[idleaction] Patch xprintidle to not use the creepy workaround anymore

This used to work around a bug in the xserver where it would always
reset the idle time whenever the screen goes to standby or suspend.
This does not happen anymore on a recent system, so xprintidle would
erroneously add the timeout values to the idletime, resulting in
incorrect high results when the screen is turned off.

1 files changed, 12 insertions, 3 deletions

diff --git a/core/modules/idleaction/xprintidle.c b/core/modules/idleaction/xprintidle.c
index 7fc62486..eae02988 100644
--- a/core/modules/idleaction/xprintidle.c
+++ b/core/modules/idleaction/xprintidle.c
@@ -40,7 +40,7 @@ unsigned long workaroundCreepyXServer(Display *dpy, unsigned long _idleTime );
 
 int main(int argc, char *argv[])
 {
-  XScreenSaverInfo ssi;
+  XScreenSaverInfo *ssi;
   Display *dpy;
   int event_basep, error_basep;
 
@@ -60,13 +60,22 @@ int main(int argc, char *argv[])
     return 1;
   }
   
-  if (!XScreenSaverQueryInfo(dpy, DefaultRootWindow(dpy), &ssi)) {
+  ssi = XScreenSaverAllocInfo();
+  if (ssi == NULL) {
+    fprintf(stderr, "couldn't allocate screen saver info\n");
+    return 1;
+  }
+  
+  if (!XScreenSaverQueryInfo(dpy, DefaultRootWindow(dpy), ssi)) {
     fprintf(stderr, "couldn't query screen saver info\n");
     return 1;
   }
   
-  printf("%lu\n", workaroundCreepyXServer(dpy, ssi.idle));
+  //printf("%lu\n", workaroundCreepyXServer(dpy, ssi.idle));
+  // Apparently not needed anymore since some recent X11 release.
+  printf("%lu\n", dpy, ssi->idle);
   
+  XFree(ssi);
   XCloseDisplay(dpy);
   return 0;
 }