Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent error spam when XScreenSaver not supported

Browse Source 
If XScreenSaver is available but not supported
(e.g. when running in XWayland), return -1 for
Utils.idleMilliseconds(), instead of letting the code fail and print an
error every time this function gets called to check for the machine's
idle time.
This commit is contained in:
miruka 2020-11-05 20:24:40 -04:00
parent ed74592769
commit acce5d60ae
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils.h
View File

@ -65,8 +65,13 @@ public slots:
Display *display = XOpenDisplay(NULL); Display *display = XOpenDisplay(NULL);
if (! display) return -1; if (! display) return -1;
int supportedVersion = 0, error = 0;
if (! XScreenSaverQueryExtension(display, &supportedVersion, &error))
return -1;
XScreenSaverInfo *info = XScreenSaverAllocInfo(); XScreenSaverInfo *info = XScreenSaverAllocInfo();
XScreenSaverQueryInfo(display, DefaultRootWindow(display), info); XScreenSaverQueryInfo(display, DefaultRootWindow(display), info);
XFree(info);
const int idle = info->idle; const int idle = info->idle;
XCloseDisplay(display); XCloseDisplay(display);
@ -77,6 +82,7 @@ public slots:
#else #else
return -1; return -1;
#endif #endif
} }