all repos — openbox @ f34b2571b99f40885548fc3ea7c8c5b45ba64335

openbox fork - make it a bit more like ryudo 

Correct a 64-bit bug in event_time_after

The code assumed the timestamps had the same domain as the type Xlib
uses for them, which is almost never the case with Xlib. Change all
involved variables to guint32.
Mikael Magnusson mikachu@gmail.com
commit

f34b2571b99f40885548fc3ea7c8c5b45ba64335

parent

4a9b25ad58d9098bf55d04ca907f2f3865dea7e0

2 files changed, 6 insertions(+), 4 deletions(-)

jump to
M openbox/event.c → openbox/event.c 
@@ -1999,7 +1999,7 @@ 
     XSync(ob_display, FALSE);
 }
 
-gboolean event_time_after(Time t1, Time t2)
+gboolean event_time_after(guint32 t1, guint32 t2)
 {
     g_assert(t1 != CurrentTime);
     g_assert(t2 != CurrentTime);

@@ -2012,8 +2012,10 @@ later in time than T.
       - http://tronche.com/gui/x/xlib/input/pointer-grabbing.html
     */
 
-    /* TIME_HALF is half of the number space of a Time type variable */
-#define TIME_HALF (Time)(1 << (sizeof(Time)*8-1))
+    /* TIME_HALF is not half of the number space of a Time type variable.
+     * Rather, it is half the number space of a timestamp value, which is
+     * always 32 bits. */
+#define TIME_HALF (guint32)(1 << 31)
 
     if (t2 >= TIME_HALF)
         /* t2 is in the second half so t1 might wrap around and be smaller than
M openbox/event.h → openbox/event.h 
@@ -65,7 +65,7 @@ void event_halt_focus_delay();
 
 /*! Compare t1 and t2, taking into account wraparound. True if t1
     comes at the same time or later than t2. */
-gboolean event_time_after(Time t1, Time t2);
+gboolean event_time_after(guint32 t1, guint32 t2);
 
 Time event_get_server_time();