Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        events.c events.h 


Log Message:
Debug stuff + trivial cleanups.

===================================================================
RCS file: /cvs/e/e16/e/src/events.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -3 -r1.138 -r1.139
--- events.c    9 Jun 2007 14:45:09 -0000       1.138
+++ events.c    11 Jul 2007 08:32:23 -0000      1.139
@@ -72,6 +72,7 @@
 #define event_base_shape ExtData[XEXT_SHAPE].event_base
 #define event_base_randr ExtData[XEXT_RANDR].event_base
 #define event_base_damage ExtData[XEXT_DAMAGE].event_base
+#define event_base_saver  ExtData[XEXT_SCRSAVER].event_base
 
 static void
 ExtInitShape(int available)
@@ -131,6 +132,8 @@
        Eprintf(" Screen saver window=%#lx\n", xssi->window);
        XFree(xssi);
      }
+   XScreenSaverSelectInput(disp, VRoot.xwin,
+                          ScreenSaverNotifyMask | ScreenSaverCycleMask);
 }
 #endif
 
@@ -571,6 +574,10 @@
             else if (ev->type == event_base_damage + XDamageNotify)
                ev->type = EX_EVENT_DAMAGE_NOTIFY;
 #endif
+#if USE_XSCREENSAVER
+            else if (ev->type == event_base_saver + ScreenSaverNotify)
+               ev->type = EX_EVENT_SAVER_NOTIFY;
+#endif
          }
      }
 
@@ -759,10 +766,18 @@
        return "Reparent-Gone";
      case EX_EVENT_SHAPE_NOTIFY:
        return "ShapeNotify";
+#if USE_XSCREENSAVER
+     case EX_EVENT_SAVER_NOTIFY:
+       return "ScreenSaverNotify";
+#endif
+#if USE_XRANDR
      case EX_EVENT_SCREEN_CHANGE_NOTIFY:
        return "ScreenChangeNotify";
+#endif
+#if USE_COMPOSITE
      case EX_EVENT_DAMAGE_NOTIFY:
        return "DamageNotify";
+#endif
      }
 
    sprintf(buf, "%d", type);
@@ -914,6 +929,13 @@
                se->kind, se->shaped, se->x, se->y, se->width, se->height);
 #undef se
        break;
+#if USE_XSCREENSAVER
+     case EX_EVENT_SAVER_NOTIFY:
+#define se ((XScreenSaverNotifyEvent *)ev)
+       Eprintf("%s state=%d kind=%d\n", buf, se->state, se->kind);
+#undef se
+       break;
+#endif
 #if USE_XRANDR
      case EX_EVENT_SCREEN_CHANGE_NOTIFY:
        Eprintf("%s\n", buf);
===================================================================
RCS file: /cvs/e/e16/e/src/events.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- events.h    13 Jan 2007 19:14:27 -0000      1.2
+++ events.h    11 Jul 2007 08:32:23 -0000      1.3
@@ -30,7 +30,8 @@
 #define EX_EVENT_MAPREQUEST_GONE         67
 #define EX_EVENT_REPARENT_GONE           68
 
-#define EX_EVENT_SHAPE_NOTIFY            72
+#define EX_EVENT_SHAPE_NOTIFY            71
+#define EX_EVENT_SAVER_NOTIFY            72
 #define EX_EVENT_SCREEN_CHANGE_NOTIFY    73
 #define EX_EVENT_DAMAGE_NOTIFY           74
 



-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to