cleanups for how we display iconic state in the hints, and choose it in the mapping...

[chaz/openbox] / src / openbox.py

diff --git a/src/openbox.py b/src/openbox.py
index ac8b0c6c3ba6505d01adf1edcba32c239f8caea9..dbe602247ea4b8eb475f5b2e46a268a0eb1a2eaa 100644 (file)
--- a/src/openbox.py
+++ b/src/openbox.py
@@ -773,13 +773,14 @@ class Client(EventHandler,):
     Decor_Border = _openbox.Client_Decor_Border
     Decor_Iconify = _openbox.Client_Decor_Iconify
     Decor_Maximize = _openbox.Client_Decor_Maximize
-    Decor_Sticky = _openbox.Client_Decor_Sticky
+    Decor_AllDesktops = _openbox.Client_Decor_AllDesktops
     Decor_Close = _openbox.Client_Decor_Close
     State_Remove = _openbox.Client_State_Remove
     State_Add = _openbox.Client_State_Add
     State_Toggle = _openbox.Client_State_Toggle
     event_mask = _openbox.Client_event_mask
     no_propagate_mask = _openbox.Client_no_propagate_mask
+    ICONIC_DESKTOP = _openbox.Client_ICONIC_DESKTOP
     __swig_setmethods__["ignore_unmaps"] = _openbox.Client_ignore_unmaps_set
     __swig_getmethods__["ignore_unmaps"] = _openbox.Client_ignore_unmaps_get
     if _newclass:ignore_unmaps = property(_openbox.Client_ignore_unmaps_get,_openbox.Client_ignore_unmaps_set)
@@ -825,6 +826,7 @@ class Client(EventHandler,):
     def unmapHandler(*args): return apply(_openbox.Client_unmapHandler,args)
     def destroyHandler(*args): return apply(_openbox.Client_destroyHandler,args)
     def reparentHandler(*args): return apply(_openbox.Client_reparentHandler,args)
+    def mapRequestHandler(*args): return apply(_openbox.Client_mapRequestHandler,args)
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<C Client instance at %s>" % (self.this,)
@@ -869,7 +871,7 @@ class Frame(_object):
     def button_close(*args): return apply(_openbox.Frame_button_close,args)
     def button_iconify(*args): return apply(_openbox.Frame_button_iconify,args)
     def button_max(*args): return apply(_openbox.Frame_button_max,args)
-    def button_stick(*args): return apply(_openbox.Frame_button_stick,args)
+    def button_alldesk(*args): return apply(_openbox.Frame_button_alldesk,args)
     def handle(*args): return apply(_openbox.Frame_handle,args)
     def grip_left(*args): return apply(_openbox.Frame_grip_left,args)
     def grip_right(*args): return apply(_openbox.Frame_grip_right,args)
@@ -890,7 +892,7 @@ MC_Window = _openbox.MC_Window
 MC_MaximizeButton = _openbox.MC_MaximizeButton
 MC_CloseButton = _openbox.MC_CloseButton
 MC_IconifyButton = _openbox.MC_IconifyButton
-MC_StickyButton = _openbox.MC_StickyButton
+MC_AllDesktopsButton = _openbox.MC_AllDesktopsButton
 MC_Grip = _openbox.MC_Grip
 MC_Root = _openbox.MC_Root
 MC_MenuItem = _openbox.MC_MenuItem
@@ -910,6 +912,7 @@ EventNewWindow = _openbox.EventNewWindow
 EventCloseWindow = _openbox.EventCloseWindow
 EventStartup = _openbox.EventStartup
 EventShutdown = _openbox.EventShutdown
+EventKey = _openbox.EventKey
 EventFocus = _openbox.EventFocus
 EventBell = _openbox.EventBell
 NUM_EVENTS = _openbox.NUM_EVENTS
@@ -1026,6 +1029,9 @@ class KeyData(_object):
     __swig_setmethods__["key"] = _openbox.KeyData_key_set
     __swig_getmethods__["key"] = _openbox.KeyData_key_get
     if _newclass:key = property(_openbox.KeyData_key_get,_openbox.KeyData_key_set)
+    __swig_setmethods__["action"] = _openbox.KeyData_action_set
+    __swig_getmethods__["action"] = _openbox.KeyData_action_get
+    if _newclass:action = property(_openbox.KeyData_action_get,_openbox.KeyData_action_set)
     def __init__(self,*args):
         self.this = apply(_openbox.new_KeyData,args)
         self.thisown = 1