Changeset 195

Timestamp:

07/14/2007 04:19:34 AM (18 months ago)

Author:

mwm

Message:

Move pane configuration data into the xml config file. Update config example to include that and the websearch config as well.

Location:

trunk/examples

Files:

• plpwm.py (modified) (6 diffs)
• plpwmrc.xml (modified) (1 diff)

trunk/examples/plpwm.py

@@ -1 +1 @@
 #!/usr/bin/env python
-# $Id: plpwm.py,v 1.43 2007-07-14 07:38:12 mwm Exp $
+# $Id: plpwm.py,v 1.44 2007-07-14 09:19:34 mwm Exp $
 #
 # plpwm.py -- Example PLWM window manager configuration with panes.
@@ -213 +213 @@
 
     def M1_k(my, event):
+        my.wm.panes_list[my.wm.panes_current].window.delete(1)
+
+    def M1_K(my, event):
         my.wm.panes_list[my.wm.panes_current].window.destroy()
 
@@ -238 +241 @@
             my.menus = load_menus(my.menu_file)
 
-        codemenu(my.wm.panes_list[my.wm.panes_current],
-                 {'1: Restore': (restore, (my.wm,)),
-                  '2: Reload': (reload_menus, ()),
-                  '3: Restart': (os.execvp, (sys.executable,
-                                             [sys.executable] + sys.argv)),
-                  '4: Quit': (my.wm.quit, ())
-                 })
+        def restore_menu(wm):
+            view_menu(pane, XML_controller(my.menus.find('paneconfigmenus'),
+                                           dict(paneconfig=lambda x: restore(wm, x))))
+
+        pane = my.wm.panes_list[my.wm.panes_current]
+        codemenu(pane, {'1: Restore': (restore_menu, (my.wm,)),
+                        '2: Reload': (reload_menus, ()),
+                        '3: Restart': (os.execvp, (sys.executable,
+                                                   [sys.executable] + sys.argv)),
+                        '4: Quit': (my.wm.quit, ())
+                        })
 
     def M1_s(my, event):
@@ -252 +259 @@
         def dowebsearch(node):
             if node.get('images'):
-                websearch(pane, node.get('label'), paneWindow, node.get('url'), dillo)
+                websearch(pane, node.get('label'), paneWindow, node.get('url'),
+                          dillo)
             else:
                 websearch(pane, node.get('label'), paneWindow, node.get('url'))
@@ -293 +301 @@
 
 
-def restore(wm):
+def restore(wm, config):
     "Build my standard work environment."
 
@@ -307 +315 @@
     pane.window = None
 
-    # If we don't have Xinerama working, fake it by splitting the one
-    # *big* screen.
-    pane.vertical_split(1920. / 3520.)
-
-    # Create the panes
-    pane.vertical_split()
-    pane.horizontal_split(.06)
-    pane.vertical_split(.75)
-    pane.horizontal_split(.06)
-    pane.horizontal_split(.45)
-    pane = wm.panes_list[4]
-    pane.horizontal_split(.42)
-    pane.horizontal_split()
-
-    # Now number them.
-    wm.panes_goto(2)
-    wm.panes_number(0)
-    wm.panes_goto(4)
-    wm.panes_number(1)
-    wm.panes_goto(8)
-    wm.panes_number(2)
-    wm.panes_goto(7)
-    wm.panes_number(3)
-    wm.panes_goto(7)
-    wm.panes_number(4)
-    wm.panes_goto(8)
-    wm.panes_number(5)
-    wm.panes_goto(8)
-    wm.panes_number(7)
-    
-    # Set up the second screen
-    #wm.panes_list[7].vertical_split()
-
-    # And make the world sane
+    for node in config:
+        if node.tag == 'vertical':
+            pane.vertical_split(float(node.get('fraction')))
+        elif node.tag == 'horizontal':
+            pane.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')))
+        elif node.tag == 'number':
+            wm.panes_number(int(node.get('number')))
+        else:
+            raise ValueError, 'Unrecognized pane config element %s' % node
+
+
+    # And now make the world sane
     wm.panes_goto(0)
     wm.panes_restore()

trunk/examples/plpwmrc.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <plpwm xmlns:xi="http://www.w3.org/2001/XInclude">
   <functionmenu>
-    <getapp label="a: Audio" title='VCL' command='vlc' />
-    <getapp label="b: Browser" title='w3m:' command='w3m' />
-    <getapp label="c: Calendar" title='Sunbird' command='sunbird' />
-    <getapp label="d: Documents" title='LyX' command='lyx' />
-    <getapp label="e: Editor" title="emacs@" command="emacs" />
-    <getapp label="f: Finances" title="data - " command="gnucash" />
-    <getapp label="i: IM" title="Buddy" command="gaim" />
-    <getapp label="m: Mail" title='Claws Mail' command='claws-mail' />
-    <getapp label="o: Office" title='OpenOffice.org' command='openoffice.org' />
-    <getapp label="p: Pdf viewer" title="Xpdf:" command="xpdf" />
-    <getapp label="x: XClipboard" title="xclipboard" />
+    <getapp label="a: Audio" title="VCL" command="vlc"/>
+    <getapp label="b: Browser" title="w3m:" command="w3m"/>
+    <getapp label="c: Calendar" title="Sunbird" command="sunbird"/>
+    <getapp label="d: Documents" title="LyX" command="lyx"/>
+    <getapp label="e: Editor" title="emacs@" command="emacs"/>
+    <getapp label="f: Finances" title="data - " command="gnucash"/>
+    <getapp label="i: IM" title="Buddy" command="gaim"/>
+    <getapp label="m: Mail" title="Claws Mail" command="claws-mail"/>
+    <getapp label="o: Office" title="OpenOffice.org" command="openoffice.org"/>
+    <getapp label="p: Pdf viewer" title="Xpdf:" command="xpdf"/>
+    <getapp label="x: XClipboard" title="xclipboard"/>
   </functionmenu>
   <namemenu>
-    <getapp label="d: Dillo" title='Dillo' command='dillo' />
-    <getapp label="e: Emacs" title="emacs@" command="emacs" />
+    <getapp label="d: Dillo" title="Dillo" command="dillo"/>
+    <getapp label="e: Emacs" title="emacs@" command="emacs"/>
     <!-- Damn Firefox doesn't set the title properly when running tabbed, just
          uses "firefox-bin". So we try both cases. -->
-    <getapp label="f: Firefox" title='[fF]irefox' command='firefox' />
-    <getapp label="g: Gkrellm" title="gkrellm" />
-    <getapp label="l: LyX" title='LyX' command='lyx' />
-    <getapp label="o: OpenOffice" title='OpenOffice.org' command='openoffice.org' />
-    <getapp label="s: Sunbird" title='Sunbird' command='sunbird' />
-    <getapp label="v: VNC" title='TightVNC' command='vncviewer' />
-    <run label="w w3m" command="/home/mwm/bin/w3m" />
-    <getapp label="x: XClipboard" title='xclipboard' />
+    <getapp label="f: Firefox" title="[fF]irefox" command="firefox"/>
+    <getapp label="g: Gkrellm" title="gkrellm"/>
+    <getapp label="l: LyX" title="LyX" command="lyx"/>
+    <getapp label="o: OpenOffice" title="OpenOffice.org" command="openoffice.org"/>
+    <getapp label="s: Sunbird" title="Sunbird" command="sunbird"/>
+    <getapp label="v: VNC" title="TightVNC" command="vncviewer"/>
+    <run label="w w3m" command="/home/mwm/bin/w3m"/>
+    <getapp label="x: XClipboard" title="xclipboard"/>
   </namemenu>
   <itunesmenu>
-    <itunes label="1: Pause" command="pause" />
-    <itunes label="2: Play" command="play" />
-    <itunes label="3: Stop" command="stop" />
+    <itunes label="1: Pause" command="pause"/>
+    <itunes label="2: Play" command="play"/>
+    <itunes label="3: Stop" command="stop"/>
   </itunesmenu>
-  <xi:include href=".websearches.xml" />
+  <websearches>
+    <search label="Amazon" shortcut="a" url="http://www.amazon.com/exec/obidos/search-handle-url/index=blended;field-keywords=%s"/>
+    <search label="Code" shortcut="c" url="http://www.google.com/codesearch?q=%s"/>
+    <search label="Dictionary" shortcut="d" url="http://www.webster.com/cgi-bin/dictionary?book=Dictionary&amp;va=%s"/>
+    <search label="Google" shortcut="g" url="http://www.google.com/search?q=%s&amp;hl=en&amp;safe=off"/>
+    <search label="IMDB" shortcut="i" url="http://www.imdb.com/find?tt=on&amp;nm=on&amp;mx=20&amp;q=%s"/>
+    <search label="Images" shortcut="I" images="1" url="http://images.google.com/images?q=%s&amp;ie=ISO-8859-1&amp;oe=ISO-8859-1&amp;imgsz=xxlarge&amp;safe=o"/>
+    <search label="Jargon" shortcut="j" url="http://www.google.com/search?as_q=%s&amp;as_sitesearch=www.catb.org&amp;btnI=I%27m+feeling+lucky"/>
+    <search label="Netflix" shortcut="n" url="http://www.netflix.com/Search?v1=%s"/>
+    <search label="Python documentation" shortcut="p" url="http://starship.python.net/crew/theller/pyhelp.cgi?keyword=%s&amp;version=current"/>
+    <search label="Python cookbook" shortcut="P" url="http://aspn.activestate.com/ASPN/search?query=%s&amp;section=PYTHONCKBK&amp;type=Subsection&amp;x=13&amp;y=3"/>
+    <search label="Quotes" shortcut="q" url="http://en.wikiquote.org/w/index.php?title=Special%%3ASearch&amp;search=%s&amp;fulltext=Search"/>
+    <search label="TV" shortcut="t" url="http://www.tv.com/search.php?type=11&amp;stype=all&amp;qs=%s&amp;x=0&amp;y=0"/>
+    <search label="Thesaurs" shortcut="T" url="http://www.webster.com/cgi-bin/thesaurus?book=Thesaurus&amp;va=%s"/>
+    <search label="Wikipedia" shortcut="w" url="http://en.wikipedia.org/wiki/Special:Search?search=%s&amp;go=Go"/>
+    <search label="Wiktionary" shortcut="W" url="http://en.wiktionary.org/wiki/Special:Search?search=%s&amp;go=Go"/>
+  </websearches>
+  <paneconfigmenus>
+    <paneconfig label="0: Working">
+      <vertical fraction=".545454"/>
+      <vertical fraction=".5"/>
+      <horizontal fraction=".06"/>
+      <vertical fraction=".75"/>
+      <horizontal fraction=".06"/>
+      <horizontal fraction=".45"/>
+      <newpane pane="4"/>
+      <horizontal fraction=".42"/>
+      <horizontal fraction=".5"/>
+      <goto number="2"/>
+      <number number="0"/>
+      <goto number="4"/>
+      <number number="1"/>
+      <goto number="8"/>
+      <number number="2"/>
+      <goto number="7"/>
+      <number number="3"/>
+      <goto number="7"/>
+      <number number="4"/>
+      <goto number="8"/>
+      <number number="5"/>
+      <goto number="8"/>
+      <number number="7"/>
+      <newpane pane="8"/>
+      <vertical fraction=".5"/>
+    </paneconfig>
+    <paneconfig label="1: Big right">
+      <vertical fraction=".545454"/>
+      <vertical fraction=".5"/>
+      <horizontal fraction=".06"/>
+      <vertical fraction=".75"/>
+      <horizontal fraction=".06"/>
+      <horizontal fraction=".45"/>
+      <newpane pane="4"/>
+      <horizontal fraction=".42"/>
+      <horizontal fraction=".5"/>
+      <goto number="2"/>
+      <number number="0"/>
+      <goto number="4"/>
+      <number number="1"/>
+      <goto number="8"/>
+      <number number="2"/>
+      <goto number="7"/>
+      <number number="3"/>
+      <goto number="7"/>
+      <number number="4"/>
+      <goto number="8"/>
+      <number number="5"/>
+      <goto number="8"/>
+      <number number="7"/>
+      <newpane pane="7"/>
+      <vertical fraction=".5"/>
+    </paneconfig>
+    <paneconfig label="2: Screens">
+      <vertical fraction=".545454"/>
+    </paneconfig>
+  </paneconfigmenus>
 </plpwm>
-
-