Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-03-21 17:34:57 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix some windows (Steam) not being found on Linux

Browse Source 
Reverts part of commit e61905d02f

Fallback to WM_NAME if _NET_WM_NAME does not exist

Also fixes some BadWindow errors that were due to some apps like Steam only populating WM_NAME, and only for certain windows (tooltips count as windows due to the odd way the GUI works on Linux, so they don't have either property)
This commit is contained in:
Myned 2020-06-02 00:38:35 -04:00
parent 55d8303ecf
commit d6380b865e
No known key found for this signature in database
GPG Key ID: 24318A323F309244
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/linux/advanced-scene-switcher-nix.cpp
View File

@ -184,8 +184,9 @@ static std::string GetWindowTitle(size_t i)
char* name;
XTextProperty text;
Atom titleProperty = XInternAtom(disp(), "_NET_WM_NAME", true);
int status = XGetTextProperty(disp(), w, &text, titleProperty);
int status = XGetTextProperty(disp(), w, &text, XInternAtom(disp(), "_NET_WM_NAME", true));
if (status == 0)
status = XGetTextProperty(disp(), w, &text, XInternAtom(disp(), "WM_NAME", true));
name = reinterpret_cast<char*>(text.value);
if (status != 0 && name != nullptr)
@ -235,7 +236,7 @@ void GetCurrentWindowTitle(string &title)
Window rootWin = RootWindow(disp(), 0);
XGetWindowProperty(
int xstatus = XGetWindowProperty(
disp(),
rootWin,
active,
@ -249,9 +250,13 @@ void GetCurrentWindowTitle(string &title)
&bytes,
(uint8_t**)&data);
int status = 0;
XTextProperty text;
Atom titleProperty = XInternAtom(disp(), "_NET_WM_NAME", true);
int status = XGetTextProperty(disp(), data[0], &text, titleProperty);
if (xstatus == Success) {
status = XGetTextProperty(disp(), data[0], &text, XInternAtom(disp(), "_NET_WM_NAME", true));
if (status == 0)
status = XGetTextProperty(disp(), data[0], &text, XInternAtom(disp(), "WM_NAME", true));
}
name = reinterpret_cast<char*>(text.value);
if (status != 0 && name != nullptr) {
@ -293,15 +298,16 @@ bool isFullscreen(std::string &title)
return false;
// Find switch in top level windows
Atom titleProperty = XInternAtom(disp(), "_NET_WM_NAME", true);
vector<Window> windows = getTopLevelWindows();
for (auto &window : windows)
{
XTextProperty text;
int status = XGetTextProperty(disp(), window, &text, titleProperty);
int status = XGetTextProperty(disp(), window, &text, XInternAtom(disp(), "_NET_WM_NAME", true));
if (status == 0)
status = XGetTextProperty(disp(), window, &text, XInternAtom(disp(), "WM_NAME", true));
char *name = reinterpret_cast<char*>(text.value);
if (status == 0 || strcmp(name, "") == 0)
if (status == 0 || name == nullptr)
continue;
// True if switch equals window