Changeset 178

Timestamp:

08/06/2005 11:22:18 PM (3 years ago)

Author:

mwm

Message:

Turn the refernces to what used to be globals in plpwm.py in pane_utilities.py to
arguments.

Teak the plpwm.py key bindings slightly.

Location:

trunk

Files:

• examples/plpwm.py (modified) (6 diffs)
• plwm/pane_utilities.py (modified) (6 diffs)

trunk/examples/plpwm.py

@@ -1 +1 @@
 #!/usr/bin/env python
-# $Id: plpwm.py,v 1.37 2005-08-07 03:18:52 mwm Exp $
+# $Id: plpwm.py,v 1.38 2005-08-07 04:22:18 mwm Exp $
 #
 # plpwm.py -- Example PLWM window manager configuration with panes.
@@ -119 +119 @@
     def S_M4_0(my, event):
         pane = my.wm.panes_list[my.wm.panes_current]
-        splitpane(pane, pane.vertical_split)
+        splitpane(pane, pane.vertical_split, paneWindow)
 
     def M4_1(my, event):
@@ -138 +138 @@
     # Keystrokes for launching applications
     def M4_exclam(my, event):
-        runcommand(my.wm.panes_list[my.wm.panes_current])
+        runcommand(my.wm.panes_list[my.wm.panes_current], paneWindow)
 
     def M4_b(my, event):
@@ -161 +161 @@
         getapp(my.wm.panes_list[my.wm.panes_current], "J-Pilot", "jpilot")
 
-    def M4_n(my, event):
+    def M4_f(my, event):
         getapp(my.wm.panes_list[my.wm.panes_current], "Mozilla", "mozilla")
-
-    def M4_s(my, event):
-        getapp(my.wm.panes_list[my.wm.panes_current], "SkipStone", "skipstone")
 
     # Keystrokes for window manager operations
     def M4_equal(my, event):
-        numberpane(my.wm.panes_list[my.wm.panes_current])
+        numberpane(my.wm.panes_list[my.wm.panes_current], paneWindow)
 
     def M4_quoteright(my, event):
-        pullwindow(my.wm.panes_list[my.wm.panes_current])
+        pullwindow(my.wm.panes_list[my.wm.panes_current], paneWindow)
 
     def M4_quotedbl(my, event):
-        gotowindow(my.wm.panes_list[my.wm.panes_current])
+        gotowindow(my.wm.panes_list[my.wm.panes_current], screenWindow)
 
     def M4_Return(my, event):
@@ -284 +281 @@
 class paneWindow(input.inputWindow):
     bordercolor = "Goldenrod"
+    editHandler = MyEditHandler
 
 
@@ -289 +287 @@
     borderwidth = 5
     bordercolor = "Orange"
+    editHandler = MyEditHandler
 
 

trunk/plwm/pane_utilities.py

@@ -1 +1 @@
 #!/usr/bin/env python
-# $Id: pane_utilities.py,v 1.1 2005-08-07 03:18:53 mwm Exp $
+# $Id: pane_utilities.py,v 1.2 2005-08-07 04:22:18 mwm Exp $
 #
 # pane_utilities.py -- Utility clases and functions for use with panes
@@ -122 +122 @@
     "Read a string from the user, and run it."
 
-    def __init__(my, pane, prompt = "Command: "):
+    def __init__(my, pane, winclass, prompt = "Command: "):
         my.system = pane.screen.system
-        window = paneWindow(prompt, pane.screen, length = 50)
-        window.read(my, MyEditHandler, pane.x, pane.y)
+        window = winclass(prompt, pane.screen, length = 50)
+        window.read(my, window.editHandler, pane.x, pane.y)
 
     def __call__(my, string):
@@ -134 +134 @@
     "Read in a fraction, and split that much off the current pane."
 
-    def __init__(my, pane, splitter, prompt = "Fraction: "):
+    def __init__(my, pane, splitter, winclass, prompt = "Fraction: "):
         my.pane, my.splitter = pane, splitter
-        window = paneWindow(prompt, pane.screen, length = 50)
+        window = winclass(prompt, pane.screen, length = 50)
         window.read(my, MyEditHandler, pane.x, pane.y)
 
@@ -150 +150 @@
     "Read a new number for the current pane."
 
-    def __init__(my, pane, prompt = "New number: "):
+    def __init__(my, pane, winclass, prompt = "New number: "):
         my.wm = pane.wm
-        window = paneWindow(prompt, pane.screen)
-        window.read(my, MyEditHandler, pane.x, pane.y)
+        window = winclass(prompt, pane.screen)
+        window.read(my, window.editHandler, pane.x, pane.y)
 
     def __call__(my, name):
@@ -162 +162 @@
     "Read a window's name, and pull it to the current pane."
 
-    def __init__(my, pane, prompt = "Pull: "):
+    def __init__(my, pane, winclass, prompt = "Pull: "):
         my.pane = pane
-        window = paneWindow(prompt, pane.screen)
-        window.read(my, MyEditHandler, pane.x, pane.y)
+        window = winclass(prompt, pane.screen)
+        window.read(my, window.editHandler, pane.x, pane.y)
 
     def __call__(my, name):
@@ -179 +179 @@
     "Emulate the rp 'goto' command."
 
-    def __init__(my, pane, prompt = "Goto: "):
+    def __init__(my, pane, winclass, prompt = "Goto: "):
         my.pane = pane
-        window = screenWindow(prompt, pane.screen)
-        window.read(my, MyEditHandler)
+        window = winclass(prompt, pane.screen)
+        window.read(my, window.editHandler)
 
     def __call__(my, name):