[Scsh-checkins] CVS: scx/c/xlib color.c,1.3,1.4 type.c,1.4,1.5 window.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-serv28776

Modified Files:
        color.c type.c window.c 
Log Message:
Only some small changes.


Index: color.c
===================================================================
RCS file: /cvsroot/scsh/scx/c/xlib/color.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** color.c     2001/06/11 15:25:39     1.3
--- color.c     2001/06/25 11:46:06     1.4
***************
*** 17,23 ****
    S48_GC_PROTECT_1(res);
    
-   res = s48_cons( s48_enter_integer(col.red), res );
-   res = s48_cons( s48_enter_integer(col.green), res );
    res = s48_cons( s48_enter_integer(col.blue), res );
    
    S48_GC_UNPROTECT();
--- 17,23 ----
    S48_GC_PROTECT_1(res);
    
    res = s48_cons( s48_enter_integer(col.blue), res );
+   res = s48_cons( s48_enter_integer(col.green), res );
+   res = s48_cons( s48_enter_integer(col.red), res );
    
    S48_GC_UNPROTECT();

Index: type.c
===================================================================
RCS file: /cvsroot/scsh/scx/c/xlib/type.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** type.c      2001/06/11 15:25:39     1.4
--- type.c      2001/06/25 11:46:06     1.5
***************
*** 25,29 ****
  */
  
! s48_value Bits_To_Symbols(unsigned long bits, int mask_flag, SYMDESCR* table) 
{
    s48_value res = S48_NULL;
    char* name;
--- 25,29 ----
  */
  
! s48_value Bits_To_Symbols(unsigned long bits, SYMDESCR* table) {
    s48_value res = S48_NULL;
    char* name;
***************
*** 39,53 ****
      
      if ((val & bits) != 0) {
!       if (mask_flag == 0) {
!       res = s48_enter_symbol(name);
!       break;
!       } else {
!       res = s48_cons(s48_enter_symbol(name), res);
!       }
      }
      i++;
    }
-   if ((mask_flag == 0) && S48_NULL_P(res))
-     res = s48_enter_integer(bits); // or an exception??
  
    S48_GC_UNPROTECT();
--- 39,46 ----
      
      if ((val & bits) != 0) {
!       res = s48_cons(s48_enter_symbol(name), res);
      }
      i++;
    }
  
    S48_GC_UNPROTECT();
***************
*** 55,68 ****
  }
  
! unsigned long Symbols_To_Bits(s48_value Syms, int mask_flag, SYMDESCR* table) 
{
    unsigned long res = 0;
    s48_value l;
  
!   if (mask_flag) {
!     for (l = Syms; !S48_NULL_P(l); l = S48_CDR(l)) {
!       res |= Symbol_To_Bit(S48_CAR(l), table);
!     }
!   } else {
!     res |= Symbol_To_Bit(l, table);
    }
  
--- 48,65 ----
  }
  
! s48_value Bit_To_Symbol(unsigned long bits, SYMDESCR* table) {
!   s48_value res = Bits_To_Symbols(bits, table);
!   if (S48_NULL_P(res))
!     return s48_enter_integer(bits);
!   else
!     return S48_CAR(res);
! }}
! 
! unsigned long Symbols_To_Bits(s48_value Syms, SYMDESCR* table) {
    unsigned long res = 0;
    s48_value l;
  
!   for (l = Syms; !S48_NULL_P(l); l = S48_CDR(l)) {
!     res |= Symbol_To_Bit(S48_CAR(l), table);
    }
  

Index: window.c
===================================================================
RCS file: /cvsroot/scsh/scx/c/xlib/window.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** window.c    2001/06/11 15:25:39     1.3
--- window.c    2001/06/25 11:46:06     1.4
***************
*** 29,39 ****
        mask |= CWBorderPixel;
      } else if (cname == "bit-gravity") {
!       Xattrs->bit_gravity = Symbols_To_Bits(value, 0, Bit_Grav_Syms);
        mask |= CWBitGravity;
      } else if (cname == "gravity") {
!       Xattrs->win_gravity = Symbols_To_Bits(value, 0, Grav_Syms);
        mask |= CWWinGravity;
      } else if (cname == "backing-store") {
!       Xattrs->backing_store = Symbols_To_Bits(value, 0, Backing_Store_Syms);
        mask |= CWBackingStore;
      } else if (cname == "backing-planes") {
--- 29,39 ----
        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") {
***************
*** 47,54 ****
        mask |= CWSaveUnder;
      } else if (cname == "event-mask") {
!       Xattrs->event_mask = Symbols_To_Bits(value, 1, Event_Syms);
        mask |= CWEventMask;
      } else if (cname == "do-not-propagate-mask") {
!       Xattrs->do_not_propagate_mask = Symbols_To_Bits(value, 1, Event_Syms);
        mask |= CWDontPropagate;
      } else if (cname == "override-redirect") {
--- 47,54 ----
        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") {
***************
*** 143,164 ****
    S48_GC_PROTECT_1(res);
  
!   XGetWindowAttributes(dpy, win, &WA);
    
!   // ... usw.
!   res = s48_cons( s48_enter_integer(WA.backing_planes), res);
!   res = s48_cons( Bits_To_Symbols(WA.backing_store, 1, Backing_Store_Syms), 
!                 res);
!   res = s48_cons( Bits_To_Symbols(WA.win_gravity, 1, Grav_Syms), 
!                 res);
!   res = s48_cons( Bits_To_Symbols(WA.bit_gravity, 1, Bit_Grav_Syms), res);
!   res = s48_cons( Bits_To_Symbols(WA.class, 1, Class_Syms), res);
!   res = s48_cons( s48_enter_integer(WA.root), res); // a Window !
!   res = s48_cons( s48_enter_integer((long)WA.visual), res); // a Visual* !
!   res = s48_cons( s48_enter_integer(WA.depth), res);
!   res = s48_cons( s48_enter_integer(WA.border_width), res);
!   res = s48_cons( s48_enter_integer(WA.height), res);
!   res = s48_cons( s48_enter_integer(WA.width), res);
!   res = s48_cons( s48_enter_integer(WA.y), res);
!   res = s48_cons( s48_enter_integer(WA.x), res);
  
    S48_GC_UNPROTECT();
--- 143,176 ----
    S48_GC_PROTECT_1(res);
  
!   if (!XGetWindowAttributes(dpy, win, &WA))
!     res = S48_FALSE;
!   else {
    
!     // WA.screen - ignored in Elk
!     res = s48_cons( WA.overide_redirect ? S48_TRUE : S48_FALSE, res);
!     res = s48_cons( ENTER_MASK( WA.do_not_propagate_mask ), res);
!     res = s48_cons( ENTER_MASK( WA.your_event_mask ), res);
!     res = s48_cons( ENTER_MASK( WA.all_event_mask ), res);
!     res = s48_cons( Bit_To_Symbol( WA.map_state, Map_State_Syms), res);
!     res = s48_cons( WA.map_installed ? S48_TRUE : S48_FALSE, res);
!     res = s48_cons( ENTER_COLORMAP( WA.colormap ), res);
!     res = s48_cons( WA.save_under ? S48_TRUE : s48_FALSE );
!     res = s48_cons( ENTER_PIXEL(WA.backing_pixel), res);
!     res = s48_cons( s48_enter_integer(WA.backing_planes), res);
!     res = s48_cons( Bit_To_Symbol(WA.backing_store, Backing_Store_Syms), 
!                   res);
!     res = s48_cons( Bit_To_Symbol(WA.win_gravity, Grav_Syms), 
!                   res);
!     res = s48_cons( Bit_To_Symbol(WA.bit_gravity, Bit_Grav_Syms), res);
!     res = s48_cons( Bit_To_Symbol(WA.class, Class_Syms), res);
!     res = s48_cons( ENTER_WINDOW(WA.root), res);
!     res = s48_cons( ENTER_VISUAL(WA.visual), res);
!     res = s48_cons( s48_enter_integer(WA.depth), res);
!     res = s48_cons( s48_enter_integer(WA.border_width), res);
!     res = s48_cons( s48_enter_integer(WA.height), res);
!     res = s48_cons( s48_enter_integer(WA.width), res);
!     res = s48_cons( s48_enter_integer(WA.y), res);
!     res = s48_cons( s48_enter_integer(WA.x), res);
!   }
  
    S48_GC_UNPROTECT();