X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=scripts%2Fcallbacks.py;h=8c220e6451db1efd4430fdc940f1986ab9ffce3f;hb=69d12b5ee2e8da238ac2fca5606cc25ddaa07523;hp=7ff673550cfb9cffe2f1139d065a36ecd97e6f7b;hpb=4a79f7c4390b420a0993a0f3059924c3839cd445;p=chaz%2Fopenbox

diff --git a/scripts/callbacks.py b/scripts/callbacks.py
index 7ff67355..8c220e64 100644
--- a/scripts/callbacks.py
+++ b/scripts/callbacks.py
@@ -5,46 +5,84 @@
 import ob
 import otk
 
-def state_above(data, add=2):
+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: 0 - removes the state, 1 - adds the
-       state, 2 - toggles the state."""
+       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)
     
-def state_below(data, add=2):
+def state_below(data, add=StateAdd):
     """Toggles, adds or removes the 'below' state on a window.
-       The second paramater should one of: 0 - removes the state, 1 - adds the
-       state, 2 - toggles the state."""
+       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)
     
-def state_shaded(data, add=2):
+def state_shaded(data, add=StateAdd):
     """Toggles, adds or removes the 'shaded' state on a window.
-       The second paramater should one of: 0 - removes the state, 1 - adds the
-       state, 2 - toggles the state."""
+       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)
 
-def state_skip_taskbar(data, add=2):
+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.Property_atoms().net_wm_state, data.client.window(),
+                       add, otk.Property_atoms().net_wm_state_maximized_horz,
+                       otk.Property_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_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.Property_atoms().net_wm_state, data.client.window(),
+                       add, otk.Property_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: 0 - removes the state, 1 - adds the
-       state, 2 - toggles the state."""
+       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_skip_taskbar)
     
-def state_skip_pager(data, add=2):
+def state_skip_pager(data, add=StateAdd):
     """Toggles, adds or removes the 'skip_pager' state on a window.
-       The second paramater should one of: 0 - removes the state, 1 - adds the
-       state, 2 - toggles the state."""
+       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(),
@@ -81,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
@@ -95,17 +129,55 @@ 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"""
@@ -151,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"""
@@ -190,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"