Changeset 188

Timestamp:

07/19/2006 05:16:47 PM (2 years ago)

Author:

mwm

Message:

Update my exaple file. Fixes to the input and pane_utilities for dealing with lots of windows in an input menu.

Location:

trunk

Files:

• examples/plpwm.py (modified) (12 diffs)
• plwm/input.py (modified) (4 diffs)
• plwm/pane_utilities.py (modified) (5 diffs)

trunk/examples/plpwm.py

@@ -1 +1 @@
 #!/usr/bin/env python
-# $Id: plpwm.py,v 1.40 2005-09-08 00:18:03 mwm Exp $
+# $Id: plpwm.py,v 1.41 2006-07-19 22:16:47 mwm Exp $
 #
 # plpwm.py -- Example PLWM window manager configuration with panes.
@@ -96 +96 @@
     client_class = MyClient
     screen_class = MyScreen
+    panes_maxsize_gravity = X.NorthGravity
 
 
@@ -113 +114 @@
 
     # Commands for navigating and manipulating panes
-    def M4_Escape(my, event): my.wm.quit()
-
     def C_0(my, event):
         "Go to the pane numbered by the keycode."
@@ -127 +126 @@
     def M4_0(my, event):
         pane = my.wm.panes_list[my.wm.panes_current]
-        splitpane(pane, pane.horizontal_split)
+        splitpane(pane, pane.horizontal_split, paneWindow)
 
     def S_M4_0(my, event):
@@ -152 +151 @@
         runcommand(my.wm.panes_list[my.wm.panes_current], paneWindow)
 
+    def M4_a(my, event):
+        getapp(my.wm.panes_list[my.wm.panes_current],
+               ".aw", "applix -wp")
+
     def M4_b(my, event):
         getapp(my.wm.panes_list[my.wm.panes_current], "w3m")
 
+    def M4_B(my, event):
+        websearch(my.wm.panes_list[my.wm.panes_current], MyEditHandler,
+                  "Amazon", paneWindow,
+                  'http://www.amazon.com/exec/obidos/search-handle-url/index=blended&field-keywords=%s')
+
     def M4_c(my, event):
+        getapp(my.wm.panes_list[my.wm.panes_current], 'Sunbird', 'sunbird')
+
+    def M4_C(my, event):
         getapp(my.wm.panes_list[my.wm.panes_current], "xclipboard")
 
     def M4_d(my, event):
-        websearch(my.wm.panes_list[my.wm.panes_current], MyEditHandler,
-                  "Google Directory", paneWindow,
-                  "http://www.google.com/search?q=%s&it=ISO-8859-1&oe=ISO-8859-1&cat=gwd%%2FTop")
+        getapp(my.wm.panes_list[my.wm.panes_current], 'Dillo', 'dillo')
+
+    def M4_D(my, event):
+        websearch(my.wm.panes_list[my.wm.panes_current], MyEditHandler,
+                  "Webster Dictionary", paneWindow,
+                  "http://www.webster.com/cgi-bin/dictionary?book=Dictionary&va=%s")
 
     def M4_e(my, event):
@@ -169 +183 @@
     def M4_f(my, event):
         # Damn Firefox doesn't set the title properly when running tabbed,
-        # just uses "firefox-bin". So we chop the leading F off.
-        getapp(my.wm.panes_list[my.wm.panes_current], "irefox", "firefox")
+        # just uses "firefox-bin". So we try both cases.
+        getapp(my.wm.panes_list[my.wm.panes_current], "[fF]irefox", "firefox")
 
     def M4_g(my, event):
@@ -179 +193 @@
     def M4_G(my, event):
         getapp(my.wm.panes_list[my.wm.panes_current],
-               "GnuCash", "gnucash")
+               "Accounts", "gnucash")
+
+    def M4_j(my, event):
+        websearch(my.wm.panes_list[my.wm.panes_current], MyEditHandler,
+                  "Jargon file", paneWindow,
+                  "http://www.google.com/search?as_q=%s&as_sitesearch=www.catb.org&btnG=Google+Search")
 
     def M4_i(my, event):
@@ -187 +206 @@
 
     def M4_I(my, event):
-        def firefox(url):
+        def dillo(url):
             assert "'" not in url
-            my.wm.system("firefox '%s' &" % url)
+            my.wm.system("dillo '%s' &" % url)
 
         websearch(my.wm.panes_list[my.wm.panes_current], MyEditHandler,
                   "Google Images", paneWindow,
-                  'http://images.google.com/images?q=%s&ie=ISO-8859-1&oe=ISO-8859-1',
-                  firefox)
-
-    def M4_I(my, event):
-        getapp(my.wm.panes_list[my.wm.panes_current],
-               "/home/mwm/axhome/axMail/Inbox.sp", "applix -inbox")
-
-    def M4_j(my, event):
-        getapp(my.wm.panes_list[my.wm.panes_current], "J-Pilot", "jpilot")
+                  'http://images.google.com/images?q=%s&ie=ISO-8859-1&oe=ISO-8859-1&imgsz=xxlarge&safe=off',
+                  dillo)
+
+    def M4_l(my, event):
+        getapp(my.wm.panes_list[my.wm.panes_current], 'LyX', 'lyx')
+
+    def M4_M(my, event):
+        getapp(my.wm.panes_list[my.wm.panes_current], 'Mozilla[^ ]', 'mozilla')
+
+    def M4_p(my, event):
+        websearch(my.wm.panes_list[my.wm.panes_current], MyEditHandler,
+                  "Python Cookbook", paneWindow,
+                  "http://aspn.activestate.com/ASPN/search?query=%s&section=PYTHONCKBK&type=Subsection&x=13&y=3")
+
+    def M4_P(my, event):
+        websearch(my.wm.panes_list[my.wm.panes_current], MyEditHandler,
+                  "Python Documentation", paneWindow,
+                  'http://starship.python.net/crew/theller/pyhelp.cgi?keyword=%s&version=current')
+
+    M4_S = M4_c         # Sunbird, to match the Mac 
 
     def M4_t(my, event):
+        websearch(my.wm.panes_list[my.wm.panes_current], MyEditHandler,
+                  "TV Tome Search", paneWindow,
+                  "http://www.tv.com/search.php?type=11&stype=all&qs=%s&x=0&y=0")
+
+    def M4_T(my, event):
         websearch(my.wm.panes_list[my.wm.panes_current], MyEditHandler,
                   "Webster Thesaurus", paneWindow,
@@ -210 +245 @@
     def M4_w(my, event):
         websearch(my.wm.panes_list[my.wm.panes_current], MyEditHandler,
-                  "Webster Dictionary", paneWindow,
-                  "http://www.webster.com/cgi-bin/dictionary?book=Dictionary&va=%s")
+                  "Wikipedia Dictionary", paneWindow,
+                  "http://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go")
 
     # Keystrokes for window manager operations
@@ -238 +273 @@
         MenuKeys(my.wm, event.time)
 
+    def M4_M(my, event):
+        def nop():
+            pass
+
+        codemenu(my.wm.panes_list[my.wm.panes_current],
+                 {"Next pane (tab)": (my.M4_Tab, (event,)),
+                  "Previous pane (shift tab)": (my.S_M4_Tab, (event,)),
+                  "Maximize (1)": (my.M4_1, (event,)),
+                  "Command (!)": (my.M4_exclam, (event,)),
+                  "Applix Mail (a)": (my.M4_a, (event,)),
+                  "Browser (b)": (my.M4_b, (event,)),
+                  "Clipboard (c)": (my.M4_c, (event,)),
+                  "Directory search (d)": (my.M4_d, (event,)),
+                  "Emacs (e)": (my.M4_e, (event,)),
+                  "Firefox (f)": (my.M4_f, (event,)),
+                  "Scroogle search (g)": (my.M4_g, (event,)),
+                  "Gnucash (G)": (my.M4_G, (event,)),
+                  "Image search (I)": (my.M4_I, (event,)),
+                  "IMDB search (i)": (my.M4_i, (event,)),
+                  "J-Pilot (j)": (my.M4_j, (event,)),
+                  "Thesaurus search (t)": (my.M4_t, (event,)),
+                  "Webster search (w)": (my.M4_w, (event,)),
+                  "Pane renumber (=)": (my.M4_equal, (event,)),
+                  "Pull window (')": (my.M4_quoteright, (event,)),
+                  'Goto window (")': (my.M4_quotedbl, (event,)),
+                  "Next window (shift space)": (my.M4_space, (event,)),
+                  "Previous Window (space)": (my.S_M4_space, (event,)),
+                  "Close window (k)": (my.M4_k, (event,)),
+                  "Kill window (K)": (my.S_M4_k, (event,)),
+                  "Menus (m)": (my.M4_m, (event,)),
+                  "This menu (M)": (nop, ()),
+                  "Quit (Q)": (my.M4_Q, (event,)),
+                  "Force window resize (r)": (my.M4_r, (event,)),
+                  "Iconify window (x)": (my.M4_x, (event,))})
+
+    def M4_Q(my, event): my.wm.quit()
+
     def M4_r(my, event):
         my.wm.panes_list[my.wm.panes_current].force_window()
+
+    def M4_v(my, event):
+        getapp(my.wm.panes_list[my.wm.panes_current], "TightVNC", "vncviewer")
 
     def M4_x(my, event):
@@ -321 +396 @@
         my._cleanup()
 
-    Any_g = Any_Escape = keys.KeyGrabKeyboard._timeout
+    C_g = Any_Escape = keys.KeyGrabKeyboard._timeout
     
 
@@ -374 +449 @@
     wm.panes_number(4)
     pane = wm.panes_list[5]
-    pane.horizontal_split(16. / 45.)
-    pane.horizontal_split(24. / 29.)
+    pane.horizontal_split(25. / 29.)
     wm.panes_number(6)
+
+    # 524 bhuda 362 student 921 total
+    pane = wm.panes_list[6]
+    pane.horizontal_split(.43)
+    #wm.panes_number(7)
     wm.panes_goto(0)
     wm.panes_restore()

trunk/plwm/input.py

@@ -52 +52 @@
     timeout = None
 
-    def __init__(my, handler, display):
+    def __init__(my, handler, display, initial=''):
         """Init with a handler and display.
 
@@ -63 +63 @@
         my.handler = handler
         my.left = ""
-        my.right = ""
+        my.right = initial
         if isinstance(handler, Window):
             my.selection = my.wm.display.intern_atom("SELECTION")
@@ -184 +184 @@
         my.window.dispatch.add_handler(X.Expose, my.redraw)
 
-    def read(my, action, handlertype, x = 0, y = 0):
+    def read(my, action, handlertype, x = 0, y = 0, initial=''):
         "Open the window at x, y, using handlertype, and doing action."
 
@@ -191 +191 @@
         my.window.configure(x = x, y = y, width = width, height = height)
         my.window.map()
-        handlertype(my.window, my)
+        handlertype(my.window, my, initial)
 
     def raisewindow(my, event):

trunk/plwm/pane_utilities.py

@@ -1 +1 @@
 #!/usr/bin/env python
-# $Id: pane_utilities.py,v 1.3 2005-08-10 13:30:38 mwm Exp $
+# $Id: pane_utilities.py,v 1.4 2006-07-19 22:16:47 mwm Exp $
 #
 # pane_utilities.py -- Utility clases and functions for use with panes
@@ -65 +65 @@
 
 
-
 class windowmenu:
     "Create a menu of windows to add to a pane."
 
-    def __init__(my, pane, filter = cfilter.true, list = None):
+    def __init__(my, pane, filter = cfilter.true, startlist = None):
         labels = []
         clients = {}
+        clientlist = startlist or pane.screen.query_clients(filter, 1)
+        clientlist.sort(key=lambda c: c.get_title().lower())
         i = 'a'
-        for c in list or pane.screen.query_clients(filter, 1):
+        # We really need to deal with window lists longer than 26.
+        for c in clientlist:
             l = "%c: %s" % (i, c.get_title())
             labels.append(l)
@@ -124 +126 @@
     "Launch a browser with a web search from the user."
 
+    previous = ''
+
     def __init__(my, pane, editHandler, name, winclass, format, browser = None):
         my.format = format
         my.browser = browser
         my.pane = pane
-        window = winclass("Search %s: " % name, pane.screen, length = 50)
-        window.read(my, editHandler, pane.x, pane.y)
+        window = winclass("Search %s: " % name, pane.screen, length=50)
+        window.read(my, editHandler, pane.x, pane.y, websearch.previous)
 
     def __call__(my, string):
+        websearch.previous = string
         query = my.format % quote(string)
         if my.browser:
@@ -190 +195 @@
         clients = my.pane.screen.query_clients(cfilter.re_title(name + ".*"), 1)
         if len(clients) == 1: my.pane.add_window(clients[0])
-        elif clients: windowmenu(my.pane, list = clients)
+        elif clients: windowmenu(my.pane, startlist = clients)
         else:
             width, height = my.pane.screen.message_make("No windows")
@@ -229 +234 @@
 
     clients = pane.screen.query_clients(cfilter.re_title(".*%s.*" % name), 1)
-    if len(clients) > 1: windowmenu(pane, list = clients)
+    if len(clients) > 1: windowmenu(pane, startlist = clients)
     elif clients: pane.add_window(clients[0])
     else: pane.screen.system((command or name) + " &")