Update of /cvsroot/scsh/scx/c/xlib
In directory usw-pr-cvs1:/tmp/cvs-serv3237
Modified Files:
window.c
Log Message:
Fixed wrong string comparison.
Index: window.c
===================================================================
RCS file: /cvsroot/scsh/scx/c/xlib/window.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** window.c 2001/06/27 13:44:48 1.5
--- window.c 2001/07/16 11:49:01 1.6
***************
*** 6,63 ****
unsigned long mask = 0;
s48_value l;
char* cname;
s48_value name, value;
for (l = attrAlist; !S48_NULL_P(l); l = S48_CDR(l)) {
! name = S48_CAR(l);
! value = S48_CDR(l);
! cname = s48_extract_string(S48_SYMBOL_TO_STRING(name));
!
! if (cname == "background-pixmap") {
Xattrs->background_pixmap = extract_background(value);
mask |= CWBackPixmap;
! } else if (cname == "background-pixel") {
Xattrs->background_pixel = s48_extract_integer(value);
mask |= CWBackPixel;
! } else if (cname == "border-pixmap") {
Xattrs->border_pixmap = extract_border(value);
mask |= CWBorderPixmap;
! } else if (cname == "border-pixel") {
Xattrs->border_pixel = s48_extract_integer(value);
mask |= CWBorderPixel;
! } else if (cname == "bit-gravity") {
Xattrs->bit_gravity = Symbol_To_Bit(value, Bit_Grav_Syms);
mask |= CWBitGravity;
! } else if (cname == "gravity") {
Xattrs->win_gravity = Symbol_To_Bit(value, Grav_Syms);
mask |= CWWinGravity;
! } else if (cname == "backing-store") {
Xattrs->backing_store = Symbol_To_Bit(value, Backing_Store_Syms);
mask |= CWBackingStore;
! } else if (cname == "backing-planes") {
Xattrs->backing_planes = s48_extract_integer(value);
mask |= CWBackingPlanes;
! } else if (cname == "backing-pixel") {
Xattrs->backing_pixel = s48_extract_integer(value);
mask |= CWBackingPixel;
! } else if (cname == "save-under") {
Xattrs->save_under = !S48_FALSE_P(value);
mask |= CWSaveUnder;
! } else if (cname == "event-mask") {
! Xattrs->event_mask = Symbols_To_Bits(value, Event_Syms);
mask |= CWEventMask;
! } else if (cname == "do-not-propagate-mask") {
! Xattrs->do_not_propagate_mask = Symbols_To_Bits(value, Event_Syms);
mask |= CWDontPropagate;
! } else if (cname == "override-redirect") {
Xattrs->override_redirect = !S48_FALSE_P(value);
mask |= CWOverrideRedirect;
! } else if (cname == "colormap") {
Xattrs->colormap = s48_extract_integer(value);
mask |= CWColormap;
! } else if (cname == "cursor") {
Xattrs->cursor = s48_extract_integer(value);
mask |= CWCursor;
! } // else error
} /* for */
return mask;
--- 6,65 ----
unsigned long mask = 0;
s48_value l;
+ s48_value p;
char* cname;
s48_value name, value;
for (l = attrAlist; !S48_NULL_P(l); l = S48_CDR(l)) {
! p = S48_CAR(l);
! name = S48_CAR(p);
! value = S48_CDR(p);
! cname = s48_extract_symbol(name);
!
! if (strcmp(cname, "background-pixmap") == 0) {
Xattrs->background_pixmap = extract_background(value);
mask |= CWBackPixmap;
! } else if (strcmp(cname, "background-pixel") == 0) {
Xattrs->background_pixel = s48_extract_integer(value);
mask |= CWBackPixel;
! } else if (strcmp(cname, "border-pixmap") == 0) {
Xattrs->border_pixmap = extract_border(value);
mask |= CWBorderPixmap;
! } else if (strcmp(cname, "border-pixel") == 0) {
Xattrs->border_pixel = s48_extract_integer(value);
mask |= CWBorderPixel;
! } else if (strcmp(cname, "bit-gravity") == 0) {
Xattrs->bit_gravity = Symbol_To_Bit(value, Bit_Grav_Syms);
mask |= CWBitGravity;
! } else if (strcmp(cname, "gravity") == 0) {
Xattrs->win_gravity = Symbol_To_Bit(value, Grav_Syms);
mask |= CWWinGravity;
! } else if (strcmp(cname, "backing-store") == 0) {
Xattrs->backing_store = Symbol_To_Bit(value, Backing_Store_Syms);
mask |= CWBackingStore;
! } else if (strcmp(cname, "backing-planes") == 0) {
Xattrs->backing_planes = s48_extract_integer(value);
mask |= CWBackingPlanes;
! } else if (strcmp(cname, "backing-pixel") == 0) {
Xattrs->backing_pixel = s48_extract_integer(value);
mask |= CWBackingPixel;
! } else if (strcmp(cname, "save-under") == 0) {
Xattrs->save_under = !S48_FALSE_P(value);
mask |= CWSaveUnder;
! } else if (strcmp(cname, "event-mask") == 0) {
! Xattrs->event_mask = Symbols_To_Bits(value, Event_Mask_Syms);
mask |= CWEventMask;
! } else if (strcmp(cname, "do-not-propagate-mask") == 0) {
! Xattrs->do_not_propagate_mask = Symbols_To_Bits(value, Event_Mask_Syms);
mask |= CWDontPropagate;
! } else if (strcmp(cname, "override-redirect") == 0) {
Xattrs->override_redirect = !S48_FALSE_P(value);
mask |= CWOverrideRedirect;
! } else if (strcmp(cname, "colormap") == 0) {
Xattrs->colormap = s48_extract_integer(value);
mask |= CWColormap;
! } else if (strcmp(cname, "cursor") == 0) {
Xattrs->cursor = s48_extract_integer(value);
mask |= CWCursor;
! } // else error ??
} /* for */
return mask;
***************
*** 67,73 ****
if (S48_SYMBOL_P(value)) {
char* v = s48_extract_string(S48_SYMBOL_TO_STRING(value));
! if (v == "none")
return None;
! else if (v == "parent-relative")
return ParentRelative;
//else // error ...
--- 69,75 ----
if (S48_SYMBOL_P(value)) {
char* v = s48_extract_string(S48_SYMBOL_TO_STRING(value));
! if (strcmp(v, "none") == 0)
return None;
! else if (strcmp(v, "parent-relative") == 0)
return ParentRelative;
//else // error ...
***************
*** 79,83 ****
if (S48_SYMBOL_P(value)) {
char* v = s48_extract_string(S48_SYMBOL_TO_STRING(value));
! if (v == "copy-from-parent")
return CopyFromParent;
// else error
--- 81,85 ----
if (S48_SYMBOL_P(value)) {
char* v = s48_extract_string(S48_SYMBOL_TO_STRING(value));
! if (strcmp(v, "copy-from-parent") == 0)
return CopyFromParent;
// else error
***************
*** 117,123 ****
XSetWindowAttributes Xattrs;
! unsigned long mask = 0;
!
! mask = AList_To_XSetWindowAttributes( attrAlist, &Xattrs );
XChangeWindowAttributes(EXTRACT_DISPLAY(Xdisplay), EXTRACT_WINDOW(Xwindow),
--- 119,123 ----
XSetWindowAttributes Xattrs;
! unsigned long mask = AList_To_XSetWindowAttributes( attrAlist, &Xattrs );
XChangeWindowAttributes(EXTRACT_DISPLAY(Xdisplay), EXTRACT_WINDOW(Xwindow),
***************
*** 160,169 ****
S48_VECTOR_SET(res, 16, WA.map_installed ? S48_TRUE : S48_FALSE);
S48_VECTOR_SET(res, 17, Bit_To_Symbol( WA.map_state, Map_State_Syms));
! S48_VECTOR_SET(res, 18, ENTER_MASK( WA.all_event_masks )); //?? MASKS?
! S48_VECTOR_SET(res, 19, ENTER_MASK( WA.your_event_mask ));
! S48_VECTOR_SET(res, 20, ENTER_MASK( WA.do_not_propagate_mask ));
S48_VECTOR_SET(res, 21, WA.override_redirect ? S48_TRUE : S48_FALSE);
S48_VECTOR_SET(res, 22, s48_enter_integer((long)WA.screen)); //??
! // WA.screen - ignored in Elk
}
--- 160,172 ----
S48_VECTOR_SET(res, 16, WA.map_installed ? S48_TRUE : S48_FALSE);
S48_VECTOR_SET(res, 17, Bit_To_Symbol( WA.map_state, Map_State_Syms));
! S48_VECTOR_SET(res, 18, Bits_To_Symbols( WA.all_event_masks,
! Event_Mask_Syms ));
! S48_VECTOR_SET(res, 19, Bits_To_Symbols( WA.your_event_mask,
! Event_Mask_Syms ));
! S48_VECTOR_SET(res, 20, Bits_To_Symbols( WA.do_not_propagate_mask,
! Event_Mask_Syms ));
S48_VECTOR_SET(res, 21, WA.override_redirect ? S48_TRUE : S48_FALSE);
S48_VECTOR_SET(res, 22, s48_enter_integer((long)WA.screen)); //??
! // WA.screen - ignored/not supported in Elk
}
***************
*** 187,209 ****
cvalue = (int)s48_extract_integer(value); // only ints here
! if (cname == "x") {
WC.x = cvalue;
mask |= CWX;
! } else if (cname == "y") {
WC.y = cvalue;
mask |= CWY;
! } else if (cname == "width") {
WC.width = cvalue;
mask |= CWWidth;
! } else if (cname == "height") {
WC.height = cvalue;
mask |= CWHeight;
! } else if (cname == "border-width") {
WC.border_width = cvalue;
mask |= CWBorderWidth;
! } else if (cname == "sibling") {
WC.sibling = (Window)s48_extract_integer(value);
mask |= CWSibling;
! } else if (cname == "stack-mode") {
WC.stack_mode = cvalue;
mask |= CWStackMode;
--- 190,212 ----
cvalue = (int)s48_extract_integer(value); // only ints here
! if (strcmp(cname, "x") == 0) {
WC.x = cvalue;
mask |= CWX;
! } else if (strcmp(cname, "y") == 0) {
WC.y = cvalue;
mask |= CWY;
! } else if (strcmp(cname, "width") == 0) {
WC.width = cvalue;
mask |= CWWidth;
! } else if (strcmp(cname, "height") == 0) {
WC.height = cvalue;
mask |= CWHeight;
! } else if (strcmp(cname, "border-width") == 0) {
WC.border_width = cvalue;
mask |= CWBorderWidth;
! } else if (strcmp(cname, "sibling") == 0) {
WC.sibling = (Window)s48_extract_integer(value);
mask |= CWSibling;
! } else if (strcmp(cname, "stack-mode") == 0) {
WC.stack_mode = cvalue;
mask |= CWStackMode;
***************
*** 248,267 ****
}
-
-
-
/*
-
- Drawable Get_Drawable (d, dpyp) s48_value d; Display **dpyp; {
- if (TYPE(d) == T_Window) {
- *dpyp = WINDOW(d)->dpy;
- return (Drawable)WINDOW(d)->win;
- } else if (TYPE(d) == T_Pixmap) {
- *dpyp = PIXMAP(d)->dpy;
- return (Drawable)PIXMAP(d)->pm;
- }
- Wrong_Type_Combination (d, "drawable");
- //NOTREACHED
- }
static s48_value P_Get_Geometry (d) s48_value d; {
--- 251,255 ----
|