Changeset 193

Timestamp:

07/14/2007 02:38:13 AM (18 months ago)

Author:

mwm

Message:

keys.py: Add allmap to map all printable latin1 keys to a single method.

input.py: Replace initial value hack with history mechanism (mostly)
from Mike O'Connor <stew@…>, and have it use keys.allmap. Also
fix bug in focus loss when menu entries cause a window to open.

menu.py: take advantage of allmap, and add new menuhandler
MenuCharSelectHandler? that selects a menu entry when you hit its key,
as opposed to just going to it. Also some tweaks for xinerama systems.

pane_utilies.py: Make menus work reasonably with more than 26 items,
most notably handling upper-case characters now. Allow the codemenu
class to be invoked without labels, in which case it will construct
them from it's own methods. Add view_menu, which is the view part of
an MVC pattern for menus. See the new xmlcontrol.py for an example of
a corresponding controller object. Remove the editHandler argument to
websearch - we need to use the window arguments edithandler(!). Fix
bug in splitpane where it was using an undefined variable.

examples/plpwm: take advantage of all those nice new tools to
reogranize the key controls, and move the menu configuration into an
external xml config file.

Location:

trunk

Files:

• examples/plpwm.py (modified) (13 diffs)
• examples/xmlcontrol.py (added)
• plwm/input.py (modified) (9 diffs)
• plwm/keys.py (modified) (4 diffs)
• plwm/menu.py (modified) (8 diffs)
• plwm/pane_utilities.py (modified) (8 diffs)

trunk/examples/plpwm.py

@@ -1 +1 @@
 #!/usr/bin/env python
-# $Id: plpwm.py,v 1.42 2006-09-15 06:06:26 mwm Exp $
+# $Id: plpwm.py,v 1.43 2007-07-14 07:38:12 mwm Exp $
 #
 # plpwm.py -- Example PLWM window manager configuration with panes.
@@ -30 +30 @@
 ###END SETUP PATH
 
+from time import sleep
+    
 from Xlib import X, XK
 
@@ -37 +39 @@
 from plwm.pane_utilities import appmenu, codemenu, windowmenu, panesmenu, \
      runcommand, splitpane, numberpane, pullwindow, gotowindow, websearch, \
-     split_pane, getapp
-
-
-class MyMenuHandler(menu.MenuCharHandler):
+     split_pane, getapp, view_menu
+
+from xmlcontrol import XML_controller, load_menus
+
+class MyMenuHandler(menu.MenuCharSelecter):
     Any_Escape = C_g = menu.MenuKeyHandler._abort
     Any_Return = menu.MenuKeyHandler._do
@@ -50 +53 @@
     Any_Escape = C_g = input.InputKeyHandler._abort
     Any_Return = input.InputKeyHandler._done
-    Any_BackSpace = C_h = input.InputKeyHandler._delback
+    Any_Delete = Any_BackSpace = C_h = input.InputKeyHandler._delback
     C_d = input.InputKeyHandler._delforw
     C_b = input.InputKeyHandler._back
@@ -58 +61 @@
     C_e = input.InputKeyHandler._end
     C_y = input.InputKeyHandler._paste
+    c_p = input.InputKeyHandler._history_up
+    c_n = input.InputKeyHandler._history_down
 
 
@@ -96 +101 @@
     client_class = MyClient
     screen_class = MyScreen
-    panes_maxsize_gravity = X.NorthGravity
+    panes_maxsize_gravity = X.NorthWestGravity
 
 
@@ -113 +118 @@
     "The pane control keys."
 
+    menu_file = os.path.expanduser('~/.plpwmrc.xml')
+
+    def __init__(my, obj):
+        keys.KeyHandler.__init__(my, obj)
+        my.menus = load_menus(my.menu_file)
+
     # Commands for navigating and manipulating panes
     def C_0(my, event):
@@ -121 +132 @@
     C_1 = C_2 = C_3 = C_4 = C_5 = C_6 = C_7 = C_8 = C_9 = C_0
 
-    def M4_Tab(my, event): my.wm.panes_next()
-    def S_M4_Tab(my, event): my.wm.panes_prev()
-
-    def M4_0(my, event):
+    def M1_Tab(my, event): my.wm.panes_next()
+    def S_M1_Tab(my, event): my.wm.panes_prev()
+
+    def M1_0(my, event):
         pane = my.wm.panes_list[my.wm.panes_current]
         splitpane(pane, pane.horizontal_split, paneWindow)
 
-    def S_M4_0(my, event):
+    def S_M1_0(my, event):
         pane = my.wm.panes_list[my.wm.panes_current]
         splitpane(pane, pane.vertical_split, paneWindow)
 
-    def M4_1(my, event):
+    def M1_1(my, event):
         my.wm.panes_list[my.wm.panes_current].maximize()
 
-    def M4_2(my, event):
+    def M1_2(my, event):
         split_pane(my.wm.display.keycode_to_keysym(event.detail, 0) - XK.XK_0,
                    my.wm.panes_list[my.wm.panes_current].horizontal_split)
 
-    M4_3 = M4_4 = M4_5 = M4_6 = M4_7 = M4_8 = M4_9 = M4_2
-
-    def S_M4_2(my, event):
+    M1_3 = M1_4 = M1_5 = M1_6 = M1_7 = M1_8 = M1_9 = M1_2
+
+    def S_M1_2(my, event):
         split_pane(my.wm.display.keycode_to_keysym(event.detail, 0) - XK.XK_0,
                    my.wm.panes_list[my.wm.panes_current].vertical_split)
 
-    S_M4_3 = S_M4_4 = S_M4_5 = S_M4_6 = S_M4_7 = S_M4_8 = S_M4_9 = S_M4_2
+    S_M1_3 = S_M1_4 = S_M1_5 = S_M1_6 = S_M1_7 = S_M1_8 = S_M1_9 = S_M1_2
  
-    # Keystrokes for launching applications
-    def M4_exclam(my, event):
+    def M1_exclam(my, event):
         runcommand(my.wm.panes_list[my.wm.panes_current], paneWindow)
 
-    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):
-        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):
-        my.wm.panes_goto(0)     # always run emacs in pane 0.
-        getapp(my.wm.panes_list[my.wm.panes_current], "emacs", "xemacs")
-
-    def M4_f(my, event):
-        # Damn Firefox doesn't set the title properly when running tabbed,
-        # 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):
-        websearch(my.wm.panes_list[my.wm.panes_current], MyEditHandler,
-                  "Google", paneWindow,
-                  'http://www.google.com/search?q=%s&hl=en&safe=off')
-
-    def M4_G(my, event):
-        getapp(my.wm.panes_list[my.wm.panes_current],
-               "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):
-        websearch(my.wm.panes_list[my.wm.panes_current], MyEditHandler,
-                  "IMDB", paneWindow,
-                  "http://www.imdb.com/find?tt=on;nm=on;mx=20;q=%s")
-
-    def M4_I(my, event):
-        def dillo(url):
-            assert "'" not in 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&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_o(my, event):
-        getapp(my.wm.panes_list[my.wm.panes_current], 'OpenOffice.org',
-               'openoffice.org')
-    M4_n = M4_o         # Mac compatability (Neooffice vs. Opera)
-
-    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,
-                  "http://www.webster.com/cgi-bin/thesaurus?book=Thesaurus&va=%s")
-
-    def M4_w(my, event):
-        websearch(my.wm.panes_list[my.wm.panes_current], MyEditHandler,
-                  "Wikipedia Dictionary", paneWindow,
-                  "http://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go")
-
-    # Keystrokes for window manager operations
-    def M4_equal(my, event):
+    def M1_equal(my, event):
         numberpane(my.wm.panes_list[my.wm.panes_current], paneWindow)
 
-    def M4_quoteright(my, event):
+    def M1_minus(my, event):
+        """Close all the internal windows. Untested"""
+
+        for s in my.wm.screens:
+            for w in s.windows:
+                if my.wm.is_internal_window(w):
+                    w.destroy()
+
+    def M1_quoteright(my, event):
         pullwindow(my.wm.panes_list[my.wm.panes_current], paneWindow)
 
-    def M4_quotedbl(my, event):
+    def M1_quotedbl(my, event):
         gotowindow(my.wm.panes_list[my.wm.panes_current], screenWindow)
 
-    def M4_space(my, event):
+    def M1_space(my, event):
         my.wm.panes_list[my.wm.panes_current].prev_window()
 
-    def S_M4_space(my, event):
+    def S_M1_space(my, event):
         my.wm.panes_list[my.wm.panes_current].next_window()
 
-    def M4_k(my, event):
+    def _getapp(my, node):
+        getapp(my.wm.panes_list[my.wm.panes_current], node.get('title'),
+               node.get('command'))
+
+    def M1_a(my, event):
+        view_menu(my.wm.panes_list[my.wm.panes_current],
+                  XML_controller(my.menus.find('functionmenu'),
+                                 dict(getapp=my._getapp)))
+
+    def M1_A(my, event):
+        def run(node): my.wm.system('%s &' % node.get('command'))
+        view_menu(my.wm.panes_list[my.wm.panes_current],
+                  XML_controller(my.menus.find('namemenu'),
+                                 dict(getapp=my._getapp, run=run)))
+
+    def M1_c(my, event):
         my.wm.panes_list[my.wm.panes_current].window.delete(1)
 
-    def S_M4_k(my, event):
+    def M1_l(my, event):
+        my.wm.system('xscreensaver-command -activate')
+
+    def M1_i(my, event):
+        windowmenu(my.wm.panes_list[my.wm.panes_current], cfilter.iconified)
+
+    def M1_I(my, event):
+        my.wm.inspect_enable()
+        my.wm.system('xterm -title Inspector -e inspect_plwm &')
+
+    def M1_k(my, event):
         my.wm.panes_list[my.wm.panes_current].window.destroy()
 
-    def M4_m(my, event):
-        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,)),
-                  "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):
-        my.wm.panes_list[my.wm.panes_current].iconify_window()
-
-
-class MenuKeys(keys.KeyGrabKeyboard):
-    "Menus, with a timeout."
-
-    def a(my, event):
-        appmenu(my.wm.panes_list[my.wm.panes_current],
-                {'clipboard': 'xclipboard',
-                 'fxtv': 'fxtv',
-                 'w3m': 'w3m',
-                 'skipstone': 'skipstone'})
-        my._cleanup()
-
-    def A(my, event):
-        appmenu(my.wm.panes_list[my.wm.panes_current],
-                {'mixer': 'xgmixer',
-                 'console': 'xconsole -daemon',
-                 'gkrellm': 'gkrellm',
-                 'xterm': 'xterm -ls'})
-        my._cleanup()
-
-    def b(my, event):
-        windowmenu(my.wm.panes_list[my.wm.panes_current])
-        my._cleanup()
-
-    def c(my, event):
+    def M1_m(my, event):
+        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'),
+                                 dict(itunes=itunes)))
+
+    def M1_n(my, event):
         pane = my.wm.panes_list[my.wm.panes_current]
         width, height = pane.screen.message_make("Current pane %d" % \
@@ -349 +227 @@
         pane.screen.message_display((pane.width - width) / 2 + pane.x,
                                    (pane.height - height) / 2 + pane.y)
-        my._cleanup()
-
-    def i(my, event):
-        windowmenu(my.wm.panes_list[my.wm.panes_current], cfilter.iconified)
-        my._cleanup()
-
-    def m(my, event):
-        def inspect(wm):
-            wm.inspect_enable()
-            wm.system('xterm -title Inspector -e inspect_plwm &')
+
+    def M1_p(my, event):
+        panesmenu(my.wm.current_screen)
+
+    def M1_r(my, event):
+        my.wm.panes_list[my.wm.panes_current].force_window()
+
+    def M1_R(my, event):
+        def reload_menus():
+            my.menus = load_menus(my.menu_file)
 
         codemenu(my.wm.panes_list[my.wm.panes_current],
-                   {'inspect': (inspect, (my.wm,)),
-                    'save': (my.wm.panes_save, ()),
-                    'restore': (restore, (my.wm,))})
-        my._cleanup()
-
-    def p(my, event):
-        panesmenu(my.wm.current_screen)
-        my._cleanup()
-
-    def w(my, event):
+                 {'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 M1_s(my, event):
+        def dillo(url):
+            my.wm.system("dillo '%s' &" % url)
+ 
+        def dowebsearch(node):
+            if node.get('images'):
+                websearch(pane, node.get('label'), paneWindow, node.get('url'), dillo)
+            else:
+                websearch(pane, node.get('label'), paneWindow, node.get('url'))
+
+        pane = my.wm.panes_list[my.wm.panes_current]
+        menu = XML_controller(my.menus.find('websearches'), dict(search=dowebsearch))
+        add_keys(menu)
+        view_menu(pane, menu)
+
+    def M1_S(my, event):
+        my.wm.panes_save()
+        pane = my.wm.panes_list[my.wm.panes_current]
+        width, height = pane.screen.message_make("Saved panes configuration")
+        pane.screen.message_display((pane.screen.root_width - width)
+                                     / 2 + pane.screen.root_x,
+                                    (pane.screen.root_height - height)
+                                     / 2 + pane.screen.root_y)
+
+    def M1_w(my, event):
+        windowmenu(my.wm.panes_list[my.wm.panes_current])
+
+    def M1_W(my, event):
         pane = my.wm.panes_list[my.wm.panes_current]
         windowmenu(pane, panes.panefilter(pane))
-        my._cleanup()
-
-    def W(my, event):
-        windowmenu(my.wm.panes_list[my.wm.panes_current],
-                   lambda w: not (w.panes_pane and w.panes_pane.window == w))
-        my._cleanup()
-
-    def M4_m(my, event):
-        codemenu(my.wm.panes_list[my.wm.panes_current],
-                 {"applications (a)": (my.a, (event,)),
-                  "startup apps (A)": (my.A, (event,)),
-                  "all windows (b)": (my.b, (event,)),
-                  "current pane (c)": (my.c, (event,)),
-                  "iconfified (i)": (my.i, (event,)),
-                  "manager ops (m)": (my.m, (event,)),
-                  "panes (p)": (my.p, (event,)),
-                  "open in pane (w)": (my.w, (event,)),
-                  "all in pane (W)": (my.W, (event,))})
-        my._cleanup()
-
-    C_g = Any_Escape = keys.KeyGrabKeyboard._timeout
-    
+
+    def M1_x(my, event):
+        my.wm.panes_list[my.wm.panes_current].iconify_window()
+
+
+def add_keys(menu):
+    """Add shortcuts keys to the menu."""
+
+    for label in menu.keys():
+        node = menu[label]
+        key = node.get('shortcut')
+        if key:
+            nl = '%s: %s' % (key, label)
+            menu[nl] = menu[label]
+            del menu[label]
+
 
 def restore(wm):
@@ -401 +298 @@
     pane = wm.panes_list[0]
     pane.maximize()
-    wm.panes_list[1].maximize()
-
+        
     # Disconnect all windows from panes to avoid displaying everything
     # that's about to happen. wm.panes_restore() will put things back.
@@ -408 +304 @@
         c.panes_pane = None
 
-    # Disconnect the two remaining panes from their windows as well.
+    # Disconnect any remaining panes from their windows as well.
     pane.window = None
-    wm.panes_list[1].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
@@ -416 +315 @@
     pane.horizontal_split(.06)
     pane.vertical_split(.75)
-    pane.horizontal_split(.37)
-    pane.horizontal_split(.77)
+    pane.horizontal_split(.06)
+    pane.horizontal_split(.45)
     pane = wm.panes_list[4]
     pane.horizontal_split(.42)
@@ -435 +334 @@
     wm.panes_goto(8)
     wm.panes_number(5)
-    #wm.panes_goto(6)
-    #wm.panes_number(6)
     wm.panes_goto(8)
     wm.panes_number(7)
     
     # Set up the second screen
-    wm.panes_list[8].vertical_split()
+    #wm.panes_list[7].vertical_split()
 
     # And make the world sane

trunk/plwm/input.py

@@ -23 +23 @@
 
 from Xlib import X, Xatom
-from Xlib.keysymdef import latin1
-from keys import KeyGrabKeyboard
+from keys import KeyGrabKeyboard, allmap
 from wmanager import Window
 
@@ -48 +47 @@
     _done - run action on the current string
 
-    _abort - exit without doing anything"""
+    _abort - exit without doing anything
+
+    _history_up - scroll to newer events
+
+    _history_down - scroll to older events"""
 
     timeout = None
 
-    def __init__(my, handler, display, initial=''):
+    def __init__(my, handler, display, history):
         """Init with a handler and display.
 
         handler is a handler object appropriate for KeyGrabKeyboard.
         display has show(left, right), do(string) and abort() methods.
-            both abort() and do() should clean up the object."""
+            both abort() and do() should clean up the object.
+        history is a list of strings we let the user scroll through."""
 
         KeyGrabKeyboard.__init__(my, handler, X.CurrentTime)
         my.display = display
         my.handler = handler
+        my.history = history
+        my.history_index = len(history)
         my.left = ""
-        my.right = initial
+        my.right = ""
         if isinstance(handler, Window):
             my.selection = my.wm.display.intern_atom("SELECTION")
@@ -127 +133 @@
 
     def _done(my, event):
-        my.display.do(my.left + my.right)
+        res = my.left + my.right
+        my.history.append(res)
+        my.display.do(res)
         my.wm.dispatch.remove_handler(my)
         my._cleanup()
@@ -136 +144 @@
         my._cleanup()
 
-for c in dir(latin1):
-    if len(c) > 3 and c[:3] == 'XK_':
-        setattr(InputKeyHandler, c[3:], InputKeyHandler._insert)
-
+    def _history_up(my, event):
+        if len(my.history):
+            if my.history_index > 0:
+                my.history_index -= 1
+                my.left = my.history[my.history_index]
+                my.right = ""
+                my.display.show(my.left, my.right)
+
+    def _history_down(my, event):
+        if len(my.history):
+            if my.history_index <(len(my.history)-1):
+                my.history_index += 1
+                my.left = my.history[my.history_index]
+                my.right = ""
+                my.display.show(my.left, my.right)
+
+allmap(InputKeyHandler, InputKeyHandler._insert)
 
 class inputWindow:
@@ -149 +170 @@
     borderwidth = 3
     bordercolor = "black"
-
-    def __init__(my, prompt, screen, length = 30):
+    history = []
+
+    def __init__(my, prompt, screen, length=30):
 
         if not prompt: prompt = ' '     # We have problems if there's no prompt, so add one.
@@ -184 +206 @@
         my.window.dispatch.add_handler(X.Expose, my.redraw)
 
-    def read(my, action, handlertype, x = 0, y = 0, initial=''):
+    def read(my, action, handlertype, x=0, y=0):
         "Open the window at x, y, using handlertype, and doing action."
 
@@ -191 +213 @@
         my.window.configure(x = x, y = y, width = width, height = height)
         my.window.map()
-        handlertype(my.window, my, initial)
+        my.window.get_focus(X.CurrentTime)
+        handlertype(my.window, my, my.history)
 
     def raisewindow(my, event):
@@ -237 +260 @@
     "Class to get input via the modewindow."
 
+    history = []
+
     def __init__(my, prompt, screen, length = None):
         # ignore length argument
@@ -245 +270 @@
         my.action = action
         my.status_msg = my.screen.modestatus_new(my.prompt + "_")
-        handlertype(my.screen.modewindow_mw.window, my)
+        handlertype(my.screen.modewindow_mw.window, my, my.history)
 
     def show(my, left, right):

trunk/plwm/keys.py

@@ -1 @@
-# $Id: keys.py,v 1.9 2005-08-10 13:30:37 mwm Exp $
+# $Id: keys.py,v 1.10 2007-07-14 07:38:13 mwm Exp $
 #
 # keys.py -- Base keypress handlers
@@ -20 +20 @@
 
 from Xlib import X, XK
+from Xlib.keysymdef import latin1
 import string
 import wmanager
@@ -142 +143 @@
             
         
-        wmanager.debug('mem', 'Initing keyhandler %s', self)
+&n