devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Merge pull request #1876 from mdosch/fix-screensaver-spam

Browse Source 
Don't use xscreensaver on wayland.
This commit is contained in:
Michael Vetter
2023-08-11 13:25:06 +02:00
committed by GitHub
parent 191f571bcd 2ed6211cc3
commit f56ce07141
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ui/core.c
View File

@@ -107,7 +107,11 @@ ui_init(void)
notifier_initialise(); notifier_initialise();
cons_about(); cons_about();
#ifdef HAVE_LIBXSS #ifdef HAVE_LIBXSS
display = XOpenDisplay(0); char* x11_display = getenv("DISPLAY");
char* wayland_display = getenv("WAYLAND_DISPLAY");
if (x11_display && !wayland_display) {
display = XOpenDisplay(0);
}
#endif #endif
ui_idle_time = g_timer_new(); ui_idle_time = g_timer_new();
inp_size = 0; inp_size = 0;
@@ -150,15 +154,17 @@ ui_get_idle_time(void)
{ {
// if compiled with libxss, get the x sessions idle time // if compiled with libxss, get the x sessions idle time
#ifdef HAVE_LIBXSS #ifdef HAVE_LIBXSS
XScreenSaverInfo* info = XScreenSaverAllocInfo(); if (display) {
if (info && display) { XScreenSaverInfo* info = XScreenSaverAllocInfo();
XScreenSaverQueryInfo(display, DefaultRootWindow(display), info); if (info && display) {
unsigned long result = info->idle; XScreenSaverQueryInfo(display, DefaultRootWindow(display), info);
XFree(info); unsigned long result = info->idle;
return result; XFree(info);
} return result;
if (info) { }
XFree(info); if (info) {
XFree(info);
}
} }
// if no libxss or xss idle time failed, use profanity idle time // if no libxss or xss idle time failed, use profanity idle time
#endif #endif