[Scsh-checkins] CVS: scx/c/xlib gcontext.c,1.5,1.6

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

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

Modified Files:
        gcontext.c 
Log Message:
fixed AList_To_GCValues and corrected the representation of gcontext->function.


Index: gcontext.c
===================================================================
RCS file: /cvsroot/scsh/scx/c/xlib/gcontext.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** gcontext.c  2001/07/19 15:33:50     1.5
--- gcontext.c  2001/07/30 14:15:34     1.6
***************
*** 4,18 ****
  unsigned long AList_To_GCValues(s48_value alist, XGCValues* GCV) {
    unsigned long mask = 0;
!   s48_value l;
    char* cname;
    s48_value name, value;
    
    for (l = alist; !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 (strcmp(cname, "function") == 0) { 
!       GCV->function = Symbols_To_Bits(value, 0, Func_Syms);
        mask |= GCFunction;
      } else if (strcmp(cname, "plane-mask") == 0) {
--- 4,19 ----
  unsigned long AList_To_GCValues(s48_value alist, XGCValues* GCV) {
    unsigned long mask = 0;
!   s48_value l, p;
    char* cname;
    s48_value name, value;
    
    for (l = alist; !S48_NULL_P(l); l = S48_CDR(l)) {
!     p = S48_CAR(l);
!     name = S48_CAR(p);
!     value = S48_CDR(p);
      cname = s48_extract_string(S48_SYMBOL_TO_STRING(name));
      
      if (strcmp(cname, "function") == 0) { 
!       GCV->function = Symbol_To_Bit(value, Func_Syms);
        mask |= GCFunction;
      } else if (strcmp(cname, "plane-mask") == 0) {
***************
*** 132,136 ****
      S48_GC_PROTECT_1(res);
  
!     S48_VECTOR_SET(res, 0, s48_enter_integer(GCV.function));
      S48_VECTOR_SET(res, 1, ENTER_PIXEL(GCV.plane_mask));
      S48_VECTOR_SET(res, 2, ENTER_PIXEL(GCV.foreground));
--- 133,137 ----
      S48_GC_PROTECT_1(res);
  
!     S48_VECTOR_SET(res, 0, Bit_To_Symbol(GCV.function, Func_Syms));
      S48_VECTOR_SET(res, 1, ENTER_PIXEL(GCV.plane_mask));
      S48_VECTOR_SET(res, 2, ENTER_PIXEL(GCV.foreground));
***************
*** 243,245 ****
--- 244,247 ----
    S48_EXPORT_FUNCTION(Set_Gcontext_Dashlist);
    S48_EXPORT_FUNCTION(Set_Gcontext_Clip_Rectangles);
+   S48_EXPORT_FUNCTION(Query_Best_Size);
  }