Changeset e5a49d88871fb35f6707a45ab64035954decd2ad for samurai-x

Timestamp:

08/01/2008 03:44:22 PM (2 years ago)

Author:

dunkfordyce <dunkfordyce@…>

Children:

8cb29f0449b55f9722acde17e3cf24cf1c7e501e

Parents:

4ade186470c310d77434411f4fab27ab8ccfc5a0

git-committer:

dunkfordyce <dunkfordyce@561c22c7-a851-0410-91f3-c76db74392ff> / 2008-08-01T14:44:22Z+0000

Message:

opaque window resizing

git-svn-id:  https://samurai-x.googlecode.com/svn/trunk@15 561c22c7-a851-0410-91f3-c76db74392ff

Location:

samurai-x/samuraix

Files:

• client.py (modified) (4 diffs)
• defaultconfig.py (modified) (3 diffs)

samurai-x/samuraix/client.py

@@ -398 +398 @@
         root = xlib.XRootWindow(samuraix.display, self.screen.num)
 
+
         if (xlib.XGrabPointer(samuraix.display, 
                 root,
@@ -405 +406 @@
             return 
 
+        if not xlib.XGrabServer(samuraix.display):
+            log.warn('possibly failed grabbing server')
+        
+        gc = xlib.XCreateGC(samuraix.display, self.window, 0, None)
+        xlib.XSetForeground(samuraix.display, gc, self.screen.white_pixel)
+        xlib.XSetFunction(samuraix.display, gc, xlib.GXxor)
+        xlib.XSetSubwindowMode(samuraix.display, gc, xlib.IncludeInferiors)
+        #xlib.XSetBackground(samuraix.display, gc, self.screen.white_pixel)
+
         xlib.XWarpPointer(samuraix.display, xlib.None_, self.window, 0, 0, 0, 0,
             self.geom.width + self.border_width - 1, self.geom.height + self.border_width - 1)   
@@ -412 +422 @@
         geom = self.geom.copy()
 
+        xlib.XDrawRectangle(samuraix.display, root, gc, 
+                geom.x, geom.y, geom.width, geom.height)
+        xlib.XFlush(samuraix.display)
+        xlib.XSync(samuraix.display, 0)
+
+        ev = xlib.XEvent()
+
         while True:
 
-            xlib.XMaskEvent(samuraix.display, 
-                MOUSEMASK | xlib.ExposureMask | xlib.SubstructureRedirectMask,
-                byref(ev))
+            xlib.XNextEvent(samuraix.display, byref(ev))
+
+            #xlib.XMaskEvent(samuraix.display, 
+            #    MOUSEMASK | xlib.ExposureMask | xlib.SubstructureRedirectMask,
+            #    byref(ev))
 
             if ev.type == xlib.ButtonRelease:
@@ -422 +441 @@
                 break
             elif ev.type == xlib.MotionNotify:
+                # erase the old box 
+                xlib.XDrawRectangle(samuraix.display, root, gc, 
+                        geom.x, geom.y, geom.width, geom.height)
+
                 geom.width = max(0, ev.xmotion.x - ocx - 2 * self.border_width + 1)
                 geom.height = max(0, ev.xmotion.y - ocy - 2 * self.border_width + 1)
-                self.resize(geom)
+
+                xlib.XDrawRectangle(samuraix.display, root, gc, 
+                        geom.x, geom.y, geom.width, geom.height)
+                xlib.XFlush(samuraix.display)
+                xlib.XSync(samuraix.display, 0)
             else:
                 samuraix.app.handle_event(ev)
 
+        # erase the box
+        xlib.XDrawRectangle(samuraix.display, root, gc, 
+                geom.x, geom.y, geom.width, geom.height)
+        xlib.XFlush(samuraix.display)
+        xlib.XSync(samuraix.display, 0)
+
+        xlib.XUngrabServer(samuraix.display)
+        xlib.XFreeGC(samuraix.display, gc)
+
+        self.resize(geom)
         self.floating_geom = self.geom.copy()
         self.resizing = False

samurai-x/samuraix/defaultconfig.py

@@ -6 +6 @@
 from samuraix.userfuncs import *
 
+default_mod = xlib.Mod4Mask
 
 config = {
@@ -32 +33 @@
 
             'keys': {
-                (keysymdef.XK_Return, xlib.Mod4Mask): 
+                (keysymdef.XK_Return, default_mod): 
                     spawn("xterm"),
-                (keysymdef.XK_g, xlib.Mod4Mask):
+                (keysymdef.XK_g, default_mod):
                     spawn("gimp"),
 
-                (keysymdef.XK_F2, xlib.Mod4Mask):
-                    spawn("./samurai-runner"),
+                (keysymdef.XK_F2, default_mod):
+                    spawn("./sx-runner"),
 
-                (keysymdef.XK_Page_Up, xlib.Mod4Mask):
+                (keysymdef.XK_Page_Up, default_mod):
                     spawn("amixer -c 0 set Master 2dB+"),
-                (keysymdef.XK_Page_Down, xlib.Mod4Mask):
+                (keysymdef.XK_Page_Down, default_mod):
                     spawn("amixer -c 0 set Master 2dB-"),
-                (keysymdef.XK_End, xlib.Mod4Mask):
+                (keysymdef.XK_End, default_mod):
                     spawn("amixer -c 0 set Master 0dB+ toggle"),
                 
-                (keysymdef.XK_l, xlib.Mod4Mask):
+                (keysymdef.XK_l, default_mod):
                     spawn("xlock -mode biof"),
 
-                (keysymdef.XK_1, xlib.Mod4Mask): 
+                (keysymdef.XK_1, default_mod): 
                     screenfunc('set_active_desktop_by_index', 0),
-                (keysymdef.XK_2, xlib.Mod4Mask):
+                (keysymdef.XK_2, default_mod):
                     screenfunc('set_active_desktop_by_index', 1),
-                (keysymdef.XK_3, xlib.Mod4Mask):
+                (keysymdef.XK_3, default_mod):
                     screenfunc('set_active_desktop_by_index', 2),
-                (keysymdef.XK_4, xlib.Mod4Mask):
+                (keysymdef.XK_4, default_mod):
                     screenfunc('set_active_desktop_by_index', 3),
-                (keysymdef.XK_5, xlib.Mod4Mask):
+                (keysymdef.XK_5, default_mod):
                     screenfunc('set_active_desktop_by_index', 4),
-                (keysymdef.XK_6, xlib.Mod4Mask):
+                (keysymdef.XK_6, default_mod):
                     screenfunc('set_active_desktop_by_index', 5),
-                (keysymdef.XK_7, xlib.Mod4Mask):
+                (keysymdef.XK_7, default_mod):
                     screenfunc('set_active_desktop_by_index', 6),
-                (keysymdef.XK_8, xlib.Mod4Mask):
+                (keysymdef.XK_8, default_mod):
                     screenfunc('set_active_desktop_by_index', 7),
-                (keysymdef.XK_9, xlib.Mod4Mask):
+                (keysymdef.XK_9, default_mod):
                     screenfunc('set_active_desktop_by_index', 8),
 
-                (keysymdef.XK_Right, xlib.Mod4Mask):
+                (keysymdef.XK_Right, default_mod):
                     screenfunc('next_desktop'),
-                (keysymdef.XK_Left, xlib.Mod4Mask):
+                (keysymdef.XK_Left, default_mod):
                     screenfunc('prev_desktop'),
 
-                (keysymdef.XK_m, xlib.Mod4Mask):
+                (keysymdef.XK_m, default_mod):
                     focusedwindowfunc('toggle_maximise'),               
             },
@@ -86 +87 @@
     'client': {
         'buttons': {
-            (1, xlib.Mod4Mask): clientfunc('mousemove'),
-            (3, xlib.Mod4Mask): clientfunc('mouseresize'), 
+            (1, default_mod): clientfunc('mousemove'),
+            (3, default_mod): clientfunc('mouseresize'), 
         }
     },