Merge branch 'master' into chaz

[chaz/openbox] / openbox / event.h

diff --git a/openbox/event.h b/openbox/event.h
index 8a2a4cbc654f43950b9f4ac818853446e359d293..cc441405a4638e582f0119149ec76b5ff991981a 100644 (file)
--- a/openbox/event.h
+++ b/openbox/event.h
@@ -26,7 +26,7 @@ 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 */
 
 /*! The last user-interaction time, as given by the clients */
 extern Time event_last_user_time;
@@ -68,10 +68,24 @@ gboolean event_time_after(guint32 t1, guint32 t2);
   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);
+
+/*! Reset the timestamp for when the user has last used the focused window. */
+void event_reset_user_time(void);
+
 #endif