Changeset 235

Timestamp:

06/06/06 18:49:28 (18 years ago)

Author:

Nicholas Riley

Message:

StreamVision.py: Pass through cmd-ctrl-\ in Emacs and X11 (C-M-\ is used in Emacs, and it doesn't handle being zoomed through the accessibility interface properly anyway); handle exceptions better when app doesn't respond to zooming Apple Events

File:

• trunk/StreamVision/StreamVision.py (modified) (4 diffs)

trunk/StreamVision/StreamVision.py

@@ -119 +119 @@
         self.hotKeys.append(hotKeyRef)
         self.hotKeyActions[HotKey.HotKeyAddress(hotKeyRef)] = func
+        return hotKeyRef
+
+    def unregisterHotKey(self, hotKeyRef):
+        self.hotKeys.remove(hotKeyRef)
+        del self.hotKeyActions[HotKey.HotKeyAddress(hotKeyRef)]
+        hotKeyRef.UnregisterEventHotKey()
 
     def incrementRatingBy(self, increment):
@@ -145 +151 @@
             else:
                 XTensionApp().turnoff('Stereo')
-                
+
+    def registerZoomWindowHotKey(self):
+        self.zoomWindowHotKey = self.registerHotKey(self.zoomWindow, 42, cmdKey | controlKey) # cmd-ctrl-\
+
+    def unregisterZoomWindowHotKey(self):
+        self.unregisterHotKey(self.zoomWindowHotKey)
+        self.zoomWindowHotKey = None
+
     def zoomWindow(self):
         systemEvents = app(id='com.apple.systemEvents')
@@ -153 +166 @@
                 menu_bar_items['Window'].menus.menu_items['Zoom'].click()
             return
+        elif frontName in ('X11', 'Emacs'): # preserve C-M-\
+            self.unregisterZoomWindowHotKey()
+            systemEvents.key_code(42, using=[k.command_down, k.control_down])
+            self.registerZoomWindowHotKey()
+            return
         try:
             zoomed = app(frontName).windows[1].zoomed
             zoomed.set(not zoomed())
-        except CommandError:
+        except (CommandError, RuntimeError):
             systemEvents.processes[frontName].windows. \
                 filter(its.subrole == 'AXStandardWindow').windows[1]. \
@@ -170 +188 @@
         self.registerHotKey(lambda: self.incrementRatingBy(-20), 109, shiftKey) # shift-F10
         self.registerHotKey(lambda: self.incrementRatingBy(20), 103, shiftKey) # shift-F11
-        self.registerHotKey(self.zoomWindow, 42, cmdKey | controlKey) # cmd-ctrl-\
+        self.registerZoomWindowHotKey()
         NSDistributedNotificationCenter.defaultCenter().addObserver_selector_name_object_(self, self.displayTrackInfo, 'com.apple.iTunes.playerInfo', None)