DeviceWorkstation.st
changeset 5917 d5b5e701a6e8
parent 5909 c8177fd7a890
child 5937 ab867dbe42dd
--- a/DeviceWorkstation.st	Tue Jul 10 09:58:20 2012 +0200
+++ b/DeviceWorkstation.st	Thu Jul 12 18:43:32 2012 +0200
@@ -4421,7 +4421,7 @@
         untranslatedKey := untranslatedKeyArg
     ].
 
-"/ Timestamp now print. 'X: ' print. untranslatedKey printCR.
+    "/ Timestamp now print. 'X: ' print. untranslatedKey printCR.
 
     "/
     "/ ctrl-Esc gives up focus
@@ -4452,7 +4452,7 @@
 "/
     aView sensor keyPress:untranslatedKey x:x y:y view:aView
 
-    "Modified: / 04-10-2011 / 19:32:52 / cg"
+    "Modified (format): / 12-07-2012 / 18:37:40 / cg"
 !
 
 keyRelease:untranslatedKeyArg x:x y:y view:aView
@@ -6696,7 +6696,12 @@
 prependModifierToKey:untranslatedKey
     |xlatedKey s modifier|
 
-    xlatedKey := untranslatedKey.
+    (ctrlDown and:[ metaDown ]) ifTrue:[
+        "/ right-ALT: already xlated (I hope)
+        ^ untranslatedKey
+    ].               
+
+    xlatedKey := untranslatedKey.  
     xlatedKey isCharacter ifFalse:[
         xlatedKey := xlatedKey asSymbol
     ].
@@ -6746,7 +6751,7 @@
 
     ^ xlatedKey
 
-    "Modified (format): / 05-10-2011 / 13:51:49 / cg"
+    "Modified (format): / 12-07-2012 / 18:37:22 / cg"
 !
 
 translateKey:untranslatedKey forView:aView
@@ -6777,15 +6782,15 @@
 
     xlatedKey := aView keyboardMap valueFor:xlatedKey.
     xlatedKey notNil ifTrue:[
-	xlatedKey isCharacter ifFalse:[
-	    xlatedKey bitsPerCharacter == 8 ifTrue:[
-		xlatedKey := xlatedKey asSymbol
-	    ]
-	]
+        xlatedKey isCharacter ifFalse:[
+            xlatedKey bitsPerCharacter == 8 ifTrue:[
+                xlatedKey := xlatedKey asSymbol
+            ]
+        ]
     ].
     ^ xlatedKey
 
-    "Modified: 28.2.1996 / 17:12:16 / cg"
+    "Modified: / 12-07-2012 / 18:37:47 / cg"
 ! !
 
 !DeviceWorkstation methodsFor:'keyboard queries'!
@@ -8137,11 +8142,11 @@
 !DeviceWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.567 2012-04-25 19:06:51 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.568 2012-07-12 16:43:32 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.567 2012-04-25 19:06:51 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.568 2012-07-12 16:43:32 cg Exp $'
 ! !
 
 DeviceWorkstation initialize!