Merge branch 'backport'

diff --combined data/rc.xml
index caa38c673f7a6fa0970ef3f2a7f1d64f041caa7c,3859f5375e86fcf6c69c6586441e1c2a3dbd8e4d..e54cb04da7f41c2dd2d0dd3004b27582f2b6ef35
--- 1/data/rc.xml
--- 2/data/rc.xml
+++ b/data/rc.xml
@@@ -116,6 -116,9 +116,9 @@@
      <name>desktop 2</name>
      -->
    </names>
+   <popupTime>875</popupTime>
+   <!-- The number of milliseconds to show the popup for when switching
+        desktops.  Set this to 0 to disable the popup. -->
  </desktops>
  
  <resize>
@@@ -261,9 -264,9 +264,9 @@@
    <doubleClickTime>200</doubleClickTime>
    <!-- in milliseconds (1000 = 1 second) -->
    <screenEdgeWarpTime>400</screenEdgeWarpTime>
-   <!-- time before changing desktops when the pointer touches the edge of the
-        screen while moving a window, in milliseconds (1000 = 1 second),
-        0 disables warping -->
+   <!-- Time before changing desktops when the pointer touches the edge of the
+        screen while moving a window, in milliseconds (1000 = 1 second).
+        Set this to 0 to disable warping -->
  
    <context name="Frame">
      <mousebind button="A-Left" action="Press">
@@@ -331,24 -334,14 +334,24 @@@
      </mousebind>
  
      <mousebind button="Up" action="Click">
 -      <action name="Shade"/>
 -      <action name="FocusToBottom"/>
 -      <action name="Unfocus"/>
 -      <action name="Lower"/>
 +      <action name="if">
 +        <shaded>no</shaded>
 +        <then>
 +          <action name="Shade"/>
 +          <action name="FocusToBottom"/>
 +          <action name="Unfocus"/>
 +          <action name="Lower"/>
 +        </then>
 +      </action>
      </mousebind>
      <mousebind button="Down" action="Click">
 -      <action name="Unshade"/>
 -      <action name="Raise"/>
 +      <action name="if">
 +        <shaded>yes</shaded>
 +        <then>
 +          <action name="Unshade"/>
 +          <action name="Raise"/>
 +        </then>
 +      </action>
      </mousebind>
  
      <mousebind button="Right" action="Press">
@@@ -552,23 -545,23 +555,23 @@@
    </context>
  
    <context name="Desktop">
 -    <mousebind button="Up" action="Press">
 +    <mousebind button="Up" action="Click">
        <action name="GoToDesktop"><to>previous</to></action>
      </mousebind>
 -    <mousebind button="Down" action="Press">
 +    <mousebind button="Down" action="Click">
        <action name="GoToDesktop"><to>next</to></action>
      </mousebind>
  
 -    <mousebind button="A-Up" action="Press">
 +    <mousebind button="A-Up" action="Click">
        <action name="GoToDesktop"><to>previous</to></action>
      </mousebind>
 -    <mousebind button="A-Down" action="Press">
 +    <mousebind button="A-Down" action="Click">
        <action name="GoToDesktop"><to>next</to></action>
      </mousebind>
 -    <mousebind button="C-A-Up" action="Press">
 +    <mousebind button="C-A-Up" action="Click">
        <action name="GoToDesktop"><to>previous</to></action>
      </mousebind>
 -    <mousebind button="C-A-Down" action="Press">
 +    <mousebind button="C-A-Down" action="Click">
        <action name="GoToDesktop"><to>next</to></action>
      </mousebind>
  
@@@ -589,16 -582,16 +592,16 @@@
    </context>
  
    <context name="MoveResize">
 -    <mousebind button="Up" action="Press">
 +    <mousebind button="Up" action="Click">
        <action name="GoToDesktop"><to>previous</to></action>
      </mousebind>
 -    <mousebind button="Down" action="Press">
 +    <mousebind button="Down" action="Click">
        <action name="GoToDesktop"><to>next</to></action>
      </mousebind>
 -    <mousebind button="A-Up" action="Press">
 +    <mousebind button="A-Up" action="Click">
        <action name="GoToDesktop"><to>previous</to></action>
      </mousebind>
 -    <mousebind button="A-Down" action="Press">
 +    <mousebind button="A-Down" action="Click">
        <action name="GoToDesktop"><to>next</to></action>
      </mousebind>
    </context>

diff --combined 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);
  
@@@ -50,4 -61,6 +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