Changeset 177

Timestamp:

08/06/2005 10:18:53 PM (3 years ago)

Author:

mwm

Message:

Move a lot of utilities code out of examples/plpwm.py into plwm/pane_utilities.py.
Some of this would be useful to non-paned wms, but the code needs to have the pane
dependencies removed for that to happen. I'm not up for doing it direct, but would
be willing to help someone tackling it.

Added "shortcut key" notes to the menu meta-menu.

Changed inspect to use /usr/bin/env isntead of invokeing python directly.

Location:

trunk

Files:

• examples/plpwm.py (modified) (5 diffs)
• plwm/pane_utilities.py (added)
• utils/inspect_plwm.py (modified) (1 diff)

trunk/examples/plpwm.py

@@ -1 +1 @@
 #!/usr/bin/env python
-# $Id: plpwm.py,v 1.36 2005-08-06 05:35:21 mwm Exp $
-#
-# plpwm.py -- Exemple PLWM window manager configuration with panes.
+# $Id: plpwm.py,v 1.37 2005-08-07 03:18:52 mwm Exp $
+#
+# plpwm.py -- Example PLWM window manager configuration with panes.
 #
 #    Copyright (C) 2001  Mike Meyer <mwm@mired.org>
@@ -35 +35 @@
      border, color, font, menu, panes, cfilter, input, message
 
+from plwm.pane_utilities import appmenu, codemenu, windowmenu, panesmenu, \
+     runcommand, splitpane, numberpane, pullwindow, gotowindow, \
+     split_pane, getapp
 
 class MyMenuHandler(menu.MenuCharHandler):
@@ -265 +268 @@
     def M4_m(my, event):
         codemenu(my.wm.panes_list[my.wm.panes_current],
-                 {"applications": (my.a, (event,)),
-                  "startup apps": (my.A, (event,)),
-                  "all windows": (my.b, (event,)),
-                  "current pane": (my.c, (event,)),
-                  "iconfified": (my.i, (event,)),
-                  "manager ops": (my.m, (event,)),
-                  "panes": (my.p, (event,)),
-                  "open in pane": (my.w, (event,)),
-                  "all in pane": (my.W, (event,))})
+                 {"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()
 
     Any_g = Any_Escape = keys.KeyGrabKeyboard._timeout
     
-
-class appmenu:
-    "Creates a menu of applications to run in a pane."
-
-    def __init__(my, pane, apps):
-        "Create and run the applications menu from the keys."
-
-        labels = apps.keys()
-        labels.sort()
-        width, height = pane.screen.menu_make(labels)
-        my.system = pane.screen.system
-        my.apps = apps
-        pane.screen.menu_run((pane.width - width) / 2 + pane.x,
-                         (pane.height - height) / 2 + pane.y,
-                         my)
-
-    def __call__(my, choice):
-        "Call the system function on the value of the given choice."
-
-        my.system(my.apps[choice] + " &")
-
-                                                               
-class codemenu:
-    "Create a menu of Python actions to run."
-
-    def __init__(my, pane, actions):
-        "Create the menu and run it."
-
-        labels = actions.keys()
-        labels.sort()
-        width, height = pane.screen.menu_make(labels)
-        my.actions = actions
-        pane.screen.menu_run((pane.width - width) / 2 + pane.x,
-                         (pane.height - height) / 2 + pane.y,
-                         my)
-
-    def __call__(my, choice):
-        "Run the selection for the user."
-
-        apply(apply, my.actions[choice])
-
-
-class windowmenu:
-    "Create a menu of windows to add to a pane."
-
-    def __init__(my, pane, filter = cfilter.true, list = None):
-        labels = []
-        clients = {}
-        i = 'a'
-        for c in list or pane.screen.query_clients(filter, 1):
-            l = "%c: %s" % (i, c.get_title())
-            labels.append(l)
-            clients[l] = c
-            i = chr(ord(i) + 1)
-        if labels:
-            width, height = pane.screen.menu_make(labels, align = 'left')
-            my.add = pane.add_window
-            my.clients = clients
-            pane.screen.menu_run((pane.width - width) / 2 + pane.x,
-                                 (pane.height - height) / 2 + pane.y,
-                                 my)
-        else:
-            width, height = pane.screen.message_make("No windows")
-            pane.screen.message_display((pane.width - width) / 2 + pane.x,
-                                        (pane.height - height) / 2 + pane.y)
-
-    def __call__(my, choice):
-        "Add the selected window to the pane."
-
-        my.add(my.clients[choice])
-
-
-class panesmenu:
-    "Create a menu of all the panes."
-
-    def __init__(my, screen):
-        wm = screen.wm
-        labels = []
-        panes = {}
-        for i in range(len(wm.panes_list)):
-            w = wm.panes_list[i].window
-            if w: l = "%d: %s" % (i, w.get_title())
-            else: l = "%d: <EMPTY>" % i
-            labels.append(l)
-            panes[l] = i
-        width, height = screen.menu_make(labels, align = 'left')
-        my.goto = wm.panes_goto
-        my.panes = panes
-        screen.menu_run((screen.root_width - width) / 2,
-                        (screen.root_height - height) / 2, my)
-
-    def __call__(my, choice):
-        "Activate the selected pane."
-
-        my.goto(my.panes[choice])
-            
 
 class paneWindow(input.inputWindow):
@@ -383 +290 @@
     bordercolor = "Orange"
 
-
-class runcommand:
-    "Read a string from the user, and run it."
-
-    def __init__(my, pane):
-        my.system = pane.screen.system
-        window = paneWindow("! ", pane.screen, length = 50)
-        window.read(my, MyEditHandler, pane.x, pane.y)
-
-    def __call__(my, string):
-        my.system(string + " &")
-
-
-class splitpane:
-    "Read in a fraction, and split that much off the current pane."
-
-    def __init__(my, pane, splitter):
-        my.pane, my.splitter = pane, splitter
-        window = paneWindow("Fraction: ", pane.screen, length = 50)
-        window.read(my, MyEditHandler, pane.x, pane.y)
-
-    def __call__(my, fraction):
-        try:
-            f = string.atof(fraction)
-            my.splitter(f)
-        except ValueError:
-            pass
-
-
-class numberpane:
-    "Read a new number for the current pane."
-
-    def __init__(my, pane):
-        my.wm = pane.wm
-        window = paneWindow("New number: ", pane.screen)
-        window.read(my, MyEditHandler, pane.x, pane.y)
-
-    def __call__(my, name):
-        my.wm.panes_number(int(name))
-
-class pullwindow:
-    "Read a window's name, and pull it to the current pane."
-
-    def __init__(my, pane):
-        my.pane = pane
-        window = paneWindow("pull ", pane.screen)
-        window.read(my, MyEditHandler, pane.x, pane.y)
-
-    def __call__(my, name):
-        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)
-        else:
-            width, height = my.pane.screen.message_make("No windows")
-            my.pane.screen.message_display(my.pane.x, my.pane.y)
-
-
-class gotowindow:
-    "Emulate the rp 'goto' command."
-
-    def __init__(my, pane):
-        my.pane = pane
-        window = screenWindow("goto ", pane.screen)
-        window.read(my, MyEditHandler)
-
-    def __call__(my, name):
-        clients = my.pane.screen.query_clients(cfilter.re_title(name + ".*"), 1)
-        if clients:
-            window = clients[0]
-            if window.panes_pane.window and window.panes_pane.window == window:
-                my.pane.wm.panes_activate(window.panes_pane)
-            else:
-                my.pane.add_window(window)
-        else:
-            width, height = my.pane.screen.message_make("No windows")
-            my.pane.screen.message_display(0, 0)
-
-
-def getapp(pane, name, command = None):
-    "Find a window starting with name, and run command if it doesn't exist."
-
-    clients = pane.screen.query_clients(cfilter.re_title(".*%s.*" % name), 1)
-    if len(clients) > 1: windowmenu(pane, list = clients)
-    elif clients: pane.add_window(clients[0])
-    else: pane.screen.system((command or name) + " &")
-    
 
 def restore(wm):
@@ -526 +347 @@
     wm.panes_restore()
 
-def split_pane(count, splitter):
-    "Split current pane into 2-9 equal-sized panes."
-
-    while count > 1:
-        splitter(1. / count)
-        count -= 1
-
 
 if __name__ == '__main__':

trunk/utils/inspect_plwm.py

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
-# $Id: inspect_plwm.py,v 1.3 2004-04-16 12:08:46 petli Exp $
+# $Id: inspect_plwm.py,v 1.4 2005-08-07 03:18:53 mwm Exp $
 #
 # inspect_plwm.py -- PLWM inspect client