fixes bug where copy/paste were blocked when keyhandler was active

jeremymarch · May 31, 2022 · 64e25b1 · 64e25b1
1 parent 21bfd63
commit 64e25b1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/HKToolbar.xcu b/src/HKToolbar.xcu
@@ -3,7 +3,7 @@
   <node oor:name="AddonUI">
     <node oor:name="OfficeToolBar">
       <node oor:name="com.philolog.hoplitekb.toolbar" oor:op="replace">
-        <node oor:name="button1" oor:op="replace">
+        <node oor:name="com.philolog.hoplitekb.button1" oor:op="replace">
           <prop oor:name="URL" oor:type="xs:string">
             <value>com.philolog.hoplitekb:open</value>
           </prop>

diff --git a/src/images/hop24.png b/src/images/hop24.png
diff --git a/src/images/hop48.png b/src/images/hop48.png
diff --git a/src/py/hoplitekb.py b/src/py/hoplitekb.py
@@ -154,8 +154,7 @@ def __init__(self, parent):
     def dispatch(self, url, args):
         self.state = not self.state
         ev = self.create_simple_event(url, self.state)
-        self.listener.statusChanged(ev)
-
+        self.listener.statusChanged(ev) #this shades the button to indicate toggled state
         self.toggle_action()
 
     def addStatusListener(self, listener, url):
@@ -167,7 +166,7 @@ def removeStatusListener(self, listener, url): pass
     def controlEvent(self, ev): pass
 
     def create_simple_event(self, url, state, enabled=True):
-        return FeatureStateEvent(self, url, "", enabled, False, state) #this shades the button to indicate toggled state
+        return FeatureStateEvent(self, url, "", enabled, False, state)
 
     def toggle_action(self):
         if self.state == False:
@@ -182,6 +181,13 @@ def __init__(self, parent, ctx):
         self.ctx = ctx
 
     def keyPressed(self, oEvent):
+        #do not interfere with modified keys except shift
+        #1 shift                SHIFT
+        #2 control/command      MOD1
+        #4 alt                  MOD2
+        #8 control on macOS     MOD3
+        if oEvent.Modifiers != 0 and oEvent.Modifiers != 1:
+            return False
         letter = oEvent.KeyChar.value
         if letter.isnumeric():
             self.parent.toggleDiacritic(letter)
@@ -292,6 +298,7 @@ def queryDispatch(self, url, name, flag):
                     dispatch = Dispatcher(self)
                 except Exception as e:
                     print(e)
+                    #insertString(self.ctx, str(e))
             return dispatch
 
     def queryDispatches(self, requests):