Merge branch 'backport'

diff --cc data/rc.xml
Simple merge

diff --cc openbox/event.h
index a1ccfbc603b60edcc8f9bb9631f1701855120633,a8d1aeaf9160aad2dc742cf59e3b58ff3c24926f..65ff915bc5f76d4b7c84477ce33746cb9d7f43ec
--- 1/openbox/event.h
--- 2/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);