Changeset 212

Timestamp:

05/05/2008 12:14:37 AM (8 months ago)

Author:

funkiedamouse

Message:

Merged plcm changes from petli.

Location:

trunk

Files:

• . (modified) (5 props)
• examples/petliwm.py (modified) (9 diffs)
• plcm (added)
• plcm/Makefile (added)
• plcm/events.c (added)
• plcm/main.c (added)
• plcm/plcm.h (added)
• plcm/projection.c (added)
• plcm/trans_glx.c (added)
• plcm/trans_render.c (added)
• plwm/__init__.py (modified) (1 diff)
• plwm/composite.py (added)
• plwm/wmanager.py (modified) (15 diffs)

trunk

@@ -7 +7 @@
 164 david.bronke@g33xnexus.com-20080425163300-bd5hb9q7lv4tvqi2
 165 david.bronke@g33xnexus.com-20080502003750-x2jktkjxttsrfd7y
+166 david.bronke@g33xnexus.com-20080505045843-m80adl8a0lzjc6qr
-plwm/mw_xmms2.py        mw_xmms2.py-20080502003726-9k8jbylthw1lg0s0-1
+plwm/composite.py       210@51b01d74-a847-0410-9038-a726f43140df:trunk:plwm%2Fcomposite.py
+plcm    210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm
+plcm/projection.c       210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Fprojection.c
+plcm/plcm.h     210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Fplcm.h
+plcm/Makefile   210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2FMakefile
+plcm/trans_glx.c        210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Ftrans_glx.c
+plcm/events.c   210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Fevents.c
+plcm/trans_render.c     210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Ftrans_render.c
+plcm/main.c     210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Fmain.c
-timestamp: 2008-05-01 20:37:50.073999882 -0400
+timestamp: 2008-05-05 00:58:43.687000036 -0400
 committer: David Bronke <David.Bronke@g33xnexus.com>
 properties: 

@@ -7 +7 @@
 164 david.bronke@g33xnexus.com-20080425163300-bd5hb9q7lv4tvqi2
 165 david.bronke@g33xnexus.com-20080502003750-x2jktkjxttsrfd7y
+166 david.bronke@g33xnexus.com-20080505045843-m80adl8a0lzjc6qr

@@ -1 @@
-plwm/mw_xmms2.py        mw_xmms2.py-20080502003726-9k8jbylthw1lg0s0-1
+plwm/composite.py       210@51b01d74-a847-0410-9038-a726f43140df:trunk:plwm%2Fcomposite.py
+plcm    210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm
+plcm/projection.c       210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Fprojection.c
+plcm/plcm.h     210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Fplcm.h
+plcm/Makefile   210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2FMakefile
+plcm/trans_glx.c        210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Ftrans_glx.c
+plcm/events.c   210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Fevents.c
+plcm/trans_render.c     210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Ftrans_render.c
+plcm/main.c     210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Fmain.c

@@ -1 @@
-timestamp: 2008-05-01 20:37:50.073999882 -0400
+timestamp: 2008-05-05 00:58:43.687000036 -0400
 committer: David Bronke <David.Bronke@g33xnexus.com>
 properties: 

trunk/examples/petliwm.py

@@ -39 +39 @@
      mw_clock, mw_acpi, \
      mw_watchfiles, \
-     inspect, misc, input
+     inspect, misc, input, \
+     composite, mixer
 
 from plwm.cycle import CycleKeys, CycleActivate
@@ -180 +181 @@
                ):
 
+    window_proxy_class = composite.CompositeProxy
+
     no_border_clients = name('MPlayer')
     full_screen_windows = name('MPlayer')
@@ -223 +226 @@
     view_reorder_views = 1
     view_reorder_delay = 2.0
-
-    allow_self_changes = none
+    
+    #allow_self_changes = none
 
 class WMConfig:
@@ -239 +242 @@
            mw_watchfiles.ModeWindowWatchFiles,
            inspect.InspectServer,
+           composite.CompositionManager,
+           mixer.Mixer,
            ModeWindowTraceIM,
            WMConfig):
@@ -251 +256 @@
                                                present_msg = '',
                                                missing_msg = 'LTM OFF'),
-                     mw_watchfiles.WatchedFile('/var/run/network-error',
-                                               present_msg = 'NET: %s',
+                     mw_watchfiles.WatchedFile('/var/run/tre-network',
+                                               present_msg = '3|%s',
                                                format_content = 1)
                      )
@@ -378 +383 @@
         self.wm.current_screen.view_find_with_client(Or(name('xpdf'),
                                                         name('soffice'),
-                                                        name('VCLSalFrame'),
+                                                        name('OpenOffice.org 2.0'),
                                                         name('AcroRead')))
 
@@ -385 +390 @@
 
     def F8(self, evt):
-        self.wm.current_screen.view_find_with_client(name('Vmware'))
+        self.wm.current_screen.view_find_with_client(Or(name('Vmware'),
+                                                        name('Vmplayer')))
 
     def F5(self, evt):
@@ -443 +449 @@
         self.wm.fake_button_click(3)
 
-    # def F12(self, evt):
-    #           clients = self.wm.query_clients()
-    #           f = name('titrax')
-    #           for c in clients:
-    #               if f(c):
-    #                   c.deiconify()
-    #                   c.activate()
-    #                   return
-    #           else:
-    #               self.wm.system('/opt/local/bin/titrax')
+    #
+    # Composition effects
+    #
+
+    def M5_S_b(self, evt):
+        if self.wm.current_client:
+            self.wm.comp_change_brightness(self.wm.current_client, 16)
+
+    def M5_b(self, evt):
+        if self.wm.current_client:
+            self.wm.comp_change_brightness(self.wm.current_client, -16)
+            
+    def M5_C_b(self, evt):
+        if self.wm.current_client:
+            self.wm.comp_set_brightness(self.wm.current_client, 0)
 
     #
@@ -458 +469 @@
     #
 
-    # def F7(self, evt):
-    #         # lower volume.  First main to 50, then pcm to 0
-    #         main = self.wm.mixer_get('vol')
-    #         if main > 50:
-    #             self.wm.mixer_set('vol', max(main - 10, 50))
-    #         else:
-    #             pcm = self.wm.mixer_get('pcm')
-    #             if pcm > 0:
-    #                 self.wm.mixer_set('pcm', max(pcm - 10, 0))
-    #             else:
-    #                 self.wm.display.bell(100)
-    #
-    #         self.wm.mixer_status_view(devs = ('vol', 'pcm'))
-    #
-    # def F8(self, evt):
-    #         # raise volume.  First pcm to 100, then main to 100
-    #         pcm = self.wm.mixer_get('pcm')
-    #         if pcm < 100:
-    #             self.wm.mixer_set('pcm', min(pcm + 10, 100))
-    #         else:
-    #             main = self.wm.mixer_get('vol')
-    #             if main < 100:
-    #                 self.wm.mixer_set('vol', min(main + 10, 100))
-    #             else:
-    #                 self.wm.display.bell(-50)
-    #
-    #         self.wm.mixer_status_view(devs = ('vol', 'pcm'))
-    #
-    # def S_F7(self, evt):
-    #         # toggle mute
-    #         self.wm.mixer_mute('pcm')
-    #         self.wm.mixer_status_view(devs = ('vol', 'pcm'))
-    #
-    # S_F8 = S_F7
+    def M5_Delete(self, evt):
+        # lower volume.  First main to 50, then pcm to 0
+        main = self.wm.mixer_get('vol')
+        if main > 50:
+            self.wm.mixer_set('vol', max(main - 10, 50))
+        else:
+            pcm = self.wm.mixer_get('pcm')
+            if pcm > 0:
+                self.wm.mixer_set('pcm', max(pcm - 10, 0))
+            else:
+                self.wm.display.bell(100)
+                
+        self.wm.mixer_status_view(devs = ('vol', 'pcm'))
+    
+    def M5_Insert(self, evt):
+        # raise volume.  First pcm to 100, then main to 100
+        pcm = self.wm.mixer_get('pcm')
+        if pcm < 100:
+            self.wm.mixer_set('pcm', min(pcm + 10, 100))
+        else:
+            main = self.wm.mixer_get('vol')
+            if main < 100:
+                self.wm.mixer_set('vol', min(main + 10, 100))
+            else:
+                self.wm.display.bell(-50)
+                
+        self.wm.mixer_status_view(devs = ('vol', 'pcm'))
+    
+    def M5_End(self, evt):
+        # toggle mute
+        self.wm.mixer_mute('pcm')
+        self.wm.mixer_status_view(devs = ('vol', 'pcm'))
 
 

trunk/plwm/__init__.py

@@ -33 +33 @@
             'cfilter',
             'color',
+            'composite',
             'cycle',
             'deltamove',

trunk/plwm/wmanager.py

@@ -62 +62 @@
 
 class Window:
-    "A container for all window objects on a screen."
+    """Class representing any window object on a screen, either internal
+    or client windows.
+    """
 
     full_screen_windows = cfilter.none
@@ -94 +96 @@
         self.border_width = r.border_width
 
+
+    def __str__(self):
+        return '<%s %s>' % (self.__class__, self.window)
+
+    def __repr__(self):
+        return self.__str__()
+
     #
     # Internal methods
@@ -200 +209 @@
 
 
+    def set_border_color(self, color):
+        if self.withdrawn:
+            return
+
+        self.window.change_attributes(border_pixel = color)
+
+
     def keep_on_screen(self, x, y, width, height):
         """Return X, Y, WIDTH, HEIGHT after adjusting so the entire window
@@ -284 +300 @@
     def map(self):
         if self.withdrawn: return None
+
+        # Perform delayed resizing
+        if self.delayed_moveresize:
+            self.window.configure(x = self.x, y = self.y,
+                                  width = self.width,
+                                  height = self.height)
+            self.delayed_moveresize = 0
+
         self.window.map()
 
@@ -344 +368 @@
     needs_reparent_clients = cfilter.name('AWTapp')
 
+    window_proxy_class = None
+    
     def __init__(self, screen, window, maprequest):
         """Create a client object managing WINDOW.
@@ -353 +379 @@
         """
 
+        # Let any window proxy in on the fun
+        if self.window_proxy_class is not None:
+            window = self.window_proxy_class(screen, window)
+            
         Window.__init__(self, screen, window)
         self.window.change_save_set(X.SetModeInsert)
@@ -469 +499 @@
             self.window.delete_property(self.wm.WM_STATE)
 
-
+        # Pass note to proxy, if any, that the window is gone
+        if self.window_proxy_class is not None:
+            self.window._proxy_withdraw()
+
+        
     def handle_property_notify(self, event):
         """Called when a property has changed on the client window.
@@ -555 +589 @@
         self.window.unmap()
 
+        debug('client', 'iconify')
+        
+        # Prevent us from recieving UnmapNotify events
+        self.dispatch.block_masks(X.StructureNotifyMask)
+        self.screen.dispatch.block_masks(X.SubstructureNotifyMask)
+
+        self.unmap()
+
         self.screen.dispatch.unblock_masks(X.SubstructureNotifyMask)
         self.dispatch.unblock_masks(X.StructureNotifyMask)
@@ -562 +604 @@
         self.wm.events.put_event(wmevents.ClientIconified(self))
 
+
     def deiconify(self):
         if self.withdrawn:
@@ -569 +612 @@
             return
 
+        if self.force_iconified:
+            return
+        
         debug('client', 'deiconify')
-
-        # Perform delayed resizing
-        if self.delayed_moveresize:
-            self.window.configure(x = self.x, y = self.y,
-                                  width = self.width,
-                                  height = self.height)
-            self.delayed_moveresize = 0
-
-        self.window.map()
+        
+        self.map()
         self.mapped = 1
         self.window.set_wm_state(state = Xutil.NormalState, icon = 0)
@@ -822 +861 @@
         self.windows = {}
 
+        # Map proxy windows to actual windows
+        self.proxy_windows = {}
+        
         # Set up event handler for this screen
         self.dispatch = event.WindowDispatcher(self.root)
@@ -839 +881 @@
         # Fix a DISPLAY string for this screen by replacing the
         # screen number in the DISPLAY with this screen's number
-
+        
         dstr = self.wm.display.get_display_name()
         m = re.search(r'(:\d+)(\.\d+)?$', dstr)
@@ -913 +955 @@
         else:
             debug('clients', 'Adding client for %s', window)
-            self.windows[window] = self.wm.client_class(self, window, maprequest)
-            self.windows[window].initial_map()
-            self.wm.events.put_event(wmevents.AddClient(self.windows[window]))
+            client = self.wm.client_class(self, window, maprequest)
+
+            # Use what client think its window is, to handle proxy windows
+            self.windows[client.window] = client
+
+            client.initial_map()
+            self.wm.events.put_event(wmevents.AddClient(client))
             return 1
 
@@ -956 +1002 @@
 
     def get_window(self, window):
-        return self.windows.get(window, None)
+        """Translate an Xlib window object into its controlling Window
+        or Client object.
+
+        Returns None if the Xlib window isn't known. 
+        """
+
+        while window is not None:
+            try:
+                return self.windows[window]
+            except KeyError:
+                # Try to translate via proxy window
+                window = self.proxy_windows.get(window, None)
+
+        return None
+
 
     def is_client(self, window):
         return isinstance(self.get_window(window), Client)
+    
 
     def is_internal_window(self, window):
         return isinstance(self.get_window(window), InternalWindow)
+
+
+    def add_proxy_window(self, proxy, window):
+        """Add a proxy window, so that get_window() on PROXY leads on
+        to WINDOW to find the actual Window object.
+        """
+    
+        self.proxy_windows[proxy] = window
+
+
+    def remove_proxy_window(self, proxy):
+        """Remove a proxy window previously registered with add_proxy_window().
+        """
+    
+        del self.proxy_windows[proxy]
+        
 
     def query_clients(self, client_filter = cfilter.all, stackorder = 0):
@@ -1748 +1825 @@
 
 
+class WindowProxyBase:
+    """Base class for proxy objects for the real Xlib window objects.
+
+    These proxies can override the Xlib window object methods when
+    necessary.
+    """
+
+    def __init__(self, screen, window):
+        self._screen = screen
+        self._window = window
+        self._wm = screen.wm
+
+        # These Xlib casts allows the proxy object to be passed to any
+        # Xlib method expecting one of the following objects
+        self.__resource__ = window.__resource__
+        self.__drawable__ = window.__resource__
+        self.__window__ = window.__resource__
+
+        # And these allows the proxy, for dictionary purposes, to
+        # pretend to be the actual window object.
+        self.__cmp__ = window.__cmp__
+        self.__hash__ = window.__hash__
+
+
+    def __getattr__(self, attr):
+        # Unknown attribute in the proxy, grab it from the real window instead
+        v = getattr(self._window, attr)
+
+        # And avoid this getting called again for this attr
+        setattr(self, attr, v)
+
+        return v
+
+
+    def _proxy_withdraw(self):
+        """Called by Client when the proxied window is gone, to allow any cleanup.
+        """
+        pass
+        
+
+    def __str__(self):
+        return '<%s for %s 0x%08x>' % (
+            self.__class__, 
+            self._window.__class__, self._window.id)
+
+
+    def __repr__(self):
+        return self.__str__()
 
 

@@ -7 +7 @@
 164 david.bronke@g33xnexus.com-20080425163300-bd5hb9q7lv4tvqi2
 165 david.bronke@g33xnexus.com-20080502003750-x2jktkjxttsrfd7y
+166 david.bronke@g33xnexus.com-20080505045843-m80adl8a0lzjc6qr

@@ -1 @@
-plwm/mw_xmms2.py        mw_xmms2.py-20080502003726-9k8jbylthw1lg0s0-1
+plwm/composite.py       210@51b01d74-a847-0410-9038-a726f43140df:trunk:plwm%2Fcomposite.py
+plcm    210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm
+plcm/projection.c       210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Fprojection.c
+plcm/plcm.h     210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Fplcm.h
+plcm/Makefile   210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2FMakefile
+plcm/trans_glx.c        210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Ftrans_glx.c
+plcm/events.c   210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Fevents.c
+plcm/trans_render.c     210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Ftrans_render.c
+plcm/main.c     210@51b01d74-a847-0410-9038-a726f43140df:trunk:plcm%2Fmain.c

@@ -1 @@
-timestamp: 2008-05-01 20:37:50.073999882 -0400
+timestamp: 2008-05-05 00:58:43.687000036 -0400
 committer: David Bronke <David.Bronke@g33xnexus.com>
 properties: