gcl-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gcl-commits] gcl cmpnewgcl_cmptop.lsp debian/changelog h/pro... [Versio


From: Camm Maguire
Subject: [Gcl-commits] gcl cmpnewgcl_cmptop.lsp debian/changelog h/pro... [Version_2_6_8pre]
Date: Tue, 20 Jun 2006 23:00:11 +0000

CVSROOT:        /cvsroot/gcl
Module name:    gcl
Branch:         Version_2_6_8pre
Changes by:     Camm Maguire <camm>     06/06/20 23:00:10

Modified files:
        cmpnew         : gcl_cmptop.lsp 
        debian         : changelog 
        h              : protoize.h 
        o              : cmpaux.c 
        xgcl-2         : Events.c XStruct-2.c XStruct-4.c Xutil-2.c 
                         gcl_XStruct-l-3.lsp gcl_Xlib.lsp 
                         gcl_Xstruct.lsp gcl_Xutil.lsp 
                         gcl_defentry-events.lsp gcl_dwtest.lsp 
                         gcl_general.lsp gcl_sysinit.lsp general-c.c 

Log message:
        xgcl merge from cvs head

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gcl/cmpnew/gcl_cmptop.lsp?cvsroot=gcl&only_with_tag=Version_2_6_8pre&r1=1.1.2.4.6.2.4.3&r2=1.1.2.4.6.2.4.3.2.1
http://cvs.savannah.gnu.org/viewcvs/gcl/debian/changelog?cvsroot=gcl&only_with_tag=Version_2_6_8pre&r1=1.220.2.1.4.1.2.1.2.1.2.2.2.1.2.19.2.207.2.23.2.11.2.14.2.13.4.7.2.22.2.49&r2=1.220.2.1.4.1.2.1.2.1.2.2.2.1.2.19.2.207.2.23.2.11.2.14.2.13.4.7.2.22.2.50
http://cvs.savannah.gnu.org/viewcvs/gcl/h/protoize.h?cvsroot=gcl&only_with_tag=Version_2_6_8pre&r1=1.26.4.1.2.1.2.11.6.1.6.1.2.3.2.1&r2=1.26.4.1.2.1.2.11.6.1.6.1.2.3.2.2
http://cvs.savannah.gnu.org/viewcvs/gcl/o/cmpaux.c?cvsroot=gcl&only_with_tag=Version_2_6_8pre&r1=1.15.6.1.2.1.2.1.4.4.14.3&r2=1.15.6.1.2.1.2.1.4.4.14.4
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/Events.c?cvsroot=gcl&only_with_tag=Version_2_6_8pre&r1=1.1.1.1.2.1&r2=1.1.1.1.2.1.18.1
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/XStruct-2.c?cvsroot=gcl&only_with_tag=Version_2_6_8pre&r1=1.1.1.1&r2=1.1.1.1.20.1
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/XStruct-4.c?cvsroot=gcl&only_with_tag=Version_2_6_8pre&r1=1.1.1.1.2.1.18.1&r2=1.1.1.1.2.1.18.2
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/Xutil-2.c?cvsroot=gcl&only_with_tag=Version_2_6_8pre&r1=1.1.1.1&r2=1.1.1.1.20.1
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_XStruct-l-3.lsp?cvsroot=gcl&only_with_tag=Version_2_6_8pre&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_Xlib.lsp?cvsroot=gcl&only_with_tag=Version_2_6_8pre&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_Xstruct.lsp?cvsroot=gcl&only_with_tag=Version_2_6_8pre&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_Xutil.lsp?cvsroot=gcl&only_with_tag=Version_2_6_8pre&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_defentry-events.lsp?cvsroot=gcl&only_with_tag=Version_2_6_8pre&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_dwtest.lsp?cvsroot=gcl&only_with_tag=Version_2_6_8pre&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_general.lsp?cvsroot=gcl&only_with_tag=Version_2_6_8pre&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_sysinit.lsp?cvsroot=gcl&only_with_tag=Version_2_6_8pre&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/general-c.c?cvsroot=gcl&only_with_tag=Version_2_6_8pre&r1=1.1.1.1.2.1.18.2&r2=1.1.1.1.2.1.18.3

Patches:
Index: cmpnew/gcl_cmptop.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/cmpnew/gcl_cmptop.lsp,v
retrieving revision 1.1.2.4.6.2.4.3
retrieving revision 1.1.2.4.6.2.4.3.2.1
diff -u -b -r1.1.2.4.6.2.4.3 -r1.1.2.4.6.2.4.3.2.1
--- cmpnew/gcl_cmptop.lsp       7 May 2005 14:40:32 -0000       1.1.2.4.6.2.4.3
+++ cmpnew/gcl_cmptop.lsp       20 Jun 2006 23:00:10 -0000      
1.1.2.4.6.2.4.3.2.1
@@ -1577,7 +1577,7 @@
   (cmpck (not (symbolp (car args)))
          "The function name ~s is not a symbol." (car args))
   (dolist** (x (cadr args))
-    (cmpck (not (member x '(object char int float double string)))
+    (cmpck (not (member x '(object char fixnum int float double string)))
            "The C-type ~s is illegal." x))
   (setq cfspec (caddr args))
   (cond ((symbolp cfspec)
@@ -1587,7 +1587,7 @@
          (setq type 'object)
          (setq cname cfspec))
         ((and (consp cfspec)
-              (member (car cfspec) '(void object char int float double
+              (member (car cfspec) '(void object char fixnum int float double
                                          string))
               (consp (cdr cfspec))
               (or (symbolp (cadr cfspec)) (stringp (cadr cfspec)))
@@ -1639,7 +1639,7 @@
         (void (wt "Cnil"))
         (object (wt "x"))
         (char (wt "code_char(x)"))
-        (int (when (zerop *space*) (wt "CMP"))
+        ((fixnum int) (when (zerop *space*) (wt "CMP"))
              (wt "make_fixnum(x)"))
        (string
          (wt "make_simple_string(x)"))

Index: debian/changelog
===================================================================
RCS file: /cvsroot/gcl/gcl/debian/changelog,v
retrieving revision 
1.220.2.1.4.1.2.1.2.1.2.2.2.1.2.19.2.207.2.23.2.11.2.14.2.13.4.7.2.22.2.49
retrieving revision 
1.220.2.1.4.1.2.1.2.1.2.2.2.1.2.19.2.207.2.23.2.11.2.14.2.13.4.7.2.22.2.50
diff -u -b 
-r1.220.2.1.4.1.2.1.2.1.2.2.2.1.2.19.2.207.2.23.2.11.2.14.2.13.4.7.2.22.2.49 
-r1.220.2.1.4.1.2.1.2.1.2.2.2.1.2.19.2.207.2.23.2.11.2.14.2.13.4.7.2.22.2.50
--- debian/changelog    20 Jun 2006 16:47:21 -0000      
1.220.2.1.4.1.2.1.2.1.2.2.2.1.2.19.2.207.2.23.2.11.2.14.2.13.4.7.2.22.2.49
+++ debian/changelog    20 Jun 2006 23:00:10 -0000      
1.220.2.1.4.1.2.1.2.1.2.2.2.1.2.19.2.207.2.23.2.11.2.14.2.13.4.7.2.22.2.50
@@ -61,8 +61,9 @@
   * Fix cs.po
   * update fr and sv po files
   * clean xgcl-2/gmon.out
+  * xgcl merge from cvs head
 
- -- Camm Maguire <address@hidden>  Tue, 20 Jun 2006 16:47:08 +0000
+ -- Camm Maguire <address@hidden>  Tue, 20 Jun 2006 23:00:01 +0000
 
 gcl (2.6.7-7) unstable; urgency=high
 

Index: h/protoize.h
===================================================================
RCS file: /cvsroot/gcl/gcl/h/protoize.h,v
retrieving revision 1.26.4.1.2.1.2.11.6.1.6.1.2.3.2.1
retrieving revision 1.26.4.1.2.1.2.11.6.1.6.1.2.3.2.2
diff -u -b -r1.26.4.1.2.1.2.11.6.1.6.1.2.3.2.1 
-r1.26.4.1.2.1.2.11.6.1.6.1.2.3.2.2
--- h/protoize.h        30 Sep 2005 02:17:21 -0000      
1.26.4.1.2.1.2.11.6.1.6.1.2.3.2.1
+++ h/protoize.h        20 Jun 2006 23:00:10 -0000      
1.26.4.1.2.1.2.11.6.1.6.1.2.3.2.2
@@ -141,6 +141,7 @@
 /* cmpaux.c:106:OF */ /* extern int ifloor (int x, int y); */ /* (x, y) int x; 
int y; */
 /* cmpaux.c:124:OF */ /* extern int imod (int x, int y); */ /* (x, y) int x; 
int y; */
 /* cmpaux.c:185:OF */ extern int object_to_int (object x); /* (x) object x; */
+/* cmpaux.c:185:OF */ extern fixnum object_to_fixnum (object x); /* (x) object 
x; */
 /* cmpaux.c:263:OF */ extern char *object_to_string (object x); /* (x) object 
x; */
 typedef int (*FUNC)();
 /* cmpaux.c:294:OF */ extern void call_init (int init_address, object memory, 
object fasl_vec, FUNC fptr); /* (init_address, memory, fasl_vec, fptr) int 
init_address; object memory; object fasl_vec; FUNC fptr; */

Index: o/cmpaux.c
===================================================================
RCS file: /cvsroot/gcl/gcl/o/cmpaux.c,v
retrieving revision 1.15.6.1.2.1.2.1.4.4.14.3
retrieving revision 1.15.6.1.2.1.2.1.4.4.14.4
diff -u -b -r1.15.6.1.2.1.2.1.4.4.14.3 -r1.15.6.1.2.1.2.1.4.4.14.4
--- o/cmpaux.c  1 Dec 2005 22:18:23 -0000       1.15.6.1.2.1.2.1.4.4.14.3
+++ o/cmpaux.c  20 Jun 2006 23:00:10 -0000      1.15.6.1.2.1.2.1.4.4.14.4
@@ -205,6 +205,31 @@
        return(i);
 }
 
+fixnum
+object_to_fixnum(object x)
+{
+       fixnum i=0;
+
+       switch (type_of(x)) {
+       case t_character:
+         i = char_code(x);  break;
+       case t_fixnum:
+         i = fix(x);  break;
+       case t_bignum:
+         i = number_to_double(x);
+         break;
+       case t_ratio:
+         i = number_to_double(x);  break;
+       case t_shortfloat:
+         i = sf(x);  break;
+       case t_longfloat:
+         i = lf(x);  break;
+       default:
+         FEerror("~S cannot be coerce to a C int.", 1, x);
+       }
+       return(i);
+}
+
 float 
 object_to_float(object x) 
 { 

Index: xgcl-2/Events.c
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/Events.c,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.1.18.1
diff -u -b -r1.1.1.1.2.1 -r1.1.1.1.2.1.18.1
--- xgcl-2/Events.c     20 Mar 2003 15:22:55 -0000      1.1.1.1.2.1
+++ xgcl-2/Events.c     20 Jun 2006 23:00:10 -0000      1.1.1.1.2.1.18.1
@@ -25,204 +25,159 @@
 #include <X11/Xlib.h>
 
 #include "include.h"
-
+#define int fixnum
 /********* XKeyEvent funcions *****/
 
-int  make_XKeyEvent (){
+int  make_XKeyEvent (void) {
           return ((int) calloc(1, sizeof(XKeyEvent)));
 }
 
-int  XKeyEvent_same_screen(i)
-XKeyEvent* i;
+int  XKeyEvent_same_screen(XKeyEvent *i)
 {
           return(i->same_screen);
 }
 
-void set_XKeyEvent_same_screen(i, j)
-XKeyEvent* i;
-int j;
+void set_XKeyEvent_same_screen(XKeyEvent *i, int j)
 {
           i->same_screen = j;
 }
 
-int  XKeyEvent_keycode(i)
-XKeyEvent* i;
+int  XKeyEvent_keycode(XKeyEvent *i)
 {
           return(i->keycode);
 }
 
-void set_XKeyEvent_keycode(i, j)
-XKeyEvent* i;
-int j;
+void set_XKeyEvent_keycode(XKeyEvent *i, int j)
 {
           i->keycode = j;
 }
 
-int  XKeyEvent_state(i)
-XKeyEvent* i;
+int  XKeyEvent_state(XKeyEvent *i)
 {
           return(i->state);
 }
 
-void set_XKeyEvent_state(i, j)
-XKeyEvent* i;
-int j;
+void set_XKeyEvent_state(XKeyEvent *i, int j)
 {
           i->state = j;
 }
 
-int  XKeyEvent_y_root(i)
-XKeyEvent* i;
+int  XKeyEvent_y_root(XKeyEvent *i)
 {
           return(i->y_root);
 }
 
-void set_XKeyEvent_y_root(i, j)
-XKeyEvent* i;
-int j;
+void set_XKeyEvent_y_root(XKeyEvent *i, int j)
 {
           i->y_root = j;
 }
 
-int  XKeyEvent_x_root(i)
-XKeyEvent* i;
+int  XKeyEvent_x_root(XKeyEvent *i)
 {
           return(i->x_root);
 }
 
-void set_XKeyEvent_x_root(i, j)
-XKeyEvent* i;
-int j;
+void set_XKeyEvent_x_root(XKeyEvent *i, int j)
 {
           i->x_root = j;
 }
 
-int  XKeyEvent_y(i)
-XKeyEvent* i;
+int  XKeyEvent_y(XKeyEvent *i)
 {
           return(i->y);
 }
 
-void set_XKeyEvent_y(i, j)
-XKeyEvent* i;
-int j;
+void set_XKeyEvent_y(XKeyEvent *i, int j)
 {
           i->y = j;
 }
 
-int  XKeyEvent_x(i)
-XKeyEvent* i;
+int  XKeyEvent_x(XKeyEvent *i)
 {
           return(i->x);
 }
 
-void set_XKeyEvent_x(i, j)
-XKeyEvent* i;
-int j;
+void set_XKeyEvent_x(XKeyEvent *i, int j)
 {
           i->x = j;
 }
 
-int  XKeyEvent_time(i)
-XKeyEvent* i;
+int  XKeyEvent_time(XKeyEvent *i)
 {
           return(i->time);
 }
 
-void set_XKeyEvent_time(i, j)
-XKeyEvent* i;
-int j;
+void set_XKeyEvent_time(XKeyEvent *i, int j)
 {
           i->time = j;
 }
 
-int  XKeyEvent_subwindow(i)
-XKeyEvent* i;
+int  XKeyEvent_subwindow(XKeyEvent *i)
 {
           return(i->subwindow);
 }
 
-void set_XKeyEvent_subwindow(i, j)
-XKeyEvent* i;
-int j;
+void set_XKeyEvent_subwindow(XKeyEvent *i, int j)
 {
           i->subwindow = j;
 }
 
-int  XKeyEvent_root(i)
-XKeyEvent* i;
+int  XKeyEvent_root(XKeyEvent *i)
 {
           return(i->root);
 }
 
-void set_XKeyEvent_root(i, j)
-XKeyEvent* i;
-int j;
+void set_XKeyEvent_root(XKeyEvent *i, int j)
 {
           i->root = j;
 }
 
-int  XKeyEvent_window(i)
-XKeyEvent* i;
+int  XKeyEvent_window(XKeyEvent *i)
 {
           return(i->window);
 }
 
-void set_XKeyEvent_window(i, j)
-XKeyEvent* i;
-int j;
+void set_XKeyEvent_window(XKeyEvent *i, int j)
 {
           i->window = j;
 }
 
-Display *XKeyEvent_display(i)
-XKeyEvent* i;
+Display *XKeyEvent_display(XKeyEvent *i)
 {
           return(i->display);
 }
 
-void set_XKeyEvent_display(i, j)
-XKeyEvent* i;
-Display *j;
+void set_XKeyEvent_display(XKeyEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XKeyEvent_send_event(i)
-XKeyEvent* i;
+int  XKeyEvent_send_event(XKeyEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XKeyEvent_send_event(i, j)
-XKeyEvent* i;
-int j;
+void set_XKeyEvent_send_event(XKeyEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XKeyEvent_serial(i)
-XKeyEvent* i;
+int  XKeyEvent_serial(XKeyEvent *i)
 {
           return(i->serial);
 }
 
-void set_XKeyEvent_serial(i, j)
-XKeyEvent* i;
-int j;
+void set_XKeyEvent_serial(XKeyEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XKeyEvent_type(i)
-XKeyEvent* i;
+int  XKeyEvent_type(XKeyEvent *i)
 {
           return(i->type);
 }
 
-void set_XKeyEvent_type(i, j)
-XKeyEvent* i;
-int j;
+void set_XKeyEvent_type(XKeyEvent *i, int j)
 {
           i->type = j;
 }
@@ -230,201 +185,156 @@
 
 /********* XButtonEvent funcions *****/
 
-int  make_XButtonEvent (){
+int  make_XButtonEvent (void) {
           return ((int) calloc(1, sizeof(XButtonEvent)));
 }
 
-int  XButtonEvent_same_screen(i)
-XButtonEvent* i;
+int  XButtonEvent_same_screen(XButtonEvent *i)
 {
           return(i->same_screen);
 }
 
-void set_XButtonEvent_same_screen(i, j)
-XButtonEvent* i;
-int j;
+void set_XButtonEvent_same_screen(XButtonEvent *i, int j)
 {
           i->same_screen = j;
 }
 
-int  XButtonEvent_button(i)
-XButtonEvent* i;
+int  XButtonEvent_button(XButtonEvent *i)
 {
           return(i->button);
 }
 
-void set_XButtonEvent_button(i, j)
-XButtonEvent* i;
-int j;
+void set_XButtonEvent_button(XButtonEvent *i, int j)
 {
           i->button = j;
 }
 
-int  XButtonEvent_state(i)
-XButtonEvent* i;
+int  XButtonEvent_state(XButtonEvent *i)
 {
           return(i->state);
 }
 
-void set_XButtonEvent_state(i, j)
-XButtonEvent* i;
-int j;
+void set_XButtonEvent_state(XButtonEvent *i, int j)
 {
           i->state = j;
 }
 
-int  XButtonEvent_y_root(i)
-XButtonEvent* i;
+int  XButtonEvent_y_root(XButtonEvent *i)
 {
           return(i->y_root);
 }
 
-void set_XButtonEvent_y_root(i, j)
-XButtonEvent* i;
-int j;
+void set_XButtonEvent_y_root(XButtonEvent *i, int j)
 {
           i->y_root = j;
 }
 
-int  XButtonEvent_x_root(i)
-XButtonEvent* i;
+int  XButtonEvent_x_root(XButtonEvent *i)
 {
           return(i->x_root);
 }
 
-void set_XButtonEvent_x_root(i, j)
-XButtonEvent* i;
-int j;
+void set_XButtonEvent_x_root(XButtonEvent *i, int j)
 {
           i->x_root = j;
 }
 
-int  XButtonEvent_y(i)
-XButtonEvent* i;
+int  XButtonEvent_y(XButtonEvent *i)
 {
           return(i->y);
 }
 
-void set_XButtonEvent_y(i, j)
-XButtonEvent* i;
-int j;
+void set_XButtonEvent_y(XButtonEvent *i, int j)
 {
           i->y = j;
 }
 
-int  XButtonEvent_x(i)
-XButtonEvent* i;
+int  XButtonEvent_x(XButtonEvent *i)
 {
           return(i->x);
 }
 
-void set_XButtonEvent_x(i, j)
-XButtonEvent* i;
-int j;
+void set_XButtonEvent_x(XButtonEvent *i, int j)
 {
           i->x = j;
 }
 
-int  XButtonEvent_time(i)
-XButtonEvent* i;
+int  XButtonEvent_time(XButtonEvent *i)
 {
           return(i->time);
 }
 
-void set_XButtonEvent_time(i, j)
-XButtonEvent* i;
-int j;
+void set_XButtonEvent_time(XButtonEvent *i, int j)
 {
           i->time = j;
 }
 
-int  XButtonEvent_subwindow(i)
-XButtonEvent* i;
+int  XButtonEvent_subwindow(XButtonEvent *i)
 {
           return(i->subwindow);
 }
 
-void set_XButtonEvent_subwindow(i, j)
-XButtonEvent* i;
-int j;
+void set_XButtonEvent_subwindow(XButtonEvent *i, int j)
 {
           i->subwindow = j;
 }
 
-int  XButtonEvent_root(i)
-XButtonEvent* i;
+int  XButtonEvent_root(XButtonEvent *i)
 {
           return(i->root);
 }
 
-void set_XButtonEvent_root(i, j)
-XButtonEvent* i;
-int j;
+void set_XButtonEvent_root(XButtonEvent *i, int j)
 {
           i->root = j;
 }
 
-int  XButtonEvent_window(i)
-XButtonEvent* i;
+int  XButtonEvent_window(XButtonEvent *i)
 {
           return(i->window);
 }
 
-void set_XButtonEvent_window(i, j)
-XButtonEvent* i;
-int j;
+void set_XButtonEvent_window(XButtonEvent *i, int j)
 {
           i->window = j;
 }
 
-Display *XButtonEvent_display(i)
-XButtonEvent* i;
+Display *XButtonEvent_display(XButtonEvent *i)
 {
           return(i->display);
 }
 
-void set_XButtonEvent_display(i, j)
-XButtonEvent* i;
-Display *j;
+void set_XButtonEvent_display(XButtonEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XButtonEvent_send_event(i)
-XButtonEvent* i;
+int  XButtonEvent_send_event(XButtonEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XButtonEvent_send_event(i, j)
-XButtonEvent* i;
-int j;
+void set_XButtonEvent_send_event(XButtonEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XButtonEvent_serial(i)
-XButtonEvent* i;
+int  XButtonEvent_serial(XButtonEvent *i)
 {
           return(i->serial);
 }
 
-void set_XButtonEvent_serial(i, j)
-XButtonEvent* i;
-int j;
+void set_XButtonEvent_serial(XButtonEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XButtonEvent_type(i)
-XButtonEvent* i;
+int  XButtonEvent_type(XButtonEvent *i)
 {
           return(i->type);
 }
 
-void set_XButtonEvent_type(i, j)
-XButtonEvent* i;
-int j;
+void set_XButtonEvent_type(XButtonEvent *i, int j)
 {
           i->type = j;
 }
@@ -432,201 +342,156 @@
 
 /********* XMotionEvent funcions *****/
 
-int  make_XMotionEvent (){
+int  make_XMotionEvent (void) {
           return ((int) calloc(1, sizeof(XMotionEvent)));
 }
 
-int  XMotionEvent_same_screen(i)
-XMotionEvent* i;
+int  XMotionEvent_same_screen(XMotionEvent *i)
 {
           return(i->same_screen);
 }
 
-void set_XMotionEvent_same_screen(i, j)
-XMotionEvent* i;
-int j;
+void set_XMotionEvent_same_screen(XMotionEvent *i, int j)
 {
           i->same_screen = j;
 }
 
-char XMotionEvent_is_hint(i)
-XMotionEvent* i;
+char XMotionEvent_is_hint(XMotionEvent *i)
 {
           return(i->is_hint);
 }
 
-void set_XMotionEvent_is_hint(i, j)
-XMotionEvent* i;
-char j;
+void set_XMotionEvent_is_hint(XMotionEvent *i, char j)
 {
           i->is_hint = j;
 }
 
-int  XMotionEvent_state(i)
-XMotionEvent* i;
+int  XMotionEvent_state(XMotionEvent *i)
 {
           return(i->state);
 }
 
-void set_XMotionEvent_state(i, j)
-XMotionEvent* i;
-int j;
+void set_XMotionEvent_state(XMotionEvent *i, int j)
 {
           i->state = j;
 }
 
-int  XMotionEvent_y_root(i)
-XMotionEvent* i;
+int  XMotionEvent_y_root(XMotionEvent *i)
 {
           return(i->y_root);
 }
 
-void set_XMotionEvent_y_root(i, j)
-XMotionEvent* i;
-int j;
+void set_XMotionEvent_y_root(XMotionEvent *i, int j)
 {
           i->y_root = j;
 }
 
-int  XMotionEvent_x_root(i)
-XMotionEvent* i;
+int  XMotionEvent_x_root(XMotionEvent *i)
 {
           return(i->x_root);
 }
 
-void set_XMotionEvent_x_root(i, j)
-XMotionEvent* i;
-int j;
+void set_XMotionEvent_x_root(XMotionEvent *i, int j)
 {
           i->x_root = j;
 }
 
-int  XMotionEvent_y(i)
-XMotionEvent* i;
+int  XMotionEvent_y(XMotionEvent *i)
 {
           return(i->y);
 }
 
-void set_XMotionEvent_y(i, j)
-XMotionEvent* i;
-int j;
+void set_XMotionEvent_y(XMotionEvent *i, int j)
 {
           i->y = j;
 }
 
-int  XMotionEvent_x(i)
-XMotionEvent* i;
+int  XMotionEvent_x(XMotionEvent *i)
 {
           return(i->x);
 }
 
-void set_XMotionEvent_x(i, j)
-XMotionEvent* i;
-int j;
+void set_XMotionEvent_x(XMotionEvent *i, int j)
 {
           i->x = j;
 }
 
-int  XMotionEvent_time(i)
-XMotionEvent* i;
+int  XMotionEvent_time(XMotionEvent *i)
 {
           return(i->time);
 }
 
-void set_XMotionEvent_time(i, j)
-XMotionEvent* i;
-int j;
+void set_XMotionEvent_time(XMotionEvent *i, int j)
 {
           i->time = j;
 }
 
-int  XMotionEvent_subwindow(i)
-XMotionEvent* i;
+int  XMotionEvent_subwindow(XMotionEvent *i)
 {
           return(i->subwindow);
 }
 
-void set_XMotionEvent_subwindow(i, j)
-XMotionEvent* i;
-int j;
+void set_XMotionEvent_subwindow(XMotionEvent *i, int j)
 {
           i->subwindow = j;
 }
 
-int  XMotionEvent_root(i)
-XMotionEvent* i;
+int  XMotionEvent_root(XMotionEvent *i)
 {
           return(i->root);
 }
 
-void set_XMotionEvent_root(i, j)
-XMotionEvent* i;
-int j;
+void set_XMotionEvent_root(XMotionEvent *i, int j)
 {
           i->root = j;
 }
 
-int  XMotionEvent_window(i)
-XMotionEvent* i;
+int  XMotionEvent_window(XMotionEvent *i)
 {
           return(i->window);
 }
 
-void set_XMotionEvent_window(i, j)
-XMotionEvent* i;
-int j;
+void set_XMotionEvent_window(XMotionEvent *i, int j)
 {
           i->window = j;
 }
 
-Display *XMotionEvent_display(i)
-XMotionEvent* i;
+Display *XMotionEvent_display(XMotionEvent *i)
 {
           return(i->display);
 }
 
-void set_XMotionEvent_display(i, j)
-XMotionEvent* i;
-Display *j;
+void set_XMotionEvent_display(XMotionEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XMotionEvent_send_event(i)
-XMotionEvent* i;
+int  XMotionEvent_send_event(XMotionEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XMotionEvent_send_event(i, j)
-XMotionEvent* i;
-int j;
+void set_XMotionEvent_send_event(XMotionEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XMotionEvent_serial(i)
-XMotionEvent* i;
+int  XMotionEvent_serial(XMotionEvent *i)
 {
           return(i->serial);
 }
 
-void set_XMotionEvent_serial(i, j)
-XMotionEvent* i;
-int j;
+void set_XMotionEvent_serial(XMotionEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XMotionEvent_type(i)
-XMotionEvent* i;
+int  XMotionEvent_type(XMotionEvent *i)
 {
           return(i->type);
 }
 
-void set_XMotionEvent_type(i, j)
-XMotionEvent* i;
-int j;
+void set_XMotionEvent_type(XMotionEvent *i, int j)
 {
           i->type = j;
 }
@@ -634,227 +499,176 @@
 
 /********* XCrossingEvent funcions *****/
 
-int  make_XCrossingEvent (){
+int  make_XCrossingEvent (void) {
           return ((int) calloc(1, sizeof(XCrossingEvent)));
 }
 
-int  XCrossingEvent_state(i)
-XCrossingEvent* i;
+int  XCrossingEvent_state(XCrossingEvent *i)
 {
           return(i->state);
 }
 
-void set_XCrossingEvent_state(i, j)
-XCrossingEvent* i;
-int j;
+void set_XCrossingEvent_state(XCrossingEvent *i, int j)
 {
           i->state = j;
 }
 
-int  XCrossingEvent_focus(i)
-XCrossingEvent* i;
+int  XCrossingEvent_focus(XCrossingEvent *i)
 {
           return(i->focus);
 }
 
-void set_XCrossingEvent_focus(i, j)
-XCrossingEvent* i;
-int j;
+void set_XCrossingEvent_focus(XCrossingEvent *i, int j)
 {
           i->focus = j;
 }
 
-int  XCrossingEvent_same_screen(i)
-XCrossingEvent* i;
+int  XCrossingEvent_same_screen(XCrossingEvent *i)
 {
           return(i->same_screen);
 }
 
-void set_XCrossingEvent_same_screen(i, j)
-XCrossingEvent* i;
-int j;
+void set_XCrossingEvent_same_screen(XCrossingEvent *i, int j)
 {
           i->same_screen = j;
 }
 
-int  XCrossingEvent_detail(i)
-XCrossingEvent* i;
+int  XCrossingEvent_detail(XCrossingEvent *i)
 {
           return(i->detail);
 }
 
-void set_XCrossingEvent_detail(i, j)
-XCrossingEvent* i;
-int j;
+void set_XCrossingEvent_detail(XCrossingEvent *i, int j)
 {
           i->detail = j;
 }
 
-int  XCrossingEvent_mode(i)
-XCrossingEvent* i;
+int  XCrossingEvent_mode(XCrossingEvent *i)
 {
           return(i->mode);
 }
 
-void set_XCrossingEvent_mode(i, j)
-XCrossingEvent* i;
-int j;
+void set_XCrossingEvent_mode(XCrossingEvent *i, int j)
 {
           i->mode = j;
 }
 
-int  XCrossingEvent_y_root(i)
-XCrossingEvent* i;
+int  XCrossingEvent_y_root(XCrossingEvent *i)
 {
           return(i->y_root);
 }
 
-void set_XCrossingEvent_y_root(i, j)
-XCrossingEvent* i;
-int j;
+void set_XCrossingEvent_y_root(XCrossingEvent *i, int j)
 {
           i->y_root = j;
 }
 
-int  XCrossingEvent_x_root(i)
-XCrossingEvent* i;
+int  XCrossingEvent_x_root(XCrossingEvent *i)
 {
           return(i->x_root);
 }
 
-void set_XCrossingEvent_x_root(i, j)
-XCrossingEvent* i;
-int j;
+void set_XCrossingEvent_x_root(XCrossingEvent *i, int j)
 {
           i->x_root = j;
 }
 
-int  XCrossingEvent_y(i)
-XCrossingEvent* i;
+int  XCrossingEvent_y(XCrossingEvent *i)
 {
           return(i->y);
 }
 
-void set_XCrossingEvent_y(i, j)
-XCrossingEvent* i;
-int j;
+void set_XCrossingEvent_y(XCrossingEvent *i, int j)
 {
           i->y = j;
 }
 
-int  XCrossingEvent_x(i)
-XCrossingEvent* i;
+int  XCrossingEvent_x(XCrossingEvent *i)
 {
           return(i->x);
 }
 
-void set_XCrossingEvent_x(i, j)
-XCrossingEvent* i;
-int j;
+void set_XCrossingEvent_x(XCrossingEvent *i, int j)
 {
           i->x = j;
 }
 
-int  XCrossingEvent_time(i)
-XCrossingEvent* i;
+int  XCrossingEvent_time(XCrossingEvent *i)
 {
           return(i->time);
 }
 
-void set_XCrossingEvent_time(i, j)
-XCrossingEvent* i;
-int j;
+void set_XCrossingEvent_time(XCrossingEvent *i, int j)
 {
           i->time = j;
 }
 
-int  XCrossingEvent_subwindow(i)
-XCrossingEvent* i;
+int  XCrossingEvent_subwindow(XCrossingEvent *i)
 {
           return(i->subwindow);
 }
 
-void set_XCrossingEvent_subwindow(i, j)
-XCrossingEvent* i;
-int j;
+void set_XCrossingEvent_subwindow(XCrossingEvent *i, int j)
 {
           i->subwindow = j;
 }
 
-int  XCrossingEvent_root(i)
-XCrossingEvent* i;
+int  XCrossingEvent_root(XCrossingEvent *i)
 {
           return(i->root);
 }
 
-void set_XCrossingEvent_root(i, j)
-XCrossingEvent* i;
-int j;
+void set_XCrossingEvent_root(XCrossingEvent *i, int j)
 {
           i->root = j;
 }
 
-int  XCrossingEvent_window(i)
-XCrossingEvent* i;
+int  XCrossingEvent_window(XCrossingEvent *i)
 {
           return(i->window);
 }
 
-void set_XCrossingEvent_window(i, j)
-XCrossingEvent* i;
-int j;
+void set_XCrossingEvent_window(XCrossingEvent *i, int j)
 {
           i->window = j;
 }
 
-Display *XCrossingEvent_display(i)
-XCrossingEvent* i;
+Display *XCrossingEvent_display(XCrossingEvent *i)
 {
           return(i->display);
 }
 
-void set_XCrossingEvent_display(i, j)
-XCrossingEvent* i;
-Display *j;
+void set_XCrossingEvent_display(XCrossingEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XCrossingEvent_send_event(i)
-XCrossingEvent* i;
+int  XCrossingEvent_send_event(XCrossingEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XCrossingEvent_send_event(i, j)
-XCrossingEvent* i;
-int j;
+void set_XCrossingEvent_send_event(XCrossingEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XCrossingEvent_serial(i)
-XCrossingEvent* i;
+int  XCrossingEvent_serial(XCrossingEvent *i)
 {
           return(i->serial);
 }
 
-void set_XCrossingEvent_serial(i, j)
-XCrossingEvent* i;
-int j;
+void set_XCrossingEvent_serial(XCrossingEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XCrossingEvent_type(i)
-XCrossingEvent* i;
+int  XCrossingEvent_type(XCrossingEvent *i)
 {
           return(i->type);
 }
 
-void set_XCrossingEvent_type(i, j)
-XCrossingEvent* i;
-int j;
+void set_XCrossingEvent_type(XCrossingEvent *i, int j)
 {
           i->type = j;
 }
@@ -862,97 +676,76 @@
 
 /********* XFocusChangeEvent funcions *****/
 
-int  make_XFocusChangeEvent (){
+int  make_XFocusChangeEvent (void) {
           return ((int) calloc(1, sizeof(XFocusChangeEvent)));
 }
 
-int  XFocusChangeEvent_detail(i)
-XFocusChangeEvent* i;
+int  XFocusChangeEvent_detail(XFocusChangeEvent *i)
 {
           return(i->detail);
 }
 
-void set_XFocusChangeEvent_detail(i, j)
-XFocusChangeEvent* i;
-int j;
+void set_XFocusChangeEvent_detail(XFocusChangeEvent *i, int j)
 {
           i->detail = j;
 }
 
-int  XFocusChangeEvent_mode(i)
-XFocusChangeEvent* i;
+int  XFocusChangeEvent_mode(XFocusChangeEvent *i)
 {
           return(i->mode);
 }
 
-void set_XFocusChangeEvent_mode(i, j)
-XFocusChangeEvent* i;
-int j;
+void set_XFocusChangeEvent_mode(XFocusChangeEvent *i, int j)
 {
           i->mode = j;
 }
 
-int  XFocusChangeEvent_window(i)
-XFocusChangeEvent* i;
+int  XFocusChangeEvent_window(XFocusChangeEvent *i)
 {
           return(i->window);
 }
 
-void set_XFocusChangeEvent_window(i, j)
-XFocusChangeEvent* i;
-int j;
+void set_XFocusChangeEvent_window(XFocusChangeEvent *i, int j)
 {
           i->window = j;
 }
 
-Display *XFocusChangeEvent_display(i)
-XFocusChangeEvent* i;
+Display *XFocusChangeEvent_display(XFocusChangeEvent *i)
 {
           return(i->display);
 }
 
-void set_XFocusChangeEvent_display(i, j)
-XFocusChangeEvent* i;
-Display *j;
+void set_XFocusChangeEvent_display(XFocusChangeEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XFocusChangeEvent_send_event(i)
-XFocusChangeEvent* i;
+int  XFocusChangeEvent_send_event(XFocusChangeEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XFocusChangeEvent_send_event(i, j)
-XFocusChangeEvent* i;
-int j;
+void set_XFocusChangeEvent_send_event(XFocusChangeEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XFocusChangeEvent_serial(i)
-XFocusChangeEvent* i;
+int  XFocusChangeEvent_serial(XFocusChangeEvent *i)
 {
           return(i->serial);
 }
 
-void set_XFocusChangeEvent_serial(i, j)
-XFocusChangeEvent* i;
-int j;
+void set_XFocusChangeEvent_serial(XFocusChangeEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XFocusChangeEvent_type(i)
-XFocusChangeEvent* i;
+int  XFocusChangeEvent_type(XFocusChangeEvent *i)
 {
           return(i->type);
 }
 
-void set_XFocusChangeEvent_type(i, j)
-XFocusChangeEvent* i;
-int j;
+void set_XFocusChangeEvent_type(XFocusChangeEvent *i, int j)
 {
           i->type = j;
 }
@@ -960,76 +753,60 @@
 
 /********* XKeymapEvent funcions *****/
 
-int  make_XKeymapEvent (){
+int  make_XKeymapEvent (void) {
           return ((int) calloc(1, sizeof(XKeymapEvent)));
 }
 
-char* XKeymapEvent_key_vector(i)
-XKeymapEvent* i;
+char* XKeymapEvent_key_vector(XKeymapEvent *i)
 {
           return(i->key_vector);
 }
-int  XKeymapEvent_window(i)
-XKeymapEvent* i;
+int  XKeymapEvent_window(XKeymapEvent *i)
 {
           return(i->window);
 }
 
-void set_XKeymapEvent_window(i, j)
-XKeymapEvent* i;
-int j;
+void set_XKeymapEvent_window(XKeymapEvent *i, int j)
 {
           i->window = j;
 }
 
-Display * XKeymapEvent_display(i)
-XKeymapEvent* i;
+Display * XKeymapEvent_display(XKeymapEvent *i)
 {
           return(i->display);
 }
 
-void set_XKeymapEvent_display(i, j)
-XKeymapEvent* i;
-Display *j;
+void set_XKeymapEvent_display(XKeymapEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XKeymapEvent_send_event(i)
-XKeymapEvent* i;
+int  XKeymapEvent_send_event(XKeymapEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XKeymapEvent_send_event(i, j)
-XKeymapEvent* i;
-int j;
+void set_XKeymapEvent_send_event(XKeymapEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XKeymapEvent_serial(i)
-XKeymapEvent* i;
+int  XKeymapEvent_serial(XKeymapEvent *i)
 {
           return(i->serial);
 }
 
-void set_XKeymapEvent_serial(i, j)
-XKeymapEvent* i;
-int j;
+void set_XKeymapEvent_serial(XKeymapEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XKeymapEvent_type(i)
-XKeymapEvent* i;
+int  XKeymapEvent_type(XKeymapEvent *i)
 {
           return(i->type);
 }
 
-void set_XKeymapEvent_type(i, j)
-XKeymapEvent* i;
-int j;
+void set_XKeymapEvent_type(XKeymapEvent *i, int j)
 {
           i->type = j;
 }
@@ -1037,136 +814,106 @@
 
 /********* XExposeEvent funcions *****/
 
-int  make_XExposeEvent (){
+int  make_XExposeEvent (void) {
           return ((int) calloc(1, sizeof(XExposeEvent)));
 }
 
-int  XExposeEvent_count(i)
-XExposeEvent* i;
+int  XExposeEvent_count(XExposeEvent *i)
 {
           return(i->count);
 }
 
-void set_XExposeEvent_count(i, j)
-XExposeEvent* i;
-int j;
+void set_XExposeEvent_count(XExposeEvent *i, int j)
 {
           i->count = j;
 }
 
-int  XExposeEvent_height(i)
-XExposeEvent* i;
+int  XExposeEvent_height(XExposeEvent *i)
 {
           return(i->height);
 }
 
-void set_XExposeEvent_height(i, j)
-XExposeEvent* i;
-int j;
+void set_XExposeEvent_height(XExposeEvent *i, int j)
 {
           i->height = j;
 }
 
-int  XExposeEvent_width(i)
-XExposeEvent* i;
+int  XExposeEvent_width(XExposeEvent *i)
 {
           return(i->width);
 }
 
-void set_XExposeEvent_width(i, j)
-XExposeEvent* i;
-int j;
+void set_XExposeEvent_width(XExposeEvent *i, int j)
 {
           i->width = j;
 }
 
-int  XExposeEvent_y(i)
-XExposeEvent* i;
+int  XExposeEvent_y(XExposeEvent *i)
 {
           return(i->y);
 }
 
-void set_XExposeEvent_y(i, j)
-XExposeEvent* i;
-int j;
+void set_XExposeEvent_y(XExposeEvent *i, int j)
 {
           i->y = j;
 }
 
-int  XExposeEvent_x(i)
-XExposeEvent* i;
+int  XExposeEvent_x(XExposeEvent *i)
 {
           return(i->x);
 }
 
-void set_XExposeEvent_x(i, j)
-XExposeEvent* i;
-int j;
+void set_XExposeEvent_x(XExposeEvent *i, int j)
 {
           i->x = j;
 }
 
-int  XExposeEvent_window(i)
-XExposeEvent* i;
+int  XExposeEvent_window(XExposeEvent *i)
 {
           return(i->window);
 }
 
-void set_XExposeEvent_window(i, j)
-XExposeEvent* i;
-int j;
+void set_XExposeEvent_window(XExposeEvent *i, int j)
 {
           i->window = j;
 }
 
-Display *XExposeEvent_display(i)
-XExposeEvent* i;
+Display *XExposeEvent_display(XExposeEvent *i)
 {
           return(i->display);
 }
 
-void set_XExposeEvent_display(i, j)
-XExposeEvent* i;
-Display *j;
+void set_XExposeEvent_display(XExposeEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XExposeEvent_send_event(i)
-XExposeEvent* i;
+int  XExposeEvent_send_event(XExposeEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XExposeEvent_send_event(i, j)
-XExposeEvent* i;
-int j;
+void set_XExposeEvent_send_event(XExposeEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XExposeEvent_serial(i)
-XExposeEvent* i;
+int  XExposeEvent_serial(XExposeEvent *i)
 {
           return(i->serial);
 }
 
-void set_XExposeEvent_serial(i, j)
-XExposeEvent* i;
-int j;
+void set_XExposeEvent_serial(XExposeEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XExposeEvent_type(i)
-XExposeEvent* i;
+int  XExposeEvent_type(XExposeEvent *i)
 {
           return(i->type);
 }
 
-void set_XExposeEvent_type(i, j)
-XExposeEvent* i;
-int j;
+void set_XExposeEvent_type(XExposeEvent *i, int j)
 {
           i->type = j;
 }
@@ -1174,162 +921,126 @@
 
 /********* XGraphicsExposeEvent funcions *****/
 
-int  make_XGraphicsExposeEvent (){
+int  make_XGraphicsExposeEvent (void) {
           return ((int) calloc(1, sizeof(XGraphicsExposeEvent)));
 }
 
-int  XGraphicsExposeEvent_minor_code(i)
-XGraphicsExposeEvent* i;
+int  XGraphicsExposeEvent_minor_code(XGraphicsExposeEvent *i)
 {
           return(i->minor_code);
 }
 
-void set_XGraphicsExposeEvent_minor_code(i, j)
-XGraphicsExposeEvent* i;
-int j;
+void set_XGraphicsExposeEvent_minor_code(XGraphicsExposeEvent *i, int j)
 {
           i->minor_code = j;
 }
 
-int  XGraphicsExposeEvent_major_code(i)
-XGraphicsExposeEvent* i;
+int  XGraphicsExposeEvent_major_code(XGraphicsExposeEvent *i)
 {
           return(i->major_code);
 }
 
-void set_XGraphicsExposeEvent_major_code(i, j)
-XGraphicsExposeEvent* i;
-int j;
+void set_XGraphicsExposeEvent_major_code(XGraphicsExposeEvent *i, int j)
 {
           i->major_code = j;
 }
 
-int  XGraphicsExposeEvent_count(i)
-XGraphicsExposeEvent* i;
+int  XGraphicsExposeEvent_count(XGraphicsExposeEvent *i)
 {
           return(i->count);
 }
 
-void set_XGraphicsExposeEvent_count(i, j)
-XGraphicsExposeEvent* i;
-int j;
+void set_XGraphicsExposeEvent_count(XGraphicsExposeEvent *i, int j)
 {
           i->count = j;
 }
 
-int  XGraphicsExposeEvent_height(i)
-XGraphicsExposeEvent* i;
+int  XGraphicsExposeEvent_height(XGraphicsExposeEvent *i)
 {
           return(i->height);
 }
 
-void set_XGraphicsExposeEvent_height(i, j)
-XGraphicsExposeEvent* i;
-int j;
+void set_XGraphicsExposeEvent_height(XGraphicsExposeEvent *i, int j)
 {
           i->height = j;
 }
 
-int  XGraphicsExposeEvent_width(i)
-XGraphicsExposeEvent* i;
+int  XGraphicsExposeEvent_width(XGraphicsExposeEvent *i)
 {
           return(i->width);
 }
 
-void set_XGraphicsExposeEvent_width(i, j)
-XGraphicsExposeEvent* i;
-int j;
+void set_XGraphicsExposeEvent_width(XGraphicsExposeEvent *i, int j)
 {
           i->width = j;
 }
 
-int  XGraphicsExposeEvent_y(i)
-XGraphicsExposeEvent* i;
+int  XGraphicsExposeEvent_y(XGraphicsExposeEvent *i)
 {
           return(i->y);
 }
 
-void set_XGraphicsExposeEvent_y(i, j)
-XGraphicsExposeEvent* i;
-int j;
+void set_XGraphicsExposeEvent_y(XGraphicsExposeEvent *i, int j)
 {
           i->y = j;
 }
 
-int  XGraphicsExposeEvent_x(i)
-XGraphicsExposeEvent* i;
+int  XGraphicsExposeEvent_x(XGraphicsExposeEvent *i)
 {
           return(i->x);
 }
 
-void set_XGraphicsExposeEvent_x(i, j)
-XGraphicsExposeEvent* i;
-int j;
+void set_XGraphicsExposeEvent_x(XGraphicsExposeEvent *i, int j)
 {
           i->x = j;
 }
 
-Drawable XGraphicsExposeEvent_drawable(i)
-XGraphicsExposeEvent* i;
+Drawable XGraphicsExposeEvent_drawable(XGraphicsExposeEvent *i)
 {
           return(i->drawable);
 }
 
-void set_XGraphicsExposeEvent_drawable(i, j)
-XGraphicsExposeEvent* i;
-Drawable j;
+void set_XGraphicsExposeEvent_drawable(XGraphicsExposeEvent *i, Drawable j)
 {
           i->drawable = j;
 }
 
-Display * XGraphicsExposeEvent_display(i)
-XGraphicsExposeEvent* i;
+Display * XGraphicsExposeEvent_display(XGraphicsExposeEvent *i)
 {
           return(i->display);
 }
 
-void set_XGraphicsExposeEvent_display(i, j)
-XGraphicsExposeEvent* i;
-Display *j;
+void set_XGraphicsExposeEvent_display(XGraphicsExposeEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XGraphicsExposeEvent_send_event(i)
-XGraphicsExposeEvent* i;
+int  XGraphicsExposeEvent_send_event(XGraphicsExposeEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XGraphicsExposeEvent_send_event(i, j)
-XGraphicsExposeEvent* i;
-int j;
+void set_XGraphicsExposeEvent_send_event(XGraphicsExposeEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XGraphicsExposeEvent_serial(i)
-XGraphicsExposeEvent* i;
+int  XGraphicsExposeEvent_serial(XGraphicsExposeEvent *i)
 {
           return(i->serial);
 }
 
-void set_XGraphicsExposeEvent_serial(i, j)
-XGraphicsExposeEvent* i;
-int j;
+void set_XGraphicsExposeEvent_serial(XGraphicsExposeEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XGraphicsExposeEvent_type(i)
-XGraphicsExposeEvent* i;
+int  XGraphicsExposeEvent_type(XGraphicsExposeEvent *i)
 {
           return(i->type);
 }
 
-void set_XGraphicsExposeEvent_type(i, j)
-XGraphicsExposeEvent* i;
-int j;
+void set_XGraphicsExposeEvent_type(XGraphicsExposeEvent *i, int j)
 {
           i->type = j;
 }
@@ -1337,97 +1048,76 @@
 
 /********* XNoExposeEvent funcions *****/
 
-int  make_XNoExposeEvent (){
+int  make_XNoExposeEvent (void) {
           return ((int) calloc(1, sizeof(XNoExposeEvent)));
 }
 
-int  XNoExposeEvent_minor_code(i)
-XNoExposeEvent* i;
+int  XNoExposeEvent_minor_code(XNoExposeEvent *i)
 {
           return(i->minor_code);
 }
 
-void set_XNoExposeEvent_minor_code(i, j)
-XNoExposeEvent* i;
-int j;
+void set_XNoExposeEvent_minor_code(XNoExposeEvent *i, int j)
 {
           i->minor_code = j;
 }
 
-int  XNoExposeEvent_major_code(i)
-XNoExposeEvent* i;
+int  XNoExposeEvent_major_code(XNoExposeEvent *i)
 {
           return(i->major_code);
 }
 
-void set_XNoExposeEvent_major_code(i, j)
-XNoExposeEvent* i;
-int j;
+void set_XNoExposeEvent_major_code(XNoExposeEvent *i, int j)
 {
           i->major_code = j;
 }
 
-Drawable XNoExposeEvent_drawable(i)
-XNoExposeEvent* i;
+Drawable XNoExposeEvent_drawable(XNoExposeEvent *i)
 {
           return(i->drawable);
 }
 
-void set_XNoExposeEvent_drawable(i, j)
-XNoExposeEvent* i;
-Drawable j;
+void set_XNoExposeEvent_drawable(XNoExposeEvent *i, Drawable j)
 {
           i->drawable = j;
 }
 
-Display *XNoExposeEvent_display(i)
-XNoExposeEvent* i;
+Display *XNoExposeEvent_display(XNoExposeEvent *i)
 {
           return(i->display);
 }
 
-void set_XNoExposeEvent_display(i, j)
-XNoExposeEvent* i;
-Display *j;
+void set_XNoExposeEvent_display(XNoExposeEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XNoExposeEvent_send_event(i)
-XNoExposeEvent* i;
+int  XNoExposeEvent_send_event(XNoExposeEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XNoExposeEvent_send_event(i, j)
-XNoExposeEvent* i;
-int j;
+void set_XNoExposeEvent_send_event(XNoExposeEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XNoExposeEvent_serial(i)
-XNoExposeEvent* i;
+int  XNoExposeEvent_serial(XNoExposeEvent *i)
 {
           return(i->serial);
 }
 
-void set_XNoExposeEvent_serial(i, j)
-XNoExposeEvent* i;
-int j;
+void set_XNoExposeEvent_serial(XNoExposeEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XNoExposeEvent_type(i)
-XNoExposeEvent* i;
+int  XNoExposeEvent_type(XNoExposeEvent *i)
 {
           return(i->type);
 }
 
-void set_XNoExposeEvent_type(i, j)
-XNoExposeEvent* i;
-int j;
+void set_XNoExposeEvent_type(XNoExposeEvent *i, int j)
 {
           i->type = j;
 }
@@ -1435,84 +1125,66 @@
 
 /********* XVisibilityEvent funcions *****/
 
-int  make_XVisibilityEvent (){
+int  make_XVisibilityEvent (void) {
           return ((int) calloc(1, sizeof(XVisibilityEvent)));
 }
 
-int  XVisibilityEvent_state(i)
-XVisibilityEvent* i;
+int  XVisibilityEvent_state(XVisibilityEvent *i)
 {
           return(i->state);
 }
 
-void set_XVisibilityEvent_state(i, j)
-XVisibilityEvent* i;
-int j;
+void set_XVisibilityEvent_state(XVisibilityEvent *i, int j)
 {
           i->state = j;
 }
 
-int  XVisibilityEvent_window(i)
-XVisibilityEvent* i;
+int  XVisibilityEvent_window(XVisibilityEvent *i)
 {
           return(i->window);
 }
 
-void set_XVisibilityEvent_window(i, j)
-XVisibilityEvent* i;
-int j;
+void set_XVisibilityEvent_window(XVisibilityEvent *i, int j)
 {
           i->window = j;
 }
 
-Display *XVisibilityEvent_display(i)
-XVisibilityEvent* i;
+Display *XVisibilityEvent_display(XVisibilityEvent *i)
 {
           return(i->display);
 }
 
-void set_XVisibilityEvent_display(i, j)
-XVisibilityEvent* i;
-Display *j;
+void set_XVisibilityEvent_display(XVisibilityEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XVisibilityEvent_send_event(i)
-XVisibilityEvent* i;
+int  XVisibilityEvent_send_event(XVisibilityEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XVisibilityEvent_send_event(i, j)
-XVisibilityEvent* i;
-int j;
+void set_XVisibilityEvent_send_event(XVisibilityEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XVisibilityEvent_serial(i)
-XVisibilityEvent* i;
+int  XVisibilityEvent_serial(XVisibilityEvent *i)
 {
           return(i->serial);
 }
 
-void set_XVisibilityEvent_serial(i, j)
-XVisibilityEvent* i;
-int j;
+void set_XVisibilityEvent_serial(XVisibilityEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XVisibilityEvent_type(i)
-XVisibilityEvent* i;
+int  XVisibilityEvent_type(XVisibilityEvent *i)
 {
           return(i->type);
 }
 
-void set_XVisibilityEvent_type(i, j)
-XVisibilityEvent* i;
-int j;
+void set_XVisibilityEvent_type(XVisibilityEvent *i, int j)
 {
           i->type = j;
 }
@@ -1520,162 +1192,126 @@
 
 /********* XCreateWindowEvent funcions *****/
 
-int  make_XCreateWindowEvent (){
+int  make_XCreateWindowEvent (void) {
           return ((int) calloc(1, sizeof(XCreateWindowEvent)));
 }
 
-int  XCreateWindowEvent_override_redirect(i)
-XCreateWindowEvent* i;
+int  XCreateWindowEvent_override_redirect(XCreateWindowEvent *i)
 {
           return(i->override_redirect);
 }
 
-void set_XCreateWindowEvent_override_redirect(i, j)
-XCreateWindowEvent* i;
-int j;
+void set_XCreateWindowEvent_override_redirect(XCreateWindowEvent *i, int j)
 {
           i->override_redirect = j;
 }
 
-int  XCreateWindowEvent_border_width(i)
-XCreateWindowEvent* i;
+int  XCreateWindowEvent_border_width(XCreateWindowEvent *i)
 {
           return(i->border_width);
 }
 
-void set_XCreateWindowEvent_border_width(i, j)
-XCreateWindowEvent* i;
-int j;
+void set_XCreateWindowEvent_border_width(XCreateWindowEvent *i, int j)
 {
           i->border_width = j;
 }
 
-int  XCreateWindowEvent_height(i)
-XCreateWindowEvent* i;
+int  XCreateWindowEvent_height(XCreateWindowEvent *i)
 {
           return(i->height);
 }
 
-void set_XCreateWindowEvent_height(i, j)
-XCreateWindowEvent* i;
-int j;
+void set_XCreateWindowEvent_height(XCreateWindowEvent *i, int j)
 {
           i->height = j;
 }
 
-int  XCreateWindowEvent_width(i)
-XCreateWindowEvent* i;
+int  XCreateWindowEvent_width(XCreateWindowEvent *i)
 {
           return(i->width);
 }
 
-void set_XCreateWindowEvent_width(i, j)
-XCreateWindowEvent* i;
-int j;
+void set_XCreateWindowEvent_width(XCreateWindowEvent *i, int j)
 {
           i->width = j;
 }
 
-int  XCreateWindowEvent_y(i)
-XCreateWindowEvent* i;
+int  XCreateWindowEvent_y(XCreateWindowEvent *i)
 {
           return(i->y);
 }
 
-void set_XCreateWindowEvent_y(i, j)
-XCreateWindowEvent* i;
-int j;
+void set_XCreateWindowEvent_y(XCreateWindowEvent *i, int j)
 {
           i->y = j;
 }
 
-int  XCreateWindowEvent_x(i)
-XCreateWindowEvent* i;
+int  XCreateWindowEvent_x(XCreateWindowEvent *i)
 {
           return(i->x);
 }
 
-void set_XCreateWindowEvent_x(i, j)
-XCreateWindowEvent* i;
-int j;
+void set_XCreateWindowEvent_x(XCreateWindowEvent *i, int j)
 {
           i->x = j;
 }
 
-int  XCreateWindowEvent_window(i)
-XCreateWindowEvent* i;
+int  XCreateWindowEvent_window(XCreateWindowEvent *i)
 {
           return(i->window);
 }
 
-void set_XCreateWindowEvent_window(i, j)
-XCreateWindowEvent* i;
-int j;
+void set_XCreateWindowEvent_window(XCreateWindowEvent *i, int j)
 {
           i->window = j;
 }
 
-int  XCreateWindowEvent_parent(i)
-XCreateWindowEvent* i;
+int  XCreateWindowEvent_parent(XCreateWindowEvent *i)
 {
           return(i->parent);
 }
 
-void set_XCreateWindowEvent_parent(i, j)
-XCreateWindowEvent* i;
-int j;
+void set_XCreateWindowEvent_parent(XCreateWindowEvent *i, int j)
 {
           i->parent = j;
 }
 
-Display *XCreateWindowEvent_display(i)
-XCreateWindowEvent* i;
+Display *XCreateWindowEvent_display(XCreateWindowEvent *i)
 {
           return(i->display);
 }
 
-void set_XCreateWindowEvent_display(i, j)
-XCreateWindowEvent* i;
-Display *j;
+void set_XCreateWindowEvent_display(XCreateWindowEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XCreateWindowEvent_send_event(i)
-XCreateWindowEvent* i;
+int  XCreateWindowEvent_send_event(XCreateWindowEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XCreateWindowEvent_send_event(i, j)
-XCreateWindowEvent* i;
-int j;
+void set_XCreateWindowEvent_send_event(XCreateWindowEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XCreateWindowEvent_serial(i)
-XCreateWindowEvent* i;
+int  XCreateWindowEvent_serial(XCreateWindowEvent *i)
 {
           return(i->serial);
 }
 
-void set_XCreateWindowEvent_serial(i, j)
-XCreateWindowEvent* i;
-int j;
+void set_XCreateWindowEvent_serial(XCreateWindowEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XCreateWindowEvent_type(i)
-XCreateWindowEvent* i;
+int  XCreateWindowEvent_type(XCreateWindowEvent *i)
 {
           return(i->type);
 }
 
-void set_XCreateWindowEvent_type(i, j)
-XCreateWindowEvent* i;
-int j;
+void set_XCreateWindowEvent_type(XCreateWindowEvent *i, int j)
 {
           i->type = j;
 }
@@ -1683,84 +1319,66 @@
 
 /********* XDestroyWindowEvent funcions *****/
 
-int  make_XDestroyWindowEvent (){
+int  make_XDestroyWindowEvent (void) {
           return ((int) calloc(1, sizeof(XDestroyWindowEvent)));
 }
 
-int  XDestroyWindowEvent_window(i)
-XDestroyWindowEvent* i;
+int  XDestroyWindowEvent_window(XDestroyWindowEvent *i)
 {
           return(i->window);
 }
 
-void set_XDestroyWindowEvent_window(i, j)
-XDestroyWindowEvent* i;
-int j;
+void set_XDestroyWindowEvent_window(XDestroyWindowEvent *i, int j)
 {
           i->window = j;
 }
 
-int  XDestroyWindowEvent_event(i)
-XDestroyWindowEvent* i;
+int  XDestroyWindowEvent_event(XDestroyWindowEvent *i)
 {
           return(i->event);
 }
 
-void set_XDestroyWindowEvent_event(i, j)
-XDestroyWindowEvent* i;
-int j;
+void set_XDestroyWindowEvent_event(XDestroyWindowEvent *i, int j)
 {
           i->event = j;
 }
 
-Display *XDestroyWindowEvent_display(i)
-XDestroyWindowEvent* i;
+Display *XDestroyWindowEvent_display(XDestroyWindowEvent *i)
 {
           return(i->display);
 }
 
-void set_XDestroyWindowEvent_display(i, j)
-XDestroyWindowEvent* i;
-Display *j;
+void set_XDestroyWindowEvent_display(XDestroyWindowEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XDestroyWindowEvent_send_event(i)
-XDestroyWindowEvent* i;
+int  XDestroyWindowEvent_send_event(XDestroyWindowEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XDestroyWindowEvent_send_event(i, j)
-XDestroyWindowEvent* i;
-int j;
+void set_XDestroyWindowEvent_send_event(XDestroyWindowEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XDestroyWindowEvent_serial(i)
-XDestroyWindowEvent* i;
+int  XDestroyWindowEvent_serial(XDestroyWindowEvent *i)
 {
           return(i->serial);
 }
 
-void set_XDestroyWindowEvent_serial(i, j)
-XDestroyWindowEvent* i;
-int j;
+void set_XDestroyWindowEvent_serial(XDestroyWindowEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XDestroyWindowEvent_type(i)
-XDestroyWindowEvent* i;
+int  XDestroyWindowEvent_type(XDestroyWindowEvent *i)
 {
           return(i->type);
 }
 
-void set_XDestroyWindowEvent_type(i, j)
-XDestroyWindowEvent* i;
-int j;
+void set_XDestroyWindowEvent_type(XDestroyWindowEvent *i, int j)
 {
           i->type = j;
 }
@@ -1768,97 +1386,76 @@
 
 /********* XUnmapEvent funcions *****/
 
-int  make_XUnmapEvent (){
+int  make_XUnmapEvent (void) {
           return ((int) calloc(1, sizeof(XUnmapEvent)));
 }
 
-int  XUnmapEvent_from_configure(i)
-XUnmapEvent* i;
+int  XUnmapEvent_from_configure(XUnmapEvent *i)
 {
           return(i->from_configure);
 }
 
-void set_XUnmapEvent_from_configure(i, j)
-XUnmapEvent* i;
-int j;
+void set_XUnmapEvent_from_configure(XUnmapEvent *i, int j)
 {
           i->from_configure = j;
 }
 
-int  XUnmapEvent_window(i)
-XUnmapEvent* i;
+int  XUnmapEvent_window(XUnmapEvent *i)
 {
           return(i->window);
 }
 
-void set_XUnmapEvent_window(i, j)
-XUnmapEvent* i;
-int j;
+void set_XUnmapEvent_window(XUnmapEvent *i, int j)
 {
           i->window = j;
 }
 
-int  XUnmapEvent_event(i)
-XUnmapEvent* i;
+int  XUnmapEvent_event(XUnmapEvent *i)
 {
           return(i->event);
 }
 
-void set_XUnmapEvent_event(i, j)
-XUnmapEvent* i;
-int j;
+void set_XUnmapEvent_event(XUnmapEvent *i, int j)
 {
           i->event = j;
 }
 
-Display *XUnmapEvent_display(i)
-XUnmapEvent* i;
+Display *XUnmapEvent_display(XUnmapEvent *i)
 {
           return(i->display);
 }
 
-void set_XUnmapEvent_display(i, j)
-XUnmapEvent* i;
-Display *j;
+void set_XUnmapEvent_display(XUnmapEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XUnmapEvent_send_event(i)
-XUnmapEvent* i;
+int  XUnmapEvent_send_event(XUnmapEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XUnmapEvent_send_event(i, j)
-XUnmapEvent* i;
-int j;
+void set_XUnmapEvent_send_event(XUnmapEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XUnmapEvent_serial(i)
-XUnmapEvent* i;
+int  XUnmapEvent_serial(XUnmapEvent *i)
 {
           return(i->serial);
 }
 
-void set_XUnmapEvent_serial(i, j)
-XUnmapEvent* i;
-int j;
+void set_XUnmapEvent_serial(XUnmapEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XUnmapEvent_type(i)
-XUnmapEvent* i;
+int  XUnmapEvent_type(XUnmapEvent *i)
 {
           return(i->type);
 }
 
-void set_XUnmapEvent_type(i, j)
-XUnmapEvent* i;
-int j;
+void set_XUnmapEvent_type(XUnmapEvent *i, int j)
 {
           i->type = j;
 }
@@ -1866,97 +1463,76 @@
 
 /********* XMapEvent funcions *****/
 
-int  make_XMapEvent (){
+int  make_XMapEvent (void) {
           return ((int) calloc(1, sizeof(XMapEvent)));
 }
 
-int  XMapEvent_override_redirect(i)
-XMapEvent* i;
+int  XMapEvent_override_redirect(XMapEvent *i)
 {
           return(i->override_redirect);
 }
 
-void set_XMapEvent_override_redirect(i, j)
-XMapEvent* i;
-int j;
+void set_XMapEvent_override_redirect(XMapEvent *i, int j)
 {
           i->override_redirect = j;
 }
 
-int  XMapEvent_window(i)
-XMapEvent* i;
+int  XMapEvent_window(XMapEvent *i)
 {
           return(i->window);
 }
 
-void set_XMapEvent_window(i, j)
-XMapEvent* i;
-int j;
+void set_XMapEvent_window(XMapEvent *i, int j)
 {
           i->window = j;
 }
 
-int  XMapEvent_event(i)
-XMapEvent* i;
+int  XMapEvent_event(XMapEvent *i)
 {
           return(i->event);
 }
 
-void set_XMapEvent_event(i, j)
-XMapEvent* i;
-int j;
+void set_XMapEvent_event(XMapEvent *i, int j)
 {
           i->event = j;
 }
 
-Display *XMapEvent_display(i)
-XMapEvent* i;
+Display *XMapEvent_display(XMapEvent *i)
 {
           return(i->display);
 }
 
-void set_XMapEvent_display(i, j)
-XMapEvent* i;
-Display *j;
+void set_XMapEvent_display(XMapEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XMapEvent_send_event(i)
-XMapEvent* i;
+int  XMapEvent_send_event(XMapEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XMapEvent_send_event(i, j)
-XMapEvent* i;
-int j;
+void set_XMapEvent_send_event(XMapEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XMapEvent_serial(i)
-XMapEvent* i;
+int  XMapEvent_serial(XMapEvent *i)
 {
           return(i->serial);
 }
 
-void set_XMapEvent_serial(i, j)
-XMapEvent* i;
-int j;
+void set_XMapEvent_serial(XMapEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XMapEvent_type(i)
-XMapEvent* i;
+int  XMapEvent_type(XMapEvent *i)
 {
           return(i->type);
 }
 
-void set_XMapEvent_type(i, j)
-XMapEvent* i;
-int j;
+void set_XMapEvent_type(XMapEvent *i, int j)
 {
           i->type = j;
 }
@@ -1964,84 +1540,66 @@
 
 /********* XMapRequestEvent funcions *****/
 
-int  make_XMapRequestEvent (){
+int  make_XMapRequestEvent (void) {
           return ((int) calloc(1, sizeof(XMapRequestEvent)));
 }
 
-int  XMapRequestEvent_window(i)
-XMapRequestEvent* i;
+int  XMapRequestEvent_window(XMapRequestEvent *i)
 {
           return(i->window);
 }
 
-void set_XMapRequestEvent_window(i, j)
-XMapRequestEvent* i;
-int j;
+void set_XMapRequestEvent_window(XMapRequestEvent *i, int j)
 {
           i->window = j;
 }
 
-int  XMapRequestEvent_parent(i)
-XMapRequestEvent* i;
+int  XMapRequestEvent_parent(XMapRequestEvent *i)
 {
           return(i->parent);
 }
 
-void set_XMapRequestEvent_parent(i, j)
-XMapRequestEvent* i;
-int j;
+void set_XMapRequestEvent_parent(XMapRequestEvent *i, int j)
 {
           i->parent = j;
 }
 
-Display *XMapRequestEvent_display(i)
-XMapRequestEvent* i;
+Display *XMapRequestEvent_display(XMapRequestEvent *i)
 {
           return(i->display);
 }
 
-void set_XMapRequestEvent_display(i, j)
-XMapRequestEvent* i;
-Display *j;
+void set_XMapRequestEvent_display(XMapRequestEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XMapRequestEvent_send_event(i)
-XMapRequestEvent* i;
+int  XMapRequestEvent_send_event(XMapRequestEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XMapRequestEvent_send_event(i, j)
-XMapRequestEvent* i;
-int j;
+void set_XMapRequestEvent_send_event(XMapRequestEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XMapRequestEvent_serial(i)
-XMapRequestEvent* i;
+int  XMapRequestEvent_serial(XMapRequestEvent *i)
 {
           return(i->serial);
 }
 
-void set_XMapRequestEvent_serial(i, j)
-XMapRequestEvent* i;
-int j;
+void set_XMapRequestEvent_serial(XMapRequestEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XMapRequestEvent_type(i)
-XMapRequestEvent* i;
+int  XMapRequestEvent_type(XMapRequestEvent *i)
 {
           return(i->type);
 }
 
-void set_XMapRequestEvent_type(i, j)
-XMapRequestEvent* i;
-int j;
+void set_XMapRequestEvent_type(XMapRequestEvent *i, int j)
 {
           i->type = j;
 }
@@ -2049,136 +1607,106 @@
 
 /********* XReparentEvent funcions *****/
 
-int  make_XReparentEvent (){
+int  make_XReparentEvent (void) {
           return ((int) calloc(1, sizeof(XReparentEvent)));
 }
 
-int  XReparentEvent_override_redirect(i)
-XReparentEvent* i;
+int  XReparentEvent_override_redirect(XReparentEvent *i)
 {
           return(i->override_redirect);
 }
 
-void set_XReparentEvent_override_redirect(i, j)
-XReparentEvent* i;
-int j;
+void set_XReparentEvent_override_redirect(XReparentEvent *i, int j)
 {
           i->override_redirect = j;
 }
 
-int  XReparentEvent_y(i)
-XReparentEvent* i;
+int  XReparentEvent_y(XReparentEvent *i)
 {
           return(i->y);
 }
 
-void set_XReparentEvent_y(i, j)
-XReparentEvent* i;
-int j;
+void set_XReparentEvent_y(XReparentEvent *i, int j)
 {
           i->y = j;
 }
 
-int  XReparentEvent_x(i)
-XReparentEvent* i;
+int  XReparentEvent_x(XReparentEvent *i)
 {
           return(i->x);
 }
 
-void set_XReparentEvent_x(i, j)
-XReparentEvent* i;
-int j;
+void set_XReparentEvent_x(XReparentEvent *i, int j)
 {
           i->x = j;
 }
 
-int  XReparentEvent_parent(i)
-XReparentEvent* i;
+int  XReparentEvent_parent(XReparentEvent *i)
 {
           return(i->parent);
 }
 
-void set_XReparentEvent_parent(i, j)
-XReparentEvent* i;
-int j;
+void set_XReparentEvent_parent(XReparentEvent *i, int j)
 {
           i->parent = j;
 }
 
-int  XReparentEvent_window(i)
-XReparentEvent* i;
+int  XReparentEvent_window(XReparentEvent *i)
 {
           return(i->window);
 }
 
-void set_XReparentEvent_window(i, j)
-XReparentEvent* i;
-int j;
+void set_XReparentEvent_window(XReparentEvent *i, int j)
 {
           i->window = j;
 }
 
-int  XReparentEvent_event(i)
-XReparentEvent* i;
+int  XReparentEvent_event(XReparentEvent *i)
 {
           return(i->event);
 }
 
-void set_XReparentEvent_event(i, j)
-XReparentEvent* i;
-int j;
+void set_XReparentEvent_event(XReparentEvent *i, int j)
 {
           i->event = j;
 }
 
-Display *XReparentEvent_display(i)
-XReparentEvent* i;
+Display *XReparentEvent_display(XReparentEvent *i)
 {
           return(i->display);
 }
 
-void set_XReparentEvent_display(i, j)
-XReparentEvent* i;
-Display *j;
+void set_XReparentEvent_display(XReparentEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XReparentEvent_send_event(i)
-XReparentEvent* i;
+int  XReparentEvent_send_event(XReparentEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XReparentEvent_send_event(i, j)
-XReparentEvent* i;
-int j;
+void set_XReparentEvent_send_event(XReparentEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XReparentEvent_serial(i)
-XReparentEvent* i;
+int  XReparentEvent_serial(XReparentEvent *i)
 {
           return(i->serial);
 }
 
-void set_XReparentEvent_serial(i, j)
-XReparentEvent* i;
-int j;
+void set_XReparentEvent_serial(XReparentEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XReparentEvent_type(i)
-XReparentEvent* i;
+int  XReparentEvent_type(XReparentEvent *i)
 {
           return(i->type);
 }
 
-void set_XReparentEvent_type(i, j)
-XReparentEvent* i;
-int j;
+void set_XReparentEvent_type(XReparentEvent *i, int j)
 {
           i->type = j;
 }
@@ -2186,175 +1714,136 @@
 
 /********* XConfigureEvent funcions *****/
 
-int  make_XConfigureEvent (){
+int  make_XConfigureEvent (void) {
           return ((int) calloc(1, sizeof(XConfigureEvent)));
 }
 
-int  XConfigureEvent_override_redirect(i)
-XConfigureEvent* i;
+int  XConfigureEvent_override_redirect(XConfigureEvent *i)
 {
           return(i->override_redirect);
 }
 
-void set_XConfigureEvent_override_redirect(i, j)
-XConfigureEvent* i;
-int j;
+void set_XConfigureEvent_override_redirect(XConfigureEvent *i, int j)
 {
           i->override_redirect = j;
 }
 
-int  XConfigureEvent_above(i)
-XConfigureEvent* i;
+int  XConfigureEvent_above(XConfigureEvent *i)
 {
           return(i->above);
 }
 
-void set_XConfigureEvent_above(i, j)
-XConfigureEvent* i;
-int j;
+void set_XConfigureEvent_above(XConfigureEvent *i, int j)
 {
           i->above = j;
 }
 
-int  XConfigureEvent_border_width(i)
-XConfigureEvent* i;
+int  XConfigureEvent_border_width(XConfigureEvent *i)
 {
           return(i->border_width);
 }
 
-void set_XConfigureEvent_border_width(i, j)
-XConfigureEvent* i;
-int j;
+void set_XConfigureEvent_border_width(XConfigureEvent *i, int j)
 {
           i->border_width = j;
 }
 
-int  XConfigureEvent_height(i)
-XConfigureEvent* i;
+int  XConfigureEvent_height(XConfigureEvent *i)
 {
           return(i->height);
 }
 
-void set_XConfigureEvent_height(i, j)
-XConfigureEvent* i;
-int j;
+void set_XConfigureEvent_height(XConfigureEvent *i, int j)
 {
           i->height = j;
 }
 
-int  XConfigureEvent_width(i)
-XConfigureEvent* i;
+int  XConfigureEvent_width(XConfigureEvent *i)
 {
           return(i->width);
 }
 
-void set_XConfigureEvent_width(i, j)
-XConfigureEvent* i;
-int j;
+void set_XConfigureEvent_width(XConfigureEvent *i, int j)
 {
           i->width = j;
 }
 
-int  XConfigureEvent_y(i)
-XConfigureEvent* i;
+int  XConfigureEvent_y(XConfigureEvent *i)
 {
           return(i->y);
 }
 
-void set_XConfigureEvent_y(i, j)
-XConfigureEvent* i;
-int j;
+void set_XConfigureEvent_y(XConfigureEvent *i, int j)
 {
           i->y = j;
 }
 
-int  XConfigureEvent_x(i)
-XConfigureEvent* i;
+int  XConfigureEvent_x(XConfigureEvent *i)
 {
           return(i->x);
 }
 
-void set_XConfigureEvent_x(i, j)
-XConfigureEvent* i;
-int j;
+void set_XConfigureEvent_x(XConfigureEvent *i, int j)
 {
           i->x = j;
 }
 
-int  XConfigureEvent_window(i)
-XConfigureEvent* i;
+int  XConfigureEvent_window(XConfigureEvent *i)
 {
           return(i->window);
 }
 
-void set_XConfigureEvent_window(i, j)
-XConfigureEvent* i;
-int j;
+void set_XConfigureEvent_window(XConfigureEvent *i, int j)
 {
           i->window = j;
 }
 
-int  XConfigureEvent_event(i)
-XConfigureEvent* i;
+int  XConfigureEvent_event(XConfigureEvent *i)
 {
           return(i->event);
 }
 
-void set_XConfigureEvent_event(i, j)
-XConfigureEvent* i;
-int j;
+void set_XConfigureEvent_event(XConfigureEvent *i, int j)
 {
           i->event = j;
 }
 
-Display *XConfigureEvent_display(i)
-XConfigureEvent* i;
+Display *XConfigureEvent_display(XConfigureEvent *i)
 {
           return(i->display);
 }
 
-void set_XConfigureEvent_display(i, j)
-XConfigureEvent* i;
-Display *j;
+void set_XConfigureEvent_display(XConfigureEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XConfigureEvent_send_event(i)
-XConfigureEvent* i;
+int  XConfigureEvent_send_event(XConfigureEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XConfigureEvent_send_event(i, j)
-XConfigureEvent* i;
-int j;
+void set_XConfigureEvent_send_event(XConfigureEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XConfigureEvent_serial(i)
-XConfigureEvent* i;
+int  XConfigureEvent_serial(XConfigureEvent *i)
 {
           return(i->serial);
 }
 
-void set_XConfigureEvent_serial(i, j)
-XConfigureEvent* i;
-int j;
+void set_XConfigureEvent_serial(XConfigureEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XConfigureEvent_type(i)
-XConfigureEvent* i;
+int  XConfigureEvent_type(XConfigureEvent *i)
 {
           return(i->type);
 }
 
-void set_XConfigureEvent_type(i, j)
-XConfigureEvent* i;
-int j;
+void set_XConfigureEvent_type(XConfigureEvent *i, int j)
 {
           i->type = j;
 }
@@ -2362,110 +1851,86 @@
 
 /********* XGravityEvent funcions *****/
 
-int  make_XGravityEvent (){
+int  make_XGravityEvent (void) {
           return ((int) calloc(1, sizeof(XGravityEvent)));
 }
 
-int  XGravityEvent_y(i)
-XGravityEvent* i;
+int  XGravityEvent_y(XGravityEvent *i)
 {
           return(i->y);
 }
 
-void set_XGravityEvent_y(i, j)
-XGravityEvent* i;
-int j;
+void set_XGravityEvent_y(XGravityEvent *i, int j)
 {
           i->y = j;
 }
 
-int  XGravityEvent_x(i)
-XGravityEvent* i;
+int  XGravityEvent_x(XGravityEvent *i)
 {
           return(i->x);
 }
 
-void set_XGravityEvent_x(i, j)
-XGravityEvent* i;
-int j;
+void set_XGravityEvent_x(XGravityEvent *i, int j)
 {
           i->x = j;
 }
 
-int  XGravityEvent_window(i)
-XGravityEvent* i;
+int  XGravityEvent_window(XGravityEvent *i)
 {
           return(i->window);
 }
 
-void set_XGravityEvent_window(i, j)
-XGravityEvent* i;
-int j;
+void set_XGravityEvent_window(XGravityEvent *i, int j)
 {
           i->window = j;
 }
 
-int  XGravityEvent_event(i)
-XGravityEvent* i;
+int  XGravityEvent_event(XGravityEvent *i)
 {
           return(i->event);
 }
 
-void set_XGravityEvent_event(i, j)
-XGravityEvent* i;
-int j;
+void set_XGravityEvent_event(XGravityEvent *i, int j)
 {
           i->event = j;
 }
 
-Display *XGravityEvent_display(i)
-XGravityEvent* i;
+Display *XGravityEvent_display(XGravityEvent *i)
 {
           return(i->display);
 }
 
-void set_XGravityEvent_display(i, j)
-XGravityEvent* i;
-Display *j;
+void set_XGravityEvent_display(XGravityEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XGravityEvent_send_event(i)
-XGravityEvent* i;
+int  XGravityEvent_send_event(XGravityEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XGravityEvent_send_event(i, j)
-XGravityEvent* i;
-int j;
+void set_XGravityEvent_send_event(XGravityEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XGravityEvent_serial(i)
-XGravityEvent* i;
+int  XGravityEvent_serial(XGravityEvent *i)
 {
           return(i->serial);
 }
 
-void set_XGravityEvent_serial(i, j)
-XGravityEvent* i;
-int j;
+void set_XGravityEvent_serial(XGravityEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XGravityEvent_type(i)
-XGravityEvent* i;
+int  XGravityEvent_type(XGravityEvent *i)
 {
           return(i->type);
 }
 
-void set_XGravityEvent_type(i, j)
-XGravityEvent* i;
-int j;
+void set_XGravityEvent_type(XGravityEvent *i, int j)
 {
           i->type = j;
 }
@@ -2473,97 +1938,76 @@
 
 /********* XResizeRequestEvent funcions *****/
 
-int  make_XResizeRequestEvent (){
+int  make_XResizeRequestEvent (void) {
           return ((int) calloc(1, sizeof(XResizeRequestEvent)));
 }
 
-int  XResizeRequestEvent_height(i)
-XResizeRequestEvent* i;
+int  XResizeRequestEvent_height(XResizeRequestEvent *i)
 {
           return(i->height);
 }
 
-void set_XResizeRequestEvent_height(i, j)
-XResizeRequestEvent* i;
-int j;
+void set_XResizeRequestEvent_height(XResizeRequestEvent *i, int j)
 {
           i->height = j;
 }
 
-int  XResizeRequestEvent_width(i)
-XResizeRequestEvent* i;
+int  XResizeRequestEvent_width(XResizeRequestEvent *i)
 {
           return(i->width);
 }
 
-void set_XResizeRequestEvent_width(i, j)
-XResizeRequestEvent* i;
-int j;
+void set_XResizeRequestEvent_width(XResizeRequestEvent *i, int j)
 {
           i->width = j;
 }
 
-int  XResizeRequestEvent_window(i)
-XResizeRequestEvent* i;
+int  XResizeRequestEvent_window(XResizeRequestEvent *i)
 {
           return(i->window);
 }
 
-void set_XResizeRequestEvent_window(i, j)
-XResizeRequestEvent* i;
-int j;
+void set_XResizeRequestEvent_window(XResizeRequestEvent *i, int j)
 {
           i->window = j;
 }
 
-Display *XResizeRequestEvent_display(i)
-XResizeRequestEvent* i;
+Display *XResizeRequestEvent_display(XResizeRequestEvent *i)
 {
           return(i->display);
 }
 
-void set_XResizeRequestEvent_display(i, j)
-XResizeRequestEvent* i;
-Display *j;
+void set_XResizeRequestEvent_display(XResizeRequestEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XResizeRequestEvent_send_event(i)
-XResizeRequestEvent* i;
+int  XResizeRequestEvent_send_event(XResizeRequestEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XResizeRequestEvent_send_event(i, j)
-XResizeRequestEvent* i;
-int j;
+void set_XResizeRequestEvent_send_event(XResizeRequestEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XResizeRequestEvent_serial(i)
-XResizeRequestEvent* i;
+int  XResizeRequestEvent_serial(XResizeRequestEvent *i)
 {
           return(i->serial);
 }
 
-void set_XResizeRequestEvent_serial(i, j)
-XResizeRequestEvent* i;
-int j;
+void set_XResizeRequestEvent_serial(XResizeRequestEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XResizeRequestEvent_type(i)
-XResizeRequestEvent* i;
+int  XResizeRequestEvent_type(XResizeRequestEvent *i)
 {
           return(i->type);
 }
 
-void set_XResizeRequestEvent_type(i, j)
-XResizeRequestEvent* i;
-int j;
+void set_XResizeRequestEvent_type(XResizeRequestEvent *i, int j)
 {
           i->type = j;
 }
@@ -2571,188 +2015,146 @@
 
 /********* XConfigureRequestEvent funcions *****/
 
-int  make_XConfigureRequestEvent (){
+int  make_XConfigureRequestEvent (void) {
           return ((int) calloc(1, sizeof(XConfigureRequestEvent)));
 }
 
-int  XConfigureRequestEvent_value_mask(i)
-XConfigureRequestEvent* i;
+int  XConfigureRequestEvent_value_mask(XConfigureRequestEvent *i)
 {
           return(i->value_mask);
 }
 
-void set_XConfigureRequestEvent_value_mask(i, j)
-XConfigureRequestEvent* i;
-int j;
+void set_XConfigureRequestEvent_value_mask(XConfigureRequestEvent *i, int j)
 {
           i->value_mask = j;
 }
 
-int  XConfigureRequestEvent_detail(i)
-XConfigureRequestEvent* i;
+int  XConfigureRequestEvent_detail(XConfigureRequestEvent *i)
 {
           return(i->detail);
 }
 
-void set_XConfigureRequestEvent_detail(i, j)
-XConfigureRequestEvent* i;
-int j;
+void set_XConfigureRequestEvent_detail(XConfigureRequestEvent *i, int j)
 {
           i->detail = j;
 }
 
-int  XConfigureRequestEvent_above(i)
-XConfigureRequestEvent* i;
+int  XConfigureRequestEvent_above(XConfigureRequestEvent *i)
 {
           return(i->above);
 }
 
-void set_XConfigureRequestEvent_above(i, j)
-XConfigureRequestEvent* i;
-int j;
+void set_XConfigureRequestEvent_above(XConfigureRequestEvent *i, int j)
 {
           i->above = j;
 }
 
-int  XConfigureRequestEvent_border_width(i)
-XConfigureRequestEvent* i;
+int  XConfigureRequestEvent_border_width(XConfigureRequestEvent *i)
 {
           return(i->border_width);
 }
 
-void set_XConfigureRequestEvent_border_width(i, j)
-XConfigureRequestEvent* i;
-int j;
+void set_XConfigureRequestEvent_border_width(XConfigureRequestEvent *i, int j)
 {
           i->border_width = j;
 }
 
-int  XConfigureRequestEvent_height(i)
-XConfigureRequestEvent* i;
+int  XConfigureRequestEvent_height(XConfigureRequestEvent *i)
 {
           return(i->height);
 }
 
-void set_XConfigureRequestEvent_height(i, j)
-XConfigureRequestEvent* i;
-int j;
+void set_XConfigureRequestEvent_height(XConfigureRequestEvent *i, int j)
 {
           i->height = j;
 }
 
-int  XConfigureRequestEvent_width(i)
-XConfigureRequestEvent* i;
+int  XConfigureRequestEvent_width(XConfigureRequestEvent *i)
 {
           return(i->width);
 }
 
-void set_XConfigureRequestEvent_width(i, j)
-XConfigureRequestEvent* i;
-int j;
+void set_XConfigureRequestEvent_width(XConfigureRequestEvent *i, int j)
 {
           i->width = j;
 }
 
-int  XConfigureRequestEvent_y(i)
-XConfigureRequestEvent* i;
+int  XConfigureRequestEvent_y(XConfigureRequestEvent *i)
 {
           return(i->y);
 }
 
-void set_XConfigureRequestEvent_y(i, j)
-XConfigureRequestEvent* i;
-int j;
+void set_XConfigureRequestEvent_y(XConfigureRequestEvent *i, int j)
 {
           i->y = j;
 }
 
-int  XConfigureRequestEvent_x(i)
-XConfigureRequestEvent* i;
+int  XConfigureRequestEvent_x(XConfigureRequestEvent *i)
 {
           return(i->x);
 }
 
-void set_XConfigureRequestEvent_x(i, j)
-XConfigureRequestEvent* i;
-int j;
+void set_XConfigureRequestEvent_x(XConfigureRequestEvent *i, int j)
 {
           i->x = j;
 }
 
-int  XConfigureRequestEvent_window(i)
-XConfigureRequestEvent* i;
+int  XConfigureRequestEvent_window(XConfigureRequestEvent *i)
 {
           return(i->window);
 }
 
-void set_XConfigureRequestEvent_window(i, j)
-XConfigureRequestEvent* i;
-int j;
+void set_XConfigureRequestEvent_window(XConfigureRequestEvent *i, int j)
 {
           i->window = j;
 }
 
-int  XConfigureRequestEvent_parent(i)
-XConfigureRequestEvent* i;
+int  XConfigureRequestEvent_parent(XConfigureRequestEvent *i)
 {
           return(i->parent);
 }
 
-void set_XConfigureRequestEvent_parent(i, j)
-XConfigureRequestEvent* i;
-int j;
+void set_XConfigureRequestEvent_parent(XConfigureRequestEvent *i, int j)
 {
           i->parent = j;
 }
 
-Display *XConfigureRequestEvent_display(i)
-XConfigureRequestEvent* i;
+Display *XConfigureRequestEvent_display(XConfigureRequestEvent *i)
 {
           return(i->display);
 }
 
-void set_XConfigureRequestEvent_display(i, j)
-XConfigureRequestEvent* i;
-Display *j;
+void set_XConfigureRequestEvent_display(XConfigureRequestEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XConfigureRequestEvent_send_event(i)
-XConfigureRequestEvent* i;
+int  XConfigureRequestEvent_send_event(XConfigureRequestEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XConfigureRequestEvent_send_event(i, j)
-XConfigureRequestEvent* i;
-int j;
+void set_XConfigureRequestEvent_send_event(XConfigureRequestEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XConfigureRequestEvent_serial(i)
-XConfigureRequestEvent* i;
+int  XConfigureRequestEvent_serial(XConfigureRequestEvent *i)
 {
           return(i->serial);
 }
 
-void set_XConfigureRequestEvent_serial(i, j)
-XConfigureRequestEvent* i;
-int j;
+void set_XConfigureRequestEvent_serial(XConfigureRequestEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XConfigureRequestEvent_type(i)
-XConfigureRequestEvent* i;
+int  XConfigureRequestEvent_type(XConfigureRequestEvent *i)
 {
           return(i->type);
 }
 
-void set_XConfigureRequestEvent_type(i, j)
-XConfigureRequestEvent* i;
-int j;
+void set_XConfigureRequestEvent_type(XConfigureRequestEvent *i, int j)
 {
           i->type = j;
 }
@@ -2760,97 +2162,76 @@
 
 /********* XCirculateEvent funcions *****/
 
-int  make_XCirculateEvent (){
+int  make_XCirculateEvent (void) {
           return ((int) calloc(1, sizeof(XCirculateEvent)));
 }
 
-int  XCirculateEvent_place(i)
-XCirculateEvent* i;
+int  XCirculateEvent_place(XCirculateEvent *i)
 {
           return(i->place);
 }
 
-void set_XCirculateEvent_place(i, j)
-XCirculateEvent* i;
-int j;
+void set_XCirculateEvent_place(XCirculateEvent *i, int j)
 {
           i->place = j;
 }
 
-int  XCirculateEvent_window(i)
-XCirculateEvent* i;
+int  XCirculateEvent_window(XCirculateEvent *i)
 {
           return(i->window);
 }
 
-void set_XCirculateEvent_window(i, j)
-XCirculateEvent* i;
-int j;
+void set_XCirculateEvent_window(XCirculateEvent *i, int j)
 {
           i->window = j;
 }
 
-int  XCirculateEvent_event(i)
-XCirculateEvent* i;
+int  XCirculateEvent_event(XCirculateEvent *i)
 {
           return(i->event);
 }
 
-void set_XCirculateEvent_event(i, j)
-XCirculateEvent* i;
-int j;
+void set_XCirculateEvent_event(XCirculateEvent *i, int j)
 {
           i->event = j;
 }
 
-Display *XCirculateEvent_display(i)
-XCirculateEvent* i;
+Display *XCirculateEvent_display(XCirculateEvent *i)
 {
           return(i->display);
 }
 
-void set_XCirculateEvent_display(i, j)
-XCirculateEvent* i;
-Display *j;
+void set_XCirculateEvent_display(XCirculateEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XCirculateEvent_send_event(i)
-XCirculateEvent* i;
+int  XCirculateEvent_send_event(XCirculateEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XCirculateEvent_send_event(i, j)
-XCirculateEvent* i;
-int j;
+void set_XCirculateEvent_send_event(XCirculateEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XCirculateEvent_serial(i)
-XCirculateEvent* i;
+int  XCirculateEvent_serial(XCirculateEvent *i)
 {
           return(i->serial);
 }
 
-void set_XCirculateEvent_serial(i, j)
-XCirculateEvent* i;
-int j;
+void set_XCirculateEvent_serial(XCirculateEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XCirculateEvent_type(i)
-XCirculateEvent* i;
+int  XCirculateEvent_type(XCirculateEvent *i)
 {
           return(i->type);
 }
 
-void set_XCirculateEvent_type(i, j)
-XCirculateEvent* i;
-int j;
+void set_XCirculateEvent_type(XCirculateEvent *i, int j)
 {
           i->type = j;
 }
@@ -2858,97 +2239,76 @@
 
 /********* XCirculateRequestEvent funcions *****/
 
-int  make_XCirculateRequestEvent (){
+int  make_XCirculateRequestEvent (void) {
           return ((int) calloc(1, sizeof(XCirculateRequestEvent)));
 }
 
-int  XCirculateRequestEvent_place(i)
-XCirculateRequestEvent* i;
+int  XCirculateRequestEvent_place(XCirculateRequestEvent *i)
 {
           return(i->place);
 }
 
-void set_XCirculateRequestEvent_place(i, j)
-XCirculateRequestEvent* i;
-int j;
+void set_XCirculateRequestEvent_place(XCirculateRequestEvent *i, int j)
 {
           i->place = j;
 }
 
-int  XCirculateRequestEvent_window(i)
-XCirculateRequestEvent* i;
+int  XCirculateRequestEvent_window(XCirculateRequestEvent *i)
 {
           return(i->window);
 }
 
-void set_XCirculateRequestEvent_window(i, j)
-XCirculateRequestEvent* i;
-int j;
+void set_XCirculateRequestEvent_window(XCirculateRequestEvent *i, int j)
 {
           i->window = j;
 }
 
-int  XCirculateRequestEvent_parent(i)
-XCirculateRequestEvent* i;
+int  XCirculateRequestEvent_parent(XCirculateRequestEvent *i)
 {
           return(i->parent);
 }
 
-void set_XCirculateRequestEvent_parent(i, j)
-XCirculateRequestEvent* i;
-int j;
+void set_XCirculateRequestEvent_parent(XCirculateRequestEvent *i, int j)
 {
           i->parent = j;
 }
 
-Display *XCirculateRequestEvent_display(i)
-XCirculateRequestEvent* i;
+Display *XCirculateRequestEvent_display(XCirculateRequestEvent *i)
 {
           return(i->display);
 }
 
-void set_XCirculateRequestEvent_display(i, j)
-XCirculateRequestEvent* i;
-Display *j;
+void set_XCirculateRequestEvent_display(XCirculateRequestEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XCirculateRequestEvent_send_event(i)
-XCirculateRequestEvent* i;
+int  XCirculateRequestEvent_send_event(XCirculateRequestEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XCirculateRequestEvent_send_event(i, j)
-XCirculateRequestEvent* i;
-int j;
+void set_XCirculateRequestEvent_send_event(XCirculateRequestEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XCirculateRequestEvent_serial(i)
-XCirculateRequestEvent* i;
+int  XCirculateRequestEvent_serial(XCirculateRequestEvent *i)
 {
           return(i->serial);
 }
 
-void set_XCirculateRequestEvent_serial(i, j)
-XCirculateRequestEvent* i;
-int j;
+void set_XCirculateRequestEvent_serial(XCirculateRequestEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XCirculateRequestEvent_type(i)
-XCirculateRequestEvent* i;
+int  XCirculateRequestEvent_type(XCirculateRequestEvent *i)
 {
           return(i->type);
 }
 
-void set_XCirculateRequestEvent_type(i, j)
-XCirculateRequestEvent* i;
-int j;
+void set_XCirculateRequestEvent_type(XCirculateRequestEvent *i, int j)
 {
           i->type = j;
 }
@@ -2956,110 +2316,86 @@
 
 /********* XPropertyEvent funcions *****/
 
-int  make_XPropertyEvent (){
+int  make_XPropertyEvent (void) {
           return ((int) calloc(1, sizeof(XPropertyEvent)));
 }
 
-int  XPropertyEvent_state(i)
-XPropertyEvent* i;
+int  XPropertyEvent_state(XPropertyEvent *i)
 {
           return(i->state);
 }
 
-void set_XPropertyEvent_state(i, j)
-XPropertyEvent* i;
-int j;
+void set_XPropertyEvent_state(XPropertyEvent *i, int j)
 {
           i->state = j;
 }
 
-int  XPropertyEvent_time(i)
-XPropertyEvent* i;
+int  XPropertyEvent_time(XPropertyEvent *i)
 {
           return(i->time);
 }
 
-void set_XPropertyEvent_time(i, j)
-XPropertyEvent* i;
-int j;
+void set_XPropertyEvent_time(XPropertyEvent *i, int j)
 {
           i->time = j;
 }
 
-int  XPropertyEvent_atom(i)
-XPropertyEvent* i;
+int  XPropertyEvent_atom(XPropertyEvent *i)
 {
           return(i->atom);
 }
 
-void set_XPropertyEvent_atom(i, j)
-XPropertyEvent* i;
-int j;
+void set_XPropertyEvent_atom(XPropertyEvent *i, int j)
 {
           i->atom = j;
 }
 
-int  XPropertyEvent_window(i)
-XPropertyEvent* i;
+int  XPropertyEvent_window(XPropertyEvent *i)
 {
           return(i->window);
 }
 
-void set_XPropertyEvent_window(i, j)
-XPropertyEvent* i;
-int j;
+void set_XPropertyEvent_window(XPropertyEvent *i, int j)
 {
           i->window = j;
 }
 
-Display *XPropertyEvent_display(i)
-XPropertyEvent* i;
+Display *XPropertyEvent_display(XPropertyEvent *i)
 {
           return(i->display);
 }
 
-void set_XPropertyEvent_display(i, j)
-XPropertyEvent* i;
-Display *j;
+void set_XPropertyEvent_display(XPropertyEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XPropertyEvent_send_event(i)
-XPropertyEvent* i;
+int  XPropertyEvent_send_event(XPropertyEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XPropertyEvent_send_event(i, j)
-XPropertyEvent* i;
-int j;
+void set_XPropertyEvent_send_event(XPropertyEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XPropertyEvent_serial(i)
-XPropertyEvent* i;
+int  XPropertyEvent_serial(XPropertyEvent *i)
 {
           return(i->serial);
 }
 
-void set_XPropertyEvent_serial(i, j)
-XPropertyEvent* i;
-int j;
+void set_XPropertyEvent_serial(XPropertyEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XPropertyEvent_type(i)
-XPropertyEvent* i;
+int  XPropertyEvent_type(XPropertyEvent *i)
 {
           return(i->type);
 }
 
-void set_XPropertyEvent_type(i, j)
-XPropertyEvent* i;
-int j;
+void set_XPropertyEvent_type(XPropertyEvent *i, int j)
 {
           i->type = j;
 }
@@ -3067,97 +2403,76 @@
 
 /********* XSelectionClearEvent funcions *****/
 
-int  make_XSelectionClearEvent (){
+int  make_XSelectionClearEvent (void) {
           return ((int) calloc(1, sizeof(XSelectionClearEvent)));
 }
 
-int  XSelectionClearEvent_time(i)
-XSelectionClearEvent* i;
+int  XSelectionClearEvent_time(XSelectionClearEvent *i)
 {
           return(i->time);
 }
 
-void set_XSelectionClearEvent_time(i, j)
-XSelectionClearEvent* i;
-int j;
+void set_XSelectionClearEvent_time(XSelectionClearEvent *i, int j)
 {
           i->time = j;
 }
 
-int  XSelectionClearEvent_selection(i)
-XSelectionClearEvent* i;
+int  XSelectionClearEvent_selection(XSelectionClearEvent *i)
 {
           return(i->selection);
 }
 
-void set_XSelectionClearEvent_selection(i, j)
-XSelectionClearEvent* i;
-int j;
+void set_XSelectionClearEvent_selection(XSelectionClearEvent *i, int j)
 {
           i->selection = j;
 }
 
-int  XSelectionClearEvent_window(i)
-XSelectionClearEvent* i;
+int  XSelectionClearEvent_window(XSelectionClearEvent *i)
 {
           return(i->window);
 }
 
-void set_XSelectionClearEvent_window(i, j)
-XSelectionClearEvent* i;
-int j;
+void set_XSelectionClearEvent_window(XSelectionClearEvent *i, int j)
 {
           i->window = j;
 }
 
-Display *XSelectionClearEvent_display(i)
-XSelectionClearEvent* i;
+Display *XSelectionClearEvent_display(XSelectionClearEvent *i)
 {
           return(i->display);
 }
 
-void set_XSelectionClearEvent_display(i, j)
-XSelectionClearEvent* i;
-Display *j;
+void set_XSelectionClearEvent_display(XSelectionClearEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XSelectionClearEvent_send_event(i)
-XSelectionClearEvent* i;
+int  XSelectionClearEvent_send_event(XSelectionClearEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XSelectionClearEvent_send_event(i, j)
-XSelectionClearEvent* i;
-int j;
+void set_XSelectionClearEvent_send_event(XSelectionClearEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XSelectionClearEvent_serial(i)
-XSelectionClearEvent* i;
+int  XSelectionClearEvent_serial(XSelectionClearEvent *i)
 {
           return(i->serial);
 }
 
-void set_XSelectionClearEvent_serial(i, j)
-XSelectionClearEvent* i;
-int j;
+void set_XSelectionClearEvent_serial(XSelectionClearEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XSelectionClearEvent_type(i)
-XSelectionClearEvent* i;
+int  XSelectionClearEvent_type(XSelectionClearEvent *i)
 {
           return(i->type);
 }
 
-void set_XSelectionClearEvent_type(i, j)
-XSelectionClearEvent* i;
-int j;
+void set_XSelectionClearEvent_type(XSelectionClearEvent *i, int j)
 {
           i->type = j;
 }
@@ -3165,136 +2480,106 @@
 
 /********* XSelectionRequestEvent funcions *****/
 
-int  make_XSelectionRequestEvent (){
+int  make_XSelectionRequestEvent (void) {
           return ((int) calloc(1, sizeof(XSelectionRequestEvent)));
 }
 
-int  XSelectionRequestEvent_time(i)
-XSelectionRequestEvent* i;
+int  XSelectionRequestEvent_time(XSelectionRequestEvent *i)
 {
           return(i->time);
 }
 
-void set_XSelectionRequestEvent_time(i, j)
-XSelectionRequestEvent* i;
-int j;
+void set_XSelectionRequestEvent_time(XSelectionRequestEvent *i, int j)
 {
           i->time = j;
 }
 
-int  XSelectionRequestEvent_property(i)
-XSelectionRequestEvent* i;
+int  XSelectionRequestEvent_property(XSelectionRequestEvent *i)
 {
           return(i->property);
 }
 
-void set_XSelectionRequestEvent_property(i, j)
-XSelectionRequestEvent* i;
-int j;
+void set_XSelectionRequestEvent_property(XSelectionRequestEvent *i, int j)
 {
           i->property = j;
 }
 
-int  XSelectionRequestEvent_target(i)
-XSelectionRequestEvent* i;
+int  XSelectionRequestEvent_target(XSelectionRequestEvent *i)
 {
           return(i->target);
 }
 
-void set_XSelectionRequestEvent_target(i, j)
-XSelectionRequestEvent* i;
-int j;
+void set_XSelectionRequestEvent_target(XSelectionRequestEvent *i, int j)
 {
           i->target = j;
 }
 
-int  XSelectionRequestEvent_selection(i)
-XSelectionRequestEvent* i;
+int  XSelectionRequestEvent_selection(XSelectionRequestEvent *i)
 {
           return(i->selection);
 }
 
-void set_XSelectionRequestEvent_selection(i, j)
-XSelectionRequestEvent* i;
-int j;
+void set_XSelectionRequestEvent_selection(XSelectionRequestEvent *i, int j)
 {
           i->selection = j;
 }
 
-int  XSelectionRequestEvent_requestor(i)
-XSelectionRequestEvent* i;
+int  XSelectionRequestEvent_requestor(XSelectionRequestEvent *i)
 {
           return(i->requestor);
 }
 
-void set_XSelectionRequestEvent_requestor(i, j)
-XSelectionRequestEvent* i;
-int j;
+void set_XSelectionRequestEvent_requestor(XSelectionRequestEvent *i, int j)
 {
           i->requestor = j;
 }
 
-int  XSelectionRequestEvent_owner(i)
-XSelectionRequestEvent* i;
+int  XSelectionRequestEvent_owner(XSelectionRequestEvent *i)
 {
           return(i->owner);
 }
 
-void set_XSelectionRequestEvent_owner(i, j)
-XSelectionRequestEvent* i;
-int j;
+void set_XSelectionRequestEvent_owner(XSelectionRequestEvent *i, int j)
 {
           i->owner = j;
 }
 
-Display *XSelectionRequestEvent_display(i)
-XSelectionRequestEvent* i;
+Display *XSelectionRequestEvent_display(XSelectionRequestEvent *i)
 {
           return(i->display);
 }
 
-void set_XSelectionRequestEvent_display(i, j)
-XSelectionRequestEvent* i;
-Display *j;
+void set_XSelectionRequestEvent_display(XSelectionRequestEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XSelectionRequestEvent_send_event(i)
-XSelectionRequestEvent* i;
+int  XSelectionRequestEvent_send_event(XSelectionRequestEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XSelectionRequestEvent_send_event(i, j)
-XSelectionRequestEvent* i;
-int j;
+void set_XSelectionRequestEvent_send_event(XSelectionRequestEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XSelectionRequestEvent_serial(i)
-XSelectionRequestEvent* i;
+int  XSelectionRequestEvent_serial(XSelectionRequestEvent *i)
 {
           return(i->serial);
 }
 
-void set_XSelectionRequestEvent_serial(i, j)
-XSelectionRequestEvent* i;
-int j;
+void set_XSelectionRequestEvent_serial(XSelectionRequestEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XSelectionRequestEvent_type(i)
-XSelectionRequestEvent* i;
+int  XSelectionRequestEvent_type(XSelectionRequestEvent *i)
 {
           return(i->type);
 }
 
-void set_XSelectionRequestEvent_type(i, j)
-XSelectionRequestEvent* i;
-int j;
+void set_XSelectionRequestEvent_type(XSelectionRequestEvent *i, int j)
 {
           i->type = j;
 }
@@ -3302,123 +2587,96 @@
 
 /********* XSelectionEvent funcions *****/
 
-int  make_XSelectionEvent (){
+int  make_XSelectionEvent (void) {
           return ((int) calloc(1, sizeof(XSelectionEvent)));
 }
 
-int  XSelectionEvent_time(i)
-XSelectionEvent* i;
+int  XSelectionEvent_time(XSelectionEvent *i)
 {
           return(i->time);
 }
 
-void set_XSelectionEvent_time(i, j)
-XSelectionEvent* i;
-int j;
+void set_XSelectionEvent_time(XSelectionEvent *i, int j)
 {
           i->time = j;
 }
 
-int  XSelectionEvent_property(i)
-XSelectionEvent* i;
+int  XSelectionEvent_property(XSelectionEvent *i)
 {
           return(i->property);
 }
 
-void set_XSelectionEvent_property(i, j)
-XSelectionEvent* i;
-int j;
+void set_XSelectionEvent_property(XSelectionEvent *i, int j)
 {
           i->property = j;
 }
 
-int  XSelectionEvent_target(i)
-XSelectionEvent* i;
+int  XSelectionEvent_target(XSelectionEvent *i)
 {
           return(i->target);
 }
 
-void set_XSelectionEvent_target(i, j)
-XSelectionEvent* i;
-int j;
+void set_XSelectionEvent_target(XSelectionEvent *i, int j)
 {
           i->target = j;
 }
 
-int  XSelectionEvent_selection(i)
-XSelectionEvent* i;
+int  XSelectionEvent_selection(XSelectionEvent *i)
 {
           return(i->selection);
 }
 
-void set_XSelectionEvent_selection(i, j)
-XSelectionEvent* i;
-int j;
+void set_XSelectionEvent_selection(XSelectionEvent *i, int j)
 {
           i->selection = j;
 }
 
-int  XSelectionEvent_requestor(i)
-XSelectionEvent* i;
+int  XSelectionEvent_requestor(XSelectionEvent *i)
 {
           return(i->requestor);
 }
 
-void set_XSelectionEvent_requestor(i, j)
-XSelectionEvent* i;
-int j;
+void set_XSelectionEvent_requestor(XSelectionEvent *i, int j)
 {
           i->requestor = j;
 }
 
-Display *XSelectionEvent_display(i)
-XSelectionEvent* i;
+Display *XSelectionEvent_display(XSelectionEvent *i)
 {
           return(i->display);
 }
 
-void set_XSelectionEvent_display(i, j)
-XSelectionEvent* i;
-Display *j;
+void set_XSelectionEvent_display(XSelectionEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XSelectionEvent_send_event(i)
-XSelectionEvent* i;
+int  XSelectionEvent_send_event(XSelectionEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XSelectionEvent_send_event(i, j)
-XSelectionEvent* i;
-int j;
+void set_XSelectionEvent_send_event(XSelectionEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XSelectionEvent_serial(i)
-XSelectionEvent* i;
+int  XSelectionEvent_serial(XSelectionEvent *i)
 {
           return(i->serial);
 }
 
-void set_XSelectionEvent_serial(i, j)
-XSelectionEvent* i;
-int j;
+void set_XSelectionEvent_serial(XSelectionEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XSelectionEvent_type(i)
-XSelectionEvent* i;
+int  XSelectionEvent_type(XSelectionEvent *i)
 {
           return(i->type);
 }
 
-void set_XSelectionEvent_type(i, j)
-XSelectionEvent* i;
-int j;
+void set_XSelectionEvent_type(XSelectionEvent *i, int j)
 {
           i->type = j;
 }
@@ -3426,110 +2684,86 @@
 
 /********* XColormapEvent funcions *****/
 
-int  make_XColormapEvent (){
+int  make_XColormapEvent (void) {
           return ((int) calloc(1, sizeof(XColormapEvent)));
 }
 
-int  XColormapEvent_state(i)
-XColormapEvent* i;
+int  XColormapEvent_state(XColormapEvent *i)
 {
           return(i->state);
 }
 
-void set_XColormapEvent_state(i, j)
-XColormapEvent* i;
-int j;
+void set_XColormapEvent_state(XColormapEvent *i, int j)
 {
           i->state = j;
 }
 
-int  XColormapEvent_new(i)
-XColormapEvent* i;
+int  XColormapEvent_new(XColormapEvent *i)
 {
           return(i->new);
 }
 
-void set_XColormapEvent_new(i, j)
-XColormapEvent* i;
-int j;
+void set_XColormapEvent_new(XColormapEvent *i, int j)
 {
           i->new = j;
 }
 
-int  XColormapEvent_colormap(i)
-XColormapEvent* i;
+int  XColormapEvent_colormap(XColormapEvent *i)
 {
           return(i->colormap);
 }
 
-void set_XColormapEvent_colormap(i, j)
-XColormapEvent* i;
-int j;
+void set_XColormapEvent_colormap(XColormapEvent *i, int j)
 {
           i->colormap = j;
 }
 
-int  XColormapEvent_window(i)
-XColormapEvent* i;
+int  XColormapEvent_window(XColormapEvent *i)
 {
           return(i->window);
 }
 
-void set_XColormapEvent_window(i, j)
-XColormapEvent* i;
-int j;
+void set_XColormapEvent_window(XColormapEvent *i, int j)
 {
           i->window = j;
 }
 
-Display *XColormapEvent_display(i)
-XColormapEvent* i;
+Display *XColormapEvent_display(XColormapEvent *i)
 {
           return(i->display);
 }
 
-void set_XColormapEvent_display(i, j)
-XColormapEvent* i;
-Display *j;
+void set_XColormapEvent_display(XColormapEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XColormapEvent_send_event(i)
-XColormapEvent* i;
+int  XColormapEvent_send_event(XColormapEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XColormapEvent_send_event(i, j)
-XColormapEvent* i;
-int j;
+void set_XColormapEvent_send_event(XColormapEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XColormapEvent_serial(i)
-XColormapEvent* i;
+int  XColormapEvent_serial(XColormapEvent *i)
 {
           return(i->serial);
 }
 
-void set_XColormapEvent_serial(i, j)
-XColormapEvent* i;
-int j;
+void set_XColormapEvent_serial(XColormapEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XColormapEvent_type(i)
-XColormapEvent* i;
+int  XColormapEvent_type(XColormapEvent *i)
 {
           return(i->type);
 }
 
-void set_XColormapEvent_type(i, j)
-XColormapEvent* i;
-int j;
+void set_XColormapEvent_type(XColormapEvent *i, int j)
 {
           i->type = j;
 }
@@ -3537,98 +2771,77 @@
 
 /********* XClientMessageEvent funcions *****/
 
-int  make_XClientMessageEvent (){
+int  make_XClientMessageEvent (void) {
           return ((int) calloc(1, sizeof(XClientMessageEvent)));
 }
 
-int  XClientMessageEvent_format(i)
-XClientMessageEvent* i;
+int  XClientMessageEvent_format(XClientMessageEvent *i)
 {
           return(i->format);
 }
 
-void set_XClientMessageEvent_format(i, j)
-XClientMessageEvent* i;
-int j;
+void set_XClientMessageEvent_format(XClientMessageEvent *i, int j)
 {
           i->format = j;
 }
 
-int  XClientMessageEvent_message_type(i)
-XClientMessageEvent* i;
+int  XClientMessageEvent_message_type(XClientMessageEvent *i)
 {
           return(i->message_type);
 }
 
-void set_XClientMessageEvent_message_type(i, j)
-XClientMessageEvent* i;
-int j;
+void set_XClientMessageEvent_message_type(XClientMessageEvent *i, int j)
 {
           i->message_type = j;
 }
 
 
-int  XClientMessageEvent_window(i)
-XClientMessageEvent* i;
+int  XClientMessageEvent_window(XClientMessageEvent *i)
 {
           return(i->window);
 }
 
-void set_XClientMessageEvent_window(i, j)
-XClientMessageEvent* i;
-int j;
+void set_XClientMessageEvent_window(XClientMessageEvent *i, int j)
 {
           i->window = j;
 }
 
-Display *XClientMessageEvent_display(i)
-XClientMessageEvent* i;
+Display *XClientMessageEvent_display(XClientMessageEvent *i)
 {
           return(i->display);
 }
 
-void set_XClientMessageEvent_display(i, j)
-XClientMessageEvent* i;
-Display *j;
+void set_XClientMessageEvent_display(XClientMessageEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XClientMessageEvent_send_event(i)
-XClientMessageEvent* i;
+int  XClientMessageEvent_send_event(XClientMessageEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XClientMessageEvent_send_event(i, j)
-XClientMessageEvent* i;
-int j;
+void set_XClientMessageEvent_send_event(XClientMessageEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XClientMessageEvent_serial(i)
-XClientMessageEvent* i;
+int  XClientMessageEvent_serial(XClientMessageEvent *i)
 {
           return(i->serial);
 }
 
-void set_XClientMessageEvent_serial(i, j)
-XClientMessageEvent* i;
-int j;
+void set_XClientMessageEvent_serial(XClientMessageEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XClientMessageEvent_type(i)
-XClientMessageEvent* i;
+int  XClientMessageEvent_type(XClientMessageEvent *i)
 {
           return(i->type);
 }
 
-void set_XClientMessageEvent_type(i, j)
-XClientMessageEvent* i;
-int j;
+void set_XClientMessageEvent_type(XClientMessageEvent *i, int j)
 {
           i->type = j;
 }
@@ -3636,110 +2849,86 @@
 
 /********* XMappingEvent funcions *****/
 
-int  make_XMappingEvent (){
+int  make_XMappingEvent (void) {
           return ((int) calloc(1, sizeof(XMappingEvent)));
 }
 
-int  XMappingEvent_count(i)
-XMappingEvent* i;
+int  XMappingEvent_count(XMappingEvent *i)
 {
           return(i->count);
 }
 
-void set_XMappingEvent_count(i, j)
-XMappingEvent* i;
-int j;
+void set_XMappingEvent_count(XMappingEvent *i, int j)
 {
           i->count = j;
 }
 
-int XMappingEvent_first_keycode(i)
-XMappingEvent* i;
+int XMappingEvent_first_keycode(XMappingEvent *i)
 {
           return(i->first_keycode);
 }
 
-void set_XMappingEvent_first_keycode(i, j)
-XMappingEvent* i;
-int j;
+void set_XMappingEvent_first_keycode(XMappingEvent *i, int j)
 {
           i->first_keycode = j;
 }
 
-int  XMappingEvent_request(i)
-XMappingEvent* i;
+int  XMappingEvent_request(XMappingEvent *i)
 {
           return(i->request);
 }
 
-void set_XMappingEvent_request(i, j)
-XMappingEvent* i;
-int j;
+void set_XMappingEvent_request(XMappingEvent *i, int j)
 {
           i->request = j;
 }
 
-int  XMappingEvent_window(i)
-XMappingEvent* i;
+int  XMappingEvent_window(XMappingEvent *i)
 {
           return(i->window);
 }
 
-void set_XMappingEvent_window(i, j)
-XMappingEvent* i;
-int j;
+void set_XMappingEvent_window(XMappingEvent *i, int j)
 {
           i->window = j;
 }
 
-Display *XMappingEvent_display(i)
-XMappingEvent* i;
+Display *XMappingEvent_display(XMappingEvent *i)
 {
           return(i->display);
 }
 
-void set_XMappingEvent_display(i, j)
-XMappingEvent* i;
-Display *j;
+void set_XMappingEvent_display(XMappingEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XMappingEvent_send_event(i)
-XMappingEvent* i;
+int  XMappingEvent_send_event(XMappingEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XMappingEvent_send_event(i, j)
-XMappingEvent* i;
-int j;
+void set_XMappingEvent_send_event(XMappingEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XMappingEvent_serial(i)
-XMappingEvent* i;
+int  XMappingEvent_serial(XMappingEvent *i)
 {
           return(i->serial);
 }
 
-void set_XMappingEvent_serial(i, j)
-XMappingEvent* i;
-int j;
+void set_XMappingEvent_serial(XMappingEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XMappingEvent_type(i)
-XMappingEvent* i;
+int  XMappingEvent_type(XMappingEvent *i)
 {
           return(i->type);
 }
 
-void set_XMappingEvent_type(i, j)
-XMappingEvent* i;
-int j;
+void set_XMappingEvent_type(XMappingEvent *i, int j)
 {
           i->type = j;
 }
@@ -3747,97 +2936,76 @@
 
 /********* XErrorEvent funcions *****/
 
-int  make_XErrorEvent (){
+int  make_XErrorEvent (void) {
           return ((int) calloc(1, sizeof(XErrorEvent)));
 }
 
-char XErrorEvent_minor_code(i)
-XErrorEvent* i;
+char XErrorEvent_minor_code(XErrorEvent *i)
 {
           return(i->minor_code);
 }
 
-void set_XErrorEvent_minor_code(i, j)
-XErrorEvent* i;
-char j;
+void set_XErrorEvent_minor_code(XErrorEvent *i, char j)
 {
           i->minor_code = j;
 }
 
-char XErrorEvent_request_code(i)
-XErrorEvent* i;
+char XErrorEvent_request_code(XErrorEvent *i)
 {
           return(i->request_code);
 }
 
-void set_XErrorEvent_request_code(i, j)
-XErrorEvent* i;
-char j;
+void set_XErrorEvent_request_code(XErrorEvent *i, char j)
 {
           i->request_code = j;
 }
 
-char XErrorEvent_error_code(i)
-XErrorEvent* i;
+char XErrorEvent_error_code(XErrorEvent *i)
 {
           return(i->error_code);
 }
 
-void set_XErrorEvent_error_code(i, j)
-XErrorEvent* i;
-char j;
+void set_XErrorEvent_error_code(XErrorEvent *i, char j)
 {
           i->error_code = j;
 }
 
-int  XErrorEvent_serial(i)
-XErrorEvent* i;
+int  XErrorEvent_serial(XErrorEvent *i)
 {
           return(i->serial);
 }
 
-void set_XErrorEvent_serial(i, j)
-XErrorEvent* i;
-int j;
+void set_XErrorEvent_serial(XErrorEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XErrorEvent_resourceid(i)
-XErrorEvent* i;
+int  XErrorEvent_resourceid(XErrorEvent *i)
 {
           return(i->resourceid);
 }
 
-void set_XErrorEvent_resourceid(i, j)
-XErrorEvent* i;
-int j;
+void set_XErrorEvent_resourceid(XErrorEvent *i, int j)
 {
           i->resourceid = j;
 }
 
-Display *XErrorEvent_display(i)
-XErrorEvent* i;
+Display *XErrorEvent_display(XErrorEvent *i)
 {
           return(i->display);
 }
 
-void set_XErrorEvent_display(i, j)
-XErrorEvent* i;
-Display *j;
+void set_XErrorEvent_display(XErrorEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XErrorEvent_type(i)
-XErrorEvent* i;
+int  XErrorEvent_type(XErrorEvent *i)
 {
           return(i->type);
 }
 
-void set_XErrorEvent_type(i, j)
-XErrorEvent* i;
-int j;
+void set_XErrorEvent_type(XErrorEvent *i, int j)
 {
           i->type = j;
 }
@@ -3845,71 +3013,56 @@
 
 /********* XAnyEvent funcions *****/
 
-int  make_XAnyEvent (){
+int  make_XAnyEvent (void) {
           return ((int) calloc(1, sizeof(XAnyEvent)));
 }
 
-int  XAnyEvent_window(i)
-XAnyEvent* i;
+int  XAnyEvent_window(XAnyEvent *i)
 {
           return(i->window);
 }
 
-void set_XAnyEvent_window(i, j)
-XAnyEvent* i;
-int j;
+void set_XAnyEvent_window(XAnyEvent *i, int j)
 {
           i->window = j;
 }
 
-Display *XAnyEvent_display(i)
-XAnyEvent* i;
+Display *XAnyEvent_display(XAnyEvent *i)
 {
           return(i->display);
 }
 
-void set_XAnyEvent_display(i, j)
-XAnyEvent* i;
-Display *j;
+void set_XAnyEvent_display(XAnyEvent *i, Display *j)
 {
           i->display = j;
 }
 
-int  XAnyEvent_send_event(i)
-XAnyEvent* i;
+int  XAnyEvent_send_event(XAnyEvent *i)
 {
           return(i->send_event);
 }
 
-void set_XAnyEvent_send_event(i, j)
-XAnyEvent* i;
-int j;
+void set_XAnyEvent_send_event(XAnyEvent *i, int j)
 {
           i->send_event = j;
 }
 
-int  XAnyEvent_serial(i)
-XAnyEvent* i;
+int  XAnyEvent_serial(XAnyEvent *i)
 {
           return(i->serial);
 }
 
-void set_XAnyEvent_serial(i, j)
-XAnyEvent* i;
-int j;
+void set_XAnyEvent_serial(XAnyEvent *i, int j)
 {
           i->serial = j;
 }
 
-int  XAnyEvent_type(i)
-XAnyEvent* i;
+int  XAnyEvent_type(XAnyEvent *i)
 {
           return(i->type);
 }
 
-void set_XAnyEvent_type(i, j)
-XAnyEvent* i;
-int j;
+void set_XAnyEvent_type(XAnyEvent *i, int j)
 {
           i->type = j;
 }
@@ -3917,6 +3070,6 @@
 
 /********* XEvent funcions *****/
 
-int  make_XEvent (){
+int  make_XEvent (void) {
           return ((int) calloc(1, sizeof(XEvent)));
 }

Index: xgcl-2/XStruct-2.c
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/XStruct-2.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.20.1
diff -u -b -r1.1.1.1 -r1.1.1.1.20.1
--- xgcl-2/XStruct-2.c  13 Aug 2002 03:24:28 -0000      1.1.1.1
+++ xgcl-2/XStruct-2.c  20 Jun 2006 23:00:10 -0000      1.1.1.1.20.1
@@ -27,9 +27,9 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xlibint.h>
+#define int long
 
-
-int  make__XQEvent (){
+int  make__XQEvent (void) {
           return ((int) calloc(1, sizeof(_XQEvent)));
 }
 
@@ -62,84 +62,66 @@
 
 /********* XCharStruct funcions *****/
 
-int  make_XCharStruct (){
+int  make_XCharStruct (void) {
           return ((int) calloc(1, sizeof(XCharStruct)));
 }
 
-int  XCharStruct_attributes(i)
-XCharStruct* i;
+int  XCharStruct_attributes(XCharStruct *i)
 {
           return(i->attributes);
 }
 
-void set_XCharStruct_attributes(i, j)
-XCharStruct* i;
-int j;
+void set_XCharStruct_attributes(XCharStruct *i, int j)
 {
           i->attributes = j;
 }
 
-int  XCharStruct_descent(i)
-XCharStruct* i;
+int  XCharStruct_descent(XCharStruct *i)
 {
           return(i->descent);
 }
 
-void set_XCharStruct_descent(i, j)
-XCharStruct* i;
-int j;
+void set_XCharStruct_descent(XCharStruct *i, int j)
 {
           i->descent = j;
 }
 
-int  XCharStruct_ascent(i)
-XCharStruct* i;
+int  XCharStruct_ascent(XCharStruct *i)
 {
           return(i->ascent);
 }
 
-void set_XCharStruct_ascent(i, j)
-XCharStruct* i;
-int j;
+void set_XCharStruct_ascent(XCharStruct *i, int j)
 {
           i->ascent = j;
 }
 
-int  XCharStruct_width(i)
-XCharStruct* i;
+int  XCharStruct_width(XCharStruct *i)
 {
           return(i->width);
 }
 
-void set_XCharStruct_width(i, j)
-XCharStruct* i;
-int j;
+void set_XCharStruct_width(XCharStruct *i, int j)
 {
           i->width = j;
 }
 
-int  XCharStruct_rbearing(i)
-XCharStruct* i;
+int  XCharStruct_rbearing(XCharStruct *i)
 {
           return(i->rbearing);
 }
 
-void set_XCharStruct_rbearing(i, j)
-XCharStruct* i;
-int j;
+void set_XCharStruct_rbearing(XCharStruct *i, int j)
 {
           i->rbearing = j;
 }
 
-int  XCharStruct_lbearing(i)
-XCharStruct* i;
+int  XCharStruct_lbearing(XCharStruct *i)
 {
           return(i->lbearing);
 }
 
-void set_XCharStruct_lbearing(i, j)
-XCharStruct* i;
-int j;
+void set_XCharStruct_lbearing(XCharStruct *i, int j)
 {
           i->lbearing = j;
 }
@@ -147,32 +129,26 @@
 
 /********* XFontProp funcions *****/
 
-int  make_XFontProp (){
+int  make_XFontProp (void) {
           return ((int) calloc(1, sizeof(XFontProp)));
 }
 
-int  XFontProp_card32(i)
-XFontProp* i;
+int  XFontProp_card32(XFontProp *i)
 {
           return(i->card32);
 }
 
-void set_XFontProp_card32(i, j)
-XFontProp* i;
-int j;
+void set_XFontProp_card32(XFontProp *i, int j)
 {
           i->card32 = j;
 }
 
-int  XFontProp_name(i)
-XFontProp* i;
+int  XFontProp_name(XFontProp *i)
 {
           return(i->name);
 }
 
-void set_XFontProp_name(i, j)
-XFontProp* i;
-int j;
+void set_XFontProp_name(XFontProp *i, int j)
 {
           i->name = j;
 }
@@ -180,211 +156,163 @@
 
 /********* XFontStruct funcions *****/
 
-int  make_XFontStruct (){
+int  make_XFontStruct (void) {
           return ((int) calloc(1, sizeof(XFontStruct)));
 }
 
-int  XFontStruct_descent(i)
-XFontStruct* i;
+int  XFontStruct_descent(XFontStruct *i)
 {
           return(i->descent);
 }
 
-void set_XFontStruct_descent(i, j)
-XFontStruct* i;
-int j;
+void set_XFontStruct_descent(XFontStruct *i, int j)
 {
           i->descent = j;
 }
 
-int  XFontStruct_ascent(i)
-XFontStruct* i;
+int  XFontStruct_ascent(XFontStruct *i)
 {
           return(i->ascent);
 }
 
-void set_XFontStruct_ascent(i, j)
-XFontStruct* i;
-int j;
+void set_XFontStruct_ascent(XFontStruct *i, int j)
 {
           i->ascent = j;
 }
 
-XCharStruct *XFontStruct_per_char(i)
-XFontStruct* i;
+XCharStruct *XFontStruct_per_char(XFontStruct *i)
 {
           return(i->per_char);
 }
 
-void set_XFontStruct_per_char(i, j)
-XFontStruct* i;
-XCharStruct *j;
+void set_XFontStruct_per_char(XFontStruct *i, XCharStruct *j)
 {
           i->per_char = j;
 }
 
-XCharStruct *XFontStruct_max_bounds(i)
-XFontStruct* i;
+XCharStruct *XFontStruct_max_bounds(XFontStruct *i)
 {
           return(&i->max_bounds);
 }
-XCharStruct *XFontStruct_min_bounds(i)
-XFontStruct* i;
+XCharStruct *XFontStruct_min_bounds(XFontStruct *i)
 {
           return(&i->min_bounds);
 }
-void set_XFontStruct_max_bounds(i, j)
-XFontStruct* i;
-XCharStruct j;
+void set_XFontStruct_max_bounds(XFontStruct *i, XCharStruct j)
 {
           i->max_bounds = j;
 }
-void set_XFontStruct_min_bounds(i, j)
-XFontStruct* i;
-XCharStruct j;
+void set_XFontStruct_min_bounds(XFontStruct *i, XCharStruct j)
 {
           i->min_bounds = j;
 }
 
-XFontProp *XFontStruct_properties(i)
-XFontStruct* i;
+XFontProp *XFontStruct_properties(XFontStruct *i)
 {
           return(i->properties);
 }
 
-void set_XFontStruct_properties(i, j)
-XFontStruct* i;
-XFontProp *j;
+void set_XFontStruct_properties(XFontStruct *i, XFontProp *j)
 {
           i->properties = j;
 }
 
-int  XFontStruct_n_properties(i)
-XFontStruct* i;
+int  XFontStruct_n_properties(XFontStruct *i)
 {
           return(i->n_properties);
 }
 
-void set_XFontStruct_n_properties(i, j)
-XFontStruct* i;
-int j;
+void set_XFontStruct_n_properties(XFontStruct *i, int j)
 {
           i->n_properties = j;
 }
 
-int  XFontStruct_default_char(i)
-XFontStruct* i;
+int  XFontStruct_default_char(XFontStruct *i)
 {
           return(i->default_char);
 }
 
-void set_XFontStruct_default_char(i, j)
-XFontStruct* i;
-int j;
+void set_XFontStruct_default_char(XFontStruct *i, int j)
 {
           i->default_char = j;
 }
 
-int  XFontStruct_all_chars_exist(i)
-XFontStruct* i;
+int  XFontStruct_all_chars_exist(XFontStruct *i)
 {
           return(i->all_chars_exist);
 }
 
-void set_XFontStruct_all_chars_exist(i, j)
-XFontStruct* i;
-int j;
+void set_XFontStruct_all_chars_exist(XFontStruct *i, int j)
 {
           i->all_chars_exist = j;
 }
 
-int  XFontStruct_max_byte1(i)
-XFontStruct* i;
+int  XFontStruct_max_byte1(XFontStruct *i)
 {
           return(i->max_byte1);
 }
 
-void set_XFontStruct_max_byte1(i, j)
-XFontStruct* i;
-int j;
+void set_XFontStruct_max_byte1(XFontStruct *i, int j)
 {
           i->max_byte1 = j;
 }
 
-int  XFontStruct_min_byte1(i)
-XFontStruct* i;
+int  XFontStruct_min_byte1(XFontStruct *i)
 {
           return(i->min_byte1);
 }
 
-void set_XFontStruct_min_byte1(i, j)
-XFontStruct* i;
-int j;
+void set_XFontStruct_min_byte1(XFontStruct *i, int j)
 {
           i->min_byte1 = j;
 }
 
-int  XFontStruct_max_char_or_byte2(i)
-XFontStruct* i;
+int  XFontStruct_max_char_or_byte2(XFontStruct *i)
 {
           return(i->max_char_or_byte2);
 }
 
-void set_XFontStruct_max_char_or_byte2(i, j)
-XFontStruct* i;
-int j;
+void set_XFontStruct_max_char_or_byte2(XFontStruct *i, int j)
 {
           i->max_char_or_byte2 = j;
 }
 
-int  XFontStruct_min_char_or_byte2(i)
-XFontStruct* i;
+int  XFontStruct_min_char_or_byte2(XFontStruct *i)
 {
           return(i->min_char_or_byte2);
 }
 
-void set_XFontStruct_min_char_or_byte2(i, j)
-XFontStruct* i;
-int j;
+void set_XFontStruct_min_char_or_byte2(XFontStruct *i, int j)
 {
           i->min_char_or_byte2 = j;
 }
 
-int  XFontStruct_direction(i)
-XFontStruct* i;
+int  XFontStruct_direction(XFontStruct *i)
 {
           return(i->direction);
 }
 
-void set_XFontStruct_direction(i, j)
-XFontStruct* i;
-int j;
+void set_XFontStruct_direction(XFontStruct *i, int j)
 {
           i->direction = j;
 }
 
-int  XFontStruct_fid(i)
-XFontStruct* i;
+int  XFontStruct_fid(XFontStruct *i)
 {
           return(i->fid);
 }
 
-void set_XFontStruct_fid(i, j)
-XFontStruct* i;
-int j;
+void set_XFontStruct_fid(XFontStruct *i, int j)
 {
           i->fid = j;
 }
 
-XExtData * XFontStruct_ext_data(i)
-XFontStruct* i;
+XExtData * XFontStruct_ext_data(XFontStruct *i)
 {
           return(i->ext_data);
 }
 
-void set_XFontStruct_ext_data(i, j)
-XFontStruct* i;
-XExtData *j;
+void set_XFontStruct_ext_data(XFontStruct *i, XExtData *j)
 {
           i->ext_data = j;
 }
@@ -392,58 +320,46 @@
 
 /********* XTextItem funcions *****/
 
-int  make_XTextItem (){
+int  make_XTextItem (void) {
           return ((int) calloc(1, sizeof(XTextItem)));
 }
 
-int  XTextItem_font(i)
-XTextItem* i;
+int  XTextItem_font(XTextItem *i)
 {
           return(i->font);
 }
 
-void set_XTextItem_font(i, j)
-XTextItem* i;
-int j;
+void set_XTextItem_font(XTextItem *i, int j)
 {
           i->font = j;
 }
 
-int  XTextItem_delta(i)
-XTextItem* i;
+int  XTextItem_delta(XTextItem *i)
 {
           return(i->delta);
 }
 
-void set_XTextItem_delta(i, j)
-XTextItem* i;
-int j;
+void set_XTextItem_delta(XTextItem *i, int j)
 {
           i->delta = j;
 }
 
-int  XTextItem_nchars(i)
-XTextItem* i;
+int  XTextItem_nchars(XTextItem *i)
 {
           return(i->nchars);
 }
 
-void set_XTextItem_nchars(i, j)
-XTextItem* i;
-int j;
+void set_XTextItem_nchars(XTextItem *i, int j)
 {
           i->nchars = j;
 }
 
-char * XTextItem_chars(i)
-XTextItem* i;
+char * XTextItem_chars(XTextItem *i)
 {
           return(i->chars);
 }
 
-void set_XTextItem_chars(i, j)
-XTextItem* i;
-char *j;
+void set_XTextItem_chars(XTextItem *i, char *j)
 {
           i->chars = j;
 }
@@ -451,32 +367,26 @@
 
 /********* XChar2b funcions *****/
 
-int  make_XChar2b (){
+int  make_XChar2b (void) {
           return ((int) calloc(1, sizeof(XChar2b)));
 }
 
-char XChar2b_byte2(i)
-XChar2b* i;
+char XChar2b_byte2(XChar2b *i)
 {
           return(i->byte2);
 }
 
-void set_XChar2b_byte2(i, j)
-XChar2b* i;
-char j;
+void set_XChar2b_byte2(XChar2b *i, char j)
 {
           i->byte2 = j;
 }
 
-char XChar2b_byte1(i)
-XChar2b* i;
+char XChar2b_byte1(XChar2b *i)
 {
           return(i->byte1);
 }
 
-void set_XChar2b_byte1(i, j)
-XChar2b* i;
-char j;
+void set_XChar2b_byte1(XChar2b *i, char j)
 {
           i->byte1 = j;
 }
@@ -484,58 +394,46 @@
 
 /********* XTextItem16 funcions *****/
 
-int  make_XTextItem16 (){
+int  make_XTextItem16 (void) {
           return ((int) calloc(1, sizeof(XTextItem16)));
 }
 
-int  XTextItem16_font(i)
-XTextItem16* i;
+int  XTextItem16_font(XTextItem16 *i)
 {
           return(i->font);
 }
 
-void set_XTextItem16_font(i, j)
-XTextItem16* i;
-int j;
+void set_XTextItem16_font(XTextItem16 *i, int j)
 {
           i->font = j;
 }
 
-int  XTextItem16_delta(i)
-XTextItem16* i;
+int  XTextItem16_delta(XTextItem16 *i)
 {
           return(i->delta);
 }
 
-void set_XTextItem16_delta(i, j)
-XTextItem16* i;
-int j;
+void set_XTextItem16_delta(XTextItem16 *i, int j)
 {
           i->delta = j;
 }
 
-int  XTextItem16_nchars(i)
-XTextItem16* i;
+int  XTextItem16_nchars(XTextItem16 *i)
 {
           return(i->nchars);
 }
 
-void set_XTextItem16_nchars(i, j)
-XTextItem16* i;
-int j;
+void set_XTextItem16_nchars(XTextItem16 *i, int j)
 {
           i->nchars = j;
 }
 
-XChar2b * XTextItem16_chars(i)
-XTextItem16* i;
+XChar2b * XTextItem16_chars(XTextItem16 *i)
 {
           return(i->chars);
 }
 
-void set_XTextItem16_chars(i, j)
-XTextItem16* i;
-XChar2b *j;
+void set_XTextItem16_chars(XTextItem16 *i, XChar2b *j)
 {
           i->chars = j;
 }
@@ -543,71 +441,56 @@
 
 /********* XEDataObject funcions *****/
 
-int  make_XEDataObject (){
+int  make_XEDataObject (void) {
           return ((int) calloc(1, sizeof(XEDataObject)));
 }
 
-XFontStruct *XEDataObject_font(i)
-XEDataObject* i;
+XFontStruct *XEDataObject_font(XEDataObject *i)
 {
           return(i->font);
 }
 
-void set_XEDataObject_font(i, j)
-XEDataObject* i;
-XFontStruct *j;
+void set_XEDataObject_font(XEDataObject *i, XFontStruct *j)
 {
           i->font = j;
 }
 
-ScreenFormat *XEDataObject_pixmap_format(i)
-XEDataObject* i;
+ScreenFormat *XEDataObject_pixmap_format(XEDataObject *i)
 {
           return(i->pixmap_format);
 }
 
-void set_XEDataObject_pixmap_format(i, j)
-XEDataObject* i;
-ScreenFormat *j;
+void set_XEDataObject_pixmap_format(XEDataObject *i, ScreenFormat *j)
 {
           i->pixmap_format = j;
 }
 
-Screen *XEDataObject_screen(i)
-XEDataObject* i;
+Screen *XEDataObject_screen(XEDataObject *i)
 {
           return(i->screen);
 }
 
-void set_XEDataObject_screen(i, j)
-XEDataObject* i;
-Screen *j;
+void set_XEDataObject_screen(XEDataObject *i, Screen *j)
 {
           i->screen = j;
 }
 
-Visual *XEDataObject_visual(i)
-XEDataObject* i;
+Visual *XEDataObject_visual(XEDataObject *i)
 {
           return(i->visual);
 }
 
-void set_XEDataObject_visual(i, j)
-XEDataObject* i;
-Visual *j;
+void set_XEDataObject_visual(XEDataObject *i, Visual *j)
 {
           i->visual = j;
 }
 
-GC   XEDataObject_gc(i)
-XEDataObject* i;
+GC   XEDataObject_gc(XEDataObject *i)
 {
           return(i->gc);
 }
 
-void set_XEDataObject_gc(i, j)
-XEDataObject* i;
-GC j;
+void set_XEDataObject_gc(XEDataObject *i, GC j)
 {
           i->gc = j;
 }
@@ -615,242 +498,188 @@
 
 /********* XSizeHints funcions *****/
 
-int  make_XSizeHints (){
+int  make_XSizeHints (void) {
           return ((int) calloc(1, sizeof(XSizeHints)));
 }
 
-int  XSizeHints_win_gravity(i)
-XSizeHints *i;
+int  XSizeHints_win_gravity(XSizeHints *i)
 {
           return(i->win_gravity);
 }
 
-void set_XSizeHints_win_gravity(i, j)
-XSizeHints *i;
-int j;
+void set_XSizeHints_win_gravity(XSizeHints *i, int j)
 {
           i->win_gravity = j;
 }
 
-int  XSizeHints_base_height(i)
-XSizeHints* i;
+int  XSizeHints_base_height(XSizeHints *i)
 {
           return(i->base_height);
 }
 
-void set_XSizeHints_base_height(i, j)
-XSizeHints* i;
-int j;
+void set_XSizeHints_base_height(XSizeHints *i, int j)
 {
           i->base_height = j;
 }
 
-int  XSizeHints_base_width(i)
-XSizeHints* i;
+int  XSizeHints_base_width(XSizeHints *i)
 {
           return(i->base_width);
 }
 
-void set_XSizeHints_base_width(i, j)
-XSizeHints* i;
-int j;
+void set_XSizeHints_base_width(XSizeHints *i, int j)
 {
           i->base_width = j;
 }
 
-int  XSizeHints_height_inc(i)
-XSizeHints* i;
+int  XSizeHints_height_inc(XSizeHints *i)
 {
           return(i->height_inc);
 }
 
-void set_XSizeHints_height_inc(i, j)
-XSizeHints* i;
-int j;
+void set_XSizeHints_height_inc(XSizeHints *i, int j)
 {
           i->height_inc = j;
 }
 
-int  XSizeHints_width_inc(i)
-XSizeHints* i;
+int  XSizeHints_width_inc(XSizeHints *i)
 {
           return(i->width_inc);
 }
 
-void set_XSizeHints_width_inc(i, j)
-XSizeHints* i;
-int j;
+void set_XSizeHints_width_inc(XSizeHints *i, int j)
 {
           i->width_inc = j;
 }
 
-int  XSizeHints_max_height(i)
-XSizeHints* i;
+int  XSizeHints_max_height(XSizeHints *i)
 {
           return(i->max_height);
 }
 
-void set_XSizeHints_max_height(i, j)
-XSizeHints* i;
-int j;
+void set_XSizeHints_max_height(XSizeHints *i, int j)
 {
           i->max_height = j;
 }
 
-int  XSizeHints_max_width(i)
-XSizeHints* i;
+int  XSizeHints_max_width(XSizeHints *i)
 {
           return(i->max_width);
 }
 
-void set_XSizeHints_max_width(i, j)
-XSizeHints* i;
-int j;
+void set_XSizeHints_max_width(XSizeHints *i, int j)
 {
           i->max_width = j;
 }
 
-int  XSizeHints_min_height(i)
-XSizeHints* i;
+int  XSizeHints_min_height(XSizeHints *i)
 {
           return(i->min_height);
 }
 
-void set_XSizeHints_min_height(i, j)
-XSizeHints* i;
-int j;
+void set_XSizeHints_min_height(XSizeHints *i, int j)
 {
           i->min_height = j;
 }
 
-int  XSizeHints_min_width(i)
-XSizeHints* i;
+int  XSizeHints_min_width(XSizeHints *i)
 {
           return(i->min_width);
 }
 
-void set_XSizeHints_min_width(i, j)
-XSizeHints* i;
-int j;
+void set_XSizeHints_min_width(XSizeHints *i, int j)
 {
           i->min_width = j;
 }
 
-int  XSizeHints_height(i)
-XSizeHints* i;
+int  XSizeHints_height(XSizeHints *i)
 {
           return(i->height);
 }
 
-void set_XSizeHints_height(i, j)
-XSizeHints* i;
-int j;
+void set_XSizeHints_height(XSizeHints *i, int j)
 {
           i->height = j;
 }
 
-int  XSizeHints_width(i)
-XSizeHints* i;
+int  XSizeHints_width(XSizeHints *i)
 {
           return(i->width);
 }
 
-void set_XSizeHints_width(i, j)
-XSizeHints* i;
-int j;
+void set_XSizeHints_width(XSizeHints *i, int j)
 {
           i->width = j;
 }
 
-int  XSizeHints_y(i)
-XSizeHints* i;
+int  XSizeHints_y(XSizeHints *i)
 {
           return(i->y);
 }
 
-void set_XSizeHints_y(i, j)
-XSizeHints* i;
-int j;
+void set_XSizeHints_y(XSizeHints *i, int j)
 {
           i->y = j;
 }
 
-int  XSizeHints_x(i)
-XSizeHints* i;
+int  XSizeHints_x(XSizeHints *i)
 {
           return(i->x);
 }
 
-void set_XSizeHints_x(i, j)
-XSizeHints* i;
-int j;
+void set_XSizeHints_x(XSizeHints *i, int j)
 {
           i->x = j;
 }
 
-int  XSizeHints_flags(i)
-XSizeHints* i;
+int  XSizeHints_flags(XSizeHints *i)
 {
           return(i->flags);
 }
 
-void set_XSizeHints_flags(i, j)
-XSizeHints* i;
-int j;
+void set_XSizeHints_flags(XSizeHints *i, int j)
 {
           i->flags = j;
 }
 
 
-int  XSizeHints_max_aspect_x(i)
-XSizeHints* i;
+int  XSizeHints_max_aspect_x(XSizeHints *i)
 {
           return(i->max_aspect.x);
 }
 
-void  set_XSizeHints_max_aspect_x(i, j)
-XSizeHints* i;
-int    j;
+void  set_XSizeHints_max_aspect_x(XSizeHints *i, int j)
 {
           i->max_aspect.x = j;
 }
 
-int  XSizeHints_max_aspect_y(i)
-XSizeHints* i;
+int  XSizeHints_max_aspect_y(XSizeHints *i)
 {
           return(i->max_aspect.y);
 }
 
-void  set_XSizeHints_max_aspect_y(i, j)
-XSizeHints* i;
-int    j;
+void  set_XSizeHints_max_aspect_y(XSizeHints *i, int j)
 {
           i->max_aspect.y = j;
 }
 
-int  XSizeHints_min_aspect_x(i)
-XSizeHints* i;
+int  XSizeHints_min_aspect_x(XSizeHints *i)
 {
           return(i->min_aspect.x);
 }
 
-void  set_XSizeHints_min_aspect_x(i, j)
-XSizeHints* i;
-int    j;
+void  set_XSizeHints_min_aspect_x(XSizeHints *i, int j)
 {
           i->min_aspect.x = j;
 }
 
 
-int  XSizeHints_min_aspect_y(i)
-XSizeHints* i;
+int  XSizeHints_min_aspect_y(XSizeHints *i)
 {
           return(i->min_aspect.y);
 }
 
-void  set_XSizeHints_min_aspect_y(i, j)
-XSizeHints* i;
-int    j;
+void  set_XSizeHints_min_aspect_y(XSizeHints *i, int j)
 {
           i->min_aspect.y = j;
 }
@@ -858,123 +687,96 @@
 
 /********* XWMHints funcions *****/
 
-int  make_XWMHints (){
+int  make_XWMHints (void) {
           return ((int) calloc(1, sizeof(XWMHints)));
 }
 
-int  XWMHints_window_group(i)
-XWMHints* i;
+int  XWMHints_window_group(XWMHints *i)
 {
           return(i->window_group);
 }
 
-void set_XWMHints_window_group(i, j)
-XWMHints* i;
-int j;
+void set_XWMHints_window_group(XWMHints *i, int j)
 {
           i->window_group = j;
 }
 
-int  XWMHints_icon_mask(i)
-XWMHints* i;
+int  XWMHints_icon_mask(XWMHints *i)
 {
           return(i->icon_mask);
 }
 
-void set_XWMHints_icon_mask(i, j)
-XWMHints* i;
-int j;
+void set_XWMHints_icon_mask(XWMHints *i, int j)
 {
           i->icon_mask = j;
 }
 
-int  XWMHints_icon_y(i)
-XWMHints* i;
+int  XWMHints_icon_y(XWMHints *i)
 {
           return(i->icon_y);
 }
 
-void set_XWMHints_icon_y(i, j)
-XWMHints* i;
-int j;
+void set_XWMHints_icon_y(XWMHints *i, int j)
 {
           i->icon_y = j;
 }
 
-int  XWMHints_icon_x(i)
-XWMHints* i;
+int  XWMHints_icon_x(XWMHints *i)
 {
           return(i->icon_x);
 }
 
-void set_XWMHints_icon_x(i, j)
-XWMHints* i;
-int j;
+void set_XWMHints_icon_x(XWMHints *i, int j)
 {
           i->icon_x = j;
 }
 
-int  XWMHints_icon_window(i)
-XWMHints* i;
+int  XWMHints_icon_window(XWMHints *i)
 {
           return(i->icon_window);
 }
 
-void set_XWMHints_icon_window(i, j)
-XWMHints* i;
-int j;
+void set_XWMHints_icon_window(XWMHints *i, int j)
 {
           i->icon_window = j;
 }
 
-int  XWMHints_icon_pixmap(i)
-XWMHints* i;
+int  XWMHints_icon_pixmap(XWMHints *i)
 {
           return(i->icon_pixmap);
 }
 
-void set_XWMHints_icon_pixmap(i, j)
-XWMHints* i;
-int j;
+void set_XWMHints_icon_pixmap(XWMHints *i, int j)
 {
           i->icon_pixmap = j;
 }
 
-int  XWMHints_initial_state(i)
-XWMHints* i;
+int  XWMHints_initial_state(XWMHints *i)
 {
           return(i->initial_state);
 }
 
-void set_XWMHints_initial_state(i, j)
-XWMHints* i;
-int j;
+void set_XWMHints_initial_state(XWMHints *i, int j)
 {
           i->initial_state = j;
 }
 
-int  XWMHints_input(i)
-XWMHints* i;
+int  XWMHints_input(XWMHints *i)
 {
           return(i->input);
 }
 
-void set_XWMHints_input(i, j)
-XWMHints* i;
-int j;
+void set_XWMHints_input(XWMHints *i, int j)
 {
           i->input = j;
 }
 
-int  XWMHints_flags(i)
-XWMHints* i;
+int  XWMHints_flags(XWMHints *i)
 {
           return(i->flags);
 }
 
-void set_XWMHints_flags(i, j)
-XWMHints* i;
-int j;
+void set_XWMHints_flags(XWMHints *i, int j)
 {
           i->flags = j;
 }
@@ -982,58 +784,46 @@
 
 /********* XTextProperty funcions *****/
 
-int  make_XTextProperty (){
+int  make_XTextProperty (void) {
           return ((int) calloc(1, sizeof(XTextProperty)));
 }
 
-int  XTextProperty_nitems(i)
-XTextProperty *i;
+int  XTextProperty_nitems(XTextProperty *i)
 {
           return(i->nitems);
 }
 
-void set_XTextProperty_nitems(i, j)
-XTextProperty* i;
-int j;
+void set_XTextProperty_nitems(XTextProperty *i, int j)
 {
           i->nitems = j;
 }
 
-int  XTextProperty_format(i)
-XTextProperty* i;
+int  XTextProperty_format(XTextProperty *i)
 {
           return(i->format);
 }
 
-void set_XTextProperty_format(i, j)
-XTextProperty* i;
-int j;
+void set_XTextProperty_format(XTextProperty *i, int j)
 {
           i->format = j;
 }
 
-int  XTextProperty_encoding(i)
-XTextProperty* i;
+int  XTextProperty_encoding(XTextProperty *i)
 {
           return(i->encoding);
 }
 
-void set_XTextProperty_encoding(i, j)
-XTextProperty* i;
-int j;
+void set_XTextProperty_encoding(XTextProperty *i, int j)
 {
           i->encoding = j;
 }
 
-unsigned char *XTextProperty_value(i)
-XTextProperty* i;
+unsigned char *XTextProperty_value(XTextProperty *i)
 {
           return(i->value);
 }
 
-void set_XTextProperty_value(i, j)
-XTextProperty* i;
-unsigned char *j;
+void set_XTextProperty_value(XTextProperty *i, unsigned char *j)
 {
           i->value = j;
 }
@@ -1041,84 +831,66 @@
 
 /********* XIconSize funcions *****/
 
-int  make_XIconSize (){
+int  make_XIconSize (void) {
           return ((int) calloc(1, sizeof(XIconSize)));
 }
 
-int  XIconSize_height_inc(i)
-XIconSize* i;
+int  XIconSize_height_inc(XIconSize *i)
 {
           return(i->height_inc);
 }
 
-void set_XIconSize_height_inc(i, j)
-XIconSize* i;
-int j;
+void set_XIconSize_height_inc(XIconSize *i, int j)
 {
           i->height_inc = j;
 }
 
-int  XIconSize_width_inc(i)
-XIconSize* i;
+int  XIconSize_width_inc(XIconSize *i)
 {
           return(i->width_inc);
 }
 
-void set_XIconSize_width_inc(i, j)
-XIconSize* i;
-int j;
+void set_XIconSize_width_inc(XIconSize *i, int j)
 {
           i->width_inc = j;
 }
 
-int  XIconSize_max_height(i)
-XIconSize* i;
+int  XIconSize_max_height(XIconSize *i)
 {
           return(i->max_height);
 }
 
-void set_XIconSize_max_height(i, j)
-XIconSize* i;
-int j;
+void set_XIconSize_max_height(XIconSize *i, int j)
 {
           i->max_height = j;
 }
 
-int  XIconSize_max_width(i)
-XIconSize* i;
+int  XIconSize_max_width(XIconSize *i)
 {
           return(i->max_width);
 }
 
-void set_XIconSize_max_width(i, j)
-XIconSize* i;
-int j;
+void set_XIconSize_max_width(XIconSize *i, int j)
 {
           i->max_width = j;
 }
 
-int  XIconSize_min_height(i)
-XIconSize* i;
+int  XIconSize_min_height(XIconSize *i)
 {
           return(i->min_height);
 }
 
-void set_XIconSize_min_height(i, j)
-XIconSize* i;
-int j;
+void set_XIconSize_min_height(XIconSize *i, int j)
 {
           i->min_height = j;
 }
 
-int  XIconSize_min_width(i)
-XIconSize* i;
+int  XIconSize_min_width(XIconSize *i)
 {
           return(i->min_width);
 }
 
-void set_XIconSize_min_width(i, j)
-XIconSize* i;
-int j;
+void set_XIconSize_min_width(XIconSize *i, int j)
 {
           i->min_width = j;
 }
@@ -1126,32 +898,26 @@
 
 /********* XClassHint funcions *****/
 
-int  make_XClassHint (){
+int  make_XClassHint (void) {
           return ((int) calloc(1, sizeof(XClassHint)));
 }
 
-char *XClassHint_res_class(i)
-XClassHint* i;
+char *XClassHint_res_class(XClassHint *i)
 {
           return(i->res_class);
 }
 
-void set_XClassHint_res_class(i, j)
-XClassHint* i;
-char *j;
+void set_XClassHint_res_class(XClassHint *i, char *j)
 {
           i->res_class = j;
 }
 
-char *XClassHint_res_name(i)
-XClassHint* i;
+char *XClassHint_res_name(XClassHint *i)
 {
           return(i->res_name);
 }
 
-void set_XClassHint_res_name(i, j)
-XClassHint* i;
-char *j;
+void set_XClassHint_res_name(XClassHint *i, char *j)
 {
           i->res_name = j;
 }
@@ -1159,32 +925,26 @@
 
 /********* XComposeStatus funcions *****/
 
-int  make_XComposeStatus (){
+int  make_XComposeStatus (void) {
           return ((int) calloc(1, sizeof(XComposeStatus)));
 }
 
-int  XComposeStatus_chars_matched(i)
-XComposeStatus* i;
+int  XComposeStatus_chars_matched(XComposeStatus *i)
 {
           return(i->chars_matched);
 }
 
-void set_XComposeStatus_chars_matched(i, j)
-XComposeStatus* i;
-int j;
+void set_XComposeStatus_chars_matched(XComposeStatus *i, int j)
 {
           i->chars_matched = j;
 }
 
-XPointer  XComposeStatus_compose_ptr(i)
-XComposeStatus* i;
+XPointer  XComposeStatus_compose_ptr(XComposeStatus *i)
 {
           return(i->compose_ptr);
 }
 
-void set_XComposeStatus_compose_ptr(i, j)
-XComposeStatus* i;
-XPointer j;
+void set_XComposeStatus_compose_ptr(XComposeStatus *i, XPointer j)
 {
           i->compose_ptr = j;
 }
@@ -1192,136 +952,106 @@
 
 /********* XVisualInfo funcions *****/
 
-int  make_XVisualInfo (){
+int  make_XVisualInfo (void) {
           return ((int) calloc(1, sizeof(XVisualInfo)));
 }
 
-int  XVisualInfo_bits_per_rgb(i)
-XVisualInfo* i;
+int  XVisualInfo_bits_per_rgb(XVisualInfo *i)
 {
           return(i->bits_per_rgb);
 }
 
-void set_XVisualInfo_bits_per_rgb(i, j)
-XVisualInfo* i;
-int j;
+void set_XVisualInfo_bits_per_rgb(XVisualInfo *i, int j)
 {
           i->bits_per_rgb = j;
 }
 
-int  XVisualInfo_colormap_size(i)
-XVisualInfo* i;
+int  XVisualInfo_colormap_size(XVisualInfo *i)
 {
           return(i->colormap_size);
 }
 
-void set_XVisualInfo_colormap_size(i, j)
-XVisualInfo* i;
-int j;
+void set_XVisualInfo_colormap_size(XVisualInfo *i, int j)
 {
           i->colormap_size = j;
 }
 
-int  XVisualInfo_blue_mask(i)
-XVisualInfo* i;
+int  XVisualInfo_blue_mask(XVisualInfo *i)
 {
           return(i->blue_mask);
 }
 
-void set_XVisualInfo_blue_mask(i, j)
-XVisualInfo* i;
-int j;
+void set_XVisualInfo_blue_mask(XVisualInfo *i, int j)
 {
           i->blue_mask = j;
 }
 
-int  XVisualInfo_green_mask(i)
-XVisualInfo* i;
+int  XVisualInfo_green_mask(XVisualInfo *i)
 {
           return(i->green_mask);
 }
 
-void set_XVisualInfo_green_mask(i, j)
-XVisualInfo* i;
-int j;
+void set_XVisualInfo_green_mask(XVisualInfo *i, int j)
 {
           i->green_mask = j;
 }
 
-int  XVisualInfo_red_mask(i)
-XVisualInfo* i;
+int  XVisualInfo_red_mask(XVisualInfo *i)
 {
           return(i->red_mask);
 }
 
-void set_XVisualInfo_red_mask(i, j)
-XVisualInfo* i;
-int j;
+void set_XVisualInfo_red_mask(XVisualInfo *i, int j)
 {
           i->red_mask = j;
 }
 
-int  XVisualInfo_class(i)
-XVisualInfo* i;
+int  XVisualInfo_class(XVisualInfo *i)
 {
           return(i->class);
 }
 
-void set_XVisualInfo_class(i, j)
-XVisualInfo* i;
-int j;
+void set_XVisualInfo_class(XVisualInfo *i, int j)
 {
           i->class = j;
 }
 
-int  XVisualInfo_depth(i)
-XVisualInfo* i;
+int  XVisualInfo_depth(XVisualInfo *i)
 {
           return(i->depth);
 }
 
-void set_XVisualInfo_depth(i, j)
-XVisualInfo* i;
-int j;
+void set_XVisualInfo_depth(XVisualInfo *i, int j)
 {
           i->depth = j;
 }
 
-int  XVisualInfo_screen(i)
-XVisualInfo* i;
+int  XVisualInfo_screen(XVisualInfo *i)
 {
           return(i->screen);
 }
 
-void set_XVisualInfo_screen(i, j)
-XVisualInfo* i;
-int j;
+void set_XVisualInfo_screen(XVisualInfo *i, int j)
 {
           i->screen = j;
 }
 
-int  XVisualInfo_visualid(i)
-XVisualInfo* i;
+int  XVisualInfo_visualid(XVisualInfo *i)
 {
           return(i->visualid);
 }
 
-void set_XVisualInfo_visualid(i, j)
-XVisualInfo* i;
-int j;
+void set_XVisualInfo_visualid(XVisualInfo *i, int j)
 {
           i->visualid = j;
 }
 
-Visual *XVisualInfo_visual(i)
-XVisualInfo* i;
+Visual *XVisualInfo_visual(XVisualInfo *i)
 {
           return(i->visual);
 }
 
-void set_XVisualInfo_visual(i, j)
-XVisualInfo* i;
-Visual *j;
+void set_XVisualInfo_visual(XVisualInfo *i, Visual *j)
 {
           i->visual = j;
 }
@@ -1329,136 +1059,106 @@
 
 /********* XStandardColormap funcions *****/
 
-int  make_XStandardColormap (){
+int  make_XStandardColormap (void) {
           return ((int) calloc(1, sizeof(XStandardColormap)));
 }
 
-int  XStandardColormap_killid(i)
-XStandardColormap* i;
+int  XStandardColormap_killid(XStandardColormap *i)
 {
           return(i->killid);
 }
 
-void set_XStandardColormap_killid(i, j)
-XStandardColormap* i;
-int j;
+void set_XStandardColormap_killid(XStandardColormap *i, int j)
 {
           i->killid = j;
 }
 
-int  XStandardColormap_visualid(i)
-XStandardColormap* i;
+int  XStandardColormap_visualid(XStandardColormap *i)
 {
           return(i->visualid);
 }
 
-void set_XStandardColormap_visualid(i, j)
-XStandardColormap* i;
-int j;
+void set_XStandardColormap_visualid(XStandardColormap *i, int j)
 {
           i->visualid = j;
 }
 
-int  XStandardColormap_base_pixel(i)
-XStandardColormap* i;
+int  XStandardColormap_base_pixel(XStandardColormap *i)
 {
           return(i->base_pixel);
 }
 
-void set_XStandardColormap_base_pixel(i, j)
-XStandardColormap* i;
-int j;
+void set_XStandardColormap_base_pixel(XStandardColormap *i, int j)
 {
           i->base_pixel = j;
 }
 
-int  XStandardColormap_blue_mult(i)
-XStandardColormap* i;
+int  XStandardColormap_blue_mult(XStandardColormap *i)
 {
           return(i->blue_mult);
 }
 
-void set_XStandardColormap_blue_mult(i, j)
-XStandardColormap* i;
-int j;
+void set_XStandardColormap_blue_mult(XStandardColormap *i, int j)
 {
           i->blue_mult = j;
 }
 
-int  XStandardColormap_blue_max(i)
-XStandardColormap* i;
+int  XStandardColormap_blue_max(XStandardColormap *i)
 {
           return(i->blue_max);
 }
 
-void set_XStandardColormap_blue_max(i, j)
-XStandardColormap* i;
-int j;
+void set_XStandardColormap_blue_max(XStandardColormap *i, int j)
 {
           i->blue_max = j;
 }
 
-int  XStandardColormap_green_mult(i)
-XStandardColormap* i;
+int  XStandardColormap_green_mult(XStandardColormap *i)
 {
           return(i->green_mult);
 }
 
-void set_XStandardColormap_green_mult(i, j)
-XStandardColormap* i;
-int j;
+void set_XStandardColormap_green_mult(XStandardColormap *i, int j)
 {
           i->green_mult = j;
 }
 
-int  XStandardColormap_green_max(i)
-XStandardColormap* i;
+int  XStandardColormap_green_max(XStandardColormap *i)
 {
           return(i->green_max);
 }
 
-void set_XStandardColormap_green_max(i, j)
-XStandardColormap* i;
-int j;
+void set_XStandardColormap_green_max(XStandardColormap *i, int j)
 {
           i->green_max = j;
 }
 
-int  XStandardColormap_red_mult(i)
-XStandardColormap* i;
+int  XStandardColormap_red_mult(XStandardColormap *i)
 {
           return(i->red_mult);
 }
 
-void set_XStandardColormap_red_mult(i, j)
-XStandardColormap* i;
-int j;
+void set_XStandardColormap_red_mult(XStandardColormap *i, int j)
 {
           i->red_mult = j;
 }
 
-int  XStandardColormap_red_max(i)
-XStandardColormap* i;
+int  XStandardColormap_red_max(XStandardColormap *i)
 {
           return(i->red_max);
 }
 
-void set_XStandardColormap_red_max(i, j)
-XStandardColormap* i;
-int j;
+void set_XStandardColormap_red_max(XStandardColormap *i, int j)
 {
           i->red_max = j;
 }
 
-int  XStandardColormap_colormap(i)
-XStandardColormap* i;
+int  XStandardColormap_colormap(XStandardColormap *i)
 {
           return(i->colormap);
 }
 
-void set_XStandardColormap_colormap(i, j)
-XStandardColormap* i;
-int j;
+void set_XStandardColormap_colormap(XStandardColormap *i, int j)
 {
           i->colormap = j;
 }

Index: xgcl-2/XStruct-4.c
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/XStruct-4.c,v
retrieving revision 1.1.1.1.2.1.18.1
retrieving revision 1.1.1.1.2.1.18.2
diff -u -b -r1.1.1.1.2.1.18.1 -r1.1.1.1.2.1.18.2
--- xgcl-2/XStruct-4.c  5 Jan 2006 17:55:35 -0000       1.1.1.1.2.1.18.1
+++ xgcl-2/XStruct-4.c  20 Jun 2006 23:00:10 -0000      1.1.1.1.2.1.18.2
@@ -27,61 +27,49 @@
 #include <X11/Xutil.h>
 
 #include "include.h"
-
+#define int fixnum
 /********* XExtCodes funcions *****/
 
-int  make_XExtCodes (){
+int  make_XExtCodes (void) {
           return ((int) calloc(1, sizeof(XExtCodes)));
 }
 
-int  XExtCodes_first_error(i)
-XExtCodes* i;
+int  XExtCodes_first_error(XExtCodes *i)
 {
           return(i->first_error);
 }
 
-void set_XExtCodes_first_error(i, j)
-XExtCodes* i;
-int j;
+void set_XExtCodes_first_error(XExtCodes *i, int j)
 {
           i->first_error = j;
 }
 
-int  XExtCodes_first_event(i)
-XExtCodes* i;
+int  XExtCodes_first_event(XExtCodes *i)
 {
           return(i->first_event);
 }
 
-void set_XExtCodes_first_event(i, j)
-XExtCodes* i;
-int j;
+void set_XExtCodes_first_event(XExtCodes *i, int j)
 {
           i->first_event = j;
 }
 
-int  XExtCodes_major_opcode(i)
-XExtCodes* i;
+int  XExtCodes_major_opcode(XExtCodes *i)
 {
           return(i->major_opcode);
 }
 
-void set_XExtCodes_major_opcode(i, j)
-XExtCodes* i;
-int j;
+void set_XExtCodes_major_opcode(XExtCodes *i, int j)
 {
           i->major_opcode = j;
 }
 
-int  XExtCodes_extension(i)
-XExtCodes* i;
+int  XExtCodes_extension(XExtCodes *i)
 {
           return(i->extension);
 }
 
-void set_XExtCodes_extension(i, j)
-XExtCodes* i;
-int j;
+void set_XExtCodes_extension(XExtCodes *i, int j)
 {
           i->extension = j;
 }
@@ -89,45 +77,36 @@
 
 /********* XPixmapFormatValues funcions *****/
 
-int  make_XPixmapFormatValues (){
+int  make_XPixmapFormatValues (void) {
           return ((int) calloc(1, sizeof(XPixmapFormatValues)));
 }
 
-int  XPixmapFormatValues_scanline_pad(i)
-XPixmapFormatValues* i;
+int  XPixmapFormatValues_scanline_pad(XPixmapFormatValues *i)
 {
           return(i->scanline_pad);
 }
 
-void set_XPixmapFormatValues_scanline_pad(i, j)
-XPixmapFormatValues* i;
-int j;
+void set_XPixmapFormatValues_scanline_pad(XPixmapFormatValues *i, int j)
 {
           i->scanline_pad = j;
 }
 
-int  XPixmapFormatValues_bits_per_pixel(i)
-XPixmapFormatValues* i;
+int  XPixmapFormatValues_bits_per_pixel(XPixmapFormatValues *i)
 {
           return(i->bits_per_pixel);
 }
 
-void set_XPixmapFormatValues_bits_per_pixel(i, j)
-XPixmapFormatValues* i;
-int j;
+void set_XPixmapFormatValues_bits_per_pixel(XPixmapFormatValues *i, int j)
 {
           i->bits_per_pixel = j;
 }
 
-int  XPixmapFormatValues_depth(i)
-XPixmapFormatValues* i;
+int  XPixmapFormatValues_depth(XPixmapFormatValues *i)
 {
           return(i->depth);
 }
 
-void set_XPixmapFormatValues_depth(i, j)
-XPixmapFormatValues* i;
-int j;
+void set_XPixmapFormatValues_depth(XPixmapFormatValues *i, int j)
 {
           i->depth = j;
 }
@@ -135,305 +114,236 @@
 
 /********* XGCValues funcions *****/
 
-int  make_XGCValues (){
+int  make_XGCValues (void) {
           return ((int) calloc(1, sizeof(XGCValues)));
 }
 
-char XGCValues_dashes(i)
-XGCValues* i;
+char XGCValues_dashes(XGCValues *i)
 {
           return(i->dashes);
 }
 
-void set_XGCValues_dashes(i, j)
-XGCValues* i;
-char j;
+void set_XGCValues_dashes(XGCValues *i, char j)
 {
           i->dashes = j;
 }
 
-int  XGCValues_dash_offset(i)
-XGCValues* i;
+int  XGCValues_dash_offset(XGCValues *i)
 {
           return(i->dash_offset);
 }
 
-void set_XGCValues_dash_offset(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_dash_offset(XGCValues *i, int j)
 {
           i->dash_offset = j;
 }
 
-int  XGCValues_clip_mask(i)
-XGCValues* i;
+int  XGCValues_clip_mask(XGCValues *i)
 {
           return(i->clip_mask);
 }
 
-void set_XGCValues_clip_mask(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_clip_mask(XGCValues *i, int j)
 {
           i->clip_mask = j;
 }
 
-int  XGCValues_clip_y_origin(i)
-XGCValues* i;
+int  XGCValues_clip_y_origin(XGCValues *i)
 {
           return(i->clip_y_origin);
 }
 
-void set_XGCValues_clip_y_origin(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_clip_y_origin(XGCValues *i, int j)
 {
           i->clip_y_origin = j;
 }
 
-int  XGCValues_clip_x_origin(i)
-XGCValues* i;
+int  XGCValues_clip_x_origin(XGCValues *i)
 {
           return(i->clip_x_origin);
 }
 
-void set_XGCValues_clip_x_origin(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_clip_x_origin(XGCValues *i, int j)
 {
           i->clip_x_origin = j;
 }
 
-int  XGCValues_graphics_exposures(i)
-XGCValues* i;
+int  XGCValues_graphics_exposures(XGCValues *i)
 {
           return(i->graphics_exposures);
 }
 
-void set_XGCValues_graphics_exposures(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_graphics_exposures(XGCValues *i, int j)
 {
           i->graphics_exposures = j;
 }
 
-int  XGCValues_subwindow_mode(i)
-XGCValues* i;
+int  XGCValues_subwindow_mode(XGCValues *i)
 {
           return(i->subwindow_mode);
 }
 
-void set_XGCValues_subwindow_mode(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_subwindow_mode(XGCValues *i, int j)
 {
           i->subwindow_mode = j;
 }
 
-int  XGCValues_font(i)
-XGCValues* i;
+int  XGCValues_font(XGCValues *i)
 {
           return(i->font);
 }
 
-void set_XGCValues_font(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_font(XGCValues *i, int j)
 {
           i->font = j;
 }
 
-int  XGCValues_ts_y_origin(i)
-XGCValues* i;
+int  XGCValues_ts_y_origin(XGCValues *i)
 {
           return(i->ts_y_origin);
 }
 
-void set_XGCValues_ts_y_origin(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_ts_y_origin(XGCValues *i, int j)
 {
           i->ts_y_origin = j;
 }
 
-int  XGCValues_ts_x_origin(i)
-XGCValues* i;
+int  XGCValues_ts_x_origin(XGCValues *i)
 {
           return(i->ts_x_origin);
 }
 
-void set_XGCValues_ts_x_origin(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_ts_x_origin(XGCValues *i, int j)
 {
           i->ts_x_origin = j;
 }
 
-int  XGCValues_stipple(i)
-XGCValues* i;
+int  XGCValues_stipple(XGCValues *i)
 {
           return(i->stipple);
 }
 
-void set_XGCValues_stipple(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_stipple(XGCValues *i, int j)
 {
           i->stipple = j;
 }
 
-int  XGCValues_tile(i)
-XGCValues* i;
+int  XGCValues_tile(XGCValues *i)
 {
           return(i->tile);
 }
 
-void set_XGCValues_tile(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_tile(XGCValues *i, int j)
 {
           i->tile = j;
 }
 
-int  XGCValues_arc_mode(i)
-XGCValues* i;
+int  XGCValues_arc_mode(XGCValues *i)
 {
           return(i->arc_mode);
 }
 
-void set_XGCValues_arc_mode(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_arc_mode(XGCValues *i, int j)
 {
           i->arc_mode = j;
 }
 
-int  XGCValues_fill_rule(i)
-XGCValues* i;
+int  XGCValues_fill_rule(XGCValues *i)
 {
           return(i->fill_rule);
 }
 
-void set_XGCValues_fill_rule(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_fill_rule(XGCValues *i, int j)
 {
           i->fill_rule = j;
 }
 
-int  XGCValues_fill_style(i)
-XGCValues* i;
+int  XGCValues_fill_style(XGCValues *i)
 {
           return(i->fill_style);
 }
 
-void set_XGCValues_fill_style(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_fill_style(XGCValues *i, int j)
 {
           i->fill_style = j;
 }
 
-int  XGCValues_join_style(i)
-XGCValues* i;
+int  XGCValues_join_style(XGCValues *i)
 {
           return(i->join_style);
 }
 
-void set_XGCValues_join_style(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_join_style(XGCValues *i, int j)
 {
           i->join_style = j;
 }
 
-int  XGCValues_cap_style(i)
-XGCValues* i;
+int  XGCValues_cap_style(XGCValues *i)
 {
           return(i->cap_style);
 }
 
-void set_XGCValues_cap_style(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_cap_style(XGCValues *i, int j)
 {
           i->cap_style = j;
 }
 
-int  XGCValues_line_style(i)
-XGCValues* i;
+int  XGCValues_line_style(XGCValues *i)
 {
           return(i->line_style);
 }
 
-void set_XGCValues_line_style(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_line_style(XGCValues *i, int j)
 {
           i->line_style = j;
 }
 
-int  XGCValues_line_width(i)
-XGCValues* i;
+int  XGCValues_line_width(XGCValues *i)
 {
           return(i->line_width);
 }
 
-void set_XGCValues_line_width(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_line_width(XGCValues *i, int j)
 {
           i->line_width = j;
 }
 
-int  XGCValues_background(i)
-XGCValues* i;
+int  XGCValues_background(XGCValues *i)
 {
           return(i->background);
 }
 
-void set_XGCValues_background(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_background(XGCValues *i, int j)
 {
           i->background = j;
 }
 
-int  XGCValues_foreground(i)
-XGCValues* i;
+int  XGCValues_foreground(XGCValues *i)
 {
           return(i->foreground);
 }
 
-void set_XGCValues_foreground(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_foreground(XGCValues *i, int j)
 {
           i->foreground = j;
 }
 
-int  XGCValues_plane_mask(i)
-XGCValues* i;
+int  XGCValues_plane_mask(XGCValues *i)
 {
           return(i->plane_mask);
 }
 
-void set_XGCValues_plane_mask(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_plane_mask(XGCValues *i, int j)
 {
           i->plane_mask = j;
 }
 
-int  XGCValues_function(i)
-XGCValues* i;
+int  XGCValues_function(XGCValues *i)
 {
           return(i->function);
 }
 
-void set_XGCValues_function(i, j)
-XGCValues* i;
-int j;
+void set_XGCValues_function(XGCValues *i, int j)
 {
           i->function = j;
 }
@@ -528,110 +438,86 @@
 
 /********* Visual funcions *****/
 
-int  make_Visual (){
+int  make_Visual (void) {
           return ((int) calloc(1, sizeof(Visual)));
 }
 
-int  Visual_map_entries(i)
-Visual* i;
+int  Visual_map_entries(Visual *i)
 {
           return(i->map_entries);
 }
 
-void set_Visual_map_entries(i, j)
-Visual* i;
-int j;
+void set_Visual_map_entries(Visual *i, int j)
 {
           i->map_entries = j;
 }
 
-int  Visual_bits_per_rgb(i)
-Visual* i;
+int  Visual_bits_per_rgb(Visual *i)
 {
           return(i->bits_per_rgb);
 }
 
-void set_Visual_bits_per_rgb(i, j)
-Visual* i;
-int j;
+void set_Visual_bits_per_rgb(Visual *i, int j)
 {
           i->bits_per_rgb = j;
 }
 
-int   Visual_blue_mask(i)
-Visual* i;
+int   Visual_blue_mask(Visual *i)
 {
           return(i->blue_mask);
 }
 
-void set_Visual_blue_mask(i, j)
-Visual* i;
-int j;
+void set_Visual_blue_mask(Visual *i, int j)
 {
           i->blue_mask = j;
 }
 
-int  Visual_green_mask(i)
-Visual* i;
+int  Visual_green_mask(Visual *i)
 {
           return(i->green_mask);
 }
 
-void set_Visual_green_mask(i, j)
-Visual* i;
-int j;
+void set_Visual_green_mask(Visual *i, int j)
 {
           i->green_mask = j;
 }
 
-int  Visual_red_mask(i)
-Visual* i;
+int  Visual_red_mask(Visual *i)
 {
           return(i->red_mask);
 }
 
-void set_Visual_red_mask(i, j)
-Visual* i;
-int j;
+void set_Visual_red_mask(Visual *i, int j)
 {
           i->red_mask = j;
 }
 
-int  Visual_class(i)
-Visual* i;
+int  Visual_class(Visual *i)
 {
           return(i->class);
 }
 
-void set_Visual_class(i, j)
-Visual* i;
-int j;
+void set_Visual_class(Visual *i, int j)
 {
           i->class = j;
 }
 
-int  Visual_visualid(i)
-Visual* i;
+int  Visual_visualid(Visual *i)
 {
           return(i->visualid);
 }
 
-void set_Visual_visualid(i, j)
-Visual* i;
-int j;
+void set_Visual_visualid(Visual *i, int j)
 {
           i->visualid = j;
 }
 
-XExtData *Visual_ext_data(i)
-Visual* i;
+XExtData *Visual_ext_data(Visual *i)
 {
           return(i->ext_data);
 }
 
-void set_Visual_ext_data(i, j)
-Visual* i;
-XExtData *j;
+void set_Visual_ext_data(Visual *i, XExtData *j)
 {
           i->ext_data = j;
 }
@@ -639,45 +525,36 @@
 
 /********* Depth funcions *****/
 
-int  make_Depth (){
+int  make_Depth (void) {
           return ((int) calloc(1, sizeof(Depth)));
 }
 
-Visual *Depth_visuals(i)
-Depth* i;
+Visual *Depth_visuals(Depth *i)
 {
           return(i->visuals);
 }
 
-void set_Depth_visuals(i, j)
-Depth* i;
-Visual *j;
+void set_Depth_visuals(Depth *i, Visual *j)
 {
           i->visuals = j;
 }
 
-int  Depth_nvisuals(i)
-Depth* i;
+int  Depth_nvisuals(Depth *i)
 {
           return(i->nvisuals);
 }
 
-void set_Depth_nvisuals(i, j)
-Depth* i;
-int j;
+void set_Depth_nvisuals(Depth *i, int j)
 {
           i->nvisuals = j;
 }
 
-int  Depth_depth(i)
-Depth* i;
+int  Depth_depth(Depth *i)
 {
           return(i->depth);
 }
 
-void set_Depth_depth(i, j)
-Depth* i;
-int j;
+void set_Depth_depth(Depth *i, int j)
 {
           i->depth = j;
 }
@@ -685,266 +562,206 @@
 
 /********* Screen funcions *****/
 
-int  make_Screen (){
+int  make_Screen (void) {
           return ((int) calloc(1, sizeof(Screen)));
 }
 
-int  Screen_root_input_mask(i)
-Screen* i;
+int  Screen_root_input_mask(Screen *i)
 {
           return(i->root_input_mask);
 }
 
-void set_Screen_root_input_mask(i, j)
-Screen* i;
-int j;
+void set_Screen_root_input_mask(Screen *i, int j)
 {
           i->root_input_mask = j;
 }
 
-int  Screen_save_unders(i)
-Screen* i;
+int  Screen_save_unders(Screen *i)
 {
           return(i->save_unders);
 }
 
-void set_Screen_save_unders(i, j)
-Screen* i;
-int j;
+void set_Screen_save_unders(Screen *i, int j)
 {
           i->save_unders = j;
 }
 
-int  Screen_backing_store(i)
-Screen* i;
+int  Screen_backing_store(Screen *i)
 {
           return(i->backing_store);
 }
 
-void set_Screen_backing_store(i, j)
-Screen* i;
-int j;
+void set_Screen_backing_store(Screen *i, int j)
 {
           i->backing_store = j;
 }
 
-int  Screen_min_maps(i)
-Screen* i;
+int  Screen_min_maps(Screen *i)
 {
           return(i->min_maps);
 }
 
-void set_Screen_min_maps(i, j)
-Screen* i;
-int j;
+void set_Screen_min_maps(Screen *i, int j)
 {
           i->min_maps = j;
 }
 
-int  Screen_max_maps(i)
-Screen* i;
+int  Screen_max_maps(Screen *i)
 {
           return(i->max_maps);
 }
 
-void set_Screen_max_maps(i, j)
-Screen* i;
-int j;
+void set_Screen_max_maps(Screen *i, int j)
 {
           i->max_maps = j;
 }
 
-int  Screen_black_pixel(i)
-Screen* i;
+int  Screen_black_pixel(Screen *i)
 {
           return(i->black_pixel);
 }
 
-void set_Screen_black_pixel(i, j)
-Screen* i;
-int j;
+void set_Screen_black_pixel(Screen *i, int j)
 {
           i->black_pixel = j;
 }
 
-int  Screen_white_pixel(i)
-Screen* i;
+int  Screen_white_pixel(Screen *i)
 {
           return(i->white_pixel);
 }
 
-void set_Screen_white_pixel(i, j)
-Screen* i;
-int j;
+void set_Screen_white_pixel(Screen *i, int j)
 {
           i->white_pixel = j;
 }
 
-int  Screen_cmap(i)
-Screen* i;
+int  Screen_cmap(Screen *i)
 {
           return(i->cmap);
 }
 
-void set_Screen_cmap(i, j)
-Screen* i;
-int j;
+void set_Screen_cmap(Screen *i, int j)
 {
           i->cmap = j;
 }
 
-GC  Screen_default_gc(i)
-Screen* i;
+GC  Screen_default_gc(Screen *i)
 {
           return(i->default_gc);
 }
 
-void set_Screen_default_gc(i, j)
-Screen* i;
-GC j;
+void set_Screen_default_gc(Screen *i, GC j)
 {
           i->default_gc = j;
 }
 
-Visual *Screen_root_visual(i)
-Screen* i;
+Visual *Screen_root_visual(Screen *i)
 {
           return(i->root_visual);
 }
 
-void set_Screen_root_visual(i, j)
-Screen* i;
-Visual *j;
+void set_Screen_root_visual(Screen *i, Visual *j)
 {
           i->root_visual = j;
 }
 
-int  Screen_root_depth(i)
-Screen* i;
+int  Screen_root_depth(Screen *i)
 {
           return(i->root_depth);
 }
 
-void set_Screen_root_depth(i, j)
-Screen* i;
-int j;
+void set_Screen_root_depth(Screen *i, int j)
 {
           i->root_depth = j;
 }
 
-Depth *Screen_depths(i)
-Screen* i;
+Depth *Screen_depths(Screen *i)
 {
           return(i->depths);
 }
 
-void set_Screen_depths(i, j)
-Screen* i;
-Depth *j;
+void set_Screen_depths(Screen *i, Depth *j)
 {
           i->depths = j;
 }
 
-int  Screen_ndepths(i)
-Screen* i;
+int  Screen_ndepths(Screen *i)
 {
           return(i->ndepths);
 }
 
-void set_Screen_ndepths(i, j)
-Screen* i;
-int j;
+void set_Screen_ndepths(Screen *i, int j)
 {
           i->ndepths = j;
 }
 
-int  Screen_mheight(i)
-Screen* i;
+int  Screen_mheight(Screen *i)
 {
           return(i->mheight);
 }
 
-void set_Screen_mheight(i, j)
-Screen* i;
-int j;
+void set_Screen_mheight(Screen *i, int j)
 {
           i->mheight = j;
 }
 
-int  Screen_mwidth(i)
-Screen* i;
+int  Screen_mwidth(Screen *i)
 {
           return(i->mwidth);
 }
 
-void set_Screen_mwidth(i, j)
-Screen* i;
-int j;
+void set_Screen_mwidth(Screen *i, int j)
 {
           i->mwidth = j;
 }
 
-int  Screen_height(i)
-Screen* i;
+int  Screen_height(Screen *i)
 {
           return(i->height);
 }
 
-void set_Screen_height(i, j)
-Screen* i;
-int j;
+void set_Screen_height(Screen *i, int j)
 {
           i->height = j;
 }
 
-int  Screen_width(i)
-Screen* i;
+int  Screen_width(Screen *i)
 {
           return(i->width);
 }
 
-void set_Screen_width(i, j)
-Screen* i;
-int j;
+void set_Screen_width(Screen *i, int j)
 {
           i->width = j;
 }
 
-int  Screen_root(i)
-Screen* i;
+int  Screen_root(Screen *i)
 {
           return(i->root);
 }
 
-void set_Screen_root(i, j)
-Screen* i;
-int j;
+void set_Screen_root(Screen *i, int j)
 {
           i->root = j;
 }
 
-Display *Screen_display(i)
-Screen* i;
+Display *Screen_display(Screen *i)
 {
           return(i->display);
 }
 
-void set_Screen_display(i, j)
-Screen* i;
-Display *j;
+void set_Screen_display(Screen *i, Display *j)
 {
            i->display = j;
 }
 
-XExtData *Screen_ext_data(i)
-Screen* i;
+XExtData *Screen_ext_data(Screen *i)
 {
           return(i->ext_data);
 }
 
-void set_Screen_ext_data(i, j)
-Screen* i;
-XExtData *j;
+void set_Screen_ext_data(Screen *i, XExtData *j)
 {
           i->ext_data = j;
 }
@@ -952,58 +769,46 @@
 
 /********* ScreenFormat funcions *****/
 
-int  make_ScreenFormat (){
+int  make_ScreenFormat (void) {
           return ((int) calloc(1, sizeof(ScreenFormat)));
 }
 
-int  ScreenFormat_scanline_pad(i)
-ScreenFormat* i;
+int  ScreenFormat_scanline_pad(ScreenFormat *i)
 {
           return(i->scanline_pad);
 }
 
-void set_ScreenFormat_scanline_pad(i, j)
-ScreenFormat* i;
-int j;
+void set_ScreenFormat_scanline_pad(ScreenFormat *i, int j)
 {
           i->scanline_pad = j;
 }
 
-int  ScreenFormat_bits_per_pixel(i)
-ScreenFormat* i;
+int  ScreenFormat_bits_per_pixel(ScreenFormat *i)
 {
           return(i->bits_per_pixel);
 }
 
-void set_ScreenFormat_bits_per_pixel(i, j)
-ScreenFormat* i;
-int j;
+void set_ScreenFormat_bits_per_pixel(ScreenFormat *i, int j)
 {
           i->bits_per_pixel = j;
 }
 
-int  ScreenFormat_depth(i)
-ScreenFormat* i;
+int  ScreenFormat_depth(ScreenFormat *i)
 {
           return(i->depth);
 }
 
-void set_ScreenFormat_depth(i, j)
-ScreenFormat* i;
-int j;
+void set_ScreenFormat_depth(ScreenFormat *i, int j)
 {
           i->depth = j;
 }
 
-XExtData *ScreenFormat_ext_data(i)
-ScreenFormat* i;
+XExtData *ScreenFormat_ext_data(ScreenFormat *i)
 {
           return(i->ext_data);
 }
 
-void set_ScreenFormat_ext_data(i, j)
-ScreenFormat* i;
-XExtData *j;
+void set_ScreenFormat_ext_data(ScreenFormat *i, XExtData *j)
 {
           i->ext_data = j;
 }
@@ -1011,201 +816,156 @@
 
 /********* XSetWindowAttributes funcions *****/
 
-int  make_XSetWindowAttributes (){
+int  make_XSetWindowAttributes (void) {
           return ((int) calloc(1, sizeof(XSetWindowAttributes)));
 }
 
-int  XSetWindowAttributes_cursor(i)
-XSetWindowAttributes* i;
+int  XSetWindowAttributes_cursor(XSetWindowAttributes *i)
 {
           return(i->cursor);
 }
 
-void set_XSetWindowAttributes_cursor(i, j)
-XSetWindowAttributes* i;
-int j;
+void set_XSetWindowAttributes_cursor(XSetWindowAttributes *i, int j)
 {
           i->cursor = j;
 }
 
-int  XSetWindowAttributes_colormap(i)
-XSetWindowAttributes* i;
+int  XSetWindowAttributes_colormap(XSetWindowAttributes *i)
 {
           return(i->colormap);
 }
 
-void set_XSetWindowAttributes_colormap(i, j)
-XSetWindowAttributes* i;
-int j;
+void set_XSetWindowAttributes_colormap(XSetWindowAttributes *i, int j)
 {
           i->colormap = j;
 }
 
-int  XSetWindowAttributes_override_redirect(i)
-XSetWindowAttributes* i;
+int  XSetWindowAttributes_override_redirect(XSetWindowAttributes *i)
 {
           return(i->override_redirect);
 }
 
-void set_XSetWindowAttributes_override_redirect(i, j)
-XSetWindowAttributes* i;
-int j;
+void set_XSetWindowAttributes_override_redirect(XSetWindowAttributes *i, int j)
 {
           i->override_redirect = j;
 }
 
-int  XSetWindowAttributes_do_not_propagate_mask(i)
-XSetWindowAttributes* i;
+int  XSetWindowAttributes_do_not_propagate_mask(XSetWindowAttributes *i)
 {
           return(i->do_not_propagate_mask);
 }
 
-void set_XSetWindowAttributes_do_not_propagate_mask(i, j)
-XSetWindowAttributes* i;
-int j;
+void set_XSetWindowAttributes_do_not_propagate_mask(XSetWindowAttributes *i, 
int j)
 {
           i->do_not_propagate_mask = j;
 }
 
-int  XSetWindowAttributes_event_mask(i)
-XSetWindowAttributes* i;
+int  XSetWindowAttributes_event_mask(XSetWindowAttributes *i)
 {
           return(i->event_mask);
 }
 
-void set_XSetWindowAttributes_event_mask(i, j)
-XSetWindowAttributes* i;
-int j;
+void set_XSetWindowAttributes_event_mask(XSetWindowAttributes *i, int j)
 {
           i->event_mask = j;
 }
 
-int  XSetWindowAttributes_save_under(i)
-XSetWindowAttributes* i;
+int  XSetWindowAttributes_save_under(XSetWindowAttributes *i)
 {
           return(i->save_under);
 }
 
-void set_XSetWindowAttributes_save_under(i, j)
-XSetWindowAttributes* i;
-int j;
+void set_XSetWindowAttributes_save_under(XSetWindowAttributes *i, int j)
 {
           i->save_under = j;
 }
 
-int  XSetWindowAttributes_backing_pixel(i)
-XSetWindowAttributes* i;
+int  XSetWindowAttributes_backing_pixel(XSetWindowAttributes *i)
 {
           return(i->backing_pixel);
 }
 
-void set_XSetWindowAttributes_backing_pixel(i, j)
-XSetWindowAttributes* i;
-int j;
+void set_XSetWindowAttributes_backing_pixel(XSetWindowAttributes *i, int j)
 {
           i->backing_pixel = j;
 }
 
-int  XSetWindowAttributes_backing_planes(i)
-XSetWindowAttributes* i;
+int  XSetWindowAttributes_backing_planes(XSetWindowAttributes *i)
 {
           return(i->backing_planes);
 }
 
-void set_XSetWindowAttributes_backing_planes(i, j)
-XSetWindowAttributes* i;
-int j;
+void set_XSetWindowAttributes_backing_planes(XSetWindowAttributes *i, int j)
 {
           i->backing_planes = j;
 }
 
-int  XSetWindowAttributes_backing_store(i)
-XSetWindowAttributes* i;
+int  XSetWindowAttributes_backing_store(XSetWindowAttributes *i)
 {
           return(i->backing_store);
 }
 
-void set_XSetWindowAttributes_backing_store(i, j)
-XSetWindowAttributes* i;
-int j;
+void set_XSetWindowAttributes_backing_store(XSetWindowAttributes *i, int j)
 {
           i->backing_store = j;
 }
 
-int  XSetWindowAttributes_win_gravity(i)
-XSetWindowAttributes* i;
+int  XSetWindowAttributes_win_gravity(XSetWindowAttributes *i)
 {
           return(i->win_gravity);
 }
 
-void set_XSetWindowAttributes_win_gravity(i, j)
-XSetWindowAttributes* i;
-int j;
+void set_XSetWindowAttributes_win_gravity(XSetWindowAttributes *i, int j)
 {
           i->win_gravity = j;
 }
 
-int  XSetWindowAttributes_bit_gravity(i)
-XSetWindowAttributes* i;
+int  XSetWindowAttributes_bit_gravity(XSetWindowAttributes *i)
 {
           return(i->bit_gravity);
 }
 
-void set_XSetWindowAttributes_bit_gravity(i, j)
-XSetWindowAttributes* i;
-int j;
+void set_XSetWindowAttributes_bit_gravity(XSetWindowAttributes *i, int j)
 {
           i->bit_gravity = j;
 }
 
-int  XSetWindowAttributes_border_pixel(i)
-XSetWindowAttributes* i;
+int  XSetWindowAttributes_border_pixel(XSetWindowAttributes *i)
 {
           return(i->border_pixel);
 }
 
-void set_XSetWindowAttributes_border_pixel(i, j)
-XSetWindowAttributes* i;
-int j;
+void set_XSetWindowAttributes_border_pixel(XSetWindowAttributes *i, int j)
 {
           i->border_pixel = j;
 }
 
-int  XSetWindowAttributes_border_pixmap(i)
-XSetWindowAttributes* i;
+int  XSetWindowAttributes_border_pixmap(XSetWindowAttributes *i)
 {
           return(i->border_pixmap);
 }
 
-void set_XSetWindowAttributes_border_pixmap(i, j)
-XSetWindowAttributes* i;
-int j;
+void set_XSetWindowAttributes_border_pixmap(XSetWindowAttributes *i, int j)
 {
           i->border_pixmap = j;
 }
 
-int  XSetWindowAttributes_background_pixel(i)
-XSetWindowAttributes* i;
+int  XSetWindowAttributes_background_pixel(XSetWindowAttributes *i)
 {
           return(i->background_pixel);
 }
 
-void set_XSetWindowAttributes_background_pixel(i, j)
-XSetWindowAttributes* i;
-int j;
+void set_XSetWindowAttributes_background_pixel(XSetWindowAttributes *i, int j)
 {
           i->background_pixel = j;
 }
 
-int  XSetWindowAttributes_background_pixmap(i)
-XSetWindowAttributes* i;
+int  XSetWindowAttributes_background_pixmap(XSetWindowAttributes *i)
 {
           return(i->background_pixmap);
 }
 
-void set_XSetWindowAttributes_background_pixmap(i, j)
-XSetWindowAttributes* i;
-int j;
+void set_XSetWindowAttributes_background_pixmap(XSetWindowAttributes *i, int j)
 {
           i->background_pixmap = j;
 }
@@ -1213,305 +973,236 @@
 
 /********* XWindowAttributes funcions *****/
 
-int  make_XWindowAttributes (){
+int  make_XWindowAttributes (void) {
           return ((int) calloc(1, sizeof(XWindowAttributes)));
 }
 
-Screen *XWindowAttributes_screen(i)
-XWindowAttributes* i;
+Screen *XWindowAttributes_screen(XWindowAttributes *i)
 {
           return(i->screen);
 }
 
-void set_XWindowAttributes_screen(i, j)
-XWindowAttributes* i;
-Screen *j;
+void set_XWindowAttributes_screen(XWindowAttributes *i, Screen *j)
 {
           i->screen = j;
 }
 
-int  XWindowAttributes_override_redirect(i)
-XWindowAttributes* i;
+int  XWindowAttributes_override_redirect(XWindowAttributes *i)
 {
           return(i->override_redirect);
 }
 
-void set_XWindowAttributes_override_redirect(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_override_redirect(XWindowAttributes *i, int j)
 {
           i->override_redirect = j;
 }
 
-int  XWindowAttributes_do_not_propagate_mask(i)
-XWindowAttributes* i;
+int  XWindowAttributes_do_not_propagate_mask(XWindowAttributes *i)
 {
           return(i->do_not_propagate_mask);
 }
 
-void set_XWindowAttributes_do_not_propagate_mask(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_do_not_propagate_mask(XWindowAttributes *i, int j)
 {
           i->do_not_propagate_mask = j;
 }
 
-int  XWindowAttributes_your_event_mask(i)
-XWindowAttributes* i;
+int  XWindowAttributes_your_event_mask(XWindowAttributes *i)
 {
           return(i->your_event_mask);
 }
 
-void set_XWindowAttributes_your_event_mask(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_your_event_mask(XWindowAttributes *i, int j)
 {
           i->your_event_mask = j;
 }
 
-int  XWindowAttributes_all_event_masks(i)
-XWindowAttributes* i;
+int  XWindowAttributes_all_event_masks(XWindowAttributes *i)
 {
           return(i->all_event_masks);
 }
 
-void set_XWindowAttributes_all_event_masks(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_all_event_masks(XWindowAttributes *i, int j)
 {
           i->all_event_masks = j;
 }
 
-int  XWindowAttributes_map_state(i)
-XWindowAttributes* i;
+int  XWindowAttributes_map_state(XWindowAttributes *i)
 {
           return(i->map_state);
 }
 
-void set_XWindowAttributes_map_state(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_map_state(XWindowAttributes *i, int j)
 {
           i->map_state = j;
 }
 
-int  XWindowAttributes_map_installed(i)
-XWindowAttributes* i;
+int  XWindowAttributes_map_installed(XWindowAttributes *i)
 {
           return(i->map_installed);
 }
 
-void set_XWindowAttributes_map_installed(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_map_installed(XWindowAttributes *i, int j)
 {
           i->map_installed = j;
 }
 
-int  XWindowAttributes_colormap(i)
-XWindowAttributes* i;
+int  XWindowAttributes_colormap(XWindowAttributes *i)
 {
           return(i->colormap);
 }
 
-void set_XWindowAttributes_colormap(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_colormap(XWindowAttributes *i, int j)
 {
           i->colormap = j;
 }
 
-int  XWindowAttributes_save_under(i)
-XWindowAttributes* i;
+int  XWindowAttributes_save_under(XWindowAttributes *i)
 {
           return(i->save_under);
 }
 
-void set_XWindowAttributes_save_under(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_save_under(XWindowAttributes *i, int j)
 {
           i->save_under = j;
 }
 
-int  XWindowAttributes_backing_pixel(i)
-XWindowAttributes* i;
+int  XWindowAttributes_backing_pixel(XWindowAttributes *i)
 {
           return(i->backing_pixel);
 }
 
-void set_XWindowAttributes_backing_pixel(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_backing_pixel(XWindowAttributes *i, int j)
 {
           i->backing_pixel = j;
 }
 
-int  XWindowAttributes_backing_planes(i)
-XWindowAttributes* i;
+int  XWindowAttributes_backing_planes(XWindowAttributes *i)
 {
           return(i->backing_planes);
 }
 
-void set_XWindowAttributes_backing_planes(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_backing_planes(XWindowAttributes *i, int j)
 {
           i->backing_planes = j;
 }
 
-int  XWindowAttributes_backing_store(i)
-XWindowAttributes* i;
+int  XWindowAttributes_backing_store(XWindowAttributes *i)
 {
           return(i->backing_store);
 }
 
-void set_XWindowAttributes_backing_store(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_backing_store(XWindowAttributes *i, int j)
 {
           i->backing_store = j;
 }
 
-int  XWindowAttributes_win_gravity(i)
-XWindowAttributes* i;
+int  XWindowAttributes_win_gravity(XWindowAttributes *i)
 {
           return(i->win_gravity);
 }
 
-void set_XWindowAttributes_win_gravity(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_win_gravity(XWindowAttributes *i, int j)
 {
           i->win_gravity = j;
 }
 
-int  XWindowAttributes_bit_gravity(i)
-XWindowAttributes* i;
+int  XWindowAttributes_bit_gravity(XWindowAttributes *i)
 {
           return(i->bit_gravity);
 }
 
-void set_XWindowAttributes_bit_gravity(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_bit_gravity(XWindowAttributes *i, int j)
 {
           i->bit_gravity = j;
 }
 
-int  XWindowAttributes_class(i)
-XWindowAttributes* i;
+int  XWindowAttributes_class(XWindowAttributes *i)
 {
           return(i->class);
 }
 
-void set_XWindowAttributes_class(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_class(XWindowAttributes *i, int j)
 {
           i->class = j;
 }
 
-int  XWindowAttributes_root(i)
-XWindowAttributes* i;
+int  XWindowAttributes_root(XWindowAttributes *i)
 {
           return(i->root);
 }
 
-void set_XWindowAttributes_root(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_root(XWindowAttributes *i, int j)
 {
           i->root = j;
 }
 
-Visual *XWindowAttributes_visual(i)
-XWindowAttributes* i;
+Visual *XWindowAttributes_visual(XWindowAttributes *i)
 {
           return(i->visual);
 }
 
-void set_XWindowAttributes_visual(i, j)
-XWindowAttributes* i;
-Visual *j;
+void set_XWindowAttributes_visual(XWindowAttributes *i, Visual *j)
 {
           i->visual = j;
 }
 
-int  XWindowAttributes_depth(i)
-XWindowAttributes* i;
+int  XWindowAttributes_depth(XWindowAttributes *i)
 {
           return(i->depth);
 }
 
-void set_XWindowAttributes_depth(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_depth(XWindowAttributes *i, int j)
 {
           i->depth = j;
 }
 
-int  XWindowAttributes_border_width(i)
-XWindowAttributes* i;
+int  XWindowAttributes_border_width(XWindowAttributes *i)
 {
           return(i->border_width);
 }
 
-void set_XWindowAttributes_border_width(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_border_width(XWindowAttributes *i, int j)
 {
           i->border_width = j;
 }
 
-int  XWindowAttributes_height(i)
-XWindowAttributes* i;
+int  XWindowAttributes_height(XWindowAttributes *i)
 {
           return(i->height);
 }
 
-void set_XWindowAttributes_height(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_height(XWindowAttributes *i, int j)
 {
           i->height = j;
 }
 
-int  XWindowAttributes_width(i)
-XWindowAttributes* i;
+int  XWindowAttributes_width(XWindowAttributes *i)
 {
           return(i->width);
 }
 
-void set_XWindowAttributes_width(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_width(XWindowAttributes *i, int j)
 {
           i->width = j;
 }
 
-int  XWindowAttributes_y(i)
-XWindowAttributes* i;
+int  XWindowAttributes_y(XWindowAttributes *i)
 {
           return(i->y);
 }
 
-void set_XWindowAttributes_y(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_y(XWindowAttributes *i, int j)
 {
           i->y = j;
 }
 
-int  XWindowAttributes_x(i)
-XWindowAttributes* i;
+int  XWindowAttributes_x(XWindowAttributes *i)
 {
           return(i->x);
 }
 
-void set_XWindowAttributes_x(i, j)
-XWindowAttributes* i;
-int j;
+void set_XWindowAttributes_x(XWindowAttributes *i, int j)
 {
           i->x = j;
 }
@@ -1519,45 +1210,36 @@
 
 /********* XHostAddress funcions *****/
 
-int  make_XHostAddress (){
+int  make_XHostAddress (void) {
           return ((int) calloc(1, sizeof(XHostAddress)));
 }
 
-char *XHostAddress_address(i)
-XHostAddress* i;
+char *XHostAddress_address(XHostAddress *i)
 {
           return(i->address);
 }
 
-void set_XHostAddress_address(i, j)
-XHostAddress* i;
-char *j;
+void set_XHostAddress_address(XHostAddress *i, char *j)
 {
           i->address = j;
 }
 
-int  XHostAddress_length(i)
-XHostAddress* i;
+int  XHostAddress_length(XHostAddress *i)
 {
           return(i->length);
 }
 
-void set_XHostAddress_length(i, j)
-XHostAddress* i;
-int j;
+void set_XHostAddress_length(XHostAddress *i, int j)
 {
           i->length = j;
 }
 
-int  XHostAddress_family(i)
-XHostAddress* i;
+int  XHostAddress_family(XHostAddress *i)
 {
           return(i->family);
 }
 
-void set_XHostAddress_family(i, j)
-XHostAddress* i;
-int j;
+void set_XHostAddress_family(XHostAddress *i, int j)
 {
           i->family = j;
 }
@@ -1565,214 +1247,166 @@
 
 /********* XImage funcions *****/
 
-int  make_XImage (){
+int  make_XImage (void) {
           return ((int) calloc(1, sizeof(XImage)));
 }
 
-XPointer XImage_obdata(i)
-XImage* i;
+XPointer XImage_obdata(XImage *i)
 {
           return(i->obdata);
 }
 
-void set_XImage_obdata(i, j)
-XImage* i;
-XPointer j;
+void set_XImage_obdata(XImage *i, XPointer j)
 {
           i->obdata = j;
 }
 
-int  XImage_blue_mask(i)
-XImage* i;
+int  XImage_blue_mask(XImage *i)
 {
           return(i->blue_mask);
 }
 
-void set_XImage_blue_mask(i, j)
-XImage* i;
-int j;
+void set_XImage_blue_mask(XImage *i, int j)
 {
           i->blue_mask = j;
 }
 
-int  XImage_green_mask(i)
-XImage* i;
+int  XImage_green_mask(XImage *i)
 {
           return(i->green_mask);
 }
 
-void set_XImage_green_mask(i, j)
-XImage* i;
-int j;
+void set_XImage_green_mask(XImage *i, int j)
 {
           i->green_mask = j;
 }
 
-int  XImage_red_mask(i)
-XImage* i;
+int  XImage_red_mask(XImage *i)
 {
           return(i->red_mask);
 }
 
-void set_XImage_red_mask(i, j)
-XImage* i;
-int j;
+void set_XImage_red_mask(XImage *i, int j)
 {
           i->red_mask = j;
 }
 
-int  XImage_bits_per_pixel(i)
-XImage* i;
+int  XImage_bits_per_pixel(XImage *i)
 {
           return(i->bits_per_pixel);
 }
 
-void set_XImage_bits_per_pixel(i, j)
-XImage* i;
-int j;
+void set_XImage_bits_per_pixel(XImage *i, int j)
 {
           i->bits_per_pixel = j;
 }
 
-int  XImage_bytes_per_line(i)
-XImage* i;
+int  XImage_bytes_per_line(XImage *i)
 {
           return(i->bytes_per_line);
 }
 
-void set_XImage_bytes_per_line(i, j)
-XImage* i;
-int j;
+void set_XImage_bytes_per_line(XImage *i, int j)
 {
           i->bytes_per_line = j;
 }
 
-int  XImage_depth(i)
-XImage* i;
+int  XImage_depth(XImage *i)
 {
           return(i->depth);
 }
 
-void set_XImage_depth(i, j)
-XImage* i;
-int j;
+void set_XImage_depth(XImage *i, int j)
 {
           i->depth = j;
 }
 
-int  XImage_bitmap_pad(i)
-XImage* i;
+int  XImage_bitmap_pad(XImage *i)
 {
           return(i->bitmap_pad);
 }
 
-void set_XImage_bitmap_pad(i, j)
-XImage* i;
-int j;
+void set_XImage_bitmap_pad(XImage *i, int j)
 {
           i->bitmap_pad = j;
 }
 
-int  XImage_bitmap_bit_order(i)
-XImage* i;
+int  XImage_bitmap_bit_order(XImage *i)
 {
           return(i->bitmap_bit_order);
 }
 
-void set_XImage_bitmap_bit_order(i, j)
-XImage* i;
-int j;
+void set_XImage_bitmap_bit_order(XImage *i, int j)
 {
           i->bitmap_bit_order = j;
 }
 
-int  XImage_bitmap_unit(i)
-XImage* i;
+int  XImage_bitmap_unit(XImage *i)
 {
           return(i->bitmap_unit);
 }
 
-void set_XImage_bitmap_unit(i, j)
-XImage* i;
-int j;
+void set_XImage_bitmap_unit(XImage *i, int j)
 {
           i->bitmap_unit = j;
 }
 
-int  XImage_byte_order(i)
-XImage* i;
+int  XImage_byte_order(XImage *i)
 {
           return(i->byte_order);
 }
 
-void set_XImage_byte_order(i, j)
-XImage* i;
-int j;
+void set_XImage_byte_order(XImage *i, int j)
 {
           i->byte_order = j;
 }
 
-char *XImage_data(i)
-XImage* i;
+char *XImage_data(XImage *i)
 {
           return(i->data);
 }
 
-void set_XImage_data(i, j)
-XImage* i;
-char *j;
+void set_XImage_data(XImage *i, char *j)
 {
           i->data = j;
 }
 
-int  XImage_format(i)
-XImage* i;
+int  XImage_format(XImage *i)
 {
           return(i->format);
 }
 
-void set_XImage_format(i, j)
-XImage* i;
-int j;
+void set_XImage_format(XImage *i, int j)
 {
           i->format = j;
 }
 
-int  XImage_xoffset(i)
-XImage* i;
+int  XImage_xoffset(XImage *i)
 {
           return(i->xoffset);
 }
 
-void set_XImage_xoffset(i, j)
-XImage* i;
-int j;
+void set_XImage_xoffset(XImage *i, int j)
 {
           i->xoffset = j;
 }
 
-int  XImage_height(i)
-XImage* i;
+int  XImage_height(XImage *i)
 {
           return(i->height);
 }
 
-void set_XImage_height(i, j)
-XImage* i;
-int j;
+void set_XImage_height(XImage *i, int j)
 {
           i->height = j;
 }
 
-int  XImage_width(i)
-XImage* i;
+int  XImage_width(XImage *i)
 {
           return(i->width);
 }
 
-void set_XImage_width(i, j)
-XImage* i;
-int j;
+void set_XImage_width(XImage *i, int j)
 {
           i->width = j;
 }
@@ -1780,97 +1414,76 @@
 
 /********* XWindowChanges funcions *****/
 
-int  make_XWindowChanges (){
+int  make_XWindowChanges (void) {
           return ((int) calloc(1, sizeof(XWindowChanges)));
 }
 
-int  XWindowChanges_stack_mode(i)
-XWindowChanges* i;
+int  XWindowChanges_stack_mode(XWindowChanges *i)
 {
           return(i->stack_mode);
 }
 
-void set_XWindowChanges_stack_mode(i, j)
-XWindowChanges* i;
-int j;
+void set_XWindowChanges_stack_mode(XWindowChanges *i, int j)
 {
           i->stack_mode = j;
 }
 
-int  XWindowChanges_sibling(i)
-XWindowChanges* i;
+int  XWindowChanges_sibling(XWindowChanges *i)
 {
           return(i->sibling);
 }
 
-void set_XWindowChanges_sibling(i, j)
-XWindowChanges* i;
-int j;
+void set_XWindowChanges_sibling(XWindowChanges *i, int j)
 {
           i->sibling = j;
 }
 
-int  XWindowChanges_border_width(i)
-XWindowChanges* i;
+int  XWindowChanges_border_width(XWindowChanges *i)
 {
           return(i->border_width);
 }
 
-void set_XWindowChanges_border_width(i, j)
-XWindowChanges* i;
-int j;
+void set_XWindowChanges_border_width(XWindowChanges *i, int j)
 {
           i->border_width = j;
 }
 
-int  XWindowChanges_height(i)
-XWindowChanges* i;
+int  XWindowChanges_height(XWindowChanges *i)
 {
           return(i->height);
 }
 
-void set_XWindowChanges_height(i, j)
-XWindowChanges* i;
-int j;
+void set_XWindowChanges_height(XWindowChanges *i, int j)
 {
           i->height = j;
 }
 
-int  XWindowChanges_width(i)
-XWindowChanges* i;
+int  XWindowChanges_width(XWindowChanges *i)
 {
           return(i->width);
 }
 
-void set_XWindowChanges_width(i, j)
-XWindowChanges* i;
-int j;
+void set_XWindowChanges_width(XWindowChanges *i, int j)
 {
           i->width = j;
 }
 
-int  XWindowChanges_y(i)
-XWindowChanges* i;
+int  XWindowChanges_y(XWindowChanges *i)
 {
           return(i->y);
 }
 
-void set_XWindowChanges_y(i, j)
-XWindowChanges* i;
-int j;
+void set_XWindowChanges_y(XWindowChanges *i, int j)
 {
           i->y = j;
 }
 
-int  XWindowChanges_x(i)
-XWindowChanges* i;
+int  XWindowChanges_x(XWindowChanges *i)
 {
           return(i->x);
 }
 
-void set_XWindowChanges_x(i, j)
-XWindowChanges* i;
-int j;
+void set_XWindowChanges_x(XWindowChanges *i, int j)
 {
           i->x = j;
 }
@@ -1878,84 +1491,66 @@
 
 /********* XColor funcions *****/
 
-int  make_XColor (){
+int  make_XColor (void) {
           return ((int) calloc(1, sizeof(XColor)));
 }
 
-char XColor_pad(i)
-XColor* i;
+char XColor_pad(XColor *i)
 {
           return(i->pad);
 }
 
-void set_XColor_pad(i, j)
-XColor* i;
-char j;
+void set_XColor_pad(XColor *i, char j)
 {
           i->pad = j;
 }
 
-char XColor_flags(i)
-XColor* i;
+char XColor_flags(XColor *i)
 {
           return(i->flags);
 }
 
-void set_XColor_flags(i, j)
-XColor* i;
-char j;
+void set_XColor_flags(XColor *i, char j)
 {
           i->flags = j;
 }
 
-int  XColor_blue(i)
-XColor* i;
+int  XColor_blue(XColor *i)
 {
           return(i->blue);
 }
 
-void set_XColor_blue(i, j)
-XColor* i;
-int j;
+void set_XColor_blue(XColor *i, int j)
 {
           i->blue = j;
 }
 
-int  XColor_green(i)
-XColor* i;
+int  XColor_green(XColor *i)
 {
           return(i->green);
 }
 
-void set_XColor_green(i, j)
-XColor* i;
-int j;
+void set_XColor_green(XColor *i, int j)
 {
           i->green = j;
 }
 
-int  XColor_red(i)
-XColor* i;
+int  XColor_red(XColor *i)
 {
           return(i->red);
 }
 
-void set_XColor_red(i, j)
-XColor* i;
-int j;
+void set_XColor_red(XColor *i, int j)
 {
           i->red = j;
 }
 
-int  XColor_pixel(i)
-XColor* i;
+int  XColor_pixel(XColor *i)
 {
           return(i->pixel);
 }
 
-void set_XColor_pixel(i, j)
-XColor* i;
-int j;
+void set_XColor_pixel(XColor *i, int j)
 {
           i->pixel = j;
 }
@@ -1963,58 +1558,46 @@
 
 /********* XSegment funcions *****/
 
-int  make_XSegment (){
+int  make_XSegment (void) {
           return ((int) calloc(1, sizeof(XSegment)));
 }
 
-int  XSegment_y2(i)
-XSegment* i;
+int  XSegment_y2(XSegment *i)
 {
           return(i->y2);
 }
 
-void set_XSegment_y2(i, j)
-XSegment* i;
-int j;
+void set_XSegment_y2(XSegment *i, int j)
 {
           i->y2 = j;
 }
 
-int  XSegment_x2(i)
-XSegment* i;
+int  XSegment_x2(XSegment *i)
 {
           return(i->x2);
 }
 
-void set_XSegment_x2(i, j)
-XSegment* i;
-int j;
+void set_XSegment_x2(XSegment *i, int j)
 {
           i->x2 = j;
 }
 
-int  XSegment_y1(i)
-XSegment* i;
+int  XSegment_y1(XSegment *i)
 {
           return(i->y1);
 }
 
-void set_XSegment_y1(i, j)
-XSegment* i;
-int j;
+void set_XSegment_y1(XSegment *i, int j)
 {
           i->y1 = j;
 }
 
-int  XSegment_x1(i)
-XSegment* i;
+int  XSegment_x1(XSegment *i)
 {
           return(i->x1);
 }
 
-void set_XSegment_x1(i, j)
-XSegment* i;
-int j;
+void set_XSegment_x1(XSegment *i, int j)
 {
           i->x1 = j;
 }
@@ -2022,32 +1605,26 @@
 
 /********* XPoint funcions *****/
 
-int  make_XPoint (){
+int  make_XPoint (void) {
           return ((int) calloc(1, sizeof(XPoint)));
 }
 
-int  XPoint_y(i)
-XPoint* i;
+int  XPoint_y(XPoint *i)
 {
           return(i->y);
 }
 
-void set_XPoint_y(i, j)
-XPoint* i;
-int j;
+void set_XPoint_y(XPoint *i, int j)
 {
           i->y = j;
 }
 
-int  XPoint_x(i)
-XPoint* i;
+int  XPoint_x(XPoint *i)
 {
           return(i->x);
 }
 
-void set_XPoint_x(i, j)
-XPoint* i;
-int j;
+void set_XPoint_x(XPoint *i, int j)
 {
           i->x = j;
 }
@@ -2055,58 +1632,46 @@
 
 /********* XRectangle funcions *****/
 
-int  make_XRectangle (){
+int  make_XRectangle (void) {
           return ((int) calloc(1, sizeof(XRectangle)));
 }
 
-int  XRectangle_height(i)
-XRectangle* i;
+int  XRectangle_height(XRectangle *i)
 {
           return(i->height);
 }
 
-void set_XRectangle_height(i, j)
-XRectangle* i;
-int j;
+void set_XRectangle_height(XRectangle *i, int j)
 {
           i->height = j;
 }
 
-int  XRectangle_width(i)
-XRectangle* i;
+int  XRectangle_width(XRectangle *i)
 {
           return(i->width);
 }
 
-void set_XRectangle_width(i, j)
-XRectangle* i;
-int j;
+void set_XRectangle_width(XRectangle *i, int j)
 {
           i->width = j;
 }
 
-int  XRectangle_y(i)
-XRectangle* i;
+int  XRectangle_y(XRectangle *i)
 {
           return(i->y);
 }
 
-void set_XRectangle_y(i, j)
-XRectangle* i;
-int j;
+void set_XRectangle_y(XRectangle *i, int j)
 {
           i->y = j;
 }
 
-int  XRectangle_x(i)
-XRectangle* i;
+int  XRectangle_x(XRectangle *i)
 {
           return(i->x);
 }
 
-void set_XRectangle_x(i, j)
-XRectangle* i;
-int j;
+void set_XRectangle_x(XRectangle *i, int j)
 {
           i->x = j;
 }
@@ -2114,84 +1679,66 @@
 
 /********* XArc funcions *****/
 
-int  make_XArc (){
+int  make_XArc (void) {
           return ((int) calloc(1, sizeof(XArc)));
 }
 
-int  XArc_angle2(i)
-XArc* i;
+int  XArc_angle2(XArc *i)
 {
           return(i->angle2);
 }
 
-void set_XArc_angle2(i, j)
-XArc* i;
-int j;
+void set_XArc_angle2(XArc *i, int j)
 {
           i->angle2 = j;
 }
 
-int  XArc_angle1(i)
-XArc* i;
+int  XArc_angle1(XArc *i)
 {
           return(i->angle1);
 }
 
-void set_XArc_angle1(i, j)
-XArc* i;
-int j;
+void set_XArc_angle1(XArc *i, int j)
 {
           i->angle1 = j;
 }
 
-int  XArc_height(i)
-XArc* i;
+int  XArc_height(XArc *i)
 {
           return(i->height);
 }
 
-void set_XArc_height(i, j)
-XArc* i;
-int j;
+void set_XArc_height(XArc *i, int j)
 {
           i->height = j;
 }
 
-int  XArc_width(i)
-XArc* i;
+int  XArc_width(XArc *i)
 {
           return(i->width);
 }
 
-void set_XArc_width(i, j)
-XArc* i;
-int j;
+void set_XArc_width(XArc *i, int j)
 {
           i->width = j;
 }
 
-int  XArc_y(i)
-XArc* i;
+int  XArc_y(XArc *i)
 {
           return(i->y);
 }
 
-void set_XArc_y(i, j)
-XArc* i;
-int j;
+void set_XArc_y(XArc *i, int j)
 {
           i->y = j;
 }
 
-int  XArc_x(i)
-XArc* i;
+int  XArc_x(XArc *i)
 {
           return(i->x);
 }
 
-void set_XArc_x(i, j)
-XArc* i;
-int j;
+void set_XArc_x(XArc *i, int j)
 {
           i->x = j;
 }
@@ -2199,110 +1746,86 @@
 
 /********* XKeyboardControl funcions *****/
 
-int  make_XKeyboardControl (){
+int  make_XKeyboardControl (void) {
           return ((int) calloc(1, sizeof(XKeyboardControl)));
 }
 
-int  XKeyboardControl_auto_repeat_mode(i)
-XKeyboardControl* i;
+int  XKeyboardControl_auto_repeat_mode(XKeyboardControl *i)
 {
           return(i->auto_repeat_mode);
 }
 
-void set_XKeyboardControl_auto_repeat_mode(i, j)
-XKeyboardControl* i;
-int j;
+void set_XKeyboardControl_auto_repeat_mode(XKeyboardControl *i, int j)
 {
           i->auto_repeat_mode = j;
 }
 
-int  XKeyboardControl_key(i)
-XKeyboardControl* i;
+int  XKeyboardControl_key(XKeyboardControl *i)
 {
           return(i->key);
 }
 
-void set_XKeyboardControl_key(i, j)
-XKeyboardControl* i;
-int j;
+void set_XKeyboardControl_key(XKeyboardControl *i, int j)
 {
           i->key = j;
 }
 
-int  XKeyboardControl_led_mode(i)
-XKeyboardControl* i;
+int  XKeyboardControl_led_mode(XKeyboardControl *i)
 {
           return(i->led_mode);
 }
 
-void set_XKeyboardControl_led_mode(i, j)
-XKeyboardControl* i;
-int j;
+void set_XKeyboardControl_led_mode(XKeyboardControl *i, int j)
 {
           i->led_mode = j;
 }
 
-int  XKeyboardControl_led(i)
-XKeyboardControl* i;
+int  XKeyboardControl_led(XKeyboardControl *i)
 {
           return(i->led);
 }
 
-void set_XKeyboardControl_led(i, j)
-XKeyboardControl* i;
-int j;
+void set_XKeyboardControl_led(XKeyboardControl *i, int j)
 {
           i->led = j;
 }
 
-int  XKeyboardControl_bell_duration(i)
-XKeyboardControl* i;
+int  XKeyboardControl_bell_duration(XKeyboardControl *i)
 {
           return(i->bell_duration);
 }
 
-void set_XKeyboardControl_bell_duration(i, j)
-XKeyboardControl* i;
-int j;
+void set_XKeyboardControl_bell_duration(XKeyboardControl *i, int j)
 {
           i->bell_duration = j;
 }
 
-int  XKeyboardControl_bell_pitch(i)
-XKeyboardControl* i;
+int  XKeyboardControl_bell_pitch(XKeyboardControl *i)
 {
           return(i->bell_pitch);
 }
 
-void set_XKeyboardControl_bell_pitch(i, j)
-XKeyboardControl* i;
-int j;
+void set_XKeyboardControl_bell_pitch(XKeyboardControl *i, int j)
 {
           i->bell_pitch = j;
 }
 
-int  XKeyboardControl_bell_percent(i)
-XKeyboardControl* i;
+int  XKeyboardControl_bell_percent(XKeyboardControl *i)
 {
           return(i->bell_percent);
 }
 
-void set_XKeyboardControl_bell_percent(i, j)
-XKeyboardControl* i;
-int j;
+void set_XKeyboardControl_bell_percent(XKeyboardControl *i, int j)
 {
           i->bell_percent = j;
 }
 
-int  XKeyboardControl_key_click_percent(i)
-XKeyboardControl* i;
+int  XKeyboardControl_key_click_percent(XKeyboardControl *i)
 {
           return(i->key_click_percent);
 }
 
-void set_XKeyboardControl_key_click_percent(i, j)
-XKeyboardControl* i;
-int j;
+void set_XKeyboardControl_key_click_percent(XKeyboardControl *i, int j)
 {
           i->key_click_percent = j;
 }
@@ -2310,97 +1833,76 @@
 
 /********* XKeyboardState funcions *****/
 
-int  make_XKeyboardState (){
+int  make_XKeyboardState (void) {
           return ((int) calloc(1, sizeof(XKeyboardState)));
 }
 
-char *XKeyboardState_auto_repeats(i)
-XKeyboardState* i;
+char *XKeyboardState_auto_repeats(XKeyboardState *i)
 {
           return(i->auto_repeats);
 }
 
-void set_XKeyboardState_auto_repeats(i, j)
-XKeyboardState* i;
-char   *j;
+void set_XKeyboardState_auto_repeats(XKeyboardState *i, char *j)
 {
           strcpy(i->auto_repeats,  j);
 }
 
-int  XKeyboardState_global_auto_repeat(i)
-XKeyboardState* i;
+int  XKeyboardState_global_auto_repeat(XKeyboardState *i)
 {
           return(i->global_auto_repeat);
 }
 
-void set_XKeyboardState_global_auto_repeat(i, j)
-XKeyboardState* i;
-int j;
+void set_XKeyboardState_global_auto_repeat(XKeyboardState *i, int j)
 {
           i->global_auto_repeat = j;
 }
 
-int  XKeyboardState_led_mask(i)
-XKeyboardState* i;
+int  XKeyboardState_led_mask(XKeyboardState *i)
 {
           return(i->led_mask);
 }
 
-void set_XKeyboardState_led_mask(i, j)
-XKeyboardState* i;
-int j;
+void set_XKeyboardState_led_mask(XKeyboardState *i, int j)
 {
           i->led_mask = j;
 }
 
-int  XKeyboardState_bell_duration(i)
-XKeyboardState* i;
+int  XKeyboardState_bell_duration(XKeyboardState *i)
 {
           return(i->bell_duration);
 }
 
-void set_XKeyboardState_bell_duration(i, j)
-XKeyboardState* i;
-int j;
+void set_XKeyboardState_bell_duration(XKeyboardState *i, int j)
 {
           i->bell_duration = j;
 }
 
-int  XKeyboardState_bell_pitch(i)
-XKeyboardState* i;
+int  XKeyboardState_bell_pitch(XKeyboardState *i)
 {
           return(i->bell_pitch);
 }
 
-void set_XKeyboardState_bell_pitch(i, j)
-XKeyboardState* i;
-int j;
+void set_XKeyboardState_bell_pitch(XKeyboardState *i, int j)
 {
           i->bell_pitch = j;
 }
 
-int  XKeyboardState_bell_percent(i)
-XKeyboardState* i;
+int  XKeyboardState_bell_percent(XKeyboardState *i)
 {
           return(i->bell_percent);
 }
 
-void set_XKeyboardState_bell_percent(i, j)
-XKeyboardState* i;
-int j;
+void set_XKeyboardState_bell_percent(XKeyboardState *i, int j)
 {
           i->bell_percent = j;
 }
 
-int  XKeyboardState_key_click_percent(i)
-XKeyboardState* i;
+int  XKeyboardState_key_click_percent(XKeyboardState *i)
 {
           return(i->key_click_percent);
 }
 
-void set_XKeyboardState_key_click_percent(i, j)
-XKeyboardState* i;
-int j;
+void set_XKeyboardState_key_click_percent(XKeyboardState *i, int j)
 {
           i->key_click_percent = j;
 }
@@ -2408,45 +1910,36 @@
 
 /********* XTimeCoord funcions *****/
 
-int  make_XTimeCoord (){
+int  make_XTimeCoord (void) {
           return ((int) calloc(1, sizeof(XTimeCoord)));
 }
 
-int  XTimeCoord_y(i)
-XTimeCoord* i;
+int  XTimeCoord_y(XTimeCoord *i)
 {
           return(i->y);
 }
 
-void set_XTimeCoord_y(i, j)
-XTimeCoord* i;
-int j;
+void set_XTimeCoord_y(XTimeCoord *i, int j)
 {
           i->y = j;
 }
 
-int  XTimeCoord_x(i)
-XTimeCoord* i;
+int  XTimeCoord_x(XTimeCoord *i)
 {
           return(i->x);
 }
 
-void set_XTimeCoord_x(i, j)
-XTimeCoord* i;
-int j;
+void set_XTimeCoord_x(XTimeCoord *i, int j)
 {
           i->x = j;
 }
 
-int  XTimeCoord_time(i)
-XTimeCoord* i;
+int  XTimeCoord_time(XTimeCoord *i)
 {
           return(i->time);
 }
 
-void set_XTimeCoord_time(i, j)
-XTimeCoord* i;
-int j;
+void set_XTimeCoord_time(XTimeCoord *i, int j)
 {
           i->time = j;
 }
@@ -2454,32 +1947,26 @@
 
 /********* XModifierKeymap funcions *****/
 
-int  make_XModifierKeymap (){
+int  make_XModifierKeymap (void) {
           return ((int) calloc(1, sizeof(XModifierKeymap)));
 }
 
-KeyCode *XModifierKeymap_modifiermap(i)
-XModifierKeymap* i;
+KeyCode *XModifierKeymap_modifiermap(XModifierKeymap *i)
 {
           return(i->modifiermap);
 }
 
-void set_XModifierKeymap_modifiermap(i, j)
-XModifierKeymap* i;
-KeyCode *j;
+void set_XModifierKeymap_modifiermap(XModifierKeymap *i, KeyCode *j)
 {
           i->modifiermap = j;
 }
 
-int  XModifierKeymap_max_keypermod(i)
-XModifierKeymap* i;
+int  XModifierKeymap_max_keypermod(XModifierKeymap *i)
 {
           return(i->max_keypermod);
 }
 
-void set_XModifierKeymap_max_keypermod(i, j)
-XModifierKeymap* i;
-int j;
+void set_XModifierKeymap_max_keypermod(XModifierKeymap *i, int j)
 {
           i->max_keypermod = j;
 }

Index: xgcl-2/Xutil-2.c
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/Xutil-2.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.20.1
diff -u -b -r1.1.1.1 -r1.1.1.1.20.1
--- xgcl-2/Xutil-2.c    13 Aug 2002 03:24:29 -0000      1.1.1.1
+++ xgcl-2/Xutil-2.c    20 Jun 2006 23:00:10 -0000      1.1.1.1.20.1
@@ -25,31 +25,30 @@
 #include <X11/Xresource.h>
 #include <X11/keysym.h>
 
-int IsKeypadKey(keysym) int keysym; { 
+int IsKeypadKey(int keysym) { 
  return  (((unsigned)(keysym) >= XK_KP_Space) && ((unsigned)(keysym) <= 
XK_KP_Equal));}
 
-int IsCursorKey(keysym) int keysym; { 
+int IsCursorKey(int keysym) { 
   return (((unsigned)(keysym) >= XK_Home)     && ((unsigned)(keysym) <  
XK_Select));}
 
-int IsPFKey(keysym) int keysym; { 
+int IsPFKey(int keysym) { 
   return (((unsigned)(keysym) >= XK_KP_F1)     && ((unsigned)(keysym) <= 
XK_KP_F4));}
 
-int IsFunctionKey(keysym) int keysym; { 
+int IsFunctionKey(int keysym) { 
   return (((unsigned)(keysym) >= XK_F1)       && ((unsigned)(keysym) <= 
XK_F35));}
 
-int IsMiscFunctionKey(keysym) int keysym; { 
+int IsMiscFunctionKey(int keysym) { 
   return (((unsigned)(keysym) >= XK_Select)   && ((unsigned)(keysym) <  
XK_KP_Space));}
 
-int IsModifierKey(keysym) int keysym; { 
+int IsModifierKey(int keysym) { 
   return (((unsigned)(keysym) >= XK_Shift_L)  && ((unsigned)(keysym) <= 
XK_Hyper_R));}
 
-int XUniqueContext() 
+int XUniqueContext(void)
 {
        return( ((int)XrmUniqueQuark()) );
 }
 
-int XStringToContext(string) 
-       char *string; 
+int XStringToContext(char *string)
 {
        return( (int)XrmStringToQuark(string) );
 }

Index: xgcl-2/gcl_XStruct-l-3.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_XStruct-l-3.lsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- xgcl-2/gcl_XStruct-l-3.lsp  5 Jan 2006 17:55:35 -0000       1.1.2.1
+++ xgcl-2/gcl_XStruct-l-3.lsp  20 Jun 2006 23:00:10 -0000      1.1.2.2
@@ -27,465 +27,466 @@
 
 ;;;;;; XExtCodes funcions ;;;;;;
 
-(defentry make-XExtCodes () ( int  "make_XExtCodes" ))
-(defentry XExtCodes-first_error (int) ( int "XExtCodes_first_error" ))
-(defentry set-XExtCodes-first_error (int int) ( void 
"set_XExtCodes_first_error" ))
-(defentry XExtCodes-first_event (int) ( int "XExtCodes_first_event" ))
-(defentry set-XExtCodes-first_event (int int) ( void 
"set_XExtCodes_first_event" ))
-(defentry XExtCodes-major_opcode (int) ( int "XExtCodes_major_opcode" ))
-(defentry set-XExtCodes-major_opcode (int int) ( void 
"set_XExtCodes_major_opcode" ))
-(defentry XExtCodes-extension (int) ( int "XExtCodes_extension" ))
-(defentry set-XExtCodes-extension (int int) ( void "set_XExtCodes_extension" ))
+(clines "#include \"xgcl.h\"")
+(defentry make-XExtCodes () ( fixnum  "make_XExtCodes" ))
+(defentry XExtCodes-first_error (fixnum) ( fixnum "XExtCodes_first_error" ))
+(defentry set-XExtCodes-first_error (fixnum fixnum) ( void 
"set_XExtCodes_first_error" ))
+(defentry XExtCodes-first_event (fixnum) ( fixnum "XExtCodes_first_event" ))
+(defentry set-XExtCodes-first_event (fixnum fixnum) ( void 
"set_XExtCodes_first_event" ))
+(defentry XExtCodes-major_opcode (fixnum) ( fixnum "XExtCodes_major_opcode" ))
+(defentry set-XExtCodes-major_opcode (fixnum fixnum) ( void 
"set_XExtCodes_major_opcode" ))
+(defentry XExtCodes-extension (fixnum) ( fixnum "XExtCodes_extension" ))
+(defentry set-XExtCodes-extension (fixnum fixnum) ( void 
"set_XExtCodes_extension" ))
 
 
 ;;;;;; XPixmapFormatValues funcions ;;;;;;
 
-(defentry make-XPixmapFormatValues () ( int  "make_XPixmapFormatValues" ))
-(defentry XPixmapFormatValues-scanline_pad (int) ( int 
"XPixmapFormatValues_scanline_pad" ))
-(defentry set-XPixmapFormatValues-scanline_pad (int int) ( void 
"set_XPixmapFormatValues_scanline_pad" ))
-(defentry XPixmapFormatValues-bits_per_pixel (int) ( int 
"XPixmapFormatValues_bits_per_pixel" ))
-(defentry set-XPixmapFormatValues-bits_per_pixel (int int) ( void 
"set_XPixmapFormatValues_bits_per_pixel" ))
-(defentry XPixmapFormatValues-depth (int) ( int "XPixmapFormatValues_depth" ))
-(defentry set-XPixmapFormatValues-depth (int int) ( void 
"set_XPixmapFormatValues_depth" ))
+(defentry make-XPixmapFormatValues () ( fixnum  "make_XPixmapFormatValues" ))
+(defentry XPixmapFormatValues-scanline_pad (fixnum) ( fixnum 
"XPixmapFormatValues_scanline_pad" ))
+(defentry set-XPixmapFormatValues-scanline_pad (fixnum fixnum) ( void 
"set_XPixmapFormatValues_scanline_pad" ))
+(defentry XPixmapFormatValues-bits_per_pixel (fixnum) ( fixnum 
"XPixmapFormatValues_bits_per_pixel" ))
+(defentry set-XPixmapFormatValues-bits_per_pixel (fixnum fixnum) ( void 
"set_XPixmapFormatValues_bits_per_pixel" ))
+(defentry XPixmapFormatValues-depth (fixnum) ( fixnum 
"XPixmapFormatValues_depth" ))
+(defentry set-XPixmapFormatValues-depth (fixnum fixnum) ( void 
"set_XPixmapFormatValues_depth" ))
 
 
 ;;;;;; XGCValues funcions ;;;;;;
 
-(defentry make-XGCValues () ( int  "make_XGCValues" ))
-(defentry XGCValues-dashes (int) ( char "XGCValues_dashes" ))
-(defentry set-XGCValues-dashes (int char) ( void "set_XGCValues_dashes" ))
-(defentry XGCValues-dash_offset (int) ( int "XGCValues_dash_offset" ))
-(defentry set-XGCValues-dash_offset (int int) ( void 
"set_XGCValues_dash_offset" ))
-(defentry XGCValues-clip_mask (int) ( int "XGCValues_clip_mask" ))
-(defentry set-XGCValues-clip_mask (int int) ( void "set_XGCValues_clip_mask" ))
-(defentry XGCValues-clip_y_origin (int) ( int "XGCValues_clip_y_origin" ))
-(defentry set-XGCValues-clip_y_origin (int int) ( void 
"set_XGCValues_clip_y_origin" ))
-(defentry XGCValues-clip_x_origin (int) ( int "XGCValues_clip_x_origin" ))
-(defentry set-XGCValues-clip_x_origin (int int) ( void 
"set_XGCValues_clip_x_origin" ))
-(defentry XGCValues-graphics_exposures (int) ( int 
"XGCValues_graphics_exposures" ))
-(defentry set-XGCValues-graphics_exposures (int int) ( void 
"set_XGCValues_graphics_exposures" ))
-(defentry XGCValues-subwindow_mode (int) ( int "XGCValues_subwindow_mode" ))
-(defentry set-XGCValues-subwindow_mode (int int) ( void 
"set_XGCValues_subwindow_mode" ))
-(defentry XGCValues-font (int) ( int "XGCValues_font" ))
-(defentry set-XGCValues-font (int int) ( void "set_XGCValues_font" ))
-(defentry XGCValues-ts_y_origin (int) ( int "XGCValues_ts_y_origin" ))
-(defentry set-XGCValues-ts_y_origin (int int) ( void 
"set_XGCValues_ts_y_origin" ))
-(defentry XGCValues-ts_x_origin (int) ( int "XGCValues_ts_x_origin" ))
-(defentry set-XGCValues-ts_x_origin (int int) ( void 
"set_XGCValues_ts_x_origin" ))
-(defentry XGCValues-stipple (int) ( int "XGCValues_stipple" ))
-(defentry set-XGCValues-stipple (int int) ( void "set_XGCValues_stipple" ))
-(defentry XGCValues-tile (int) ( int "XGCValues_tile" ))
-(defentry set-XGCValues-tile (int int) ( void "set_XGCValues_tile" ))
-(defentry XGCValues-arc_mode (int) ( int "XGCValues_arc_mode" ))
-(defentry set-XGCValues-arc_mode (int int) ( void "set_XGCValues_arc_mode" ))
-(defentry XGCValues-fill_rule (int) ( int "XGCValues_fill_rule" ))
-(defentry set-XGCValues-fill_rule (int int) ( void "set_XGCValues_fill_rule" ))
-(defentry XGCValues-fill_style (int) ( int "XGCValues_fill_style" ))
-(defentry set-XGCValues-fill_style (int int) ( void "set_XGCValues_fill_style" 
))
-(defentry XGCValues-join_style (int) ( int "XGCValues_join_style" ))
-(defentry set-XGCValues-join_style (int int) ( void "set_XGCValues_join_style" 
))
-(defentry XGCValues-cap_style (int) ( int "XGCValues_cap_style" ))
-(defentry set-XGCValues-cap_style (int int) ( void "set_XGCValues_cap_style" ))
-(defentry XGCValues-line_style (int) ( int "XGCValues_line_style" ))
-(defentry set-XGCValues-line_style (int int) ( void "set_XGCValues_line_style" 
))
-(defentry XGCValues-line_width (int) ( int "XGCValues_line_width" ))
-(defentry set-XGCValues-line_width (int int) ( void "set_XGCValues_line_width" 
))
-(defentry XGCValues-background (int) ( int "XGCValues_background" ))
-(defentry set-XGCValues-background (int int) ( void "set_XGCValues_background" 
))
-(defentry XGCValues-foreground (int) ( int "XGCValues_foreground" ))
-(defentry set-XGCValues-foreground (int int) ( void "set_XGCValues_foreground" 
))
-(defentry XGCValues-plane_mask (int) ( int "XGCValues_plane_mask" ))
-(defentry set-XGCValues-plane_mask (int int) ( void "set_XGCValues_plane_mask" 
))
-(defentry XGCValues-function (int) ( int "XGCValues_function" ))
-(defentry set-XGCValues-function (int int) ( void "set_XGCValues_function" ))
+(defentry make-XGCValues () ( fixnum  "make_XGCValues" ))
+(defentry XGCValues-dashes (fixnum) ( char "XGCValues_dashes" ))
+(defentry set-XGCValues-dashes (fixnum char) ( void "set_XGCValues_dashes" ))
+(defentry XGCValues-dash_offset (fixnum) ( fixnum "XGCValues_dash_offset" ))
+(defentry set-XGCValues-dash_offset (fixnum fixnum) ( void 
"set_XGCValues_dash_offset" ))
+(defentry XGCValues-clip_mask (fixnum) ( fixnum "XGCValues_clip_mask" ))
+(defentry set-XGCValues-clip_mask (fixnum fixnum) ( void 
"set_XGCValues_clip_mask" ))
+(defentry XGCValues-clip_y_origin (fixnum) ( fixnum "XGCValues_clip_y_origin" 
))
+(defentry set-XGCValues-clip_y_origin (fixnum fixnum) ( void 
"set_XGCValues_clip_y_origin" ))
+(defentry XGCValues-clip_x_origin (fixnum) ( fixnum "XGCValues_clip_x_origin" 
))
+(defentry set-XGCValues-clip_x_origin (fixnum fixnum) ( void 
"set_XGCValues_clip_x_origin" ))
+(defentry XGCValues-graphics_exposures (fixnum) ( fixnum 
"XGCValues_graphics_exposures" ))
+(defentry set-XGCValues-graphics_exposures (fixnum fixnum) ( void 
"set_XGCValues_graphics_exposures" ))
+(defentry XGCValues-subwindow_mode (fixnum) ( fixnum 
"XGCValues_subwindow_mode" ))
+(defentry set-XGCValues-subwindow_mode (fixnum fixnum) ( void 
"set_XGCValues_subwindow_mode" ))
+(defentry XGCValues-font (fixnum) ( fixnum "XGCValues_font" ))
+(defentry set-XGCValues-font (fixnum fixnum) ( void "set_XGCValues_font" ))
+(defentry XGCValues-ts_y_origin (fixnum) ( fixnum "XGCValues_ts_y_origin" ))
+(defentry set-XGCValues-ts_y_origin (fixnum fixnum) ( void 
"set_XGCValues_ts_y_origin" ))
+(defentry XGCValues-ts_x_origin (fixnum) ( fixnum "XGCValues_ts_x_origin" ))
+(defentry set-XGCValues-ts_x_origin (fixnum fixnum) ( void 
"set_XGCValues_ts_x_origin" ))
+(defentry XGCValues-stipple (fixnum) ( fixnum "XGCValues_stipple" ))
+(defentry set-XGCValues-stipple (fixnum fixnum) ( void "set_XGCValues_stipple" 
))
+(defentry XGCValues-tile (fixnum) ( fixnum "XGCValues_tile" ))
+(defentry set-XGCValues-tile (fixnum fixnum) ( void "set_XGCValues_tile" ))
+(defentry XGCValues-arc_mode (fixnum) ( fixnum "XGCValues_arc_mode" ))
+(defentry set-XGCValues-arc_mode (fixnum fixnum) ( void 
"set_XGCValues_arc_mode" ))
+(defentry XGCValues-fill_rule (fixnum) ( fixnum "XGCValues_fill_rule" ))
+(defentry set-XGCValues-fill_rule (fixnum fixnum) ( void 
"set_XGCValues_fill_rule" ))
+(defentry XGCValues-fill_style (fixnum) ( fixnum "XGCValues_fill_style" ))
+(defentry set-XGCValues-fill_style (fixnum fixnum) ( void 
"set_XGCValues_fill_style" ))
+(defentry XGCValues-join_style (fixnum) ( fixnum "XGCValues_join_style" ))
+(defentry set-XGCValues-join_style (fixnum fixnum) ( void 
"set_XGCValues_join_style" ))
+(defentry XGCValues-cap_style (fixnum) ( fixnum "XGCValues_cap_style" ))
+(defentry set-XGCValues-cap_style (fixnum fixnum) ( void 
"set_XGCValues_cap_style" ))
+(defentry XGCValues-line_style (fixnum) ( fixnum "XGCValues_line_style" ))
+(defentry set-XGCValues-line_style (fixnum fixnum) ( void 
"set_XGCValues_line_style" ))
+(defentry XGCValues-line_width (fixnum) ( fixnum "XGCValues_line_width" ))
+(defentry set-XGCValues-line_width (fixnum fixnum) ( void 
"set_XGCValues_line_width" ))
+(defentry XGCValues-background (fixnum) ( fixnum "XGCValues_background" ))
+(defentry set-XGCValues-background (fixnum fixnum) ( void 
"set_XGCValues_background" ))
+(defentry XGCValues-foreground (fixnum) ( fixnum "XGCValues_foreground" ))
+(defentry set-XGCValues-foreground (fixnum fixnum) ( void 
"set_XGCValues_foreground" ))
+(defentry XGCValues-plane_mask (fixnum) ( fixnum "XGCValues_plane_mask" ))
+(defentry set-XGCValues-plane_mask (fixnum fixnum) ( void 
"set_XGCValues_plane_mask" ))
+(defentry XGCValues-function (fixnum) ( fixnum "XGCValues_function" ))
+(defentry set-XGCValues-function (fixnum fixnum) ( void 
"set_XGCValues_function" ))
 
 
 ;;;;;; *GC funcions ;;;;;;
 
-;;(defentry make-*GC () ( int  "make_*GC" ))
-;;(defentry *GC-values (int) ( int "*GC_values" ))
-;;(defentry set-*GC-values (int int) ( void "set_*GC_values" ))
-;;(defentry *GC-dirty (int) ( int "*GC_dirty" ))
-;;(defentry set-*GC-dirty (int int) ( void "set_*GC_dirty" ))
-;;(defentry *GC-dashes (int) ( int "*GC_dashes" ))
-;;(defentry set-*GC-dashes (int int) ( void "set_*GC_dashes" ))
-;;(defentry *GC-rects (int) ( int "*GC_rects" ))
-;;(defentry set-*GC-rects (int int) ( void "set_*GC_rects" ))
-;;(defentry *GC-gid (int) ( int "*GC_gid" ))
-;;(defentry set-*GC-gid (int int) ( void "set_*GC_gid" ))
-;;(defentry *GC-ext_data (int) ( int "*GC_ext_data" ))
-;;(defentry set-*GC-ext_data (int int) ( void "set_*GC_ext_data" ))
+;;(defentry make-*GC () ( fixnum  "make_*GC" ))
+;;(defentry *GC-values (fixnum) ( fixnum "*GC_values" ))
+;;(defentry set-*GC-values (fixnum fixnum) ( void "set_*GC_values" ))
+;;(defentry *GC-dirty (fixnum) ( fixnum "*GC_dirty" ))
+;;(defentry set-*GC-dirty (fixnum fixnum) ( void "set_*GC_dirty" ))
+;;(defentry *GC-dashes (fixnum) ( fixnum "*GC_dashes" ))
+;;(defentry set-*GC-dashes (fixnum fixnum) ( void "set_*GC_dashes" ))
+;;(defentry *GC-rects (fixnum) ( fixnum "*GC_rects" ))
+;;(defentry set-*GC-rects (fixnum fixnum) ( void "set_*GC_rects" ))
+;;(defentry *GC-gid (fixnum) ( fixnum "*GC_gid" ))
+;;(defentry set-*GC-gid (fixnum fixnum) ( void "set_*GC_gid" ))
+;;(defentry *GC-ext_data (fixnum) ( fixnum "*GC_ext_data" ))
+;;(defentry set-*GC-ext_data (fixnum fixnum) ( void "set_*GC_ext_data" ))
 
 
 ;;;;;; Visual funcions ;;;;;;
 
-(defentry make-Visual () ( int  "make_Visual" ))
-(defentry Visual-map_entries (int) ( int "Visual_map_entries" ))
-(defentry set-Visual-map_entries (int int) ( void "set_Visual_map_entries" ))
-(defentry Visual-bits_per_rgb (int) ( int "Visual_bits_per_rgb" ))
-(defentry set-Visual-bits_per_rgb (int int) ( void "set_Visual_bits_per_rgb" ))
-(defentry Visual-blue_mask (int) ( int "Visual_blue_mask" ))
-(defentry set-Visual-blue_mask (int int) ( void "set_Visual_blue_mask" ))
-(defentry Visual-green_mask (int) ( int "Visual_green_mask" ))
-(defentry set-Visual-green_mask (int int) ( void "set_Visual_green_mask" ))
-(defentry Visual-red_mask (int) ( int "Visual_red_mask" ))
-(defentry set-Visual-red_mask (int int) ( void "set_Visual_red_mask" ))
-(defentry Visual-class (int) ( int "Visual_class" ))
-(defentry set-Visual-class (int int) ( void "set_Visual_class" ))
-(defentry Visual-visualid (int) ( int "Visual_visualid" ))
-(defentry set-Visual-visualid (int int) ( void "set_Visual_visualid" ))
-(defentry Visual-ext_data (int) ( int "Visual_ext_data" ))
-(defentry set-Visual-ext_data (int int) ( void "set_Visual_ext_data" ))
+(defentry make-Visual () ( fixnum  "make_Visual" ))
+(defentry Visual-map_entries (fixnum) ( fixnum "Visual_map_entries" ))
+(defentry set-Visual-map_entries (fixnum fixnum) ( void 
"set_Visual_map_entries" ))
+(defentry Visual-bits_per_rgb (fixnum) ( fixnum "Visual_bits_per_rgb" ))
+(defentry set-Visual-bits_per_rgb (fixnum fixnum) ( void 
"set_Visual_bits_per_rgb" ))
+(defentry Visual-blue_mask (fixnum) ( fixnum "Visual_blue_mask" ))
+(defentry set-Visual-blue_mask (fixnum fixnum) ( void "set_Visual_blue_mask" ))
+(defentry Visual-green_mask (fixnum) ( fixnum "Visual_green_mask" ))
+(defentry set-Visual-green_mask (fixnum fixnum) ( void "set_Visual_green_mask" 
))
+(defentry Visual-red_mask (fixnum) ( fixnum "Visual_red_mask" ))
+(defentry set-Visual-red_mask (fixnum fixnum) ( void "set_Visual_red_mask" ))
+(defentry Visual-class (fixnum) ( fixnum "Visual_class" ))
+(defentry set-Visual-class (fixnum fixnum) ( void "set_Visual_class" ))
+(defentry Visual-visualid (fixnum) ( fixnum "Visual_visualid" ))
+(defentry set-Visual-visualid (fixnum fixnum) ( void "set_Visual_visualid" ))
+(defentry Visual-ext_data (fixnum) ( fixnum "Visual_ext_data" ))
+(defentry set-Visual-ext_data (fixnum fixnum) ( void "set_Visual_ext_data" ))
 
 
 ;;;;;; Depth funcions ;;;;;;
 
-(defentry make-Depth () ( int  "make_Depth" ))
-(defentry Depth-visuals (int) ( int "Depth_visuals" ))
-(defentry set-Depth-visuals (int int) ( void "set_Depth_visuals" ))
-(defentry Depth-nvisuals (int) ( int "Depth_nvisuals" ))
-(defentry set-Depth-nvisuals (int int) ( void "set_Depth_nvisuals" ))
-(defentry Depth-depth (int) ( int "Depth_depth" ))
-(defentry set-Depth-depth (int int) ( void "set_Depth_depth" ))
+(defentry make-Depth () ( fixnum  "make_Depth" ))
+(defentry Depth-visuals (fixnum) ( fixnum "Depth_visuals" ))
+(defentry set-Depth-visuals (fixnum fixnum) ( void "set_Depth_visuals" ))
+(defentry Depth-nvisuals (fixnum) ( fixnum "Depth_nvisuals" ))
+(defentry set-Depth-nvisuals (fixnum fixnum) ( void "set_Depth_nvisuals" ))
+(defentry Depth-depth (fixnum) ( fixnum "Depth_depth" ))
+(defentry set-Depth-depth (fixnum fixnum) ( void "set_Depth_depth" ))
 
 
 ;;;;;; Screen funcions ;;;;;;
 
-(defentry make-Screen () ( int  "make_Screen" ))
-(defentry Screen-root_input_mask (int) ( int "Screen_root_input_mask" ))
-(defentry set-Screen-root_input_mask (int int) ( void 
"set_Screen_root_input_mask" ))
-(defentry Screen-save_unders (int) ( int "Screen_save_unders" ))
-(defentry set-Screen-save_unders (int int) ( void "set_Screen_save_unders" ))
-(defentry Screen-backing_store (int) ( int "Screen_backing_store" ))
-(defentry set-Screen-backing_store (int int) ( void "set_Screen_backing_store" 
))
-(defentry Screen-min_maps (int) ( int "Screen_min_maps" ))
-(defentry set-Screen-min_maps (int int) ( void "set_Screen_min_maps" ))
-(defentry Screen-max_maps (int) ( int "Screen_max_maps" ))
-(defentry set-Screen-max_maps (int int) ( void "set_Screen_max_maps" ))
-(defentry Screen-black_pixel (int) ( int "Screen_black_pixel" ))
-(defentry set-Screen-black_pixel (int int) ( void "set_Screen_black_pixel" ))
-(defentry Screen-white_pixel (int) ( int "Screen_white_pixel" ))
-(defentry set-Screen-white_pixel (int int) ( void "set_Screen_white_pixel" ))
-(defentry Screen-cmap (int) ( int "Screen_cmap" ))
-(defentry set-Screen-cmap (int int) ( void "set_Screen_cmap" ))
-(defentry Screen-default_gc (int) ( int "Screen_default_gc" ))
-(defentry set-Screen-default_gc (int int) ( void "set_Screen_default_gc" ))
-(defentry Screen-root_visual (int) ( int "Screen_root_visual" ))
-(defentry set-Screen-root_visual (int int) ( void "set_Screen_root_visual" ))
-(defentry Screen-root_depth (int) ( int "Screen_root_depth" ))
-(defentry set-Screen-root_depth (int int) ( void "set_Screen_root_depth" ))
-(defentry Screen-depths (int) ( int "Screen_depths" ))
-(defentry set-Screen-depths (int int) ( void "set_Screen_depths" ))
-(defentry Screen-ndepths (int) ( int "Screen_ndepths" ))
-(defentry set-Screen-ndepths (int int) ( void "set_Screen_ndepths" ))
-(defentry Screen-mheight (int) ( int "Screen_mheight" ))
-(defentry set-Screen-mheight (int int) ( void "set_Screen_mheight" ))
-(defentry Screen-mwidth (int) ( int "Screen_mwidth" ))
-(defentry set-Screen-mwidth (int int) ( void "set_Screen_mwidth" ))
-(defentry Screen-height (int) ( int "Screen_height" ))
-(defentry set-Screen-height (int int) ( void "set_Screen_height" ))
-(defentry Screen-width (int) ( int "Screen_width" ))
-(defentry set-Screen-width (int int) ( void "set_Screen_width" ))
-(defentry Screen-root (int) ( int "Screen_root" ))
-(defentry set-Screen-root (int int) ( void "set_Screen_root" ))
-(defentry Screen-display (int) ( int "Screen_display" ))
-(defentry set-Screen-display (int int) ( void "set_Screen_display" ))
-(defentry Screen-ext_data (int) ( int "Screen_ext_data" ))
-(defentry set-Screen-ext_data (int int) ( void "set_Screen_ext_data" ))
+(defentry make-Screen () ( fixnum  "make_Screen" ))
+(defentry Screen-root_input_mask (fixnum) ( fixnum "Screen_root_input_mask" ))
+(defentry set-Screen-root_input_mask (fixnum fixnum) ( void 
"set_Screen_root_input_mask" ))
+(defentry Screen-save_unders (fixnum) ( fixnum "Screen_save_unders" ))
+(defentry set-Screen-save_unders (fixnum fixnum) ( void 
"set_Screen_save_unders" ))
+(defentry Screen-backing_store (fixnum) ( fixnum "Screen_backing_store" ))
+(defentry set-Screen-backing_store (fixnum fixnum) ( void 
"set_Screen_backing_store" ))
+(defentry Screen-min_maps (fixnum) ( fixnum "Screen_min_maps" ))
+(defentry set-Screen-min_maps (fixnum fixnum) ( void "set_Screen_min_maps" ))
+(defentry Screen-max_maps (fixnum) ( fixnum "Screen_max_maps" ))
+(defentry set-Screen-max_maps (fixnum fixnum) ( void "set_Screen_max_maps" ))
+(defentry Screen-black_pixel (fixnum) ( fixnum "Screen_black_pixel" ))
+(defentry set-Screen-black_pixel (fixnum fixnum) ( void 
"set_Screen_black_pixel" ))
+(defentry Screen-white_pixel (fixnum) ( fixnum "Screen_white_pixel" ))
+(defentry set-Screen-white_pixel (fixnum fixnum) ( void 
"set_Screen_white_pixel" ))
+(defentry Screen-cmap (fixnum) ( fixnum "Screen_cmap" ))
+(defentry set-Screen-cmap (fixnum fixnum) ( void "set_Screen_cmap" ))
+(defentry Screen-default_gc (fixnum) ( fixnum "Screen_default_gc" ))
+(defentry set-Screen-default_gc (fixnum fixnum) ( void "set_Screen_default_gc" 
))
+(defentry Screen-root_visual (fixnum) ( fixnum "Screen_root_visual" ))
+(defentry set-Screen-root_visual (fixnum fixnum) ( void 
"set_Screen_root_visual" ))
+(defentry Screen-root_depth (fixnum) ( fixnum "Screen_root_depth" ))
+(defentry set-Screen-root_depth (fixnum fixnum) ( void "set_Screen_root_depth" 
))
+(defentry Screen-depths (fixnum) ( fixnum "Screen_depths" ))
+(defentry set-Screen-depths (fixnum fixnum) ( void "set_Screen_depths" ))
+(defentry Screen-ndepths (fixnum) ( fixnum "Screen_ndepths" ))
+(defentry set-Screen-ndepths (fixnum fixnum) ( void "set_Screen_ndepths" ))
+(defentry Screen-mheight (fixnum) ( fixnum "Screen_mheight" ))
+(defentry set-Screen-mheight (fixnum fixnum) ( void "set_Screen_mheight" ))
+(defentry Screen-mwidth (fixnum) ( fixnum "Screen_mwidth" ))
+(defentry set-Screen-mwidth (fixnum fixnum) ( void "set_Screen_mwidth" ))
+(defentry Screen-height (fixnum) ( fixnum "Screen_height" ))
+(defentry set-Screen-height (fixnum fixnum) ( void "set_Screen_height" ))
+(defentry Screen-width (fixnum) ( fixnum "Screen_width" ))
+(defentry set-Screen-width (fixnum fixnum) ( void "set_Screen_width" ))
+(defentry Screen-root (fixnum) ( fixnum "Screen_root" ))
+(defentry set-Screen-root (fixnum fixnum) ( void "set_Screen_root" ))
+(defentry Screen-display (fixnum) ( fixnum "Screen_display" ))
+(defentry set-Screen-display (fixnum fixnum) ( void "set_Screen_display" ))
+(defentry Screen-ext_data (fixnum) ( fixnum "Screen_ext_data" ))
+(defentry set-Screen-ext_data (fixnum fixnum) ( void "set_Screen_ext_data" ))
 
 
 ;;;;;; ScreenFormat funcions ;;;;;;
 
-(defentry make-ScreenFormat () ( int  "make_ScreenFormat" ))
-(defentry ScreenFormat-scanline_pad (int) ( int "ScreenFormat_scanline_pad" ))
-(defentry set-ScreenFormat-scanline_pad (int int) ( void 
"set_ScreenFormat_scanline_pad" ))
-(defentry ScreenFormat-bits_per_pixel (int) ( int 
"ScreenFormat_bits_per_pixel" ))
-(defentry set-ScreenFormat-bits_per_pixel (int int) ( void 
"set_ScreenFormat_bits_per_pixel" ))
-(defentry ScreenFormat-depth (int) ( int "ScreenFormat_depth" ))
-(defentry set-ScreenFormat-depth (int int) ( void "set_ScreenFormat_depth" ))
-(defentry ScreenFormat-ext_data (int) ( int "ScreenFormat_ext_data" ))
-(defentry set-ScreenFormat-ext_data (int int) ( void 
"set_ScreenFormat_ext_data" ))
+(defentry make-ScreenFormat () ( fixnum  "make_ScreenFormat" ))
+(defentry ScreenFormat-scanline_pad (fixnum) ( fixnum 
"ScreenFormat_scanline_pad" ))
+(defentry set-ScreenFormat-scanline_pad (fixnum fixnum) ( void 
"set_ScreenFormat_scanline_pad" ))
+(defentry ScreenFormat-bits_per_pixel (fixnum) ( fixnum 
"ScreenFormat_bits_per_pixel" ))
+(defentry set-ScreenFormat-bits_per_pixel (fixnum fixnum) ( void 
"set_ScreenFormat_bits_per_pixel" ))
+(defentry ScreenFormat-depth (fixnum) ( fixnum "ScreenFormat_depth" ))
+(defentry set-ScreenFormat-depth (fixnum fixnum) ( void 
"set_ScreenFormat_depth" ))
+(defentry ScreenFormat-ext_data (fixnum) ( fixnum "ScreenFormat_ext_data" ))
+(defentry set-ScreenFormat-ext_data (fixnum fixnum) ( void 
"set_ScreenFormat_ext_data" ))
 
 
 ;;;;;; XSetWindowAttributes funcions ;;;;;;
 
-(defentry make-XSetWindowAttributes () ( int  "make_XSetWindowAttributes" ))
-(defentry XSetWindowAttributes-cursor (int) ( int 
"XSetWindowAttributes_cursor" ))
-(defentry set-XSetWindowAttributes-cursor (int int) ( void 
"set_XSetWindowAttributes_cursor" ))
-(defentry XSetWindowAttributes-colormap (int) ( int 
"XSetWindowAttributes_colormap" ))
-(defentry set-XSetWindowAttributes-colormap (int int) ( void 
"set_XSetWindowAttributes_colormap" ))
-(defentry XSetWindowAttributes-override_redirect (int) ( int 
"XSetWindowAttributes_override_redirect" ))
-(defentry set-XSetWindowAttributes-override_redirect (int int) ( void 
"set_XSetWindowAttributes_override_redirect" ))
-(defentry XSetWindowAttributes-do_not_propagate_mask (int) ( int 
"XSetWindowAttributes_do_not_propagate_mask" ))
-(defentry set-XSetWindowAttributes-do_not_propagate_mask (int int) ( void 
"set_XSetWindowAttributes_do_not_propagate_mask" ))
-(defentry XSetWindowAttributes-event_mask (int) ( int 
"XSetWindowAttributes_event_mask" ))
-(defentry set-XSetWindowAttributes-event_mask (int int) ( void 
"set_XSetWindowAttributes_event_mask" ))
-(defentry XSetWindowAttributes-save_under (int) ( int 
"XSetWindowAttributes_save_under" ))
-(defentry set-XSetWindowAttributes-save_under (int int) ( void 
"set_XSetWindowAttributes_save_under" ))
-(defentry XSetWindowAttributes-backing_pixel (int) ( int 
"XSetWindowAttributes_backing_pixel" ))
-(defentry set-XSetWindowAttributes-backing_pixel (int int) ( void 
"set_XSetWindowAttributes_backing_pixel" ))
-(defentry XSetWindowAttributes-backing_planes (int) ( int 
"XSetWindowAttributes_backing_planes" ))
-(defentry set-XSetWindowAttributes-backing_planes (int int) ( void 
"set_XSetWindowAttributes_backing_planes" ))
-(defentry XSetWindowAttributes-backing_store (int) ( int 
"XSetWindowAttributes_backing_store" ))
-(defentry set-XSetWindowAttributes-backing_store (int int) ( void 
"set_XSetWindowAttributes_backing_store" ))
-(defentry XSetWindowAttributes-win_gravity (int) ( int 
"XSetWindowAttributes_win_gravity" ))
-(defentry set-XSetWindowAttributes-win_gravity (int int) ( void 
"set_XSetWindowAttributes_win_gravity" ))
-(defentry XSetWindowAttributes-bit_gravity (int) ( int 
"XSetWindowAttributes_bit_gravity" ))
-(defentry set-XSetWindowAttributes-bit_gravity (int int) ( void 
"set_XSetWindowAttributes_bit_gravity" ))
-(defentry XSetWindowAttributes-border_pixel (int) ( int 
"XSetWindowAttributes_border_pixel" ))
-(defentry set-XSetWindowAttributes-border_pixel (int int) ( void 
"set_XSetWindowAttributes_border_pixel" ))
-(defentry XSetWindowAttributes-border_pixmap (int) ( int 
"XSetWindowAttributes_border_pixmap" ))
-(defentry set-XSetWindowAttributes-border_pixmap (int int) ( void 
"set_XSetWindowAttributes_border_pixmap" ))
-(defentry XSetWindowAttributes-background_pixel (int) ( int 
"XSetWindowAttributes_background_pixel" ))
-(defentry set-XSetWindowAttributes-background_pixel (int int) ( void 
"set_XSetWindowAttributes_background_pixel" ))
-(defentry XSetWindowAttributes-background_pixmap (int) ( int 
"XSetWindowAttributes_background_pixmap" ))
-(defentry set-XSetWindowAttributes-background_pixmap (int int) ( void 
"set_XSetWindowAttributes_background_pixmap" ))
+(defentry make-XSetWindowAttributes () ( fixnum  "make_XSetWindowAttributes" ))
+(defentry XSetWindowAttributes-cursor (fixnum) ( fixnum 
"XSetWindowAttributes_cursor" ))
+(defentry set-XSetWindowAttributes-cursor (fixnum fixnum) ( void 
"set_XSetWindowAttributes_cursor" ))
+(defentry XSetWindowAttributes-colormap (fixnum) ( fixnum 
"XSetWindowAttributes_colormap" ))
+(defentry set-XSetWindowAttributes-colormap (fixnum fixnum) ( void 
"set_XSetWindowAttributes_colormap" ))
+(defentry XSetWindowAttributes-override_redirect (fixnum) ( fixnum 
"XSetWindowAttributes_override_redirect" ))
+(defentry set-XSetWindowAttributes-override_redirect (fixnum fixnum) ( void 
"set_XSetWindowAttributes_override_redirect" ))
+(defentry XSetWindowAttributes-do_not_propagate_mask (fixnum) ( fixnum 
"XSetWindowAttributes_do_not_propagate_mask" ))
+(defentry set-XSetWindowAttributes-do_not_propagate_mask (fixnum fixnum) ( 
void "set_XSetWindowAttributes_do_not_propagate_mask" ))
+(defentry XSetWindowAttributes-event_mask (fixnum) ( fixnum 
"XSetWindowAttributes_event_mask" ))
+(defentry set-XSetWindowAttributes-event_mask (fixnum fixnum) ( void 
"set_XSetWindowAttributes_event_mask" ))
+(defentry XSetWindowAttributes-save_under (fixnum) ( fixnum 
"XSetWindowAttributes_save_under" ))
+(defentry set-XSetWindowAttributes-save_under (fixnum fixnum) ( void 
"set_XSetWindowAttributes_save_under" ))
+(defentry XSetWindowAttributes-backing_pixel (fixnum) ( fixnum 
"XSetWindowAttributes_backing_pixel" ))
+(defentry set-XSetWindowAttributes-backing_pixel (fixnum fixnum) ( void 
"set_XSetWindowAttributes_backing_pixel" ))
+(defentry XSetWindowAttributes-backing_planes (fixnum) ( fixnum 
"XSetWindowAttributes_backing_planes" ))
+(defentry set-XSetWindowAttributes-backing_planes (fixnum fixnum) ( void 
"set_XSetWindowAttributes_backing_planes" ))
+(defentry XSetWindowAttributes-backing_store (fixnum) ( fixnum 
"XSetWindowAttributes_backing_store" ))
+(defentry set-XSetWindowAttributes-backing_store (fixnum fixnum) ( void 
"set_XSetWindowAttributes_backing_store" ))
+(defentry XSetWindowAttributes-win_gravity (fixnum) ( fixnum 
"XSetWindowAttributes_win_gravity" ))
+(defentry set-XSetWindowAttributes-win_gravity (fixnum fixnum) ( void 
"set_XSetWindowAttributes_win_gravity" ))
+(defentry XSetWindowAttributes-bit_gravity (fixnum) ( fixnum 
"XSetWindowAttributes_bit_gravity" ))
+(defentry set-XSetWindowAttributes-bit_gravity (fixnum fixnum) ( void 
"set_XSetWindowAttributes_bit_gravity" ))
+(defentry XSetWindowAttributes-border_pixel (fixnum) ( fixnum 
"XSetWindowAttributes_border_pixel" ))
+(defentry set-XSetWindowAttributes-border_pixel (fixnum fixnum) ( void 
"set_XSetWindowAttributes_border_pixel" ))
+(defentry XSetWindowAttributes-border_pixmap (fixnum) ( fixnum 
"XSetWindowAttributes_border_pixmap" ))
+(defentry set-XSetWindowAttributes-border_pixmap (fixnum fixnum) ( void 
"set_XSetWindowAttributes_border_pixmap" ))
+(defentry XSetWindowAttributes-background_pixel (fixnum) ( fixnum 
"XSetWindowAttributes_background_pixel" ))
+(defentry set-XSetWindowAttributes-background_pixel (fixnum fixnum) ( void 
"set_XSetWindowAttributes_background_pixel" ))
+(defentry XSetWindowAttributes-background_pixmap (fixnum) ( fixnum 
"XSetWindowAttributes_background_pixmap" ))
+(defentry set-XSetWindowAttributes-background_pixmap (fixnum fixnum) ( void 
"set_XSetWindowAttributes_background_pixmap" ))
 
 
 ;;;;;; XWindowAttributes funcions ;;;;;;
 
-(defentry make-XWindowAttributes () ( int  "make_XWindowAttributes" ))
-(defentry XWindowAttributes-screen (int) ( int "XWindowAttributes_screen" ))
-(defentry set-XWindowAttributes-screen (int int) ( void 
"set_XWindowAttributes_screen" ))
-(defentry XWindowAttributes-override_redirect (int) ( int 
"XWindowAttributes_override_redirect" ))
-(defentry set-XWindowAttributes-override_redirect (int int) ( void 
"set_XWindowAttributes_override_redirect" ))
-(defentry XWindowAttributes-do_not_propagate_mask (int) ( int 
"XWindowAttributes_do_not_propagate_mask" ))
-(defentry set-XWindowAttributes-do_not_propagate_mask (int int) ( void 
"set_XWindowAttributes_do_not_propagate_mask" ))
-(defentry XWindowAttributes-your_event_mask (int) ( int 
"XWindowAttributes_your_event_mask" ))
-(defentry set-XWindowAttributes-your_event_mask (int int) ( void 
"set_XWindowAttributes_your_event_mask" ))
-(defentry XWindowAttributes-all_event_masks (int) ( int 
"XWindowAttributes_all_event_masks" ))
-(defentry set-XWindowAttributes-all_event_masks (int int) ( void 
"set_XWindowAttributes_all_event_masks" ))
-(defentry XWindowAttributes-map_state (int) ( int 
"XWindowAttributes_map_state" ))
-(defentry set-XWindowAttributes-map_state (int int) ( void 
"set_XWindowAttributes_map_state" ))
-(defentry XWindowAttributes-map_installed (int) ( int 
"XWindowAttributes_map_installed" ))
-(defentry set-XWindowAttributes-map_installed (int int) ( void 
"set_XWindowAttributes_map_installed" ))
-(defentry XWindowAttributes-colormap (int) ( int "XWindowAttributes_colormap" 
))
-(defentry set-XWindowAttributes-colormap (int int) ( void 
"set_XWindowAttributes_colormap" ))
-(defentry XWindowAttributes-save_under (int) ( int 
"XWindowAttributes_save_under" ))
-(defentry set-XWindowAttributes-save_under (int int) ( void 
"set_XWindowAttributes_save_under" ))
-(defentry XWindowAttributes-backing_pixel (int) ( int 
"XWindowAttributes_backing_pixel" ))
-(defentry set-XWindowAttributes-backing_pixel (int int) ( void 
"set_XWindowAttributes_backing_pixel" ))
-(defentry XWindowAttributes-backing_planes (int) ( int 
"XWindowAttributes_backing_planes" ))
-(defentry set-XWindowAttributes-backing_planes (int int) ( void 
"set_XWindowAttributes_backing_planes" ))
-(defentry XWindowAttributes-backing_store (int) ( int 
"XWindowAttributes_backing_store" ))
-(defentry set-XWindowAttributes-backing_store (int int) ( void 
"set_XWindowAttributes_backing_store" ))
-(defentry XWindowAttributes-win_gravity (int) ( int 
"XWindowAttributes_win_gravity" ))
-(defentry set-XWindowAttributes-win_gravity (int int) ( void 
"set_XWindowAttributes_win_gravity" ))
-(defentry XWindowAttributes-bit_gravity (int) ( int 
"XWindowAttributes_bit_gravity" ))
-(defentry set-XWindowAttributes-bit_gravity (int int) ( void 
"set_XWindowAttributes_bit_gravity" ))
-(defentry XWindowAttributes-class (int) ( int "XWindowAttributes_class" ))
-(defentry set-XWindowAttributes-class (int int) ( void 
"set_XWindowAttributes_class" ))
-(defentry XWindowAttributes-root (int) ( int "XWindowAttributes_root" ))
-(defentry set-XWindowAttributes-root (int int) ( void 
"set_XWindowAttributes_root" ))
-(defentry XWindowAttributes-visual (int) ( int "XWindowAttributes_visual" ))
-(defentry set-XWindowAttributes-visual (int int) ( void 
"set_XWindowAttributes_visual" ))
-(defentry XWindowAttributes-depth (int) ( int "XWindowAttributes_depth" ))
-(defentry set-XWindowAttributes-depth (int int) ( void 
"set_XWindowAttributes_depth" ))
-(defentry XWindowAttributes-border_width (int) ( int 
"XWindowAttributes_border_width" ))
-(defentry set-XWindowAttributes-border_width (int int) ( void 
"set_XWindowAttributes_border_width" ))
-(defentry XWindowAttributes-height (int) ( int "XWindowAttributes_height" ))
-(defentry set-XWindowAttributes-height (int int) ( void 
"set_XWindowAttributes_height" ))
-(defentry XWindowAttributes-width (int) ( int "XWindowAttributes_width" ))
-(defentry set-XWindowAttributes-width (int int) ( void 
"set_XWindowAttributes_width" ))
-(defentry XWindowAttributes-y (int) ( int "XWindowAttributes_y" ))
-(defentry set-XWindowAttributes-y (int int) ( void "set_XWindowAttributes_y" ))
-(defentry XWindowAttributes-x (int) ( int "XWindowAttributes_x" ))
-(defentry set-XWindowAttributes-x (int int) ( void "set_XWindowAttributes_x" ))
+(defentry make-XWindowAttributes () ( fixnum  "make_XWindowAttributes" ))
+(defentry XWindowAttributes-screen (fixnum) ( fixnum 
"XWindowAttributes_screen" ))
+(defentry set-XWindowAttributes-screen (fixnum fixnum) ( void 
"set_XWindowAttributes_screen" ))
+(defentry XWindowAttributes-override_redirect (fixnum) ( fixnum 
"XWindowAttributes_override_redirect" ))
+(defentry set-XWindowAttributes-override_redirect (fixnum fixnum) ( void 
"set_XWindowAttributes_override_redirect" ))
+(defentry XWindowAttributes-do_not_propagate_mask (fixnum) ( fixnum 
"XWindowAttributes_do_not_propagate_mask" ))
+(defentry set-XWindowAttributes-do_not_propagate_mask (fixnum fixnum) ( void 
"set_XWindowAttributes_do_not_propagate_mask" ))
+(defentry XWindowAttributes-your_event_mask (fixnum) ( fixnum 
"XWindowAttributes_your_event_mask" ))
+(defentry set-XWindowAttributes-your_event_mask (fixnum fixnum) ( void 
"set_XWindowAttributes_your_event_mask" ))
+(defentry XWindowAttributes-all_event_masks (fixnum) ( fixnum 
"XWindowAttributes_all_event_masks" ))
+(defentry set-XWindowAttributes-all_event_masks (fixnum fixnum) ( void 
"set_XWindowAttributes_all_event_masks" ))
+(defentry XWindowAttributes-map_state (fixnum) ( fixnum 
"XWindowAttributes_map_state" ))
+(defentry set-XWindowAttributes-map_state (fixnum fixnum) ( void 
"set_XWindowAttributes_map_state" ))
+(defentry XWindowAttributes-map_installed (fixnum) ( fixnum 
"XWindowAttributes_map_installed" ))
+(defentry set-XWindowAttributes-map_installed (fixnum fixnum) ( void 
"set_XWindowAttributes_map_installed" ))
+(defentry XWindowAttributes-colormap (fixnum) ( fixnum 
"XWindowAttributes_colormap" ))
+(defentry set-XWindowAttributes-colormap (fixnum fixnum) ( void 
"set_XWindowAttributes_colormap" ))
+(defentry XWindowAttributes-save_under (fixnum) ( fixnum 
"XWindowAttributes_save_under" ))
+(defentry set-XWindowAttributes-save_under (fixnum fixnum) ( void 
"set_XWindowAttributes_save_under" ))
+(defentry XWindowAttributes-backing_pixel (fixnum) ( fixnum 
"XWindowAttributes_backing_pixel" ))
+(defentry set-XWindowAttributes-backing_pixel (fixnum fixnum) ( void 
"set_XWindowAttributes_backing_pixel" ))
+(defentry XWindowAttributes-backing_planes (fixnum) ( fixnum 
"XWindowAttributes_backing_planes" ))
+(defentry set-XWindowAttributes-backing_planes (fixnum fixnum) ( void 
"set_XWindowAttributes_backing_planes" ))
+(defentry XWindowAttributes-backing_store (fixnum) ( fixnum 
"XWindowAttributes_backing_store" ))
+(defentry set-XWindowAttributes-backing_store (fixnum fixnum) ( void 
"set_XWindowAttributes_backing_store" ))
+(defentry XWindowAttributes-win_gravity (fixnum) ( fixnum 
"XWindowAttributes_win_gravity" ))
+(defentry set-XWindowAttributes-win_gravity (fixnum fixnum) ( void 
"set_XWindowAttributes_win_gravity" ))
+(defentry XWindowAttributes-bit_gravity (fixnum) ( fixnum 
"XWindowAttributes_bit_gravity" ))
+(defentry set-XWindowAttributes-bit_gravity (fixnum fixnum) ( void 
"set_XWindowAttributes_bit_gravity" ))
+(defentry XWindowAttributes-class (fixnum) ( fixnum "XWindowAttributes_class" 
))
+(defentry set-XWindowAttributes-class (fixnum fixnum) ( void 
"set_XWindowAttributes_class" ))
+(defentry XWindowAttributes-root (fixnum) ( fixnum "XWindowAttributes_root" ))
+(defentry set-XWindowAttributes-root (fixnum fixnum) ( void 
"set_XWindowAttributes_root" ))
+(defentry XWindowAttributes-visual (fixnum) ( fixnum 
"XWindowAttributes_visual" ))
+(defentry set-XWindowAttributes-visual (fixnum fixnum) ( void 
"set_XWindowAttributes_visual" ))
+(defentry XWindowAttributes-depth (fixnum) ( fixnum "XWindowAttributes_depth" 
))
+(defentry set-XWindowAttributes-depth (fixnum fixnum) ( void 
"set_XWindowAttributes_depth" ))
+(defentry XWindowAttributes-border_width (fixnum) ( fixnum 
"XWindowAttributes_border_width" ))
+(defentry set-XWindowAttributes-border_width (fixnum fixnum) ( void 
"set_XWindowAttributes_border_width" ))
+(defentry XWindowAttributes-height (fixnum) ( fixnum 
"XWindowAttributes_height" ))
+(defentry set-XWindowAttributes-height (fixnum fixnum) ( void 
"set_XWindowAttributes_height" ))
+(defentry XWindowAttributes-width (fixnum) ( fixnum "XWindowAttributes_width" 
))
+(defentry set-XWindowAttributes-width (fixnum fixnum) ( void 
"set_XWindowAttributes_width" ))
+(defentry XWindowAttributes-y (fixnum) ( fixnum "XWindowAttributes_y" ))
+(defentry set-XWindowAttributes-y (fixnum fixnum) ( void 
"set_XWindowAttributes_y" ))
+(defentry XWindowAttributes-x (fixnum) ( fixnum "XWindowAttributes_x" ))
+(defentry set-XWindowAttributes-x (fixnum fixnum) ( void 
"set_XWindowAttributes_x" ))
 
 
 ;;;;;; XHostAddress funcions ;;;;;;
 
-(defentry make-XHostAddress () ( int  "make_XHostAddress" ))
-(defentry XHostAddress-address (int) ( int "XHostAddress_address" ))
-(defentry set-XHostAddress-address (int int) ( void "set_XHostAddress_address" 
))
-(defentry XHostAddress-length (int) ( int "XHostAddress_length" ))
-(defentry set-XHostAddress-length (int int) ( void "set_XHostAddress_length" ))
-(defentry XHostAddress-family (int) ( int "XHostAddress_family" ))
-(defentry set-XHostAddress-family (int int) ( void "set_XHostAddress_family" ))
+(defentry make-XHostAddress () ( fixnum  "make_XHostAddress" ))
+(defentry XHostAddress-address (fixnum) ( fixnum "XHostAddress_address" ))
+(defentry set-XHostAddress-address (fixnum fixnum) ( void 
"set_XHostAddress_address" ))
+(defentry XHostAddress-length (fixnum) ( fixnum "XHostAddress_length" ))
+(defentry set-XHostAddress-length (fixnum fixnum) ( void 
"set_XHostAddress_length" ))
+(defentry XHostAddress-family (fixnum) ( fixnum "XHostAddress_family" ))
+(defentry set-XHostAddress-family (fixnum fixnum) ( void 
"set_XHostAddress_family" ))
 
 
 ;;;;;; XImage funcions ;;;;;;
 
-(defentry make-XImage () ( int  "make_XImage" ))
-;;(defentry XImage-f (int) ( int "XImage_f" ))
-;;(defentry set-XImage-f (int int) ( void "set_XImage_f" ))
-(defentry XImage-obdata (int) ( int "XImage_obdata" ))
-(defentry set-XImage-obdata (int int) ( void "set_XImage_obdata" ))
-(defentry XImage-blue_mask (int) ( int "XImage_blue_mask" ))
-(defentry set-XImage-blue_mask (int int) ( void "set_XImage_blue_mask" ))
-(defentry XImage-green_mask (int) ( int "XImage_green_mask" ))
-(defentry set-XImage-green_mask (int int) ( void "set_XImage_green_mask" ))
-(defentry XImage-red_mask (int) ( int "XImage_red_mask" ))
-(defentry set-XImage-red_mask (int int) ( void "set_XImage_red_mask" ))
-(defentry XImage-bits_per_pixel (int) ( int "XImage_bits_per_pixel" ))
-(defentry set-XImage-bits_per_pixel (int int) ( void 
"set_XImage_bits_per_pixel" ))
-(defentry XImage-bytes_per_line (int) ( int "XImage_bytes_per_line" ))
-(defentry set-XImage-bytes_per_line (int int) ( void 
"set_XImage_bytes_per_line" ))
-(defentry XImage-depth (int) ( int "XImage_depth" ))
-(defentry set-XImage-depth (int int) ( void "set_XImage_depth" ))
-(defentry XImage-bitmap_pad (int) ( int "XImage_bitmap_pad" ))
-(defentry set-XImage-bitmap_pad (int int) ( void "set_XImage_bitmap_pad" ))
-(defentry XImage-bitmap_bit_order (int) ( int "XImage_bitmap_bit_order" ))
-(defentry set-XImage-bitmap_bit_order (int int) ( void 
"set_XImage_bitmap_bit_order" ))
-(defentry XImage-bitmap_unit (int) ( int "XImage_bitmap_unit" ))
-(defentry set-XImage-bitmap_unit (int int) ( void "set_XImage_bitmap_unit" ))
-(defentry XImage-byte_order (int) ( int "XImage_byte_order" ))
-(defentry set-XImage-byte_order (int int) ( void "set_XImage_byte_order" ))
-(defentry XImage-data (int) ( int "XImage_data" ))
-(defentry set-XImage-data (int int) ( void "set_XImage_data" ))
-(defentry XImage-format (int) ( int "XImage_format" ))
-(defentry set-XImage-format (int int) ( void "set_XImage_format" ))
-(defentry XImage-xoffset (int) ( int "XImage_xoffset" ))
-(defentry set-XImage-xoffset (int int) ( void "set_XImage_xoffset" ))
-(defentry XImage-height (int) ( int "XImage_height" ))
-(defentry set-XImage-height (int int) ( void "set_XImage_height" ))
-(defentry XImage-width (int) ( int "XImage_width" ))
-(defentry set-XImage-width (int int) ( void "set_XImage_width" ))
+(defentry make-XImage () ( fixnum  "make_XImage" ))
+;;(defentry XImage-f (fixnum) ( fixnum "XImage_f" ))
+;;(defentry set-XImage-f (fixnum fixnum) ( void "set_XImage_f" ))
+(defentry XImage-obdata (fixnum) ( fixnum "XImage_obdata" ))
+(defentry set-XImage-obdata (fixnum fixnum) ( void "set_XImage_obdata" ))
+(defentry XImage-blue_mask (fixnum) ( fixnum "XImage_blue_mask" ))
+(defentry set-XImage-blue_mask (fixnum fixnum) ( void "set_XImage_blue_mask" ))
+(defentry XImage-green_mask (fixnum) ( fixnum "XImage_green_mask" ))
+(defentry set-XImage-green_mask (fixnum fixnum) ( void "set_XImage_green_mask" 
))
+(defentry XImage-red_mask (fixnum) ( fixnum "XImage_red_mask" ))
+(defentry set-XImage-red_mask (fixnum fixnum) ( void "set_XImage_red_mask" ))
+(defentry XImage-bits_per_pixel (fixnum) ( fixnum "XImage_bits_per_pixel" ))
+(defentry set-XImage-bits_per_pixel (fixnum fixnum) ( void 
"set_XImage_bits_per_pixel" ))
+(defentry XImage-bytes_per_line (fixnum) ( fixnum "XImage_bytes_per_line" ))
+(defentry set-XImage-bytes_per_line (fixnum fixnum) ( void 
"set_XImage_bytes_per_line" ))
+(defentry XImage-depth (fixnum) ( fixnum "XImage_depth" ))
+(defentry set-XImage-depth (fixnum fixnum) ( void "set_XImage_depth" ))
+(defentry XImage-bitmap_pad (fixnum) ( fixnum "XImage_bitmap_pad" ))
+(defentry set-XImage-bitmap_pad (fixnum fixnum) ( void "set_XImage_bitmap_pad" 
))
+(defentry XImage-bitmap_bit_order (fixnum) ( fixnum "XImage_bitmap_bit_order" 
))
+(defentry set-XImage-bitmap_bit_order (fixnum fixnum) ( void 
"set_XImage_bitmap_bit_order" ))
+(defentry XImage-bitmap_unit (fixnum) ( fixnum "XImage_bitmap_unit" ))
+(defentry set-XImage-bitmap_unit (fixnum fixnum) ( void 
"set_XImage_bitmap_unit" ))
+(defentry XImage-byte_order (fixnum) ( fixnum "XImage_byte_order" ))
+(defentry set-XImage-byte_order (fixnum fixnum) ( void "set_XImage_byte_order" 
))
+(defentry XImage-data (fixnum) ( fixnum "XImage_data" ))
+(defentry set-XImage-data (fixnum fixnum) ( void "set_XImage_data" ))
+(defentry XImage-format (fixnum) ( fixnum "XImage_format" ))
+(defentry set-XImage-format (fixnum fixnum) ( void "set_XImage_format" ))
+(defentry XImage-xoffset (fixnum) ( fixnum "XImage_xoffset" ))
+(defentry set-XImage-xoffset (fixnum fixnum) ( void "set_XImage_xoffset" ))
+(defentry XImage-height (fixnum) ( fixnum "XImage_height" ))
+(defentry set-XImage-height (fixnum fixnum) ( void "set_XImage_height" ))
+(defentry XImage-width (fixnum) ( fixnum "XImage_width" ))
+(defentry set-XImage-width (fixnum fixnum) ( void "set_XImage_width" ))
 
 
 ;;;;;; XWindowChanges funcions ;;;;;;
 
-(defentry make-XWindowChanges () ( int  "make_XWindowChanges" ))
-(defentry XWindowChanges-stack_mode (int) ( int "XWindowChanges_stack_mode" ))
-(defentry set-XWindowChanges-stack_mode (int int) ( void 
"set_XWindowChanges_stack_mode" ))
-(defentry XWindowChanges-sibling (int) ( int "XWindowChanges_sibling" ))
-(defentry set-XWindowChanges-sibling (int int) ( void 
"set_XWindowChanges_sibling" ))
-(defentry XWindowChanges-border_width (int) ( int 
"XWindowChanges_border_width" ))
-(defentry set-XWindowChanges-border_width (int int) ( void 
"set_XWindowChanges_border_width" ))
-(defentry XWindowChanges-height (int) ( int "XWindowChanges_height" ))
-(defentry set-XWindowChanges-height (int int) ( void 
"set_XWindowChanges_height" ))
-(defentry XWindowChanges-width (int) ( int "XWindowChanges_width" ))
-(defentry set-XWindowChanges-width (int int) ( void "set_XWindowChanges_width" 
))
-(defentry XWindowChanges-y (int) ( int "XWindowChanges_y" ))
-(defentry set-XWindowChanges-y (int int) ( void "set_XWindowChanges_y" ))
-(defentry XWindowChanges-x (int) ( int "XWindowChanges_x" ))
-(defentry set-XWindowChanges-x (int int) ( void "set_XWindowChanges_x" ))
+(defentry make-XWindowChanges () ( fixnum  "make_XWindowChanges" ))
+(defentry XWindowChanges-stack_mode (fixnum) ( fixnum 
"XWindowChanges_stack_mode" ))
+(defentry set-XWindowChanges-stack_mode (fixnum fixnum) ( void 
"set_XWindowChanges_stack_mode" ))
+(defentry XWindowChanges-sibling (fixnum) ( fixnum "XWindowChanges_sibling" ))
+(defentry set-XWindowChanges-sibling (fixnum fixnum) ( void 
"set_XWindowChanges_sibling" ))
+(defentry XWindowChanges-border_width (fixnum) ( fixnum 
"XWindowChanges_border_width" ))
+(defentry set-XWindowChanges-border_width (fixnum fixnum) ( void 
"set_XWindowChanges_border_width" ))
+(defentry XWindowChanges-height (fixnum) ( fixnum "XWindowChanges_height" ))
+(defentry set-XWindowChanges-height (fixnum fixnum) ( void 
"set_XWindowChanges_height" ))
+(defentry XWindowChanges-width (fixnum) ( fixnum "XWindowChanges_width" ))
+(defentry set-XWindowChanges-width (fixnum fixnum) ( void 
"set_XWindowChanges_width" ))
+(defentry XWindowChanges-y (fixnum) ( fixnum "XWindowChanges_y" ))
+(defentry set-XWindowChanges-y (fixnum fixnum) ( void "set_XWindowChanges_y" ))
+(defentry XWindowChanges-x (fixnum) ( fixnum "XWindowChanges_x" ))
+(defentry set-XWindowChanges-x (fixnum fixnum) ( void "set_XWindowChanges_x" ))
 
 
 ;;;;;; XColor funcions ;;;;;;
 
-(defentry make-XColor () ( int  "make_XColor" ))
-(defentry XColor-pad (int) ( char "XColor_pad" ))
-(defentry set-XColor-pad (int char) ( void "set_XColor_pad" ))
-(defentry XColor-flags (int) ( char "XColor_flags" ))
-(defentry set-XColor-flags (int char) ( void "set_XColor_flags" ))
-(defentry XColor-blue (int) ( int "XColor_blue" ))
-(defentry set-XColor-blue (int int) ( void "set_XColor_blue" ))
-(defentry XColor-green (int) ( int "XColor_green" ))
-(defentry set-XColor-green (int int) ( void "set_XColor_green" ))
-(defentry XColor-red (int) ( int "XColor_red" ))
-(defentry set-XColor-red (int int) ( void "set_XColor_red" ))
-(defentry XColor-pixel (int) ( int "XColor_pixel" ))
-(defentry set-XColor-pixel (int int) ( void "set_XColor_pixel" ))
+(defentry make-XColor () ( fixnum  "make_XColor" ))
+(defentry XColor-pad (fixnum) ( char "XColor_pad" ))
+(defentry set-XColor-pad (fixnum char) ( void "set_XColor_pad" ))
+(defentry XColor-flags (fixnum) ( char "XColor_flags" ))
+(defentry set-XColor-flags (fixnum char) ( void "set_XColor_flags" ))
+(defentry XColor-blue (fixnum) ( fixnum "XColor_blue" ))
+(defentry set-XColor-blue (fixnum fixnum) ( void "set_XColor_blue" ))
+(defentry XColor-green (fixnum) ( fixnum "XColor_green" ))
+(defentry set-XColor-green (fixnum fixnum) ( void "set_XColor_green" ))
+(defentry XColor-red (fixnum) ( fixnum "XColor_red" ))
+(defentry set-XColor-red (fixnum fixnum) ( void "set_XColor_red" ))
+(defentry XColor-pixel (fixnum) ( fixnum "XColor_pixel" ))
+(defentry set-XColor-pixel (fixnum fixnum) ( void "set_XColor_pixel" ))
 
 
 ;;;;;; XSegment funcions ;;;;;;
 
-(defentry make-XSegment () ( int  "make_XSegment" ))
-(defentry XSegment-y2 (int) ( int "XSegment_y2" ))
-(defentry set-XSegment-y2 (int int) ( void "set_XSegment_y2" ))
-(defentry XSegment-x2 (int) ( int "XSegment_x2" ))
-(defentry set-XSegment-x2 (int int) ( void "set_XSegment_x2" ))
-(defentry XSegment-y1 (int) ( int "XSegment_y1" ))
-(defentry set-XSegment-y1 (int int) ( void "set_XSegment_y1" ))
-(defentry XSegment-x1 (int) ( int "XSegment_x1" ))
-(defentry set-XSegment-x1 (int int) ( void "set_XSegment_x1" ))
+(defentry make-XSegment () ( fixnum  "make_XSegment" ))
+(defentry XSegment-y2 (fixnum) ( fixnum "XSegment_y2" ))
+(defentry set-XSegment-y2 (fixnum fixnum) ( void "set_XSegment_y2" ))
+(defentry XSegment-x2 (fixnum) ( fixnum "XSegment_x2" ))
+(defentry set-XSegment-x2 (fixnum fixnum) ( void "set_XSegment_x2" ))
+(defentry XSegment-y1 (fixnum) ( fixnum "XSegment_y1" ))
+(defentry set-XSegment-y1 (fixnum fixnum) ( void "set_XSegment_y1" ))
+(defentry XSegment-x1 (fixnum) ( fixnum "XSegment_x1" ))
+(defentry set-XSegment-x1 (fixnum fixnum) ( void "set_XSegment_x1" ))
 
 
 ;;;;;; XPoint funcions ;;;;;;
 
-(defentry make-XPoint () ( int  "make_XPoint" ))
-(defentry XPoint-y (int) ( int "XPoint_y" ))
-(defentry set-XPoint-y (int int) ( void "set_XPoint_y" ))
-(defentry XPoint-x (int) ( int "XPoint_x" ))
-(defentry set-XPoint-x (int int) ( void "set_XPoint_x" ))
+(defentry make-XPoint () ( fixnum  "make_XPoint" ))
+(defentry XPoint-y (fixnum) ( fixnum "XPoint_y" ))
+(defentry set-XPoint-y (fixnum fixnum) ( void "set_XPoint_y" ))
+(defentry XPoint-x (fixnum) ( fixnum "XPoint_x" ))
+(defentry set-XPoint-x (fixnum fixnum) ( void "set_XPoint_x" ))
 
 
 ;;;;;; XRectangle funcions ;;;;;;
 
-(defentry make-XRectangle () ( int  "make_XRectangle" ))
-(defentry XRectangle-height (int) ( int "XRectangle_height" ))
-(defentry set-XRectangle-height (int int) ( void "set_XRectangle_height" ))
-(defentry XRectangle-width (int) ( int "XRectangle_width" ))
-(defentry set-XRectangle-width (int int) ( void "set_XRectangle_width" ))
-(defentry XRectangle-y (int) ( int "XRectangle_y" ))
-(defentry set-XRectangle-y (int int) ( void "set_XRectangle_y" ))
-(defentry XRectangle-x (int) ( int "XRectangle_x" ))
-(defentry set-XRectangle-x (int int) ( void "set_XRectangle_x" ))
+(defentry make-XRectangle () ( fixnum  "make_XRectangle" ))
+(defentry XRectangle-height (fixnum) ( fixnum "XRectangle_height" ))
+(defentry set-XRectangle-height (fixnum fixnum) ( void "set_XRectangle_height" 
))
+(defentry XRectangle-width (fixnum) ( fixnum "XRectangle_width" ))
+(defentry set-XRectangle-width (fixnum fixnum) ( void "set_XRectangle_width" ))
+(defentry XRectangle-y (fixnum) ( fixnum "XRectangle_y" ))
+(defentry set-XRectangle-y (fixnum fixnum) ( void "set_XRectangle_y" ))
+(defentry XRectangle-x (fixnum) ( fixnum "XRectangle_x" ))
+(defentry set-XRectangle-x (fixnum fixnum) ( void "set_XRectangle_x" ))
 
 
 ;;;;;; XArc funcions ;;;;;;
 
-(defentry make-XArc () ( int  "make_XArc" ))
-(defentry XArc-angle2 (int) ( int "XArc_angle2" ))
-(defentry set-XArc-angle2 (int int) ( void "set_XArc_angle2" ))
-(defentry XArc-angle1 (int) ( int "XArc_angle1" ))
-(defentry set-XArc-angle1 (int int) ( void "set_XArc_angle1" ))
-(defentry XArc-height (int) ( int "XArc_height" ))
-(defentry set-XArc-height (int int) ( void "set_XArc_height" ))
-(defentry XArc-width (int) ( int "XArc_width" ))
-(defentry set-XArc-width (int int) ( void "set_XArc_width" ))
-(defentry XArc-y (int) ( int "XArc_y" ))
-(defentry set-XArc-y (int int) ( void "set_XArc_y" ))
-(defentry XArc-x (int) ( int "XArc_x" ))
-(defentry set-XArc-x (int int) ( void "set_XArc_x" ))
+(defentry make-XArc () ( fixnum  "make_XArc" ))
+(defentry XArc-angle2 (fixnum) ( fixnum "XArc_angle2" ))
+(defentry set-XArc-angle2 (fixnum fixnum) ( void "set_XArc_angle2" ))
+(defentry XArc-angle1 (fixnum) ( fixnum "XArc_angle1" ))
+(defentry set-XArc-angle1 (fixnum fixnum) ( void "set_XArc_angle1" ))
+(defentry XArc-height (fixnum) ( fixnum "XArc_height" ))
+(defentry set-XArc-height (fixnum fixnum) ( void "set_XArc_height" ))
+(defentry XArc-width (fixnum) ( fixnum "XArc_width" ))
+(defentry set-XArc-width (fixnum fixnum) ( void "set_XArc_width" ))
+(defentry XArc-y (fixnum) ( fixnum "XArc_y" ))
+(defentry set-XArc-y (fixnum fixnum) ( void "set_XArc_y" ))
+(defentry XArc-x (fixnum) ( fixnum "XArc_x" ))
+(defentry set-XArc-x (fixnum fixnum) ( void "set_XArc_x" ))
 
 
 ;;;;;; XKeyboardControl funcions ;;;;;;
 
-(defentry make-XKeyboardControl () ( int  "make_XKeyboardControl" ))
-(defentry XKeyboardControl-auto_repeat_mode (int) ( int 
"XKeyboardControl_auto_repeat_mode" ))
-;;(defentry set-XKeyboardControl-auto_repeat_mode (int int) ( void 
"set_XKeyboardControl_auto_repeat_mode" ))
-(defentry XKeyboardControl-key (int) ( int "XKeyboardControl_key" ))
-(defentry set-XKeyboardControl-key (int int) ( void "set_XKeyboardControl_key" 
))
-(defentry XKeyboardControl-led_mode (int) ( int "XKeyboardControl_led_mode" ))
-(defentry set-XKeyboardControl-led_mode (int int) ( void 
"set_XKeyboardControl_led_mode" ))
-(defentry XKeyboardControl-led (int) ( int "XKeyboardControl_led" ))
-(defentry set-XKeyboardControl-led (int int) ( void "set_XKeyboardControl_led" 
))
-(defentry XKeyboardControl-bell_duration (int) ( int 
"XKeyboardControl_bell_duration" ))
-(defentry set-XKeyboardControl-bell_duration (int int) ( void 
"set_XKeyboardControl_bell_duration" ))
-(defentry XKeyboardControl-bell_pitch (int) ( int 
"XKeyboardControl_bell_pitch" ))
-(defentry set-XKeyboardControl-bell_pitch (int int) ( void 
"set_XKeyboardControl_bell_pitch" ))
-(defentry XKeyboardControl-bell_percent (int) ( int 
"XKeyboardControl_bell_percent" ))
-(defentry set-XKeyboardControl-bell_percent (int int) ( void 
"set_XKeyboardControl_bell_percent" ))
-(defentry XKeyboardControl-key_click_percent (int) ( int 
"XKeyboardControl_key_click_percent" ))
-(defentry set-XKeyboardControl-key_click_percent (int int) ( void 
"set_XKeyboardControl_key_click_percent" ))
+(defentry make-XKeyboardControl () ( fixnum  "make_XKeyboardControl" ))
+(defentry XKeyboardControl-auto_repeat_mode (fixnum) ( fixnum 
"XKeyboardControl_auto_repeat_mode" ))
+;;(defentry set-XKeyboardControl-auto_repeat_mode (fixnum fixnum) ( void 
"set_XKeyboardControl_auto_repeat_mode" ))
+(defentry XKeyboardControl-key (fixnum) ( fixnum "XKeyboardControl_key" ))
+(defentry set-XKeyboardControl-key (fixnum fixnum) ( void 
"set_XKeyboardControl_key" ))
+(defentry XKeyboardControl-led_mode (fixnum) ( fixnum 
"XKeyboardControl_led_mode" ))
+(defentry set-XKeyboardControl-led_mode (fixnum fixnum) ( void 
"set_XKeyboardControl_led_mode" ))
+(defentry XKeyboardControl-led (fixnum) ( fixnum "XKeyboardControl_led" ))
+(defentry set-XKeyboardControl-led (fixnum fixnum) ( void 
"set_XKeyboardControl_led" ))
+(defentry XKeyboardControl-bell_duration (fixnum) ( fixnum 
"XKeyboardControl_bell_duration" ))
+(defentry set-XKeyboardControl-bell_duration (fixnum fixnum) ( void 
"set_XKeyboardControl_bell_duration" ))
+(defentry XKeyboardControl-bell_pitch (fixnum) ( fixnum 
"XKeyboardControl_bell_pitch" ))
+(defentry set-XKeyboardControl-bell_pitch (fixnum fixnum) ( void 
"set_XKeyboardControl_bell_pitch" ))
+(defentry XKeyboardControl-bell_percent (fixnum) ( fixnum 
"XKeyboardControl_bell_percent" ))
+(defentry set-XKeyboardControl-bell_percent (fixnum fixnum) ( void 
"set_XKeyboardControl_bell_percent" ))
+(defentry XKeyboardControl-key_click_percent (fixnum) ( fixnum 
"XKeyboardControl_key_click_percent" ))
+(defentry set-XKeyboardControl-key_click_percent (fixnum fixnum) ( void 
"set_XKeyboardControl_key_click_percent" ))
 
 
 ;;;;;; XKeyboardState funcions ;;;;;;
 
-(defentry make-XKeyboardState () ( int  "make_XKeyboardState" ))
-(defentry XKeyboardState-auto_repeats (int) ( int 
"XKeyboardState_auto_repeats" ))
-(defentry set-XKeyboardState-auto_repeats (int object) ( void 
"set_XKeyboardState_auto_repeats" ))
-(defentry XKeyboardState-global_auto_repeat (int) ( int 
"XKeyboardState_global_auto_repeat" ))
-(defentry set-XKeyboardState-global_auto_repeat (int int) ( void 
"set_XKeyboardState_global_auto_repeat" ))
-(defentry XKeyboardState-led_mask (int) ( int "XKeyboardState_led_mask" ))
-(defentry set-XKeyboardState-led_mask (int int) ( void 
"set_XKeyboardState_led_mask" ))
-(defentry XKeyboardState-bell_duration (int) ( int 
"XKeyboardState_bell_duration" ))
-(defentry set-XKeyboardState-bell_duration (int int) ( void 
"set_XKeyboardState_bell_duration" ))
-(defentry XKeyboardState-bell_pitch (int) ( int "XKeyboardState_bell_pitch" ))
-(defentry set-XKeyboardState-bell_pitch (int int) ( void 
"set_XKeyboardState_bell_pitch" ))
-(defentry XKeyboardState-bell_percent (int) ( int 
"XKeyboardState_bell_percent" ))
-(defentry set-XKeyboardState-bell_percent (int int) ( void 
"set_XKeyboardState_bell_percent" ))
-(defentry XKeyboardState-key_click_percent (int) ( int 
"XKeyboardState_key_click_percent" ))
-(defentry set-XKeyboardState-key_click_percent (int int) ( void 
"set_XKeyboardState_key_click_percent" ))
+(defentry make-XKeyboardState () ( fixnum  "make_XKeyboardState" ))
+(defentry XKeyboardState-auto_repeats (fixnum) ( fixnum 
"XKeyboardState_auto_repeats" ))
+(defentry set-XKeyboardState-auto_repeats (fixnum object) ( void 
"set_XKeyboardState_auto_repeats" ))
+(defentry XKeyboardState-global_auto_repeat (fixnum) ( fixnum 
"XKeyboardState_global_auto_repeat" ))
+(defentry set-XKeyboardState-global_auto_repeat (fixnum fixnum) ( void 
"set_XKeyboardState_global_auto_repeat" ))
+(defentry XKeyboardState-led_mask (fixnum) ( fixnum "XKeyboardState_led_mask" 
))
+(defentry set-XKeyboardState-led_mask (fixnum fixnum) ( void 
"set_XKeyboardState_led_mask" ))
+(defentry XKeyboardState-bell_duration (fixnum) ( fixnum 
"XKeyboardState_bell_duration" ))
+(defentry set-XKeyboardState-bell_duration (fixnum fixnum) ( void 
"set_XKeyboardState_bell_duration" ))
+(defentry XKeyboardState-bell_pitch (fixnum) ( fixnum 
"XKeyboardState_bell_pitch" ))
+(defentry set-XKeyboardState-bell_pitch (fixnum fixnum) ( void 
"set_XKeyboardState_bell_pitch" ))
+(defentry XKeyboardState-bell_percent (fixnum) ( fixnum 
"XKeyboardState_bell_percent" ))
+(defentry set-XKeyboardState-bell_percent (fixnum fixnum) ( void 
"set_XKeyboardState_bell_percent" ))
+(defentry XKeyboardState-key_click_percent (fixnum) ( fixnum 
"XKeyboardState_key_click_percent" ))
+(defentry set-XKeyboardState-key_click_percent (fixnum fixnum) ( void 
"set_XKeyboardState_key_click_percent" ))
 
 
 ;;;;;; XTimeCoord funcions ;;;;;;
 
-(defentry make-XTimeCoord () ( int  "make_XTimeCoord" ))
-(defentry XTimeCoord-y (int) ( int "XTimeCoord_y" ))
-(defentry set-XTimeCoord-y (int int) ( void "set_XTimeCoord_y" ))
-(defentry XTimeCoord-x (int) ( int "XTimeCoord_x" ))
-(defentry set-XTimeCoord-x (int int) ( void "set_XTimeCoord_x" ))
-(defentry XTimeCoord-time (int) ( int "XTimeCoord_time" ))
-(defentry set-XTimeCoord-time (int int) ( void "set_XTimeCoord_time" ))
+(defentry make-XTimeCoord () ( fixnum  "make_XTimeCoord" ))
+(defentry XTimeCoord-y (fixnum) ( fixnum "XTimeCoord_y" ))
+(defentry set-XTimeCoord-y (fixnum fixnum) ( void "set_XTimeCoord_y" ))
+(defentry XTimeCoord-x (fixnum) ( fixnum "XTimeCoord_x" ))
+(defentry set-XTimeCoord-x (fixnum fixnum) ( void "set_XTimeCoord_x" ))
+(defentry XTimeCoord-time (fixnum) ( fixnum "XTimeCoord_time" ))
+(defentry set-XTimeCoord-time (fixnum fixnum) ( void "set_XTimeCoord_time" ))
 
 
 ;;;;;; XModifierKeymap funcions ;;;;;;
 
-(defentry make-XModifierKeymap () ( int  "make_XModifierKeymap" ))
-(defentry XModifierKeymap-modifiermap (int) ( int 
"XModifierKeymap_modifiermap" ))
-(defentry set-XModifierKeymap-modifiermap (int int) ( void 
"set_XModifierKeymap_modifiermap" ))
-(defentry XModifierKeymap-max_keypermod (int) ( int 
"XModifierKeymap_max_keypermod" ))
-(defentry set-XModifierKeymap-max_keypermod (int int) ( void 
"set_XModifierKeymap_max_keypermod" ))
+(defentry make-XModifierKeymap () ( fixnum  "make_XModifierKeymap" ))
+(defentry XModifierKeymap-modifiermap (fixnum) ( fixnum 
"XModifierKeymap_modifiermap" ))
+(defentry set-XModifierKeymap-modifiermap (fixnum fixnum) ( void 
"set_XModifierKeymap_modifiermap" ))
+(defentry XModifierKeymap-max_keypermod (fixnum) ( fixnum 
"XModifierKeymap_max_keypermod" ))
+(defentry set-XModifierKeymap-max_keypermod (fixnum fixnum) ( void 
"set_XModifierKeymap_max_keypermod" ))

Index: xgcl-2/gcl_Xlib.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_Xlib.lsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- xgcl-2/gcl_Xlib.lsp 5 Jan 2006 17:55:35 -0000       1.1.2.1
+++ xgcl-2/gcl_Xlib.lsp 20 Jun 2006 23:00:10 -0000      1.1.2.2
@@ -50,123 +50,125 @@
 (defconstant  QueuedAfterReading 1)
 (defconstant  QueuedAfterFlush 2)
 
+(clines "#include \"xgcl.h\"")
+
 
 (defentry XLoadQueryFont(
 
-    int                ;; display 
+    fixnum             ;; display 
     object             ;; name 
 
-)( int  "XLoadQueryFont"))
+)( fixnum  "XLoadQueryFont"))
 
 
 
 (defentry  XQueryFont(
 
-    int                ;; display 
-    int                        ;; font_ID 
+    fixnum             ;; display 
+    fixnum                     ;; font_ID 
 
-)( int  "XQueryFont"))
+)( fixnum  "XQueryFont"))
 
 
 
 
 (defentry  XGetMotionEvents(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; start 
-    int                ;; stop 
-    int                ;; nevents_return 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; start 
+    fixnum             ;; stop 
+    fixnum             ;; nevents_return 
 
-)( int  "XGetMotionEvents"))
+)( fixnum  "XGetMotionEvents"))
 
 
 
 (defentry  XDeleteModifiermapEntry(
 
-    int        ;; modmap 
+    fixnum     ;; modmap 
 
-    int                ;; keycode_entry 
+    fixnum             ;; keycode_entry 
 
-    int                        ;; modifier 
+    fixnum                     ;; modifier 
 
-)( int  "XDeleteModifiermapEntry"))
+)( fixnum  "XDeleteModifiermapEntry"))
 
 
 
 (defentry  XGetModifierMapping(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)(     int "XGetModifierMapping"))
+)(     fixnum "XGetModifierMapping"))
 
 
 
 (defentry  XInsertModifiermapEntry(
 
-    int        ;; modmap 
+    fixnum     ;; modmap 
 
-    int                ;; keycode_entry 
+    fixnum             ;; keycode_entry 
 
-    int                        ;; modifier     
+    fixnum                     ;; modifier     
 
-)(     int  "XInsertModifiermapEntry"))
+)(     fixnum  "XInsertModifiermapEntry"))
 
 
 
 (defentry  XNewModifiermap(
 
-    int                        ;; max_keys_per_mod 
+    fixnum                     ;; max_keys_per_mod 
 
-)( int  "XNewModifiermap"))
+)( fixnum  "XNewModifiermap"))
 
 
 
 (defentry  XCreateImage(
 
-    int                ;; display 
-    int                ;; visual 
-     int       ;; depth 
-    int                        ;; format 
-    int                        ;; offset 
+    fixnum             ;; display 
+    fixnum             ;; visual 
+     fixnum    ;; depth 
+    fixnum                     ;; format 
+    fixnum                     ;; offset 
    object              ;; data 
-     int       ;; width 
-     int       ;; height 
-    int                        ;; bitmap_pad 
-    int                        ;; bytes_per_line 
+     fixnum    ;; width 
+     fixnum    ;; height 
+    fixnum                     ;; bitmap_pad 
+    fixnum                     ;; bytes_per_line 
 
-)( int  "XCreateImage"))
+)( fixnum  "XCreateImage"))
 
 
 (defentry  XGetImage(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; x 
-    int                        ;; y 
-     int       ;; width 
-     int       ;; height 
-     int       ;; plane_mask 
-    int                        ;; format 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
+     fixnum    ;; width 
+     fixnum    ;; height 
+     fixnum    ;; plane_mask 
+    fixnum                     ;; format 
 
-)( int  "XGetImage"))
+)( fixnum  "XGetImage"))
 
 
 (defentry  XGetSubImage(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; x 
-    int                        ;; y 
-     int       ;; width 
-     int       ;; height 
-     int       ;; plane_mask 
-    int                        ;; format 
-    int        ;; dest_image 
-    int                        ;; dest_x 
-    int                        ;; dest_y 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
+     fixnum    ;; width 
+     fixnum    ;; height 
+     fixnum    ;; plane_mask 
+    fixnum                     ;; format 
+    fixnum     ;; dest_image 
+    fixnum                     ;; dest_x 
+    fixnum                     ;; dest_y 
 
-)( int "XGetSubImage"))
+)( fixnum "XGetSubImage"))
 
 ;;Window  X function declarations.
  
@@ -176,7 +178,7 @@
 
     object             ;; display_name 
 
-)( int  "XOpenDisplay"))
+)( fixnum  "XOpenDisplay"))
 
 
 
@@ -190,345 +192,345 @@
 
 (defentry  XFetchBytes(
 
-    int                ;; display 
-    int                ;; nbytes_return 
+    fixnum             ;; display 
+    fixnum             ;; nbytes_return 
 
-)( int  "XFetchBytes"))
+)( fixnum  "XFetchBytes"))
 
 
 (defentry  XFetchBuffer(
 
-    int                ;; display 
-    int                ;; nbytes_return 
-    int                        ;; buffer 
+    fixnum             ;; display 
+    fixnum             ;; nbytes_return 
+    fixnum                     ;; buffer 
 
-)( int  "XFetchBuffer"))
+)( fixnum  "XFetchBuffer"))
 
 
 (defentry  XGetAtomName(
 
-    int                ;; display 
-    int                ;; atom 
+    fixnum             ;; display 
+    fixnum             ;; atom 
 
-)( int  "XGetAtomName"))
+)( fixnum  "XGetAtomName"))
 
 
 (defentry  XGetDefault(
 
-    int                ;; display 
+    fixnum             ;; display 
     object             ;; program 
     object             ;; option                 
 
-)( int  "XGetDefault"))
+)( fixnum  "XGetDefault"))
 
 
 (defentry  XDisplayName(
 
     object             ;; string 
 
-)( int  "XDisplayName"))
+)( fixnum  "XDisplayName"))
 
 
 (defentry  XKeysymToString(
 
-    int                ;; keysym 
+    fixnum             ;; keysym 
 
-)( int  "XKeysymToString"))
+)( fixnum  "XKeysymToString"))
 
 
 
 
 (defentry XInternAtom(
 
-    int                ;; display 
+    fixnum             ;; display 
     object             ;; atom_name 
-    int                ;; only_if_exists                
+    fixnum             ;; only_if_exists                
 
-)( int "XInternAtom"))
+)( fixnum "XInternAtom"))
 
 
 (defentry XCopyColormapAndFree(
 
-    int                ;; display 
-    int                ;; colormap 
+    fixnum             ;; display 
+    fixnum             ;; colormap 
 
-)( int "XCopyColormapAndFree"))
+)( fixnum "XCopyColormapAndFree"))
 
 
 (defentry XCreateColormap(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; visual 
-    int                        ;; alloc                         
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; visual 
+    fixnum                     ;; alloc                         
 
-)( int "XCreateColormap"))
+)( fixnum "XCreateColormap"))
 
 
 (defentry XCreatePixmapCursor(
 
-    int                ;; display 
-    int                ;; source 
-    int                ;; mask 
-    int                ;; foreground_color 
-    int                ;; background_color 
-     int       ;; x 
-     int       ;; y                       
+    fixnum             ;; display 
+    fixnum             ;; source 
+    fixnum             ;; mask 
+    fixnum             ;; foreground_color 
+    fixnum             ;; background_color 
+     fixnum    ;; x 
+     fixnum    ;; y                       
 
-)( int "XCreatePixmapCursor"))
+)( fixnum "XCreatePixmapCursor"))
 
 
 (defentry XCreateGlyphCursor(
 
-    int                ;; display 
-    int                ;; source_font 
-    int                ;; mask_font 
-     int       ;; source_char 
-     int       ;; mask_char 
-    int                ;; foreground_color 
-    int                ;; background_color 
+    fixnum             ;; display 
+    fixnum             ;; source_font 
+    fixnum             ;; mask_font 
+     fixnum    ;; source_char 
+     fixnum    ;; mask_char 
+    fixnum             ;; foreground_color 
+    fixnum             ;; background_color 
 
-)( int "XCreateGlyphCursor"))
+)( fixnum "XCreateGlyphCursor"))
 
 
 (defentry XCreateFontCursor(
 
-    int                ;; display 
-     int       ;; shape 
+    fixnum             ;; display 
+     fixnum    ;; shape 
 
-)( int "XCreateFontCursor"))
+)( fixnum "XCreateFontCursor"))
 
 
 (defentry XLoadFont(
 
-    int                ;; display 
+    fixnum             ;; display 
     object             ;; name 
 
-)( int "XLoadFont"))
+)( fixnum "XLoadFont"))
 
 
 (defentry XCreateGC(
 
-    int                ;; display 
-    int                ;; d 
-     int       ;; valuemask 
-    int                ;; values 
+    fixnum             ;; display 
+    fixnum             ;; d 
+     fixnum    ;; valuemask 
+    fixnum             ;; values 
 
-)( int "XCreateGC"))
+)( fixnum "XCreateGC"))
 
 
 (defentry XGContextFromGC(
 
-    int                        ;; gc 
+    fixnum                     ;; gc 
 
-)( int "XGContextFromGC"))
+)( fixnum "XGContextFromGC"))
 
 
 (defentry XCreatePixmap(
 
-    int                ;; display 
-    int                ;; d 
-     int       ;; width 
-     int       ;; height 
-     int       ;; depth                        
+    fixnum             ;; display 
+    fixnum             ;; d 
+     fixnum    ;; width 
+     fixnum    ;; height 
+     fixnum    ;; depth                        
 
-)( int "XCreatePixmap"))
+)( fixnum "XCreatePixmap"))
 
 
 (defentry XCreateBitmapFromData(
 
-    int                ;; display 
-    int                ;; d 
+    fixnum             ;; display 
+    fixnum             ;; d 
     object             ;; data 
-     int       ;; width 
-     int       ;; height 
+     fixnum    ;; width 
+     fixnum    ;; height 
 
-)( int "XCreateBitmapFromData"))
+)( fixnum "XCreateBitmapFromData"))
 
 
 (defentry XCreatePixmapFromBitmapData(
 
-    int                ;; display 
-    int                ;; d 
+    fixnum             ;; display 
+    fixnum             ;; d 
    object              ;; data 
-     int       ;; width 
-     int       ;; height 
-     int       ;; fg 
-     int       ;; bg 
-     int       ;; depth 
+     fixnum    ;; width 
+     fixnum    ;; height 
+     fixnum    ;; fg 
+     fixnum    ;; bg 
+     fixnum    ;; depth 
 
-)( int "XCreatePixmapFromBitmapData"))
+)( fixnum "XCreatePixmapFromBitmapData"))
 
 
 (defentry XCreateSimpleWindow(
 
-    int                ;; display 
-    int                ;; parent 
-    int                        ;; x 
-    int                        ;; y 
-     int       ;; width 
-     int       ;; height 
-     int       ;; border_width 
-     int       ;; border 
-     int       ;; background 
+    fixnum             ;; display 
+    fixnum             ;; parent 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
+     fixnum    ;; width 
+     fixnum    ;; height 
+     fixnum    ;; border_width 
+     fixnum    ;; border 
+     fixnum    ;; background 
 
-)( int "XCreateSimpleWindow"))
+)( fixnum "XCreateSimpleWindow"))
 
 
 (defentry XGetSelectionOwner(
 
-    int                ;; display 
-    int                ;; selection 
+    fixnum             ;; display 
+    fixnum             ;; selection 
 
-)( int "XGetSelectionOwner"))
+)( fixnum "XGetSelectionOwner"))
 
 
 (defentry XCreateWindow(
 
-    int                ;; display 
-    int                ;; parent 
-    int                        ;; x 
-    int                        ;; y 
-     int       ;; width 
-     int       ;; height 
-     int       ;; border_width 
-    int                        ;; depth 
-     int       ;; class 
-    int                ;; visual 
-     int       ;; valuemask 
-    int        ;; attributes 
+    fixnum             ;; display 
+    fixnum             ;; parent 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
+     fixnum    ;; width 
+     fixnum    ;; height 
+     fixnum    ;; border_width 
+    fixnum                     ;; depth 
+     fixnum    ;; class 
+    fixnum             ;; visual 
+     fixnum    ;; valuemask 
+    fixnum     ;; attributes 
 
-)( int "XCreateWindow")) 
+)( fixnum "XCreateWindow")) 
 
 
 (defentry  XListInstalledColormaps(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; num_return 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; num_return 
 
-)( int  "XListInstalledColormaps"))
+)( fixnum  "XListInstalledColormaps"))
 
 
 (defentry XListFonts(
 
-    int                ;; display 
+    fixnum             ;; display 
     object             ;; pattern 
-    int                        ;; maxnames 
-    int                ;; actual_count_return 
+    fixnum                     ;; maxnames 
+    fixnum             ;; actual_count_return 
 
-)( int "XListFonts"))
+)( fixnum "XListFonts"))
 
 
 (defentry XListFontsWithInfo(
 
-    int                ;; display 
+    fixnum             ;; display 
     object             ;; pattern 
-    int                        ;; maxnames 
-    int                ;; count_return 
-    int                ;; info_return 
+    fixnum                     ;; maxnames 
+    fixnum             ;; count_return 
+    fixnum             ;; info_return 
 
-)( int "XListFontsWithInfo"))
+)( fixnum "XListFontsWithInfo"))
 
 
 (defentry XGetFontPath(
 
-    int                ;; display 
-    int                ;; npaths_return 
+    fixnum             ;; display 
+    fixnum             ;; npaths_return 
 
-)( int "XGetFontPath"))
+)( fixnum "XGetFontPath"))
 
 
 (defentry XListExtensions(
 
-    int                ;; display 
-    int                ;; nextensions_return 
+    fixnum             ;; display 
+    fixnum             ;; nextensions_return 
 
-)( int "XListExtensions"))
+)( fixnum "XListExtensions"))
 
 
 (defentry  XListProperties(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; num_prop_return 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; num_prop_return 
 
-)( int  "XListProperties"))
+)( fixnum  "XListProperties"))
 
 
 (defentry XListHosts(
 
-    int                ;; display 
-    int                ;; nhosts_return 
-    int                ;; state_return 
+    fixnum             ;; display 
+    fixnum             ;; nhosts_return 
+    fixnum             ;; state_return 
 
-)( int "XListHosts"))
+)( fixnum "XListHosts"))
 
 
 (defentry XKeycodeToKeysym(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-    int                ;; int 
+    fixnum             ;; fixnum 
 
-    int                        ;; index 
+    fixnum                     ;; index 
 
-)( int "XKeycodeToKeysym"))
+)( fixnum "XKeycodeToKeysym"))
 
 
 (defentry XLookupKeysym(
 
-    int                ;; key_event 
-    int                        ;; index 
+    fixnum             ;; key_event 
+    fixnum                     ;; index 
 
-)( int "XLookupKeysym"))
+)( fixnum "XLookupKeysym"))
 
 
 (defentry  XGetKeyboardMapping(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-    int                ;; first_keycode
+    fixnum             ;; first_keycode
 
-    int                        ;; keycode_count 
-    int                ;; keysyms_per_keycode_return 
+    fixnum                     ;; keycode_count 
+    fixnum             ;; keysyms_per_keycode_return 
 
-)( int  "XGetKeyboardMapping"))
+)( fixnum  "XGetKeyboardMapping"))
 
 
 (defentry XStringToKeysym(
 
     object             ;; string 
 
-)( int "XStringToKeysym"))
+)( fixnum "XStringToKeysym"))
 
 
 (defentry XMaxRequestSize(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XMaxRequestSize"))
+)( fixnum "XMaxRequestSize"))
 
 
 (defentry XResourceManagerString(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XResourceManagerString"))
+)( fixnum "XResourceManagerString"))
 
 
 (defentry XDisplayMotionBufferSize(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XDisplayMotionBufferSize"))
+)( fixnum "XDisplayMotionBufferSize"))
 
 
 (defentry XVisualIDFromVisual(
 
-    int                ;; visual 
+    fixnum             ;; visual 
 
-)( int "XVisualIDFromVisual"))
+)( fixnum "XVisualIDFromVisual"))
 
 ;; routines for dealing with extensions 
 
@@ -536,216 +538,216 @@
 
 (defentry  XInitExtension(
 
-    int                ;; display 
+    fixnum             ;; display 
     object             ;; name 
 
-)( int  "XInitExtension"))
+)( fixnum  "XInitExtension"))
 
 
 
 (defentry  XAddExtension(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int  "XAddExtension"))
+)( fixnum  "XAddExtension"))
 
 
 (defentry  XFindOnExtensionList(
 
-    int                ;; structure 
-    int                        ;; number 
+    fixnum             ;; structure 
+    fixnum                     ;; number 
 
-)( int  "XFindOnExtensionList"))
+)( fixnum  "XFindOnExtensionList"))
 
 
 
 ;;;fix
 
 
-(defentry XEHeadOfExtensionList(
+;(defentry XEHeadOfExtensionList(
 
-    int        ;;object 
+;    fixnum    ;;object 
 
-)( int "XEHeadOfExtensionList"))
+;)( fixnum "XEHeadOfExtensionList"))
 
 ;; these are routines for which there are also macros 
 
 
 (defentry XRootWindow(
 
-    int                ;; display 
-    int                        ;; screen_number 
+    fixnum             ;; display 
+    fixnum                     ;; screen_number 
 
-)( int "XRootWindow"))
+)( fixnum "XRootWindow"))
 
 
 (defentry XDefaultRootWindow(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XDefaultRootWindow"))
+)( fixnum "XDefaultRootWindow"))
 
 
 (defentry XRootWindowOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int "XRootWindowOfScreen"))
+)( fixnum "XRootWindowOfScreen"))
 
 
 (defentry  XDefaultVisual(
 
-    int                ;; display 
-    int                        ;; screen_number 
+    fixnum             ;; display 
+    fixnum                     ;; screen_number 
 
-)( int  "XDefaultVisual"))
+)( fixnum  "XDefaultVisual"))
 
 
 (defentry  XDefaultVisualOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int  "XDefaultVisualOfScreen"))
+)( fixnum  "XDefaultVisualOfScreen"))
 
 
 (defentry XDefaultGC(
 
-    int                ;; display 
-    int                        ;; screen_number 
+    fixnum             ;; display 
+    fixnum                     ;; screen_number 
 
-)( int "XDefaultGC"))
+)( fixnum "XDefaultGC"))
 
 
 (defentry XDefaultGCOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int "XDefaultGCOfScreen"))
+)( fixnum "XDefaultGCOfScreen"))
 
 
 (defentry XBlackPixel(
 
-    int                ;; display 
-    int                        ;; screen_number 
+    fixnum             ;; display 
+    fixnum                     ;; screen_number 
 
-)( int "XBlackPixel"))
+)( fixnum "XBlackPixel"))
 
 
 (defentry XWhitePixel(
 
-    int                ;; display 
-    int                        ;; screen_number 
+    fixnum             ;; display 
+    fixnum                     ;; screen_number 
 
-)( int "XWhitePixel"))
+)( fixnum "XWhitePixel"))
 
 
 (defentry XAllPlanes(
 
 ;;    void
 
-)( int "XAllPlanes"))
+)( fixnum "XAllPlanes"))
 
 
 (defentry XBlackPixelOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int "XBlackPixelOfScreen"))
+)( fixnum "XBlackPixelOfScreen"))
 
 
 (defentry XWhitePixelOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int "XWhitePixelOfScreen"))
+)( fixnum "XWhitePixelOfScreen"))
 
 
 (defentry XNextRequest(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XNextRequest"))
+)( fixnum "XNextRequest"))
 
 
 (defentry XLastKnownRequestProcessed(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XLastKnownRequestProcessed"))
+)( fixnum "XLastKnownRequestProcessed"))
 
 
 (defentry  XServerVendor(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int  "XServerVendor"))
+)( fixnum  "XServerVendor"))
 
 
 (defentry  XDisplayString(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int  "XDisplayString"))
+)( fixnum  "XDisplayString"))
 
 
 (defentry XDefaultColormap(
 
-    int                ;; display 
-    int                        ;; screen_number 
+    fixnum             ;; display 
+    fixnum                     ;; screen_number 
 
-)( int "XDefaultColormap"))
+)( fixnum "XDefaultColormap"))
 
 
 (defentry XDefaultColormapOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int "XDefaultColormapOfScreen"))
+)( fixnum "XDefaultColormapOfScreen"))
 
 
 (defentry  XDisplayOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int  "XDisplayOfScreen"))
+)( fixnum  "XDisplayOfScreen"))
 
 
 (defentry  XScreenOfDisplay(
 
-    int                ;; display 
-    int                        ;; screen_number 
+    fixnum             ;; display 
+    fixnum                     ;; screen_number 
 
-)( int  "XScreenOfDisplay"))
+)( fixnum  "XScreenOfDisplay"))
 
 
 (defentry  XDefaultScreenOfDisplay(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int  "XDefaultScreenOfDisplay"))
+)( fixnum  "XDefaultScreenOfDisplay"))
 
 
 (defentry XEventMaskOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int "XEventMaskOfScreen"))
+)( fixnum "XEventMaskOfScreen"))
 
 
 
 (defentry XScreenNumberOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int "XScreenNumberOfScreen"))
+)( fixnum "XScreenNumberOfScreen"))
 
 
 
 (defentry XSetErrorHandler (
 
-    int        ;; handler 
+    fixnum     ;; handler 
 
-)( int "XSetErrorHandler" ))
+)( fixnum "XSetErrorHandler" ))
 
 
 ;;fix
@@ -753,28 +755,28 @@
 
 (defentry XSetIOErrorHandler (
 
-    int        ;; handler 
+    fixnum     ;; handler 
 
-)( int "XSetIOErrorHandler" ))
+)( fixnum "XSetIOErrorHandler" ))
 
 
 
 
 (defentry XListPixmapFormats(
 
-    int                ;; display 
-    int                ;; count_return 
+    fixnum             ;; display 
+    fixnum             ;; count_return 
 
-)( int "XListPixmapFormats"))
+)( fixnum "XListPixmapFormats"))
 
 
 (defentry  XListDepths(
 
-    int                ;; display 
-    int                        ;; screen_number 
-    int                ;; count_return 
+    fixnum             ;; display 
+    fixnum                     ;; screen_number 
+    fixnum             ;; count_return 
 
-)( int  "XListDepths"))
+)( fixnum  "XListDepths"))
 
 ;; ICCCM routines for things that don't require special include files; 
 ;; other declarations are given in Xutil.h                             
@@ -782,98 +784,98 @@
 
 (defentry XReconfigureWMWindow(
 
-    int                ;; display 
-    int                ;; w 
-    int                        ;; screen_number 
-     int       ;; mask 
-    int                ;; changes 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum                     ;; screen_number 
+     fixnum    ;; mask 
+    fixnum             ;; changes 
 
-)( int "XReconfigureWMWindow"))
+)( fixnum "XReconfigureWMWindow"))
 
 
 
 (defentry XGetWMProtocols(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; protocols_return 
-    int                ;; count_return 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; protocols_return 
+    fixnum             ;; count_return 
 
-)( int "XGetWMProtocols"))
+)( fixnum "XGetWMProtocols"))
 
 
 (defentry XSetWMProtocols(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; protocols 
-    int                        ;; count 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; protocols 
+    fixnum                     ;; count 
 
-)( int "XSetWMProtocols"))
+)( fixnum "XSetWMProtocols"))
 
 
 (defentry XIconifyWindow(
 
-    int                ;; display 
-    int                ;; w 
-    int                        ;; screen_number 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum                     ;; screen_number 
 
-)( int "XIconifyWindow"))
+)( fixnum "XIconifyWindow"))
 
 
 (defentry XWithdrawWindow(
 
-    int                ;; display 
-    int                ;; w 
-    int                        ;; screen_number 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum                     ;; screen_number 
 
-)( int "XWithdrawWindow"))
+)( fixnum "XWithdrawWindow"))
 
 ;;;fix
 
 
 (defentry XGetCommand(
 
-    int                ;; display 
-    int                ;; w 
-   int                 ;; argv_return 
-    int                ;; argc_return 
+    fixnum             ;; display 
+    fixnum             ;; w 
+   fixnum              ;; argv_return 
+    fixnum             ;; argc_return 
 
-)( int "XGetCommand"))
+)( fixnum "XGetCommand"))
 
 
 (defentry XGetWMColormapWindows(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; windows_return 
-    int                ;; count_return 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; windows_return 
+    fixnum             ;; count_return 
 
-)( int "XGetWMColormapWindows"))
+)( fixnum "XGetWMColormapWindows"))
 
 
 (defentry XSetWMColormapWindows(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; colormap_windows 
-    int                        ;; count 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; colormap_windows 
+    fixnum                     ;; count 
 
-)( int "XSetWMColormapWindows"))
+)( fixnum "XSetWMColormapWindows"))
 
 
 (defentry XFreeStringList(
 
-   int         ;; list 
+   fixnum      ;; list 
 
 )( void "XFreeStringList"))
 
 
 (defentry XSetTransientForHint(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; prop_window 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; prop_window 
 
 )( void "XSetTransientForHint"))
 
@@ -883,7 +885,7 @@
 
 (defentry XActivateScreenSaver(
 
-    int                ;; display 
+    fixnum             ;; display 
 
 )( void "XActivateScreenSaver"))
 
@@ -891,8 +893,8 @@
 
 (defentry XAddHost(
 
-    int                ;; display 
-    int        ;; host 
+    fixnum             ;; display 
+    fixnum     ;; host 
 
 )( void "XAddHost"))
 
@@ -900,9 +902,9 @@
 
 (defentry XAddHosts(
 
-    int                ;; display 
-    int                ;; hosts 
-    int                        ;; num_hosts     
+    fixnum             ;; display 
+    fixnum             ;; hosts 
+    fixnum                     ;; num_hosts     
 
 )( void "XAddHosts"))
 
@@ -910,8 +912,8 @@
 
 (defentry XAddToExtensionList(
 
-    int        ;; structure 
-    int                ;; ext_data 
+    fixnum     ;; structure 
+    fixnum             ;; ext_data 
 
 )( void "XAddToExtensionList"))
 
@@ -919,8 +921,8 @@
 
 (defentry XAddToSaveSet(
 
-    int                ;; display 
-    int                ;; w 
+    fixnum             ;; display 
+    fixnum             ;; w 
 
 )( void "XAddToSaveSet"))
 
@@ -928,64 +930,64 @@
 
 (defentry XAllocColor(
 
-    int                ;; display 
-    int                ;; colormap 
-    int                ;; screen_in_out 
+    fixnum             ;; display 
+    fixnum             ;; colormap 
+    fixnum             ;; screen_in_out 
 
-)( int "XAllocColor"))
+)( fixnum "XAllocColor"))
 
 ;;;fix
 
 
 (defentry XAllocColorCells(
 
-    int                ;; display 
-    int                ;; colormap 
-    int                ;; contig 
-     int ;; plane_masks_return 
-     int       ;; nplanes 
-     int ;; pixels_return 
-     int       ;; npixels 
+    fixnum             ;; display 
+    fixnum             ;; colormap 
+    fixnum             ;; contig 
+     fixnum ;; plane_masks_return 
+     fixnum    ;; nplanes 
+     fixnum ;; pixels_return 
+     fixnum    ;; npixels 
 
-)( int "XAllocColorCells"))
+)( fixnum "XAllocColorCells"))
 
 
 
 (defentry XAllocColorPlanes(
 
-    int                ;; display 
-    int                ;; colormap 
-    int                ;; contig 
-     int ;; pixels_return 
-    int                        ;; ncolors 
-    int                        ;; nreds 
-    int                        ;; ngreens 
-    int                        ;; nblues 
-     int ;; rmask_return 
-     int ;; gmask_return 
-     int ;; bmask_return 
+    fixnum             ;; display 
+    fixnum             ;; colormap 
+    fixnum             ;; contig 
+     fixnum ;; pixels_return 
+    fixnum                     ;; ncolors 
+    fixnum                     ;; nreds 
+    fixnum                     ;; ngreens 
+    fixnum                     ;; nblues 
+     fixnum ;; rmask_return 
+     fixnum ;; gmask_return 
+     fixnum ;; bmask_return 
 
-)( int "XAllocColorPlanes"))
+)( fixnum "XAllocColorPlanes"))
 
 
 
 (defentry XAllocNamedColor(
 
-    int                ;; display 
-    int                ;; colormap 
+    fixnum             ;; display 
+    fixnum             ;; colormap 
     object             ;; color_name 
-    int                ;; screen_def_return 
-    int                ;; exact_def_return 
+    fixnum             ;; screen_def_return 
+    fixnum             ;; exact_def_return 
 
-)( int "XAllocNamedColor"))
+)( fixnum "XAllocNamedColor"))
 
 
 
 (defentry XAllowEvents(
 
-    int                ;; display 
-    int                        ;; event_mode 
-    int                ;; time
+    fixnum             ;; display 
+    fixnum                     ;; event_mode 
+    fixnum             ;; time
 
 )( void "XAllowEvents"))
 
@@ -993,7 +995,7 @@
 
 (defentry XAutoRepeatOff(
 
-    int                ;; display 
+    fixnum             ;; display 
 
 )( void "XAutoRepeatOff"))
 
@@ -1001,7 +1003,7 @@
 
 (defentry XAutoRepeatOn(
 
-    int                ;; display 
+    fixnum             ;; display 
 
 )( void "XAutoRepeatOn"))
 
@@ -1009,8 +1011,8 @@
 
 (defentry XBell(
 
-    int                ;; display 
-    int                        ;; percent 
+    fixnum             ;; display 
+    fixnum                     ;; percent 
 
 )( void "XBell"))
 
@@ -1018,42 +1020,42 @@
 
 (defentry XBitmapBitOrder(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XBitmapBitOrder"))
+)( fixnum "XBitmapBitOrder"))
 
 
 
 (defentry XBitmapPad(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XBitmapPad"))
+)( fixnum "XBitmapPad"))
 
 
 
 (defentry XBitmapUnit(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XBitmapUnit"))
+)( fixnum "XBitmapUnit"))
 
 
 
 (defentry XCellsOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int "XCellsOfScreen"))
+)( fixnum "XCellsOfScreen"))
 
 
 
 (defentry XChangeActivePointerGrab(
 
-    int                ;; display 
-     int       ;; event_mask 
-    int                ;; cursor 
-    int                ;; time
+    fixnum             ;; display 
+     fixnum    ;; event_mask 
+    fixnum             ;; cursor 
+    fixnum             ;; time
 
 )( void "XChangeActivePointerGrab"))
 
@@ -1061,10 +1063,10 @@
 
 (defentry XChangeGC(
 
-    int                ;; display 
-    int                        ;; gc 
-     int       ;; valuemask 
-    int                ;; values 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+     fixnum    ;; valuemask 
+    fixnum             ;; values 
 
 )( void "XChangeGC"))
 
@@ -1072,9 +1074,9 @@
 
 (defentry XChangeKeyboardControl(
 
-    int                ;; display 
-     int       ;; value_mask 
-    int        ;; values 
+    fixnum             ;; display 
+     fixnum    ;; value_mask 
+    fixnum     ;; values 
 
 )( void "XChangeKeyboardControl"))
 
@@ -1082,11 +1084,11 @@
 
 (defentry XChangeKeyboardMapping(
 
-    int                ;; display 
-    int                        ;; first_keycode 
-    int                        ;; keysyms_per_keycode 
-    int                        ;; keysyms 
-    int                        ;; num_codes 
+    fixnum             ;; display 
+    fixnum                     ;; first_keycode 
+    fixnum                     ;; keysyms_per_keycode 
+    fixnum                     ;; keysyms 
+    fixnum                     ;; num_codes 
 
 )( void "XChangeKeyboardMapping"))
 
@@ -1094,12 +1096,12 @@
 
 (defentry XChangePointerControl(
 
-    int                ;; display 
-    int                ;; do_accel 
-    int                ;; do_threshold 
-    int                        ;; accel_numerator 
-    int                        ;; accel_denominator 
-    int                        ;; threshold 
+    fixnum             ;; display 
+    fixnum             ;; do_accel 
+    fixnum             ;; do_threshold 
+    fixnum                     ;; accel_numerator 
+    fixnum                     ;; accel_denominator 
+    fixnum                     ;; threshold 
 
 )( void "XChangePointerControl"))
 
@@ -1107,14 +1109,14 @@
 
 (defentry XChangeProperty(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; property 
-    int                ;; type 
-    int                        ;; format 
-    int                        ;; mode 
-    int        ;; data 
-    int                        ;; nelements 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; property 
+    fixnum             ;; type 
+    fixnum                     ;; format 
+    fixnum                     ;; mode 
+    fixnum     ;; data 
+    fixnum                     ;; nelements 
 
 )( void "XChangeProperty"))
 
@@ -1122,9 +1124,9 @@
 
 (defentry XChangeSaveSet(
 
-    int                ;; display 
-    int                ;; w 
-    int                        ;; change_mode 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum                     ;; change_mode 
 
 )( void "XChangeSaveSet"))
 
@@ -1132,10 +1134,10 @@
 
 (defentry XChangeWindowAttributes(
 
-    int                ;; display 
-    int                ;; w 
-     int       ;; valuemask 
-    int ;; attributes 
+    fixnum             ;; display 
+    fixnum             ;; w 
+     fixnum    ;; valuemask 
+    fixnum ;; attributes 
 
 )( void "XChangeWindowAttributes"))
 
@@ -1143,51 +1145,51 @@
 
 (defentry XCheckMaskEvent(
 
-    int                ;; display 
-    int                ;; event_mask 
-    int                ;; event_return 
+    fixnum             ;; display 
+    fixnum             ;; event_mask 
+    fixnum             ;; event_return 
 
-)( int "XCheckMaskEvent"))
+)( fixnum "XCheckMaskEvent"))
 
 
 
 (defentry XCheckTypedEvent(
 
-    int                ;; display 
-    int                        ;; event_type 
-    int                ;; event_return 
+    fixnum             ;; display 
+    fixnum                     ;; event_type 
+    fixnum             ;; event_return 
 
-)( int "XCheckTypedEvent"))
+)( fixnum "XCheckTypedEvent"))
 
 
 
 (defentry XCheckTypedWindowEvent(
 
-    int                ;; display 
-    int                ;; w 
-    int                        ;; event_type 
-    int                ;; event_return 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum                     ;; event_type 
+    fixnum             ;; event_return 
 
-)( int "XCheckTypedWindowEvent"))
+)( fixnum "XCheckTypedWindowEvent"))
 
 
 
 (defentry XCheckWindowEvent(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; event_mask 
-    int                ;; event_return 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; event_mask 
+    fixnum             ;; event_return 
 
-)( int "XCheckWindowEvent"))
+)( fixnum "XCheckWindowEvent"))
 
 
 
 (defentry XCirculateSubwindows(
 
-    int                ;; display 
-    int                ;; w 
-    int                        ;; direction 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum                     ;; direction 
 
 )( void "XCirculateSubwindows"))
 
@@ -1195,8 +1197,8 @@
 
 (defentry XCirculateSubwindowsDown(
 
-    int                ;; display 
-    int                ;; w 
+    fixnum             ;; display 
+    fixnum             ;; w 
 
 )( void "XCirculateSubwindowsDown"))
 
@@ -1204,8 +1206,8 @@
 
 (defentry XCirculateSubwindowsUp(
 
-    int                ;; display 
-    int                ;; w 
+    fixnum             ;; display 
+    fixnum             ;; w 
 
 )( void "XCirculateSubwindowsUp"))
 
@@ -1213,13 +1215,13 @@
 
 (defentry XClearArea(
 
-    int                ;; display 
-    int                ;; w 
-    int                        ;; x 
-    int                        ;; y 
-     int       ;; width 
-     int       ;; height 
-    int                ;; exposures 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
+     fixnum    ;; width 
+     fixnum    ;; height 
+    fixnum             ;; exposures 
 
 )( void "XClearArea"))
 
@@ -1227,8 +1229,8 @@
 
 (defentry XClearWindow(
 
-    int                ;; display 
-    int                ;; w 
+    fixnum             ;; display 
+    fixnum             ;; w 
 
 )( void "XClearWindow"))
 
@@ -1236,7 +1238,7 @@
 
 (defentry XCloseDisplay(
 
-    int                ;; display 
+    fixnum             ;; display 
 
 )( void "XCloseDisplay"))
 
@@ -1244,10 +1246,10 @@
 
 (defentry XConfigureWindow(
 
-    int                ;; display 
-    int                ;; w 
-     int       ;; value_mask 
-    int ;; values               
+    fixnum             ;; display 
+    fixnum             ;; w 
+     fixnum    ;; value_mask 
+    fixnum ;; values            
 
 )( void "XConfigureWindow"))
 
@@ -1255,20 +1257,20 @@
 
 (defentry XConnectionNumber(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XConnectionNumber"))
+)( fixnum "XConnectionNumber"))
 
 
 
 (defentry XConvertSelection(
 
-    int                ;; display 
-    int                ;; selection 
-    int                ;; target 
-    int                ;; property 
-    int                ;; requestor 
-    int                ;; time
+    fixnum             ;; display 
+    fixnum             ;; selection 
+    fixnum             ;; target 
+    fixnum             ;; property 
+    fixnum             ;; requestor 
+    fixnum             ;; time
 
 )( void "XConvertSelection"))
 
@@ -1276,16 +1278,16 @@
 
 (defentry XCopyArea(
 
-    int                ;; display 
-    int                ;; src 
-    int                ;; dest 
-    int                        ;; gc 
-    int                        ;; src_x 
-    int                        ;; src_y 
-     int       ;; width 
-     int       ;; height 
-    int                        ;; dest_x 
-    int                        ;; dest_y 
+    fixnum             ;; display 
+    fixnum             ;; src 
+    fixnum             ;; dest 
+    fixnum                     ;; gc 
+    fixnum                     ;; src_x 
+    fixnum                     ;; src_y 
+     fixnum    ;; width 
+     fixnum    ;; height 
+    fixnum                     ;; dest_x 
+    fixnum                     ;; dest_y 
 
 )( void "XCopyArea"))
 
@@ -1293,10 +1295,10 @@
 
 (defentry XCopyGC(
 
-    int                ;; display 
-    int                        ;; src 
-     int       ;; valuemask 
-    int                        ;; dest 
+    fixnum             ;; display 
+    fixnum                     ;; src 
+     fixnum    ;; valuemask 
+    fixnum                     ;; dest 
 
 )( void "XCopyGC"))
 
@@ -1304,17 +1306,17 @@
 
 (defentry XCopyPlane(
 
-    int                ;; display 
-    int                ;; src 
-    int                ;; dest 
-    int                        ;; gc 
-    int                        ;; src_x 
-    int                        ;; src_y 
-     int       ;; width 
-     int       ;; height 
-    int                        ;; dest_x 
-    int                        ;; dest_y 
-     int       ;; plane 
+    fixnum             ;; display 
+    fixnum             ;; src 
+    fixnum             ;; dest 
+    fixnum                     ;; gc 
+    fixnum                     ;; src_x 
+    fixnum                     ;; src_y 
+     fixnum    ;; width 
+     fixnum    ;; height 
+    fixnum                     ;; dest_x 
+    fixnum                     ;; dest_y 
+     fixnum    ;; plane 
 
 )( void "XCopyPlane"))
 
@@ -1322,34 +1324,34 @@
 
 (defentry XDefaultDepth(
 
-    int                ;; display 
-    int                        ;; screen_number 
+    fixnum             ;; display 
+    fixnum                     ;; screen_number 
 
-)( int "XDefaultDepth"))
+)( fixnum "XDefaultDepth"))
 
 
 
 (defentry XDefaultDepthOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int "XDefaultDepthOfScreen"))
+)( fixnum "XDefaultDepthOfScreen"))
 
 
 
 (defentry XDefaultScreen(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XDefaultScreen"))
+)( fixnum "XDefaultScreen"))
 
 
 
 (defentry XDefineCursor(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; cursor 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; cursor 
 
 )( void "XDefineCursor"))
 
@@ -1357,9 +1359,9 @@
 
 (defentry XDeleteProperty(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; property 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; property 
 
 )( void "XDeleteProperty"))
 
@@ -1367,8 +1369,8 @@
 
 (defentry XDestroyWindow(
 
-    int                ;; display 
-    int                ;; w 
+    fixnum             ;; display 
+    fixnum             ;; w 
 
 )( void "XDestroyWindow"))
 
@@ -1376,8 +1378,8 @@
 
 (defentry XDestroySubwindows(
 
-    int                ;; display 
-    int                ;; w 
+    fixnum             ;; display 
+    fixnum             ;; w 
 
 )( void "XDestroySubwindows"))
 
@@ -1385,23 +1387,23 @@
 
 (defentry XDoesBackingStore(
 
-    int                ;; screen     
+    fixnum             ;; screen     
 
-)( int "XDoesBackingStore"))
+)( fixnum "XDoesBackingStore"))
 
 
 
 (defentry XDoesSaveUnders(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int "XDoesSaveUnders"))
+)( fixnum "XDoesSaveUnders"))
 
 
 
 (defentry XDisableAccessControl(
 
-    int                ;; display 
+    fixnum             ;; display 
 
 )( void "XDisableAccessControl"))
 
@@ -1410,36 +1412,36 @@
 
 (defentry XDisplayCells(
 
-    int                ;; display 
-    int                        ;; screen_number 
+    fixnum             ;; display 
+    fixnum                     ;; screen_number 
 
-)( int "XDisplayCells"))
+)( fixnum "XDisplayCells"))
 
 
 
 (defentry XDisplayHeight(
 
-    int                ;; display 
-    int                        ;; screen_number 
+    fixnum             ;; display 
+    fixnum                     ;; screen_number 
 
-)( int "XDisplayHeight"))
+)( fixnum "XDisplayHeight"))
 
 
 
 (defentry XDisplayHeightMM(
 
-    int                ;; display 
-    int                        ;; screen_number 
+    fixnum             ;; display 
+    fixnum                     ;; screen_number 
 
-)( int "XDisplayHeightMM"))
+)( fixnum "XDisplayHeightMM"))
 
 
 
 (defentry XDisplayKeycodes(
 
-    int                ;; display 
-    int                ;; min_keycodes_return 
-    int                ;; max_keycodes_return 
+    fixnum             ;; display 
+    fixnum             ;; min_keycodes_return 
+    fixnum             ;; max_keycodes_return 
 
 )( void "XDisplayKeycodes"))
 
@@ -1447,42 +1449,42 @@
 
 (defentry XDisplayPlanes(
 
-    int                ;; display 
-    int                        ;; screen_number 
+    fixnum             ;; display 
+    fixnum                     ;; screen_number 
 
-)( int "XDisplayPlanes"))
+)( fixnum "XDisplayPlanes"))
 
 
 
 (defentry XDisplayWidth(
 
-    int                ;; display 
-    int                        ;; screen_number 
+    fixnum             ;; display 
+    fixnum                     ;; screen_number 
 
-)( int "XDisplayWidth"))
+)( fixnum "XDisplayWidth"))
 
 
 
 (defentry XDisplayWidthMM(
 
-    int                ;; display 
-    int                        ;; screen_number 
+    fixnum             ;; display 
+    fixnum                     ;; screen_number 
 
-)( int "XDisplayWidthMM"))
+)( fixnum "XDisplayWidthMM"))
 
 
 
 (defentry XDrawArc(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int                        ;; x 
-    int                        ;; y 
-     int       ;; width 
-     int       ;; height 
-    int                        ;; angle1 
-    int                        ;; angle2 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
+     fixnum    ;; width 
+     fixnum    ;; height 
+    fixnum                     ;; angle1 
+    fixnum                     ;; angle2 
 
 )( void "XDrawArc"))
 
@@ -1490,11 +1492,11 @@
 
 (defentry XDrawArcs(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int        ;; arcs 
-    int                        ;; narcs 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum     ;; arcs 
+    fixnum                     ;; narcs 
 
 )( void "XDrawArcs"))
 
@@ -1502,13 +1504,13 @@
 
 (defentry XDrawImageString(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int                        ;; x 
-    int                        ;; y 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
     object             ;; string 
-    int                        ;; length 
+    fixnum                     ;; length 
 
 )( void "XDrawImageString"))
 
@@ -1516,13 +1518,13 @@
 
 (defentry XDrawImageString16(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int                        ;; x 
-    int                        ;; y 
-     int       ;; string 
-    int                        ;; length 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
+     fixnum    ;; string 
+    fixnum                     ;; length 
 
 )( void "XDrawImageString16"))
 
@@ -1530,13 +1532,13 @@
 
 (defentry XDrawLine(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int                        ;; x1 
-    int                        ;; x2 
-    int                        ;; y1 
-    int                        ;; y2 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum                     ;; x1 
+    fixnum                     ;; x2 
+    fixnum                     ;; y1 
+    fixnum                     ;; y2 
 
 )( void "XDrawLine"))
 
@@ -1544,12 +1546,12 @@
 
 (defentry XDrawLines(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int                ;; points 
-    int                        ;; npoints 
-    int                        ;; mode 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum             ;; points 
+    fixnum                     ;; npoints 
+    fixnum                     ;; mode 
 
 )( void "XDrawLines"))
 
@@ -1557,11 +1559,11 @@
 
 (defentry XDrawPoint(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int                        ;; x 
-    int                        ;; y 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
 
 )( void "XDrawPoint"))
 
@@ -1569,12 +1571,12 @@
 
 (defentry XDrawPoints(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int                ;; points 
-    int                        ;; npoints 
-    int                        ;; mode 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum             ;; points 
+    fixnum                     ;; npoints 
+    fixnum                     ;; mode 
 
 )( void "XDrawPoints"))
 
@@ -1582,13 +1584,13 @@
 
 (defentry XDrawRectangle(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int                        ;; x 
-    int                        ;; y 
-     int       ;; width 
-     int       ;; height 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
+     fixnum    ;; width 
+     fixnum    ;; height 
 
 )( void "XDrawRectangle"))
 
@@ -1596,11 +1598,11 @@
 
 (defentry XDrawRectangles(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int        ;; rectangles 
-    int                        ;; nrectangles 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum     ;; rectangles 
+    fixnum                     ;; nrectangles 
 
 )( void "XDrawRectangles"))
 
@@ -1608,11 +1610,11 @@
 
 (defentry XDrawSegments(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int        ;; segments 
-    int                        ;; nsegments 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum     ;; segments 
+    fixnum                     ;; nsegments 
 
 )( void "XDrawSegments"))
 
@@ -1620,13 +1622,13 @@
 
 (defentry XDrawString(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int                        ;; x 
-    int                        ;; y 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
     object             ;; string 
-    int                        ;; length 
+    fixnum                     ;; length 
 
 )( void "XDrawString"))
 
@@ -1634,13 +1636,13 @@
 
 (defentry XDrawString16(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int                        ;; x 
-    int                        ;; y 
-     int       ;; string 
-    int                        ;; length 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
+     fixnum    ;; string 
+    fixnum                     ;; length 
 
 )( void "XDrawString16"))
 
@@ -1648,13 +1650,13 @@
 
 (defentry XDrawText(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int                        ;; x 
-    int                        ;; y 
-    int        ;; items 
-    int                        ;; nitems 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
+    fixnum     ;; items 
+    fixnum                     ;; nitems 
 
 )( void "XDrawText"))
 
@@ -1662,13 +1664,13 @@
 
 (defentry XDrawText16(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int                        ;; x 
-    int                        ;; y 
-    int ;; items 
-    int                        ;; nitems 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
+    fixnum ;; items 
+    fixnum                     ;; nitems 
 
 )( void "XDrawText16"))
 
@@ -1676,7 +1678,7 @@
 
 (defentry XEnableAccessControl(
 
-    int                ;; display 
+    fixnum             ;; display 
 
 )( void "XEnableAccessControl"))
 
@@ -1684,34 +1686,34 @@
 
 (defentry XEventsQueued(
 
-    int                ;; display 
-    int                        ;; mode 
+    fixnum             ;; display 
+    fixnum                     ;; mode 
 
-)( int "XEventsQueued"))
+)( fixnum "XEventsQueued"))
 
 
 
 (defentry XFetchName(
 
-    int                ;; display 
-    int                ;; w 
-   int         ;; window_name_return 
+    fixnum             ;; display 
+    fixnum             ;; w 
+   fixnum      ;; window_name_return 
 
-)( int "XFetchName"))
+)( fixnum "XFetchName"))
 
 
 
 (defentry XFillArc(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int                        ;; x 
-    int                        ;; y 
-     int       ;; width 
-     int       ;; height 
-    int                        ;; angle1 
-    int                        ;; angle2 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
+     fixnum    ;; width 
+     fixnum    ;; height 
+    fixnum                     ;; angle1 
+    fixnum                     ;; angle2 
 
 )( void "XFillArc"))
 
@@ -1719,11 +1721,11 @@
 
 (defentry XFillArcs(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int        ;; arcs 
-    int                        ;; narcs 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum     ;; arcs 
+    fixnum                     ;; narcs 
 
 )( void "XFillArcs"))
 
@@ -1731,13 +1733,13 @@
 
 (defentry XFillPolygon(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int                ;; points 
-    int                        ;; npoints 
-    int                        ;; shape 
-    int                        ;; mode 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum             ;; points 
+    fixnum                     ;; npoints 
+    fixnum                     ;; shape 
+    fixnum                     ;; mode 
 
 )( void "XFillPolygon"))
 
@@ -1745,13 +1747,13 @@
 
 (defentry XFillRectangle(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int                        ;; x 
-    int                        ;; y 
-     int       ;; width 
-     int       ;; height 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
+     fixnum    ;; width 
+     fixnum    ;; height 
 
 )( void "XFillRectangle"))
 
@@ -1759,11 +1761,11 @@
 
 (defentry XFillRectangles(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int        ;; rectangles 
-    int                        ;; nrectangles 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum     ;; rectangles 
+    fixnum                     ;; nrectangles 
 
 )( void "XFillRectangles"))
 
@@ -1771,7 +1773,7 @@
 
 (defentry XFlush(
 
-    int                ;; display 
+    fixnum             ;; display 
 
 )( void "XFlush"))
 
@@ -1779,8 +1781,8 @@
 
 (defentry XForceScreenSaver(
 
-    int                ;; display 
-    int                        ;; mode 
+    fixnum             ;; display 
+    fixnum                     ;; mode 
 
 )( void "XForceScreenSaver"))
 
@@ -1796,8 +1798,8 @@
 
 (defentry XFreeColormap(
 
-    int                ;; display 
-    int                ;; colormap 
+    fixnum             ;; display 
+    fixnum             ;; colormap 
 
 )( void "XFreeColormap"))
 
@@ -1805,11 +1807,11 @@
 
 (defentry XFreeColors(
 
-    int                ;; display 
-    int                ;; colormap 
-     int ;; pixels 
-    int                        ;; npixels 
-     int       ;; planes 
+    fixnum             ;; display 
+    fixnum             ;; colormap 
+     fixnum ;; pixels 
+    fixnum                     ;; npixels 
+     fixnum    ;; planes 
 
 )( void "XFreeColors"))
 
@@ -1817,8 +1819,8 @@
 
 (defentry XFreeCursor(
 
-    int                ;; display 
-    int                ;; cursor 
+    fixnum             ;; display 
+    fixnum             ;; cursor 
 
 )( void "XFreeCursor"))
 
@@ -1826,7 +1828,7 @@
 
 (defentry XFreeExtensionList(
 
-   int         ;; list     
+   fixnum      ;; list     
 
 )( void "XFreeExtensionList"))
 
@@ -1834,8 +1836,8 @@
 
 (defentry XFreeFont(
 
-    int                ;; display 
-    int        ;; font_struct 
+    fixnum             ;; display 
+    fixnum     ;; font_struct 
 
 )( void "XFreeFont"))
 
@@ -1843,9 +1845,9 @@
 
 (defentry XFreeFontInfo(
 
-   int         ;; names 
-    int        ;; free_info 
-    int                        ;; actual_count 
+   fixnum      ;; names 
+    fixnum     ;; free_info 
+    fixnum                     ;; actual_count 
 
 )( void "XFreeFontInfo"))
 
@@ -1853,7 +1855,7 @@
 
 (defentry XFreeFontNames(
 
-   int         ;; list 
+   fixnum      ;; list 
 
 )( void "XFreeFontNames"))
 
@@ -1861,7 +1863,7 @@
 
 (defentry XFreeFontPath(
 
-   int         ;; list 
+   fixnum      ;; list 
 
 )( void "XFreeFontPath"))
 
@@ -1869,8 +1871,8 @@
 
 (defentry XFreeGC(
 
-    int                ;; display 
-    int                        ;; gc 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
 
 )( void "XFreeGC"))
 
@@ -1878,7 +1880,7 @@
 
 (defentry XFreeModifiermap(
 
-    int        ;; modmap 
+    fixnum     ;; modmap 
 
 )( void "XFreeModifiermap"))
 
@@ -1886,8 +1888,8 @@
 
 (defentry XFreePixmap(
 
-    int                ;; display 
-    int                ;; int 
+    fixnum             ;; display 
+    fixnum             ;; fixnum 
 
 )( void "XFreePixmap"))
 
@@ -1895,32 +1897,32 @@
 
 (defentry XGeometry(
 
-    int                ;; display 
-    int                        ;; screen 
+    fixnum             ;; display 
+    fixnum                     ;; screen 
     object             ;; position 
     object             ;; default_position 
-     int       ;; bwidth 
-     int       ;; fwidth 
-     int       ;; fheight 
-    int                        ;; xadder 
-    int                        ;; yadder 
-    int                ;; x_return 
-    int                ;; y_return 
-    int                ;; width_return 
-    int                ;; height_return 
+     fixnum    ;; bwidth 
+     fixnum    ;; fwidth 
+     fixnum    ;; fheight 
+    fixnum                     ;; xadder 
+    fixnum                     ;; yadder 
+    fixnum             ;; x_return 
+    fixnum             ;; y_return 
+    fixnum             ;; width_return 
+    fixnum             ;; height_return 
 
-)( int "XGeometry"))
+)( fixnum "XGeometry"))
 
 
 
 (defentry XGetErrorDatabaseText(
 
-    int                ;; display 
+    fixnum             ;; display 
     object             ;; name 
     object             ;; message 
     object             ;; default_string 
    object              ;; buffer_return 
-    int                        ;; length 
+    fixnum                     ;; length 
 
 )( void "XGetErrorDatabaseText"))
 
@@ -1928,10 +1930,10 @@
 
 (defentry XGetErrorText(
 
-    int                ;; display 
-    int                        ;; code 
+    fixnum             ;; display 
+    fixnum                     ;; code 
    object              ;; buffer_return 
-    int                        ;; length 
+    fixnum                     ;; length 
 
 )( void "XGetErrorText"))
 
@@ -1939,56 +1941,56 @@
 
 (defentry XGetFontProperty(
 
-    int        ;; font_struct 
-    int                ;; atom 
-     int ;; value_return 
+    fixnum     ;; font_struct 
+    fixnum             ;; atom 
+     fixnum ;; value_return 
 
-)( int "XGetFontProperty"))
+)( fixnum "XGetFontProperty"))
 
 
 
 (defentry XGetGCValues(
 
-    int                ;; display 
-    int                        ;; gc 
-     int       ;; valuemask 
-    int        ;; values_return 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+     fixnum    ;; valuemask 
+    fixnum     ;; values_return 
 
-)( int "XGetGCValues"))
+)( fixnum "XGetGCValues"))
 
 
 
 (defentry XGetGeometry(
 
-    int                ;; display 
-    int                ;; d 
-    int                ;; root_return 
-    int                ;; x_return 
-    int                ;; y_return 
-     int       ;; width_return 
-     int       ;; height_return 
-     int       ;; border_width_return 
-     int       ;; depth_return 
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum             ;; root_return 
+    fixnum             ;; x_return 
+    fixnum             ;; y_return 
+     fixnum    ;; width_return 
+     fixnum    ;; height_return 
+     fixnum    ;; border_width_return 
+     fixnum    ;; depth_return 
 
-)( int "XGetGeometry"))
+)( fixnum "XGetGeometry"))
 
 
 
 (defentry XGetIconName(
 
-    int                ;; display 
-    int                ;; w 
-   int         ;; icon_name_return 
+    fixnum             ;; display 
+    fixnum             ;; w 
+   fixnum      ;; icon_name_return 
 
-)( int "XGetIconName"))
+)( fixnum "XGetIconName"))
 
 
 
 (defentry XGetInputFocus(
 
-    int                ;; display 
-    int                ;; focus_return 
-    int                ;; revert_to_return 
+    fixnum             ;; display 
+    fixnum             ;; focus_return 
+    fixnum             ;; revert_to_return 
 
 )( void "XGetInputFocus"))
 
@@ -1996,8 +1998,8 @@
 
 (defentry XGetKeyboardControl(
 
-    int                ;; display 
-    int ;; values_return 
+    fixnum             ;; display 
+    fixnum ;; values_return 
 
 )( void "XGetKeyboardControl"))
 
@@ -2005,10 +2007,10 @@
 
 (defentry XGetPointerControl(
 
-    int                ;; display 
-    int                ;; accel_numerator_return 
-    int                ;; accel_denominator_return 
-    int                ;; threshold_return 
+    fixnum             ;; display 
+    fixnum             ;; accel_numerator_return 
+    fixnum             ;; accel_denominator_return 
+    fixnum             ;; threshold_return 
 
 )( void "XGetPointerControl"))
 
@@ -2016,21 +2018,21 @@
 
 (defentry XGetPointerMapping(
 
-    int                ;; display 
+    fixnum             ;; display 
     object     ;; map_return 
-    int                        ;; nmap 
+    fixnum                     ;; nmap 
 
-)( int "XGetPointerMapping"))
+)( fixnum "XGetPointerMapping"))
 
 
 
 (defentry XGetScreenSaver(
 
-    int                ;; display 
-    int                ;; intout_return 
-    int                ;; interval_return 
-    int                ;; prefer_blanking_return 
-    int                ;; allow_exposures_return 
+    fixnum             ;; display 
+    fixnum             ;; intout_return 
+    fixnum             ;; interval_return 
+    fixnum             ;; prefer_blanking_return 
+    fixnum             ;; allow_exposures_return 
 
 )( void "XGetScreenSaver"))
 
@@ -2038,55 +2040,55 @@
 
 (defentry XGetTransientForHint(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; prop_window_return 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; prop_window_return 
 
-)( int "XGetTransientForHint"))
+)( fixnum "XGetTransientForHint"))
 
 
 
 (defentry XGetWindowProperty(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; property 
-    int                ;; int_offset 
-    int                ;; int_length 
-    int                ;; delete 
-    int                ;; req_type 
-    int        ;; actual_type_return 
-    int                ;; actual_format_return 
-     int ;; nitems_return 
-     int ;; bytes_after_return 
-    int ;; prop_return 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; property 
+    fixnum             ;; int_offset 
+    fixnum             ;; int_length 
+    fixnum             ;; delete 
+    fixnum             ;; req_type 
+    fixnum     ;; actual_type_return 
+    fixnum             ;; actual_format_return 
+     fixnum ;; nitems_return 
+     fixnum ;; bytes_after_return 
+    fixnum ;; prop_return 
 
-)( int "XGetWindowProperty"))
+)( fixnum "XGetWindowProperty"))
 
 
 
 (defentry XGetWindowAttributes(
 
-    int                ;; display 
-    int                ;; w 
-    int ;; Window_attributes_return 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum ;; Window_attributes_return 
 
-)( int "XGetWindowAttributes"))
+)( fixnum "XGetWindowAttributes"))
 
 
 
 (defentry XGrabButton(
 
-    int                ;; display 
-     int       ;; button 
-     int       ;; modifiers 
-    int                ;; grab_window 
-    int                ;; owner_events 
-     int       ;; event_mask 
-    int                        ;; pointer_mode 
-    int                        ;; keyboard_mode 
-    int                ;; confine_to 
-    int                ;; cursor 
+    fixnum             ;; display 
+     fixnum    ;; button 
+     fixnum    ;; modifiers 
+    fixnum             ;; grab_window 
+    fixnum             ;; owner_events 
+     fixnum    ;; event_mask 
+    fixnum                     ;; pointer_mode 
+    fixnum                     ;; keyboard_mode 
+    fixnum             ;; confine_to 
+    fixnum             ;; cursor 
 
 )( void "XGrabButton"))
 
@@ -2094,13 +2096,13 @@
 
 (defentry XGrabKey(
 
-    int                ;; display 
-    int                        ;; keycode
-     int       ;; modifiers 
-    int                ;; grab_window 
-    int                ;; owner_events 
-    int                        ;; pointer_mode 
-    int                        ;; keyboard_mode 
+    fixnum             ;; display 
+    fixnum                     ;; keycode
+     fixnum    ;; modifiers 
+    fixnum             ;; grab_window 
+    fixnum             ;; owner_events 
+    fixnum                     ;; pointer_mode 
+    fixnum                     ;; keyboard_mode 
 
 )( void "XGrabKey"))
 
@@ -2108,36 +2110,36 @@
 
 (defentry XGrabKeyboard(
 
-    int                ;; display 
-    int                ;; grab_window 
-    int                ;; owner_events 
-    int                        ;; pointer_mode 
-    int                        ;; keyboard_mode 
-    int                ;; int 
+    fixnum             ;; display 
+    fixnum             ;; grab_window 
+    fixnum             ;; owner_events 
+    fixnum                     ;; pointer_mode 
+    fixnum                     ;; keyboard_mode 
+    fixnum             ;; fixnum 
 
-)( int "XGrabKeyboard"))
+)( fixnum "XGrabKeyboard"))
 
 
 
 (defentry XGrabPointer(
 
-    int                ;; display 
-    int                ;; grab_window 
-    int                ;; owner_events 
-     int       ;; event_mask 
-    int                        ;; pointer_mode 
-    int                        ;; keyboard_mode 
-    int                ;; confine_to 
-    int                ;; cursor 
-    int                ;; int 
+    fixnum             ;; display 
+    fixnum             ;; grab_window 
+    fixnum             ;; owner_events 
+     fixnum    ;; event_mask 
+    fixnum                     ;; pointer_mode 
+    fixnum                     ;; keyboard_mode 
+    fixnum             ;; confine_to 
+    fixnum             ;; cursor 
+    fixnum             ;; fixnum 
 
-)( int "XGrabPointer"))
+)( fixnum "XGrabPointer"))
 
 
 
 (defentry XGrabServer(
 
-    int                ;; display 
+    fixnum             ;; display 
 
 )( void "XGrabServer"))
 
@@ -2145,32 +2147,32 @@
 
 (defentry XHeightMMOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int "XHeightMMOfScreen"))
+)( fixnum "XHeightMMOfScreen"))
 
 
 
 (defentry XHeightOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int "XHeightOfScreen"))
+)( fixnum "XHeightOfScreen"))
 
 
 
 (defentry XImageByteOrder(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XImageByteOrder"))
+)( fixnum "XImageByteOrder"))
 
 
 
 (defentry XInstallColormap(
 
-    int                ;; display 
-    int                ;; colormap 
+    fixnum             ;; display 
+    fixnum             ;; colormap 
 
 )( void "XInstallColormap"))
 
@@ -2178,17 +2180,17 @@
 
 (defentry XKeysymToKeycode(
 
-    int                ;; display 
-    int                ;; keysym 
+    fixnum             ;; display 
+    fixnum             ;; keysym 
 
-)( int "XKeysymToKeycode"))
+)( fixnum "XKeysymToKeycode"))
 
 
 
 (defentry XKillClient(
 
-    int                ;; display 
-    int                        ;; resource 
+    fixnum             ;; display 
+    fixnum                     ;; resource 
 
 )( void "XKillClient"))
 
@@ -2196,28 +2198,28 @@
 
 (defentry XLastKnownRequestProcessed(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XLastKnownRequestProcessed"))
+)( fixnum "XLastKnownRequestProcessed"))
 
 
 
 (defentry XLookupColor(
 
-    int                ;; display 
-    int                ;; colormap 
+    fixnum             ;; display 
+    fixnum             ;; colormap 
     object             ;; color_name 
-    int                ;; exact_def_return 
-    int                ;; screen_def_return 
+    fixnum             ;; exact_def_return 
+    fixnum             ;; screen_def_return 
 
-)( int "XLookupColor"))
+)( fixnum "XLookupColor"))
 
 
 
 (defentry XLowerWindow(
 
-    int                ;; display 
-    int                ;; w 
+    fixnum             ;; display 
+    fixnum             ;; w 
 
 )( void "XLowerWindow"))
 
@@ -2225,8 +2227,8 @@
 
 (defentry XMapRaised(
 
-    int                ;; display 
-    int                ;; w 
+    fixnum             ;; display 
+    fixnum             ;; w 
 
 )( void "XMapRaised"))
 
@@ -2234,8 +2236,8 @@
 
 (defentry XMapSubwindows(
 
-    int                ;; display 
-    int                ;; w 
+    fixnum             ;; display 
+    fixnum             ;; w 
 
 )( void "XMapSubwindows"))
 
@@ -2243,8 +2245,8 @@
 
 (defentry XMapWindow(
 
-    int                ;; display 
-    int                ;; w 
+    fixnum             ;; display 
+    fixnum             ;; w 
 
 )( void "XMapWindow"))
 
@@ -2252,9 +2254,9 @@
 
 (defentry XMaskEvent(
 
-    int                ;; display 
-    int                ;; event_mask 
-    int                ;; event_return 
+    fixnum             ;; display 
+    fixnum             ;; event_mask 
+    fixnum             ;; event_return 
 
 )( void "XMaskEvent"))
 
@@ -2262,28 +2264,28 @@
 
 (defentry XMaxCmapsOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int "XMaxCmapsOfScreen"))
+)( fixnum "XMaxCmapsOfScreen"))
 
 
 
 (defentry XMinCmapsOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int "XMinCmapsOfScreen"))
+)( fixnum "XMinCmapsOfScreen"))
 
 
 
 (defentry XMoveResizeWindow(
 
-    int                ;; display 
-    int                ;; w 
-    int                        ;; x 
-    int                        ;; y 
-     int       ;; width 
-     int       ;; height 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
+     fixnum    ;; width 
+     fixnum    ;; height 
 
 )( void "XMoveResizeWindow"))
 
@@ -2291,10 +2293,10 @@
 
 (defentry XMoveWindow(
 
-    int                ;; display 
-    int                ;; w 
-    int                        ;; x 
-    int                        ;; y 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
 
 )( void "XMoveWindow"))
 
@@ -2302,8 +2304,8 @@
 
 (defentry XNextEvent(
 
-    int                ;; display 
-    int                ;; event_return 
+    fixnum             ;; display 
+    fixnum             ;; event_return 
 
 )( void "XNextEvent"))
 
@@ -2311,7 +2313,7 @@
 
 (defentry XNoOp(
 
-    int                ;; display 
+    fixnum             ;; display 
 
 )( void "XNoOp"))
 
@@ -2319,31 +2321,31 @@
 
 (defentry XParseColor(
 
-    int                ;; display 
-    int                ;; colormap 
+    fixnum             ;; display 
+    fixnum             ;; colormap 
     object             ;; spec 
-    int                ;; exact_def_return 
+    fixnum             ;; exact_def_return 
 
-)( int "XParseColor"))
+)( fixnum "XParseColor"))
 
 
 
 (defentry XParseGeometry(
 
     object             ;; parsestring 
-    int                ;; x_return 
-    int                ;; y_return 
-     int       ;; width_return 
-     int       ;; height_return 
+    fixnum             ;; x_return 
+    fixnum             ;; y_return 
+     fixnum    ;; width_return 
+     fixnum    ;; height_return 
 
-)( int "XParseGeometry"))
+)( fixnum "XParseGeometry"))
 
 
 
 (defentry XPeekEvent(
 
-    int                ;; display 
-    int                ;; event_return 
+    fixnum             ;; display 
+    fixnum             ;; event_return 
 
 )( void "XPeekEvent"))
 
@@ -2352,42 +2354,42 @@
 
 (defentry XPending(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XPending"))
+)( fixnum "XPending"))
 
 
 
 (defentry XPlanesOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
     
 
-)( int "XPlanesOfScreen"))
+)( fixnum "XPlanesOfScreen"))
 
 
 
 (defentry XProtocolRevision(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XProtocolRevision"))
+)( fixnum "XProtocolRevision"))
 
 
 
 (defentry XProtocolVersion(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XProtocolVersion"))
+)( fixnum "XProtocolVersion"))
 
 
 
 
 (defentry XPutBackEvent(
 
-    int                ;; display 
-    int                ;; event 
+    fixnum             ;; display 
+    fixnum             ;; event 
 
 )( void "XPutBackEvent"))
 
@@ -2395,16 +2397,16 @@
 
 (defentry XPutImage(
 
-    int                ;; display 
-    int                ;; d 
-    int                        ;; gc 
-    int        ;; image 
-    int                        ;; src_x 
-    int                        ;; src_y 
-    int                        ;; dest_x 
-    int                        ;; dest_y 
-     int       ;; width 
-     int       ;; height         
+    fixnum             ;; display 
+    fixnum             ;; d 
+    fixnum                     ;; gc 
+    fixnum     ;; image 
+    fixnum                     ;; src_x 
+    fixnum                     ;; src_y 
+    fixnum                     ;; dest_x 
+    fixnum                     ;; dest_y 
+     fixnum    ;; width 
+     fixnum    ;; height         
 
 )( void "XPutImage"))
 
@@ -2412,70 +2414,70 @@
 
 (defentry XQLength(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XQLength"))
+)( fixnum "XQLength"))
 
 
 
 (defentry XQueryBestCursor(
 
-    int                ;; display 
-    int                ;; d 
-     int        ;; width 
-     int       ;; height 
-     int       ;; width_return 
-     int       ;; height_return 
+    fixnum             ;; display 
+    fixnum             ;; d 
+     fixnum        ;; width 
+     fixnum    ;; height 
+     fixnum    ;; width_return 
+     fixnum    ;; height_return 
 
-)( int "XQueryBestCursor"))
+)( fixnum "XQueryBestCursor"))
 
 
 
 (defentry XQueryBestSize(
 
-    int                ;; display 
-    int                        ;; class 
-    int                ;; which_screen 
-     int       ;; width 
-     int       ;; height 
-     int       ;; width_return 
-     int       ;; height_return 
+    fixnum             ;; display 
+    fixnum                     ;; class 
+    fixnum             ;; which_screen 
+     fixnum    ;; width 
+     fixnum    ;; height 
+     fixnum    ;; width_return 
+     fixnum    ;; height_return 
 
-)( int "XQueryBestSize"))
+)( fixnum "XQueryBestSize"))
 
 
 
 (defentry XQueryBestStipple(
 
-    int                ;; display 
-    int                ;; which_screen 
-     int       ;; width 
-     int       ;; height 
-     int       ;; width_return 
-     int       ;; height_return 
+    fixnum             ;; display 
+    fixnum             ;; which_screen 
+     fixnum    ;; width 
+     fixnum    ;; height 
+     fixnum    ;; width_return 
+     fixnum    ;; height_return 
 
-)( int "XQueryBestStipple"))
+)( fixnum "XQueryBestStipple"))
 
 
 
 (defentry XQueryBestTile(
 
-    int                ;; display 
-    int                ;; which_screen 
-     int       ;; width 
-     int       ;; height 
-     int       ;; width_return 
-     int       ;; height_return 
+    fixnum             ;; display 
+    fixnum             ;; which_screen 
+     fixnum    ;; width 
+     fixnum    ;; height 
+     fixnum    ;; width_return 
+     fixnum    ;; height_return 
 
-)( int "XQueryBestTile"))
+)( fixnum "XQueryBestTile"))
 
 
 
 (defentry XQueryColor(
 
-    int                ;; display 
-    int                ;; colormap 
-    int                ;; def_in_out 
+    fixnum             ;; display 
+    fixnum             ;; colormap 
+    fixnum             ;; def_in_out 
 
 )( void "XQueryColor"))
 
@@ -2483,10 +2485,10 @@
 
 (defentry XQueryColors(
 
-    int                ;; display 
-    int                ;; colormap 
-    int                ;; defs_in_out 
-    int                        ;; ncolors 
+    fixnum             ;; display 
+    fixnum             ;; colormap 
+    fixnum             ;; defs_in_out 
+    fixnum                     ;; ncolors 
 
 )( void "XQueryColors"))
 
@@ -2494,20 +2496,20 @@
 
 (defentry XQueryExtension(
 
-    int                ;; display 
+    fixnum             ;; display 
     object             ;; name 
-    int                ;; major_opcode_return 
-    int                ;; first_event_return 
-    int                ;; first_error_return 
+    fixnum             ;; major_opcode_return 
+    fixnum             ;; first_event_return 
+    fixnum             ;; first_error_return 
 
-)( int "XQueryExtension"))
+)( fixnum "XQueryExtension"))
 
 
 ;;fix
 (defentry XQueryKeymap(
 
-    int                ;; display 
-    int                ;; keys_return 
+    fixnum             ;; display 
+    fixnum             ;; keys_return 
 
 )( void "XQueryKeymap"))
 
@@ -2515,30 +2517,30 @@
 
 (defentry XQueryPointer(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; root_return 
-    int                ;; child_return 
-    int                ;; root_x_return 
-    int                ;; root_y_return 
-    int                ;; win_x_return 
-    int                ;; win_y_return 
-     int       ;; mask_return 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; root_return 
+    fixnum             ;; child_return 
+    fixnum             ;; root_x_return 
+    fixnum             ;; root_y_return 
+    fixnum             ;; win_x_return 
+    fixnum             ;; win_y_return 
+     fixnum       ;; mask_return 
 
-)( int "XQueryPointer"))
+)( fixnum "XQueryPointer"))
 
 
 
 (defentry XQueryTextExtents(
 
-    int                ;; display 
-    int                        ;; font_ID 
+    fixnum             ;; display 
+    fixnum                     ;; font_ID 
     object             ;; string 
-    int                        ;; nchars 
-    int                ;; direction_return 
-    int                ;; font_ascent_return 
-    int                ;; font_descent_return 
-    int        ;; overall_return     
+    fixnum                     ;; nchars 
+    fixnum             ;; direction_return 
+    fixnum             ;; font_ascent_return 
+    fixnum             ;; font_descent_return 
+    fixnum     ;; overall_return     
 
 )( void "XQueryTextExtents"))
 
@@ -2546,14 +2548,14 @@
 
 (defentry XQueryTextExtents16(
 
-    int                ;; display 
-    int                        ;; font_ID 
-     int       ;; string 
-    int                        ;; nchars 
-    int                ;; direction_return 
-    int                ;; font_ascent_return 
-    int                ;; font_descent_return 
-    int        ;; overall_return 
+    fixnum             ;; display 
+    fixnum                     ;; font_ID 
+     fixnum    ;; string 
+    fixnum                     ;; nchars 
+    fixnum             ;; direction_return 
+    fixnum             ;; font_ascent_return 
+    fixnum             ;; font_descent_return 
+    fixnum     ;; overall_return 
 
 )( void "XQueryTextExtents16"))
 
@@ -2561,21 +2563,21 @@
 
 (defentry XQueryTree(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; root_return 
-    int                ;; parent_return 
-    int                ;; children_return 
-     int       ;; nchildren_return 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; root_return 
+    fixnum             ;; parent_return 
+    fixnum             ;; children_return 
+     fixnum    ;; nchildren_return 
 
-)( int "XQueryTree"))
+)( fixnum "XQueryTree"))
 
 
 
 (defentry XRaiseWindow(
 
-    int                ;; display 
-    int                ;; w 
+    fixnum             ;; display 
+    fixnum             ;; w 
 
 )( void "XRaiseWindow"))
 
@@ -2583,27 +2585,27 @@
 
 (defentry XReadBitmapFile(
 
-    int                ;; display 
-    int                ;; d 
+    fixnum             ;; display 
+    fixnum             ;; d 
     object             ;; filename 
-     int       ;; width_return 
-     int       ;; height_return 
-    int                ;; bitmap_return 
-    int                ;; x_hot_return 
-    int                ;; y_hot_return 
+     fixnum    ;; width_return 
+     fixnum    ;; height_return 
+    fixnum             ;; bitmap_return 
+    fixnum             ;; x_hot_return 
+    fixnum             ;; y_hot_return 
 
-)( int "XReadBitmapFile"))
+)( fixnum "XReadBitmapFile"))
 
 
 
 (defentry XRebindKeysym(
 
-    int                ;; display 
-    int                ;; keysym 
-    int                ;; list 
-    int                        ;; mod_count 
+    fixnum             ;; display 
+    fixnum             ;; keysym 
+    fixnum             ;; list 
+    fixnum                     ;; mod_count 
      object    ;; string 
-    int                        ;; bytes_string 
+    fixnum                     ;; bytes_string 
 
 )( void "XRebindKeysym"))
 
@@ -2611,10 +2613,10 @@
 
 (defentry XRecolorCursor(
 
-    int                ;; display 
-    int                ;; cursor 
-    int                ;; foreground_color 
-    int                ;; background_color 
+    fixnum             ;; display 
+    fixnum             ;; cursor 
+    fixnum             ;; foreground_color 
+    fixnum             ;; background_color 
 
 )( void "XRecolorCursor"))
 
@@ -2622,7 +2624,7 @@
 
 (defentry XRefreshKeyboardMapping(
 
-    int        ;; event_map     
+    fixnum     ;; event_map     
 
 )( void "XRefreshKeyboardMapping"))
 
@@ -2630,8 +2632,8 @@
 
 (defentry XRemoveFromSaveSet(
 
-    int                ;; display 
-    int                ;; w 
+    fixnum             ;; display 
+    fixnum             ;; w 
 
 )( void "XRemoveFromSaveSet"))
 
@@ -2639,8 +2641,8 @@
 
 (defentry XRemoveHost(
 
-    int                ;; display 
-    int ;; host 
+    fixnum             ;; display 
+    fixnum ;; host 
 
 )( void "XRemoveHost"))
 
@@ -2648,9 +2650,9 @@
 
 (defentry XRemoveHosts(
 
-    int                ;; display 
-    int        ;; hosts 
-    int                        ;; num_hosts 
+    fixnum             ;; display 
+    fixnum     ;; hosts 
+    fixnum                     ;; num_hosts 
 
 )( void "XRemoveHosts"))
 
@@ -2658,11 +2660,11 @@
 
 (defentry XReparentWindow(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; parent 
-    int                        ;; x 
-    int                        ;; y 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; parent 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
 
 )( void "XReparentWindow"))
 
@@ -2670,7 +2672,7 @@
 
 (defentry XResetScreenSaver(
 
-    int                ;; display 
+    fixnum             ;; display 
 
 )( void "XResetScreenSaver"))
 
@@ -2678,10 +2680,10 @@
 
 (defentry XResizeWindow(
 
-    int                ;; display 
-    int                ;; w 
-     int       ;; width 
-     int       ;; height 
+    fixnum             ;; display 
+    fixnum             ;; w 
+     fixnum    ;; width 
+     fixnum    ;; height 
 
 )( void "XResizeWindow"))
 
@@ -2689,9 +2691,9 @@
 
 (defentry XRestackWindows(
 
-    int                ;; display 
-    int                ;; windows 
-    int                        ;; nwindows 
+    fixnum             ;; display 
+    fixnum             ;; windows 
+    fixnum                     ;; nwindows 
 
 )( void "XRestackWindows"))
 
@@ -2699,8 +2701,8 @@
 
 (defentry XRotateBuffers(
 
-    int                ;; display 
-    int                        ;; rotate 
+    fixnum             ;; display 
+    fixnum                     ;; rotate 
 
 )( void "XRotateBuffers"))
 
@@ -2708,11 +2710,11 @@
 
 (defentry XRotateWindowProperties(
 
-    int                ;; display 
-    int                ;; w 
-    int        ;; properties 
-    int                        ;; num_prop 
-    int                        ;; npositions 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum     ;; properties 
+    fixnum                     ;; num_prop 
+    fixnum                     ;; npositions 
 
 )( void "XRotateWindowProperties"))
 
@@ -2720,17 +2722,17 @@
 
 (defentry XScreenCount(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XScreenCount"))
+)( fixnum "XScreenCount"))
 
 
 
 (defentry XSelectInput(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; event_mask 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; event_mask 
 
 )( void "XSelectInput"))
 
@@ -2738,20 +2740,20 @@
 
 (defentry XSendEvent(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; propagate 
-    int                ;; event_mask 
-    int                ;; event_send 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; propagate 
+    fixnum             ;; event_mask 
+    fixnum             ;; event_send 
 
-)( int "XSendEvent"))
+)( fixnum "XSendEvent"))
 
 
 
 (defentry XSetAccessControl(
 
-    int                ;; display 
-    int                        ;; mode 
+    fixnum             ;; display 
+    fixnum                     ;; mode 
 
 )( void "XSetAccessControl"))
 
@@ -2759,9 +2761,9 @@
 
 (defentry XSetArcMode(
 
-    int                ;; display 
-    int                        ;; gc 
-    int                        ;; arc_mode 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+    fixnum                     ;; arc_mode 
 
 )( void "XSetArcMode"))
 
@@ -2769,9 +2771,9 @@
 
 (defentry XSetBackground(
 
-    int                ;; display 
-    int                        ;; gc 
-     int       ;; background 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+     fixnum    ;; background 
 
 )( void "XSetBackground"))
 
@@ -2779,9 +2781,9 @@
 
 (defentry XSetClipMask(
 
-    int                ;; display 
-    int                        ;; gc 
-    int                ;; int 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+    fixnum             ;; fixnum 
 
 )( void "XSetClipMask"))
 
@@ -2789,10 +2791,10 @@
 
 (defentry XSetClipOrigin(
 
-    int                ;; display 
-    int                        ;; gc 
-    int                        ;; clip_x_origin 
-    int                        ;; clip_y_origin 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+    fixnum                     ;; clip_x_origin 
+    fixnum                     ;; clip_y_origin 
 
 )( void "XSetClipOrigin"))
 
@@ -2800,13 +2802,13 @@
 
 (defentry XSetClipRectangles(
 
-    int                ;; display 
-    int                        ;; gc 
-    int                        ;; clip_x_origin 
-    int                        ;; clip_y_origin 
-    int                        ;; rectangles 
-    int                        ;; n 
-    int                        ;; ordering 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+    fixnum                     ;; clip_x_origin 
+    fixnum                     ;; clip_y_origin 
+    fixnum                     ;; rectangles 
+    fixnum                     ;; n 
+    fixnum                     ;; ordering 
 
 )( void "XSetClipRectangles"))
 
@@ -2814,8 +2816,8 @@
 
 (defentry XSetCloseDownMode(
 
-    int                ;; display 
-    int                        ;; close_mode 
+    fixnum             ;; display 
+    fixnum                     ;; close_mode 
 
 )( void "XSetCloseDownMode"))
 
@@ -2823,10 +2825,10 @@
 
 (defentry XSetCommand(
 
-    int                ;; display 
-    int                ;; w 
-   int         ;; argv 
-    int                        ;; argc 
+    fixnum             ;; display 
+    fixnum             ;; w 
+   fixnum      ;; argv 
+    fixnum                     ;; argc 
 
 )( void "XSetCommand"))
 
@@ -2834,11 +2836,11 @@
 
 (defentry XSetDashes(
 
-    int                ;; display 
-    int                        ;; gc 
-    int                        ;; dash_offset 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+    fixnum                     ;; dash_offset 
     object             ;; dash_list 
-    int                        ;; n 
+    fixnum                     ;; n 
 
 )( void "XSetDashes"))
 
@@ -2846,9 +2848,9 @@
 
 (defentry XSetFillRule(
 
-    int                ;; display 
-    int                        ;; gc 
-    int                        ;; fill_rule 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+    fixnum                     ;; fill_rule 
 
 )( void "XSetFillRule"))
 
@@ -2856,9 +2858,9 @@
 
 (defentry XSetFillStyle(
 
-    int                ;; display 
-    int                        ;; gc 
-    int                        ;; fill_style 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+    fixnum                     ;; fill_style 
 
 )( void "XSetFillStyle"))
 
@@ -2866,9 +2868,9 @@
 
 (defentry XSetFont(
 
-    int                ;; display 
-    int                        ;; gc 
-    int                ;; font 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+    fixnum             ;; font 
 
 )( void "XSetFont"))
 
@@ -2876,9 +2878,9 @@
 
 (defentry XSetFontPath(
 
-    int                ;; display 
-   int         ;; directories 
-    int                        ;; ndirs             
+    fixnum             ;; display 
+   fixnum      ;; directories 
+    fixnum                     ;; ndirs             
 
 )( void "XSetFontPath"))
 
@@ -2886,9 +2888,9 @@
 
 (defentry XSetForeground(
 
-    int                ;; display 
-    int                        ;; gc 
-     int       ;; foreground 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+     fixnum    ;; foreground 
 
 )( void "XSetForeground"))
 
@@ -2896,9 +2898,9 @@
 
 (defentry XSetFunction(
 
-    int                ;; display 
-    int                        ;; gc 
-    int                        ;; function 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+    fixnum                     ;; function 
 
 )( void "XSetFunction"))
 
@@ -2906,9 +2908,9 @@
 
 (defentry XSetGraphicsExposures(
 
-    int                ;; display 
-    int                        ;; gc 
-    int                ;; graphics_exposures 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+    fixnum             ;; graphics_exposures 
 
 )( void "XSetGraphicsExposures"))
 
@@ -2916,8 +2918,8 @@
 
 (defentry XSetIconName(
 
-    int                ;; display 
-    int                ;; w 
+    fixnum             ;; display 
+    fixnum             ;; w 
     object             ;; icon_name 
 
 )( void "XSetIconName"))
@@ -2926,10 +2928,10 @@
 
 (defentry XSetInputFocus(
 
-    int                ;; display 
-    int                ;; focus 
-    int                        ;; revert_to 
-    int                ;; int 
+    fixnum             ;; display 
+    fixnum             ;; focus 
+    fixnum                     ;; revert_to 
+    fixnum             ;; fixnum 
 
 )( void "XSetInputFocus"))
 
@@ -2937,12 +2939,12 @@
 
 (defentry XSetLineAttributes(
 
-    int                ;; display 
-    int                        ;; gc 
-     int       ;; line_width 
-    int                        ;; line_style 
-    int                        ;; cap_style 
-    int                        ;; join_style 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+     fixnum    ;; line_width 
+    fixnum                     ;; line_style 
+    fixnum                     ;; cap_style 
+    fixnum                     ;; join_style 
 
 )( void "XSetLineAttributes"))
 
@@ -2950,18 +2952,18 @@
 
 (defentry XSetModifierMapping(
 
-    int                ;; display 
-    int        ;; modmap 
+    fixnum             ;; display 
+    fixnum     ;; modmap 
 
-)( int "XSetModifierMapping"))
+)( fixnum "XSetModifierMapping"))
 
 
 
 (defentry XSetPlaneMask(
 
-    int                ;; display 
-    int                        ;; gc 
-     int       ;; plane_mask 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+     fixnum    ;; plane_mask 
 
 )( void "XSetPlaneMask"))
 
@@ -2969,21 +2971,21 @@
 
 (defentry XSetPointerMapping(
 
-    int                ;; display 
+    fixnum             ;; display 
      object    ;; map 
-    int                        ;; nmap 
+    fixnum                     ;; nmap 
 
-)( int "XSetPointerMapping"))
+)( fixnum "XSetPointerMapping"))
 
 
 
 (defentry XSetScreenSaver(
 
-    int                ;; display 
-    int                        ;; intout 
-    int                        ;; interval 
-    int                        ;; prefer_blanking 
-    int                        ;; allow_exposures 
+    fixnum             ;; display 
+    fixnum                     ;; intout 
+    fixnum                     ;; interval 
+    fixnum                     ;; prefer_blanking 
+    fixnum                     ;; allow_exposures 
 
 )( void "XSetScreenSaver"))
 
@@ -2991,10 +2993,10 @@
 
 (defentry XSetSelectionOwner(
 
-    int                ;; display 
-    int                ;; selection 
-    int                ;; owner 
-    int                ;; int 
+    fixnum             ;; display 
+    fixnum             ;; selection 
+    fixnum             ;; owner 
+    fixnum             ;; fixnum 
 
 )( void "XSetSelectionOwner"))
 
@@ -3002,12 +3004,12 @@
 
 (defentry XSetState(
 
-    int                ;; display 
-    int                        ;; gc 
-     int       ;; foreground 
-     int       ;; background 
-    int                        ;; function 
-     int       ;; plane_mask 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+     fixnum    ;; foreground 
+     fixnum    ;; background 
+    fixnum                     ;; function 
+     fixnum    ;; plane_mask 
 
 )( void "XSetState"))
 
@@ -3015,9 +3017,9 @@
 
 (defentry XSetStipple(
 
-    int                ;; display 
-    int                        ;; gc 
-    int                ;; stipple 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+    fixnum             ;; stipple 
 
 )( void "XSetStipple"))
 
@@ -3025,9 +3027,9 @@
 
 (defentry XSetSubwindowMode(
 
-    int                ;; display 
-    int                        ;; gc 
-    int                        ;; subwindow_mode 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+    fixnum                     ;; subwindow_mode 
 
 )( void "XSetSubwindowMode"))
 
@@ -3035,10 +3037,10 @@
 
 (defentry XSetTSOrigin(
 
-    int                ;; display 
-    int                        ;; gc 
-    int                        ;; ts_x_origin 
-    int                        ;; ts_y_origin 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+    fixnum                     ;; ts_x_origin 
+    fixnum                     ;; ts_y_origin 
 
 )( void "XSetTSOrigin"))
 
@@ -3046,9 +3048,9 @@
 
 (defentry XSetTile(
 
-    int                ;; display 
-    int                        ;; gc 
-    int                ;; tile 
+    fixnum             ;; display 
+    fixnum                     ;; gc 
+    fixnum             ;; tile 
 
 )( void "XSetTile"))
 
@@ -3056,9 +3058,9 @@
 
 (defentry XSetWindowBackground(
 
-    int                ;; display 
-    int                ;; w 
-     int       ;; background_pixel 
+    fixnum             ;; display 
+    fixnum             ;; w 
+     fixnum    ;; background_pixel 
 
 )( void "XSetWindowBackground"))
 
@@ -3066,9 +3068,9 @@
 
 (defentry XSetWindowBackgroundPixmap(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; background_pixmap 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; background_pixmap 
 
 )( void "XSetWindowBackgroundPixmap"))
 
@@ -3076,9 +3078,9 @@
 
 (defentry XSetWindowBorder(
 
-    int                ;; display 
-    int                ;; w 
-     int       ;; border_pixel 
+    fixnum             ;; display 
+    fixnum             ;; w 
+     fixnum    ;; border_pixel 
 
 )( void "XSetWindowBorder"))
 
@@ -3086,9 +3088,9 @@
 
 (defentry XSetWindowBorderPixmap(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; border_pixmap
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; border_pixmap
 
 )( void "XSetWindowBorderPixmap"))
 
@@ -3096,9 +3098,9 @@
 
 (defentry XSetWindowBorderWidth(
 
-    int                ;; display 
-    int                ;; w 
-     int       ;; width 
+    fixnum             ;; display 
+    fixnum             ;; w 
+     fixnum    ;; width 
 
 )( void "XSetWindowBorderWidth"))
 
@@ -3106,9 +3108,9 @@
 
 (defentry XSetWindowColormap(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; colormap 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; colormap 
 
 )( void "XSetWindowColormap"))
 
@@ -3116,10 +3118,10 @@
 
 (defentry XStoreBuffer(
 
-    int                ;; display 
+    fixnum             ;; display 
     object             ;; bytes 
-    int                        ;; nbytes 
-    int                        ;; buffer 
+    fixnum                     ;; nbytes 
+    fixnum                     ;; buffer 
 
 )( void "XStoreBuffer"))
 
@@ -3127,9 +3129,9 @@
 
 (defentry XStoreBytes(
 
-    int                ;; display 
+    fixnum             ;; display 
     object             ;; bytes 
-    int                        ;; nbytes 
+    fixnum                     ;; nbytes 
 
 )( void "XStoreBytes"))
 
@@ -3137,9 +3139,9 @@
 
 (defentry XStoreColor(
 
-    int                ;; display 
-    int                ;; colormap 
-    int                ;; color 
+    fixnum             ;; display 
+    fixnum             ;; colormap 
+    fixnum             ;; color 
 
 )( void "XStoreColor"))
 
@@ -3147,10 +3149,10 @@
 
 (defentry XStoreColors(
 
-    int                ;; display 
-    int                ;; colormap 
-    int                ;; color 
-    int                        ;; ncolors 
+    fixnum             ;; display 
+    fixnum             ;; colormap 
+    fixnum             ;; color 
+    fixnum                     ;; ncolors 
 
 )( void "XStoreColors"))
 
@@ -3158,8 +3160,8 @@
 
 (defentry XStoreName(
 
-    int                ;; display 
-    int                ;; w 
+    fixnum             ;; display 
+    fixnum             ;; w 
     object             ;; window_name 
 
 )( void "XStoreName"))
@@ -3168,11 +3170,11 @@
 
 (defentry XStoreNamedColor(
 
-    int                ;; display 
-    int                ;; colormap 
+    fixnum             ;; display 
+    fixnum             ;; colormap 
     object             ;; color 
-     int       ;; pixel 
-    int                        ;; flags 
+     fixnum    ;; pixel 
+    fixnum                     ;; flags 
 
 )( void "XStoreNamedColor"))
 
@@ -3180,8 +3182,8 @@
 
 (defentry XSync(
 
-    int                ;; display 
-    int                ;; discard 
+    fixnum             ;; display 
+    fixnum             ;; discard 
 
 )( void "XSync"))
 
@@ -3189,13 +3191,13 @@
 
 (defentry XTextExtents(
 
-    int        ;; font_struct 
+    fixnum     ;; font_struct 
     object             ;; string 
-    int                        ;; nchars 
-    int                ;; direction_return 
-    int                ;; font_ascent_return 
-    int                ;; font_descent_return 
-    int        ;; overall_return 
+    fixnum                     ;; nchars 
+    fixnum             ;; direction_return 
+    fixnum             ;; font_ascent_return 
+    fixnum             ;; font_descent_return 
+    fixnum     ;; overall_return 
 
 )( void "XTextExtents"))
 
@@ -3203,13 +3205,13 @@
 
 (defentry XTextExtents16(
 
-    int        ;; font_struct 
-     int       ;; string 
-    int                        ;; nchars 
-    int                ;; direction_return 
-    int                ;; font_ascent_return 
-    int                ;; font_descent_return 
-    int        ;; overall_return 
+    fixnum     ;; font_struct 
+     fixnum    ;; string 
+    fixnum                     ;; nchars 
+    fixnum             ;; direction_return 
+    fixnum             ;; font_ascent_return 
+    fixnum             ;; font_descent_return 
+    fixnum     ;; overall_return 
 
 )( void "XTextExtents16"))
 
@@ -3217,43 +3219,43 @@
 
 (defentry XTextWidth(
 
-    int        ;; font_struct 
+    fixnum     ;; font_struct 
     object             ;; string 
-    int                        ;; count 
+    fixnum                     ;; count 
 
-)( int "XTextWidth"))
+)( fixnum "XTextWidth"))
 
 
 
 (defentry XTextWidth16(
 
-    int        ;; font_struct 
-    int                ;; string 
-    int                        ;; count 
+    fixnum     ;; font_struct 
+    fixnum             ;; string 
+    fixnum                     ;; count 
 
-)( int "XTextWidth16"))
+)( fixnum "XTextWidth16"))
 
 
 
 (defentry XTranslateCoordinates(
 
-    int                ;; display 
-    int                ;; src_w 
-    int                ;; dest_w 
-    int                ;; src_x 
-    int                ;; src_y 
-    int                ;; dest_x_return 
-    int                ;; dest_y_return 
-    int                ;; child_return 
+    fixnum             ;; display 
+    fixnum             ;; src_w 
+    fixnum             ;; dest_w 
+    fixnum             ;; src_x 
+    fixnum             ;; src_y 
+    fixnum             ;; dest_x_return 
+    fixnum             ;; dest_y_return 
+    fixnum             ;; child_return 
 
-)( int "XTranslateCoordinates"))
+)( fixnum "XTranslateCoordinates"))
 
 
 
 (defentry XUndefineCursor(
 
-    int                ;; display 
-    int                ;; w 
+    fixnum             ;; display 
+    fixnum             ;; w 
 
 )( void "XUndefineCursor"))
 
@@ -3261,10 +3263,10 @@
 
 (defentry XUngrabButton(
 
-    int                ;; display 
-     int       ;; button 
-     int       ;; modifiers 
-    int                ;; grab_window 
+    fixnum             ;; display 
+     fixnum    ;; button 
+     fixnum    ;; modifiers 
+    fixnum             ;; grab_window 
 
 )( void "XUngrabButton"))
 
@@ -3272,10 +3274,10 @@
 
 (defentry XUngrabKey(
 
-    int                ;; display 
-    int                ;; keycode
-     int       ;; modifiers 
-    int                ;; grab_window 
+    fixnum             ;; display 
+    fixnum             ;; keycode
+     fixnum    ;; modifiers 
+    fixnum             ;; grab_window 
 
 )( void "XUngrabKey"))
 
@@ -3283,8 +3285,8 @@
 
 (defentry XUngrabKeyboard(
 
-    int                ;; display 
-    int                ;; int 
+    fixnum             ;; display 
+    fixnum             ;; fixnum 
 
 )( void "XUngrabKeyboard"))
 
@@ -3292,8 +3294,8 @@
 
 (defentry XUngrabPointer(
 
-    int                ;; display 
-    int                ;; int 
+    fixnum             ;; display 
+    fixnum             ;; fixnum 
 
 )( void "XUngrabPointer"))
 
@@ -3301,7 +3303,7 @@
 
 (defentry XUngrabServer(
 
-    int                ;; display 
+    fixnum             ;; display 
 
 )( void "XUngrabServer"))
 
@@ -3309,8 +3311,8 @@
 
 (defentry XUninstallColormap(
 
-    int                ;; display 
-    int                ;; colormap 
+    fixnum             ;; display 
+    fixnum             ;; colormap 
 
 )( void "XUninstallColormap"))
 
@@ -3318,8 +3320,8 @@
 
 (defentry XUnloadFont(
 
-    int                ;; display 
-    int        ;; font 
+    fixnum             ;; display 
+    fixnum     ;; font 
 
 )( void "XUnloadFont"))
 
@@ -3327,8 +3329,8 @@
 
 (defentry XUnmapSubwindows(
 
-    int                ;; display 
-    int                ;; w 
+    fixnum             ;; display 
+    fixnum             ;; w 
 
 )( void "XUnmapSubwindows"))
 
@@ -3336,8 +3338,8 @@
 
 (defentry XUnmapWindow(
 
-    int                ;; display 
-    int                ;; w 
+    fixnum             ;; display 
+    fixnum             ;; w 
 
 )( void "XUnmapWindow"))
 
@@ -3345,23 +3347,23 @@
 
 (defentry XVendorRelease(
 
-    int                ;; display 
+    fixnum             ;; display 
 
-)( int "XVendorRelease"))
+)( fixnum "XVendorRelease"))
 
 
 
 (defentry XWarpPointer(
 
-    int                ;; display 
-    int                ;; src_w 
-    int                ;; dest_w 
-    int                        ;; src_x 
-    int                        ;; src_y 
-     int       ;; src_width 
-     int       ;; src_height 
-    int                        ;; dest_x 
-    int                        ;; dest_y            
+    fixnum             ;; display 
+    fixnum             ;; src_w 
+    fixnum             ;; dest_w 
+    fixnum                     ;; src_x 
+    fixnum                     ;; src_y 
+     fixnum    ;; src_width 
+     fixnum    ;; src_height 
+    fixnum                     ;; dest_x 
+    fixnum                     ;; dest_y            
 
 )( void "XWarpPointer"))
 
@@ -3369,26 +3371,26 @@
 
 (defentry XWidthMMOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int "XWidthMMOfScreen"))
+)( fixnum "XWidthMMOfScreen"))
 
 
 
 (defentry XWidthOfScreen(
 
-    int                ;; screen 
+    fixnum             ;; screen 
 
-)( int "XWidthOfScreen"))
+)( fixnum "XWidthOfScreen"))
 
 
 
 (defentry XWindowEvent(
 
-    int                ;; display 
-    int                ;; w 
-    int                ;; event_mask 
-    int                ;; event_return 
+    fixnum             ;; display 
+    fixnum             ;; w 
+    fixnum             ;; event_mask 
+    fixnum             ;; event_return 
 
 )( void "XWindowEvent"))
 
@@ -3396,15 +3398,15 @@
 
 (defentry XWriteBitmapFile(
 
-    int                ;; display 
+    fixnum             ;; display 
     object             ;; filename 
-    int                ;; bitmap 
-     int       ;; width 
-     int       ;; height 
-    int                        ;; x_hot 
-    int                        ;; y_hot                     
+    fixnum             ;; bitmap 
+     fixnum    ;; width 
+     fixnum    ;; height 
+    fixnum                     ;; x_hot 
+    fixnum                     ;; y_hot                     
 
-)( int "XWriteBitmapFile"))
+)( fixnum "XWriteBitmapFile"))
 
 
 
@@ -3413,16 +3415,16 @@
 
 
 
-;;(defentry int (int Synchronize(
+;;(defentry fixnum (int Synchronize(
 
-;;    int              ;; display 
-;;    int              ;; onoff 
+;;    fixnum           ;; display 
+;;    fixnum           ;; onoff 
 
 ;;))()())
-;;(defentry int (int SetAfterFunction(
+;;(defentry fixnum (int SetAfterFunction(
 
-;;    int              ;; display 
-;;    int (int  ( int                  ;; display 
+;;    fixnum           ;; display 
+;;    fixnum (int  ( fixnum                    ;; display 
 ;;            )                ;; procedure 
 
 ;;))()())                                      
@@ -3430,22 +3432,22 @@
 
 ;;(defentry void XPeekIfEvent(
 
-;;    int              ;; display 
-;;    int              ;; event_return 
-;;    int (int  ( int          ;; display 
-;;               int           ;; event 
+;;    fixnum           ;; display 
+;;    fixnum           ;; event_return 
+;;    fixnum (int  ( fixnum            ;; display 
+;;               fixnum                ;; event 
 ;;              object         ;; arg 
 ;;             )               ;; predicate 
 ;;   object            ;; arg 
 
 ;;)())
 
-;;(defentry int XCheckIfEvent(
+;;(defentry fixnum XCheckIfEvent(
 
-;;    int              ;; display 
-;;    int              ;; event_return 
-;;    int (int  ( int                  ;; display 
-;;               int                   ;; event 
+;;    fixnum           ;; display 
+;;    fixnum           ;; event_return 
+;;    fixnum (int  ( fixnum                    ;; display 
+;;               fixnum                        ;; event 
 ;;              object                 ;; arg 
 ;;             )               ;; predicate 
 ;;   object            ;; arg 
@@ -3454,10 +3456,10 @@
 
 ;;(defentry void XIfEvent(
 
-;;    int              ;; display 
-;;    int              ;; event_return 
-;;    int (int  ( int                  ;; display 
-;;               int                   ;; event 
+;;    fixnum           ;; display 
+;;    fixnum           ;; event_return 
+;;    fixnum (int  ( fixnum                    ;; display 
+;;               fixnum                        ;; event 
 ;;              object                 ;; arg 
 ;;             )               ;; predicate 
 ;;   object            ;; arg 

Index: xgcl-2/gcl_Xstruct.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_Xstruct.lsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- xgcl-2/gcl_Xstruct.lsp      5 Jan 2006 17:55:35 -0000       1.1.2.1
+++ xgcl-2/gcl_Xstruct.lsp      20 Jun 2006 23:00:10 -0000      1.1.2.2
@@ -27,285 +27,286 @@
 
 ;;;;;; _XQEvent funcions ;;;;;;
 
-(defentry make-_XQEvent () ( int  "make__XQEvent" ))
-(defentry _XQEvent-event (int) ( int "_XQEvent_event" ))
-(defentry set-_XQEvent-event (int int) ( void "set__XQEvent_event" ))
-(defentry _XQEvent-next (int) ( int "_XQEvent_next" ))
-(defentry set-_XQEvent-next (int int) ( void "set__XQEvent_next" ))
+(clines "#include \"xgcl.h\"")
+(defentry make-_XQEvent () ( fixnum  "make__XQEvent" ))
+(defentry _XQEvent-event (fixnum) ( fixnum "_XQEvent_event" ))
+(defentry set-_XQEvent-event (fixnum fixnum) ( void "set__XQEvent_event" ))
+(defentry _XQEvent-next (fixnum) ( fixnum "_XQEvent_next" ))
+(defentry set-_XQEvent-next (fixnum fixnum) ( void "set__XQEvent_next" ))
 
 
 ;;;;;; XCharStruct funcions ;;;;;;
 
-(defentry make-XCharStruct () ( int  "make_XCharStruct" ))
-(defentry XCharStruct-attributes (int) ( int "XCharStruct_attributes" ))
-(defentry set-XCharStruct-attributes (int int) ( void 
"set_XCharStruct_attributes" ))
-(defentry XCharStruct-descent (int) ( int "XCharStruct_descent" ))
-(defentry set-XCharStruct-descent (int int) ( void "set_XCharStruct_descent" ))
-(defentry XCharStruct-ascent (int) ( int "XCharStruct_ascent" ))
-(defentry set-XCharStruct-ascent (int int) ( void "set_XCharStruct_ascent" ))
-(defentry XCharStruct-width (int) ( int "XCharStruct_width" ))
-(defentry set-XCharStruct-width (int int) ( void "set_XCharStruct_width" ))
-(defentry XCharStruct-rbearing (int) ( int "XCharStruct_rbearing" ))
-(defentry set-XCharStruct-rbearing (int int) ( void "set_XCharStruct_rbearing" 
))
-(defentry XCharStruct-lbearing (int) ( int "XCharStruct_lbearing" ))
-(defentry set-XCharStruct-lbearing (int int) ( void "set_XCharStruct_lbearing" 
))
+(defentry make-XCharStruct () ( fixnum  "make_XCharStruct" ))
+(defentry XCharStruct-attributes (fixnum) ( fixnum "XCharStruct_attributes" ))
+(defentry set-XCharStruct-attributes (fixnum fixnum) ( void 
"set_XCharStruct_attributes" ))
+(defentry XCharStruct-descent (fixnum) ( fixnum "XCharStruct_descent" ))
+(defentry set-XCharStruct-descent (fixnum fixnum) ( void 
"set_XCharStruct_descent" ))
+(defentry XCharStruct-ascent (fixnum) ( fixnum "XCharStruct_ascent" ))
+(defentry set-XCharStruct-ascent (fixnum fixnum) ( void 
"set_XCharStruct_ascent" ))
+(defentry XCharStruct-width (fixnum) ( fixnum "XCharStruct_width" ))
+(defentry set-XCharStruct-width (fixnum fixnum) ( void "set_XCharStruct_width" 
))
+(defentry XCharStruct-rbearing (fixnum) ( fixnum "XCharStruct_rbearing" ))
+(defentry set-XCharStruct-rbearing (fixnum fixnum) ( void 
"set_XCharStruct_rbearing" ))
+(defentry XCharStruct-lbearing (fixnum) ( fixnum "XCharStruct_lbearing" ))
+(defentry set-XCharStruct-lbearing (fixnum fixnum) ( void 
"set_XCharStruct_lbearing" ))
 
 
 ;;;;;; XFontProp funcions ;;;;;;
 
-(defentry make-XFontProp () ( int  "make_XFontProp" ))
-(defentry XFontProp-card32 (int) ( int "XFontProp_card32" ))
-(defentry set-XFontProp-card32 (int int) ( void "set_XFontProp_card32" ))
-(defentry XFontProp-name (int) ( int "XFontProp_name" ))
-(defentry set-XFontProp-name (int int) ( void "set_XFontProp_name" ))
+(defentry make-XFontProp () ( fixnum  "make_XFontProp" ))
+(defentry XFontProp-card32 (fixnum) ( fixnum "XFontProp_card32" ))
+(defentry set-XFontProp-card32 (fixnum fixnum) ( void "set_XFontProp_card32" ))
+(defentry XFontProp-name (fixnum) ( fixnum "XFontProp_name" ))
+(defentry set-XFontProp-name (fixnum fixnum) ( void "set_XFontProp_name" ))
 
 
 ;;;;;; XFontStruct funcions ;;;;;;
 
-(defentry make-XFontStruct () ( int  "make_XFontStruct" ))
-(defentry XFontStruct-descent (int) ( int "XFontStruct_descent" ))
-(defentry set-XFontStruct-descent (int int) ( void "set_XFontStruct_descent" ))
-(defentry XFontStruct-ascent (int) ( int "XFontStruct_ascent" ))
-(defentry set-XFontStruct-ascent (int int) ( void "set_XFontStruct_ascent" ))
-(defentry XFontStruct-per_char (int) ( int "XFontStruct_per_char" ))
-(defentry set-XFontStruct-per_char (int int) ( void "set_XFontStruct_per_char" 
))
-(defentry XFontStruct-max_bounds (int) ( int "XFontStruct_max_bounds" ))
-(defentry set-XFontStruct-max_bounds (int int) ( void 
"set_XFontStruct_max_bounds" ))
-(defentry XFontStruct-min_bounds (int) ( int "XFontStruct_min_bounds" ))
-(defentry set-XFontStruct-min_bounds (int int) ( void 
"set_XFontStruct_min_bounds" ))
-(defentry XFontStruct-properties (int) ( int "XFontStruct_properties" ))
-(defentry set-XFontStruct-properties (int int) ( void 
"set_XFontStruct_properties" ))
-(defentry XFontStruct-n_properties (int) ( int "XFontStruct_n_properties" ))
-(defentry set-XFontStruct-n_properties (int int) ( void 
"set_XFontStruct_n_properties" ))
-(defentry XFontStruct-default_char (int) ( int "XFontStruct_default_char" ))
-(defentry set-XFontStruct-default_char (int int) ( void 
"set_XFontStruct_default_char" ))
-(defentry XFontStruct-all_chars_exist (int) ( int 
"XFontStruct_all_chars_exist" ))
-(defentry set-XFontStruct-all_chars_exist (int int) ( void 
"set_XFontStruct_all_chars_exist" ))
-(defentry XFontStruct-max_byte1 (int) ( int "XFontStruct_max_byte1" ))
-(defentry set-XFontStruct-max_byte1 (int int) ( void 
"set_XFontStruct_max_byte1" ))
-(defentry XFontStruct-min_byte1 (int) ( int "XFontStruct_min_byte1" ))
-(defentry set-XFontStruct-min_byte1 (int int) ( void 
"set_XFontStruct_min_byte1" ))
-(defentry XFontStruct-max_char_or_byte2 (int) ( int 
"XFontStruct_max_char_or_byte2" ))
-(defentry set-XFontStruct-max_char_or_byte2 (int int) ( void 
"set_XFontStruct_max_char_or_byte2" ))
-(defentry XFontStruct-min_char_or_byte2 (int) ( int 
"XFontStruct_min_char_or_byte2" ))
-(defentry set-XFontStruct-min_char_or_byte2 (int int) ( void 
"set_XFontStruct_min_char_or_byte2" ))
-(defentry XFontStruct-direction (int) ( int "XFontStruct_direction" ))
-(defentry set-XFontStruct-direction (int int) ( void 
"set_XFontStruct_direction" ))
-(defentry XFontStruct-fid (int) ( int "XFontStruct_fid" ))
-(defentry set-XFontStruct-fid (int int) ( void "set_XFontStruct_fid" ))
-(defentry XFontStruct-ext_data (int) ( int "XFontStruct_ext_data" ))
-(defentry set-XFontStruct-ext_data (int int) ( void "set_XFontStruct_ext_data" 
))
+(defentry make-XFontStruct () ( fixnum  "make_XFontStruct" ))
+(defentry XFontStruct-descent (fixnum) ( fixnum "XFontStruct_descent" ))
+(defentry set-XFontStruct-descent (fixnum fixnum) ( void 
"set_XFontStruct_descent" ))
+(defentry XFontStruct-ascent (fixnum) ( fixnum "XFontStruct_ascent" ))
+(defentry set-XFontStruct-ascent (fixnum fixnum) ( void 
"set_XFontStruct_ascent" ))
+(defentry XFontStruct-per_char (fixnum) ( fixnum "XFontStruct_per_char" ))
+(defentry set-XFontStruct-per_char (fixnum fixnum) ( void 
"set_XFontStruct_per_char" ))
+(defentry XFontStruct-max_bounds (fixnum) ( fixnum "XFontStruct_max_bounds" ))
+(defentry set-XFontStruct-max_bounds (fixnum fixnum) ( void 
"set_XFontStruct_max_bounds" ))
+(defentry XFontStruct-min_bounds (fixnum) ( fixnum "XFontStruct_min_bounds" ))
+(defentry set-XFontStruct-min_bounds (fixnum fixnum) ( void 
"set_XFontStruct_min_bounds" ))
+(defentry XFontStruct-properties (fixnum) ( fixnum "XFontStruct_properties" ))
+(defentry set-XFontStruct-properties (fixnum fixnum) ( void 
"set_XFontStruct_properties" ))
+(defentry XFontStruct-n_properties (fixnum) ( fixnum 
"XFontStruct_n_properties" ))
+(defentry set-XFontStruct-n_properties (fixnum fixnum) ( void 
"set_XFontStruct_n_properties" ))
+(defentry XFontStruct-default_char (fixnum) ( fixnum 
"XFontStruct_default_char" ))
+(defentry set-XFontStruct-default_char (fixnum fixnum) ( void 
"set_XFontStruct_default_char" ))
+(defentry XFontStruct-all_chars_exist (fixnum) ( fixnum 
"XFontStruct_all_chars_exist" ))
+(defentry set-XFontStruct-all_chars_exist (fixnum fixnum) ( void 
"set_XFontStruct_all_chars_exist" ))
+(defentry XFontStruct-max_byte1 (fixnum) ( fixnum "XFontStruct_max_byte1" ))
+(defentry set-XFontStruct-max_byte1 (fixnum fixnum) ( void 
"set_XFontStruct_max_byte1" ))
+(defentry XFontStruct-min_byte1 (fixnum) ( fixnum "XFontStruct_min_byte1" ))
+(defentry set-XFontStruct-min_byte1 (fixnum fixnum) ( void 
"set_XFontStruct_min_byte1" ))
+(defentry XFontStruct-max_char_or_byte2 (fixnum) ( fixnum 
"XFontStruct_max_char_or_byte2" ))
+(defentry set-XFontStruct-max_char_or_byte2 (fixnum fixnum) ( void 
"set_XFontStruct_max_char_or_byte2" ))
+(defentry XFontStruct-min_char_or_byte2 (fixnum) ( fixnum 
"XFontStruct_min_char_or_byte2" ))
+(defentry set-XFontStruct-min_char_or_byte2 (fixnum fixnum) ( void 
"set_XFontStruct_min_char_or_byte2" ))
+(defentry XFontStruct-direction (fixnum) ( fixnum "XFontStruct_direction" ))
+(defentry set-XFontStruct-direction (fixnum fixnum) ( void 
"set_XFontStruct_direction" ))
+(defentry XFontStruct-fid (fixnum) ( fixnum "XFontStruct_fid" ))
+(defentry set-XFontStruct-fid (fixnum fixnum) ( void "set_XFontStruct_fid" ))
+(defentry XFontStruct-ext_data (fixnum) ( fixnum "XFontStruct_ext_data" ))
+(defentry set-XFontStruct-ext_data (fixnum fixnum) ( void 
"set_XFontStruct_ext_data" ))
 
 
 ;;;;;; XTextItem funcions ;;;;;;
 
-(defentry make-XTextItem () ( int  "make_XTextItem" ))
-(defentry XTextItem-font (int) ( int "XTextItem_font" ))
-(defentry set-XTextItem-font (int int) ( void "set_XTextItem_font" ))
-(defentry XTextItem-delta (int) ( int "XTextItem_delta" ))
-(defentry set-XTextItem-delta (int int) ( void "set_XTextItem_delta" ))
-(defentry XTextItem-nchars (int) ( int "XTextItem_nchars" ))
-(defentry set-XTextItem-nchars (int int) ( void "set_XTextItem_nchars" ))
-(defentry XTextItem-chars (int) ( int "XTextItem_chars" ))
-(defentry set-XTextItem-chars (int int) ( void "set_XTextItem_chars" ))
+(defentry make-XTextItem () ( fixnum  "make_XTextItem" ))
+(defentry XTextItem-font (fixnum) ( fixnum "XTextItem_font" ))
+(defentry set-XTextItem-font (fixnum fixnum) ( void "set_XTextItem_font" ))
+(defentry XTextItem-delta (fixnum) ( fixnum "XTextItem_delta" ))
+(defentry set-XTextItem-delta (fixnum fixnum) ( void "set_XTextItem_delta" ))
+(defentry XTextItem-nchars (fixnum) ( fixnum "XTextItem_nchars" ))
+(defentry set-XTextItem-nchars (fixnum fixnum) ( void "set_XTextItem_nchars" ))
+(defentry XTextItem-chars (fixnum) ( fixnum "XTextItem_chars" ))
+(defentry set-XTextItem-chars (fixnum fixnum) ( void "set_XTextItem_chars" ))
 
 
 ;;;;;; XChar2b funcions ;;;;;;
 
-(defentry make-XChar2b () ( int  "make_XChar2b" ))
-(defentry XChar2b-byte2 (int) ( char "XChar2b_byte2" ))
-(defentry set-XChar2b-byte2 (int char) ( void "set_XChar2b_byte2" ))
-(defentry XChar2b-byte1 (int) ( char "XChar2b_byte1" ))
-(defentry set-XChar2b-byte1 (int char) ( void "set_XChar2b_byte1" ))
+(defentry make-XChar2b () ( fixnum  "make_XChar2b" ))
+(defentry XChar2b-byte2 (fixnum) ( char "XChar2b_byte2" ))
+(defentry set-XChar2b-byte2 (fixnum char) ( void "set_XChar2b_byte2" ))
+(defentry XChar2b-byte1 (fixnum) ( char "XChar2b_byte1" ))
+(defentry set-XChar2b-byte1 (fixnum char) ( void "set_XChar2b_byte1" ))
 
 
 ;;;;;; XTextItem16 funcions ;;;;;;
 
-(defentry make-XTextItem16 () ( int  "make_XTextItem16" ))
-(defentry XTextItem16-font (int) ( int "XTextItem16_font" ))
-(defentry set-XTextItem16-font (int int) ( void "set_XTextItem16_font" ))
-(defentry XTextItem16-delta (int) ( int "XTextItem16_delta" ))
-(defentry set-XTextItem16-delta (int int) ( void "set_XTextItem16_delta" ))
-(defentry XTextItem16-nchars (int) ( int "XTextItem16_nchars" ))
-(defentry set-XTextItem16-nchars (int int) ( void "set_XTextItem16_nchars" ))
-(defentry XTextItem16-chars (int) ( int "XTextItem16_chars" ))
-(defentry set-XTextItem16-chars (int int) ( void "set_XTextItem16_chars" ))
+(defentry make-XTextItem16 () ( fixnum  "make_XTextItem16" ))
+(defentry XTextItem16-font (fixnum) ( fixnum "XTextItem16_font" ))
+(defentry set-XTextItem16-font (fixnum fixnum) ( void "set_XTextItem16_font" ))
+(defentry XTextItem16-delta (fixnum) ( fixnum "XTextItem16_delta" ))
+(defentry set-XTextItem16-delta (fixnum fixnum) ( void "set_XTextItem16_delta" 
))
+(defentry XTextItem16-nchars (fixnum) ( fixnum "XTextItem16_nchars" ))
+(defentry set-XTextItem16-nchars (fixnum fixnum) ( void 
"set_XTextItem16_nchars" ))
+(defentry XTextItem16-chars (fixnum) ( fixnum "XTextItem16_chars" ))
+(defentry set-XTextItem16-chars (fixnum fixnum) ( void "set_XTextItem16_chars" 
))
 
 
 ;;;;;; XEDataObject funcions ;;;;;;
 
-(defentry make-XEDataObject () ( int  "make_XEDataObject" ))
-(defentry XEDataObject-font (int) ( int "XEDataObject_font" ))
-(defentry set-XEDataObject-font (int int) ( void "set_XEDataObject_font" ))
-(defentry XEDataObject-pixmap_format (int) ( int "XEDataObject_pixmap_format" 
))
-(defentry set-XEDataObject-pixmap_format (int int) ( void 
"set_XEDataObject_pixmap_format" ))
-(defentry XEDataObject-screen (int) ( int "XEDataObject_screen" ))
-(defentry set-XEDataObject-screen (int int) ( void "set_XEDataObject_screen" ))
-(defentry XEDataObject-visual (int) ( int "XEDataObject_visual" ))
-(defentry set-XEDataObject-visual (int int) ( void "set_XEDataObject_visual" ))
-(defentry XEDataObject-gc (int) ( int "XEDataObject_gc" ))
-(defentry set-XEDataObject-gc (int int) ( void "set_XEDataObject_gc" ))
+(defentry make-XEDataObject () ( fixnum  "make_XEDataObject" ))
+(defentry XEDataObject-font (fixnum) ( fixnum "XEDataObject_font" ))
+(defentry set-XEDataObject-font (fixnum fixnum) ( void "set_XEDataObject_font" 
))
+(defentry XEDataObject-pixmap_format (fixnum) ( fixnum 
"XEDataObject_pixmap_format" ))
+(defentry set-XEDataObject-pixmap_format (fixnum fixnum) ( void 
"set_XEDataObject_pixmap_format" ))
+(defentry XEDataObject-screen (fixnum) ( fixnum "XEDataObject_screen" ))
+(defentry set-XEDataObject-screen (fixnum fixnum) ( void 
"set_XEDataObject_screen" ))
+(defentry XEDataObject-visual (fixnum) ( fixnum "XEDataObject_visual" ))
+(defentry set-XEDataObject-visual (fixnum fixnum) ( void 
"set_XEDataObject_visual" ))
+(defentry XEDataObject-gc (fixnum) ( fixnum "XEDataObject_gc" ))
+(defentry set-XEDataObject-gc (fixnum fixnum) ( void "set_XEDataObject_gc" ))
 
 
 ;;;;;; XSizeHints funcions ;;;;;;
 
-(defentry make-XSizeHints () ( int  "make_XSizeHints" ))
-(defentry XSizeHints-win_gravity (int) ( int "XSizeHints_win_gravity" ))
-(defentry set-XSizeHints-win_gravity (int int) ( void 
"set_XSizeHints_win_gravity" ))
-(defentry XSizeHints-base_height (int) ( int "XSizeHints_base_height" ))
-(defentry set-XSizeHints-base_height (int int) ( void 
"set_XSizeHints_base_height" ))
-(defentry XSizeHints-base_width (int) ( int "XSizeHints_base_width" ))
-(defentry set-XSizeHints-base_width (int int) ( void 
"set_XSizeHints_base_width" ))
-
-(defentry XSizeHints-max_aspect_x (int) ( int "XSizeHints_max_aspect_x" ))
-(defentry set-XSizeHints-max_aspect_x (int int) ( void 
"set_XSizeHints_max_aspect_x" ))
-(defentry XSizeHints-max_aspect_y (int) ( int "XSizeHints_max_aspect_y" ))
-(defentry set-XSizeHints-max_aspect_y (int int) ( void 
"set_XSizeHints_max_aspect_y" ))
-(defentry XSizeHints-min_aspect_x (int) ( int "XSizeHints_min_aspect_x" ))
-(defentry set-XSizeHints-min_aspect_x (int int) ( void 
"set_XSizeHints_min_aspect_x" ))
-(defentry XSizeHints-min_aspect_y (int) ( int "XSizeHints_min_aspect_y" ))
-(defentry set-XSizeHints-min_aspect_y (int int) ( void 
"set_XSizeHints_min_aspect_y" ))
-
-(defentry XSizeHints-height_inc (int) ( int "XSizeHints_height_inc" ))
-(defentry set-XSizeHints-height_inc (int int) ( void 
"set_XSizeHints_height_inc" ))
-(defentry XSizeHints-width_inc (int) ( int "XSizeHints_width_inc" ))
-(defentry set-XSizeHints-width_inc (int int) ( void "set_XSizeHints_width_inc" 
))
-(defentry XSizeHints-max_height (int) ( int "XSizeHints_max_height" ))
-(defentry set-XSizeHints-max_height (int int) ( void 
"set_XSizeHints_max_height" ))
-(defentry XSizeHints-max_width (int) ( int "XSizeHints_max_width" ))
-(defentry set-XSizeHints-max_width (int int) ( void "set_XSizeHints_max_width" 
))
-(defentry XSizeHints-min_height (int) ( int "XSizeHints_min_height" ))
-(defentry set-XSizeHints-min_height (int int) ( void 
"set_XSizeHints_min_height" ))
-(defentry XSizeHints-min_width (int) ( int "XSizeHints_min_width" ))
-(defentry set-XSizeHints-min_width (int int) ( void "set_XSizeHints_min_width" 
))
-(defentry XSizeHints-height (int) ( int "XSizeHints_height" ))
-(defentry set-XSizeHints-height (int int) ( void "set_XSizeHints_height" ))
-(defentry XSizeHints-width (int) ( int "XSizeHints_width" ))
-(defentry set-XSizeHints-width (int int) ( void "set_XSizeHints_width" ))
-(defentry XSizeHints-y (int) ( int "XSizeHints_y" ))
-(defentry set-XSizeHints-y (int int) ( void "set_XSizeHints_y" ))
-(defentry XSizeHints-x (int) ( int "XSizeHints_x" ))
-(defentry set-XSizeHints-x (int int) ( void "set_XSizeHints_x" ))
-(defentry XSizeHints-flags (int) ( int "XSizeHints_flags" ))
-(defentry set-XSizeHints-flags (int int) ( void "set_XSizeHints_flags" ))
+(defentry make-XSizeHints () ( fixnum  "make_XSizeHints" ))
+(defentry XSizeHints-win_gravity (fixnum) ( fixnum "XSizeHints_win_gravity" ))
+(defentry set-XSizeHints-win_gravity (fixnum fixnum) ( void 
"set_XSizeHints_win_gravity" ))
+(defentry XSizeHints-base_height (fixnum) ( fixnum "XSizeHints_base_height" ))
+(defentry set-XSizeHints-base_height (fixnum fixnum) ( void 
"set_XSizeHints_base_height" ))
+(defentry XSizeHints-base_width (fixnum) ( fixnum "XSizeHints_base_width" ))
+(defentry set-XSizeHints-base_width (fixnum fixnum) ( void 
"set_XSizeHints_base_width" ))
+
+(defentry XSizeHints-max_aspect_x (fixnum) ( fixnum "XSizeHints_max_aspect_x" 
))
+(defentry set-XSizeHints-max_aspect_x (fixnum fixnum) ( void 
"set_XSizeHints_max_aspect_x" ))
+(defentry XSizeHints-max_aspect_y (fixnum) ( fixnum "XSizeHints_max_aspect_y" 
))
+(defentry set-XSizeHints-max_aspect_y (fixnum fixnum) ( void 
"set_XSizeHints_max_aspect_y" ))
+(defentry XSizeHints-min_aspect_x (fixnum) ( fixnum "XSizeHints_min_aspect_x" 
))
+(defentry set-XSizeHints-min_aspect_x (fixnum fixnum) ( void 
"set_XSizeHints_min_aspect_x" ))
+(defentry XSizeHints-min_aspect_y (fixnum) ( fixnum "XSizeHints_min_aspect_y" 
))
+(defentry set-XSizeHints-min_aspect_y (fixnum fixnum) ( void 
"set_XSizeHints_min_aspect_y" ))
+
+(defentry XSizeHints-height_inc (fixnum) ( fixnum "XSizeHints_height_inc" ))
+(defentry set-XSizeHints-height_inc (fixnum fixnum) ( void 
"set_XSizeHints_height_inc" ))
+(defentry XSizeHints-width_inc (fixnum) ( fixnum "XSizeHints_width_inc" ))
+(defentry set-XSizeHints-width_inc (fixnum fixnum) ( void 
"set_XSizeHints_width_inc" ))
+(defentry XSizeHints-max_height (fixnum) ( fixnum "XSizeHints_max_height" ))
+(defentry set-XSizeHints-max_height (fixnum fixnum) ( void 
"set_XSizeHints_max_height" ))
+(defentry XSizeHints-max_width (fixnum) ( fixnum "XSizeHints_max_width" ))
+(defentry set-XSizeHints-max_width (fixnum fixnum) ( void 
"set_XSizeHints_max_width" ))
+(defentry XSizeHints-min_height (fixnum) ( fixnum "XSizeHints_min_height" ))
+(defentry set-XSizeHints-min_height (fixnum fixnum) ( void 
"set_XSizeHints_min_height" ))
+(defentry XSizeHints-min_width (fixnum) ( fixnum "XSizeHints_min_width" ))
+(defentry set-XSizeHints-min_width (fixnum fixnum) ( void 
"set_XSizeHints_min_width" ))
+(defentry XSizeHints-height (fixnum) ( fixnum "XSizeHints_height" ))
+(defentry set-XSizeHints-height (fixnum fixnum) ( void "set_XSizeHints_height" 
))
+(defentry XSizeHints-width (fixnum) ( fixnum "XSizeHints_width" ))
+(defentry set-XSizeHints-width (fixnum fixnum) ( void "set_XSizeHints_width" ))
+(defentry XSizeHints-y (fixnum) ( fixnum "XSizeHints_y" ))
+(defentry set-XSizeHints-y (fixnum fixnum) ( void "set_XSizeHints_y" ))
+(defentry XSizeHints-x (fixnum) ( fixnum "XSizeHints_x" ))
+(defentry set-XSizeHints-x (fixnum fixnum) ( void "set_XSizeHints_x" ))
+(defentry XSizeHints-flags (fixnum) ( fixnum "XSizeHints_flags" ))
+(defentry set-XSizeHints-flags (fixnum fixnum) ( void "set_XSizeHints_flags" ))
 
 
 ;;;;;; XWMHints funcions ;;;;;;
 
-(defentry make-XWMHints () ( int  "make_XWMHints" ))
-(defentry XWMHints-window_group (int) ( int "XWMHints_window_group" ))
-(defentry set-XWMHints-window_group (int int) ( void 
"set_XWMHints_window_group" ))
-(defentry XWMHints-icon_mask (int) ( int "XWMHints_icon_mask" ))
-(defentry set-XWMHints-icon_mask (int int) ( void "set_XWMHints_icon_mask" ))
-(defentry XWMHints-icon_y (int) ( int "XWMHints_icon_y" ))
-(defentry set-XWMHints-icon_y (int int) ( void "set_XWMHints_icon_y" ))
-(defentry XWMHints-icon_x (int) ( int "XWMHints_icon_x" ))
-(defentry set-XWMHints-icon_x (int int) ( void "set_XWMHints_icon_x" ))
-(defentry XWMHints-icon_window (int) ( int "XWMHints_icon_window" ))
-(defentry set-XWMHints-icon_window (int int) ( void "set_XWMHints_icon_window" 
))
-(defentry XWMHints-icon_pixmap (int) ( int "XWMHints_icon_pixmap" ))
-(defentry set-XWMHints-icon_pixmap (int int) ( void "set_XWMHints_icon_pixmap" 
))
-(defentry XWMHints-initial_state (int) ( int "XWMHints_initial_state" ))
-(defentry set-XWMHints-initial_state (int int) ( void 
"set_XWMHints_initial_state" ))
-(defentry XWMHints-input (int) ( int "XWMHints_input" ))
-(defentry set-XWMHints-input (int int) ( void "set_XWMHints_input" ))
-(defentry XWMHints-flags (int) ( int "XWMHints_flags" ))
-(defentry set-XWMHints-flags (int int) ( void "set_XWMHints_flags" ))
+(defentry make-XWMHints () ( fixnum  "make_XWMHints" ))
+(defentry XWMHints-window_group (fixnum) ( fixnum "XWMHints_window_group" ))
+(defentry set-XWMHints-window_group (fixnum fixnum) ( void 
"set_XWMHints_window_group" ))
+(defentry XWMHints-icon_mask (fixnum) ( fixnum "XWMHints_icon_mask" ))
+(defentry set-XWMHints-icon_mask (fixnum fixnum) ( void 
"set_XWMHints_icon_mask" ))
+(defentry XWMHints-icon_y (fixnum) ( fixnum "XWMHints_icon_y" ))
+(defentry set-XWMHints-icon_y (fixnum fixnum) ( void "set_XWMHints_icon_y" ))
+(defentry XWMHints-icon_x (fixnum) ( fixnum "XWMHints_icon_x" ))
+(defentry set-XWMHints-icon_x (fixnum fixnum) ( void "set_XWMHints_icon_x" ))
+(defentry XWMHints-icon_window (fixnum) ( fixnum "XWMHints_icon_window" ))
+(defentry set-XWMHints-icon_window (fixnum fixnum) ( void 
"set_XWMHints_icon_window" ))
+(defentry XWMHints-icon_pixmap (fixnum) ( fixnum "XWMHints_icon_pixmap" ))
+(defentry set-XWMHints-icon_pixmap (fixnum fixnum) ( void 
"set_XWMHints_icon_pixmap" ))
+(defentry XWMHints-initial_state (fixnum) ( fixnum "XWMHints_initial_state" ))
+(defentry set-XWMHints-initial_state (fixnum fixnum) ( void 
"set_XWMHints_initial_state" ))
+(defentry XWMHints-input (fixnum) ( fixnum "XWMHints_input" ))
+(defentry set-XWMHints-input (fixnum fixnum) ( void "set_XWMHints_input" ))
+(defentry XWMHints-flags (fixnum) ( fixnum "XWMHints_flags" ))
+(defentry set-XWMHints-flags (fixnum fixnum) ( void "set_XWMHints_flags" ))
 
 
 ;;;;;; XTextProperty funcions ;;;;;;
 
-(defentry make-XTextProperty () ( int  "make_XTextProperty" ))
-(defentry XTextProperty-nitems (int) ( int "XTextProperty_nitems" ))
-(defentry set-XTextProperty-nitems (int int) ( void "set_XTextProperty_nitems" 
))
-(defentry XTextProperty-format (int) ( int "XTextProperty_format" ))
-(defentry set-XTextProperty-format (int int) ( void "set_XTextProperty_format" 
))
-(defentry XTextProperty-encoding (int) ( int "XTextProperty_encoding" ))
-(defentry set-XTextProperty-encoding (int int) ( void 
"set_XTextProperty_encoding" ))
-(defentry XTextProperty-value (int) ( int "XTextProperty_value" ))
-(defentry set-XTextProperty-value (int int) ( void "set_XTextProperty_value" ))
+(defentry make-XTextProperty () ( fixnum  "make_XTextProperty" ))
+(defentry XTextProperty-nitems (fixnum) ( fixnum "XTextProperty_nitems" ))
+(defentry set-XTextProperty-nitems (fixnum fixnum) ( void 
"set_XTextProperty_nitems" ))
+(defentry XTextProperty-format (fixnum) ( fixnum "XTextProperty_format" ))
+(defentry set-XTextProperty-format (fixnum fixnum) ( void 
"set_XTextProperty_format" ))
+(defentry XTextProperty-encoding (fixnum) ( fixnum "XTextProperty_encoding" ))
+(defentry set-XTextProperty-encoding (fixnum fixnum) ( void 
"set_XTextProperty_encoding" ))
+(defentry XTextProperty-value (fixnum) ( fixnum "XTextProperty_value" ))
+(defentry set-XTextProperty-value (fixnum fixnum) ( void 
"set_XTextProperty_value" ))
 
 
 ;;;;;; XIconSize funcions ;;;;;;
 
-(defentry make-XIconSize () ( int  "make_XIconSize" ))
-(defentry XIconSize-height_inc (int) ( int "XIconSize_height_inc" ))
-(defentry set-XIconSize-height_inc (int int) ( void "set_XIconSize_height_inc" 
))
-(defentry XIconSize-width_inc (int) ( int "XIconSize_width_inc" ))
-(defentry set-XIconSize-width_inc (int int) ( void "set_XIconSize_width_inc" ))
-(defentry XIconSize-max_height (int) ( int "XIconSize_max_height" ))
-(defentry set-XIconSize-max_height (int int) ( void "set_XIconSize_max_height" 
))
-(defentry XIconSize-max_width (int) ( int "XIconSize_max_width" ))
-(defentry set-XIconSize-max_width (int int) ( void "set_XIconSize_max_width" ))
-(defentry XIconSize-min_height (int) ( int "XIconSize_min_height" ))
-(defentry set-XIconSize-min_height (int int) ( void "set_XIconSize_min_height" 
))
-(defentry XIconSize-min_width (int) ( int "XIconSize_min_width" ))
-(defentry set-XIconSize-min_width (int int) ( void "set_XIconSize_min_width" ))
+(defentry make-XIconSize () ( fixnum  "make_XIconSize" ))
+(defentry XIconSize-height_inc (fixnum) ( fixnum "XIconSize_height_inc" ))
+(defentry set-XIconSize-height_inc (fixnum fixnum) ( void 
"set_XIconSize_height_inc" ))
+(defentry XIconSize-width_inc (fixnum) ( fixnum "XIconSize_width_inc" ))
+(defentry set-XIconSize-width_inc (fixnum fixnum) ( void 
"set_XIconSize_width_inc" ))
+(defentry XIconSize-max_height (fixnum) ( fixnum "XIconSize_max_height" ))
+(defentry set-XIconSize-max_height (fixnum fixnum) ( void 
"set_XIconSize_max_height" ))
+(defentry XIconSize-max_width (fixnum) ( fixnum "XIconSize_max_width" ))
+(defentry set-XIconSize-max_width (fixnum fixnum) ( void 
"set_XIconSize_max_width" ))
+(defentry XIconSize-min_height (fixnum) ( fixnum "XIconSize_min_height" ))
+(defentry set-XIconSize-min_height (fixnum fixnum) ( void 
"set_XIconSize_min_height" ))
+(defentry XIconSize-min_width (fixnum) ( fixnum "XIconSize_min_width" ))
+(defentry set-XIconSize-min_width (fixnum fixnum) ( void 
"set_XIconSize_min_width" ))
 
 
 ;;;;;; XClassHint funcions ;;;;;;
 
-(defentry make-XClassHint () ( int  "make_XClassHint" ))
-(defentry XClassHint-res_class (int) ( int "XClassHint_res_class" ))
-(defentry set-XClassHint-res_class (int int) ( void "set_XClassHint_res_class" 
))
-(defentry XClassHint-res_name (int) ( int "XClassHint_res_name" ))
-(defentry set-XClassHint-res_name (int int) ( void "set_XClassHint_res_name" ))
+(defentry make-XClassHint () ( fixnum  "make_XClassHint" ))
+(defentry XClassHint-res_class (fixnum) ( fixnum "XClassHint_res_class" ))
+(defentry set-XClassHint-res_class (fixnum fixnum) ( void 
"set_XClassHint_res_class" ))
+(defentry XClassHint-res_name (fixnum) ( fixnum "XClassHint_res_name" ))
+(defentry set-XClassHint-res_name (fixnum fixnum) ( void 
"set_XClassHint_res_name" ))
 
 
 ;;;;;; XComposeStatus funcions ;;;;;;
 
-(defentry make-XComposeStatus () ( int  "make_XComposeStatus" ))
-(defentry XComposeStatus-chars_matched (int) ( int 
"XComposeStatus_chars_matched" ))
-(defentry set-XComposeStatus-chars_matched (int int) ( void 
"set_XComposeStatus_chars_matched" ))
-(defentry XComposeStatus-compose_ptr (int) ( int "XComposeStatus_compose_ptr" 
))
-(defentry set-XComposeStatus-compose_ptr (int int) ( void 
"set_XComposeStatus_compose_ptr" ))
+(defentry make-XComposeStatus () ( fixnum  "make_XComposeStatus" ))
+(defentry XComposeStatus-chars_matched (fixnum) ( fixnum 
"XComposeStatus_chars_matched" ))
+(defentry set-XComposeStatus-chars_matched (fixnum fixnum) ( void 
"set_XComposeStatus_chars_matched" ))
+(defentry XComposeStatus-compose_ptr (fixnum) ( fixnum 
"XComposeStatus_compose_ptr" ))
+(defentry set-XComposeStatus-compose_ptr (fixnum fixnum) ( void 
"set_XComposeStatus_compose_ptr" ))
 
 
 ;;;;;; XVisualInfo funcions ;;;;;;
 
-(defentry make-XVisualInfo () ( int  "make_XVisualInfo" ))
-(defentry XVisualInfo-bits_per_rgb (int) ( int "XVisualInfo_bits_per_rgb" ))
-(defentry set-XVisualInfo-bits_per_rgb (int int) ( void 
"set_XVisualInfo_bits_per_rgb" ))
-(defentry XVisualInfo-colormap_size (int) ( int "XVisualInfo_colormap_size" ))
-(defentry set-XVisualInfo-colormap_size (int int) ( void 
"set_XVisualInfo_colormap_size" ))
-(defentry XVisualInfo-blue_mask (int) ( int "XVisualInfo_blue_mask" ))
-(defentry set-XVisualInfo-blue_mask (int int) ( void 
"set_XVisualInfo_blue_mask" ))
-(defentry XVisualInfo-green_mask (int) ( int "XVisualInfo_green_mask" ))
-(defentry set-XVisualInfo-green_mask (int int) ( void 
"set_XVisualInfo_green_mask" ))
-(defentry XVisualInfo-red_mask (int) ( int "XVisualInfo_red_mask" ))
-(defentry set-XVisualInfo-red_mask (int int) ( void "set_XVisualInfo_red_mask" 
))
-(defentry XVisualInfo-class (int) ( int "XVisualInfo_class" ))
-(defentry set-XVisualInfo-class (int int) ( void "set_XVisualInfo_class" ))
-(defentry XVisualInfo-depth (int) ( int "XVisualInfo_depth" ))
-(defentry set-XVisualInfo-depth (int int) ( void "set_XVisualInfo_depth" ))
-(defentry XVisualInfo-screen (int) ( int "XVisualInfo_screen" ))
-(defentry set-XVisualInfo-screen (int int) ( void "set_XVisualInfo_screen" ))
-(defentry XVisualInfo-visualid (int) ( int "XVisualInfo_visualid" ))
-(defentry set-XVisualInfo-visualid (int int) ( void "set_XVisualInfo_visualid" 
))
-(defentry XVisualInfo-visual (int) ( int "XVisualInfo_visual" ))
-(defentry set-XVisualInfo-visual (int int) ( void "set_XVisualInfo_visual" ))
+(defentry make-XVisualInfo () ( fixnum  "make_XVisualInfo" ))
+(defentry XVisualInfo-bits_per_rgb (fixnum) ( fixnum 
"XVisualInfo_bits_per_rgb" ))
+(defentry set-XVisualInfo-bits_per_rgb (fixnum fixnum) ( void 
"set_XVisualInfo_bits_per_rgb" ))
+(defentry XVisualInfo-colormap_size (fixnum) ( fixnum 
"XVisualInfo_colormap_size" ))
+(defentry set-XVisualInfo-colormap_size (fixnum fixnum) ( void 
"set_XVisualInfo_colormap_size" ))
+(defentry XVisualInfo-blue_mask (fixnum) ( fixnum "XVisualInfo_blue_mask" ))
+(defentry set-XVisualInfo-blue_mask (fixnum fixnum) ( void 
"set_XVisualInfo_blue_mask" ))
+(defentry XVisualInfo-green_mask (fixnum) ( fixnum "XVisualInfo_green_mask" ))
+(defentry set-XVisualInfo-green_mask (fixnum fixnum) ( void 
"set_XVisualInfo_green_mask" ))
+(defentry XVisualInfo-red_mask (fixnum) ( fixnum "XVisualInfo_red_mask" ))
+(defentry set-XVisualInfo-red_mask (fixnum fixnum) ( void 
"set_XVisualInfo_red_mask" ))
+(defentry XVisualInfo-class (fixnum) ( fixnum "XVisualInfo_class" ))
+(defentry set-XVisualInfo-class (fixnum fixnum) ( void "set_XVisualInfo_class" 
))
+(defentry XVisualInfo-depth (fixnum) ( fixnum "XVisualInfo_depth" ))
+(defentry set-XVisualInfo-depth (fixnum fixnum) ( void "set_XVisualInfo_depth" 
))
+(defentry XVisualInfo-screen (fixnum) ( fixnum "XVisualInfo_screen" ))
+(defentry set-XVisualInfo-screen (fixnum fixnum) ( void 
"set_XVisualInfo_screen" ))
+(defentry XVisualInfo-visualid (fixnum) ( fixnum "XVisualInfo_visualid" ))
+(defentry set-XVisualInfo-visualid (fixnum fixnum) ( void 
"set_XVisualInfo_visualid" ))
+(defentry XVisualInfo-visual (fixnum) ( fixnum "XVisualInfo_visual" ))
+(defentry set-XVisualInfo-visual (fixnum fixnum) ( void 
"set_XVisualInfo_visual" ))
 
 
 ;;;;;; XStandardColormap funcions ;;;;;;
 
-(defentry make-XStandardColormap () ( int  "make_XStandardColormap" ))
-(defentry XStandardColormap-killid (int) ( int "XStandardColormap_killid" ))
-(defentry set-XStandardColormap-killid (int int) ( void 
"set_XStandardColormap_killid" ))
-(defentry XStandardColormap-visualid (int) ( int "XStandardColormap_visualid" 
))
-(defentry set-XStandardColormap-visualid (int int) ( void 
"set_XStandardColormap_visualid" ))
-(defentry XStandardColormap-base_pixel (int) ( int 
"XStandardColormap_base_pixel" ))
-(defentry set-XStandardColormap-base_pixel (int int) ( void 
"set_XStandardColormap_base_pixel" ))
-(defentry XStandardColormap-blue_mult (int) ( int 
"XStandardColormap_blue_mult" ))
-(defentry set-XStandardColormap-blue_mult (int int) ( void 
"set_XStandardColormap_blue_mult" ))
-(defentry XStandardColormap-blue_max (int) ( int "XStandardColormap_blue_max" 
))
-(defentry set-XStandardColormap-blue_max (int int) ( void 
"set_XStandardColormap_blue_max" ))
-(defentry XStandardColormap-green_mult (int) ( int 
"XStandardColormap_green_mult" ))
-(defentry set-XStandardColormap-green_mult (int int) ( void 
"set_XStandardColormap_green_mult" ))
-(defentry XStandardColormap-green_max (int) ( int 
"XStandardColormap_green_max" ))
-(defentry set-XStandardColormap-green_max (int int) ( void 
"set_XStandardColormap_green_max" ))
-(defentry XStandardColormap-red_mult (int) ( int "XStandardColormap_red_mult" 
))
-(defentry set-XStandardColormap-red_mult (int int) ( void 
"set_XStandardColormap_red_mult" ))
-(defentry XStandardColormap-red_max (int) ( int "XStandardColormap_red_max" ))
-(defentry set-XStandardColormap-red_max (int int) ( void 
"set_XStandardColormap_red_max" ))
-(defentry XStandardColormap-colormap (int) ( int "XStandardColormap_colormap" 
))
-(defentry set-XStandardColormap-colormap (int int) ( void 
"set_XStandardColormap_colormap" ))
+(defentry make-XStandardColormap () ( fixnum  "make_XStandardColormap" ))
+(defentry XStandardColormap-killid (fixnum) ( fixnum 
"XStandardColormap_killid" ))
+(defentry set-XStandardColormap-killid (fixnum fixnum) ( void 
"set_XStandardColormap_killid" ))
+(defentry XStandardColormap-visualid (fixnum) ( fixnum 
"XStandardColormap_visualid" ))
+(defentry set-XStandardColormap-visualid (fixnum fixnum) ( void 
"set_XStandardColormap_visualid" ))
+(defentry XStandardColormap-base_pixel (fixnum) ( fixnum 
"XStandardColormap_base_pixel" ))
+(defentry set-XStandardColormap-base_pixel (fixnum fixnum) ( void 
"set_XStandardColormap_base_pixel" ))
+(defentry XStandardColormap-blue_mult (fixnum) ( fixnum 
"XStandardColormap_blue_mult" ))
+(defentry set-XStandardColormap-blue_mult (fixnum fixnum) ( void 
"set_XStandardColormap_blue_mult" ))
+(defentry XStandardColormap-blue_max (fixnum) ( fixnum 
"XStandardColormap_blue_max" ))
+(defentry set-XStandardColormap-blue_max (fixnum fixnum) ( void 
"set_XStandardColormap_blue_max" ))
+(defentry XStandardColormap-green_mult (fixnum) ( fixnum 
"XStandardColormap_green_mult" ))
+(defentry set-XStandardColormap-green_mult (fixnum fixnum) ( void 
"set_XStandardColormap_green_mult" ))
+(defentry XStandardColormap-green_max (fixnum) ( fixnum 
"XStandardColormap_green_max" ))
+(defentry set-XStandardColormap-green_max (fixnum fixnum) ( void 
"set_XStandardColormap_green_max" ))
+(defentry XStandardColormap-red_mult (fixnum) ( fixnum 
"XStandardColormap_red_mult" ))
+(defentry set-XStandardColormap-red_mult (fixnum fixnum) ( void 
"set_XStandardColormap_red_mult" ))
+(defentry XStandardColormap-red_max (fixnum) ( fixnum 
"XStandardColormap_red_max" ))
+(defentry set-XStandardColormap-red_max (fixnum fixnum) ( void 
"set_XStandardColormap_red_max" ))
+(defentry XStandardColormap-colormap (fixnum) ( fixnum 
"XStandardColormap_colormap" ))
+(defentry set-XStandardColormap-colormap (fixnum fixnum) ( void 
"set_XStandardColormap_colormap" ))

Index: xgcl-2/gcl_Xutil.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_Xutil.lsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- xgcl-2/gcl_Xutil.lsp        5 Jan 2006 17:55:35 -0000       1.1.2.1
+++ xgcl-2/gcl_Xutil.lsp        20 Jun 2006 23:00:10 -0000      1.1.2.2
@@ -162,75 +162,76 @@
 (defconstant XCNOMEM   1    ) ;; Out of memory 
 (defconstant XCNOENT   2    ) ;; No entry in table 
 
-;;typedef int XContext;
+;;typedef fixnum XContext;
 
+(clines "#include \"xgcl.h\"")
 
 (defentry XSaveContext(
 
-    int        ;; display 
-    int                ;; w 
-    int                ;; context 
-     int       ;; data 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum             ;; context 
+     fixnum    ;; data 
 
-)( int "XSaveContext"))
+)( fixnum "XSaveContext"))
 
 
 
 (defentry XFindContext(
 
-    int        ;; display 
-    int                ;; w 
-    int                ;; context 
-    int        ;; data_return 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum             ;; context 
+    fixnum     ;; data_return 
 
-)( int "XFindContext"))
+)( fixnum "XFindContext"))
 
 
 
 (defentry XDeleteContext(
 
-    int        ;; display 
-    int                ;; w 
-    int                ;; context 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum             ;; context 
 
-)( int "XDeleteContext"))
+)( fixnum "XDeleteContext"))
 
 
 
 
 (defentry  XGetWMHints(
 
-    int        ;; display 
-    int                ;; w                  
+    fixnum     ;; display 
+    fixnum             ;; w                  
 
-)( int  "XGetWMHints"))
+)( fixnum  "XGetWMHints"))
 
 
 (defentry XCreateRegion(
 
 ;;    void
 
-)( int "XCreateRegion"))
+)( fixnum "XCreateRegion"))
 
 
 (defentry XPolygonRegion(
 
-    int        ;; points 
-    int                        ;; n 
-    int                        ;; fill_rule 
+    fixnum     ;; points 
+    fixnum                     ;; n 
+    fixnum                     ;; fill_rule 
 
-)( int "XPolygonRegion"))
+)( fixnum "XPolygonRegion"))
 
 
 
 (defentry  XGetVisualInfo(
 
-    int        ;; display 
-    int                ;; vinfo_mask 
-    int ;; vinfo_template 
-    int        ;; nitems_return 
+    fixnum     ;; display 
+    fixnum             ;; vinfo_mask 
+    fixnum ;; vinfo_template 
+    fixnum     ;; nitems_return 
 
-)( int  "XGetVisualInfo"))
+)( fixnum  "XGetVisualInfo"))
 
 ;; Allocation routines for properties that may get longer 
 
@@ -239,206 +240,206 @@
 
 ;;    void
 
-)( int  "XAllocSizeHints" ))
+)( fixnum  "XAllocSizeHints" ))
 
 
 (defentry  XAllocStandardColormap (
 
 ;;    void
 
-)( int  "XAllocStandardColormap" ))
+)( fixnum  "XAllocStandardColormap" ))
 
 
 (defentry  XAllocWMHints (
 
 ;;    void
 
-)( int  "XAllocWMHints" ))
+)( fixnum  "XAllocWMHints" ))
 
 
 (defentry  XAllocClassHint (
 
 ;;    void
 
-)( int  "XAllocClassHint" ))
+)( fixnum  "XAllocClassHint" ))
 
 
 (defentry  XAllocIconSize (
 
 ;;    void
 
-)( int  "XAllocIconSize" ))
+)( fixnum  "XAllocIconSize" ))
 
 ;; ICCCM routines for data structures defined in this file 
 
 
 (defentry XGetWMSizeHints(
 
-    int        ;; display 
-    int                ;; w 
-    int        ;; hints_return 
-    int        ;; supplied_return 
-    int                ;; property 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum     ;; hints_return 
+    fixnum     ;; supplied_return 
+    fixnum             ;; property 
 
-)( int "XGetWMSizeHints"))
+)( fixnum "XGetWMSizeHints"))
 
 
 (defentry XGetWMNormalHints(
 
-    int        ;; display 
-    int                ;; w 
-    int        ;; hints_return 
-    int        ;; supplied_return  
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum     ;; hints_return 
+    fixnum     ;; supplied_return  
 
-)( int "XGetWMNormalHints"))
+)( fixnum "XGetWMNormalHints"))
 
 
 (defentry XGetRGBColormaps(
 
-    int        ;; display 
-    int                ;; w 
-    int  ;; stdcmap_return 
-    int        ;; count_return 
-    int                ;; property 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum  ;; stdcmap_return 
+    fixnum     ;; count_return 
+    fixnum             ;; property 
 
-)( int "XGetRGBColormaps"))
+)( fixnum "XGetRGBColormaps"))
 
 
 (defentry XGetTextProperty(
 
-    int        ;; display 
-    int                ;; window 
-    int ;; text_prop_return 
-    int                ;; property 
+    fixnum     ;; display 
+    fixnum             ;; window 
+    fixnum ;; text_prop_return 
+    fixnum             ;; property 
 
-)( int "XGetTextProperty"))
+)( fixnum "XGetTextProperty"))
 
 
 (defentry XGetWMName(
 
-    int        ;; display 
-    int                ;; w 
-    int ;; text_prop_return 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum ;; text_prop_return 
 
-)( int "XGetWMName"))
+)( fixnum "XGetWMName"))
 
 
 (defentry XGetWMIconName(
 
-    int        ;; display 
-    int                ;; w 
-    int ;; text_prop_return 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum ;; text_prop_return 
 
-)( int "XGetWMIconName"))
+)( fixnum "XGetWMIconName"))
 
 
 (defentry XGetWMClientMachine(
 
-    int        ;; display 
-    int                ;; w 
-    int ;; text_prop_return 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum ;; text_prop_return 
 
-)( int "XGetWMClientMachine"))
+)( fixnum "XGetWMClientMachine"))
 
 
 (defentry XSetWMProperties(
 
-    int        ;; display 
-    int                ;; w 
-    int ;; window_name 
-    int ;; icon_name 
-    int        ;; argv 
-    int                        ;; argc 
-    int        ;; normal_hints 
-    int        ;; wm_hints 
-    int        ;; class_hints 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum ;; window_name 
+    fixnum ;; icon_name 
+    fixnum     ;; argv 
+    fixnum                     ;; argc 
+    fixnum     ;; normal_hints 
+    fixnum     ;; wm_hints 
+    fixnum     ;; class_hints 
 
 )( void "XSetWMProperties"))
 
 
 (defentry XSetWMSizeHints(
 
-    int        ;; display 
-    int                ;; w 
-    int        ;; hints 
-    int                ;; property 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum     ;; hints 
+    fixnum             ;; property 
 
 )( void "XSetWMSizeHints"))
 
 
 (defentry XSetWMNormalHints(
 
-    int        ;; display 
-    int                ;; w 
-    int        ;; hints 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum     ;; hints 
 
 )( void "XSetWMNormalHints"))
 
 
 (defentry XSetRGBColormaps(
 
-    int        ;; display 
-    int                ;; w 
-    int ;; stdcmaps 
-    int                        ;; count 
-    int                ;; property 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum ;; stdcmaps 
+    fixnum                     ;; count 
+    fixnum             ;; property 
 
 )( void "XSetRGBColormaps"))
 
 
 (defentry XSetTextProperty(
 
-    int        ;; display 
-    int                ;; w 
-    int ;; text_prop 
-    int                ;; property 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum ;; text_prop 
+    fixnum             ;; property 
 
 )( void "XSetTextProperty"))
 
 
 (defentry XSetWMName(
 
-    int        ;; display 
-    int                ;; w 
-    int ;; text_prop 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum ;; text_prop 
 
 )( void "XSetWMName"))
 
 
 (defentry XSetWMIconName(
 
-    int        ;; display 
-    int                ;; w 
-    int ;; text_prop 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum ;; text_prop 
 
 )( void "XSetWMIconName"))
 
 
 (defentry XSetWMClientMachine(
 
-    int        ;; display 
-    int                ;; w 
-    int ;; text_prop 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum ;; text_prop 
 
 )( void "XSetWMClientMachine"))
 
 
 (defentry XStringListToTextProperty(
 
-    int        ;; list 
-    int                        ;; count 
-    int ;; text_prop_return 
+    fixnum     ;; list 
+    fixnum                     ;; count 
+    fixnum ;; text_prop_return 
 
-)( int "XStringListToTextProperty"))
+)( fixnum "XStringListToTextProperty"))
 
 
 (defentry XTextPropertyToStringList(
 
-    int ;; text_prop 
-    int                ;; list_return 
-    int        ;; count_return 
+    fixnum ;; text_prop 
+    fixnum             ;; list_return 
+    fixnum     ;; count_return 
 
-)( int "XTextPropertyToStringList"))
+)( fixnum "XTextPropertyToStringList"))
 
 ;; The following declarations are alphabetized. 
 
@@ -446,8 +447,8 @@
 
 (defentry XClipBox(
 
-    int                ;; r 
-    int        ;; rect_return 
+    fixnum             ;; r 
+    fixnum     ;; rect_return 
 
 )( void "XClipBox"))
 
@@ -455,7 +456,7 @@
 
 (defentry XDestroyRegion(
 
-    int                ;; r 
+    fixnum             ;; r 
 
 )( void "XDestroyRegion"))
 
@@ -463,7 +464,7 @@
 
 (defentry XEmptyRegion(
 
-    int                ;; r 
+    fixnum             ;; r 
 
 )( void "XEmptyRegion"))
 
@@ -471,8 +472,8 @@
 
 (defentry XEqualRegion(
 
-    int                ;; r1 
-    int                ;; r2 
+    fixnum             ;; r1 
+    fixnum             ;; r2 
 
 )( void "XEqualRegion"))
 
@@ -480,72 +481,72 @@
 
 (defentry XGetClassHint(
 
-    int        ;; display 
-    int                ;; w 
-    int        ;; class_hints_return 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum     ;; class_hints_return 
 
-)( int "XGetClassHint"))
+)( fixnum "XGetClassHint"))
 
 
 
 (defentry XGetIconSizes(
 
-    int        ;; display 
-    int                ;; w 
-    int                ;; size_list_return 
-    int        ;; count_return 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum             ;; size_list_return 
+    fixnum     ;; count_return 
 
-)( int "XGetIconSizes"))
+)( fixnum "XGetIconSizes"))
 
 
 
 (defentry XGetNormalHints(
 
-    int        ;; display 
-    int                ;; w 
-    int        ;; hints_return 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum     ;; hints_return 
 
-)( int "XGetNormalHints"))
+)( fixnum "XGetNormalHints"))
 
 
 
 (defentry XGetSizeHints(
 
-    int        ;; display 
-    int                ;; w 
-    int        ;; hints_return 
-    int                ;; property 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum     ;; hints_return 
+    fixnum             ;; property 
 
-)( int "XGetSizeHints"))
+)( fixnum "XGetSizeHints"))
 
 
 
 (defentry XGetStandardColormap(
 
-    int        ;; display 
-    int                ;; w 
-    int ;; colormap_return 
-    int                ;; property                         
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum ;; colormap_return 
+    fixnum             ;; property                         
 
-)( int "XGetStandardColormap"))
+)( fixnum "XGetStandardColormap"))
 
 
 
 (defentry XGetZoomHints(
 
-    int        ;; display 
-    int                ;; w 
-    int        ;; zhints_return 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum     ;; zhints_return 
 
-)( int "XGetZoomHints"))
+)( fixnum "XGetZoomHints"))
 
 
 
 (defentry XIntersectRegion(
 
-    int                ;; sra 
-    int                ;; srb 
-    int                ;; dr_return 
+    fixnum             ;; sra 
+    fixnum             ;; srb 
+    fixnum             ;; dr_return 
 
 )( void "XIntersectRegion"))
 
@@ -553,33 +554,33 @@
 
 (defentry XLookupString(
 
-    int        ;; event_struct 
+    fixnum     ;; event_struct 
     object             ;; buffer_return 
-    int                        ;; bytes_buffer 
-    int        ;; keysym_return 
-    int ;; int_in_out 
+    fixnum                     ;; bytes_buffer 
+    fixnum     ;; keysym_return 
+    fixnum ;; int_in_out 
 
-)( int "XLookupString"))
+)( fixnum "XLookupString"))
 
 
 
 (defentry XMatchVisualInfo(
 
-    int        ;; display 
-    int                        ;; screen 
-    int                        ;; depth 
-    int                        ;; class 
-    int ;; vinfo_return 
+    fixnum     ;; display 
+    fixnum                     ;; screen 
+    fixnum                     ;; depth 
+    fixnum                     ;; class 
+    fixnum ;; vinfo_return 
 
-)( int "XMatchVisualInfo"))
+)( fixnum "XMatchVisualInfo"))
 
 
 
 (defentry XOffsetRegion(
 
-    int                ;; r 
-    int                        ;; dx 
-    int                        ;; dy 
+    fixnum             ;; r 
+    fixnum                     ;; dx 
+    fixnum                     ;; dy 
 
 )( void "XOffsetRegion"))
 
@@ -587,41 +588,41 @@
 
 (defentry XPointInRegion(
 
-    int                ;; r 
-    int                        ;; x 
-    int                        ;; y 
+    fixnum             ;; r 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
 
-)( int "XPointInRegion"))
+)( fixnum "XPointInRegion"))
 
 
 
 (defentry XPolygonRegion(
 
-    int        ;; points 
-    int                        ;; n 
-    int                        ;; fill_rule 
+    fixnum     ;; points 
+    fixnum                     ;; n 
+    fixnum                     ;; fill_rule 
 
-)( int "XPolygonRegion"))
+)( fixnum "XPolygonRegion"))
 
 
 
 (defentry XRectInRegion(
 
-    int                ;; r 
-    int                        ;; x 
-    int                        ;; y 
-     int       ;; width 
-     int       ;; height 
+    fixnum             ;; r 
+    fixnum                     ;; x 
+    fixnum                     ;; y 
+     fixnum    ;; width 
+     fixnum    ;; height 
 
-)( int "XRectInRegion"))
+)( fixnum "XRectInRegion"))
 
 
 
 (defentry XSetClassHint(
 
-    int        ;; display 
-    int                ;; w 
-    int        ;; class_hints 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum     ;; class_hints 
 
 )( void "XSetClassHint"))
 
@@ -629,10 +630,10 @@
 
 (defentry XSetIconSizes(
 
-    int        ;; display 
-    int                ;; w 
-    int        ;; size_list 
-    int                        ;; count     
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum     ;; size_list 
+    fixnum                     ;; count     
 
 )( void "XSetIconSizes"))
 
@@ -640,9 +641,9 @@
 
 (defentry XSetNormalHints(
 
-    int        ;; display 
-    int                ;; w 
-    int        ;; hints 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum     ;; hints 
 
 )( void "XSetNormalHints"))
 
@@ -650,10 +651,10 @@
 
 (defentry XSetSizeHints(
 
-    int        ;; display 
-    int                ;; w 
-    int        ;; hints 
-    int                ;; property 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum     ;; hints 
+    fixnum             ;; property 
 
 )( void "XSetSizeHints"))
 
@@ -661,14 +662,14 @@
 
 (defentry XSetStandardProperties(
 
-    int        ;; display 
-    int                ;; w 
+    fixnum     ;; display 
+    fixnum             ;; w 
      object            ;; window_name 
      object            ;; icon_name 
-    int                ;; icon_pixmap 
-    int        ;; argv 
-    int                        ;; argc 
-    int        ;; hints 
+    fixnum             ;; icon_pixmap 
+    fixnum     ;; argv 
+    fixnum                     ;; argc 
+    fixnum     ;; hints 
 
 )( void "XSetStandardProperties"))
 
@@ -676,9 +677,9 @@
 
 (defentry XSetWMHints(
 
-    int        ;; display 
-    int                ;; w 
-    int        ;; wm_hints 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum     ;; wm_hints 
 
 )( void "XSetWMHints"))
 
@@ -686,9 +687,9 @@
 
 (defentry XSetRegion(
 
-    int        ;; display 
-    int                        ;; gc 
-    int                ;; r 
+    fixnum     ;; display 
+    fixnum                     ;; gc 
+    fixnum             ;; r 
 
 )( void "XSetRegion"))
 
@@ -696,10 +697,10 @@
 
 (defentry XSetStandardColormap(
 
-    int        ;; display 
-    int                ;; w 
-    int ;; colormap 
-    int                ;; property 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum ;; colormap 
+    fixnum             ;; property 
 
 )( void "XSetStandardColormap"))
 
@@ -707,9 +708,9 @@
 
 (defentry XSetZoomHints(
 
-    int        ;; display 
-    int                ;; w 
-    int        ;; zhints 
+    fixnum     ;; display 
+    fixnum             ;; w 
+    fixnum     ;; zhints 
 
 )( void "XSetZoomHints"))
 
@@ -717,9 +718,9 @@
 
 (defentry XShrinkRegion(
 
-    int                ;; r 
-    int                        ;; dx 
-    int                        ;; dy 
+    fixnum             ;; r 
+    fixnum                     ;; dx 
+    fixnum                     ;; dy 
 
 )( void "XShrinkRegion"))
 
@@ -727,9 +728,9 @@
 
 (defentry XSubtractRegion(
 
-    int                ;; sra 
-    int                ;; srb 
-    int                ;; dr_return 
+    fixnum             ;; sra 
+    fixnum             ;; srb 
+    fixnum             ;; dr_return 
 
 )( void "XSubtractRegion"))
 
@@ -737,9 +738,9 @@
 
 (defentry XUnionRectWithRegion(
 
-    int        ;; rectangle 
-    int                ;; src_region 
-    int                ;; dest_region_return 
+    fixnum     ;; rectangle 
+    fixnum             ;; src_region 
+    fixnum             ;; dest_region_return 
 
 )( void "XUnionRectWithRegion"))
 
@@ -747,9 +748,9 @@
 
 (defentry XUnionRegion(
 
-    int                ;; sra 
-    int                ;; srb 
-    int                ;; dr_return 
+    fixnum             ;; sra 
+    fixnum             ;; srb 
+    fixnum             ;; dr_return 
 
 )( void "XUnionRegion"))
 
@@ -757,52 +758,52 @@
 
 (defentry XWMGeometry(
 
-    int        ;; display 
-    int                        ;; screen_number 
+    fixnum     ;; display 
+    fixnum                     ;; screen_number 
      object            ;; user_geometry 
      object            ;; default_geometry 
-     int       ;; border_width 
-    int        ;; hints 
-    int        ;; x_return 
-    int        ;; y_return 
-    int        ;; width_return 
-    int        ;; height_return 
-    int        ;; gravity_return 
+     fixnum    ;; border_width 
+    fixnum     ;; hints 
+    fixnum     ;; x_return 
+    fixnum     ;; y_return 
+    fixnum     ;; width_return 
+    fixnum     ;; height_return 
+    fixnum     ;; gravity_return 
 
-)( int "XWMGeometry"))
+)( fixnum "XWMGeometry"))
 
 
 
 (defentry XXorRegion(
 
-    int                ;; sra 
-    int                ;; srb 
-    int                ;; dr_return 
+    fixnum             ;; sra 
+    fixnum             ;; srb 
+    fixnum             ;; dr_return 
 
 )( void "XXorRegion"))
 ;;
  ;; These macros are used to give some sugar to the image routines so that
  ;; naive people are more comfortable with them.
  
-(defentry XDestroyImage(int) (int "XDestroyImage"))
-(defentry XGetPixel(int int int) (int "XGetPixel" ))
-(defentry XPutPixel(int int int int) ( int "XPutPixel"))
-(defentry XSubImage(int  int int int int) (int  "XSubImage"))
-(defentry XAddPixel(int  int) (int  "XAddPixel"))
+(defentry XDestroyImage(fixnum) (fixnum "XDestroyImage"))
+(defentry XGetPixel(fixnum fixnum fixnum) (fixnum "XGetPixel" ))
+(defentry XPutPixel(fixnum fixnum int fixnum) ( fixnum "XPutPixel"))
+(defentry XSubImage(fixnum  fixnum int fixnum fixnum) (fixnum  "XSubImage"))
+(defentry XAddPixel(fixnum  fixnum) (fixnum  "XAddPixel"))
 ;;
  ;; Keysym macros, used on Keysyms to test for classes of symbols
 
-(defentry IsKeypadKey(int)  (int "IsKeypadKey"))
+(defentry IsKeypadKey(fixnum)  (fixnum "IsKeypadKey"))
 
-(defentry IsCursorKey(int) (int "IsCursorKey"))
+(defentry IsCursorKey(fixnum) (fixnum "IsCursorKey"))
 
-(defentry IsPFKey(int) (int "IsPFKey"))
+(defentry IsPFKey(fixnum) (fixnum "IsPFKey"))
 
-(defentry  IsFunctionKey(int) (int "IsFunctionKey"))
+(defentry  IsFunctionKey(fixnum) (fixnum "IsFunctionKey"))
 
-(defentry IsMiscFunctionKey(int)  (int "IsMiscFunctionKey"))
+(defentry IsMiscFunctionKey(fixnum)  (fixnum "IsMiscFunctionKey"))
 
-(defentry IsModifierKey(int) (int "IsModifierKey"))
-(defentry XUniqueContext() (int  "XUniqueContext"))
-(defentry  XStringToContext(object) (int  "XStringToContext"))
+(defentry IsModifierKey(fixnum) (fixnum "IsModifierKey"))
+(defentry XUniqueContext() (fixnum  "XUniqueContext"))
+(defentry  XStringToContext(object) (fixnum  "XStringToContext"))
 

Index: xgcl-2/gcl_defentry-events.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_defentry-events.lsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- xgcl-2/gcl_defentry-events.lsp      5 Jan 2006 17:55:35 -0000       1.1.2.1
+++ xgcl-2/gcl_defentry-events.lsp      20 Jun 2006 23:00:10 -0000      1.1.2.2
@@ -25,793 +25,794 @@
 
 ;;;;;; XKeyEvent funcions ;;;;;;
 
-(defentry make-XKeyEvent () ( int  "make_XKeyEvent" ))
-(defentry XKeyEvent-same_screen (int) ( int "XKeyEvent_same_screen" ))
-(defentry set-XKeyEvent-same_screen (int int) ( void 
"set_XKeyEvent_same_screen" ))
-(defentry XKeyEvent-keycode (int) ( int "XKeyEvent_keycode" ))
-(defentry set-XKeyEvent-keycode (int int) ( void "set_XKeyEvent_keycode" ))
-(defentry XKeyEvent-state (int) ( int "XKeyEvent_state" ))
-(defentry set-XKeyEvent-state (int int) ( void "set_XKeyEvent_state" ))
-(defentry XKeyEvent-y_root (int) ( int "XKeyEvent_y_root" ))
-(defentry set-XKeyEvent-y_root (int int) ( void "set_XKeyEvent_y_root" ))
-(defentry XKeyEvent-x_root (int) ( int "XKeyEvent_x_root" ))
-(defentry set-XKeyEvent-x_root (int int) ( void "set_XKeyEvent_x_root" ))
-(defentry XKeyEvent-y (int) ( int "XKeyEvent_y" ))
-(defentry set-XKeyEvent-y (int int) ( void "set_XKeyEvent_y" ))
-(defentry XKeyEvent-x (int) ( int "XKeyEvent_x" ))
-(defentry set-XKeyEvent-x (int int) ( void "set_XKeyEvent_x" ))
-(defentry XKeyEvent-time (int) ( int "XKeyEvent_time" ))
-(defentry set-XKeyEvent-time (int int) ( void "set_XKeyEvent_time" ))
-(defentry XKeyEvent-subwindow (int) ( int "XKeyEvent_subwindow" ))
-(defentry set-XKeyEvent-subwindow (int int) ( void "set_XKeyEvent_subwindow" ))
-(defentry XKeyEvent-root (int) ( int "XKeyEvent_root" ))
-(defentry set-XKeyEvent-root (int int) ( void "set_XKeyEvent_root" ))
-(defentry XKeyEvent-window (int) ( int "XKeyEvent_window" ))
-(defentry set-XKeyEvent-window (int int) ( void "set_XKeyEvent_window" ))
-(defentry XKeyEvent-display (int) ( int "XKeyEvent_display" ))
-(defentry set-XKeyEvent-display (int int) ( void "set_XKeyEvent_display" ))
-(defentry XKeyEvent-send_event (int) ( int "XKeyEvent_send_event" ))
-(defentry set-XKeyEvent-send_event (int int) ( void "set_XKeyEvent_send_event" 
))
-(defentry XKeyEvent-serial (int) ( int "XKeyEvent_serial" ))
-(defentry set-XKeyEvent-serial (int int) ( void "set_XKeyEvent_serial" ))
-(defentry XKeyEvent-type (int) ( int "XKeyEvent_type" ))
-(defentry set-XKeyEvent-type (int int) ( void "set_XKeyEvent_type" ))
+(clines "#include \"xgcl.h\"")
+(defentry make-XKeyEvent () ( fixnum  "make_XKeyEvent" ))
+(defentry XKeyEvent-same_screen (fixnum) ( fixnum "XKeyEvent_same_screen" ))
+(defentry set-XKeyEvent-same_screen (fixnum fixnum) ( void 
"set_XKeyEvent_same_screen" ))
+(defentry XKeyEvent-keycode (fixnum) ( fixnum "XKeyEvent_keycode" ))
+(defentry set-XKeyEvent-keycode (fixnum fixnum) ( void "set_XKeyEvent_keycode" 
))
+(defentry XKeyEvent-state (fixnum) ( fixnum "XKeyEvent_state" ))
+(defentry set-XKeyEvent-state (fixnum fixnum) ( void "set_XKeyEvent_state" ))
+(defentry XKeyEvent-y_root (fixnum) ( fixnum "XKeyEvent_y_root" ))
+(defentry set-XKeyEvent-y_root (fixnum fixnum) ( void "set_XKeyEvent_y_root" ))
+(defentry XKeyEvent-x_root (fixnum) ( fixnum "XKeyEvent_x_root" ))
+(defentry set-XKeyEvent-x_root (fixnum fixnum) ( void "set_XKeyEvent_x_root" ))
+(defentry XKeyEvent-y (fixnum) ( fixnum "XKeyEvent_y" ))
+(defentry set-XKeyEvent-y (fixnum fixnum) ( void "set_XKeyEvent_y" ))
+(defentry XKeyEvent-x (fixnum) ( fixnum "XKeyEvent_x" ))
+(defentry set-XKeyEvent-x (fixnum fixnum) ( void "set_XKeyEvent_x" ))
+(defentry XKeyEvent-time (fixnum) ( fixnum "XKeyEvent_time" ))
+(defentry set-XKeyEvent-time (fixnum fixnum) ( void "set_XKeyEvent_time" ))
+(defentry XKeyEvent-subwindow (fixnum) ( fixnum "XKeyEvent_subwindow" ))
+(defentry set-XKeyEvent-subwindow (fixnum fixnum) ( void 
"set_XKeyEvent_subwindow" ))
+(defentry XKeyEvent-root (fixnum) ( fixnum "XKeyEvent_root" ))
+(defentry set-XKeyEvent-root (fixnum fixnum) ( void "set_XKeyEvent_root" ))
+(defentry XKeyEvent-window (fixnum) ( fixnum "XKeyEvent_window" ))
+(defentry set-XKeyEvent-window (fixnum fixnum) ( void "set_XKeyEvent_window" ))
+(defentry XKeyEvent-display (fixnum) ( fixnum "XKeyEvent_display" ))
+(defentry set-XKeyEvent-display (fixnum fixnum) ( void "set_XKeyEvent_display" 
))
+(defentry XKeyEvent-send_event (fixnum) ( fixnum "XKeyEvent_send_event" ))
+(defentry set-XKeyEvent-send_event (fixnum fixnum) ( void 
"set_XKeyEvent_send_event" ))
+(defentry XKeyEvent-serial (fixnum) ( fixnum "XKeyEvent_serial" ))
+(defentry set-XKeyEvent-serial (fixnum fixnum) ( void "set_XKeyEvent_serial" ))
+(defentry XKeyEvent-type (fixnum) ( fixnum "XKeyEvent_type" ))
+(defentry set-XKeyEvent-type (fixnum fixnum) ( void "set_XKeyEvent_type" ))
 
 
 ;;;;;; XButtonEvent funcions ;;;;;;
 
-(defentry make-XButtonEvent () ( int  "make_XButtonEvent" ))
-(defentry XButtonEvent-same_screen (int) ( int "XButtonEvent_same_screen" ))
-(defentry set-XButtonEvent-same_screen (int int) ( void 
"set_XButtonEvent_same_screen" ))
-(defentry XButtonEvent-button (int) ( int "XButtonEvent_button" ))
-(defentry set-XButtonEvent-button (int int) ( void "set_XButtonEvent_button" ))
-(defentry XButtonEvent-state (int) ( int "XButtonEvent_state" ))
-(defentry set-XButtonEvent-state (int int) ( void "set_XButtonEvent_state" ))
-(defentry XButtonEvent-y_root (int) ( int "XButtonEvent_y_root" ))
-(defentry set-XButtonEvent-y_root (int int) ( void "set_XButtonEvent_y_root" ))
-(defentry XButtonEvent-x_root (int) ( int "XButtonEvent_x_root" ))
-(defentry set-XButtonEvent-x_root (int int) ( void "set_XButtonEvent_x_root" ))
-(defentry XButtonEvent-y (int) ( int "XButtonEvent_y" ))
-(defentry set-XButtonEvent-y (int int) ( void "set_XButtonEvent_y" ))
-(defentry XButtonEvent-x (int) ( int "XButtonEvent_x" ))
-(defentry set-XButtonEvent-x (int int) ( void "set_XButtonEvent_x" ))
-(defentry XButtonEvent-time (int) ( int "XButtonEvent_time" ))
-(defentry set-XButtonEvent-time (int int) ( void "set_XButtonEvent_time" ))
-(defentry XButtonEvent-subwindow (int) ( int "XButtonEvent_subwindow" ))
-(defentry set-XButtonEvent-subwindow (int int) ( void 
"set_XButtonEvent_subwindow" ))
-(defentry XButtonEvent-root (int) ( int "XButtonEvent_root" ))
-(defentry set-XButtonEvent-root (int int) ( void "set_XButtonEvent_root" ))
-(defentry XButtonEvent-window (int) ( int "XButtonEvent_window" ))
-(defentry set-XButtonEvent-window (int int) ( void "set_XButtonEvent_window" ))
-(defentry XButtonEvent-display (int) ( int "XButtonEvent_display" ))
-(defentry set-XButtonEvent-display (int int) ( void "set_XButtonEvent_display" 
))
-(defentry XButtonEvent-send_event (int) ( int "XButtonEvent_send_event" ))
-(defentry set-XButtonEvent-send_event (int int) ( void 
"set_XButtonEvent_send_event" ))
-(defentry XButtonEvent-serial (int) ( int "XButtonEvent_serial" ))
-(defentry set-XButtonEvent-serial (int int) ( void "set_XButtonEvent_serial" ))
-(defentry XButtonEvent-type (int) ( int "XButtonEvent_type" ))
-(defentry set-XButtonEvent-type (int int) ( void "set_XButtonEvent_type" ))
+(defentry make-XButtonEvent () ( fixnum  "make_XButtonEvent" ))
+(defentry XButtonEvent-same_screen (fixnum) ( fixnum 
"XButtonEvent_same_screen" ))
+(defentry set-XButtonEvent-same_screen (fixnum fixnum) ( void 
"set_XButtonEvent_same_screen" ))
+(defentry XButtonEvent-button (fixnum) ( fixnum "XButtonEvent_button" ))
+(defentry set-XButtonEvent-button (fixnum fixnum) ( void 
"set_XButtonEvent_button" ))
+(defentry XButtonEvent-state (fixnum) ( fixnum "XButtonEvent_state" ))
+(defentry set-XButtonEvent-state (fixnum fixnum) ( void 
"set_XButtonEvent_state" ))
+(defentry XButtonEvent-y_root (fixnum) ( fixnum "XButtonEvent_y_root" ))
+(defentry set-XButtonEvent-y_root (fixnum fixnum) ( void 
"set_XButtonEvent_y_root" ))
+(defentry XButtonEvent-x_root (fixnum) ( fixnum "XButtonEvent_x_root" ))
+(defentry set-XButtonEvent-x_root (fixnum fixnum) ( void 
"set_XButtonEvent_x_root" ))
+(defentry XButtonEvent-y (fixnum) ( fixnum "XButtonEvent_y" ))
+(defentry set-XButtonEvent-y (fixnum fixnum) ( void "set_XButtonEvent_y" ))
+(defentry XButtonEvent-x (fixnum) ( fixnum "XButtonEvent_x" ))
+(defentry set-XButtonEvent-x (fixnum fixnum) ( void "set_XButtonEvent_x" ))
+(defentry XButtonEvent-time (fixnum) ( fixnum "XButtonEvent_time" ))
+(defentry set-XButtonEvent-time (fixnum fixnum) ( void "set_XButtonEvent_time" 
))
+(defentry XButtonEvent-subwindow (fixnum) ( fixnum "XButtonEvent_subwindow" ))
+(defentry set-XButtonEvent-subwindow (fixnum fixnum) ( void 
"set_XButtonEvent_subwindow" ))
+(defentry XButtonEvent-root (fixnum) ( fixnum "XButtonEvent_root" ))
+(defentry set-XButtonEvent-root (fixnum fixnum) ( void "set_XButtonEvent_root" 
))
+(defentry XButtonEvent-window (fixnum) ( fixnum "XButtonEvent_window" ))
+(defentry set-XButtonEvent-window (fixnum fixnum) ( void 
"set_XButtonEvent_window" ))
+(defentry XButtonEvent-display (fixnum) ( fixnum "XButtonEvent_display" ))
+(defentry set-XButtonEvent-display (fixnum fixnum) ( void 
"set_XButtonEvent_display" ))
+(defentry XButtonEvent-send_event (fixnum) ( fixnum "XButtonEvent_send_event" 
))
+(defentry set-XButtonEvent-send_event (fixnum fixnum) ( void 
"set_XButtonEvent_send_event" ))
+(defentry XButtonEvent-serial (fixnum) ( fixnum "XButtonEvent_serial" ))
+(defentry set-XButtonEvent-serial (fixnum fixnum) ( void 
"set_XButtonEvent_serial" ))
+(defentry XButtonEvent-type (fixnum) ( fixnum "XButtonEvent_type" ))
+(defentry set-XButtonEvent-type (fixnum fixnum) ( void "set_XButtonEvent_type" 
))
 
 
 ;;;;;; XMotionEvent funcions ;;;;;;
 
-(defentry make-XMotionEvent () ( int  "make_XMotionEvent" ))
-(defentry XMotionEvent-same_screen (int) ( int "XMotionEvent_same_screen" ))
-(defentry set-XMotionEvent-same_screen (int int) ( void 
"set_XMotionEvent_same_screen" ))
-(defentry XMotionEvent-is_hint (int) ( char "XMotionEvent_is_hint" ))
-(defentry set-XMotionEvent-is_hint (int char) ( void 
"set_XMotionEvent_is_hint" ))
-(defentry XMotionEvent-state (int) ( int "XMotionEvent_state" ))
-(defentry set-XMotionEvent-state (int int) ( void "set_XMotionEvent_state" ))
-(defentry XMotionEvent-y_root (int) ( int "XMotionEvent_y_root" ))
-(defentry set-XMotionEvent-y_root (int int) ( void "set_XMotionEvent_y_root" ))
-(defentry XMotionEvent-x_root (int) ( int "XMotionEvent_x_root" ))
-(defentry set-XMotionEvent-x_root (int int) ( void "set_XMotionEvent_x_root" ))
-(defentry XMotionEvent-y (int) ( int "XMotionEvent_y" ))
-(defentry set-XMotionEvent-y (int int) ( void "set_XMotionEvent_y" ))
-(defentry XMotionEvent-x (int) ( int "XMotionEvent_x" ))
-(defentry set-XMotionEvent-x (int int) ( void "set_XMotionEvent_x" ))
-(defentry XMotionEvent-time (int) ( int "XMotionEvent_time" ))
-(defentry set-XMotionEvent-time (int int) ( void "set_XMotionEvent_time" ))
-(defentry XMotionEvent-subwindow (int) ( int "XMotionEvent_subwindow" ))
-(defentry set-XMotionEvent-subwindow (int int) ( void 
"set_XMotionEvent_subwindow" ))
-(defentry XMotionEvent-root (int) ( int "XMotionEvent_root" ))
-(defentry set-XMotionEvent-root (int int) ( void "set_XMotionEvent_root" ))
-(defentry XMotionEvent-window (int) ( int "XMotionEvent_window" ))
-(defentry set-XMotionEvent-window (int int) ( void "set_XMotionEvent_window" ))
-(defentry XMotionEvent-display (int) ( int "XMotionEvent_display" ))
-(defentry set-XMotionEvent-display (int int) ( void "set_XMotionEvent_display" 
))
-(defentry XMotionEvent-send_event (int) ( int "XMotionEvent_send_event" ))
-(defentry set-XMotionEvent-send_event (int int) ( void 
"set_XMotionEvent_send_event" ))
-(defentry XMotionEvent-serial (int) ( int "XMotionEvent_serial" ))
-(defentry set-XMotionEvent-serial (int int) ( void "set_XMotionEvent_serial" ))
-(defentry XMotionEvent-type (int) ( int "XMotionEvent_type" ))
-(defentry set-XMotionEvent-type (int int) ( void "set_XMotionEvent_type" ))
+(defentry make-XMotionEvent () ( fixnum  "make_XMotionEvent" ))
+(defentry XMotionEvent-same_screen (fixnum) ( fixnum 
"XMotionEvent_same_screen" ))
+(defentry set-XMotionEvent-same_screen (fixnum fixnum) ( void 
"set_XMotionEvent_same_screen" ))
+(defentry XMotionEvent-is_hint (fixnum) ( char "XMotionEvent_is_hint" ))
+(defentry set-XMotionEvent-is_hint (fixnum char) ( void 
"set_XMotionEvent_is_hint" ))
+(defentry XMotionEvent-state (fixnum) ( fixnum "XMotionEvent_state" ))
+(defentry set-XMotionEvent-state (fixnum fixnum) ( void 
"set_XMotionEvent_state" ))
+(defentry XMotionEvent-y_root (fixnum) ( fixnum "XMotionEvent_y_root" ))
+(defentry set-XMotionEvent-y_root (fixnum fixnum) ( void 
"set_XMotionEvent_y_root" ))
+(defentry XMotionEvent-x_root (fixnum) ( fixnum "XMotionEvent_x_root" ))
+(defentry set-XMotionEvent-x_root (fixnum fixnum) ( void 
"set_XMotionEvent_x_root" ))
+(defentry XMotionEvent-y (fixnum) ( fixnum "XMotionEvent_y" ))
+(defentry set-XMotionEvent-y (fixnum fixnum) ( void "set_XMotionEvent_y" ))
+(defentry XMotionEvent-x (fixnum) ( fixnum "XMotionEvent_x" ))
+(defentry set-XMotionEvent-x (fixnum fixnum) ( void "set_XMotionEvent_x" ))
+(defentry XMotionEvent-time (fixnum) ( fixnum "XMotionEvent_time" ))
+(defentry set-XMotionEvent-time (fixnum fixnum) ( void "set_XMotionEvent_time" 
))
+(defentry XMotionEvent-subwindow (fixnum) ( fixnum "XMotionEvent_subwindow" ))
+(defentry set-XMotionEvent-subwindow (fixnum fixnum) ( void 
"set_XMotionEvent_subwindow" ))
+(defentry XMotionEvent-root (fixnum) ( fixnum "XMotionEvent_root" ))
+(defentry set-XMotionEvent-root (fixnum fixnum) ( void "set_XMotionEvent_root" 
))
+(defentry XMotionEvent-window (fixnum) ( fixnum "XMotionEvent_window" ))
+(defentry set-XMotionEvent-window (fixnum fixnum) ( void 
"set_XMotionEvent_window" ))
+(defentry XMotionEvent-display (fixnum) ( fixnum "XMotionEvent_display" ))
+(defentry set-XMotionEvent-display (fixnum fixnum) ( void 
"set_XMotionEvent_display" ))
+(defentry XMotionEvent-send_event (fixnum) ( fixnum "XMotionEvent_send_event" 
))
+(defentry set-XMotionEvent-send_event (fixnum fixnum) ( void 
"set_XMotionEvent_send_event" ))
+(defentry XMotionEvent-serial (fixnum) ( fixnum "XMotionEvent_serial" ))
+(defentry set-XMotionEvent-serial (fixnum fixnum) ( void 
"set_XMotionEvent_serial" ))
+(defentry XMotionEvent-type (fixnum) ( fixnum "XMotionEvent_type" ))
+(defentry set-XMotionEvent-type (fixnum fixnum) ( void "set_XMotionEvent_type" 
))
 
 
 ;;;;;; XCrossingEvent funcions ;;;;;;
 
-(defentry make-XCrossingEvent () ( int  "make_XCrossingEvent" ))
-(defentry XCrossingEvent-state (int) ( int "XCrossingEvent_state" ))
-(defentry set-XCrossingEvent-state (int int) ( void "set_XCrossingEvent_state" 
))
-(defentry XCrossingEvent-focus (int) ( int "XCrossingEvent_focus" ))
-(defentry set-XCrossingEvent-focus (int int) ( void "set_XCrossingEvent_focus" 
))
-(defentry XCrossingEvent-same_screen (int) ( int "XCrossingEvent_same_screen" 
))
-(defentry set-XCrossingEvent-same_screen (int int) ( void 
"set_XCrossingEvent_same_screen" ))
-(defentry XCrossingEvent-detail (int) ( int "XCrossingEvent_detail" ))
-(defentry set-XCrossingEvent-detail (int int) ( void 
"set_XCrossingEvent_detail" ))
-(defentry XCrossingEvent-mode (int) ( int "XCrossingEvent_mode" ))
-(defentry set-XCrossingEvent-mode (int int) ( void "set_XCrossingEvent_mode" ))
-(defentry XCrossingEvent-y_root (int) ( int "XCrossingEvent_y_root" ))
-(defentry set-XCrossingEvent-y_root (int int) ( void 
"set_XCrossingEvent_y_root" ))
-(defentry XCrossingEvent-x_root (int) ( int "XCrossingEvent_x_root" ))
-(defentry set-XCrossingEvent-x_root (int int) ( void 
"set_XCrossingEvent_x_root" ))
-(defentry XCrossingEvent-y (int) ( int "XCrossingEvent_y" ))
-(defentry set-XCrossingEvent-y (int int) ( void "set_XCrossingEvent_y" ))
-(defentry XCrossingEvent-x (int) ( int "XCrossingEvent_x" ))
-(defentry set-XCrossingEvent-x (int int) ( void "set_XCrossingEvent_x" ))
-(defentry XCrossingEvent-time (int) ( int "XCrossingEvent_time" ))
-(defentry set-XCrossingEvent-time (int int) ( void "set_XCrossingEvent_time" ))
-(defentry XCrossingEvent-subwindow (int) ( int "XCrossingEvent_subwindow" ))
-(defentry set-XCrossingEvent-subwindow (int int) ( void 
"set_XCrossingEvent_subwindow" ))
-(defentry XCrossingEvent-root (int) ( int "XCrossingEvent_root" ))
-(defentry set-XCrossingEvent-root (int int) ( void "set_XCrossingEvent_root" ))
-(defentry XCrossingEvent-window (int) ( int "XCrossingEvent_window" ))
-(defentry set-XCrossingEvent-window (int int) ( void 
"set_XCrossingEvent_window" ))
-(defentry XCrossingEvent-display (int) ( int "XCrossingEvent_display" ))
-(defentry set-XCrossingEvent-display (int int) ( void 
"set_XCrossingEvent_display" ))
-(defentry XCrossingEvent-send_event (int) ( int "XCrossingEvent_send_event" ))
-(defentry set-XCrossingEvent-send_event (int int) ( void 
"set_XCrossingEvent_send_event" ))
-(defentry XCrossingEvent-serial (int) ( int "XCrossingEvent_serial" ))
-(defentry set-XCrossingEvent-serial (int int) ( void 
"set_XCrossingEvent_serial" ))
-(defentry XCrossingEvent-type (int) ( int "XCrossingEvent_type" ))
-(defentry set-XCrossingEvent-type (int int) ( void "set_XCrossingEvent_type" ))
+(defentry make-XCrossingEvent () ( fixnum  "make_XCrossingEvent" ))
+(defentry XCrossingEvent-state (fixnum) ( fixnum "XCrossingEvent_state" ))
+(defentry set-XCrossingEvent-state (fixnum fixnum) ( void 
"set_XCrossingEvent_state" ))
+(defentry XCrossingEvent-focus (fixnum) ( fixnum "XCrossingEvent_focus" ))
+(defentry set-XCrossingEvent-focus (fixnum fixnum) ( void 
"set_XCrossingEvent_focus" ))
+(defentry XCrossingEvent-same_screen (fixnum) ( fixnum 
"XCrossingEvent_same_screen" ))
+(defentry set-XCrossingEvent-same_screen (fixnum fixnum) ( void 
"set_XCrossingEvent_same_screen" ))
+(defentry XCrossingEvent-detail (fixnum) ( fixnum "XCrossingEvent_detail" ))
+(defentry set-XCrossingEvent-detail (fixnum fixnum) ( void 
"set_XCrossingEvent_detail" ))
+(defentry XCrossingEvent-mode (fixnum) ( fixnum "XCrossingEvent_mode" ))
+(defentry set-XCrossingEvent-mode (fixnum fixnum) ( void 
"set_XCrossingEvent_mode" ))
+(defentry XCrossingEvent-y_root (fixnum) ( fixnum "XCrossingEvent_y_root" ))
+(defentry set-XCrossingEvent-y_root (fixnum fixnum) ( void 
"set_XCrossingEvent_y_root" ))
+(defentry XCrossingEvent-x_root (fixnum) ( fixnum "XCrossingEvent_x_root" ))
+(defentry set-XCrossingEvent-x_root (fixnum fixnum) ( void 
"set_XCrossingEvent_x_root" ))
+(defentry XCrossingEvent-y (fixnum) ( fixnum "XCrossingEvent_y" ))
+(defentry set-XCrossingEvent-y (fixnum fixnum) ( void "set_XCrossingEvent_y" ))
+(defentry XCrossingEvent-x (fixnum) ( fixnum "XCrossingEvent_x" ))
+(defentry set-XCrossingEvent-x (fixnum fixnum) ( void "set_XCrossingEvent_x" ))
+(defentry XCrossingEvent-time (fixnum) ( fixnum "XCrossingEvent_time" ))
+(defentry set-XCrossingEvent-time (fixnum fixnum) ( void 
"set_XCrossingEvent_time" ))
+(defentry XCrossingEvent-subwindow (fixnum) ( fixnum 
"XCrossingEvent_subwindow" ))
+(defentry set-XCrossingEvent-subwindow (fixnum fixnum) ( void 
"set_XCrossingEvent_subwindow" ))
+(defentry XCrossingEvent-root (fixnum) ( fixnum "XCrossingEvent_root" ))
+(defentry set-XCrossingEvent-root (fixnum fixnum) ( void 
"set_XCrossingEvent_root" ))
+(defentry XCrossingEvent-window (fixnum) ( fixnum "XCrossingEvent_window" ))
+(defentry set-XCrossingEvent-window (fixnum fixnum) ( void 
"set_XCrossingEvent_window" ))
+(defentry XCrossingEvent-display (fixnum) ( fixnum "XCrossingEvent_display" ))
+(defentry set-XCrossingEvent-display (fixnum fixnum) ( void 
"set_XCrossingEvent_display" ))
+(defentry XCrossingEvent-send_event (fixnum) ( fixnum 
"XCrossingEvent_send_event" ))
+(defentry set-XCrossingEvent-send_event (fixnum fixnum) ( void 
"set_XCrossingEvent_send_event" ))
+(defentry XCrossingEvent-serial (fixnum) ( fixnum "XCrossingEvent_serial" ))
+(defentry set-XCrossingEvent-serial (fixnum fixnum) ( void 
"set_XCrossingEvent_serial" ))
+(defentry XCrossingEvent-type (fixnum) ( fixnum "XCrossingEvent_type" ))
+(defentry set-XCrossingEvent-type (fixnum fixnum) ( void 
"set_XCrossingEvent_type" ))
 
 
 ;;;;;; XFocusChangeEvent funcions ;;;;;;
 
-(defentry make-XFocusChangeEvent () ( int  "make_XFocusChangeEvent" ))
-(defentry XFocusChangeEvent-detail (int) ( int "XFocusChangeEvent_detail" ))
-(defentry set-XFocusChangeEvent-detail (int int) ( void 
"set_XFocusChangeEvent_detail" ))
-(defentry XFocusChangeEvent-mode (int) ( int "XFocusChangeEvent_mode" ))
-(defentry set-XFocusChangeEvent-mode (int int) ( void 
"set_XFocusChangeEvent_mode" ))
-(defentry XFocusChangeEvent-window (int) ( int "XFocusChangeEvent_window" ))
-(defentry set-XFocusChangeEvent-window (int int) ( void 
"set_XFocusChangeEvent_window" ))
-(defentry XFocusChangeEvent-display (int) ( int "XFocusChangeEvent_display" ))
-(defentry set-XFocusChangeEvent-display (int int) ( void 
"set_XFocusChangeEvent_display" ))
-(defentry XFocusChangeEvent-send_event (int) ( int 
"XFocusChangeEvent_send_event" ))
-(defentry set-XFocusChangeEvent-send_event (int int) ( void 
"set_XFocusChangeEvent_send_event" ))
-(defentry XFocusChangeEvent-serial (int) ( int "XFocusChangeEvent_serial" ))
-(defentry set-XFocusChangeEvent-serial (int int) ( void 
"set_XFocusChangeEvent_serial" ))
-(defentry XFocusChangeEvent-type (int) ( int "XFocusChangeEvent_type" ))
-(defentry set-XFocusChangeEvent-type (int int) ( void 
"set_XFocusChangeEvent_type" ))
+(defentry make-XFocusChangeEvent () ( fixnum  "make_XFocusChangeEvent" ))
+(defentry XFocusChangeEvent-detail (fixnum) ( fixnum 
"XFocusChangeEvent_detail" ))
+(defentry set-XFocusChangeEvent-detail (fixnum fixnum) ( void 
"set_XFocusChangeEvent_detail" ))
+(defentry XFocusChangeEvent-mode (fixnum) ( fixnum "XFocusChangeEvent_mode" ))
+(defentry set-XFocusChangeEvent-mode (fixnum fixnum) ( void 
"set_XFocusChangeEvent_mode" ))
+(defentry XFocusChangeEvent-window (fixnum) ( fixnum 
"XFocusChangeEvent_window" ))
+(defentry set-XFocusChangeEvent-window (fixnum fixnum) ( void 
"set_XFocusChangeEvent_window" ))
+(defentry XFocusChangeEvent-display (fixnum) ( fixnum 
"XFocusChangeEvent_display" ))
+(defentry set-XFocusChangeEvent-display (fixnum fixnum) ( void 
"set_XFocusChangeEvent_display" ))
+(defentry XFocusChangeEvent-send_event (fixnum) ( fixnum 
"XFocusChangeEvent_send_event" ))
+(defentry set-XFocusChangeEvent-send_event (fixnum fixnum) ( void 
"set_XFocusChangeEvent_send_event" ))
+(defentry XFocusChangeEvent-serial (fixnum) ( fixnum 
"XFocusChangeEvent_serial" ))
+(defentry set-XFocusChangeEvent-serial (fixnum fixnum) ( void 
"set_XFocusChangeEvent_serial" ))
+(defentry XFocusChangeEvent-type (fixnum) ( fixnum "XFocusChangeEvent_type" ))
+(defentry set-XFocusChangeEvent-type (fixnum fixnum) ( void 
"set_XFocusChangeEvent_type" ))
 
 
 ;;;;;; XKeymapEvent funcions ;;;;;;
 
-(defentry make-XKeymapEvent () ( int  "make_XKeymapEvent" ))
-;;(defentry XKeymapEvent-key_vector[32] (int) ( char 
"XKeymapEvent_key_vector[32]" ))
-;;(defentry set-XKeymapEvent-key_vector[32] (int char) ( void 
"set_XKeymapEvent_key_vector[32]" ))
-(defentry XKeymapEvent-window (int) ( int "XKeymapEvent_window" ))
-(defentry set-XKeymapEvent-window (int int) ( void "set_XKeymapEvent_window" ))
-(defentry XKeymapEvent-display (int) ( int "XKeymapEvent_display" ))
-(defentry set-XKeymapEvent-display (int int) ( void "set_XKeymapEvent_display" 
))
-(defentry XKeymapEvent-send_event (int) ( int "XKeymapEvent_send_event" ))
-(defentry set-XKeymapEvent-send_event (int int) ( void 
"set_XKeymapEvent_send_event" ))
-(defentry XKeymapEvent-serial (int) ( int "XKeymapEvent_serial" ))
-(defentry set-XKeymapEvent-serial (int int) ( void "set_XKeymapEvent_serial" ))
-(defentry XKeymapEvent-type (int) ( int "XKeymapEvent_type" ))
-(defentry set-XKeymapEvent-type (int int) ( void "set_XKeymapEvent_type" ))
+(defentry make-XKeymapEvent () ( fixnum  "make_XKeymapEvent" ))
+;;(defentry XKeymapEvent-key_vector[32] (fixnum) ( char 
"XKeymapEvent_key_vector[32]" ))
+;;(defentry set-XKeymapEvent-key_vector[32] (fixnum char) ( void 
"set_XKeymapEvent_key_vector[32]" ))
+(defentry XKeymapEvent-window (fixnum) ( fixnum "XKeymapEvent_window" ))
+(defentry set-XKeymapEvent-window (fixnum fixnum) ( void 
"set_XKeymapEvent_window" ))
+(defentry XKeymapEvent-display (fixnum) ( fixnum "XKeymapEvent_display" ))
+(defentry set-XKeymapEvent-display (fixnum fixnum) ( void 
"set_XKeymapEvent_display" ))
+(defentry XKeymapEvent-send_event (fixnum) ( fixnum "XKeymapEvent_send_event" 
))
+(defentry set-XKeymapEvent-send_event (fixnum fixnum) ( void 
"set_XKeymapEvent_send_event" ))
+(defentry XKeymapEvent-serial (fixnum) ( fixnum "XKeymapEvent_serial" ))
+(defentry set-XKeymapEvent-serial (fixnum fixnum) ( void 
"set_XKeymapEvent_serial" ))
+(defentry XKeymapEvent-type (fixnum) ( fixnum "XKeymapEvent_type" ))
+(defentry set-XKeymapEvent-type (fixnum fixnum) ( void "set_XKeymapEvent_type" 
))
 
 
 ;;;;;; XExposeEvent funcions ;;;;;;
 
-(defentry make-XExposeEvent () ( int  "make_XExposeEvent" ))
-(defentry XExposeEvent-count (int) ( int "XExposeEvent_count" ))
-(defentry set-XExposeEvent-count (int int) ( void "set_XExposeEvent_count" ))
-(defentry XExposeEvent-height (int) ( int "XExposeEvent_height" ))
-(defentry set-XExposeEvent-height (int int) ( void "set_XExposeEvent_height" ))
-(defentry XExposeEvent-width (int) ( int "XExposeEvent_width" ))
-(defentry set-XExposeEvent-width (int int) ( void "set_XExposeEvent_width" ))
-(defentry XExposeEvent-y (int) ( int "XExposeEvent_y" ))
-(defentry set-XExposeEvent-y (int int) ( void "set_XExposeEvent_y" ))
-(defentry XExposeEvent-x (int) ( int "XExposeEvent_x" ))
-(defentry set-XExposeEvent-x (int int) ( void "set_XExposeEvent_x" ))
-(defentry XExposeEvent-window (int) ( int "XExposeEvent_window" ))
-(defentry set-XExposeEvent-window (int int) ( void "set_XExposeEvent_window" ))
-(defentry XExposeEvent-display (int) ( int "XExposeEvent_display" ))
-(defentry set-XExposeEvent-display (int int) ( void "set_XExposeEvent_display" 
))
-(defentry XExposeEvent-send_event (int) ( int "XExposeEvent_send_event" ))
-(defentry set-XExposeEvent-send_event (int int) ( void 
"set_XExposeEvent_send_event" ))
-(defentry XExposeEvent-serial (int) ( int "XExposeEvent_serial" ))
-(defentry set-XExposeEvent-serial (int int) ( void "set_XExposeEvent_serial" ))
-(defentry XExposeEvent-type (int) ( int "XExposeEvent_type" ))
-(defentry set-XExposeEvent-type (int int) ( void "set_XExposeEvent_type" ))
+(defentry make-XExposeEvent () ( fixnum  "make_XExposeEvent" ))
+(defentry XExposeEvent-count (fixnum) ( fixnum "XExposeEvent_count" ))
+(defentry set-XExposeEvent-count (fixnum fixnum) ( void 
"set_XExposeEvent_count" ))
+(defentry XExposeEvent-height (fixnum) ( fixnum "XExposeEvent_height" ))
+(defentry set-XExposeEvent-height (fixnum fixnum) ( void 
"set_XExposeEvent_height" ))
+(defentry XExposeEvent-width (fixnum) ( fixnum "XExposeEvent_width" ))
+(defentry set-XExposeEvent-width (fixnum fixnum) ( void 
"set_XExposeEvent_width" ))
+(defentry XExposeEvent-y (fixnum) ( fixnum "XExposeEvent_y" ))
+(defentry set-XExposeEvent-y (fixnum fixnum) ( void "set_XExposeEvent_y" ))
+(defentry XExposeEvent-x (fixnum) ( fixnum "XExposeEvent_x" ))
+(defentry set-XExposeEvent-x (fixnum fixnum) ( void "set_XExposeEvent_x" ))
+(defentry XExposeEvent-window (fixnum) ( fixnum "XExposeEvent_window" ))
+(defentry set-XExposeEvent-window (fixnum fixnum) ( void 
"set_XExposeEvent_window" ))
+(defentry XExposeEvent-display (fixnum) ( fixnum "XExposeEvent_display" ))
+(defentry set-XExposeEvent-display (fixnum fixnum) ( void 
"set_XExposeEvent_display" ))
+(defentry XExposeEvent-send_event (fixnum) ( fixnum "XExposeEvent_send_event" 
))
+(defentry set-XExposeEvent-send_event (fixnum fixnum) ( void 
"set_XExposeEvent_send_event" ))
+(defentry XExposeEvent-serial (fixnum) ( fixnum "XExposeEvent_serial" ))
+(defentry set-XExposeEvent-serial (fixnum fixnum) ( void 
"set_XExposeEvent_serial" ))
+(defentry XExposeEvent-type (fixnum) ( fixnum "XExposeEvent_type" ))
+(defentry set-XExposeEvent-type (fixnum fixnum) ( void "set_XExposeEvent_type" 
))
 
 
 ;;;;;; XGraphicsExposeEvent funcions ;;;;;;
 
-(defentry make-XGraphicsExposeEvent () ( int  "make_XGraphicsExposeEvent" ))
-(defentry XGraphicsExposeEvent-minor_code (int) ( int 
"XGraphicsExposeEvent_minor_code" ))
-(defentry set-XGraphicsExposeEvent-minor_code (int int) ( void 
"set_XGraphicsExposeEvent_minor_code" ))
-(defentry XGraphicsExposeEvent-major_code (int) ( int 
"XGraphicsExposeEvent_major_code" ))
-(defentry set-XGraphicsExposeEvent-major_code (int int) ( void 
"set_XGraphicsExposeEvent_major_code" ))
-(defentry XGraphicsExposeEvent-count (int) ( int "XGraphicsExposeEvent_count" 
))
-(defentry set-XGraphicsExposeEvent-count (int int) ( void 
"set_XGraphicsExposeEvent_count" ))
-(defentry XGraphicsExposeEvent-height (int) ( int 
"XGraphicsExposeEvent_height" ))
-(defentry set-XGraphicsExposeEvent-height (int int) ( void 
"set_XGraphicsExposeEvent_height" ))
-(defentry XGraphicsExposeEvent-width (int) ( int "XGraphicsExposeEvent_width" 
))
-(defentry set-XGraphicsExposeEvent-width (int int) ( void 
"set_XGraphicsExposeEvent_width" ))
-(defentry XGraphicsExposeEvent-y (int) ( int "XGraphicsExposeEvent_y" ))
-(defentry set-XGraphicsExposeEvent-y (int int) ( void 
"set_XGraphicsExposeEvent_y" ))
-(defentry XGraphicsExposeEvent-x (int) ( int "XGraphicsExposeEvent_x" ))
-(defentry set-XGraphicsExposeEvent-x (int int) ( void 
"set_XGraphicsExposeEvent_x" ))
-(defentry XGraphicsExposeEvent-drawable (int) (int 
"XGraphicsExposeEvent_drawable" ))
-(defentry set-XGraphicsExposeEvent-drawable (int int) ( void 
"set_XGraphicsExposeEvent_drawable" ))
-(defentry XGraphicsExposeEvent-display (int) ( int 
"XGraphicsExposeEvent_display" ))
-(defentry set-XGraphicsExposeEvent-display (int int) ( void 
"set_XGraphicsExposeEvent_display" ))
-(defentry XGraphicsExposeEvent-send_event (int) ( int 
"XGraphicsExposeEvent_send_event" ))
-(defentry set-XGraphicsExposeEvent-send_event (int int) ( void 
"set_XGraphicsExposeEvent_send_event" ))
-(defentry XGraphicsExposeEvent-serial (int) ( int 
"XGraphicsExposeEvent_serial" ))
-(defentry set-XGraphicsExposeEvent-serial (int int) ( void 
"set_XGraphicsExposeEvent_serial" ))
-(defentry XGraphicsExposeEvent-type (int) ( int "XGraphicsExposeEvent_type" ))
-(defentry set-XGraphicsExposeEvent-type (int int) ( void 
"set_XGraphicsExposeEvent_type" ))
+(defentry make-XGraphicsExposeEvent () ( fixnum  "make_XGraphicsExposeEvent" ))
+(defentry XGraphicsExposeEvent-minor_code (fixnum) ( fixnum 
"XGraphicsExposeEvent_minor_code" ))
+(defentry set-XGraphicsExposeEvent-minor_code (fixnum fixnum) ( void 
"set_XGraphicsExposeEvent_minor_code" ))
+(defentry XGraphicsExposeEvent-major_code (fixnum) ( fixnum 
"XGraphicsExposeEvent_major_code" ))
+(defentry set-XGraphicsExposeEvent-major_code (fixnum fixnum) ( void 
"set_XGraphicsExposeEvent_major_code" ))
+(defentry XGraphicsExposeEvent-count (fixnum) ( fixnum 
"XGraphicsExposeEvent_count" ))
+(defentry set-XGraphicsExposeEvent-count (fixnum fixnum) ( void 
"set_XGraphicsExposeEvent_count" ))
+(defentry XGraphicsExposeEvent-height (fixnum) ( fixnum 
"XGraphicsExposeEvent_height" ))
+(defentry set-XGraphicsExposeEvent-height (fixnum fixnum) ( void 
"set_XGraphicsExposeEvent_height" ))
+(defentry XGraphicsExposeEvent-width (fixnum) ( fixnum 
"XGraphicsExposeEvent_width" ))
+(defentry set-XGraphicsExposeEvent-width (fixnum fixnum) ( void 
"set_XGraphicsExposeEvent_width" ))
+(defentry XGraphicsExposeEvent-y (fixnum) ( fixnum "XGraphicsExposeEvent_y" ))
+(defentry set-XGraphicsExposeEvent-y (fixnum fixnum) ( void 
"set_XGraphicsExposeEvent_y" ))
+(defentry XGraphicsExposeEvent-x (fixnum) ( fixnum "XGraphicsExposeEvent_x" ))
+(defentry set-XGraphicsExposeEvent-x (fixnum fixnum) ( void 
"set_XGraphicsExposeEvent_x" ))
+(defentry XGraphicsExposeEvent-drawable (fixnum) (fixnum 
"XGraphicsExposeEvent_drawable" ))
+(defentry set-XGraphicsExposeEvent-drawable (fixnum fixnum) ( void 
"set_XGraphicsExposeEvent_drawable" ))
+(defentry XGraphicsExposeEvent-display (fixnum) ( fixnum 
"XGraphicsExposeEvent_display" ))
+(defentry set-XGraphicsExposeEvent-display (fixnum fixnum) ( void 
"set_XGraphicsExposeEvent_display" ))
+(defentry XGraphicsExposeEvent-send_event (fixnum) ( fixnum 
"XGraphicsExposeEvent_send_event" ))
+(defentry set-XGraphicsExposeEvent-send_event (fixnum fixnum) ( void 
"set_XGraphicsExposeEvent_send_event" ))
+(defentry XGraphicsExposeEvent-serial (fixnum) ( fixnum 
"XGraphicsExposeEvent_serial" ))
+(defentry set-XGraphicsExposeEvent-serial (fixnum fixnum) ( void 
"set_XGraphicsExposeEvent_serial" ))
+(defentry XGraphicsExposeEvent-type (fixnum) ( fixnum 
"XGraphicsExposeEvent_type" ))
+(defentry set-XGraphicsExposeEvent-type (fixnum fixnum) ( void 
"set_XGraphicsExposeEvent_type" ))
 
 
 ;;;;;; XNoExposeEvent funcions ;;;;;;
 
-(defentry make-XNoExposeEvent () ( int  "make_XNoExposeEvent" ))
-(defentry XNoExposeEvent-minor_code (int) ( int "XNoExposeEvent_minor_code" ))
-(defentry set-XNoExposeEvent-minor_code (int int) ( void 
"set_XNoExposeEvent_minor_code" ))
-(defentry XNoExposeEvent-major_code (int) ( int "XNoExposeEvent_major_code" ))
-(defentry set-XNoExposeEvent-major_code (int int) ( void 
"set_XNoExposeEvent_major_code" ))
-(defentry XNoExposeEvent-drawable (int) ( int "XNoExposeEvent_drawable" ))
-(defentry set-XNoExposeEvent-drawable (int int) ( void 
"set_XNoExposeEvent_drawable" ))
-(defentry XNoExposeEvent-display (int) ( int "XNoExposeEvent_display" ))
-(defentry set-XNoExposeEvent-display (int int) ( void 
"set_XNoExposeEvent_display" ))
-(defentry XNoExposeEvent-send_event (int) ( int "XNoExposeEvent_send_event" ))
-(defentry set-XNoExposeEvent-send_event (int int) ( void 
"set_XNoExposeEvent_send_event" ))
-(defentry XNoExposeEvent-serial (int) ( int "XNoExposeEvent_serial" ))
-(defentry set-XNoExposeEvent-serial (int int) ( void 
"set_XNoExposeEvent_serial" ))
-(defentry XNoExposeEvent-type (int) ( int "XNoExposeEvent_type" ))
-(defentry set-XNoExposeEvent-type (int int) ( void "set_XNoExposeEvent_type" ))
+(defentry make-XNoExposeEvent () ( fixnum  "make_XNoExposeEvent" ))
+(defentry XNoExposeEvent-minor_code (fixnum) ( fixnum 
"XNoExposeEvent_minor_code" ))
+(defentry set-XNoExposeEvent-minor_code (fixnum fixnum) ( void 
"set_XNoExposeEvent_minor_code" ))
+(defentry XNoExposeEvent-major_code (fixnum) ( fixnum 
"XNoExposeEvent_major_code" ))
+(defentry set-XNoExposeEvent-major_code (fixnum fixnum) ( void 
"set_XNoExposeEvent_major_code" ))
+(defentry XNoExposeEvent-drawable (fixnum) ( fixnum "XNoExposeEvent_drawable" 
))
+(defentry set-XNoExposeEvent-drawable (fixnum fixnum) ( void 
"set_XNoExposeEvent_drawable" ))
+(defentry XNoExposeEvent-display (fixnum) ( fixnum "XNoExposeEvent_display" ))
+(defentry set-XNoExposeEvent-display (fixnum fixnum) ( void 
"set_XNoExposeEvent_display" ))
+(defentry XNoExposeEvent-send_event (fixnum) ( fixnum 
"XNoExposeEvent_send_event" ))
+(defentry set-XNoExposeEvent-send_event (fixnum fixnum) ( void 
"set_XNoExposeEvent_send_event" ))
+(defentry XNoExposeEvent-serial (fixnum) ( fixnum "XNoExposeEvent_serial" ))
+(defentry set-XNoExposeEvent-serial (fixnum fixnum) ( void 
"set_XNoExposeEvent_serial" ))
+(defentry XNoExposeEvent-type (fixnum) ( fixnum "XNoExposeEvent_type" ))
+(defentry set-XNoExposeEvent-type (fixnum fixnum) ( void 
"set_XNoExposeEvent_type" ))
 
 
 ;;;;;; XVisibilityEvent funcions ;;;;;;
 
-(defentry make-XVisibilityEvent () ( int  "make_XVisibilityEvent" ))
-(defentry XVisibilityEvent-state (int) ( int "XVisibilityEvent_state" ))
-(defentry set-XVisibilityEvent-state (int int) ( void 
"set_XVisibilityEvent_state" ))
-(defentry XVisibilityEvent-window (int) ( int "XVisibilityEvent_window" ))
-(defentry set-XVisibilityEvent-window (int int) ( void 
"set_XVisibilityEvent_window" ))
-(defentry XVisibilityEvent-display (int) ( int "XVisibilityEvent_display" ))
-(defentry set-XVisibilityEvent-display (int int) ( void 
"set_XVisibilityEvent_display" ))
-(defentry XVisibilityEvent-send_event (int) ( int 
"XVisibilityEvent_send_event" ))
-(defentry set-XVisibilityEvent-send_event (int int) ( void 
"set_XVisibilityEvent_send_event" ))
-(defentry XVisibilityEvent-serial (int) ( int "XVisibilityEvent_serial" ))
-(defentry set-XVisibilityEvent-serial (int int) ( void 
"set_XVisibilityEvent_serial" ))
-(defentry XVisibilityEvent-type (int) ( int "XVisibilityEvent_type" ))
-(defentry set-XVisibilityEvent-type (int int) ( void 
"set_XVisibilityEvent_type" ))
+(defentry make-XVisibilityEvent () ( fixnum  "make_XVisibilityEvent" ))
+(defentry XVisibilityEvent-state (fixnum) ( fixnum "XVisibilityEvent_state" ))
+(defentry set-XVisibilityEvent-state (fixnum fixnum) ( void 
"set_XVisibilityEvent_state" ))
+(defentry XVisibilityEvent-window (fixnum) ( fixnum "XVisibilityEvent_window" 
))
+(defentry set-XVisibilityEvent-window (fixnum fixnum) ( void 
"set_XVisibilityEvent_window" ))
+(defentry XVisibilityEvent-display (fixnum) ( fixnum 
"XVisibilityEvent_display" ))
+(defentry set-XVisibilityEvent-display (fixnum fixnum) ( void 
"set_XVisibilityEvent_display" ))
+(defentry XVisibilityEvent-send_event (fixnum) ( fixnum 
"XVisibilityEvent_send_event" ))
+(defentry set-XVisibilityEvent-send_event (fixnum fixnum) ( void 
"set_XVisibilityEvent_send_event" ))
+(defentry XVisibilityEvent-serial (fixnum) ( fixnum "XVisibilityEvent_serial" 
))
+(defentry set-XVisibilityEvent-serial (fixnum fixnum) ( void 
"set_XVisibilityEvent_serial" ))
+(defentry XVisibilityEvent-type (fixnum) ( fixnum "XVisibilityEvent_type" ))
+(defentry set-XVisibilityEvent-type (fixnum fixnum) ( void 
"set_XVisibilityEvent_type" ))
 
 
 ;;;;;; XCreateWindowEvent funcions ;;;;;;
 
-(defentry make-XCreateWindowEvent () ( int  "make_XCreateWindowEvent" ))
-(defentry XCreateWindowEvent-override_redirect (int) ( int 
"XCreateWindowEvent_override_redirect" ))
-(defentry set-XCreateWindowEvent-override_redirect (int int) ( void 
"set_XCreateWindowEvent_override_redirect" ))
-(defentry XCreateWindowEvent-border_width (int) ( int 
"XCreateWindowEvent_border_width" ))
-(defentry set-XCreateWindowEvent-border_width (int int) ( void 
"set_XCreateWindowEvent_border_width" ))
-(defentry XCreateWindowEvent-height (int) ( int "XCreateWindowEvent_height" ))
-(defentry set-XCreateWindowEvent-height (int int) ( void 
"set_XCreateWindowEvent_height" ))
-(defentry XCreateWindowEvent-width (int) ( int "XCreateWindowEvent_width" ))
-(defentry set-XCreateWindowEvent-width (int int) ( void 
"set_XCreateWindowEvent_width" ))
-(defentry XCreateWindowEvent-y (int) ( int "XCreateWindowEvent_y" ))
-(defentry set-XCreateWindowEvent-y (int int) ( void "set_XCreateWindowEvent_y" 
))
-(defentry XCreateWindowEvent-x (int) ( int "XCreateWindowEvent_x" ))
-(defentry set-XCreateWindowEvent-x (int int) ( void "set_XCreateWindowEvent_x" 
))
-(defentry XCreateWindowEvent-window (int) ( int "XCreateWindowEvent_window" ))
-(defentry set-XCreateWindowEvent-window (int int) ( void 
"set_XCreateWindowEvent_window" ))
-(defentry XCreateWindowEvent-parent (int) ( int "XCreateWindowEvent_parent" ))
-(defentry set-XCreateWindowEvent-parent (int int) ( void 
"set_XCreateWindowEvent_parent" ))
-(defentry XCreateWindowEvent-display (int) ( int "XCreateWindowEvent_display" 
))
-(defentry set-XCreateWindowEvent-display (int int) ( void 
"set_XCreateWindowEvent_display" ))
-(defentry XCreateWindowEvent-send_event (int) ( int 
"XCreateWindowEvent_send_event" ))
-(defentry set-XCreateWindowEvent-send_event (int int) ( void 
"set_XCreateWindowEvent_send_event" ))
-(defentry XCreateWindowEvent-serial (int) ( int "XCreateWindowEvent_serial" ))
-(defentry set-XCreateWindowEvent-serial (int int) ( void 
"set_XCreateWindowEvent_serial" ))
-(defentry XCreateWindowEvent-type (int) ( int "XCreateWindowEvent_type" ))
-(defentry set-XCreateWindowEvent-type (int int) ( void 
"set_XCreateWindowEvent_type" ))
+(defentry make-XCreateWindowEvent () ( fixnum  "make_XCreateWindowEvent" ))
+(defentry XCreateWindowEvent-override_redirect (fixnum) ( fixnum 
"XCreateWindowEvent_override_redirect" ))
+(defentry set-XCreateWindowEvent-override_redirect (fixnum fixnum) ( void 
"set_XCreateWindowEvent_override_redirect" ))
+(defentry XCreateWindowEvent-border_width (fixnum) ( fixnum 
"XCreateWindowEvent_border_width" ))
+(defentry set-XCreateWindowEvent-border_width (fixnum fixnum) ( void 
"set_XCreateWindowEvent_border_width" ))
+(defentry XCreateWindowEvent-height (fixnum) ( fixnum 
"XCreateWindowEvent_height" ))
+(defentry set-XCreateWindowEvent-height (fixnum fixnum) ( void 
"set_XCreateWindowEvent_height" ))
+(defentry XCreateWindowEvent-width (fixnum) ( fixnum 
"XCreateWindowEvent_width" ))
+(defentry set-XCreateWindowEvent-width (fixnum fixnum) ( void 
"set_XCreateWindowEvent_width" ))
+(defentry XCreateWindowEvent-y (fixnum) ( fixnum "XCreateWindowEvent_y" ))
+(defentry set-XCreateWindowEvent-y (fixnum fixnum) ( void 
"set_XCreateWindowEvent_y" ))
+(defentry XCreateWindowEvent-x (fixnum) ( fixnum "XCreateWindowEvent_x" ))
+(defentry set-XCreateWindowEvent-x (fixnum fixnum) ( void 
"set_XCreateWindowEvent_x" ))
+(defentry XCreateWindowEvent-window (fixnum) ( fixnum 
"XCreateWindowEvent_window" ))
+(defentry set-XCreateWindowEvent-window (fixnum fixnum) ( void 
"set_XCreateWindowEvent_window" ))
+(defentry XCreateWindowEvent-parent (fixnum) ( fixnum 
"XCreateWindowEvent_parent" ))
+(defentry set-XCreateWindowEvent-parent (fixnum fixnum) ( void 
"set_XCreateWindowEvent_parent" ))
+(defentry XCreateWindowEvent-display (fixnum) ( fixnum 
"XCreateWindowEvent_display" ))
+(defentry set-XCreateWindowEvent-display (fixnum fixnum) ( void 
"set_XCreateWindowEvent_display" ))
+(defentry XCreateWindowEvent-send_event (fixnum) ( fixnum 
"XCreateWindowEvent_send_event" ))
+(defentry set-XCreateWindowEvent-send_event (fixnum fixnum) ( void 
"set_XCreateWindowEvent_send_event" ))
+(defentry XCreateWindowEvent-serial (fixnum) ( fixnum 
"XCreateWindowEvent_serial" ))
+(defentry set-XCreateWindowEvent-serial (fixnum fixnum) ( void 
"set_XCreateWindowEvent_serial" ))
+(defentry XCreateWindowEvent-type (fixnum) ( fixnum "XCreateWindowEvent_type" 
))
+(defentry set-XCreateWindowEvent-type (fixnum fixnum) ( void 
"set_XCreateWindowEvent_type" ))
 
 
 ;;;;;; XDestroyWindowEvent funcions ;;;;;;
 
-(defentry make-XDestroyWindowEvent () ( int  "make_XDestroyWindowEvent" ))
-(defentry XDestroyWindowEvent-window (int) ( int "XDestroyWindowEvent_window" 
))
-(defentry set-XDestroyWindowEvent-window (int int) ( void 
"set_XDestroyWindowEvent_window" ))
-(defentry XDestroyWindowEvent-event (int) ( int "XDestroyWindowEvent_event" ))
-(defentry set-XDestroyWindowEvent-event (int int) ( void 
"set_XDestroyWindowEvent_event" ))
-(defentry XDestroyWindowEvent-display (int) ( int 
"XDestroyWindowEvent_display" ))
-(defentry set-XDestroyWindowEvent-display (int int) ( void 
"set_XDestroyWindowEvent_display" ))
-(defentry XDestroyWindowEvent-send_event (int) ( int 
"XDestroyWindowEvent_send_event" ))
-(defentry set-XDestroyWindowEvent-send_event (int int) ( void 
"set_XDestroyWindowEvent_send_event" ))
-(defentry XDestroyWindowEvent-serial (int) ( int "XDestroyWindowEvent_serial" 
))
-(defentry set-XDestroyWindowEvent-serial (int int) ( void 
"set_XDestroyWindowEvent_serial" ))
-(defentry XDestroyWindowEvent-type (int) ( int "XDestroyWindowEvent_type" ))
-(defentry set-XDestroyWindowEvent-type (int int) ( void 
"set_XDestroyWindowEvent_type" ))
+(defentry make-XDestroyWindowEvent () ( fixnum  "make_XDestroyWindowEvent" ))
+(defentry XDestroyWindowEvent-window (fixnum) ( fixnum 
"XDestroyWindowEvent_window" ))
+(defentry set-XDestroyWindowEvent-window (fixnum fixnum) ( void 
"set_XDestroyWindowEvent_window" ))
+(defentry XDestroyWindowEvent-event (fixnum) ( fixnum 
"XDestroyWindowEvent_event" ))
+(defentry set-XDestroyWindowEvent-event (fixnum fixnum) ( void 
"set_XDestroyWindowEvent_event" ))
+(defentry XDestroyWindowEvent-display (fixnum) ( fixnum 
"XDestroyWindowEvent_display" ))
+(defentry set-XDestroyWindowEvent-display (fixnum fixnum) ( void 
"set_XDestroyWindowEvent_display" ))
+(defentry XDestroyWindowEvent-send_event (fixnum) ( fixnum 
"XDestroyWindowEvent_send_event" ))
+(defentry set-XDestroyWindowEvent-send_event (fixnum fixnum) ( void 
"set_XDestroyWindowEvent_send_event" ))
+(defentry XDestroyWindowEvent-serial (fixnum) ( fixnum 
"XDestroyWindowEvent_serial" ))
+(defentry set-XDestroyWindowEvent-serial (fixnum fixnum) ( void 
"set_XDestroyWindowEvent_serial" ))
+(defentry XDestroyWindowEvent-type (fixnum) ( fixnum 
"XDestroyWindowEvent_type" ))
+(defentry set-XDestroyWindowEvent-type (fixnum fixnum) ( void 
"set_XDestroyWindowEvent_type" ))
 
 
 ;;;;;; XUnmapEvent funcions ;;;;;;
 
-(defentry make-XUnmapEvent () ( int  "make_XUnmapEvent" ))
-(defentry XUnmapEvent-from_configure (int) ( int "XUnmapEvent_from_configure" 
))
-(defentry set-XUnmapEvent-from_configure (int int) ( void 
"set_XUnmapEvent_from_configure" ))
-(defentry XUnmapEvent-window (int) ( int "XUnmapEvent_window" ))
-(defentry set-XUnmapEvent-window (int int) ( void "set_XUnmapEvent_window" ))
-(defentry XUnmapEvent-event (int) ( int "XUnmapEvent_event" ))
-(defentry set-XUnmapEvent-event (int int) ( void "set_XUnmapEvent_event" ))
-(defentry XUnmapEvent-display (int) ( int "XUnmapEvent_display" ))
-(defentry set-XUnmapEvent-display (int int) ( void "set_XUnmapEvent_display" ))
-(defentry XUnmapEvent-send_event (int) ( int "XUnmapEvent_send_event" ))
-(defentry set-XUnmapEvent-send_event (int int) ( void 
"set_XUnmapEvent_send_event" ))
-(defentry XUnmapEvent-serial (int) ( int "XUnmapEvent_serial" ))
-(defentry set-XUnmapEvent-serial (int int) ( void "set_XUnmapEvent_serial" ))
-(defentry XUnmapEvent-type (int) ( int "XUnmapEvent_type" ))
-(defentry set-XUnmapEvent-type (int int) ( void "set_XUnmapEvent_type" ))
+(defentry make-XUnmapEvent () ( fixnum  "make_XUnmapEvent" ))
+(defentry XUnmapEvent-from_configure (fixnum) ( fixnum 
"XUnmapEvent_from_configure" ))
+(defentry set-XUnmapEvent-from_configure (fixnum fixnum) ( void 
"set_XUnmapEvent_from_configure" ))
+(defentry XUnmapEvent-window (fixnum) ( fixnum "XUnmapEvent_window" ))
+(defentry set-XUnmapEvent-window (fixnum fixnum) ( void 
"set_XUnmapEvent_window" ))
+(defentry XUnmapEvent-event (fixnum) ( fixnum "XUnmapEvent_event" ))
+(defentry set-XUnmapEvent-event (fixnum fixnum) ( void "set_XUnmapEvent_event" 
))
+(defentry XUnmapEvent-display (fixnum) ( fixnum "XUnmapEvent_display" ))
+(defentry set-XUnmapEvent-display (fixnum fixnum) ( void 
"set_XUnmapEvent_display" ))
+(defentry XUnmapEvent-send_event (fixnum) ( fixnum "XUnmapEvent_send_event" ))
+(defentry set-XUnmapEvent-send_event (fixnum fixnum) ( void 
"set_XUnmapEvent_send_event" ))
+(defentry XUnmapEvent-serial (fixnum) ( fixnum "XUnmapEvent_serial" ))
+(defentry set-XUnmapEvent-serial (fixnum fixnum) ( void 
"set_XUnmapEvent_serial" ))
+(defentry XUnmapEvent-type (fixnum) ( fixnum "XUnmapEvent_type" ))
+(defentry set-XUnmapEvent-type (fixnum fixnum) ( void "set_XUnmapEvent_type" ))
 
 
 ;;;;;; XMapEvent funcions ;;;;;;
 
-(defentry make-XMapEvent () ( int  "make_XMapEvent" ))
-(defentry XMapEvent-override_redirect (int) ( int 
"XMapEvent_override_redirect" ))
-(defentry set-XMapEvent-override_redirect (int int) ( void 
"set_XMapEvent_override_redirect" ))
-(defentry XMapEvent-window (int) ( int "XMapEvent_window" ))
-(defentry set-XMapEvent-window (int int) ( void "set_XMapEvent_window" ))
-(defentry XMapEvent-event (int) ( int "XMapEvent_event" ))
-(defentry set-XMapEvent-event (int int) ( void "set_XMapEvent_event" ))
-(defentry XMapEvent-display (int) ( int "XMapEvent_display" ))
-(defentry set-XMapEvent-display (int int) ( void "set_XMapEvent_display" ))
-(defentry XMapEvent-send_event (int) ( int "XMapEvent_send_event" ))
-(defentry set-XMapEvent-send_event (int int) ( void "set_XMapEvent_send_event" 
))
-(defentry XMapEvent-serial (int) ( int "XMapEvent_serial" ))
-(defentry set-XMapEvent-serial (int int) ( void "set_XMapEvent_serial" ))
-(defentry XMapEvent-type (int) ( int "XMapEvent_type" ))
-(defentry set-XMapEvent-type (int int) ( void "set_XMapEvent_type" ))
+(defentry make-XMapEvent () ( fixnum  "make_XMapEvent" ))
+(defentry XMapEvent-override_redirect (fixnum) ( fixnum 
"XMapEvent_override_redirect" ))
+(defentry set-XMapEvent-override_redirect (fixnum fixnum) ( void 
"set_XMapEvent_override_redirect" ))
+(defentry XMapEvent-window (fixnum) ( fixnum "XMapEvent_window" ))
+(defentry set-XMapEvent-window (fixnum fixnum) ( void "set_XMapEvent_window" ))
+(defentry XMapEvent-event (fixnum) ( fixnum "XMapEvent_event" ))
+(defentry set-XMapEvent-event (fixnum fixnum) ( void "set_XMapEvent_event" ))
+(defentry XMapEvent-display (fixnum) ( fixnum "XMapEvent_display" ))
+(defentry set-XMapEvent-display (fixnum fixnum) ( void "set_XMapEvent_display" 
))
+(defentry XMapEvent-send_event (fixnum) ( fixnum "XMapEvent_send_event" ))
+(defentry set-XMapEvent-send_event (fixnum fixnum) ( void 
"set_XMapEvent_send_event" ))
+(defentry XMapEvent-serial (fixnum) ( fixnum "XMapEvent_serial" ))
+(defentry set-XMapEvent-serial (fixnum fixnum) ( void "set_XMapEvent_serial" ))
+(defentry XMapEvent-type (fixnum) ( fixnum "XMapEvent_type" ))
+(defentry set-XMapEvent-type (fixnum fixnum) ( void "set_XMapEvent_type" ))
 
 
 ;;;;;; XMapRequestEvent funcions ;;;;;;
 
-(defentry make-XMapRequestEvent () ( int  "make_XMapRequestEvent" ))
-(defentry XMapRequestEvent-window (int) ( int "XMapRequestEvent_window" ))
-(defentry set-XMapRequestEvent-window (int int) ( void 
"set_XMapRequestEvent_window" ))
-(defentry XMapRequestEvent-parent (int) ( int "XMapRequestEvent_parent" ))
-(defentry set-XMapRequestEvent-parent (int int) ( void 
"set_XMapRequestEvent_parent" ))
-(defentry XMapRequestEvent-display (int) ( int "XMapRequestEvent_display" ))
-(defentry set-XMapRequestEvent-display (int int) ( void 
"set_XMapRequestEvent_display" ))
-(defentry XMapRequestEvent-send_event (int) ( int 
"XMapRequestEvent_send_event" ))
-(defentry set-XMapRequestEvent-send_event (int int) ( void 
"set_XMapRequestEvent_send_event" ))
-(defentry XMapRequestEvent-serial (int) ( int "XMapRequestEvent_serial" ))
-(defentry set-XMapRequestEvent-serial (int int) ( void 
"set_XMapRequestEvent_serial" ))
-(defentry XMapRequestEvent-type (int) ( int "XMapRequestEvent_type" ))
-(defentry set-XMapRequestEvent-type (int int) ( void 
"set_XMapRequestEvent_type" ))
+(defentry make-XMapRequestEvent () ( fixnum  "make_XMapRequestEvent" ))
+(defentry XMapRequestEvent-window (fixnum) ( fixnum "XMapRequestEvent_window" 
))
+(defentry set-XMapRequestEvent-window (fixnum fixnum) ( void 
"set_XMapRequestEvent_window" ))
+(defentry XMapRequestEvent-parent (fixnum) ( fixnum "XMapRequestEvent_parent" 
))
+(defentry set-XMapRequestEvent-parent (fixnum fixnum) ( void 
"set_XMapRequestEvent_parent" ))
+(defentry XMapRequestEvent-display (fixnum) ( fixnum 
"XMapRequestEvent_display" ))
+(defentry set-XMapRequestEvent-display (fixnum fixnum) ( void 
"set_XMapRequestEvent_display" ))
+(defentry XMapRequestEvent-send_event (fixnum) ( fixnum 
"XMapRequestEvent_send_event" ))
+(defentry set-XMapRequestEvent-send_event (fixnum fixnum) ( void 
"set_XMapRequestEvent_send_event" ))
+(defentry XMapRequestEvent-serial (fixnum) ( fixnum "XMapRequestEvent_serial" 
))
+(defentry set-XMapRequestEvent-serial (fixnum fixnum) ( void 
"set_XMapRequestEvent_serial" ))
+(defentry XMapRequestEvent-type (fixnum) ( fixnum "XMapRequestEvent_type" ))
+(defentry set-XMapRequestEvent-type (fixnum fixnum) ( void 
"set_XMapRequestEvent_type" ))
 
 
 ;;;;;; XReparentEvent funcions ;;;;;;
 
-(defentry make-XReparentEvent () ( int  "make_XReparentEvent" ))
-(defentry XReparentEvent-override_redirect (int) ( int 
"XReparentEvent_override_redirect" ))
-(defentry set-XReparentEvent-override_redirect (int int) ( void 
"set_XReparentEvent_override_redirect" ))
-(defentry XReparentEvent-y (int) ( int "XReparentEvent_y" ))
-(defentry set-XReparentEvent-y (int int) ( void "set_XReparentEvent_y" ))
-(defentry XReparentEvent-x (int) ( int "XReparentEvent_x" ))
-(defentry set-XReparentEvent-x (int int) ( void "set_XReparentEvent_x" ))
-(defentry XReparentEvent-parent (int) ( int "XReparentEvent_parent" ))
-(defentry set-XReparentEvent-parent (int int) ( void 
"set_XReparentEvent_parent" ))
-(defentry XReparentEvent-window (int) ( int "XReparentEvent_window" ))
-(defentry set-XReparentEvent-window (int int) ( void 
"set_XReparentEvent_window" ))
-(defentry XReparentEvent-event (int) ( int "XReparentEvent_event" ))
-(defentry set-XReparentEvent-event (int int) ( void "set_XReparentEvent_event" 
))
-(defentry XReparentEvent-display (int) ( int "XReparentEvent_display" ))
-(defentry set-XReparentEvent-display (int int) ( void 
"set_XReparentEvent_display" ))
-(defentry XReparentEvent-send_event (int) ( int "XReparentEvent_send_event" ))
-(defentry set-XReparentEvent-send_event (int int) ( void 
"set_XReparentEvent_send_event" ))
-(defentry XReparentEvent-serial (int) ( int "XReparentEvent_serial" ))
-(defentry set-XReparentEvent-serial (int int) ( void 
"set_XReparentEvent_serial" ))
-(defentry XReparentEvent-type (int) ( int "XReparentEvent_type" ))
-(defentry set-XReparentEvent-type (int int) ( void "set_XReparentEvent_type" ))
+(defentry make-XReparentEvent () ( fixnum  "make_XReparentEvent" ))
+(defentry XReparentEvent-override_redirect (fixnum) ( fixnum 
"XReparentEvent_override_redirect" ))
+(defentry set-XReparentEvent-override_redirect (fixnum fixnum) ( void 
"set_XReparentEvent_override_redirect" ))
+(defentry XReparentEvent-y (fixnum) ( fixnum "XReparentEvent_y" ))
+(defentry set-XReparentEvent-y (fixnum fixnum) ( void "set_XReparentEvent_y" ))
+(defentry XReparentEvent-x (fixnum) ( fixnum "XReparentEvent_x" ))
+(defentry set-XReparentEvent-x (fixnum fixnum) ( void "set_XReparentEvent_x" ))
+(defentry XReparentEvent-parent (fixnum) ( fixnum "XReparentEvent_parent" ))
+(defentry set-XReparentEvent-parent (fixnum fixnum) ( void 
"set_XReparentEvent_parent" ))
+(defentry XReparentEvent-window (fixnum) ( fixnum "XReparentEvent_window" ))
+(defentry set-XReparentEvent-window (fixnum fixnum) ( void 
"set_XReparentEvent_window" ))
+(defentry XReparentEvent-event (fixnum) ( fixnum "XReparentEvent_event" ))
+(defentry set-XReparentEvent-event (fixnum fixnum) ( void 
"set_XReparentEvent_event" ))
+(defentry XReparentEvent-display (fixnum) ( fixnum "XReparentEvent_display" ))
+(defentry set-XReparentEvent-display (fixnum fixnum) ( void 
"set_XReparentEvent_display" ))
+(defentry XReparentEvent-send_event (fixnum) ( fixnum 
"XReparentEvent_send_event" ))
+(defentry set-XReparentEvent-send_event (fixnum fixnum) ( void 
"set_XReparentEvent_send_event" ))
+(defentry XReparentEvent-serial (fixnum) ( fixnum "XReparentEvent_serial" ))
+(defentry set-XReparentEvent-serial (fixnum fixnum) ( void 
"set_XReparentEvent_serial" ))
+(defentry XReparentEvent-type (fixnum) ( fixnum "XReparentEvent_type" ))
+(defentry set-XReparentEvent-type (fixnum fixnum) ( void 
"set_XReparentEvent_type" ))
 
 
 ;;;;;; XConfigureEvent funcions ;;;;;;
 
-(defentry make-XConfigureEvent () ( int  "make_XConfigureEvent" ))
-(defentry XConfigureEvent-override_redirect (int) ( int 
"XConfigureEvent_override_redirect" ))
-(defentry set-XConfigureEvent-override_redirect (int int) ( void 
"set_XConfigureEvent_override_redirect" ))
-(defentry XConfigureEvent-above (int) ( int "XConfigureEvent_above" ))
-(defentry set-XConfigureEvent-above (int int) ( void 
"set_XConfigureEvent_above" ))
-(defentry XConfigureEvent-border_width (int) ( int 
"XConfigureEvent_border_width" ))
-(defentry set-XConfigureEvent-border_width (int int) ( void 
"set_XConfigureEvent_border_width" ))
-(defentry XConfigureEvent-height (int) ( int "XConfigureEvent_height" ))
-(defentry set-XConfigureEvent-height (int int) ( void 
"set_XConfigureEvent_height" ))
-(defentry XConfigureEvent-width (int) ( int "XConfigureEvent_width" ))
-(defentry set-XConfigureEvent-width (int int) ( void 
"set_XConfigureEvent_width" ))
-(defentry XConfigureEvent-y (int) ( int "XConfigureEvent_y" ))
-(defentry set-XConfigureEvent-y (int int) ( void "set_XConfigureEvent_y" ))
-(defentry XConfigureEvent-x (int) ( int "XConfigureEvent_x" ))
-(defentry set-XConfigureEvent-x (int int) ( void "set_XConfigureEvent_x" ))
-(defentry XConfigureEvent-window (int) ( int "XConfigureEvent_window" ))
-(defentry set-XConfigureEvent-window (int int) ( void 
"set_XConfigureEvent_window" ))
-(defentry XConfigureEvent-event (int) ( int "XConfigureEvent_event" ))
-(defentry set-XConfigureEvent-event (int int) ( void 
"set_XConfigureEvent_event" ))
-(defentry XConfigureEvent-display (int) ( int "XConfigureEvent_display" ))
-(defentry set-XConfigureEvent-display (int int) ( void 
"set_XConfigureEvent_display" ))
-(defentry XConfigureEvent-send_event (int) ( int "XConfigureEvent_send_event" 
))
-(defentry set-XConfigureEvent-send_event (int int) ( void 
"set_XConfigureEvent_send_event" ))
-(defentry XConfigureEvent-serial (int) ( int "XConfigureEvent_serial" ))
-(defentry set-XConfigureEvent-serial (int int) ( void 
"set_XConfigureEvent_serial" ))
-(defentry XConfigureEvent-type (int) ( int "XConfigureEvent_type" ))
-(defentry set-XConfigureEvent-type (int int) ( void "set_XConfigureEvent_type" 
))
+(defentry make-XConfigureEvent () ( fixnum  "make_XConfigureEvent" ))
+(defentry XConfigureEvent-override_redirect (fixnum) ( fixnum 
"XConfigureEvent_override_redirect" ))
+(defentry set-XConfigureEvent-override_redirect (fixnum fixnum) ( void 
"set_XConfigureEvent_override_redirect" ))
+(defentry XConfigureEvent-above (fixnum) ( fixnum "XConfigureEvent_above" ))
+(defentry set-XConfigureEvent-above (fixnum fixnum) ( void 
"set_XConfigureEvent_above" ))
+(defentry XConfigureEvent-border_width (fixnum) ( fixnum 
"XConfigureEvent_border_width" ))
+(defentry set-XConfigureEvent-border_width (fixnum fixnum) ( void 
"set_XConfigureEvent_border_width" ))
+(defentry XConfigureEvent-height (fixnum) ( fixnum "XConfigureEvent_height" ))
+(defentry set-XConfigureEvent-height (fixnum fixnum) ( void 
"set_XConfigureEvent_height" ))
+(defentry XConfigureEvent-width (fixnum) ( fixnum "XConfigureEvent_width" ))
+(defentry set-XConfigureEvent-width (fixnum fixnum) ( void 
"set_XConfigureEvent_width" ))
+(defentry XConfigureEvent-y (fixnum) ( fixnum "XConfigureEvent_y" ))
+(defentry set-XConfigureEvent-y (fixnum fixnum) ( void "set_XConfigureEvent_y" 
))
+(defentry XConfigureEvent-x (fixnum) ( fixnum "XConfigureEvent_x" ))
+(defentry set-XConfigureEvent-x (fixnum fixnum) ( void "set_XConfigureEvent_x" 
))
+(defentry XConfigureEvent-window (fixnum) ( fixnum "XConfigureEvent_window" ))
+(defentry set-XConfigureEvent-window (fixnum fixnum) ( void 
"set_XConfigureEvent_window" ))
+(defentry XConfigureEvent-event (fixnum) ( fixnum "XConfigureEvent_event" ))
+(defentry set-XConfigureEvent-event (fixnum fixnum) ( void 
"set_XConfigureEvent_event" ))
+(defentry XConfigureEvent-display (fixnum) ( fixnum "XConfigureEvent_display" 
))
+(defentry set-XConfigureEvent-display (fixnum fixnum) ( void 
"set_XConfigureEvent_display" ))
+(defentry XConfigureEvent-send_event (fixnum) ( fixnum 
"XConfigureEvent_send_event" ))
+(defentry set-XConfigureEvent-send_event (fixnum fixnum) ( void 
"set_XConfigureEvent_send_event" ))
+(defentry XConfigureEvent-serial (fixnum) ( fixnum "XConfigureEvent_serial" ))
+(defentry set-XConfigureEvent-serial (fixnum fixnum) ( void 
"set_XConfigureEvent_serial" ))
+(defentry XConfigureEvent-type (fixnum) ( fixnum "XConfigureEvent_type" ))
+(defentry set-XConfigureEvent-type (fixnum fixnum) ( void 
"set_XConfigureEvent_type" ))
 
 
 ;;;;;; XGravityEvent funcions ;;;;;;
 
-(defentry make-XGravityEvent () ( int  "make_XGravityEvent" ))
-(defentry XGravityEvent-y (int) ( int "XGravityEvent_y" ))
-(defentry set-XGravityEvent-y (int int) ( void "set_XGravityEvent_y" ))
-(defentry XGravityEvent-x (int) ( int "XGravityEvent_x" ))
-(defentry set-XGravityEvent-x (int int) ( void "set_XGravityEvent_x" ))
-(defentry XGravityEvent-window (int) ( int "XGravityEvent_window" ))
-(defentry set-XGravityEvent-window (int int) ( void "set_XGravityEvent_window" 
))
-(defentry XGravityEvent-event (int) ( int "XGravityEvent_event" ))
-(defentry set-XGravityEvent-event (int int) ( void "set_XGravityEvent_event" ))
-(defentry XGravityEvent-display (int) ( int "XGravityEvent_display" ))
-(defentry set-XGravityEvent-display (int int) ( void 
"set_XGravityEvent_display" ))
-(defentry XGravityEvent-send_event (int) ( int "XGravityEvent_send_event" ))
-(defentry set-XGravityEvent-send_event (int int) ( void 
"set_XGravityEvent_send_event" ))
-(defentry XGravityEvent-serial (int) ( int "XGravityEvent_serial" ))
-(defentry set-XGravityEvent-serial (int int) ( void "set_XGravityEvent_serial" 
))
-(defentry XGravityEvent-type (int) ( int "XGravityEvent_type" ))
-(defentry set-XGravityEvent-type (int int) ( void "set_XGravityEvent_type" ))
+(defentry make-XGravityEvent () ( fixnum  "make_XGravityEvent" ))
+(defentry XGravityEvent-y (fixnum) ( fixnum "XGravityEvent_y" ))
+(defentry set-XGravityEvent-y (fixnum fixnum) ( void "set_XGravityEvent_y" ))
+(defentry XGravityEvent-x (fixnum) ( fixnum "XGravityEvent_x" ))
+(defentry set-XGravityEvent-x (fixnum fixnum) ( void "set_XGravityEvent_x" ))
+(defentry XGravityEvent-window (fixnum) ( fixnum "XGravityEvent_window" ))
+(defentry set-XGravityEvent-window (fixnum fixnum) ( void 
"set_XGravityEvent_window" ))
+(defentry XGravityEvent-event (fixnum) ( fixnum "XGravityEvent_event" ))
+(defentry set-XGravityEvent-event (fixnum fixnum) ( void 
"set_XGravityEvent_event" ))
+(defentry XGravityEvent-display (fixnum) ( fixnum "XGravityEvent_display" ))
+(defentry set-XGravityEvent-display (fixnum fixnum) ( void 
"set_XGravityEvent_display" ))
+(defentry XGravityEvent-send_event (fixnum) ( fixnum 
"XGravityEvent_send_event" ))
+(defentry set-XGravityEvent-send_event (fixnum fixnum) ( void 
"set_XGravityEvent_send_event" ))
+(defentry XGravityEvent-serial (fixnum) ( fixnum "XGravityEvent_serial" ))
+(defentry set-XGravityEvent-serial (fixnum fixnum) ( void 
"set_XGravityEvent_serial" ))
+(defentry XGravityEvent-type (fixnum) ( fixnum "XGravityEvent_type" ))
+(defentry set-XGravityEvent-type (fixnum fixnum) ( void 
"set_XGravityEvent_type" ))
 
 
 ;;;;;; XResizeRequestEvent funcions ;;;;;;
 
-(defentry make-XResizeRequestEvent () ( int  "make_XResizeRequestEvent" ))
-(defentry XResizeRequestEvent-height (int) ( int "XResizeRequestEvent_height" 
))
-(defentry set-XResizeRequestEvent-height (int int) ( void 
"set_XResizeRequestEvent_height" ))
-(defentry XResizeRequestEvent-width (int) ( int "XResizeRequestEvent_width" ))
-(defentry set-XResizeRequestEvent-width (int int) ( void 
"set_XResizeRequestEvent_width" ))
-(defentry XResizeRequestEvent-window (int) ( int "XResizeRequestEvent_window" 
))
-(defentry set-XResizeRequestEvent-window (int int) ( void 
"set_XResizeRequestEvent_window" ))
-(defentry XResizeRequestEvent-display (int) ( int 
"XResizeRequestEvent_display" ))
-(defentry set-XResizeRequestEvent-display (int int) ( void 
"set_XResizeRequestEvent_display" ))
-(defentry XResizeRequestEvent-send_event (int) ( int 
"XResizeRequestEvent_send_event" ))
-(defentry set-XResizeRequestEvent-send_event (int int) ( void 
"set_XResizeRequestEvent_send_event" ))
-(defentry XResizeRequestEvent-serial (int) ( int "XResizeRequestEvent_serial" 
))
-(defentry set-XResizeRequestEvent-serial (int int) ( void 
"set_XResizeRequestEvent_serial" ))
-(defentry XResizeRequestEvent-type (int) ( int "XResizeRequestEvent_type" ))
-(defentry set-XResizeRequestEvent-type (int int) ( void 
"set_XResizeRequestEvent_type" ))
+(defentry make-XResizeRequestEvent () ( fixnum  "make_XResizeRequestEvent" ))
+(defentry XResizeRequestEvent-height (fixnum) ( fixnum 
"XResizeRequestEvent_height" ))
+(defentry set-XResizeRequestEvent-height (fixnum fixnum) ( void 
"set_XResizeRequestEvent_height" ))
+(defentry XResizeRequestEvent-width (fixnum) ( fixnum 
"XResizeRequestEvent_width" ))
+(defentry set-XResizeRequestEvent-width (fixnum fixnum) ( void 
"set_XResizeRequestEvent_width" ))
+(defentry XResizeRequestEvent-window (fixnum) ( fixnum 
"XResizeRequestEvent_window" ))
+(defentry set-XResizeRequestEvent-window (fixnum fixnum) ( void 
"set_XResizeRequestEvent_window" ))
+(defentry XResizeRequestEvent-display (fixnum) ( fixnum 
"XResizeRequestEvent_display" ))
+(defentry set-XResizeRequestEvent-display (fixnum fixnum) ( void 
"set_XResizeRequestEvent_display" ))
+(defentry XResizeRequestEvent-send_event (fixnum) ( fixnum 
"XResizeRequestEvent_send_event" ))
+(defentry set-XResizeRequestEvent-send_event (fixnum fixnum) ( void 
"set_XResizeRequestEvent_send_event" ))
+(defentry XResizeRequestEvent-serial (fixnum) ( fixnum 
"XResizeRequestEvent_serial" ))
+(defentry set-XResizeRequestEvent-serial (fixnum fixnum) ( void 
"set_XResizeRequestEvent_serial" ))
+(defentry XResizeRequestEvent-type (fixnum) ( fixnum 
"XResizeRequestEvent_type" ))
+(defentry set-XResizeRequestEvent-type (fixnum fixnum) ( void 
"set_XResizeRequestEvent_type" ))
 
 
 ;;;;;; XConfigureRequestEvent funcions ;;;;;;
 
-(defentry make-XConfigureRequestEvent () ( int  "make_XConfigureRequestEvent" 
))
-(defentry XConfigureRequestEvent-value_mask (int) ( int 
"XConfigureRequestEvent_value_mask" ))
-(defentry set-XConfigureRequestEvent-value_mask (int int) ( void 
"set_XConfigureRequestEvent_value_mask" ))
-(defentry XConfigureRequestEvent-detail (int) ( int 
"XConfigureRequestEvent_detail" ))
-(defentry set-XConfigureRequestEvent-detail (int int) ( void 
"set_XConfigureRequestEvent_detail" ))
-(defentry XConfigureRequestEvent-above (int) ( int 
"XConfigureRequestEvent_above" ))
-(defentry set-XConfigureRequestEvent-above (int int) ( void 
"set_XConfigureRequestEvent_above" ))
-(defentry XConfigureRequestEvent-border_width (int) ( int 
"XConfigureRequestEvent_border_width" ))
-(defentry set-XConfigureRequestEvent-border_width (int int) ( void 
"set_XConfigureRequestEvent_border_width" ))
-(defentry XConfigureRequestEvent-height (int) ( int 
"XConfigureRequestEvent_height" ))
-(defentry set-XConfigureRequestEvent-height (int int) ( void 
"set_XConfigureRequestEvent_height" ))
-(defentry XConfigureRequestEvent-width (int) ( int 
"XConfigureRequestEvent_width" ))
-(defentry set-XConfigureRequestEvent-width (int int) ( void 
"set_XConfigureRequestEvent_width" ))
-(defentry XConfigureRequestEvent-y (int) ( int "XConfigureRequestEvent_y" ))
-(defentry set-XConfigureRequestEvent-y (int int) ( void 
"set_XConfigureRequestEvent_y" ))
-(defentry XConfigureRequestEvent-x (int) ( int "XConfigureRequestEvent_x" ))
-(defentry set-XConfigureRequestEvent-x (int int) ( void 
"set_XConfigureRequestEvent_x" ))
-(defentry XConfigureRequestEvent-window (int) ( int 
"XConfigureRequestEvent_window" ))
-(defentry set-XConfigureRequestEvent-window (int int) ( void 
"set_XConfigureRequestEvent_window" ))
-(defentry XConfigureRequestEvent-parent (int) ( int 
"XConfigureRequestEvent_parent" ))
-(defentry set-XConfigureRequestEvent-parent (int int) ( void 
"set_XConfigureRequestEvent_parent" ))
-(defentry XConfigureRequestEvent-display (int) ( int 
"XConfigureRequestEvent_display" ))
-(defentry set-XConfigureRequestEvent-display (int int) ( void 
"set_XConfigureRequestEvent_display" ))
-(defentry XConfigureRequestEvent-send_event (int) ( int 
"XConfigureRequestEvent_send_event" ))
-(defentry set-XConfigureRequestEvent-send_event (int int) ( void 
"set_XConfigureRequestEvent_send_event" ))
-(defentry XConfigureRequestEvent-serial (int) ( int 
"XConfigureRequestEvent_serial" ))
-(defentry set-XConfigureRequestEvent-serial (int int) ( void 
"set_XConfigureRequestEvent_serial" ))
-(defentry XConfigureRequestEvent-type (int) ( int 
"XConfigureRequestEvent_type" ))
-(defentry set-XConfigureRequestEvent-type (int int) ( void 
"set_XConfigureRequestEvent_type" ))
+(defentry make-XConfigureRequestEvent () ( fixnum  
"make_XConfigureRequestEvent" ))
+(defentry XConfigureRequestEvent-value_mask (fixnum) ( fixnum 
"XConfigureRequestEvent_value_mask" ))
+(defentry set-XConfigureRequestEvent-value_mask (fixnum fixnum) ( void 
"set_XConfigureRequestEvent_value_mask" ))
+(defentry XConfigureRequestEvent-detail (fixnum) ( fixnum 
"XConfigureRequestEvent_detail" ))
+(defentry set-XConfigureRequestEvent-detail (fixnum fixnum) ( void 
"set_XConfigureRequestEvent_detail" ))
+(defentry XConfigureRequestEvent-above (fixnum) ( fixnum 
"XConfigureRequestEvent_above" ))
+(defentry set-XConfigureRequestEvent-above (fixnum fixnum) ( void 
"set_XConfigureRequestEvent_above" ))
+(defentry XConfigureRequestEvent-border_width (fixnum) ( fixnum 
"XConfigureRequestEvent_border_width" ))
+(defentry set-XConfigureRequestEvent-border_width (fixnum fixnum) ( void 
"set_XConfigureRequestEvent_border_width" ))
+(defentry XConfigureRequestEvent-height (fixnum) ( fixnum 
"XConfigureRequestEvent_height" ))
+(defentry set-XConfigureRequestEvent-height (fixnum fixnum) ( void 
"set_XConfigureRequestEvent_height" ))
+(defentry XConfigureRequestEvent-width (fixnum) ( fixnum 
"XConfigureRequestEvent_width" ))
+(defentry set-XConfigureRequestEvent-width (fixnum fixnum) ( void 
"set_XConfigureRequestEvent_width" ))
+(defentry XConfigureRequestEvent-y (fixnum) ( fixnum 
"XConfigureRequestEvent_y" ))
+(defentry set-XConfigureRequestEvent-y (fixnum fixnum) ( void 
"set_XConfigureRequestEvent_y" ))
+(defentry XConfigureRequestEvent-x (fixnum) ( fixnum 
"XConfigureRequestEvent_x" ))
+(defentry set-XConfigureRequestEvent-x (fixnum fixnum) ( void 
"set_XConfigureRequestEvent_x" ))
+(defentry XConfigureRequestEvent-window (fixnum) ( fixnum 
"XConfigureRequestEvent_window" ))
+(defentry set-XConfigureRequestEvent-window (fixnum fixnum) ( void 
"set_XConfigureRequestEvent_window" ))
+(defentry XConfigureRequestEvent-parent (fixnum) ( fixnum 
"XConfigureRequestEvent_parent" ))
+(defentry set-XConfigureRequestEvent-parent (fixnum fixnum) ( void 
"set_XConfigureRequestEvent_parent" ))
+(defentry XConfigureRequestEvent-display (fixnum) ( fixnum 
"XConfigureRequestEvent_display" ))
+(defentry set-XConfigureRequestEvent-display (fixnum fixnum) ( void 
"set_XConfigureRequestEvent_display" ))
+(defentry XConfigureRequestEvent-send_event (fixnum) ( fixnum 
"XConfigureRequestEvent_send_event" ))
+(defentry set-XConfigureRequestEvent-send_event (fixnum fixnum) ( void 
"set_XConfigureRequestEvent_send_event" ))
+(defentry XConfigureRequestEvent-serial (fixnum) ( fixnum 
"XConfigureRequestEvent_serial" ))
+(defentry set-XConfigureRequestEvent-serial (fixnum fixnum) ( void 
"set_XConfigureRequestEvent_serial" ))
+(defentry XConfigureRequestEvent-type (fixnum) ( fixnum 
"XConfigureRequestEvent_type" ))
+(defentry set-XConfigureRequestEvent-type (fixnum fixnum) ( void 
"set_XConfigureRequestEvent_type" ))
 
 
 ;;;;;; XCirculateEvent funcions ;;;;;;
 
-(defentry make-XCirculateEvent () ( int  "make_XCirculateEvent" ))
-(defentry XCirculateEvent-place (int) ( int "XCirculateEvent_place" ))
-(defentry set-XCirculateEvent-place (int int) ( void 
"set_XCirculateEvent_place" ))
-(defentry XCirculateEvent-window (int) ( int "XCirculateEvent_window" ))
-(defentry set-XCirculateEvent-window (int int) ( void 
"set_XCirculateEvent_window" ))
-(defentry XCirculateEvent-event (int) ( int "XCirculateEvent_event" ))
-(defentry set-XCirculateEvent-event (int int) ( void 
"set_XCirculateEvent_event" ))
-(defentry XCirculateEvent-display (int) ( int "XCirculateEvent_display" ))
-(defentry set-XCirculateEvent-display (int int) ( void 
"set_XCirculateEvent_display" ))
-(defentry XCirculateEvent-send_event (int) ( int "XCirculateEvent_send_event" 
))
-(defentry set-XCirculateEvent-send_event (int int) ( void 
"set_XCirculateEvent_send_event" ))
-(defentry XCirculateEvent-serial (int) ( int "XCirculateEvent_serial" ))
-(defentry set-XCirculateEvent-serial (int int) ( void 
"set_XCirculateEvent_serial" ))
-(defentry XCirculateEvent-type (int) ( int "XCirculateEvent_type" ))
-(defentry set-XCirculateEvent-type (int int) ( void "set_XCirculateEvent_type" 
))
+(defentry make-XCirculateEvent () ( fixnum  "make_XCirculateEvent" ))
+(defentry XCirculateEvent-place (fixnum) ( fixnum "XCirculateEvent_place" ))
+(defentry set-XCirculateEvent-place (fixnum fixnum) ( void 
"set_XCirculateEvent_place" ))
+(defentry XCirculateEvent-window (fixnum) ( fixnum "XCirculateEvent_window" ))
+(defentry set-XCirculateEvent-window (fixnum fixnum) ( void 
"set_XCirculateEvent_window" ))
+(defentry XCirculateEvent-event (fixnum) ( fixnum "XCirculateEvent_event" ))
+(defentry set-XCirculateEvent-event (fixnum fixnum) ( void 
"set_XCirculateEvent_event" ))
+(defentry XCirculateEvent-display (fixnum) ( fixnum "XCirculateEvent_display" 
))
+(defentry set-XCirculateEvent-display (fixnum fixnum) ( void 
"set_XCirculateEvent_display" ))
+(defentry XCirculateEvent-send_event (fixnum) ( fixnum 
"XCirculateEvent_send_event" ))
+(defentry set-XCirculateEvent-send_event (fixnum fixnum) ( void 
"set_XCirculateEvent_send_event" ))
+(defentry XCirculateEvent-serial (fixnum) ( fixnum "XCirculateEvent_serial" ))
+(defentry set-XCirculateEvent-serial (fixnum fixnum) ( void 
"set_XCirculateEvent_serial" ))
+(defentry XCirculateEvent-type (fixnum) ( fixnum "XCirculateEvent_type" ))
+(defentry set-XCirculateEvent-type (fixnum fixnum) ( void 
"set_XCirculateEvent_type" ))
 
 
 ;;;;;; XCirculateRequestEvent funcions ;;;;;;
 
-(defentry make-XCirculateRequestEvent () ( int  "make_XCirculateRequestEvent" 
))
-(defentry XCirculateRequestEvent-place (int) ( int 
"XCirculateRequestEvent_place" ))
-(defentry set-XCirculateRequestEvent-place (int int) ( void 
"set_XCirculateRequestEvent_place" ))
-(defentry XCirculateRequestEvent-window (int) ( int 
"XCirculateRequestEvent_window" ))
-(defentry set-XCirculateRequestEvent-window (int int) ( void 
"set_XCirculateRequestEvent_window" ))
-(defentry XCirculateRequestEvent-parent (int) ( int 
"XCirculateRequestEvent_parent" ))
-(defentry set-XCirculateRequestEvent-parent (int int) ( void 
"set_XCirculateRequestEvent_parent" ))
-(defentry XCirculateRequestEvent-display (int) ( int 
"XCirculateRequestEvent_display" ))
-(defentry set-XCirculateRequestEvent-display (int int) ( void 
"set_XCirculateRequestEvent_display" ))
-(defentry XCirculateRequestEvent-send_event (int) ( int 
"XCirculateRequestEvent_send_event" ))
-(defentry set-XCirculateRequestEvent-send_event (int int) ( void 
"set_XCirculateRequestEvent_send_event" ))
-(defentry XCirculateRequestEvent-serial (int) ( int 
"XCirculateRequestEvent_serial" ))
-(defentry set-XCirculateRequestEvent-serial (int int) ( void 
"set_XCirculateRequestEvent_serial" ))
-(defentry XCirculateRequestEvent-type (int) ( int 
"XCirculateRequestEvent_type" ))
-(defentry set-XCirculateRequestEvent-type (int int) ( void 
"set_XCirculateRequestEvent_type" ))
+(defentry make-XCirculateRequestEvent () ( fixnum  
"make_XCirculateRequestEvent" ))
+(defentry XCirculateRequestEvent-place (fixnum) ( fixnum 
"XCirculateRequestEvent_place" ))
+(defentry set-XCirculateRequestEvent-place (fixnum fixnum) ( void 
"set_XCirculateRequestEvent_place" ))
+(defentry XCirculateRequestEvent-window (fixnum) ( fixnum 
"XCirculateRequestEvent_window" ))
+(defentry set-XCirculateRequestEvent-window (fixnum fixnum) ( void 
"set_XCirculateRequestEvent_window" ))
+(defentry XCirculateRequestEvent-parent (fixnum) ( fixnum 
"XCirculateRequestEvent_parent" ))
+(defentry set-XCirculateRequestEvent-parent (fixnum fixnum) ( void 
"set_XCirculateRequestEvent_parent" ))
+(defentry XCirculateRequestEvent-display (fixnum) ( fixnum 
"XCirculateRequestEvent_display" ))
+(defentry set-XCirculateRequestEvent-display (fixnum fixnum) ( void 
"set_XCirculateRequestEvent_display" ))
+(defentry XCirculateRequestEvent-send_event (fixnum) ( fixnum 
"XCirculateRequestEvent_send_event" ))
+(defentry set-XCirculateRequestEvent-send_event (fixnum fixnum) ( void 
"set_XCirculateRequestEvent_send_event" ))
+(defentry XCirculateRequestEvent-serial (fixnum) ( fixnum 
"XCirculateRequestEvent_serial" ))
+(defentry set-XCirculateRequestEvent-serial (fixnum fixnum) ( void 
"set_XCirculateRequestEvent_serial" ))
+(defentry XCirculateRequestEvent-type (fixnum) ( fixnum 
"XCirculateRequestEvent_type" ))
+(defentry set-XCirculateRequestEvent-type (fixnum fixnum) ( void 
"set_XCirculateRequestEvent_type" ))
 
 
 ;;;;;; XPropertyEvent funcions ;;;;;;
 
-(defentry make-XPropertyEvent () ( int  "make_XPropertyEvent" ))
-(defentry XPropertyEvent-state (int) ( int "XPropertyEvent_state" ))
-(defentry set-XPropertyEvent-state (int int) ( void "set_XPropertyEvent_state" 
))
-(defentry XPropertyEvent-time (int) ( int "XPropertyEvent_time" ))
-(defentry set-XPropertyEvent-time (int int) ( void "set_XPropertyEvent_time" ))
-(defentry XPropertyEvent-atom (int) ( int "XPropertyEvent_atom" ))
-(defentry set-XPropertyEvent-atom (int int) ( void "set_XPropertyEvent_atom" ))
-(defentry XPropertyEvent-window (int) ( int "XPropertyEvent_window" ))
-(defentry set-XPropertyEvent-window (int int) ( void 
"set_XPropertyEvent_window" ))
-(defentry XPropertyEvent-display (int) ( int "XPropertyEvent_display" ))
-(defentry set-XPropertyEvent-display (int int) ( void 
"set_XPropertyEvent_display" ))
-(defentry XPropertyEvent-send_event (int) ( int "XPropertyEvent_send_event" ))
-(defentry set-XPropertyEvent-send_event (int int) ( void 
"set_XPropertyEvent_send_event" ))
-(defentry XPropertyEvent-serial (int) ( int "XPropertyEvent_serial" ))
-(defentry set-XPropertyEvent-serial (int int) ( void 
"set_XPropertyEvent_serial" ))
-(defentry XPropertyEvent-type (int) ( int "XPropertyEvent_type" ))
-(defentry set-XPropertyEvent-type (int int) ( void "set_XPropertyEvent_type" ))
+(defentry make-XPropertyEvent () ( fixnum  "make_XPropertyEvent" ))
+(defentry XPropertyEvent-state (fixnum) ( fixnum "XPropertyEvent_state" ))
+(defentry set-XPropertyEvent-state (fixnum fixnum) ( void 
"set_XPropertyEvent_state" ))
+(defentry XPropertyEvent-time (fixnum) ( fixnum "XPropertyEvent_time" ))
+(defentry set-XPropertyEvent-time (fixnum fixnum) ( void 
"set_XPropertyEvent_time" ))
+(defentry XPropertyEvent-atom (fixnum) ( fixnum "XPropertyEvent_atom" ))
+(defentry set-XPropertyEvent-atom (fixnum fixnum) ( void 
"set_XPropertyEvent_atom" ))
+(defentry XPropertyEvent-window (fixnum) ( fixnum "XPropertyEvent_window" ))
+(defentry set-XPropertyEvent-window (fixnum fixnum) ( void 
"set_XPropertyEvent_window" ))
+(defentry XPropertyEvent-display (fixnum) ( fixnum "XPropertyEvent_display" ))
+(defentry set-XPropertyEvent-display (fixnum fixnum) ( void 
"set_XPropertyEvent_display" ))
+(defentry XPropertyEvent-send_event (fixnum) ( fixnum 
"XPropertyEvent_send_event" ))
+(defentry set-XPropertyEvent-send_event (fixnum fixnum) ( void 
"set_XPropertyEvent_send_event" ))
+(defentry XPropertyEvent-serial (fixnum) ( fixnum "XPropertyEvent_serial" ))
+(defentry set-XPropertyEvent-serial (fixnum fixnum) ( void 
"set_XPropertyEvent_serial" ))
+(defentry XPropertyEvent-type (fixnum) ( fixnum "XPropertyEvent_type" ))
+(defentry set-XPropertyEvent-type (fixnum fixnum) ( void 
"set_XPropertyEvent_type" ))
 
 
 ;;;;;; XSelectionClearEvent funcions ;;;;;;
 
-(defentry make-XSelectionClearEvent () ( int  "make_XSelectionClearEvent" ))
-(defentry XSelectionClearEvent-time (int) ( int "XSelectionClearEvent_time" ))
-(defentry set-XSelectionClearEvent-time (int int) ( void 
"set_XSelectionClearEvent_time" ))
-(defentry XSelectionClearEvent-selection (int) ( int 
"XSelectionClearEvent_selection" ))
-(defentry set-XSelectionClearEvent-selection (int int) ( void 
"set_XSelectionClearEvent_selection" ))
-(defentry XSelectionClearEvent-window (int) ( int 
"XSelectionClearEvent_window" ))
-(defentry set-XSelectionClearEvent-window (int int) ( void 
"set_XSelectionClearEvent_window" ))
-(defentry XSelectionClearEvent-display (int) ( int 
"XSelectionClearEvent_display" ))
-(defentry set-XSelectionClearEvent-display (int int) ( void 
"set_XSelectionClearEvent_display" ))
-(defentry XSelectionClearEvent-send_event (int) ( int 
"XSelectionClearEvent_send_event" ))
-(defentry set-XSelectionClearEvent-send_event (int int) ( void 
"set_XSelectionClearEvent_send_event" ))
-(defentry XSelectionClearEvent-serial (int) ( int 
"XSelectionClearEvent_serial" ))
-(defentry set-XSelectionClearEvent-serial (int int) ( void 
"set_XSelectionClearEvent_serial" ))
-(defentry XSelectionClearEvent-type (int) ( int "XSelectionClearEvent_type" ))
-(defentry set-XSelectionClearEvent-type (int int) ( void 
"set_XSelectionClearEvent_type" ))
+(defentry make-XSelectionClearEvent () ( fixnum  "make_XSelectionClearEvent" ))
+(defentry XSelectionClearEvent-time (fixnum) ( fixnum 
"XSelectionClearEvent_time" ))
+(defentry set-XSelectionClearEvent-time (fixnum fixnum) ( void 
"set_XSelectionClearEvent_time" ))
+(defentry XSelectionClearEvent-selection (fixnum) ( fixnum 
"XSelectionClearEvent_selection" ))
+(defentry set-XSelectionClearEvent-selection (fixnum fixnum) ( void 
"set_XSelectionClearEvent_selection" ))
+(defentry XSelectionClearEvent-window (fixnum) ( fixnum 
"XSelectionClearEvent_window" ))
+(defentry set-XSelectionClearEvent-window (fixnum fixnum) ( void 
"set_XSelectionClearEvent_window" ))
+(defentry XSelectionClearEvent-display (fixnum) ( fixnum 
"XSelectionClearEvent_display" ))
+(defentry set-XSelectionClearEvent-display (fixnum fixnum) ( void 
"set_XSelectionClearEvent_display" ))
+(defentry XSelectionClearEvent-send_event (fixnum) ( fixnum 
"XSelectionClearEvent_send_event" ))
+(defentry set-XSelectionClearEvent-send_event (fixnum fixnum) ( void 
"set_XSelectionClearEvent_send_event" ))
+(defentry XSelectionClearEvent-serial (fixnum) ( fixnum 
"XSelectionClearEvent_serial" ))
+(defentry set-XSelectionClearEvent-serial (fixnum fixnum) ( void 
"set_XSelectionClearEvent_serial" ))
+(defentry XSelectionClearEvent-type (fixnum) ( fixnum 
"XSelectionClearEvent_type" ))
+(defentry set-XSelectionClearEvent-type (fixnum fixnum) ( void 
"set_XSelectionClearEvent_type" ))
 
 
 ;;;;;; XSelectionRequestEvent funcions ;;;;;;
 
-(defentry make-XSelectionRequestEvent () ( int  "make_XSelectionRequestEvent" 
))
-(defentry XSelectionRequestEvent-time (int) ( int 
"XSelectionRequestEvent_time" ))
-(defentry set-XSelectionRequestEvent-time (int int) ( void 
"set_XSelectionRequestEvent_time" ))
-(defentry XSelectionRequestEvent-property (int) ( int 
"XSelectionRequestEvent_property" ))
-(defentry set-XSelectionRequestEvent-property (int int) ( void 
"set_XSelectionRequestEvent_property" ))
-(defentry XSelectionRequestEvent-target (int) ( int 
"XSelectionRequestEvent_target" ))
-(defentry set-XSelectionRequestEvent-target (int int) ( void 
"set_XSelectionRequestEvent_target" ))
-(defentry XSelectionRequestEvent-selection (int) ( int 
"XSelectionRequestEvent_selection" ))
-(defentry set-XSelectionRequestEvent-selection (int int) ( void 
"set_XSelectionRequestEvent_selection" ))
-(defentry XSelectionRequestEvent-requestor (int) ( int 
"XSelectionRequestEvent_requestor" ))
-(defentry set-XSelectionRequestEvent-requestor (int int) ( void 
"set_XSelectionRequestEvent_requestor" ))
-(defentry XSelectionRequestEvent-owner (int) ( int 
"XSelectionRequestEvent_owner" ))
-(defentry set-XSelectionRequestEvent-owner (int int) ( void 
"set_XSelectionRequestEvent_owner" ))
-(defentry XSelectionRequestEvent-display (int) ( int 
"XSelectionRequestEvent_display" ))
-(defentry set-XSelectionRequestEvent-display (int int) ( void 
"set_XSelectionRequestEvent_display" ))
-(defentry XSelectionRequestEvent-send_event (int) ( int 
"XSelectionRequestEvent_send_event" ))
-(defentry set-XSelectionRequestEvent-send_event (int int) ( void 
"set_XSelectionRequestEvent_send_event" ))
-(defentry XSelectionRequestEvent-serial (int) ( int 
"XSelectionRequestEvent_serial" ))
-(defentry set-XSelectionRequestEvent-serial (int int) ( void 
"set_XSelectionRequestEvent_serial" ))
-(defentry XSelectionRequestEvent-type (int) ( int 
"XSelectionRequestEvent_type" ))
-(defentry set-XSelectionRequestEvent-type (int int) ( void 
"set_XSelectionRequestEvent_type" ))
+(defentry make-XSelectionRequestEvent () ( fixnum  
"make_XSelectionRequestEvent" ))
+(defentry XSelectionRequestEvent-time (fixnum) ( fixnum 
"XSelectionRequestEvent_time" ))
+(defentry set-XSelectionRequestEvent-time (fixnum fixnum) ( void 
"set_XSelectionRequestEvent_time" ))
+(defentry XSelectionRequestEvent-property (fixnum) ( fixnum 
"XSelectionRequestEvent_property" ))
+(defentry set-XSelectionRequestEvent-property (fixnum fixnum) ( void 
"set_XSelectionRequestEvent_property" ))
+(defentry XSelectionRequestEvent-target (fixnum) ( fixnum 
"XSelectionRequestEvent_target" ))
+(defentry set-XSelectionRequestEvent-target (fixnum fixnum) ( void 
"set_XSelectionRequestEvent_target" ))
+(defentry XSelectionRequestEvent-selection (fixnum) ( fixnum 
"XSelectionRequestEvent_selection" ))
+(defentry set-XSelectionRequestEvent-selection (fixnum fixnum) ( void 
"set_XSelectionRequestEvent_selection" ))
+(defentry XSelectionRequestEvent-requestor (fixnum) ( fixnum 
"XSelectionRequestEvent_requestor" ))
+(defentry set-XSelectionRequestEvent-requestor (fixnum fixnum) ( void 
"set_XSelectionRequestEvent_requestor" ))
+(defentry XSelectionRequestEvent-owner (fixnum) ( fixnum 
"XSelectionRequestEvent_owner" ))
+(defentry set-XSelectionRequestEvent-owner (fixnum fixnum) ( void 
"set_XSelectionRequestEvent_owner" ))
+(defentry XSelectionRequestEvent-display (fixnum) ( fixnum 
"XSelectionRequestEvent_display" ))
+(defentry set-XSelectionRequestEvent-display (fixnum fixnum) ( void 
"set_XSelectionRequestEvent_display" ))
+(defentry XSelectionRequestEvent-send_event (fixnum) ( fixnum 
"XSelectionRequestEvent_send_event" ))
+(defentry set-XSelectionRequestEvent-send_event (fixnum fixnum) ( void 
"set_XSelectionRequestEvent_send_event" ))
+(defentry XSelectionRequestEvent-serial (fixnum) ( fixnum 
"XSelectionRequestEvent_serial" ))
+(defentry set-XSelectionRequestEvent-serial (fixnum fixnum) ( void 
"set_XSelectionRequestEvent_serial" ))
+(defentry XSelectionRequestEvent-type (fixnum) ( fixnum 
"XSelectionRequestEvent_type" ))
+(defentry set-XSelectionRequestEvent-type (fixnum fixnum) ( void 
"set_XSelectionRequestEvent_type" ))
 
 
 ;;;;;; XSelectionEvent funcions ;;;;;;
 
-(defentry make-XSelectionEvent () ( int  "make_XSelectionEvent" ))
-(defentry XSelectionEvent-time (int) ( int "XSelectionEvent_time" ))
-(defentry set-XSelectionEvent-time (int int) ( void "set_XSelectionEvent_time" 
))
-(defentry XSelectionEvent-property (int) ( int "XSelectionEvent_property" ))
-(defentry set-XSelectionEvent-property (int int) ( void 
"set_XSelectionEvent_property" ))
-(defentry XSelectionEvent-target (int) ( int "XSelectionEvent_target" ))
-(defentry set-XSelectionEvent-target (int int) ( void 
"set_XSelectionEvent_target" ))
-(defentry XSelectionEvent-selection (int) ( int "XSelectionEvent_selection" ))
-(defentry set-XSelectionEvent-selection (int int) ( void 
"set_XSelectionEvent_selection" ))
-(defentry XSelectionEvent-requestor (int) ( int "XSelectionEvent_requestor" ))
-(defentry set-XSelectionEvent-requestor (int int) ( void 
"set_XSelectionEvent_requestor" ))
-(defentry XSelectionEvent-display (int) ( int "XSelectionEvent_display" ))
-(defentry set-XSelectionEvent-display (int int) ( void 
"set_XSelectionEvent_display" ))
-(defentry XSelectionEvent-send_event (int) ( int "XSelectionEvent_send_event" 
))
-(defentry set-XSelectionEvent-send_event (int int) ( void 
"set_XSelectionEvent_send_event" ))
-(defentry XSelectionEvent-serial (int) ( int "XSelectionEvent_serial" ))
-(defentry set-XSelectionEvent-serial (int int) ( void 
"set_XSelectionEvent_serial" ))
-(defentry XSelectionEvent-type (int) ( int "XSelectionEvent_type" ))
-(defentry set-XSelectionEvent-type (int int) ( void "set_XSelectionEvent_type" 
))
+(defentry make-XSelectionEvent () ( fixnum  "make_XSelectionEvent" ))
+(defentry XSelectionEvent-time (fixnum) ( fixnum "XSelectionEvent_time" ))
+(defentry set-XSelectionEvent-time (fixnum fixnum) ( void 
"set_XSelectionEvent_time" ))
+(defentry XSelectionEvent-property (fixnum) ( fixnum 
"XSelectionEvent_property" ))
+(defentry set-XSelectionEvent-property (fixnum fixnum) ( void 
"set_XSelectionEvent_property" ))
+(defentry XSelectionEvent-target (fixnum) ( fixnum "XSelectionEvent_target" ))
+(defentry set-XSelectionEvent-target (fixnum fixnum) ( void 
"set_XSelectionEvent_target" ))
+(defentry XSelectionEvent-selection (fixnum) ( fixnum 
"XSelectionEvent_selection" ))
+(defentry set-XSelectionEvent-selection (fixnum fixnum) ( void 
"set_XSelectionEvent_selection" ))
+(defentry XSelectionEvent-requestor (fixnum) ( fixnum 
"XSelectionEvent_requestor" ))
+(defentry set-XSelectionEvent-requestor (fixnum fixnum) ( void 
"set_XSelectionEvent_requestor" ))
+(defentry XSelectionEvent-display (fixnum) ( fixnum "XSelectionEvent_display" 
))
+(defentry set-XSelectionEvent-display (fixnum fixnum) ( void 
"set_XSelectionEvent_display" ))
+(defentry XSelectionEvent-send_event (fixnum) ( fixnum 
"XSelectionEvent_send_event" ))
+(defentry set-XSelectionEvent-send_event (fixnum fixnum) ( void 
"set_XSelectionEvent_send_event" ))
+(defentry XSelectionEvent-serial (fixnum) ( fixnum "XSelectionEvent_serial" ))
+(defentry set-XSelectionEvent-serial (fixnum fixnum) ( void 
"set_XSelectionEvent_serial" ))
+(defentry XSelectionEvent-type (fixnum) ( fixnum "XSelectionEvent_type" ))
+(defentry set-XSelectionEvent-type (fixnum fixnum) ( void 
"set_XSelectionEvent_type" ))
 
 
 ;;;;;; XColormapEvent funcions ;;;;;;
 
-(defentry make-XColormapEvent () ( int  "make_XColormapEvent" ))
-(defentry XColormapEvent-state (int) ( int "XColormapEvent_state" ))
-(defentry set-XColormapEvent-state (int int) ( void "set_XColormapEvent_state" 
))
-(defentry XColormapEvent-new (int) ( int "XColormapEvent_new" ))
-(defentry set-XColormapEvent-new (int int) ( void "set_XColormapEvent_new" ))
-(defentry XColormapEvent-colormap (int) ( int "XColormapEvent_colormap" ))
-(defentry set-XColormapEvent-colormap (int int) ( void 
"set_XColormapEvent_colormap" ))
-(defentry XColormapEvent-window (int) ( int "XColormapEvent_window" ))
-(defentry set-XColormapEvent-window (int int) ( void 
"set_XColormapEvent_window" ))
-(defentry XColormapEvent-display (int) ( int "XColormapEvent_display" ))
-(defentry set-XColormapEvent-display (int int) ( void 
"set_XColormapEvent_display" ))
-(defentry XColormapEvent-send_event (int) ( int "XColormapEvent_send_event" ))
-(defentry set-XColormapEvent-send_event (int int) ( void 
"set_XColormapEvent_send_event" ))
-(defentry XColormapEvent-serial (int) ( int "XColormapEvent_serial" ))
-(defentry set-XColormapEvent-serial (int int) ( void 
"set_XColormapEvent_serial" ))
-(defentry XColormapEvent-type (int) ( int "XColormapEvent_type" ))
-(defentry set-XColormapEvent-type (int int) ( void "set_XColormapEvent_type" ))
+(defentry make-XColormapEvent () ( fixnum  "make_XColormapEvent" ))
+(defentry XColormapEvent-state (fixnum) ( fixnum "XColormapEvent_state" ))
+(defentry set-XColormapEvent-state (fixnum fixnum) ( void 
"set_XColormapEvent_state" ))
+(defentry XColormapEvent-new (fixnum) ( fixnum "XColormapEvent_new" ))
+(defentry set-XColormapEvent-new (fixnum fixnum) ( void 
"set_XColormapEvent_new" ))
+(defentry XColormapEvent-colormap (fixnum) ( fixnum "XColormapEvent_colormap" 
))
+(defentry set-XColormapEvent-colormap (fixnum fixnum) ( void 
"set_XColormapEvent_colormap" ))
+(defentry XColormapEvent-window (fixnum) ( fixnum "XColormapEvent_window" ))
+(defentry set-XColormapEvent-window (fixnum fixnum) ( void 
"set_XColormapEvent_window" ))
+(defentry XColormapEvent-display (fixnum) ( fixnum "XColormapEvent_display" ))
+(defentry set-XColormapEvent-display (fixnum fixnum) ( void 
"set_XColormapEvent_display" ))
+(defentry XColormapEvent-send_event (fixnum) ( fixnum 
"XColormapEvent_send_event" ))
+(defentry set-XColormapEvent-send_event (fixnum fixnum) ( void 
"set_XColormapEvent_send_event" ))
+(defentry XColormapEvent-serial (fixnum) ( fixnum "XColormapEvent_serial" ))
+(defentry set-XColormapEvent-serial (fixnum fixnum) ( void 
"set_XColormapEvent_serial" ))
+(defentry XColormapEvent-type (fixnum) ( fixnum "XColormapEvent_type" ))
+(defentry set-XColormapEvent-type (fixnum fixnum) ( void 
"set_XColormapEvent_type" ))
 
 
 ;;;;;; XClientMessageEvent funcions ;;;;;;
 
-(defentry make-XClientMessageEvent () ( int  "make_XClientMessageEvent" ))
-(defentry XClientMessageEvent-format (int) ( int "XClientMessageEvent_format" 
))
-(defentry set-XClientMessageEvent-format (int int) ( void 
"set_XClientMessageEvent_format" ))
-(defentry XClientMessageEvent-message_type (int) ( int 
"XClientMessageEvent_message_type" ))
-(defentry set-XClientMessageEvent-message_type (int int) ( void 
"set_XClientMessageEvent_message_type" ))
-(defentry XClientMessageEvent-window (int) ( int "XClientMessageEvent_window" 
))
-(defentry set-XClientMessageEvent-window (int int) ( void 
"set_XClientMessageEvent_window" ))
-(defentry XClientMessageEvent-display (int) ( int 
"XClientMessageEvent_display" ))
-(defentry set-XClientMessageEvent-display (int int) ( void 
"set_XClientMessageEvent_display" ))
-(defentry XClientMessageEvent-send_event (int) ( int 
"XClientMessageEvent_send_event" ))
-(defentry set-XClientMessageEvent-send_event (int int) ( void 
"set_XClientMessageEvent_send_event" ))
-(defentry XClientMessageEvent-serial (int) ( int "XClientMessageEvent_serial" 
))
-(defentry set-XClientMessageEvent-serial (int int) ( void 
"set_XClientMessageEvent_serial" ))
-(defentry XClientMessageEvent-type (int) ( int "XClientMessageEvent_type" ))
-(defentry set-XClientMessageEvent-type (int int) ( void 
"set_XClientMessageEvent_type" ))
+(defentry make-XClientMessageEvent () ( fixnum  "make_XClientMessageEvent" ))
+(defentry XClientMessageEvent-format (fixnum) ( fixnum 
"XClientMessageEvent_format" ))
+(defentry set-XClientMessageEvent-format (fixnum fixnum) ( void 
"set_XClientMessageEvent_format" ))
+(defentry XClientMessageEvent-message_type (fixnum) ( fixnum 
"XClientMessageEvent_message_type" ))
+(defentry set-XClientMessageEvent-message_type (fixnum fixnum) ( void 
"set_XClientMessageEvent_message_type" ))
+(defentry XClientMessageEvent-window (fixnum) ( fixnum 
"XClientMessageEvent_window" ))
+(defentry set-XClientMessageEvent-window (fixnum fixnum) ( void 
"set_XClientMessageEvent_window" ))
+(defentry XClientMessageEvent-display (fixnum) ( fixnum 
"XClientMessageEvent_display" ))
+(defentry set-XClientMessageEvent-display (fixnum fixnum) ( void 
"set_XClientMessageEvent_display" ))
+(defentry XClientMessageEvent-send_event (fixnum) ( fixnum 
"XClientMessageEvent_send_event" ))
+(defentry set-XClientMessageEvent-send_event (fixnum fixnum) ( void 
"set_XClientMessageEvent_send_event" ))
+(defentry XClientMessageEvent-serial (fixnum) ( fixnum 
"XClientMessageEvent_serial" ))
+(defentry set-XClientMessageEvent-serial (fixnum fixnum) ( void 
"set_XClientMessageEvent_serial" ))
+(defentry XClientMessageEvent-type (fixnum) ( fixnum 
"XClientMessageEvent_type" ))
+(defentry set-XClientMessageEvent-type (fixnum fixnum) ( void 
"set_XClientMessageEvent_type" ))
 
 
 ;;;;;; XMappingEvent funcions ;;;;;;
 
-(defentry make-XMappingEvent () ( int  "make_XMappingEvent" ))
-(defentry XMappingEvent-count (int) ( int "XMappingEvent_count" ))
-(defentry set-XMappingEvent-count (int int) ( void "set_XMappingEvent_count" ))
-(defentry XMappingEvent-first_keycode (int) ( int 
"XMappingEvent_first_keycode" ))
-(defentry set-XMappingEvent-first_keycode (int int) ( void 
"set_XMappingEvent_first_keycode" ))
-(defentry XMappingEvent-request (int) ( int "XMappingEvent_request" ))
-(defentry set-XMappingEvent-request (int int) ( void 
"set_XMappingEvent_request" ))
-(defentry XMappingEvent-window (int) ( int "XMappingEvent_window" ))
-(defentry set-XMappingEvent-window (int int) ( void "set_XMappingEvent_window" 
))
-(defentry XMappingEvent-display (int) ( int "XMappingEvent_display" ))
-(defentry set-XMappingEvent-display (int int) ( void 
"set_XMappingEvent_display" ))
-(defentry XMappingEvent-send_event (int) ( int "XMappingEvent_send_event" ))
-(defentry set-XMappingEvent-send_event (int int) ( void 
"set_XMappingEvent_send_event" ))
-(defentry XMappingEvent-serial (int) ( int "XMappingEvent_serial" ))
-(defentry set-XMappingEvent-serial (int int) ( void "set_XMappingEvent_serial" 
))
-(defentry XMappingEvent-type (int) ( int "XMappingEvent_type" ))
-(defentry set-XMappingEvent-type (int int) ( void "set_XMappingEvent_type" ))
+(defentry make-XMappingEvent () ( fixnum  "make_XMappingEvent" ))
+(defentry XMappingEvent-count (fixnum) ( fixnum "XMappingEvent_count" ))
+(defentry set-XMappingEvent-count (fixnum fixnum) ( void 
"set_XMappingEvent_count" ))
+(defentry XMappingEvent-first_keycode (fixnum) ( fixnum 
"XMappingEvent_first_keycode" ))
+(defentry set-XMappingEvent-first_keycode (fixnum fixnum) ( void 
"set_XMappingEvent_first_keycode" ))
+(defentry XMappingEvent-request (fixnum) ( fixnum "XMappingEvent_request" ))
+(defentry set-XMappingEvent-request (fixnum fixnum) ( void 
"set_XMappingEvent_request" ))
+(defentry XMappingEvent-window (fixnum) ( fixnum "XMappingEvent_window" ))
+(defentry set-XMappingEvent-window (fixnum fixnum) ( void 
"set_XMappingEvent_window" ))
+(defentry XMappingEvent-display (fixnum) ( fixnum "XMappingEvent_display" ))
+(defentry set-XMappingEvent-display (fixnum fixnum) ( void 
"set_XMappingEvent_display" ))
+(defentry XMappingEvent-send_event (fixnum) ( fixnum 
"XMappingEvent_send_event" ))
+(defentry set-XMappingEvent-send_event (fixnum fixnum) ( void 
"set_XMappingEvent_send_event" ))
+(defentry XMappingEvent-serial (fixnum) ( fixnum "XMappingEvent_serial" ))
+(defentry set-XMappingEvent-serial (fixnum fixnum) ( void 
"set_XMappingEvent_serial" ))
+(defentry XMappingEvent-type (fixnum) ( fixnum "XMappingEvent_type" ))
+(defentry set-XMappingEvent-type (fixnum fixnum) ( void 
"set_XMappingEvent_type" ))
 
 
 ;;;;;; XErrorEvent funcions ;;;;;;
 
-(defentry make-XErrorEvent () ( int  "make_XErrorEvent" ))
-(defentry XErrorEvent-minor_code (int) ( char "XErrorEvent_minor_code" ))
-(defentry set-XErrorEvent-minor_code (int char) ( void 
"set_XErrorEvent_minor_code" ))
-(defentry XErrorEvent-request_code (int) ( char "XErrorEvent_request_code" ))
-(defentry set-XErrorEvent-request_code (int char) ( void 
"set_XErrorEvent_request_code" ))
-(defentry XErrorEvent-error_code (int) ( char "XErrorEvent_error_code" ))
-(defentry set-XErrorEvent-error_code (int char) ( void 
"set_XErrorEvent_error_code" ))
-(defentry XErrorEvent-serial (int) ( int "XErrorEvent_serial" ))
-(defentry set-XErrorEvent-serial (int int) ( void "set_XErrorEvent_serial" ))
-(defentry XErrorEvent-resourceid (int) ( int "XErrorEvent_resourceid" ))
-(defentry set-XErrorEvent-resourceid (int int) ( void 
"set_XErrorEvent_resourceid" ))
-(defentry XErrorEvent-display (int) ( int "XErrorEvent_display" ))
-(defentry set-XErrorEvent-display (int int) ( void "set_XErrorEvent_display" ))
-(defentry XErrorEvent-type (int) ( int "XErrorEvent_type" ))
-(defentry set-XErrorEvent-type (int int) ( void "set_XErrorEvent_type" ))
+(defentry make-XErrorEvent () ( fixnum  "make_XErrorEvent" ))
+(defentry XErrorEvent-minor_code (fixnum) ( char "XErrorEvent_minor_code" ))
+(defentry set-XErrorEvent-minor_code (fixnum char) ( void 
"set_XErrorEvent_minor_code" ))
+(defentry XErrorEvent-request_code (fixnum) ( char "XErrorEvent_request_code" 
))
+(defentry set-XErrorEvent-request_code (fixnum char) ( void 
"set_XErrorEvent_request_code" ))
+(defentry XErrorEvent-error_code (fixnum) ( char "XErrorEvent_error_code" ))
+(defentry set-XErrorEvent-error_code (fixnum char) ( void 
"set_XErrorEvent_error_code" ))
+(defentry XErrorEvent-serial (fixnum) ( fixnum "XErrorEvent_serial" ))
+(defentry set-XErrorEvent-serial (fixnum fixnum) ( void 
"set_XErrorEvent_serial" ))
+(defentry XErrorEvent-resourceid (fixnum) ( fixnum "XErrorEvent_resourceid" ))
+(defentry set-XErrorEvent-resourceid (fixnum fixnum) ( void 
"set_XErrorEvent_resourceid" ))
+(defentry XErrorEvent-display (fixnum) ( fixnum "XErrorEvent_display" ))
+(defentry set-XErrorEvent-display (fixnum fixnum) ( void 
"set_XErrorEvent_display" ))
+(defentry XErrorEvent-type (fixnum) ( fixnum "XErrorEvent_type" ))
+(defentry set-XErrorEvent-type (fixnum fixnum) ( void "set_XErrorEvent_type" ))
 
 
 ;;;;;; XAnyEvent funcions ;;;;;;
 
-(defentry make-XAnyEvent () ( int  "make_XAnyEvent" ))
-(defentry XAnyEvent-window (int) ( int "XAnyEvent_window" ))
-(defentry set-XAnyEvent-window (int int) ( void "set_XAnyEvent_window" ))
-(defentry XAnyEvent-display (int) ( int "XAnyEvent_display" ))
-(defentry set-XAnyEvent-display (int int) ( void "set_XAnyEvent_display" ))
-(defentry XAnyEvent-send_event (int) ( int "XAnyEvent_send_event" ))
-(defentry set-XAnyEvent-send_event (int int) ( void "set_XAnyEvent_send_event" 
))
-(defentry XAnyEvent-serial (int) ( int "XAnyEvent_serial" ))
-(defentry set-XAnyEvent-serial (int int) ( void "set_XAnyEvent_serial" ))
-(defentry XAnyEvent-type (int) ( int "XAnyEvent_type" ))
-(defentry set-XAnyEvent-type (int int) ( void "set_XAnyEvent_type" ))
+(defentry make-XAnyEvent () ( fixnum  "make_XAnyEvent" ))
+(defentry XAnyEvent-window (fixnum) ( fixnum "XAnyEvent_window" ))
+(defentry set-XAnyEvent-window (fixnum fixnum) ( void "set_XAnyEvent_window" ))
+(defentry XAnyEvent-display (fixnum) ( fixnum "XAnyEvent_display" ))
+(defentry set-XAnyEvent-display (fixnum fixnum) ( void "set_XAnyEvent_display" 
))
+(defentry XAnyEvent-send_event (fixnum) ( fixnum "XAnyEvent_send_event" ))
+(defentry set-XAnyEvent-send_event (fixnum fixnum) ( void 
"set_XAnyEvent_send_event" ))
+(defentry XAnyEvent-serial (fixnum) ( fixnum "XAnyEvent_serial" ))
+(defentry set-XAnyEvent-serial (fixnum fixnum) ( void "set_XAnyEvent_serial" ))
+(defentry XAnyEvent-type (fixnum) ( fixnum "XAnyEvent_type" ))
+(defentry set-XAnyEvent-type (fixnum fixnum) ( void "set_XAnyEvent_type" ))
 
 
 ;;;;;; XEvent funcions ;;;;;;
 
-(defentry make-XEvent () ( int  "make_XEvent" ))
-;;(defentry XEvent-pad[24] (int) ( int "XEvent_pad[24]" ))
-;;(defentry set-XEvent-pad[24] (int int) ( void "set_XEvent_pad[24]" ))
-;;(defentry XEvent-xkeymap (int) ( XKeymapEvent "XEvent_xkeymap" ))
-;;(defentry set-XEvent-xkeymap (int XKeymapEvent) ( void "set_XEvent_xkeymap" 
))
-;;(defentry XEvent-xerror (int) ( XErrorEvent "XEvent_xerror" ))
-;;(defentry set-XEvent-xerror (int XErrorEvent) ( void "set_XEvent_xerror" ))
-;;(defentry XEvent-xmapping (int) ( XMappingEvent "XEvent_xmapping" ))
-;;(defentry set-XEvent-xmapping (int XMappingEvent) ( void 
"set_XEvent_xmapping" ))
-;;(defentry XEvent-xclient (int) ( XClientMessageEvent "XEvent_xclient" ))
-;;(defentry set-XEvent-xclient (int XClientMessageEvent) ( void 
"set_XEvent_xclient" ))
-;;(defentry XEvent-xcolormap (int) ( XColormapEvent "XEvent_xcolormap" ))
-;;(defentry set-XEvent-xcolormap (int XColormapEvent) ( void 
"set_XEvent_xcolormap" ))
-;;(defentry XEvent-xselection (int) ( XSelectionEvent "XEvent_xselection" ))
-;;(defentry set-XEvent-xselection (int XSelectionEvent) ( void 
"set_XEvent_xselection" ))
-;;(defentry XEvent-xselectionrequest (int) ( XSelectionRequestEvent 
"XEvent_xselectionrequest" ))
-;;(defentry set-XEvent-xselectionrequest (int XSelectionRequestEvent) ( void 
"set_XEvent_xselectionrequest" ))
-;;(defentry XEvent-xselectionclear (int) ( XSelectionClearEvent 
"XEvent_xselectionclear" ))
-;;(defentry set-XEvent-xselectionclear (int XSelectionClearEvent) ( void 
"set_XEvent_xselectionclear" ))
-;;(defentry XEvent-xproperty (int) ( XPropertyEvent "XEvent_xproperty" ))
-;;(defentry set-XEvent-xproperty (int XPropertyEvent) ( void 
"set_XEvent_xproperty" ))
-;;(defentry XEvent-xcirculaterequest (int) ( XCirculateRequestEvent 
"XEvent_xcirculaterequest" ))
-;;(defentry set-XEvent-xcirculaterequest (int XCirculateRequestEvent) ( void 
"set_XEvent_xcirculaterequest" ))
-;;(defentry XEvent-xcirculate (int) ( XCirculateEvent "XEvent_xcirculate" ))
-;;(defentry set-XEvent-xcirculate (int XCirculateEvent) ( void 
"set_XEvent_xcirculate" ))
-;;(defentry XEvent-xconfigurerequest (int) ( XConfigureRequestEvent 
"XEvent_xconfigurerequest" ))
-;;(defentry set-XEvent-xconfigurerequest (int XConfigureRequestEvent) ( void 
"set_XEvent_xconfigurerequest" ))
-;;(defentry XEvent-xresizerequest (int) ( XResizeRequestEvent 
"XEvent_xresizerequest" ))
-;;(defentry set-XEvent-xresizerequest (int XResizeRequestEvent) ( void 
"set_XEvent_xresizerequest" ))
-;;(defentry XEvent-xgravity (int) ( XGravityEvent "XEvent_xgravity" ))
-;;(defentry set-XEvent-xgravity (int XGravityEvent) ( void 
"set_XEvent_xgravity" ))
-;;(defentry XEvent-xconfigure (int) ( XConfigureEvent "XEvent_xconfigure" ))
-;;(defentry set-XEvent-xconfigure (int XConfigureEvent) ( void 
"set_XEvent_xconfigure" ))
-;;(defentry XEvent-xreparent (int) ( XReparentEvent "XEvent_xreparent" ))
-;;(defentry set-XEvent-xreparent (int XReparentEvent) ( void 
"set_XEvent_xreparent" ))
-;;(defentry XEvent-xmaprequest (int) ( XMapRequestEvent "XEvent_xmaprequest" ))
-;;(defentry set-XEvent-xmaprequest (int XMapRequestEvent) ( void 
"set_XEvent_xmaprequest" ))
-;;(defentry XEvent-xmap (int) ( XMapEvent "XEvent_xmap" ))
-;;(defentry set-XEvent-xmap (int XMapEvent) ( void "set_XEvent_xmap" ))
-;;(defentry XEvent-xunmap (int) ( XUnmapEvent "XEvent_xunmap" ))
-;;(defentry set-XEvent-xunmap (int XUnmapEvent) ( void "set_XEvent_xunmap" ))
-;;(defentry XEvent-xdestroywindow (int) ( XDestroyWindowEvent 
"XEvent_xdestroywindow" ))
-;;(defentry set-XEvent-xdestroywindow (int XDestroyWindowEvent) ( void 
"set_XEvent_xdestroywindow" ))
-;;(defentry XEvent-xcreatewindow (int) ( XCreateWindowEvent 
"XEvent_xcreatewindow" ))
-;;(defentry set-XEvent-xcreatewindow (int XCreateWindowEvent) ( void 
"set_XEvent_xcreatewindow" ))
-;;(defentry XEvent-xvisibility (int) ( XVisibilityEvent "XEvent_xvisibility" ))
-;;(defentry set-XEvent-xvisibility (int XVisibilityEvent) ( void 
"set_XEvent_xvisibility" ))
-;;(defentry XEvent-xnoexpose (int) ( XNoExposeEvent "XEvent_xnoexpose" ))
-;;(defentry set-XEvent-xnoexpose (int XNoExposeEvent) ( void 
"set_XEvent_xnoexpose" ))
-;;(defentry XEvent-xgraphicsexpose (int) ( XGraphicsExposeEvent 
"XEvent_xgraphicsexpose" ))
-;;(defentry set-XEvent-xgraphicsexpose (int XGraphicsExposeEvent) ( void 
"set_XEvent_xgraphicsexpose" ))
-;;(defentry XEvent-xexpose (int) ( XExposeEvent "XEvent_xexpose" ))
-;;(defentry set-XEvent-xexpose (int XExposeEvent) ( void "set_XEvent_xexpose" 
))
-;;(defentry XEvent-xfocus (int) ( XFocusChangeEvent "XEvent_xfocus" ))
-;;(defentry set-XEvent-xfocus (int XFocusChangeEvent) ( void 
"set_XEvent_xfocus" ))
-;;(defentry XEvent-xcrossing (int) ( XCrossingEvent "XEvent_xcrossing" ))
-;;(defentry set-XEvent-xcrossing (int XCrossingEvent) ( void 
"set_XEvent_xcrossing" ))
-;;(defentry XEvent-xmotion (int) ( XMotionEvent "XEvent_xmotion" ))
-;;(defentry set-XEvent-xmotion (int XMotionEvent) ( void "set_XEvent_xmotion" 
))
-;;(defentry XEvent-xbutton (int) ( XButtonEvent "XEvent_xbutton" ))
-;;(defentry set-XEvent-xbutton (int XButtonEvent) ( void "set_XEvent_xbutton" 
))
-;;(defentry XEvent-xkey (int) ( XKeyEvent "XEvent_xkey" ))
-;;(defentry set-XEvent-xkey (int XKeyEvent) ( void "set_XEvent_xkey" ))
-;;(defentry XEvent-xany (int) ( XAnyEvent "XEvent_xany" ))
-;;(defentry set-XEvent-xany (int XAnyEvent) ( void "set_XEvent_xany" ))
-;;(defentry XEvent-type (int) ( int "XEvent_type" ))
-;;(defentry set-XEvent-type (int int) ( void "set_XEvent_type" ))
+(defentry make-XEvent () ( fixnum  "make_XEvent" ))
+;;(defentry XEvent-pad[24] (fixnum) ( fixnum "XEvent_pad[24]" ))
+;;(defentry set-XEvent-pad[24] (fixnum fixnum) ( void "set_XEvent_pad[24]" ))
+;;(defentry XEvent-xkeymap (fixnum) ( XKeymapEvent "XEvent_xkeymap" ))
+;;(defentry set-XEvent-xkeymap (fixnum XKeymapEvent) ( void 
"set_XEvent_xkeymap" ))
+;;(defentry XEvent-xerror (fixnum) ( XErrorEvent "XEvent_xerror" ))
+;;(defentry set-XEvent-xerror (fixnum XErrorEvent) ( void "set_XEvent_xerror" 
))
+;;(defentry XEvent-xmapping (fixnum) ( XMappingEvent "XEvent_xmapping" ))
+;;(defentry set-XEvent-xmapping (fixnum XMappingEvent) ( void 
"set_XEvent_xmapping" ))
+;;(defentry XEvent-xclient (fixnum) ( XClientMessageEvent "XEvent_xclient" ))
+;;(defentry set-XEvent-xclient (fixnum XClientMessageEvent) ( void 
"set_XEvent_xclient" ))
+;;(defentry XEvent-xcolormap (fixnum) ( XColormapEvent "XEvent_xcolormap" ))
+;;(defentry set-XEvent-xcolormap (fixnum XColormapEvent) ( void 
"set_XEvent_xcolormap" ))
+;;(defentry XEvent-xselection (fixnum) ( XSelectionEvent "XEvent_xselection" ))
+;;(defentry set-XEvent-xselection (fixnum XSelectionEvent) ( void 
"set_XEvent_xselection" ))
+;;(defentry XEvent-xselectionrequest (fixnum) ( XSelectionRequestEvent 
"XEvent_xselectionrequest" ))
+;;(defentry set-XEvent-xselectionrequest (fixnum XSelectionRequestEvent) ( 
void "set_XEvent_xselectionrequest" ))
+;;(defentry XEvent-xselectionclear (fixnum) ( XSelectionClearEvent 
"XEvent_xselectionclear" ))
+;;(defentry set-XEvent-xselectionclear (fixnum XSelectionClearEvent) ( void 
"set_XEvent_xselectionclear" ))
+;;(defentry XEvent-xproperty (fixnum) ( XPropertyEvent "XEvent_xproperty" ))
+;;(defentry set-XEvent-xproperty (fixnum XPropertyEvent) ( void 
"set_XEvent_xproperty" ))
+;;(defentry XEvent-xcirculaterequest (fixnum) ( XCirculateRequestEvent 
"XEvent_xcirculaterequest" ))
+;;(defentry set-XEvent-xcirculaterequest (fixnum XCirculateRequestEvent) ( 
void "set_XEvent_xcirculaterequest" ))
+;;(defentry XEvent-xcirculate (fixnum) ( XCirculateEvent "XEvent_xcirculate" ))
+;;(defentry set-XEvent-xcirculate (fixnum XCirculateEvent) ( void 
"set_XEvent_xcirculate" ))
+;;(defentry XEvent-xconfigurerequest (fixnum) ( XConfigureRequestEvent 
"XEvent_xconfigurerequest" ))
+;;(defentry set-XEvent-xconfigurerequest (fixnum XConfigureRequestEvent) ( 
void "set_XEvent_xconfigurerequest" ))
+;;(defentry XEvent-xresizerequest (fixnum) ( XResizeRequestEvent 
"XEvent_xresizerequest" ))
+;;(defentry set-XEvent-xresizerequest (fixnum XResizeRequestEvent) ( void 
"set_XEvent_xresizerequest" ))
+;;(defentry XEvent-xgravity (fixnum) ( XGravityEvent "XEvent_xgravity" ))
+;;(defentry set-XEvent-xgravity (fixnum XGravityEvent) ( void 
"set_XEvent_xgravity" ))
+;;(defentry XEvent-xconfigure (fixnum) ( XConfigureEvent "XEvent_xconfigure" ))
+;;(defentry set-XEvent-xconfigure (fixnum XConfigureEvent) ( void 
"set_XEvent_xconfigure" ))
+;;(defentry XEvent-xreparent (fixnum) ( XReparentEvent "XEvent_xreparent" ))
+;;(defentry set-XEvent-xreparent (fixnum XReparentEvent) ( void 
"set_XEvent_xreparent" ))
+;;(defentry XEvent-xmaprequest (fixnum) ( XMapRequestEvent 
"XEvent_xmaprequest" ))
+;;(defentry set-XEvent-xmaprequest (fixnum XMapRequestEvent) ( void 
"set_XEvent_xmaprequest" ))
+;;(defentry XEvent-xmap (fixnum) ( XMapEvent "XEvent_xmap" ))
+;;(defentry set-XEvent-xmap (fixnum XMapEvent) ( void "set_XEvent_xmap" ))
+;;(defentry XEvent-xunmap (fixnum) ( XUnmapEvent "XEvent_xunmap" ))
+;;(defentry set-XEvent-xunmap (fixnum XUnmapEvent) ( void "set_XEvent_xunmap" 
))
+;;(defentry XEvent-xdestroywindow (fixnum) ( XDestroyWindowEvent 
"XEvent_xdestroywindow" ))
+;;(defentry set-XEvent-xdestroywindow (fixnum XDestroyWindowEvent) ( void 
"set_XEvent_xdestroywindow" ))
+;;(defentry XEvent-xcreatewindow (fixnum) ( XCreateWindowEvent 
"XEvent_xcreatewindow" ))
+;;(defentry set-XEvent-xcreatewindow (fixnum XCreateWindowEvent) ( void 
"set_XEvent_xcreatewindow" ))
+;;(defentry XEvent-xvisibility (fixnum) ( XVisibilityEvent 
"XEvent_xvisibility" ))
+;;(defentry set-XEvent-xvisibility (fixnum XVisibilityEvent) ( void 
"set_XEvent_xvisibility" ))
+;;(defentry XEvent-xnoexpose (fixnum) ( XNoExposeEvent "XEvent_xnoexpose" ))
+;;(defentry set-XEvent-xnoexpose (fixnum XNoExposeEvent) ( void 
"set_XEvent_xnoexpose" ))
+;;(defentry XEvent-xgraphicsexpose (fixnum) ( XGraphicsExposeEvent 
"XEvent_xgraphicsexpose" ))
+;;(defentry set-XEvent-xgraphicsexpose (fixnum XGraphicsExposeEvent) ( void 
"set_XEvent_xgraphicsexpose" ))
+;;(defentry XEvent-xexpose (fixnum) ( XExposeEvent "XEvent_xexpose" ))
+;;(defentry set-XEvent-xexpose (fixnum XExposeEvent) ( void 
"set_XEvent_xexpose" ))
+;;(defentry XEvent-xfocus (fixnum) ( XFocusChangeEvent "XEvent_xfocus" ))
+;;(defentry set-XEvent-xfocus (fixnum XFocusChangeEvent) ( void 
"set_XEvent_xfocus" ))
+;;(defentry XEvent-xcrossing (fixnum) ( XCrossingEvent "XEvent_xcrossing" ))
+;;(defentry set-XEvent-xcrossing (fixnum XCrossingEvent) ( void 
"set_XEvent_xcrossing" ))
+;;(defentry XEvent-xmotion (fixnum) ( XMotionEvent "XEvent_xmotion" ))
+;;(defentry set-XEvent-xmotion (fixnum XMotionEvent) ( void 
"set_XEvent_xmotion" ))
+;;(defentry XEvent-xbutton (fixnum) ( XButtonEvent "XEvent_xbutton" ))
+;;(defentry set-XEvent-xbutton (fixnum XButtonEvent) ( void 
"set_XEvent_xbutton" ))
+;;(defentry XEvent-xkey (fixnum) ( XKeyEvent "XEvent_xkey" ))
+;;(defentry set-XEvent-xkey (fixnum XKeyEvent) ( void "set_XEvent_xkey" ))
+;;(defentry XEvent-xany (fixnum) ( XAnyEvent "XEvent_xany" ))
+;;(defentry set-XEvent-xany (fixnum XAnyEvent) ( void "set_XEvent_xany" ))
+;;(defentry XEvent-type (fixnum) ( fixnum "XEvent_type" ))
+;;(defentry set-XEvent-type (fixnum fixnum) ( void "set_XEvent_type" ))
 
 

Index: xgcl-2/gcl_dwtest.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_dwtest.lsp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- xgcl-2/gcl_dwtest.lsp       9 Jun 2006 15:53:32 -0000       1.1.2.2
+++ xgcl-2/gcl_dwtest.lsp       20 Jun 2006 23:00:10 -0000      1.1.2.3
@@ -30,11 +30,6 @@
 (defvar *myw*)  ; my window
 (defvar myw)
 
-(defun xgcl nil
-  (format t "Welcome to xgcl!  Please see dwdoc for details.~%  Or try 
(wtestc) .. (wtestk) for examples.~%")
-  (wtesta)
-  (wtestb))
-
 ; Make a window to play in.
 (defun wtesta ()
   (setq myw (setq *myw* (window-create 300 300 "test window"))) )

Index: xgcl-2/gcl_general.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_general.lsp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- xgcl-2/gcl_general.lsp      9 Jun 2006 15:53:32 -0000       1.1.2.2
+++ xgcl-2/gcl_general.lsp      20 Jun 2006 23:00:10 -0000      1.1.2.3
@@ -26,19 +26,20 @@
 ; 15 Sep 05: Edited by G. Novak to change C function headers to new form
 ; 24 Jan 06: Edited by G. Novak to remove vertex-array entries.
 
-(defentry free (int) (void free))
-(defentry calloc(int int) (int calloc))
-(defentry char-array (int) (int char_array))
-(defentry char-pos (int int) (char char_pos))
-(defentry int-array (int) (int int_array))
-(defentry int-pos (int int) (int int_pos))
-(defentry set-char-array (int int char) (void set_char_array))
-(defentry set-int-array (int int int) (void set_int_array))
+(clines "#include \"xgcl.h\"")
+(defentry free (string) (void free))
+(defentry calloc(fixnum fixnum) (string calloc))
+(defentry char-array (fixnum) (fixnum char_array))
+(defentry char-pos (fixnum fixnum) (char char_pos))
+(defentry int-array (fixnum) (fixnum int_array))
+(defentry int-pos (fixnum fixnum) (fixnum int_pos))
+(defentry set-char-array (fixnum fixnum char) (void set_char_array))
+(defentry set-int-array (fixnum fixnum fixnum) (void set_int_array))
 
 ;;from mark ring's function
 ;; General routines.
 (defCfun "object  get_c_string(object s)" 0
-  " return( s->st.st_self);"
+  " return((object)s->st.st_self);"
   )
 (defentry get_c_string_2 (object) (object get_c_string))
 
@@ -47,24 +48,24 @@
 (defentry get-c-string (object) (object "(object)object_to_string"))
 
 ;; General routines.
-(defCfun "object lisp_string(object a_string, int c_string) " 0
-  "int len = strlen(c_string);"
+(defCfun "object lisp_string(object a_string, fixnum c_string) " 0
+  "fixnum len = strlen((void *)c_string);"
   "a_string->st.st_dim = len;"
   "a_string->st.st_fillp = len;"
-  "a_string->st.st_self = c_string;"
+  "a_string->st.st_self = (void *)c_string;"
   "return(a_string);"
   )
 
-(defentry  lisp-string-2 (object int ) (object lisp_string))
+(defentry  lisp-string-2 (object fixnum ) (object lisp_string))
 (defun lisp-string (a-string )
   (lisp-string-2 "" a-string ))
 
 ;;modified from mark ring's function
 ;; General routines.
-(defCfun "int   get_st_point(object s)" 0
-  " return((int) s->st.st_self);"
+(defCfun "fixnum   get_st_point(object s)" 0
+  " return((fixnum) s->st.st_self);"
   )
-(defentry get-st-point2 (object) (int get_c_string))
+(defentry get-st-point2 (object) (fixnum "(fixnum)get_c_string"))
 
 ;; make sure string is null terminated
 (defun  get-st-point (string)

Index: xgcl-2/gcl_sysinit.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_sysinit.lsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- xgcl-2/gcl_sysinit.lsp      5 Jan 2006 17:55:35 -0000       1.1.2.1
+++ xgcl-2/gcl_sysinit.lsp      20 Jun 2006 23:00:10 -0000      1.1.2.2
@@ -48,7 +48,7 @@
        (clines "load1(\"../xgcl-2/sysdef.lisp\");")
      ,@(sloop::sloop for x  in files
        for f  = (substitute #\_ #\-  x)
-       for ff =  (namestring (truename (format nil "~a.o" x)))
+       for ff =  (namestring (merge-pathnames (make-pathname :type "o") 
(pathname (format nil "~a.lsp" x))))
        do (princ ff st) (princ " " st)
        collect
        `(clines ,(Format nil "init_or_load(init_~a,\"~a\");" (string-downcase 
f) ff))

Index: xgcl-2/general-c.c
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/general-c.c,v
retrieving revision 1.1.1.1.2.1.18.2
retrieving revision 1.1.1.1.2.1.18.3
diff -u -b -r1.1.1.1.2.1.18.2 -r1.1.1.1.2.1.18.3
--- xgcl-2/general-c.c  9 Jun 2006 15:53:32 -0000       1.1.1.1.2.1.18.2
+++ xgcl-2/general-c.c  20 Jun 2006 23:00:10 -0000      1.1.1.1.2.1.18.3
@@ -24,7 +24,7 @@
 /* 24 Jan 06: edited by G. Novak to remove vertex_array functions,
               remove includes, change function arg lists to new form */
 #include <stdlib.h>
-
+#define int long
 int char_array(int size)
 {
   return ((int) calloc (size, sizeof(char)));




reply via email to

[Prev in Thread] Current Thread [Next in Thread]