Merge branch 'backport' into work

[chaz/openbox] / openbox / event.h

diff --git a/openbox/event.h b/openbox/event.h
index 29f621d5d6bb6b54f582c8375fb01e7b9a9ac1ee..cdddc2f5751635e95f1a38e2c4d46ae99324ebd5 100644 (file)
--- a/openbox/event.h
+++ b/openbox/event.h
@@ -24,13 +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 value of the mask for the NumLock modifier */
-extern guint NumLockMask;
-/*! The value of the mask for the ScrollLock modifier */
-extern guint ScrollLockMask;
+/*! The last user-interaction time, as given by the clients */
+extern Time event_last_user_time;
 
 void event_startup(gboolean reconfig);
 void event_shutdown(gboolean reconfig);
@@ -39,19 +40,22 @@ void event_shutdown(gboolean reconfig);
   follows mouse */
 void event_enter_client(struct _ObClient *client);
 
-/*! Make mouse focus not move at all from the stuff that has happened up
-  till now. */
-void event_ignore_all_queued_enters();
+/*! Make mouse focus not move at all from the stuff that happens between these
+ two function calls. */
+gulong event_start_ignore_all_enters(void);
+void event_end_ignore_all_enters(gulong start);
 
 /*! End *all* active and passive grabs on the keyboard */
-void event_cancel_all_key_grabs();
+void event_cancel_all_key_grabs(void);
 
 /* Halts any focus delay in progress, use this when the user is selecting a
    window for focus */
-void event_halt_focus_delay();
+void event_halt_focus_delay(void);
 
 /*! 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);
 
+Time event_get_server_time(void);
+
 #endif