hg/stx-libview: comparison DeviceWorkstation.st

equal deleted inserted replaced

-:1afd95cb26cf
+:a3002e14b6bd
 DeviceWorkstation comment:'
 COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
-$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.18 1994-10-10 02:29:56 claus Exp $
+$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.19 1994-10-28 03:14:34 claus Exp $
 '!
 !DeviceWorkstation class methodsFor:'documentation'!
 copyright
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.18 1994-10-10 02:29:56 claus Exp $
+$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.19 1994-10-28 03:14:34 claus Exp $
 "
 !
 documentation
 "
 buttonTranslation:anArray
 "set the button translation, #(1 2 3) is no-translation,
 #(3 2 1) is ok for left-handers"
-ButtonTranslation := anArray
+ButtonTranslation := anArray.
+Display notNil ifTrue:[
+	Display buttonTranslation:anArray
+].
 ! !
 !DeviceWorkstation methodsFor:'initialize / release'!
 initialize
 buttonTranslation
 ^ buttonTranslation
 !
+buttonTranslation:anArray
+buttonTranslation := anArray
+!
 multiClickTimeDelta
 ^ multiClickTimeDelta
-!
-buttonTranslation:anArray
-buttonTranslation := anArray
 !
 multiClickTimeDelta:milliseconds
 multiClickTimeDelta := milliseconds
 ! !
 |curs p|
 curs := Cursor crossHair on:self.
 self ungrabPointer.
-self grabPointerIn:RootView id withCursor:curs id
+self grabPointerIn:(RootView id) withCursor:(curs id)
-	     pointerMode:#async keyboardMode:#sync confineTo:nil.
+	 pointerMode:#async keyboardMode:#sync confineTo:nil.
 ActiveGrab := RootView.
 [self leftButtonPressed] whileFalse:[].
 p := self pointerPosition.
 curs1 := Cursor origin on:self.
 curs2 := Cursor corner on:self.
 self ungrabPointer.
-self grabPointerIn:RootView id withCursor:curs1 id
+self grabPointerIn:(RootView id) withCursor:(curs1 id)
-	     pointerMode:#async keyboardMode:#sync confineTo:nil.
+	 pointerMode:#async keyboardMode:#sync confineTo:nil.
 ActiveGrab := RootView.
 [self leftButtonPressed] whileFalse:[].
 origin := self pointerPosition.
 self ungrabPointer.
-self grabPointerIn:RootView id withCursor:curs1 id
+self grabPointerIn:(RootView id) withCursor:(curs1 id)
 	     pointerMode:#async keyboardMode:#sync confineTo:nil.
 RootView noClipByChildren.
 	"
 	inputSema := Semaphore new.
 	p := [
 	    [dispatching] whileTrue:[
 		self eventPending ifFalse:[
+		    Processor activeProcess setStateTo:#ioWait if:#active.
 		    inputSema wait.
 		].
 		"
 		 in case of an error in the dispatch (i.e. WSensor
 !
 facesInFamily:aFamilyName
 "return a set of all available font faces in aFamily on this display"
-|allFonts faces family face|
+|allFonts faces "family face"|
 allFonts := self listOfAvailableFonts.
 allFonts isNil ifTrue:[^ nil].
 faces := Set new.
 "/        (family = aFamilyName) ifTrue:[
 "/            face := fntDescr at:2.
 "/            faces add:face
 "/        ]
 "/ new:
-	fntDescr family = aFamilyName ifTrue:[
+	aFamilyName = fntDescr family ifTrue:[
 	    faces add:(fntDescr face)
 	]
 ].
 ^ faces
 !
 stylesInFamily:aFamilyName face:aFaceName
 "return a set of all available font styles in aFamily/aFace on this display"
-|allFonts styles family face style|
+|allFonts styles "family face style"|
 allFonts := self listOfAvailableFonts.
 allFonts isNil ifTrue:[^ nil].
 styles := Set new.
 "/            (face = aFaceName) ifTrue:[
 "/                style := fntDescr at:3.
 "/                styles add:style
 "/            ]
 "/        ]
-	(fntDescr family = aFamilyName) ifTrue:[
+	(aFamilyName = fntDescr family) ifTrue:[
-	    (fntDescr face = aFaceName) ifTrue:[
+	    (aFaceName = fntDescr face) ifTrue:[
 		styles add:fntDescr style
 	    ]
 	]
 ].
 ^ styles
 sizesInFamily:aFamilyName face:aFaceName style:aStyleName
 "return a set of all available font sizes in aFamily/aFace/aStyle
 on this display"
-|allFonts sizes family face style size|
+|allFonts sizes "family face style size"|
 allFonts := self listOfAvailableFonts.
 allFonts isNil ifTrue:[^ nil].
 sizes := Set new.
 "/                    size := fntDescr at:4.
 "/                    sizes add:size
 "/                ]
 "/            ]
 "/        ]
-	(fntDescr family = aFamilyName) ifTrue:[
+	(aFamilyName = fntDescr family) ifTrue:[
-	    (fntDescr face = aFaceName) ifTrue:[
+	    (aFaceName = fntDescr face) ifTrue:[
-		(fntDescr style = aStyleName) ifTrue:[
+		(aStyleName = fntDescr style) ifTrue:[
 		    sizes add:fntDescr size
 		]
 	    ]
 	]
 ].
 "release the keyboard"
 ^ self subclassResponsibility
 !
+grabPointerIn:aWindowId withCursor:cursorId pointerMode:pMode keyboardMode:kMode confineTo:confineId
+"grap the pointer - all pointer events will be reported to aWindowId. The cursor will be set to cursorId
+for the duration of the grab. For pMode/kMode, see X documentation. The pointer is restricted to
+confineId - if non-nil."
+^ self subclassResponsibility
+!
 grabPointerIn:aWindowId
-"grap the pointer"
+"grap the pointer - return true if ok"
-^ self subclassResponsibility
+^ self grabPointerIn:aWindowId withCursor:nil pointerMode:#async keyboardMode:#sync confineTo:nil
 !
 ungrabPointer
 "release the pointer"
 ^ self subclassResponsibility
 ! !
 !DeviceWorkstation methodsFor:'drawing'!
-displayString:aString x:x y:y in:aDrawableId with:aGCId round:round opaque:opaque
+displayString:aString x:x y:y in:aDrawableId with:aGCId opaque:opaque
 "draw a string"
 ^ self subclassResponsibility
 !
-displayString:aString from:i1 to:i2 x:x y:y in:aDrawableId with:aGCId round:round opaque:opaque
+displayString:aString from:i1 to:i2 x:x y:y in:aDrawableId with:aGCId opaque:opaque
 "draw part of a string"
-"should be redefined to avoid creation of throw-away string"
+"
+should be redefined in concrete subclasses
+to avoid creation of throw-away string
+"
 self displayString:(aString copyFrom:i1 to:i2)
 		     x:x
 		     y:y
 		     in:aDrawableId
 		     with:aGCId
-		     round:round
 		     opaque:opaque
 !
 displayString:aString x:x y:y in:aDrawableId with:aGCId
 "draw a string - draw foreground only.
+If the coordinates are not integers, retry with rounded."
+self
+	displayString:aString
+	x:x
+	y:y
+	in:aDrawableId
+	with:aGCId
+	opaque:false
+!
+displayString:aString from:index1 to:index2 x:x y:y in:aDrawableId with:aGCId
+"draw a sub-string - draw foreground only.
+If the coordinates are not integers, retry with rounded."
+self
+	displayString:aString
+	from:index1
+	to:index2
+	x:x
+	y:y
+	in:aDrawableId
+	with:aGCId
+	opaque:false
+!
+displayOpaqueString:aString x:x y:y in:aDrawableId with:aGCId
+"draw a string - draw foreground on background.
 If the coordinates are not integers, retry with rounded."
 self displayString:aString
 	 x:x
 	 y:y
 	 in:aDrawableId
 	 with:aGCId
-	 round:true
+	 opaque:true
-	 opaque:false
+!
-!
+displayOpaqueString:aString from:index1 to:index2 x:x y:y in:aDrawableId with:aGCId
-displayString:aString from:index1 to:index2 x:x y:y in:aDrawableId with:aGCId
+"draw a sub-string - draw foreground on background.
-"draw a sub-string - draw foreground only.
 If the coordinates are not integers, retry with rounded."
 self displayString:aString
 	 from:index1
 	 to:index2
 	 x:x
 	 y:y
 	 in:aDrawableId
 	 with:aGCId
-	 round:true
-	 opaque:false
-!
-displayOpaqueString:aString x:x y:y in:aDrawableId with:aGCId
-"draw a string - draw foreground on background.
-If the coordinates are not integers, retry with rounded."
-self displayString:aString
-	 x:x
-	 y:y
-	 in:aDrawableId
-	 with:aGCId
-	 round:true
-	 opaque:true
-!
-displayOpaqueString:aString from:index1 to:index2 x:x y:y in:aDrawableId with:aGCId
-"draw a sub-string - draw foreground on background.
-If the coordinates are not integers, retry with rounded."
-self displayString:aString
-	 from:index1
-	 to:index2
-	 x:x
-	 y:y
-	 in:aDrawableId
-	 with:aGCId
-	 round:true
 	 opaque:true
 !
 displayPointX:x y:y in:aDrawableId with:aGCId
 "draw a point"
 !
 displayRectangleX:x y:y width:width height:height in:aDrawableId with:aGCId
 "draw a rectangle"
-"should draw four lines here"
+"
+should draw four lines here
+but then, we have to reimplement all line styles here
+"
 ^ self subclassResponsibility
 !
 displayPolygon:aPolygon in:aDrawableId with:aGCId
 "draw a polygon"
-"should draw the lines here"
+"
+should draw the lines here
+but then, we have to reimplement all line styles here
+"
 ^ self subclassResponsibility
 !
 copyFromFaxImage:sourceId x:srcX y:srcY to:destId x:dstX y:dstY
 		      width:w height:h with:aGCId scaleX:scaleX scaleY:scaleY

changeset 75	a3002e14b6bd
parent 71	6a42b2b115f8
child 81	4ba554473294