X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.h;h=cc441405a4638e582f0119149ec76b5ff991981a;hb=af01da31502b20300222213e693457320e4158e4;hp=93af6b4cf0ee713e95feb0d00e2d6a14b963ec91;hpb=c38a756ae50616b1431e3137141189a5588654a0;p=chaz%2Fopenbox

diff --git a/openbox/event.h b/openbox/event.h
index 93af6b4c..cc441405 100644
--- a/openbox/event.h
+++ b/openbox/event.h
@@ -26,18 +26,11 @@ 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 */
+#define OB_EVENT_USER_TIME_DELAY (1000) /* milliseconds */
 
-/*! 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;
-/*! The value of the mask for the ScrollLock modifier */
-extern guint ScrollLockMask;
-
 void event_startup(gboolean reconfig);
 void event_shutdown(gboolean reconfig);
 
@@ -45,9 +38,13 @@ void event_shutdown(gboolean reconfig);
     follows mouse */
 void event_enter_client(struct _ObClient *client);
 
+/*! Make as if the mouse just left the client, use only when using focus
+    follows mouse */
+void event_leave_client(struct _ObClient *client);
+
 /*! Make mouse focus not move at all from the stuff that happens between these
     two function calls. */
-gulong event_start_ignore_all_enters();
+gulong event_start_ignore_all_enters(void);
 void event_end_ignore_all_enters(gulong start);
 
 /*! End *all* active and passive grabs on the keyboard
@@ -57,16 +54,38 @@ void event_end_ignore_all_enters(gulong start);
 
     Actions should not rely on being able to move focus during an
     interactive grab. */
-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);
+gboolean event_time_after(guint32 t1, guint32 t2);
+
+/*! Time at which the current event occured.  If this is not known, this
+  is a time at or after it, but at or before any other events we will process
+*/
+Time event_time(void);
+
+/*! Force event_time() to skip the current timestamp and look for the next
+  one. */
+void event_reset_time(void);
+
+/*! A time at which an event happened that caused this current event to be
+  generated.  This is a user-provided time and not to be trusted.
+  Returns CurrentTime if there was no source time provided.
+*/
+Time event_source_time(void);
+
+/*! Update the timestamp for when the user has last used the focused window.
+  This updates the timestamp to the time of the last event, given by
+  event_time().
+*/
+void event_update_user_time(void);
 
-Time event_get_server_time();
+/*! Reset the timestamp for when the user has last used the focused window. */
+void event_reset_user_time(void);
 
 #endif