Ticket #134: libview_fix_1_of_1_rev_57888ed51447_Issue__134__Added_generic_implementation_of___sendKeyOrButtonEvent_____to__DeviceWorkstation_.patch

DeviceWorkstation.st

@@ -5168 +5168 @@
      The non-nil case is the lowlevel entry, where state must include any shift/ctrl information
      (not very user friendly)"
 
-    self subclassResponsibility
+    "/ WARNING: this is a generic implementation that completely bypasses underlaying
+    "/ system event queue. It may not be complete - it has been written as a quick hack
+    "/ to make UI testing framework kind-of working on systems where there's no proper
+    "/ implementation of this method (e.g., Windows at the time)
+
+    | view shiftWasDown ctrlWasDown altWasDown metaWasDown |
+
+    view := self viewFromId: targetId.
+
+    [
+        shiftWasDown := shiftDown.
+        altWasDown := altDown.
+        metaWasDown := metaDown.
+        ctrlWasDown := ctrlDown.
+        stateMask notNil ifTrue:[ 
+            shiftDown := (stateMask bitAnd: self shiftModifierMask) ~~ 0.
+            altDown := (stateMask bitAnd: self altModifierMask) ~~ 0.
+            metaDown := (stateMask bitAnd: self metaModifierMask) ~~ 0.
+            ctrlDown := (stateMask bitAnd: self ctrlModifierMask) ~~ 0.
+        ].
+        (typeSymbol == #keyPress or:[ typeSymbol == #keyRelease ]) ifTrue:[
+            | key |
+
+            key := keySymCodeOrButtonNr.
+            (#(Left Right Up Down) includes: key) ifTrue:[ 
+                key := (#Cursor , key) asSymbol.
+            ].
+            typeSymbol == #keyPress ifTrue:[
+                self keyPress:key x:1 y:1 view:view.
+            ] ifFalse:[
+                self keyRelease:key x:1 y:1 view:view.
+            ]
+        ] ifFalse:[  
+            self notYetImplemented.
+        ].
+    ] ensure:[ 
+        shiftDown := shiftWasDown.
+        altDown := altWasDown.
+        metaDown := metaWasDown.
+        ctrlDown := ctrlWasDown.
+    ].
+
+    "Modified (comment): / 06-05-2017 / 11:15:25 / jv"
 !
 
 simulateKeyboardInput:aCharacterOrString inViewId:viewId

WinWorkstation.st

@@ -19 +19 @@
         classVariableNames:'BeepDuration NativeDialogs NativeFileDialogs NativeWidgets
                 NativeWidgetClassTable StandardColorValues IgnoreSysColorChanges
                 IgnoreFontChanges SystemColorValues CanEndSession
-                VerboseNativeDialogs '
+                VerboseNativeDialogs'
         poolDictionaries:''
         category:'Interface-Graphics'
 !
@@ -6495 +6495 @@
     '                   Peak User Objects = ' errorPrint. counts second errorPrintCR.
     '                   # GDI Objects     = ' errorPrint. counts third errorPrintCR.
     '                   Peak GDI Objects  = ' errorPrint. counts fourth errorPrintCR.
-!   
+!
 
 printHandleCounts
    "show prim values"
@@ -8090 +8090 @@
     "Modified: / 28-01-2012 / 10:20:30 / cg"
 !
 
-destroyGC:aGCId
-%{
-    if (__isExternalAddress(aGCId)) {
-        struct gcData *gcData = _GCDATA(aGCId);
-
-        if (gcData == NULL) {
-            console_fprintf(stderr, "WinWorkstation [warning]: trying to destroy GC twice\n");
-            RETURN(self);
-        }
-
-#ifdef COUNT_RESOURCES
-         __cnt_gcData--;
-        RESPRINTF(("DestroyGcData %d\n",__cnt_gcData));
-#endif
-
-#ifdef CACHE_LAST_DC
-        if (lastGcData == gcData) {
-            _releaseDC(gcData);
-        }
-#endif
-        __ExternalAddressInstPtr(aGCId)->e_address = NULL;
-
-        freeGcData(gcData);
-    }
-%}
-!
-
-destroyPixmap:aDrawableId
-
-%{  /* NOCONTEXT */
-    if (__isExternalAddress(aDrawableId) && ISCONNECTED) {
-        HANDLE bitmapHandle = _HANDLEVal(aDrawableId);
-
-        if (bitmapHandle) {
-#ifdef COUNT_BMP_RESOURCES
-            __cnt_bitmap--;
-            RES_BMP_PRINTF(("DestroyPixmap %x %d\n", bitmapHandle, __cnt_bitmap));
-#endif
-            _DeleteObject(bitmapHandle, __LINE__);
-        }
-    }
-%}
-!
-
-destroyView:aView withId:aWindowId
-    self primDestroyView:aView withId:aWindowId.
-    self removeKnownView:aView withId:aWindowId
-!
-
 dcGetClipBoxForGC: gcId
         "Return clipping box for given device context (as  #(left top right bottom) ). "
 
@@ -8201 +8152 @@
     err:;
 %}.
     ^ self primitiveFailed: error
-!     
+!
 
 dcUnlockForGC:gcId
     "Unlocks and __destroy__ a device context for given GC previously
@@ -8224 +8175 @@
     err:;
 %}.
     ^ self primitiveFailed: error
-!     
+!
+
+destroyGC:aGCId
+%{
+    if (__isExternalAddress(aGCId)) {
+        struct gcData *gcData = _GCDATA(aGCId);
+
+        if (gcData == NULL) {
+            console_fprintf(stderr, "WinWorkstation [warning]: trying to destroy GC twice\n");
+            RETURN(self);
+        }
+
+#ifdef COUNT_RESOURCES
+         __cnt_gcData--;
+        RESPRINTF(("DestroyGcData %d\n",__cnt_gcData));
+#endif
+
+#ifdef CACHE_LAST_DC
+        if (lastGcData == gcData) {
+            _releaseDC(gcData);
+        }
+#endif
+        __ExternalAddressInstPtr(aGCId)->e_address = NULL;
+
+        freeGcData(gcData);
+    }
+%}
+!
+
+destroyPixmap:aDrawableId
+
+%{  /* NOCONTEXT */
+    if (__isExternalAddress(aDrawableId) && ISCONNECTED) {
+        HANDLE bitmapHandle = _HANDLEVal(aDrawableId);
+
+        if (bitmapHandle) {
+#ifdef COUNT_BMP_RESOURCES
+            __cnt_bitmap--;
+            RES_BMP_PRINTF(("DestroyPixmap %x %d\n", bitmapHandle, __cnt_bitmap));
+#endif
+            _DeleteObject(bitmapHandle, __LINE__);
+        }
+    }
+%}
+!
+
+destroyView:aView withId:aWindowId
+    self primDestroyView:aView withId:aWindowId.
+    self removeKnownView:aView withId:aWindowId
+!
 
 gcFor:aDrawableId
 
@@ -13171 +13171 @@
      The non-nil case is the lowlevel entry, where state must include any shift/ctrl information
      (not very user friendly)"
 
-    'WinWorkstation [warning]: sendKeyOrButtonEvent unimplemented' infoPrintCR.
-    ^ false
+    super sendKeyOrButtonEvent:typeSymbol x:xPos y:yPos keyOrButton:keySymCodeOrButtonNr state:stateMask toViewId:targetId
+
+    "Modified: / 06-05-2017 / 11:19:03 / jv"
 ! !
 
 !WinWorkstation methodsFor:'font stuff'!
@@ -19612 +19613 @@
 
 version_CVS
     ^ '$Header$'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 ! !