qtvcp -fix xembed keyboard forwarding error

Seems to send press and release events now.

Author: c-morley

lib/python/qtvcp/lib/xembed.py

@@ -55,6 +55,8 @@ def reparent_qt_to_x11(window, parent):
 
 
 class XEmbedForwarding():
+    # nothimg to ignore at this time (use qt.key definitions)
+    ignore = []
 
     def __init__(self, window, forward):
 
@@ -68,47 +70,26 @@ def __init__(self, window, forward):
         d = display.Display()
         self.fw = drawable.Window(d.display, forward, 0)
 
-        self.forward = forward
         self.window = window
-        self.d = d
         window.keyPressTrap = self.catch_keypress
         window.keyReleaseTrap = self.catch_keyrelease
 
     def catch_keypress(self, e):
-        print(e.nativeScanCode())
-        print(e.nativeVirtualKey())
-        print(e.text())
-        self.forward(e, e.nativeScanCode())
+        #print(e.key())
+        self.forward(e, e.nativeScanCode(),True)
 
     def catch_keyrelease(self, e):
-        return
-
-    # ks = gtk.keysyms
-    # ignore = [ ks.Tab, ks.Page_Up, ks.Page_Down
-    #         , ks.KP_Page_Up, ks.KP_Page_Down
-    #         , ks.Left, ks.Right, ks.Up, ks.Down
-    #         , ks.KP_Left, ks.KP_Right, ks.KP_Up, ks.KP_Down
-    #         , ks.bracketleft, ks.bracketright
-    #         ]
-
-    def gtk2xlib(e, fw, g, type=None):
-        if type is None: type = e.type
-        if type == gdk.KEY_PRESS:
+        self.forward(e, e.nativeScanCode(),False)
+
+    def build_event(self, e, keycode, g, type=None):
+        if type:
             klass = event.KeyPress
-        elif type == gdk.KEY_RELEASE:
+        elif type == False:
             klass = event.KeyRelease
         else:
             return
-        kw = dict(window=fw, detail=e.hardware_keycode,
-                  state=e.state & 0xff,
-                  child=X.NONE, root=g._data['root'],
-                  root_x=g._data['x'], root_y=g._data['y'],
-                  event_x=0, event_y=0, same_screen=1)
-        return klass(time=e.time, **kw)
-
-    def build_event(self, e, keycode, g):
-        klass = event.KeyPress
         time_lie = 264209133  # can't get XWIN event time from qtvcp events
+
         kw = dict(window=self.fw,  # window id to forward to
                   detail=keycode,  # keysys code
                   state=0,  # shift/cntrl/ etc modifier state anded together
@@ -120,12 +101,12 @@ def build_event(self, e, keycode, g):
                   same_screen=1)  # not from our screen
         return klass(time=time_lie, **kw)
 
-    def forward(self, e, keycode):
-        #        if e.keyval in ignore:
-        #            return
+    def forward(self, e, keycode,type):
+        if e in self.ignore:
+            return
 
         g = self.fw.get_geometry()
-        fe = self.build_event(e, keycode, g)
+        fe = self.build_event(e, keycode, g,type)
         if not fe: return
 
         self.fw.send_event(fe)

lib/python/qtvcp/qt_makegui.py

@@ -109,7 +109,7 @@ def getRegisteredHalWidgetList(self):
     def keyPressEvent(self, e):
         self.keyPressTrap(e)
 
-    def keyreleaseEvent(self, e):
+    def keyReleaseEvent(self, e):
         self.keyReleaseTrap(e)
 
     # These can get class patched by xembed library to catch events