From: Dana Jansens <danakj@orodu.net>
Date: Sun, 5 Aug 2007 03:35:36 +0000 (-0400)
Subject: Merge branch 'backport'
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=f55ae9e56945892825928cfb021b5e739d0d5224;p=chaz%2Fopenbox

Merge branch 'backport'
---

f55ae9e56945892825928cfb021b5e739d0d5224
diff --cc openbox/event.h
index a1ccfbc6,a8d1aeaf..65ff915b
--- a/openbox/event.h
+++ b/openbox/event.h
@@@ -24,9 -24,20 +24,15 @@@
  
  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;
 -/*! The value of the mask for the ScrollLock modifier */
 -extern guint ScrollLockMask;
 -
  void event_startup(gboolean reconfig);
  void event_shutdown(gboolean reconfig);