Mercurial Mercurial > hg > stx-libview / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
WindowEvent.st
changeset 1861 1b1e49147380
parent 1841 3773debcc078
child 1862 e56d9a7389bb 
--- a/WindowEvent.st	Wed Aug 13 20:29:56 1997 +0200
+++ b/WindowEvent.st	Wed Aug 13 22:10:53 1997 +0200
@@ -17,9 +17,9 @@
 	category:'Interface-Support'
 !
 
-WindowEvent subclass:#ButtonEvent
-	instanceVariableNames:''
-	classVariableNames:''
+WindowEvent subclass:#InputEvent
+	instanceVariableNames:'modifierFlags'
+	classVariableNames:'F_CTRL F_ALT F_META F_SHIFT'
 	poolDictionaries:''
 	privateIn:WindowEvent
 !
@@ -31,9 +31,16 @@
 	privateIn:WindowEvent
 !
 
-WindowEvent subclass:#KeyboardEvent
-	instanceVariableNames:'rawKey modifierFlags'
-	classVariableNames:'F_CTRL F_ALT F_META F_SHIFT'
+WindowEvent::InputEvent subclass:#ButtonEvent
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:WindowEvent
+!
+
+WindowEvent::InputEvent subclass:#KeyboardEvent
+	instanceVariableNames:'rawKey'
+	classVariableNames:''
 	poolDictionaries:''
 	privateIn:WindowEvent
 !
@@ -657,6 +664,87 @@
 	delegate:true
 ! !
 
+!WindowEvent::InputEvent class methodsFor:'class initialization'!
+
+initialize
+    F_SHIFT := 1.
+    F_CTRL := 2.
+    F_ALT := 4.
+    F_META := 8.
+
+    "Created: 13.8.1997 / 22:01:50 / cg"
+! !
+
+!WindowEvent::InputEvent methodsFor:'accessing'!
+
+hasShift:shift hasCtrl:ctrl hasAlt:alt hasMeta:meta
+    |f "{ Class: SmallInteger }"|
+
+    f := 0.
+    shift ifTrue:[f := f bitOr:F_SHIFT].
+    ctrl ifTrue:[f := f bitOr:F_CTRL].
+    alt ifTrue:[f := f bitOr:F_ALT].
+    meta ifTrue:[f := f bitOr:F_META].
+    modifierFlags := f.
+
+    "Created: 13.8.1997 / 22:02:09 / cg"
+! !
+
+!WindowEvent::InputEvent methodsFor:'queries'!
+
+hasAlt
+    "return true, if this is an event, with ALT pressed"
+
+    ^ (modifierFlags bitAnd:F_ALT) ~~ 0
+
+    "Created: 13.8.1997 / 22:02:23 / cg"
+    "Modified: 13.8.1997 / 22:02:44 / cg"
+!
+
+hasCtrl
+    "return true, if this is an event, with CTRL pressed"
+
+    ^ (modifierFlags bitAnd:F_CTRL) ~~ 0
+
+    "Created: 13.8.1997 / 22:02:29 / cg"
+    "Modified: 13.8.1997 / 22:02:48 / cg"
+!
+
+hasMeta
+    "return true, if this is an event, with META pressed"
+
+    ^ (modifierFlags bitAnd:F_META) ~~ 0
+
+    "Modified: 12.4.1997 / 11:11:10 / cg"
+    "Created: 13.8.1997 / 22:02:59 / cg"
+!
+
+hasShift
+    "return true, if this is an event, with SHIFT pressed"
+
+    ^ (modifierFlags bitAnd:F_SHIFT) ~~ 0
+
+    "Created: 13.8.1997 / 22:03:09 / cg"
+! !
+
+!WindowEvent::ClientEvent methodsFor:'accessing'!
+
+eventData
+    "return the value of the instance variable 'eventData' (automatically generated)"
+
+    ^ eventData
+
+    "Created: 4.4.1997 / 17:41:50 / cg"
+!
+
+eventData:something
+    "set the value of the instance variable 'eventData' (automatically generated)"
+
+    eventData := something.
+
+    "Created: 4.4.1997 / 17:41:57 / cg"
+! !
+
 !WindowEvent::ButtonEvent methodsFor:'accessing'!
 
 x
@@ -703,50 +791,8 @@
     "Created: 4.4.1997 / 13:44:22 / cg"
 ! !
 
-!WindowEvent::ClientEvent methodsFor:'accessing'!
-
-eventData
-    "return the value of the instance variable 'eventData' (automatically generated)"
-
-    ^ eventData
-
-    "Created: 4.4.1997 / 17:41:50 / cg"
-!
-
-eventData:something
-    "set the value of the instance variable 'eventData' (automatically generated)"
-
-    eventData := something.
-
-    "Created: 4.4.1997 / 17:41:57 / cg"
-! !
-
-!WindowEvent::KeyboardEvent class methodsFor:'class initialization'!
-
-initialize
-    F_SHIFT := 1.
-    F_CTRL := 2.
-    F_ALT := 4.
-    F_META := 8.
-
-    "Created: 12.4.1997 / 11:08:28 / cg"
-! !
-
 !WindowEvent::KeyboardEvent methodsFor:'accessing'!
 
-hasShift:shift hasCtrl:ctrl hasAlt:alt hasMeta:meta
-    |f "{ Class: SmallInteger }"|
-
-    f := 0.
-    shift ifTrue:[f := f bitOr:F_SHIFT].
-    ctrl ifTrue:[f := f bitOr:F_CTRL].
-    alt ifTrue:[f := f bitOr:F_ALT].
-    meta ifTrue:[f := f bitOr:F_META].
-    modifierFlags := f.
-
-    "Modified: 12.4.1997 / 11:10:38 / cg"
-!
-
 key
     "return the key of the key-event."
 
@@ -788,41 +834,6 @@
 
 !WindowEvent::KeyboardEvent methodsFor:'queries'!
 
-hasAlt
-    "return true, if this is a keyboard event, with ALT pressed"
-
-    ^ (modifierFlags bitAnd:F_ALT) ~~ 0
-
-    "Created: 12.4.1997 / 11:05:09 / cg"
-    "Modified: 12.4.1997 / 11:10:57 / cg"
-!
-
-hasCtrl
-    "return true, if this is a keyboard event, with CTRL pressed"
-
-    ^ (modifierFlags bitAnd:F_CTRL) ~~ 0
-
-    "Created: 12.4.1997 / 11:05:04 / cg"
-    "Modified: 12.4.1997 / 11:11:03 / cg"
-!
-
-hasMeta
-    "return true, if this is a keyboard event, with META pressed"
-
-    ^ (modifierFlags bitAnd:F_META) ~~ 0
-
-    "Created: 12.4.1997 / 11:04:45 / cg"
-    "Modified: 12.4.1997 / 11:11:10 / cg"
-!
-
-hasShift
-    "return true, if this is a keyboard event, with SHIFT pressed"
-
-    ^ (modifierFlags bitAnd:F_SHIFT) ~~ 0
-
-    "Created: 12.4.1997 / 11:11:21 / cg"
-!
-
 isKeyEvent
     "return true, if this event is a keyboard event"
 
@@ -834,5 +845,5 @@
 !WindowEvent class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WindowEvent.st,v 1.44 1997-08-01 13:40:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WindowEvent.st,v 1.45 1997-08-13 20:10:32 cg Exp $'
 ! !
hg/stx-libview