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

Don't use xscreensaver on wayland.
This commit is contained in:
Michael Vetter
2023-08-11 13:25:06 +02:00
committed by GitHub

View File

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