Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-09-30 13:30:28 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix for certain window names not being detected

Browse Source
This commit is contained in:
WarmUpTill
2018-03-05 02:26:34 +01:00
committed by GitHub
parent c934b5c7ff
commit 42dcd9dec4
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
advanced-scene-switcher-nix.cpp
View File

@@ -150,7 +150,9 @@ static std::string GetWindowTitle(size_t i)
std::string windowTitle; std::string windowTitle;
char* name; char* name;
int status = XFetchName(disp(), w, &name); XTextProperty text;
int status = XGetWMName(disp(), w, &text);
name = reinterpret_cast<char*>(text.value);
if (status >= Success && name != nullptr) if (status >= Success && name != nullptr)
{ {
std::string str(name); std::string str(name);
@@ -201,7 +203,9 @@ void GetCurrentWindowTitle(string &title)
&bytes, &bytes,
(uint8_t**)&data); (uint8_t**)&data);
int status = XFetchName(disp(), data[0], &name); XTextProperty text;
int status = XGetWMName(disp(), data[0], &text);
name = reinterpret_cast<char*>(text.value);
if (status >= Success && name != nullptr) { if (status >= Success && name != nullptr) {
std::string str(name); std::string str(name);
@@ -223,13 +227,13 @@ pair<int, int> getCursorPos()
int win_x; int win_x;
int win_y; int win_y;
unsigned int mask; unsigned int mask;
dpy = XOpenDisplay(NULL); dpy = XOpenDisplay(NULL);
root = XDefaultRootWindow(dpy); root = XDefaultRootWindow(dpy);
if(XQueryPointer(dpy, root, &ret_root, &ret_child, &root_x, &root_y, if(XQueryPointer(dpy, root, &ret_root, &ret_child, &root_x, &root_y,
&win_x, &win_y, &mask)) &win_x, &win_y, &mask))
{ {
pos = pair<int, int> (root_x,root_y); pos = pair<int, int> (root_x,root_y);
} }
XCloseDisplay(dpy); XCloseDisplay(dpy);
@@ -269,14 +273,14 @@ bool isFullscreen()
XGetWindowAttributes(disp(), rootWin, &screen_attributes_return); XGetWindowAttributes(disp(), rootWin, &screen_attributes_return);
XGetWindowAttributes(disp(), data[0], &window_attributes_return); XGetWindowAttributes(disp(), data[0], &window_attributes_return);
//menu bar is always 24 pixels in height //menu bar is always 24 pixels in height
return (window_attributes_return.width >= screen_attributes_return.width && return (window_attributes_return.width >= screen_attributes_return.width &&
window_attributes_return.height + 24 >= screen_attributes_return.height) ? true : false; window_attributes_return.height + 24 >= screen_attributes_return.height) ? true : false;
} }
//exe switch is not quite what is expected but it works for now //exe switch is not quite what is expected but it works for now
void GetProcessList(QStringList &processes) void GetProcessList(QStringList &processes)
{ {
processes.clear(); processes.clear();
for (size_t i = 0; i < getTopLevelWindows().size(); ++i){ for (size_t i = 0; i < getTopLevelWindows().size(); ++i){
@@ -286,14 +290,14 @@ void GetProcessList(QStringList &processes)
} }
} }
bool isInFocus(const QString &exeToCheck) bool isInFocus(const QString &exeToCheck)
{ {
string curWindow; string curWindow;
GetCurrentWindowTitle(curWindow); GetCurrentWindowTitle(curWindow);
return (QString::compare( return (QString::compare(
QString::fromStdString(curWindow), QString::fromStdString(curWindow),
exeToCheck, exeToCheck,
Qt::CaseInsensitive) == 0) ? true : false; Qt::CaseInsensitive) == 0) ? true : false;
} }
@@ -307,17 +311,15 @@ int secondsSinceLastInput()
mit_info = XScreenSaverAllocInfo(); mit_info = XScreenSaverAllocInfo();
if((display=XOpenDisplay(NULL)) == NULL) if((display=XOpenDisplay(NULL)) == NULL)
{ {
return(-1); return(-1);
} }
screen = DefaultScreen(display); screen = DefaultScreen(display);
XScreenSaverQueryInfo(display, RootWindow(display,screen), mit_info); XScreenSaverQueryInfo(display, RootWindow(display,screen), mit_info);
idle_time = (mit_info->idle) / 1000; idle_time = (mit_info->idle) / 1000;
XFree(mit_info); XFree(mit_info);
XCloseDisplay(display); XCloseDisplay(display);
return idle_time; return idle_time;
} }