--- a/Cursor.st Tue Apr 08 10:37:08 1997 +0200
+++ b/Cursor.st Tue Apr 08 10:38:48 1997 +0200
@@ -247,105 +247,114 @@
!
initializeNewCursors
- "Create the new cursors
- Cursor blank
- Cursor down
- Cursor execute
- Cursor left
- Cursor marker
- Cursor normal
- Cursor read
- Cursor right
- Cursor square
- Cursor up
- Cursor wait
- Cursor write
- Cursor thumbsUp
- Cursor thumbsDown
- Cursor xMarker
- Cursor caret
- Cursor stop
- Cursor eye"
-
- |device|
-
-" claus: already there in ST/X"
+ "Create the new cursors
+ Cursor blank
+ Cursor down
+ Cursor execute
+ Cursor left
+ Cursor marker
+ Cursor normal
+ Cursor read
+ Cursor right
+ Cursor square
+ Cursor up
+ Cursor wait
+ Cursor write
+ Cursor thumbsUp
+ Cursor thumbsDown
+ Cursor xMarker
+ Cursor caret
+ Cursor stop
+ Cursor eye"
-"/ OriginCursor :=
-"/ (Cursor
-"/ extent: 16@16
-"/ fromArray: #(
-"/ 2r1111111111111111
-"/ 2r1111111111111111
-"/ 2r1100000000000000
-"/ 2r1100000000000000
-"/ 2r1100000000000000
-"/ 2r1100000000000000
-"/ 2r1100000000000000
-"/ 2r1100000000000000
-"/ 2r1100000000000000
-"/ 2r1100000000000000
-"/ 2r1100000000000000
-"/ 2r1100000000000000
-"/ 2r1100000000000000
-"/ 2r1100000000000000
-"/ 2r1100000000000000
-"/ 2r1100000000000000)
-"/ offset: -2@ -2).
-"/
+ |device builtIn|
-" claus: already there in ST/X"
+ device := Display.
+ builtIn := device builtInCursorShapes.
-"/ CornerCursor :=
-"/ (Cursor
-"/ extent: 16@16
-"/ fromArray: #(
-"/ 2r0000000000000011
-"/ 2r0000000000000011
-"/ 2r0000000000000011
-"/ 2r0000000000000011
-"/ 2r0000000000000011
-"/ 2r0000000000000011
-"/ 2r0000000000000011
-"/ 2r0000000000000011
-"/ 2r0000000000000011
-"/ 2r0000000000000011
-"/ 2r0000000000000011
-"/ 2r0000000000000011
-"/ 2r0000000000000011
-"/ 2r0000000000000011
-"/ 2r1111111111111111
-"/ 2r1111111111111111)
-"/ offset: -14@ -14).
-
-
-"original from SMACK:"
+ (builtIn includes:#origin) ifFalse:[
+ OriginCursor :=
+ (Cursor
+ extent: 16@16
+ sourceArray: #(
+ 2r0000000000000000
+ 2r0111111111111111
+ 2r0111111111111111
+ 2r0110000000000000
+ 2r0110000000000000
+ 2r0110000000000000
+ 2r0110000000000000
+ 2r0110000000000000
+ 2r0110000000000000
+ 2r0110000000000000
+ 2r0110000000000000
+ 2r0110000000000000
+ 2r0110000000000000
+ 2r0110000000000000
+ 2r0110000000000000
+ 2r0110000000000000)
+ maskArray: #(
+ 2r1111111111111111
+ 2r1111111111111111
+ 2r1111111111111111
+ 2r1111111111111111
+ 2r1111000000000000
+ 2r1111000000000000
+ 2r1111000000000000
+ 2r1111000000000000
+ 2r1111000000000000
+ 2r1111000000000000
+ 2r1111000000000000
+ 2r1111000000000000
+ 2r1111000000000000
+ 2r1111000000000000
+ 2r1111000000000000
+ 2r1111000000000000)
+ offset: -1@ -1).
+ ].
-"/ ReadCursor :=
-"/ (Cursor
-"/ extent: 16@16
-"/ fromArray: #(
-"/ 2r0000110000000110
-"/ 2r0001001000001001
-"/ 2r0001001000001001
-"/ 2r0010000000010000
-"/ 2r0100000000100000
-"/ 2r1111101111100000
-"/ 2r1000010000100000
-"/ 2r1000010000100000
-"/ 2r1011010110100000
-"/ 2r0111101111000000
-"/ 2r0000000000000000
-"/ 2r0000000000000000
-"/ 2r0000000000000000
-"/ 2r0000000000000000
-"/ 2r0000000000000000
-"/ 2r0000000000000000)
-"/ offset: 0@0).
+ (builtIn includes:#corner) ifFalse:[
+ CornerCursor :=
+ (Cursor
+ extent: 16@16
+ sourceArray: #(
+ 2r0000000000000110
+ 2r0000000000000110
+ 2r0000000000000110
+ 2r0000000000000110
+ 2r0000000000000110
+ 2r0000000000000110
+ 2r0000000000000110
+ 2r0000000000000110
+ 2r0000000000000110
+ 2r0000000000000110
+ 2r0000000000000110
+ 2r0000000000000110
+ 2r0000000000000110
+ 2r1111111111111110
+ 2r1111111111111110
+ 2r0000000000000000)
+ maskArray: #(
+ 2r0000000000001111
+ 2r0000000000001111
+ 2r0000000000001111
+ 2r0000000000001111
+ 2r0000000000001111
+ 2r0000000000001111
+ 2r0000000000001111
+ 2r0000000000001111
+ 2r0000000000001111
+ 2r0000000000001111
+ 2r0000000000001111
+ 2r0000000000001111
+ 2r1111111111111111
+ 2r1111111111111111
+ 2r1111111111111111
+ 2r1111111111111111)
+ offset: -14@ -14).
+ ].
-
-"claus: added mask"
-
+ (builtIn includes:#read) ifFalse:[
ReadCursor := (Cursor
extent: 16@16
sourceArray: #(
@@ -383,32 +392,9 @@
2r0000000000000000
2r0000000000000000)
offset: -5 @ -7).
-
-"original from SMACK:"
+ ].
-"/ WriteCursor := (Cursor
-"/ extent: 16@16
-"/ fromArray: #(
-"/ 2r0000000000000110
-"/ 2r0000000000001111
-"/ 2r0000000000010110
-"/ 2r0000000000100100
-"/ 2r0000000001001000
-"/ 2r0000000010010000
-"/ 2r0000000100100000
-"/ 2r0000001001000011
-"/ 2r0000010010000010
-"/ 2r0000100100000110
-"/ 2r0001001000001000
-"/ 2r0010010000001000
-"/ 2r0111100001001000
-"/ 2r0101000010111000
-"/ 2r0110000110000000
-"/ 2r1111111100000000)
-"/ offset: 0@0).
-
-"claus: added mask"
-
+ (builtIn includes:#write) ifFalse:[
WriteCursor := (Cursor
extent: 16@16
sourceArray: #(
@@ -446,33 +432,9 @@
2r0111111110000000
2r1111111100000000)
offset: 0@ -15).
-
-"original from SMACK:"
+ ].
-"/ WaitCursor :=
-"/ (Cursor
-"/ extent: 16@16
-"/ fromArray: #(
-"/ 2r1111111111111111
-"/ 2r1000000000000001
-"/ 2r0100000000000010
-"/ 2r0010000000000100
-"/ 2r0001110000111000
-"/ 2r0000111101110000
-"/ 2r0000011011100000
-"/ 2r0000001111000000
-"/ 2r0000001111000000
-"/ 2r0000010110100000
-"/ 2r0000100010010000
-"/ 2r0001000110001000
-"/ 2r0010001101000100
-"/ 2r0100111111110010
-"/ 2r1011111111111101
-"/ 2r1111111111111111)
-"/ offset: -8@ -8).
-
-"claus: added mask"
-
+ (builtIn includes:#wait) ifFalse:[
WaitCursor :=
(Cursor
extent: 16@16
@@ -511,35 +473,11 @@
2r1111111111111111
2r1111111111111111)
offset: -8@ -8).
-
- BlankCursor := Cursor new.
-
-"original from SMACK:"
+ ].
-"/ XeqCursor :=
-"/ (Cursor
-"/ extent: 16@16
-"/ fromArray: #(
-"/ 2r1000000000010000
-"/ 2r1100000000010000
-"/ 2r1110000000111000
-"/ 2r1111000111111111
-"/ 2r1111100011000110
-"/ 2r1111110001000100
-"/ 2r1111111001111100
-"/ 2r1111000001101100
-"/ 2r1101100011000110
-"/ 2r1001100010000010
-"/ 2r0000110000000000
-"/ 2r0000110000000000
-"/ 2r0000011000000000
-"/ 2r0000011000000000
-"/ 2r0000001100000000
-"/ 2r0000001100000000)
-"/ offset: 0@0).
+ BlankCursor := Cursor new.
-"claus: added mask"
-
+ (builtIn includes:#execute) ifFalse:[
XeqCursor :=
(Cursor
extent: 16@16
@@ -578,58 +516,33 @@
2r0000001110000000
2r0000001110000000)
offset: 0@0).
-
-"claus: already there in ST/X"
-
-"/ SquareCursor :=
-"/ (Cursor
-"/ extent: 16@16
-"/ fromArray: #(
-"/ 2r0000000000000000
-"/ 2r0000000000000000
-"/ 2r0000000000000000
-"/ 2r0000000000000000
-"/ 2r0000000000000000
-"/ 2r0000001111000000
-"/ 2r0000001111000000
-"/ 2r0000001111000000
-"/ 2r0000001111000000
-"/ 2r0000000000000000
-"/ 2r0000000000000000
-"/ 2r0000000000000000
-"/ 2r0000000000000000
-"/ 2r0000000000000000
-"/ 2r0000000000000000
-"/ 2r0000000000000000)
-"/ offset: -8@ -8).
-
+ ].
-"original from SMACK:"
+ (builtIn includes:#square) ifFalse:[
+ SquareCursor :=
+ (Cursor
+ extent: 16@16
+ fromArray: #(
+ 2r0000000000000000
+ 2r0000000000000000
+ 2r0000000000000000
+ 2r0000000000000000
+ 2r0000000000000000
+ 2r0000001111000000
+ 2r0000001111000000
+ 2r0000001111000000
+ 2r0000001111000000
+ 2r0000000000000000
+ 2r0000000000000000
+ 2r0000000000000000
+ 2r0000000000000000
+ 2r0000000000000000
+ 2r0000000000000000
+ 2r0000000000000000)
+ offset: -8@ -8).
+ ].
-"/ NormalCursor :=
-"/ (Cursor
-"/ extent: 16@16
-"/ fromArray: #(
-"/ 2r1000000000000000
-"/ 2r1100000000000000
-"/ 2r1110000000000000
-"/ 2r1111000000000000
-"/ 2r1111100000000000
-"/ 2r1111110000000000
-"/ 2r1111111000000000
-"/ 2r1111100000000000
-"/ 2r1111100000000000
-"/ 2r1001100000000000
-"/ 2r0000110000000000
-"/ 2r0000110000000000
-"/ 2r0000011000000000
-"/ 2r0000011000000000
-"/ 2r0000001100000000
-"/ 2r0000001100000000)
-"/ offset: 0@0).
-
-"claus: added mask"
-
+ (builtIn includes:#upLeftArrow) ifFalse:[
NormalCursor :=
(Cursor
extent: 16@16
@@ -668,74 +581,51 @@
2r0000001110000000
2r0000001110000000)
offset: 0@0).
-
-"original from SMACK:"
+ ].
-"/ CrossHairCursor :=
-"/ (Cursor
-"/ extent: 16@16
-"/ fromArray: #(
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r1111111111111110
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0)
-"/ offset: -7@ -7).
-
-"claus: added mask"
-
-"no: already there in ST/X"
-"/ CrossHairCursor :=
-"/ (Cursor
-"/ extent: 16@16
-"/ sourceArray: #(
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r1111111111111110
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0000000100000000
-"/ 2r0)
-"/ maskArray: #(
-"/ 2r0000000110000000
-"/ 2r0000000110000000
-"/ 2r0000000110000000
-"/ 2r0000000110000000
-"/ 2r0000000110000000
-"/ 2r0000000110000000
-"/ 2r0000000110000000
-"/ 2r1111111111111110
-"/ 2r1111111111111110
-"/ 2r0000000110000000
-"/ 2r0000000110000000
-"/ 2r0000000110000000
-"/ 2r0000000110000000
-"/ 2r0000000110000000
-"/ 2r0000000110000000
-"/ 2r0)
-"/ offset: -7@ -7).
+ (builtIn includes:#crossHair) ifFalse:[
+ CrossHairCursor :=
+ (Cursor
+ extent: 16@16
+ sourceArray: #(
+ 2r0000000100000000
+ 2r0000000100000000
+ 2r0000000100000000
+ 2r0000000100000000
+ 2r0000000100000000
+ 2r0000000100000000
+ 2r0000000100000000
+ 2r1111111111111110
+ 2r0000000100000000
+ 2r0000000100000000
+ 2r0000000100000000
+ 2r0000000100000000
+ 2r0000000100000000
+ 2r0000000100000000
+ 2r0000000100000000
+ 2r0)
+ maskArray: #(
+ 2r0000000110000000
+ 2r0000000110000000
+ 2r0000000110000000
+ 2r0000000110000000
+ 2r0000000110000000
+ 2r0000000110000000
+ 2r0000000110000000
+ 2r1111111111111110
+ 2r1111111111111110
+ 2r0000000110000000
+ 2r0000000110000000
+ 2r0000000110000000
+ 2r0000000110000000
+ 2r0000000110000000
+ 2r0000000110000000
+ 2r0)
+ offset: -7@ -7).
+ ].
+ (builtIn includes:#scrollMarkerH) ifFalse:[
MarkerCursor :=
Cursor
extent: 16@16
@@ -757,7 +647,9 @@
2r0000000000000000
2r0000000000000000)
offset: -7@ -7.
+ ].
+ (builtIn includes:#scrollUp) ifFalse:[
UpCursor :=
Cursor
extent: 16@16
@@ -779,7 +671,9 @@
2r1100000000000000
2r1100000000000000)
offset: 0@ -7.
+ ].
+ (builtIn includes:#scrollDown) ifFalse:[
DownCursor :=
Cursor
extent: 16@16
@@ -801,7 +695,9 @@
2r0000110000000000
2r0000010000000000)
offset: -5@ -7.
+ ].
+ (builtIn includes:#scrollLeft) ifFalse:[
LeftCursor :=
Cursor
extent: 16@16
@@ -823,7 +719,9 @@
2r0000000000000000
2r0000000000000000)
offset: -7@0.
+ ].
+ (builtIn includes:#scrollRight) ifFalse:[
RightCursor :=
Cursor
extent: 16@16
@@ -845,6 +743,9 @@
2r0000000000000000
2r0000000000000000)
offset: -7@ -5.
+ ].
+
+ (builtIn includes:#scrollMarkerV) ifFalse:[
XMarkerCursor :=
Cursor
extent: 16@16
@@ -866,34 +767,9 @@
2r0000001110000000
2r0000001110000000)
offset: -7@ -7.
-
-"original from SMACK:"
+ ].
-"/ FourWayCursor :=
-"/ Cursor
-"/ extent: 16@16
-"/ fromArray: #(
-"/ 2r0000000100000000
-"/ 2r0000001110000000
-"/ 2r0000011111000000
-"/ 2r0000111111100000
-"/ 2r0001001110010000
-"/ 2r0011001110011000
-"/ 2r0111111111111100
-"/ 2r1111111111111110
-"/ 2r0111111111111100
-"/ 2r0011001110011000
-"/ 2r0001001110010000
-"/ 2r0000111111100000
-"/ 2r0000011111000000
-"/ 2r0000001110000000
-"/ 2r0000000100000000
-"/ 2r0000000000000000)
-"/ offset: -7@ -7.
-"/
-
-"claus: added mask"
-
+ (builtIn includes:#fourWay) ifFalse:[
FourWayCursor :=
Cursor
extent: 16@16
@@ -932,7 +808,9 @@
2r0000001110000000
2r0000000000000000)
offset: -7@ -7.
+ ].
+ (builtIn includes:#thumbsUp) ifFalse:[
ThumbsUpCursor := (Cursor
extent: 16@16
sourceArray: #(
@@ -969,8 +847,10 @@
2r0011111111111110
2r0001111111110000
2r0001111111100000)
- offset: -8@ -8).
+ offset: -8@ 0).
+ ].
+ (builtIn includes:#caret) ifFalse:[
CaretCursor := (Cursor
extent: 16@16
fromArray: #(
@@ -991,7 +871,9 @@
2r0000000000000000
2r0000000000000000)
offset: -8@0).
+ ].
+ (builtIn includes:#thumbsDown) ifFalse:[
ThumbsDownCursor := (Cursor
extent: 16@16
sourceArray: #(
@@ -1029,8 +911,10 @@
2r0000000011110000
2r0000000001110000
2r0000000000100000)
- offset: -8@ -8).
+ offset: -8@ -16).
+ ].
+ (builtIn includes:#stop) ifFalse:[
StopCursor := (Cursor
extent: 16@16
sourceArray: #(
@@ -1070,7 +954,9 @@
2r0000011111000000
)
offset: -8 @ -8).
+ ].
+ (builtIn includes:#eyeBullet) ifFalse:[
EyeCursor := (Cursor
extent: 16@16
sourceArray: #(
@@ -1110,44 +996,45 @@
2r0000000000000000
)
offset: -8 @ -8).
-
- device := Display.
+ ].
- FourWayCursor := FourWayCursor onDevice:device.
- LeftCursor := LeftCursor onDevice:device.
- RightCursor := RightCursor onDevice:device.
- XMarkerCursor := XMarkerCursor onDevice:device.
+ FourWayCursor notNil ifTrue:[FourWayCursor := FourWayCursor onDevice:device].
+ LeftCursor notNil ifTrue:[LeftCursor := LeftCursor onDevice:device].
+ RightCursor notNil ifTrue:[RightCursor := RightCursor onDevice:device].
+ XMarkerCursor notNil ifTrue:[XMarkerCursor := XMarkerCursor onDevice:device].
-"/ OriginCursor := OriginCursor onDevice:device.
-"/ CornerCursor := CornerCursor onDevice:device.
+ OriginCursor notNil ifTrue:[OriginCursor := OriginCursor onDevice:device].
+ CornerCursor notNil ifTrue:[CornerCursor := CornerCursor onDevice:device].
- ReadCursor := ReadCursor onDevice:device.
- WriteCursor := WriteCursor onDevice:device.
- WaitCursor := WaitCursor onDevice:device.
- XeqCursor := XeqCursor onDevice:device.
+ ReadCursor notNil ifTrue:[ReadCursor := ReadCursor onDevice:device].
+ WriteCursor notNil ifTrue:[WriteCursor := WriteCursor onDevice:device].
+ WaitCursor notNil ifTrue:[WaitCursor := WaitCursor onDevice:device].
+ XeqCursor notNil ifTrue:[XeqCursor := XeqCursor onDevice:device].
-"/ SquareCursor := SquareCursor onDevice:device.
+ SquareCursor notNil ifTrue:[SquareCursor := SquareCursor onDevice:device].
+
+ NormalCursor notNil ifTrue:[NormalCursor := NormalCursor onDevice:device].
- NormalCursor := NormalCursor onDevice:device.
+ CrossHairCursor notNil ifTrue:[CrossHairCursor := CrossHairCursor onDevice:device].
-"/ CrossHairCursor := CrossHairCursor onDevice:device.
+ MarkerCursor notNil ifTrue:[MarkerCursor := MarkerCursor onDevice:device].
+ UpCursor notNil ifTrue:[UpCursor := UpCursor onDevice:device].
+ DownCursor notNil ifTrue:[DownCursor := DownCursor onDevice:device].
+ LeftCursor notNil ifTrue:[LeftCursor := LeftCursor onDevice:device].
+ RightCursor notNil ifTrue:[RightCursor := RightCursor onDevice:device].
+ XMarkerCursor notNil ifTrue:[XMarkerCursor := XMarkerCursor onDevice:device].
+ CaretCursor notNil ifTrue:[CaretCursor := CaretCursor onDevice:device].
- MarkerCursor := MarkerCursor onDevice:device.
- UpCursor := UpCursor onDevice:device.
- DownCursor := DownCursor onDevice:device.
- LeftCursor := LeftCursor onDevice:device.
- RightCursor := RightCursor onDevice:device.
- XMarkerCursor := XMarkerCursor onDevice:device.
- CaretCursor := CaretCursor onDevice:device.
+ ThumbsUpCursor notNil ifTrue:[ThumbsUpCursor := ThumbsUpCursor onDevice:device].
+ ThumbsDownCursor notNil ifTrue:[ThumbsDownCursor := ThumbsDownCursor onDevice:device].
+ StopCursor notNil ifTrue:[StopCursor := StopCursor onDevice:device].
+ EyeCursor notNil ifTrue:[EyeCursor := EyeCursor onDevice:device].
- ThumbsUpCursor := ThumbsUpCursor onDevice:device.
- ThumbsDownCursor := ThumbsDownCursor onDevice:device.
- StopCursor := StopCursor onDevice:device.
- EyeCursor := EyeCursor onDevice:device.
+ "
+ Cursor initializeNewCursors
+ "
- "Cursor initializeNewCursors"
-
- "Modified: 28.3.1997 / 16:01:50 / cg"
+ "Modified: 8.4.1997 / 10:31:09 / cg"
!
update:something with:aParameter from:changedObject
@@ -2055,6 +1942,6 @@
!Cursor class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Cursor.st,v 1.48 1997-03-28 15:02:32 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Cursor.st,v 1.49 1997-04-08 08:38:48 cg Exp $'
! !
Cursor initialize!