Changeset 173

Timestamp:

04/28/2005 03:12:37 AM (4 years ago)

Author:

petli

Message:

Improve IM tracing: avoid having clients of the same type overwriting each others unseen status

Files:

• trunk/examples/petliwm.py (modified) (5 diffs)

trunk/examples/petliwm.py

@@ -72 +72 @@
     
     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
@@ -79 +84 @@
                 self.dispatch.add_handler(wmevents.ClientIconified, self.traceim_handle_iconified)
                 self.dispatch.add_handler(wmevents.ClientDeiconified, self.traceim_handle_iconified)
+                self.traceim_update()
                 break
 
+    def __client_del__(self):
+        if self.traceim_is_unseen:
+            self.wm.traceim_remove_message(self)
 
     def traceim_handle_property(self, evt):
@@ -91 +100 @@
     def traceim_update(self):
         if self.traceim_unseen(self):
-            self.wm.traceim_add_message(self.traceim_message)
+            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)
         else:
-            self.wm.traceim_remove_message(self.traceim_message)
+            if self.traceim_is_unseen:
+                wmanager.debug('traceim', 'No longer unseen IM for %s' % self.get_title())
+                self.traceim_is_unseen = 0
+                self.wm.traceim_remove_message(self)
             
 
@@ -100 +115 @@
     mw_traceim_justification = modewindow.LEFT
     
-    def __wm_init__(self):
-        self.mw_traceim_messages = []
+    def __wm_screen_init__(self):
+        self.mw_traceim_unseen_clients = {}
         self.mw_traceim_message = modewindow.Message(self.mw_traceim_position,
                                                      self.mw_traceim_justification)
+
+    def __wm_init__(self):
         for s in self.screens:
             s.modewindow_add_message(self.mw_traceim_message)
             
-    def traceim_add_message(self, message):
-        if message not in self.mw_traceim_messages:
-            self.mw_traceim_messages.append(message)
-            self.mw_traceim_message.set_text(' '.join(self.mw_traceim_messages))
-
-    def traceim_remove_message(self, message):
+    def traceim_add_message(self, client, message):
+        self.mw_traceim_unseen_clients[client] = message
+        self.mw_traceim_message.set_text(' '.join(self.mw_traceim_unseen_clients.values()))
+
+    def traceim_remove_message(self, client):
         try:
-            self.mw_traceim_messages.remove(message)
-        except ValueError:
+            del self.mw_traceim_unseen_clients[client]
+        except KeyError:
             return
         
-        self.mw_traceim_message.set_text(' '.join(self.mw_traceim_messages))
+        self.mw_traceim_message.set_text(' '.join(self.mw_traceim_unseen_clients.values()))
         
 
@@ -141 +157 @@
 
     traceim_clients = [
-        (And(name('Emacs'), re_title('KOM')), # only KOM client Emacs
+        (name('Emacs'),                       # KOM runs in Emacs
          And(iconified, re_title('Olästa')),  # only when iconified and unread
          'Olästa')