use full word "display" for variable in all places

[ozzloy@gmail.com/oble] / idle_x11.cpp

diff --git a/idle_x11.cpp b/idle_x11.cpp
index ebe49f5aed72a46b0d4accfed921361ecd2e0eab..d1f97e1db9a3de2543a778dfe6b7d366aa9c91ff 100644 (file)
--- a/idle_x11.cpp
+++ b/idle_x11.cpp
@@ -23,19 +23,18 @@
 #include <X11/extensions/sync.h>
 #include <X11/extensions/scrnsaver.h>
 
-static Display *dpy = NULL;
 
-void reset_idle_time()
+int reset_idle_time()
 {
-       if (!dpy) {
-               if (!(dpy = XOpenDisplay(NULL))) {
+  Display *display = NULL;
+       if (!display) {
+               if (!(display = XOpenDisplay(NULL))) {
                        fputs("Could not open X11 display.\n", stderr);
-                       return;
+                       return -1;
                }
        }
-
-       XScreenSaverSuspend(dpy, True);
-       XSync(dpy, False);
-       XScreenSaverSuspend(dpy, False);
-       XSync(dpy, False); 
+  int x_force_screen_saver;
+  int screen_saver_mode = ScreenSaverReset;
+  x_force_screen_saver = XForceScreenSaver(display, screen_saver_mode);
+  return x_force_screen_saver;
 }