Changeset 196

Timestamp:

02/25/2008 11:19:36 AM (11 months ago)

Author:

mwm

Message:

Extend the plpwm xml configuration facilities to allow for automatic
configuration and window placement. Tweak panes.py to deal with a bad reference
this uncovered.

Location:

trunk

Files:

• examples/plpwm.py (modified) (9 diffs)
• plwm/panes.py (modified) (3 diffs)

trunk/examples/plpwm.py

@@ -1 +1 @@
 #!/usr/bin/env python
-# $Id: plpwm.py,v 1.44 2007-07-14 09:19:34 mwm Exp $
+# $Id: plpwm.py,v 1.45 2008-02-25 17:19:36 mwm Exp $
 #
 # plpwm.py -- Example PLWM window manager configuration with panes.
@@ -31 +31 @@
 
 from time import sleep
+from string import digits
     
 from Xlib import X, XK
@@ -60 +61 @@
     C_a = input.InputKeyHandler._begin
     C_e = input.InputKeyHandler._end
-    C_y = input.InputKeyHandler._paste
+    C_y = input.InputKeyHandler._paste_selection
     c_p = input.InputKeyHandler._history_up
     c_n = input.InputKeyHandler._history_down
@@ -84 +85 @@
     menu_bordercolor = "Red"
     message_bordercolor = "Blue"
+
     
-
 class WMConfig:
     def __wm_init__(my):
-        "install the panes key map"
-        PaneKeys(my)
-
+        "install the panes key map, menus, and try to restore my config."
+
+        auto_restore(my, PaneKeys(my).menus.find('paneconfigmenus'))
+       
 
 class PLPWM(wmanager.WindowManager,
@@ -96 +98 @@
             panes.panesManager,
             inspect.InspectServer,
-            WMConfig):
+            WMConfig):
     "Set up my window manager."
 
@@ -219 +221 @@
 
     def M1_m(my, event):
-        def itunes(node): os.system('itunes %s' % node.get('command'))
+        def itunes(node): os.system('itunes "%s" &' % node.get('command'))
         view_menu(my.wm.panes_list[my.wm.panes_current],
                   XML_controller(my.menus.find('itunesmenu'),
@@ -240 +242 @@
         def reload_menus():
             my.menus = load_menus(my.menu_file)
+            auto_restore(my.wm, my.menus.find('paneconfigmenus'))
 
         def restore_menu(wm):
@@ -301 +304 @@
 
 
+def auto_restore(wm, panes):
+    "Look for and restore an automatic config."
+
+    geom = '%dx%d' % (wm.screens[0].root_full_width,
+                      wm.screens[0].root_full_height)
+    for config in panes:
+        startup = config.get('startup')
+        if (startup == 'match' and config.get('label').endswith(geom)) or \
+               startup == 'use':
+            restore(wm, config)
+            break
+
 def restore(wm, config):
     "Build my standard work environment."
 
-    pane = wm.panes_list[0]
-    pane.maximize()
+    wm.panes_list[0].maximize()
         
     # Disconnect all windows from panes to avoid displaying everything
@@ -313 +327 @@
 
     # Disconnect any remaining panes from their windows as well.
-    pane.window = None
-
+    wm.panes_list[0].window = None
+
+    places = dict()
     for node in config:
         if node.tag == 'vertical':
-            pane.vertical_split(float(node.get('fraction')))
+            wm.panes_list[wm.panes_current].vertical_split(float(node.get('fraction')))
         elif node.tag == 'horizontal':
-            pane.horizontal_split(float(node.get('fraction')))
+            wm.panes_list[wm.panes_current].horizontal_split(float(node.get('fraction')))
         elif node.tag == 'newpane':
             pane = wm.panes_list[int(node.get('pane'))]
         elif node.tag == 'goto':
-            wm.panes_goto(int(node.get('number')))
+            wm.panes_goto(int(node.get('pane')))
         elif node.tag == 'number':
-            wm.panes_number(int(node.get('number')))
+            wm.panes_number(int(node.get('new')))
+        elif node.tag == 'placewindow':
+            places[node.get('name')] = int(node.get('pane'))
         else:
             raise ValueError, 'Unrecognized pane config element %s' % node
 
+    # Now fix any windows wired by title
+    panecount = len(wm.panes_list)
+    for s in wm.screens:
+        for c in s.query_clients(cfilter.true, 1):
+            title = c.get_title()
+            if title[-2] == '@' and title[-1] in digits:
+                pane = digits.index(title[-1])
+                if pane < panecount:
+                    wm.panes_list[pane].add_window(c)
+                    continue
+            else:
+                for name in places:
+                    if name in title:
+                        if places[name] < panecount:
+                            wm.panes_list[places[name]].add_window(c)
+                            break
 
     # And now make the world sane

trunk/plwm/panes.py

@@ -1 @@
-# $Id: panes.py,v 1.21 2006-09-18 21:43:28 mwm Exp $
+# $Id: panes.py,v 1.22 2008-02-25 17:19:36 mwm Exp $
 #
 # panes.py -- Handle panes (sometimes known as "frames")
@@ -174 +174 @@
 
         w = my.get_window(event.window)
-        if w:
+        if w and w.panes_pane:
             if event.value_mask & (X.CWX | X.CWY | X.CWWidth | X.CWHeight):
                 w.panes_pane.place_window(w)
@@ -236 +236 @@
         if my.window: my.deactivate()
         my.window = window
-        if my.wm.panes_list[my.wm.panes_current] == my:
-            my.activate()
+        my.activate()
 
     def iconify_window(my):