Merge branch 'backport'

[chaz/openbox] / openbox / event.h

diff --git a/openbox/event.h b/openbox/event.h
index 5c5290f0e420ce6ed1502febcead8f6d8153ff4d..65ff915bc5f76d4b7c84477ce33746cb9d7f43ec 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);
@@ -55,4 +56,6 @@ void event_halt_focus_delay();
   comes at the same time or later than t2. */
 gboolean event_time_after(Time t1, Time t2);
 
+Time event_get_server_time();
+
 #endif