Skip to content

Commit 8b1bfcb

Browse files
committed
WM (Linux): uses the same X11 props as neofetch to query WM name
Fixes twin detection
1 parent 784a7a9 commit 8b1bfcb

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/detection/displayserver/linux/xcb.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ static void xcbDetectWMfromEWMH(XcbPropertyData* data, xcb_connection_t* connect
8383
if(wmWindow == NULL)
8484
return;
8585

86-
FF_AUTO_FREE char* wmName = (char*) xcbGetProperty(data, connection, *wmWindow, "_NET_WM_NAME");
87-
if(wmName == NULL)
88-
wmName = (char*) xcbGetProperty(data, connection, *wmWindow, "WM_NAME");
86+
FF_AUTO_FREE char* wmName = (char*) xcbGetProperty(data, connection, *wmWindow, "WM_NAME");
87+
if(!ffStrSet(wmName))
88+
wmName = (char*) xcbGetProperty(data, connection, *wmWindow, "_NET_WM_NAME");
8989

90-
if(wmName == NULL || *wmName == '\0')
90+
if(!ffStrSet(wmName))
9191
return;
9292

9393
ffStrbufSetS(&result->wmProcessName, wmName);

src/detection/displayserver/linux/xlib.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ static void x11DetectWMFromEWMH(X11PropertyData* data, Display* display, FFDispl
5353
if(wmWindow == NULL)
5454
return;
5555

56-
char* wmName = (char*) x11GetProperty(data, display, *wmWindow, "_NET_WM_NAME");
57-
if(wmName == NULL)
58-
wmName = (char*) x11GetProperty(data, display, *wmWindow, "WM_NAME");
56+
char* wmName = (char*) x11GetProperty(data, display, *wmWindow, "WM_NAME");
57+
if(!ffStrSet(wmName))
58+
wmName = (char*) x11GetProperty(data, display, *wmWindow, "_NET_WM_NAME");
5959

6060
if(ffStrSet(wmName))
6161
ffStrbufSetS(&result->wmProcessName, wmName);

0 commit comments

Comments
 (0)