Changeset 140

Timestamp:

01/20/2003 02:55:56 PM (6 years ago)

Author:

mwm

Message:

Fix the bug where panes was resizing subwindows as well as windows by
dispatching ConfigRequest? from the screen instead of the client.

Add the latest tweaks to plpwm.py.

Location:

trunk

Files:

• examples/plpwm.py (modified) (2 diffs)
• plwm/panes.py (modified) (5 diffs)

trunk/examples/plpwm.py

@@ -1 +1 @@
 #!/usr/bin/python
-# $Id: plpwm.py,v 1.30 2002-10-04 22:42:57 mwm Exp $
+# $Id: plpwm.py,v 1.31 2003-01-20 20:55:56 mwm Exp $
 #
 # plpwm.py -- Exemple PLWM window manager configuration with panes.
@@ -499 +499 @@
     pane.horizontal_split(24. / 29.)
     wm.panes_number(6)
-    pane = wm.panes_list[8]
-    pane.vertical_split()
     wm.panes_goto(0)
     wm.panes_restore()

trunk/plwm/panes.py

@@ -1 @@
-# $Id: panes.py,v 1.17 2002-04-07 17:49:24 mwm Exp $
+# $Id: panes.py,v 1.18 2003-01-20 20:55:56 mwm Exp $
 #
 # panes.py -- Handle panes (sometimes known as "frames")
@@ -152 +152 @@
 
         wmanager.debug('panesScreen', 'Initializing screen %d', my.number)
+        my.dispatch.add_handler(X.ConfigureRequest, my.panes_configure)
         pane = Pane(my, 0, 0, my.root_width, my.root_height)
         my.panes_fullscreen(pane)
@@ -169 +170 @@
             else: pane.y = my.modewindow_mw.height
         
+    def panes_configure(my, event):
+        "A window changed, so pass it on to my pane."
+
+        w = my.get_window(event.window)
+        if w:
+            if event.value_mask & (X.CWX | X.CWY | X.CWWidth | X.CWHeight):
+                w.panes_pane.place_window(w)
+            if event.value_mask & X.CWStackMode and event.stack_mode == X.Above \
+               and my.allow_self_changes(w):
+                w.panes_pane.add_window(my)
+
 
 class panesClient:
@@ -193 +205 @@
             pane = filter(lambda p, m=my.screen: p.screen == m, my.wm.panes_list)[0]
         pane.add_window(my)
-        my.dispatch.add_handler(X.ConfigureRequest, my.panes_configure)
         my.dispatch.add_handler(X.UnmapNotify, my.panes_unmap)
         my.dispatch.add_handler(X.DestroyNotify, my.panes_unmap)
         my.dispatch.add_handler(wmevents.RemoveClient, my.panes_unmap)
 
-    def panes_configure(my, event):
-        "The window changed, so pass it on to my pane."
-
-        if my.panes_pane:
-            w = my.screen.get_window(event.window)
-            if not w: return
-            if event.value_mask & (X.CWX | X.CWY | X.CWWidth | X.CWHeight):
-                my.panes_pane.place_window(my)
-            if event.value_mask & X.CWStackMode and event.stack_mode == X.Above \
-               and my.screen.allow_self_changes(w):
-                my.panes_pane.add_window(my)
-            
     def panes_unmap(my, event):
         "The window is going away or gone - make sure it's not taking up a pane"
@@ -297 +296 @@
         x, y, width, height = window.keep_on_screen(x, y, width, height)
 
+        wmanager.debug('Pane-configure', 'Resizing window from %d, %d to %d, %d' %
+                       (window.width, window.height, width, height))
         window.moveresize(x, y, width, height)