[Scsh-checkins] CVS: scx/c/xlib gcontext.c,1.3,1.4

[David Frese <frese@users.sourceforge.net>]

Update of /cvsroot/scsh/scx/c/xlib
In directory usw-pr-cvs1:/tmp/cvs-serv3846

Modified Files:
        gcontext.c 
Log Message:
Fixed wrong string comparison.


Index: gcontext.c
===================================================================
RCS file: /cvsroot/scsh/scx/c/xlib/gcontext.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** gcontext.c  2001/06/27 13:44:47     1.3
--- gcontext.c  2001/07/16 11:52:01     1.4
***************
*** 13,83 ****
      cname = s48_extract_string(S48_SYMBOL_TO_STRING(name));
      
!     if (cname == "function") { 
        GCV->function = Symbols_To_Bits(value, 0, Func_Syms);
        mask |= GCFunction;
!     } else if (cname == "plane-mask") {
        GCV->plane_mask = EXTRACT_PIXEL(value);
        mask |= GCPlaneMask;
!     } else if (cname == "foreground") {
        GCV->foreground = EXTRACT_PIXEL(value);
        mask |= GCForeground;
!     } else if (cname == "background") {
        GCV->background = EXTRACT_PIXEL(value);
        mask |= GCBackground;
!     } else if (cname == "line-width") {
        GCV->line_width = s48_extract_integer(value);
        mask |= GCLineWidth;
!     } else if (cname == "line-style") {
        GCV->line_style = Symbol_To_Bit(value,Line_Style_Syms);
        mask |= GCLineStyle;
!     } else if (cname == "cap-style") {
        GCV->cap_style = Symbol_To_Bit(value, Cap_Style_Syms);
        mask |= GCCapStyle;
!     } else if (cname == "join-style") {
        GCV->join_style = Symbol_To_Bit(value, Join_Style_Syms);
        mask |= GCJoinStyle;
!     } else if (cname == "fill-style") {
        GCV->fill_style = Symbol_To_Bit(value, Fill_Style_Syms);
        mask |= GCFillStyle;
!     } else if (cname == "fill-rule") {
        GCV->fill_rule = Symbol_To_Bit(value, Fill_Rule_Syms);
        mask |= GCFillRule;
!     } else if (cname == "arc-mode") {
        GCV->arc_mode = Symbol_To_Bit(value, Arc_Mode_Syms);
        mask |= GCArcMode;
!     } else if (cname == "tile") {
        GCV->tile = EXTRACT_PIXMAP(value);
        mask |= GCTile;
!     } else if (cname == "stipple") {
        GCV->stipple = EXTRACT_PIXMAP(value);
        mask |= GCStipple;
!     } else if (cname == "ts-x") {
        GCV->ts_x_origin = s48_extract_integer(value);
        mask |= GCTileStipXOrigin;
!     } else if (cname == "ts-y") {
        GCV->ts_y_origin = s48_extract_integer(value);
        mask |= GCTileStipYOrigin;
!     } else if (cname == "font") {
        GCV->font = EXTRACT_FONT(value);
        mask |= GCFont;
!     } else if (cname == "subwindow-mode") {
        GCV->subwindow_mode = Symbol_To_Bit(value, Subwin_Mode_Syms);
        mask |= GCSubwindowMode;
!     } else if (cname == "exposures") {
        GCV->graphics_exposures = !S48_FALSE_P(value);
        mask |= GCGraphicsExposures;
!     } else if (cname == "clip-x") {
        GCV->clip_x_origin = s48_extract_integer(value);
        mask |= GCClipXOrigin;
!     } else if (cname == "clip-y") {
        GCV->clip_y_origin = s48_extract_integer(value);
        mask |= GCClipYOrigin;
!     } else if (cname == "clip-mask") {
        GCV->clip_mask = EXTRACT_PIXMAP(value);
        mask |= GCClipMask;
!     } else if (cname == "dash-offset") {
        GCV->dash_offset = s48_extract_integer(value);
        mask |= GCDashOffset;
!     } else if (cname == "dashes") {
        GCV->dashes = (char)s48_extract_integer(value);
        mask |= GCDashList;
--- 13,83 ----
      cname = s48_extract_string(S48_SYMBOL_TO_STRING(name));
      
!     if (strcmp(cname, "function") == 0) { 
        GCV->function = Symbols_To_Bits(value, 0, Func_Syms);
        mask |= GCFunction;
!     } else if (strcmp(cname, "plane-mask") == 0) {
        GCV->plane_mask = EXTRACT_PIXEL(value);
        mask |= GCPlaneMask;
!     } else if (strcmp(cname, "foreground") == 0) {
        GCV->foreground = EXTRACT_PIXEL(value);
        mask |= GCForeground;
!     } else if (strcmp(cname, "background") == 0) {
        GCV->background = EXTRACT_PIXEL(value);
        mask |= GCBackground;
!     } else if (strcmp(cname, "line-width") == 0) {
        GCV->line_width = s48_extract_integer(value);
        mask |= GCLineWidth;
!     } else if (strcmp(cname, "line-style") == 0) {
        GCV->line_style = Symbol_To_Bit(value,Line_Style_Syms);
        mask |= GCLineStyle;
!     } else if (strcmp(cname, "cap-style") == 0) {
        GCV->cap_style = Symbol_To_Bit(value, Cap_Style_Syms);
        mask |= GCCapStyle;
!     } else if (strcmp(cname, "join-style") == 0) {
        GCV->join_style = Symbol_To_Bit(value, Join_Style_Syms);
        mask |= GCJoinStyle;
!     } else if (strcmp(cname, "fill-style") == 0) {
        GCV->fill_style = Symbol_To_Bit(value, Fill_Style_Syms);
        mask |= GCFillStyle;
!     } else if (strcmp(cname, "fill-rule") == 0) {
        GCV->fill_rule = Symbol_To_Bit(value, Fill_Rule_Syms);
        mask |= GCFillRule;
!     } else if (strcmp(cname, "arc-mode") == 0) {
        GCV->arc_mode = Symbol_To_Bit(value, Arc_Mode_Syms);
        mask |= GCArcMode;
!     } else if (strcmp(cname, "tile") == 0) {
        GCV->tile = EXTRACT_PIXMAP(value);
        mask |= GCTile;
!     } else if (strcmp(cname, "stipple") == 0) {
        GCV->stipple = EXTRACT_PIXMAP(value);
        mask |= GCStipple;
!     } else if (strcmp(cname, "ts-x") == 0) {
        GCV->ts_x_origin = s48_extract_integer(value);
        mask |= GCTileStipXOrigin;
!     } else if (strcmp(cname, "ts-y") == 0) {
        GCV->ts_y_origin = s48_extract_integer(value);
        mask |= GCTileStipYOrigin;
!     } else if (strcmp(cname, "font") == 0) {
        GCV->font = EXTRACT_FONT(value);
        mask |= GCFont;
!     } else if (strcmp(cname, "subwindow-mode") == 0) {
        GCV->subwindow_mode = Symbol_To_Bit(value, Subwin_Mode_Syms);
        mask |= GCSubwindowMode;
!     } else if (strcmp(cname, "exposures") == 0) {
        GCV->graphics_exposures = !S48_FALSE_P(value);
        mask |= GCGraphicsExposures;
!     } else if (strcmp(cname, "clip-x") == 0) {
        GCV->clip_x_origin = s48_extract_integer(value);
        mask |= GCClipXOrigin;
!     } else if (strcmp(cname, "clip-y") == 0) {
        GCV->clip_y_origin = s48_extract_integer(value);
        mask |= GCClipYOrigin;
!     } else if (strcmp(cname, "clip-mask") == 0) {
        GCV->clip_mask = EXTRACT_PIXMAP(value);
        mask |= GCClipMask;
!     } else if (strcmp(cname, "dash-offset") == 0) {
        GCV->dash_offset = s48_extract_integer(value);
        mask |= GCDashOffset;
!     } else if (strcmp(cname, "dashes") == 0) {
        GCV->dashes = (char)s48_extract_integer(value);
        mask |= GCDashList;