diff options
| -rw-r--r-- | data/rc.xml | 42 | ||||
| -rw-r--r-- | openbox/event.h | 5 |
2 files changed, 26 insertions, 21 deletions
diff --git a/data/rc.xml b/data/rc.xml index 3859f537..e54cb04d 100644 --- a/data/rc.xml +++ b/data/rc.xml @@ -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"> @@ -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> @@ -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 --git a/openbox/event.h b/openbox/event.h index a8d1aeaf..65ff915b 100644 --- a/openbox/event.h +++ b/openbox/event.h @@ -33,11 +33,6 @@ 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); |