From 37a4d6ac4631839024d062e6ba6e5644302f3729 Mon Sep 17 00:00:00 2001
From: frese <frese>
Date: Mon, 16 Jul 2001 11:57:12 +0000
Subject: [PATCH] Fixed wrong definition of Event_Mask_Syms. And commented out
 unused things.

---
 c/xlib/xlib.h | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/c/xlib/xlib.h b/c/xlib/xlib.h
index 77d74a5..1b73279 100644
--- a/c/xlib/xlib.h
+++ b/c/xlib/xlib.h
@@ -40,15 +40,16 @@
 #define EXTRACT_GCONTEXT(x) (GC)s48_extract_integer(x)
 #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_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)
 
 
 /*
@@ -216,7 +217,7 @@ extern unsigned long Vector_To_Record P_((Object, int, Object, RECORD*));
 C_LINKAGE_END
 
 */
-
+/*
 extern XSetWindowAttributes SWA;
 extern XWindowChanges WC;
 extern XGCValues GCV;
@@ -229,7 +230,7 @@ extern XSizeHints SZH;
 
 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[],
     Win_Attr_Rec[], Font_Info_Rec[], Char_Info_Rec[], Wm_Hints_Rec[],
@@ -237,15 +238,16 @@ extern RECORD Set_Attr_Rec[], Conf_Rec[], GC_Rec[], Geometry_Rec[],
 */
 
 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[];
-
+  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;
-
+*/