X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fcallbacks.py;h=6c33bc7792696f83617469984824faaf366cf5d7;hb=7b8c5c892a642553cd375f8180eff25c7406b865;hp=4d5092680d3cc2baa98395f7ecc5d483c014c6fc;hpb=225d4302d0b2bd40d03d3bfa54116c0adfe3143e;p=chaz%2Fopenbox

diff --git a/scripts/callbacks.py b/scripts/callbacks.py
index 4d509268..6c33bc77 100644
--- a/scripts/callbacks.py
+++ b/scripts/callbacks.py
@@ -2,40 +2,97 @@
 ### Functions that can be used as callbacks for mouse/keyboard bindings  ###
 ############################################################################
 
-#############################################################################
-### Options that can be modified to change the default hooks' behaviors.  ###
-###                                                                       ###
-#############################################################################
-
 import ob
 import otk
 
-def state_above(data, add=2):
-    """Toggles, adds or removes the 'above' state on a window."""
+StateRemove = 0
+"""For the state_* callbacks. Indicates the state should be removed from the
+   window."""
+StateAdd = 1
+"""For the state_* callbacks. Indicates the state should be add to the
+   window."""
+StateToggle = 2
+"""For the state_* callbacks. Indicates the state should be toggled on the
+   window."""
+
+def state_above(data, add=StateAdd):
+    """Toggles, adds or removes the 'above' state on a window.
+       The second paramater should one of: StateRemove, StateAdd, or
+       StateToggle."""
     if not data.client: return
     ob.send_client_msg(otk.display.screenInfo(data.screen).rootWindow(),
-                       otk.Property_atoms().net_wm_state, data.client.window(),
-                       add, otk.Property_atoms().net_wm_state_above)
+                       otk.atoms.net_wm_state, data.client.window(),
+                       add, otk.atoms.net_wm_state_above)
     
-def state_below(data, add=2):
-    """Toggles, adds or removes the 'below' state on a window."""
+def state_below(data, add=StateAdd):
+    """Toggles, adds or removes the 'below' state on a window.
+       The second paramater should one of: StateRemove, StateAdd, or
+       StateToggle."""
     if not data.client: return
     ob.send_client_msg(otk.display.screenInfo(data.screen).rootWindow(),
-                       otk.Property_atoms().net_wm_state, data.client.window(),
-                       add, otk.Property_atoms().net_wm_state_below)
+                       otk.atoms.net_wm_state, data.client.window(),
+                       add, otk.atoms.net_wm_state_below)
     
-def state_shaded(data, add=2):
-    """Toggles, adds or removes the 'shaded' state on a window."""
+def state_shaded(data, add=StateAdd):
+    """Toggles, adds or removes the 'shaded' state on a window.
+       The second paramater should one of: StateRemove, StateAdd, or
+       StateToggle."""
+    if not data.client: return
+    ob.send_client_msg(otk.display.screenInfo(data.screen).rootWindow(),
+                       otk.atoms.net_wm_state, data.client.window(),
+                       add, otk.atoms.net_wm_state_shaded)
+
+def state_maximize(data, add=StateAdd):
+    """Toggles, adds or removes the horizontal and vertical 'maximized' state
+       on a window. The second paramater should one of: StateRemove, StateAdd,
+       or StateToggle."""
+    if not data.client: return
+    ob.send_client_msg(otk.display.screenInfo(data.screen).rootWindow(),
+                       otk.atoms.net_wm_state, data.client.window(),
+                       add, otk.atoms.net_wm_state_maximized_horz,
+                       otk.atoms.net_wm_state_maximized_vert)
+
+def state_maximize_horz(data, add=StateAdd):
+    """Toggles, adds or removes the horizontal 'maximized' state on a window.
+       The second paramater should one of: StateRemove, StateAdd, or
+       StateToggle."""
     if not data.client: return
     ob.send_client_msg(otk.display.screenInfo(data.screen).rootWindow(),
-                       otk.Property_atoms().net_wm_state, data.client.window(),
-                       add, otk.Property_atoms().net_wm_state_shaded)
+                       otk.atoms.net_wm_state, data.client.window(),
+                       add, otk.atoms.net_wm_state_maximized_horz)
 
+def state_maximize_vert(data, add=StateAdd):
+    """Toggles, adds or removes the vertical 'maximized' state on a window.
+       The second paramater should one of: StateRemove, StateAdd, or
+       StateToggle."""
+    if not data.client: return
+    ob.send_client_msg(otk.display.screenInfo(data.screen).rootWindow(),
+                       otk.atoms.net_wm_state, data.client.window(),
+                       add, otk.atoms.net_wm_state_maximized_vert)
+
+def state_skip_taskbar(data, add=StateAdd):
+    """Toggles, adds or removes the 'skip_taskbar' state on a window.
+       The second paramater should one of: StateRemove, StateAdd, or
+       StateToggle."""
+    if not data.client: return
+    ob.send_client_msg(otk.display.screenInfo(data.screen).rootWindow(),
+                       otk.atoms.net_wm_state, data.client.window(),
+                       add, otk.atoms.net_wm_state_skip_taskbar)
+    
+def state_skip_pager(data, add=StateAdd):
+    """Toggles, adds or removes the 'skip_pager' state on a window.
+       The second paramater should one of: StateRemove, StateAdd, or
+       StateToggle."""
+    if not data.client: return
+    ob.send_client_msg(otk.display.screenInfo(data.screen).rootWindow(),
+                       otk.atoms.net_wm_state, data.client.window(),
+                       add, otk.atoms.net_wm_state_skip_pager)
+    
 def iconify(data):
     """Iconifies the window on which the event occured"""
     if not data.client: return
     ob.send_client_msg(otk.display.screenInfo(data.screen).rootWindow(),
-                       otk.Property_atoms().wm_change_state,
+                       otk.atoms.wm_change_state,
                        data.client.window(), 3) # IconicState
     
 def restore(data):
@@ -44,14 +101,14 @@ def restore(data):
        use the activate() function."""
     if not data.client: return
     ob.send_client_msg(otk.display.screenInfo(data.screen).rootWindow(),
-                       otk.Property_atoms().wm_change_state,
+                       otk.atoms.wm_change_state,
                        data.client.window(), 1) # NormalState
     
 def close(data):
     """Closes the window on which the event occured"""
     if not data.client: return
     ob.send_client_msg(otk.display.screenInfo(data.screen).rootWindow(),
-                       otk.Property_atoms().net_close_window,
+                       otk.atoms.net_close_window,
                        data.client.window(), 0)
 
 def focus(data):
@@ -62,10 +119,6 @@ def focus(data):
         return
     data.client.focus()
 
-def restart(data, other = ""):
-    """Restarts openbox, optionally starting another window manager."""
-    ob.openbox.restart(other)
-
 def raise_win(data):
     """Raises the window on which the event occured"""
     if not data.client: return
@@ -76,22 +129,60 @@ def lower_win(data):
     if not data.client: return
     ob.openbox.screen(data.screen).lowerWindow(data.client)
 
+def toggle_maximize(data):
+    """Toggles the maximized status of the window on which the event occured"""
+    state_maximize(data, StateToggle)
+
+def toggle_maximize_horz(data):
+    """Toggles the horizontal maximized status of the window on which the event
+       occured"""
+    state_maximize_horz(data, StateToggle)
+
+def toggle_maximize_vert(data):
+    """Toggles the vertical maximized status of the window on which the event
+       occured"""
+    state_maximize_vert(data, StateToggle)
+
+def maximize(data):
+    """Maximizes the window on which the event occured"""
+    state_maximize(data, StateAdd)
+
+def maximize_horz(data):
+    """Horizontally maximizes the window on which the event occured"""
+    state_maximize_horz(data, StateAdd)
+
+def maximize_vert(data):
+    """Vertically maximizes the window on which the event occured"""
+    state_maximize_vert(data, StateAdd)
+
+def unmaximize(data):
+    """Unmaximizes the window on which the event occured"""
+    state_maximize(data, StateRemove)
+
+def unmaximize_horz(data):
+    """Horizontally unmaximizes the window on which the event occured"""
+    state_maximize_horz(data, StateRemove)
+
+def unmaximize_vert(data):
+    """Vertically unmaximizes the window on which the event occured"""
+    state_maximize_vert(data, StateRemove)
+
 def toggle_shade(data):
     """Toggles the shade status of the window on which the event occured"""
-    state_shaded(data)
+    state_shaded(data, StateToggle)
 
 def shade(data):
     """Shades the window on which the event occured"""
-    state_shaded(data, 1)
+    state_shaded(data, StateAdd)
 
 def unshade(data):
     """Unshades the window on which the event occured"""
-    state_shaded(data, 0)
+    state_shaded(data, StateRemove)
 
 def change_desktop(data, num):
     """Switches to a specified desktop"""
     root = otk.display.screenInfo(data.screen).rootWindow()
-    ob.send_client_msg(root, otk.Property_atoms().net_current_desktop,
+    ob.send_client_msg(root, otk.atoms.net_current_desktop,
                        root, num)
 
 def next_desktop(data, no_wrap=0):
@@ -122,7 +213,7 @@ def send_to_desktop(data, num):
     """Sends a client to a specified desktop"""
     if not data.client: return
     ob.send_client_msg(otk.display.screenInfo(data.screen).rootWindow(),
-                       otk.Property_atoms().net_wm_desktop,
+                       otk.atoms.net_wm_desktop,
                        data.client.window(),num)
 
 def toggle_all_desktops(data):
@@ -132,7 +223,7 @@ def toggle_all_desktops(data):
     if not data.client.desktop() == 0xffffffff:
         send_to_desktop(data, 0xffffffff)
     else:
-        send_to_desktop(data, openbox.screen(data.screen).desktop())
+        send_to_desktop(data, ob.openbox.screen(data.screen).desktop())
     
 def send_to_all_desktops(data):
     """Sends a client to all desktops"""
@@ -171,4 +262,12 @@ def send_to_prev_desktop(data, no_wrap=0, follow=1):
     if follow:
         change_desktop(data, d)
 
+def restart(data=0, other = ""):
+    """Restarts Openbox, optionally starting another window manager."""
+    ob.openbox.restart(other)
+
+def exit(data=0):
+    """Exits Openbox."""
+    ob.openbox.shutdown()
+
 print "Loaded callbacks.py"