Changeset 181

Timestamp:

11/23/2005 09:12:44 AM (3 years ago)

Author:

petli

Message:

Views can now be managed on a most-recently-visited basis, set ViewManager?.view_reorder_views to true to enable it.

Location:

trunk

Files:

• examples/petliwm.py (modified) (7 diffs)
• plwm/cfilter.py (modified) (8 diffs)
• plwm/views.py (modified) (11 diffs)

trunk/examples/petliwm.py

@@ -59 +59 @@
 
 
+class TraceIM:
+    """Class for TraceIMClient.traceim_filters objects.
+    """
+
+    def __init__(self, enable, unseen, message):
+        """Create a TraceIM filter.
+
+        enable is a client filter selecting the clients that should be
+        traced.  It is checked when the client is created.
+
+        unseen is a client filter which is true when there are unseen
+        IMs for this client, and then message is displayed in the mode
+        window.
+        """
+        
+        self.enable = enable
+        self.unseen = unseen
+        self.message = message
+
+        
 class TraceIMClient:
 
@@ -68 +88 @@
     """
 
-    # A list of tuples (filter_enable_tracing, filter_unseen_im, message)
-    
-    traceim_clients = ()
+    # A list of TraceIM objects
+    
+    traceim_filters = ()
     
     def __client_init__(self):
-        self.traceim_unseen = None
         self.traceim_message = None
-        self.traceim_is_unseen = 0
-        
-        for enable, unseen, message in self.traceim_clients:
-            if enable(self):
-                wmanager.debug('traceim', 'Enabling IM tracing for %s' % self.get_title())
-                self.traceim_unseen = unseen
-                self.traceim_message = message
-                self.dispatch.add_handler(X.PropertyNotify, self.traceim_handle_property)
-                self.dispatch.add_handler(wmevents.ClientIconified, self.traceim_handle_iconified)
-                self.dispatch.add_handler(wmevents.ClientDeiconified, self.traceim_handle_iconified)
-                self.traceim_update()
-                break
+
+        filters = None
+        for f in self.traceim_filters:
+            if f.enable(self):
+                if filters is None:
+                    wmanager.debug('traceim', 'Enabling IM tracing for %s' % self.get_title())
+                    self.dispatch.add_handler(X.PropertyNotify, self.traceim_handle_property)
+                    self.dispatch.add_handler(wmevents.ClientIconified, self.traceim_handle_iconified)
+                    self.dispatch.add_handler(wmevents.ClientDeiconified, self.traceim_handle_iconified)
+                    filters = [f]
+                else:
+                    filters.append(f)
+
+        if filters:
+            self.traceim_filters = filters
+            self.traceim_message = None
+            self.traceim_update()
 
     def __client_del__(self):
-        if self.traceim_is_unseen:
-            self.wm.traceim_remove_message(self)
+        self.wm.traceim_remove_message(self)
 
     def traceim_handle_property(self, evt):
@@ -100 +123 @@
 
     def traceim_update(self):
-        if self.traceim_unseen(self):
-            if not self.traceim_is_unseen:
-                wmanager.debug('traceim', 'Unseen IM for %s' % self.get_title())
-                self.traceim_is_unseen = 1
-                self.wm.traceim_add_message(self, self.traceim_message)
+        m = []
+        for f in self.traceim_filters:
+            if f.unseen(self):
+                m.append(f.message)
+
+        if m:
+            m = ' '.join(m)
+            if m != self.traceim_message:
+                wmanager.debug('traceim', 'Unseen IM for %s: %s', self.get_title(), m)
+                self.traceim_message = m
+                self.wm.traceim_add_message(self, m)
         else:
-            if self.traceim_is_unseen:
-                wmanager.debug('traceim', 'No longer unseen IM for %s' % self.get_title())
-                self.traceim_is_unseen = 0
+            if self.traceim_message:
+                wmanager.debug('traceim', 'No longer unseen IM for %s', self.get_title())
+                self.traceim_message = None
                 self.wm.traceim_remove_message(self)
             
@@ -157 +186 @@
     border_focuscolor_name = "grey60"
 
-    traceim_clients = [
-        (name('Emacs'),                       # KOM runs in Emacs
-         And(iconified, re_title('Olästa')),  # only when iconified and unread
-         'Olästa')
+    traceim_filters = [
+        TraceIM(name('Emacs'),                       # KOM runs in Emacs
+                And(iconified, re_title('Olästa')),  # only when iconified and unread
+                'Olästa'),
+
+        TraceIM(name('Emacs'),         # TNT runs in Emacs
+                re_title(r'\(IM\)'),   # always when unacknowledged IM event
+                'IM'),
         ]
 
@@ -173 +206 @@
 
     view_always_visible_clients = none
+    view_reorder_views = 1
+    view_reorder_delay = 2.0
+    
     allow_self_changes = none
 
@@ -330 +366 @@
                                                         name('AcroRead')))
 
+    def F7(self, evt):
+        self.wm.current_screen.view_find_with_client(name('Ccm'))
+
+    def F8(self, evt):
+        self.wm.current_screen.view_find_with_client(name('Vmware'))
+
     def F5(self, evt):
         self.wm.current_screen.view_find_tag('F5')
@@ -401 +443 @@
     #
 
-    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 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
 
     

trunk/plwm/cfilter.py

@@ -1 @@
-# $Id: cfilter.py,v 1.4 2002-01-16 12:38:27 petli Exp $
+# $Id: cfilter.py,v 1.5 2005-11-23 15:12:44 petli Exp $
 #
 # cfilter.py -- Client filter functions
@@ -83 +83 @@
 
 class StaticClientFilter:
+    NAME = None
+    
     def __init__(self):
         self.__call__ = self.__call__
-        
+
+    def __str__(self):
+        return Name
+    
 class _True(StaticClientFilter):
+    NAME = 'true'
     def __call__(self, c):
         return 1
+
 true = _True()
 all = true
 
 class _False(StaticClientFilter):
+    NAME = 'false'
     def __call__(self, c):
         return 0
+
 false = _False()
 none = false
@@ -108 +117 @@
         return 1
 
+    def __str__(self):
+        return 'And(%s)' % ', '.join([str(f) for f in self.filters])
+        
 class Or:
     def __init__(self, *args):
@@ -118 +130 @@
         return 0
 
+    def __str__(self):
+        return 'Or(%s)' % ', '.join([str(f) for f in self.filters])
+
 class Not:
     def __init__(self, filter):
@@ -125 +140 @@
         return not self.filter(c)
 
+    def __str__(self):
+        return 'Not(%s)' % str(self.filter)
+
 
 class _IsClient(StaticClientFilter):
-
+    NAME = 'is_client'
+    
     # We can't import wmanager when cfilter is loaded,
     # since wmanager imports cfilter.  If we try,
@@ -148 +167 @@
 
 class _Iconified(StaticClientFilter):
+    NAME = 'iconified'
     def __call__(self, c):
         return not c.is_mapped()
@@ -153 +173 @@
 
 class _Mapped(StaticClientFilter):
+    NAME = 'mapped'
     def __call__(self, c):
         return c.is_mapped()
@@ -168 +189 @@
             return self.check_pattern(str)
 
+    def __str__(self):
+        return '%s(%s)' % (self.__class__.__name__, repr(self.pattern))
+
+        
 class _StringName(_NameBase):
     def check_pattern(self, str):

trunk/plwm/views.py

@@ -1 @@
-# $Id: views.py,v 1.7 2004-11-03 15:30:01 mtigges Exp $
+# $Id: views.py,v 1.8 2005-11-23 15:12:44 petli Exp $
 #
 # views.py -- Handle views ("workspaces")
@@ -22 +22 @@
 from Xlib import X, Xatom
 import types
+import time
 import modewindow
 import string
@@ -36 +37 @@
 class ViewHandler:
     view_always_visible_clients = cfilter.false
+
+    # If true, views will be reorded with the most-recently visited at
+    # the front.  This means that finding a view when several match
+    # the last visited view will be found first, rather than the one
+    # that happens to follow the currently visited view.
+    view_reorder_views = 0
+
+    # How long a view must have been current to be deemed visited, in
+    # seconds.  Must be > 0, otherwise only the last visited view can
+    # be reached.
+    view_reorder_delay = 2.0
     
+
     def __screen_client_init__(self):
+        if self.view_reorder_views and self.view_reorder_delay <= 0:
+            raise ValueError('view_reorder_delay must be > 0: %f' % self.view_reorder_delay)
+        
         self.PLWM_VIEW_LIST = self.wm.display.intern_atom('_PLWM_VIEW_LIST')
         self.PLWM_VIEW_WINCONF = self.wm.display.intern_atom('_PLWM_VIEW_WINCONF')
@@ -65 +81 @@
         self.view_current = v
         self.view_index = 0
+        self.view_enter_time = time.time()
+        self.view_enter_method = None
 
     def view_get_next_id(self):
@@ -234 +252 @@
             return 0
 
+        self.view_reorder_before_move('find %s' % str(clients))
+
         for i in range(self.view_index + 1, len(self.view_list)):
             if view_has_client(self.view_list[i], clients):
@@ -250 +270 @@
         """
         if len(self.view_list) > 1:
+            self.view_reorder_before_move('prevnext')
             self.view_index = (self.view_index + 1) % len(self.view_list)
             self.view_leave()
@@ -258 +279 @@
         """
         if len(self.view_list) > 1:
+            self.view_reorder_before_move('prevnext')
             self.view_index = (self.view_index - 1) % len(self.view_list)
             self.view_leave()
@@ -268 +290 @@
         otherwise it will be a copy of the current view.
         """
+
+        self.view_reorder_before_move('new')
+
         self.view_index = self.view_index + 1
         self.view_list.insert(self.view_index,
@@ -285 +310 @@
         """Goto the next view tagged with TAG.
         """
+
+        self.view_reorder_before_move('tag %s' % tag)
 
         for i in range(self.view_index + 1, len(self.view_list)):
@@ -309 +336 @@
 
         winconf, empty = self.view_current.leave()
+
         if empty:
+            old_index = self.view_list.index(self.view_current)
+
             # Delete this view as it has become empty
-            if self.view_index > 0:
-                self.view_index = self.view_index - 1
-            self.view_list.remove(self.view_current)
-
-
+            del self.view_list[old_index]
+
+            # And adjust the destination index, if it was after the now deleted view
+            if self.view_index > old_index:
+                self.view_index -= 1
+        
         try:
             self.view_current = self.view_list[self.view_index]
-        except:
+        except IndexError:
             self.view_current = self.view_list[0]
+            self.view_index = 0
             
         self.view_winconf = winconf
@@ -334 +366 @@
             self.view_current.enter(self.view_winconf)
 
+        self.view_enter_time = time.time()
+
+
+    def view_reorder_before_move(self, method):
+        """Internal function.
+
+        Moves this view to the front of the list, if reorder is
+        enabled and the view has been visible for long enough.  Also
+        move if the enter method differs from the previous move type.
+
+        Call this in any view changing methods that steps or searches
+        among views, to get the go-to-most-recently-visited
+        functionality.
+        """
+
+        if not self.view_reorder_views:
+            return
+
+        wmanager.debug('view', 'reordering, method %s', method)
+        old_method = self.view_enter_method
+        self.view_enter_method = method
+        
+        if self.view_index == 0:
+            return
+
+        now = time.time()
+        if (now - self.view_enter_time >= self.view_reorder_delay
+            or old_method != method):
+            
+            wmanager.debug('view', 'reordering, moving view %d from index %d to front',
+                           self.view_current.id, self.view_list.index(self.view_current))
+
+            self.view_list.remove(self.view_current)
+            self.view_list.insert(0, self.view_current)
+            self.view_index = 0
+        
+        
 class XMW_ViewHandler(ViewHandler):
     def __screen_client_init__(self):