Cursor.st
changeset 2370 5f45f0d30fba
parent 2362 e391d80efdb5
child 2372 e84fd06f8d2d
--- a/Cursor.st	Mon Sep 28 11:25:02 1998 +0200
+++ b/Cursor.st	Mon Sep 28 11:27:16 1998 +0200
@@ -326,9 +326,10 @@
 	    Cursor stop
 	    Cursor eye"
 
-    |device builtIn|
+    |device builtIn bits isWindows|
 
     device := Display.
+    isWindows := device platformName = 'WIN32'.
     builtIn := device builtInCursorShapes.
 
     (builtIn includes:#folder) ifFalse:[
@@ -788,26 +789,48 @@
     ].
 
     (builtIn includes:#scrollMarkerH) ifFalse:[
+	isWindows ifTrue:[
+	    bits := #(
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111110111111111
+		    2r1111110001111111
+		    2r1111110000011111
+		    2r1000000000000111
+		    2r1000000000000001
+		    2r1000000000000111
+		    2r1111110000011111
+		    2r1111110001111111
+		    2r1111110111111111
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111111111111111).
+	] ifFalse:[
+	    bits := #(
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000001000000000
+		    2r0000001110000000
+		    2r0000001111100000
+		    2r0111111111111000
+		    2r0111111111111110
+		    2r0111111111111000
+		    2r0000001111100000
+		    2r0000001110000000
+		    2r0000001000000000
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000000000000000).
+	].
+
 	MarkerCursor := 
 		Cursor
 			extent: 16@16
-			sourceArray: #(
-		2r0000000000000000
-		2r0000000000000000
-		2r0000000000000000
-		2r0000001000000000
-		2r0000001110000000
-		2r0000001111100000
-		2r0111111111111000
-		2r0111111111111110
-		2r0111111111111000
-		2r0000001111100000
-		2r0000001110000000
-		2r0000001000000000
-		2r0000000000000000
-		2r0000000000000000
-		2r0000000000000000
-		2r0000000000000000)
+			sourceArray:bits
 			maskArray: #(
 		2r0000000000000000
 		2r0000000000000000
@@ -829,26 +852,47 @@
     ].
 
     (builtIn includes:#scrollUp) ifFalse:[
+	isWindows ifTrue:[
+	    bits := #(
+		    2r1111111111111111
+		    2r1011111111111111
+		    2r1001111111111111
+		    2r1000111111111111
+		    2r1000011111111111
+		    2r1000001111111111
+		    2r1000000111111111
+		    2r1001111111111111
+		    2r1001111111111111
+		    2r1001111111111111
+		    2r1001111111111111
+		    2r1001111111111111
+		    2r1001111111111111
+		    2r1001111111111111
+		    2r1001111111111111
+		    2r1111111111111111).
+	] ifFalse:[
+	    bits := #(
+		    2r0000000000000000
+		    2r0100000000000000
+		    2r0110000000000000
+		    2r0111000000000000
+		    2r0111100000000000
+		    2r0111110000000000
+		    2r0111111000000000
+		    2r0110000000000000
+		    2r0110000000000000
+		    2r0110000000000000
+		    2r0110000000000000
+		    2r0110000000000000
+		    2r0110000000000000
+		    2r0110000000000000
+		    2r0110000000000000
+		    2r0000000000000000).
+	].
 	UpCursor := 
 		Cursor 
 			extent: 16@16
-			sourceArray: #(
-		2r0000000000000000
-		2r0100000000000000
-		2r0110000000000000
-		2r0111000000000000
-		2r0111100000000000
-		2r0111110000000000
-		2r0111111000000000
-		2r0110000000000000
-		2r0110000000000000
-		2r0110000000000000
-		2r0110000000000000
-		2r0110000000000000
-		2r0110000000000000
-		2r0110000000000000
-		2r0110000000000000
-		2r0000000000000000)
+			sourceArray:bits
 			maskArray: #(
 		2r1100000000000000
 		2r1110000000000000
@@ -870,26 +914,48 @@
     ].
 
     (builtIn includes:#scrollDown) ifFalse:[
+	isWindows ifTrue:[
+	    bits := #(
+		    2r1111111111111111
+		    2r1111100111111111
+		    2r1111100111111111
+		    2r1111100111111111
+		    2r1111100111111111
+		    2r1111100111111111
+		    2r1111100111111111
+		    2r1111100111111111
+		    2r1111100111111111
+		    2r1000000111111111
+		    2r1100000111111111
+		    2r1110000111111111
+		    2r1111000111111111
+		    2r1111100111111111
+		    2r1111110111111111
+		    2r1111111111111111).
+	] ifFalse:[
+	    bits := #(
+		    2r0000000000000000
+		    2r0000011000000000
+		    2r0000011000000000
+		    2r0000011000000000
+		    2r0000011000000000
+		    2r0000011000000000
+		    2r0000011000000000
+		    2r0000011000000000
+		    2r0000011000000000
+		    2r0111111000000000
+		    2r0011111000000000
+		    2r0001111000000000
+		    2r0000111000000000
+		    2r0000011000000000
+		    2r0000001000000000
+		    2r0000000000000000).
+	].
+
 	DownCursor :=
 		 Cursor 
 			extent: 16@16
-			sourceArray: #(
-		2r0000000000000000
-		2r0000011000000000
-		2r0000011000000000
-		2r0000011000000000
-		2r0000011000000000
-		2r0000011000000000
-		2r0000011000000000
-		2r0000011000000000
-		2r0000011000000000
-		2r0111111000000000
-		2r0011111000000000
-		2r0001111000000000
-		2r0000111000000000
-		2r0000011000000000
-		2r0000001000000000
-		2r0000000000000000)
+			sourceArray:bits
 			maskArray: #(
 		2r0000111100000000
 		2r0000111100000000
@@ -911,26 +977,48 @@
     ].
 
     (builtIn includes:#scrollLeft) ifFalse:[
+	isWindows ifTrue:[
+	    bits := #(
+		    2r1111111111111111
+		    2r1000000000000001
+		    2r1100000000000001
+		    2r1110000111111111
+		    2r1111000111111111
+		    2r1111100111111111
+		    2r1111110111111111
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111111111111111).
+	] ifFalse:[
+	    bits := #(
+		    2r0000000000000000
+		    2r0111111111111110
+		    2r0011111111111110
+		    2r0001111000000000
+		    2r0000111000000000
+		    2r0000011000000000
+		    2r0000001000000000
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000000000000000).
+	].
+
 	LeftCursor := 
 		Cursor 
 			extent: 16@16
-			sourceArray: #(
-		2r0000000000000000
-		2r0111111111111110
-		2r0011111111111110
-		2r0001111000000000
-		2r0000111000000000
-		2r0000011000000000
-		2r0000001000000000
-		2r0000000000000000
-		2r0000000000000000
-		2r0000000000000000
-		2r0000000000000000
-		2r0000000000000000
-		2r0000000000000000
-		2r0000000000000000
-		2r0000000000000000
-		2r0000000000000000)
+			sourceArray:bits
 			maskArray: #(
 		2r1111111111111111
 		2r1111111111111111
@@ -952,26 +1040,48 @@
     ].
 
     (builtIn includes:#scrollRight) ifFalse:[
+	isWindows ifTrue:[
+	    bits := #(
+		    2r1111111111111111
+		    2r1111111110111111
+		    2r1111111110011111
+		    2r1111111110001111
+		    2r1111111110000111
+		    2r1000000000000011
+		    2r1000000000000001
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111111111111111
+		    2r1111111111111111).
+	] ifFalse:[
+	    bits := #(
+		    2r0000000000000000
+		    2r0000000001000000
+		    2r0000000001100000
+		    2r0000000001110000
+		    2r0000000001111000
+		    2r0111111111111100
+		    2r0111111111111110
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000000000000000
+		    2r0000000000000000).
+	].
+
 	RightCursor :=
 		 Cursor 
 			extent: 16@16
-			sourceArray: #(
-		2r0000000000000000
-		2r0000000001000000
-		2r0000000001100000
-		2r0000000001110000
-		2r0000000001111000
-		2r0111111111111100
-		2r0111111111111110
-		2r0000000000000000
-		2r0000000000000000
-		2r0000000000000000
-		2r0000000000000000
-		2r0000000000000000
-		2r0000000000000000
-		2r0000000000000000
-		2r0000000000000000
-		2r0000000000000000)
+			sourceArray: bits
 			maskArray: #(
 		2r0000000011000000
 		2r0000000011100000
@@ -993,26 +1103,48 @@
     ].
 
     (builtIn includes:#scrollMarkerV) ifFalse:[
+	isWindows ifTrue:[
+	    bits := #(
+		    2r1111111111111111
+		    2r1111111011111111
+		    2r1111111011111111
+		    2r1111110001111111
+		    2r1111110001111111
+		    2r1111100000111111
+		    2r1111100000111111
+		    2r1111000000011111
+		    2r1111000000011111
+		    2r1110000000001111
+		    2r1111110001111111
+		    2r1111110001111111
+		    2r1111110001111111
+		    2r1111110001111111
+		    2r1111110001111111
+		    2r1111111111111111).
+	] ifFalse:[
+	    bits := #(
+		    2r0000000000000000
+		    2r0000000100000000
+		    2r0000000100000000
+		    2r0000001110000000
+		    2r0000001110000000
+		    2r0000011111000000
+		    2r0000011111000000
+		    2r0000111111100000
+		    2r0000111111100000
+		    2r0001111111110000
+		    2r0000001110000000
+		    2r0000001110000000
+		    2r0000001110000000
+		    2r0000001110000000
+		    2r0000001110000000
+		    2r0000000000000000).
+	].
+
 	XMarkerCursor := 
 		Cursor
 			extent: 16@16
-			sourceArray: #(
-		2r0000000000000000
-		2r0000000100000000
-		2r0000000100000000
-		2r0000001110000000
-		2r0000001110000000
-		2r0000011111000000
-		2r0000011111000000
-		2r0000111111100000
-		2r0000111111100000
-		2r0001111111110000
-		2r0000001110000000
-		2r0000001110000000
-		2r0000001110000000
-		2r0000001110000000
-		2r0000001110000000
-		2r0000000000000000)
+			sourceArray: bits
 			maskArray: #(
 		2r0000000100000000
 		2r0000001110000000
@@ -1315,7 +1447,7 @@
      Cursor initializeNewCursors
     "
 
-    "Modified: / 19.5.1998 / 17:23:10 / cg"
+    "Modified: / 27.9.1998 / 22:23:08 / cg"
 !
 
 update:something with:aParameter from:changedObject
@@ -2571,13 +2703,12 @@
 	].
 	w := sourceForm width.
 	h := sourceForm height.
-
-	id := aDevice createCursorSourceForm:sF
-				    maskForm:mF
-					hotX:hotX
-					hotY:hotY
-				       width:w
-				      height:h.
+	id := aDevice 
+		createCursorSourceForm:sF
+		maskForm:mF
+		hotX:hotX hotY:hotY
+		width:w height:h.
+
 	id isNil ifTrue:[
 	    'Cursor [warning]: cannot create pixmap cursor' errorPrintCR.
 	    ^ self
@@ -2659,6 +2790,6 @@
 !Cursor class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Cursor.st,v 1.60 1998-09-24 10:01:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Cursor.st,v 1.61 1998-09-28 09:27:16 cg Exp $'
 ! !
 Cursor initialize!