Correct a 64-bit bug in event_time_after

[dana/openbox.git] / openbox / event.h

diff --git a/openbox/event.h b/openbox/event.h
index f794039..a4bd886 100644 (file)
--- a/openbox/event.h
+++ b/openbox/event.h
@@ -24,8 +24,14 @@
 
 struct _ObClient;
 
+/*! The amount of time before a window appears that is checked for user input
+    to determine if the user is working in another window */
+#define OB_EVENT_USER_TIME_DELAY (500) /* 0.5 seconds */
+
 /*! Time at which the last event with a timestamp occured. */
 extern Time event_curtime;
+/*! The last user-interaction time, as given by the clients */
+extern Time event_last_user_time;
 
 /*! The value of the mask for the NumLock modifier */
 extern guint NumLockMask;
@@ -36,23 +42,31 @@ void event_startup(gboolean reconfig);
 void event_shutdown(gboolean reconfig);
 
 /*! Make as if the mouse just entered the client, use only when using focus
-  follows mouse */
+    follows mouse */
 void event_enter_client(struct _ObClient *client);
 
-/*! Make mouse focus not move if the mouse leaves this client from what
-  has just transpired. */
-void event_ignore_enters_leaving_window(struct _ObClient *c);
+/*! Make mouse focus not move at all from the stuff that happens between these
+    two function calls. */
+gulong event_start_ignore_all_enters();
+void event_end_ignore_all_enters(gulong start);
+
+/*! End *all* active and passive grabs on the keyboard
+    This is called in situations where if there is a grab going on, then
+    we need to cancel it. If we move focus during the grab, applications
+    will get NotifyWhileGrabbed events and ignore them!
 
-/*! Make mouse focus not move at all from the stuff that has happened up
-  till now. */
-void event_ignore_all_queued_enters();
+    Actions should not rely on being able to move focus during an
+    interactive grab. */
+void event_cancel_all_key_grabs();
 
 /* Halts any focus delay in progress, use this when the user is selecting a
    window for focus */
 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);
+    comes at the same time or later than t2. */
+gboolean event_time_after(guint32 t1, guint32 t2);
+
+Time event_get_server_time();
 
 #endif