--- a/XWorkstat.st Wed Dec 06 15:11:20 1995 +0100
+++ b/XWorkstat.st Wed Dec 06 15:12:16 1995 +0100
@@ -50,7 +50,7 @@
!
version
- ^ '$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.83 1995-11-25 13:06:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.84 1995-12-06 14:12:16 cg Exp $'
!
documentation
@@ -88,6 +88,8 @@
#define XK_MISCELLANY
#include <X11/keysymdef.h>
+#include <X11/cursorfont.h>
+
/*
* this define adds support for two-byte-strings.
* leaving it undefined does not really save you much
@@ -3514,30 +3516,30 @@
"this is pure X-knowlegde - but you may easily add more"
- (shape == #upLeftArrow) ifTrue:[ ^ 132 ].
- (shape == #upRightHand) ifTrue:[ ^ 58 ].
- (shape == #upDownArrow) ifTrue:[ ^ 116 ].
- (shape == #leftRightArrow) ifTrue:[ ^ 108 ].
- (shape == #upLimitArrow) ifTrue:[ ^ 138 ].
- (shape == #downLimitArrow) ifTrue:[ ^ 16 ].
- (shape == #leftLimitArrow) ifTrue:[ ^ 70 ].
- (shape == #rightLimitArrow) ifTrue:[ ^ 96 ].
- (shape == #text) ifTrue:[ ^ 152 ].
- (shape == #upRightArrow) ifTrue:[ ^ 44 ].
- (shape == #leftHand) ifTrue:[ ^ 60 ].
- (shape == #questionMark) ifTrue:[ ^ 92 ].
- (shape == #cross) ifTrue:[ ^ 0 ].
- (shape == #wait) ifTrue:[ ^ 150 ].
- (shape == #crossHair) ifTrue:[ ^ 130 ].
+ (shape == #upLeftArrow) ifTrue:[ ^ %{ __MKSMALLINT(XC_top_left_arrow) %} "132" ].
+ (shape == #upRightHand) ifTrue:[ ^ %{ __MKSMALLINT(XC_hand1) %} "58" ].
+ (shape == #upDownArrow) ifTrue:[ ^ %{ __MKSMALLINT(XC_sb_v_double_arrow) %} "116" ].
+ (shape == #leftRightArrow) ifTrue:[ ^ %{ __MKSMALLINT(XC_sb_h_double_arrow) %} "108" ].
+ (shape == #upLimitArrow) ifTrue:[ ^ %{ __MKSMALLINT(XC_top_side) %} "138" ].
+ (shape == #downLimitArrow) ifTrue:[ ^ %{ __MKSMALLINT(XC_bottom_side) %} "16" ].
+ (shape == #leftLimitArrow) ifTrue:[ ^ %{ __MKSMALLINT(XC_left_side) %} "70" ].
+ (shape == #rightLimitArrow) ifTrue:[ ^ %{ __MKSMALLINT(XC_right_side) %} "96" ].
+ (shape == #text) ifTrue:[ ^ %{ __MKSMALLINT(XC_xterm) %} "152" ].
+ (shape == #upRightArrow) ifTrue:[ ^ %{ __MKSMALLINT(XC_draft_large) %} "44" ].
+ (shape == #leftHand) ifTrue:[ ^ %{ __MKSMALLINT(XC_hand2) %} "60" ].
+ (shape == #questionMark) ifTrue:[ ^ %{ __MKSMALLINT(XC_question_arrow) %} "92" ].
+ (shape == #cross) ifTrue:[ ^ %{ __MKSMALLINT(XC_X_cursor) %} "0" ].
+ (shape == #wait) ifTrue:[ ^ %{ __MKSMALLINT(XC_watch) %} "150" ].
+ (shape == #crossHair) ifTrue:[ ^ %{ __MKSMALLINT(XC_tcross) %} "130" ].
((shape == #origin)
- or:[shape == #topLeft]) ifTrue:[ ^ 144 ].
+ or:[shape == #topLeft]) ifTrue:[ ^ %{ __MKSMALLINT(XC_ul_angle) %} "144" ].
((shape == #corner)
- or:[shape == #bottomRight]) ifTrue:[ ^ 78 ].
- (shape == #topRight) ifTrue:[ ^ 148 ].
- (shape == #bottomLeft) ifTrue:[ ^ 76 ].
- (shape == #square) ifTrue:[ ^ 40 ].
- (shape == #fourWay) ifTrue:[ ^ 52 ].
- (shape == #crossCursor) ifTrue:[ ^ 0 ].
+ or:[shape == #bottomRight]) ifTrue:[ ^ %{ __MKSMALLINT(XC_lr_angle) %} "78" ].
+ (shape == #topRight) ifTrue:[ ^ %{ __MKSMALLINT(XC_ur_angle) %} "148" ].
+ (shape == #bottomLeft) ifTrue:[ ^ %{ __MKSMALLINT(XC_ll_angle) %} "76" ].
+ (shape == #square) ifTrue:[ ^ %{ __MKSMALLINT(XC_dotbox) %} "40" ].
+ (shape == #fourWay) ifTrue:[ ^ %{ __MKSMALLINT(XC_fleur) %} "52" ].
+ (shape == #crossCursor) ifTrue:[ ^ %{ __MKSMALLINT(XC_X_cursor) %} "0" ].
('XWORKSTATION: invalid cursorShape:' , shape printString) errorPrintNL.
^ 0
!
--- a/XWorkstation.st Wed Dec 06 15:11:20 1995 +0100
+++ b/XWorkstation.st Wed Dec 06 15:12:16 1995 +0100
@@ -50,7 +50,7 @@
!
version
- ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.83 1995-11-25 13:06:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.84 1995-12-06 14:12:16 cg Exp $'
!
documentation
@@ -88,6 +88,8 @@
#define XK_MISCELLANY
#include <X11/keysymdef.h>
+#include <X11/cursorfont.h>
+
/*
* this define adds support for two-byte-strings.
* leaving it undefined does not really save you much
@@ -3514,30 +3516,30 @@
"this is pure X-knowlegde - but you may easily add more"
- (shape == #upLeftArrow) ifTrue:[ ^ 132 ].
- (shape == #upRightHand) ifTrue:[ ^ 58 ].
- (shape == #upDownArrow) ifTrue:[ ^ 116 ].
- (shape == #leftRightArrow) ifTrue:[ ^ 108 ].
- (shape == #upLimitArrow) ifTrue:[ ^ 138 ].
- (shape == #downLimitArrow) ifTrue:[ ^ 16 ].
- (shape == #leftLimitArrow) ifTrue:[ ^ 70 ].
- (shape == #rightLimitArrow) ifTrue:[ ^ 96 ].
- (shape == #text) ifTrue:[ ^ 152 ].
- (shape == #upRightArrow) ifTrue:[ ^ 44 ].
- (shape == #leftHand) ifTrue:[ ^ 60 ].
- (shape == #questionMark) ifTrue:[ ^ 92 ].
- (shape == #cross) ifTrue:[ ^ 0 ].
- (shape == #wait) ifTrue:[ ^ 150 ].
- (shape == #crossHair) ifTrue:[ ^ 130 ].
+ (shape == #upLeftArrow) ifTrue:[ ^ %{ __MKSMALLINT(XC_top_left_arrow) %} "132" ].
+ (shape == #upRightHand) ifTrue:[ ^ %{ __MKSMALLINT(XC_hand1) %} "58" ].
+ (shape == #upDownArrow) ifTrue:[ ^ %{ __MKSMALLINT(XC_sb_v_double_arrow) %} "116" ].
+ (shape == #leftRightArrow) ifTrue:[ ^ %{ __MKSMALLINT(XC_sb_h_double_arrow) %} "108" ].
+ (shape == #upLimitArrow) ifTrue:[ ^ %{ __MKSMALLINT(XC_top_side) %} "138" ].
+ (shape == #downLimitArrow) ifTrue:[ ^ %{ __MKSMALLINT(XC_bottom_side) %} "16" ].
+ (shape == #leftLimitArrow) ifTrue:[ ^ %{ __MKSMALLINT(XC_left_side) %} "70" ].
+ (shape == #rightLimitArrow) ifTrue:[ ^ %{ __MKSMALLINT(XC_right_side) %} "96" ].
+ (shape == #text) ifTrue:[ ^ %{ __MKSMALLINT(XC_xterm) %} "152" ].
+ (shape == #upRightArrow) ifTrue:[ ^ %{ __MKSMALLINT(XC_draft_large) %} "44" ].
+ (shape == #leftHand) ifTrue:[ ^ %{ __MKSMALLINT(XC_hand2) %} "60" ].
+ (shape == #questionMark) ifTrue:[ ^ %{ __MKSMALLINT(XC_question_arrow) %} "92" ].
+ (shape == #cross) ifTrue:[ ^ %{ __MKSMALLINT(XC_X_cursor) %} "0" ].
+ (shape == #wait) ifTrue:[ ^ %{ __MKSMALLINT(XC_watch) %} "150" ].
+ (shape == #crossHair) ifTrue:[ ^ %{ __MKSMALLINT(XC_tcross) %} "130" ].
((shape == #origin)
- or:[shape == #topLeft]) ifTrue:[ ^ 144 ].
+ or:[shape == #topLeft]) ifTrue:[ ^ %{ __MKSMALLINT(XC_ul_angle) %} "144" ].
((shape == #corner)
- or:[shape == #bottomRight]) ifTrue:[ ^ 78 ].
- (shape == #topRight) ifTrue:[ ^ 148 ].
- (shape == #bottomLeft) ifTrue:[ ^ 76 ].
- (shape == #square) ifTrue:[ ^ 40 ].
- (shape == #fourWay) ifTrue:[ ^ 52 ].
- (shape == #crossCursor) ifTrue:[ ^ 0 ].
+ or:[shape == #bottomRight]) ifTrue:[ ^ %{ __MKSMALLINT(XC_lr_angle) %} "78" ].
+ (shape == #topRight) ifTrue:[ ^ %{ __MKSMALLINT(XC_ur_angle) %} "148" ].
+ (shape == #bottomLeft) ifTrue:[ ^ %{ __MKSMALLINT(XC_ll_angle) %} "76" ].
+ (shape == #square) ifTrue:[ ^ %{ __MKSMALLINT(XC_dotbox) %} "40" ].
+ (shape == #fourWay) ifTrue:[ ^ %{ __MKSMALLINT(XC_fleur) %} "52" ].
+ (shape == #crossCursor) ifTrue:[ ^ %{ __MKSMALLINT(XC_X_cursor) %} "0" ].
('XWORKSTATION: invalid cursorShape:' , shape printString) errorPrintNL.
^ 0
!