Update of /cvsroot/scsh/scx/c/xlib
In directory usw-pr-cvs1:/tmp/cvs-serv4903
Modified Files:
xlib.h
Log Message:
Fixed wrong definition of Event_Mask_Syms. And commented out unused things.
Index: xlib.h
===================================================================
RCS file: /cvsroot/scsh/scx/c/xlib/xlib.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** xlib.h 2001/07/09 13:39:59 1.5
--- xlib.h 2001/07/16 11:57:12 1.6
***************
*** 41,53 ****
#define ENTER_GCONTEXT(x) s48_enter_integer((long)x)
#define EXTRACT_PIXMAP(x) (Pixmap)s48_extract_integer(x)
#define EXTRACT_DRAWABLE(x) (Drawable)s48_extract_integer(x)
// TODO:
#define ENTER_VISUAL(x) S48_FALSE
- #define ENTER_MASK(x) S48_FALSE
- #define ENTER_PIXMAP(x) S48_FALSE
#define ENTER_FONT(x) S48_FALSE
#define EXTRACT_FONT(x) (Font)0
- #define ENTER_ATOM(x) S48_FALSE
- #define ENTER_TIME(x) x == CurrentTime ? s48_enter_symbol("now") :
s48_enter_integer(x)
--- 41,54 ----
#define ENTER_GCONTEXT(x) s48_enter_integer((long)x)
#define EXTRACT_PIXMAP(x) (Pixmap)s48_extract_integer(x)
+ #define ENTER_PIXMAP(x) s48_enter_integer((long)x)
#define EXTRACT_DRAWABLE(x) (Drawable)s48_extract_integer(x)
+ #define ENTER_ATOM(x) s48_enter_integer((long)x)
+ #define EXTRACT_ATOM(x) (Atom)s48_extract_integer(x)
+ #define ENTER_TIME(x) x == CurrentTime ? s48_enter_symbol("now") :
s48_enter_integer(x)
+ #define EXTRACT_TIME(x) S48_SYMBOL_P(x) ? CurrentTime :
(int)s48_extract_integer(x)
// TODO:
#define ENTER_VISUAL(x) S48_FALSE
#define ENTER_FONT(x) S48_FALSE
#define EXTRACT_FONT(x) (Font)0
***************
*** 217,221 ****
*/
!
extern XSetWindowAttributes SWA;
extern XWindowChanges WC;
--- 218,222 ----
*/
! /*
extern XSetWindowAttributes SWA;
extern XWindowChanges WC;
***************
*** 230,234 ****
extern Set_Attr_Size, Conf_Size, GC_Size, Geometry_Size, Win_Attr_Size,
Font_Info_Size, Char_Info_Size, Wm_Hints_Size, Size_Hints_Size;
!
/*
extern RECORD Set_Attr_Rec[], Conf_Rec[], GC_Rec[], Geometry_Rec[],
--- 231,235 ----
extern Set_Attr_Size, Conf_Size, GC_Size, Geometry_Size, Win_Attr_Size,
Font_Info_Size, Char_Info_Size, Wm_Hints_Size, Size_Hints_Size;
! */
/*
extern RECORD Set_Attr_Rec[], Conf_Rec[], GC_Rec[], Geometry_Rec[],
***************
*** 238,251 ****
extern SYMDESCR Func_Syms[], Bit_Grav_Syms[], Event_Syms[], Error_Syms[],
! Grav_Syms[], Backing_Store_Syms[], Class_Syms[], Stack_Mode_Syms[],
! Line_Style_Syms[], State_Syms[], Cap_Style_Syms[], Join_Style_Syms[],
! Map_State_Syms[], Fill_Style_Syms[], Fill_Rule_Syms[], Arc_Mode_Syms[],
! Subwin_Mode_Syms[], Button_Syms[], Cross_Mode_Syms[], Cross_Detail_Syms[],
! Focus_Detail_Syms[], Place_Syms[], Visibility_Syms[], Prop_Syms[],
! Mapping_Syms[], Direction_Syms[], Shape_Syms[], Propmode_Syms[],
! Grabstatus_Syms[], Allow_Events_Syms[], Revert_Syms[], Polyshape_Syms[],
! Initial_State_Syms[], Bitmapstatus_Syms[], Circulate_Syms[],
! Ordering_Syms[], Byte_Order_Syms[], Saveset_Syms[], Closemode_Syms[];
!
extern s48_value Sym_None, Sym_Now, Sym_Char_Info, Sym_Conf;
!
--- 239,253 ----
extern SYMDESCR Func_Syms[], Bit_Grav_Syms[], Event_Syms[], Error_Syms[],
! Grav_Syms[], Backing_Store_Syms[], Class_Syms[], Stack_Mode_Syms[],
! Line_Style_Syms[], State_Syms[], Cap_Style_Syms[], Join_Style_Syms[],
! Map_State_Syms[], Fill_Style_Syms[], Fill_Rule_Syms[], Arc_Mode_Syms[],
! Subwin_Mode_Syms[], Button_Syms[], Cross_Mode_Syms[], Cross_Detail_Syms[],
! Focus_Detail_Syms[], Place_Syms[], Visibility_Syms[], Prop_Syms[],
! Mapping_Syms[], Direction_Syms[], Shape_Syms[], Propmode_Syms[],
! Grabstatus_Syms[], Allow_Events_Syms[], Revert_Syms[], Polyshape_Syms[],
! Initial_State_Syms[], Bitmapstatus_Syms[], Circulate_Syms[],
! Ordering_Syms[], Byte_Order_Syms[], Saveset_Syms[], Closemode_Syms[],
! Event_Mask_Syms[];
! /*
extern s48_value Sym_None, Sym_Now, Sym_Char_Info, Sym_Conf;
! */
|