[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gcl-commits] gcl makefile o/cmpaux.c cmpnew/gcl_cmptop.lsp c...
|
From: |
Camm Maguire |
|
Subject: |
[Gcl-commits] gcl makefile o/cmpaux.c cmpnew/gcl_cmptop.lsp c... |
|
Date: |
Tue, 20 Jun 2006 22:53:17 +0000 |
CVSROOT: /cvsroot/gcl
Module name: gcl
Changes by: Camm Maguire <camm> 06/06/20 22:53:17
Modified files:
. : makefile
o : cmpaux.c
cmpnew : gcl_cmptop.lsp gcl_cmptype.lsp
debian : changelog
h : protoize.h
unixport : init_ansi_gcl.lsp.in init_gcl.lsp.in
init_mod_gcl.lsp.in init_pcl_gcl.lsp.in
makefile
xgcl-2 : Events.c XStruct-2.c XStruct-4.c Xutil-2.c
dwdoc.tex gcl_X.lsp gcl_XStruct-l-3.lsp
gcl_Xinit.lsp gcl_Xlib.lsp gcl_Xstruct.lsp
gcl_Xutil.lsp gcl_defentry-events.lsp
gcl_draw-gates.lsp gcl_draw.lsp
gcl_drawtrans.lsp gcl_dwindow.lsp
gcl_dwtest.lsp gcl_dwtrans.lsp gcl_general.lsp
gcl_menu-set.lsp gcl_sysinit.lsp general-c.c
makefile sysdef.lisp
Log message:
xgcl integration; smaller images; fewer recompiles; eq type
comparison;128M more heap
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gcl/makefile?cvsroot=gcl&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/gcl/o/cmpaux.c?cvsroot=gcl&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gcl/cmpnew/gcl_cmptop.lsp?cvsroot=gcl&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gcl/cmpnew/gcl_cmptype.lsp?cvsroot=gcl&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gcl/debian/changelog?cvsroot=gcl&r1=1.1093&r2=1.1094
http://cvs.savannah.gnu.org/viewcvs/gcl/h/protoize.h?cvsroot=gcl&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/gcl/unixport/init_ansi_gcl.lsp.in?cvsroot=gcl&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gcl/unixport/init_gcl.lsp.in?cvsroot=gcl&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gcl/unixport/init_mod_gcl.lsp.in?cvsroot=gcl&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gcl/unixport/init_pcl_gcl.lsp.in?cvsroot=gcl&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gcl/unixport/makefile?cvsroot=gcl&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/Events.c?cvsroot=gcl&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/XStruct-2.c?cvsroot=gcl&r1=1.1.1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/XStruct-4.c?cvsroot=gcl&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/Xutil-2.c?cvsroot=gcl&r1=1.1.1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/dwdoc.tex?cvsroot=gcl&r1=1.1.1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_X.lsp?cvsroot=gcl&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_XStruct-l-3.lsp?cvsroot=gcl&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_Xinit.lsp?cvsroot=gcl&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_Xlib.lsp?cvsroot=gcl&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_Xstruct.lsp?cvsroot=gcl&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_Xutil.lsp?cvsroot=gcl&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_defentry-events.lsp?cvsroot=gcl&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_draw-gates.lsp?cvsroot=gcl&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_draw.lsp?cvsroot=gcl&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_drawtrans.lsp?cvsroot=gcl&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_dwindow.lsp?cvsroot=gcl&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_dwtest.lsp?cvsroot=gcl&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_dwtrans.lsp?cvsroot=gcl&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_general.lsp?cvsroot=gcl&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_menu-set.lsp?cvsroot=gcl&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/gcl_sysinit.lsp?cvsroot=gcl&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/general-c.c?cvsroot=gcl&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/makefile?cvsroot=gcl&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gcl/xgcl-2/sysdef.lisp?cvsroot=gcl&r1=1.3&r2=1.4
Patches:
Index: makefile
===================================================================
RCS file: /cvsroot/gcl/gcl/makefile,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- makefile 24 Mar 2006 03:57:00 -0000 1.122
+++ makefile 20 Jun 2006 22:53:16 -0000 1.123
@@ -35,9 +35,13 @@
VERSION=`cat majvers`.`cat minvers`
-all: $(BUILD_BFD) $(PORTDIR)/$(FLISP) command cmpnew/gcl_collectfn.o
lsp/gcl_info.o do-gcl-tk do-info pargcl_all
+all: $(BUILD_BFD) system command cmpnew/gcl_collectfn.o lsp/gcl_info.o
do-gcl-tk do-info pargcl_all
-ASRC:=$(shell ls -1 o/*.c o/*.d o/*.h h/*.h lsp/*.lsp cmpnew/*.lsp mod/*.lsp
pcl/*sp clcs/*sp)
+system: $(PORTDIR)/$(FLISP)
+ [ "$X_LIBS" == "" ] || cd xgcl-2 && make saved_xgcl LISP=../$< && mv
saved_xgcl ../$(PORTDIR)/$(FLISP)
+ touch $@
+
+ASRC:=$(shell ls -1 o/*.c o/*.d o/*.h h/*.h lsp/*.lsp cmpnew/*.lsp mod/*.lsp
pcl/*sp clcs/*sp xgcl-2/*p)
TAGS: $(ASRC)
etags $^
@@ -308,7 +312,7 @@
rm -rf windows/Output
rm -f ansi-tests/test_results ansi-tests/gazonk* \
ansi-tests/generated-eval-when-test-file.lisp
- rm -f config.log config.cache config.status $(PORTDIR)/gmon.out
gcl.script machine
+ rm -f config.log config.cache config.status $(PORTDIR)/gmon.out
gcl.script machine system
clean: gclclean
@@ -337,7 +341,7 @@
-e "/End for cmpinclude/,50000d" > tmpx
echo -e '#include "h/config.h"\n#ifdef SGC\n"#define
SGC"\n#else\n"#undef SGC"\n#endif' | cpp 2>/dev/null| grep -v '^ *$$' | tail
-1l | tr -d '"' >>tmpx
cat $(CMPINCLUDE_FILES) >> tmpx
- cpp -P -dD tmpx |grep -v STDC_HOSTED | grep -v __VERSION__ | grep -v
"^static *__" >tmpx1 && mv tmpx1 tmpx
+ cpp -P -dD tmpx |grep -v __STDC_ | grep -v __GNUC_ | grep -v
__VERSION__ | grep -v "^static *__" >tmpx1 && mv tmpx1 tmpx
./xbin/move-if-changed mv tmpx h/cmpinclude.h
./xbin/move-if-changed cp h/cmpinclude.h o/cmpinclude.h
Index: o/cmpaux.c
===================================================================
RCS file: /cvsroot/gcl/gcl/o/cmpaux.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- o/cmpaux.c 1 Dec 2005 23:12:22 -0000 1.29
+++ o/cmpaux.c 20 Jun 2006 22:53:16 -0000 1.30
@@ -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:
+ FEcannot_coerce(sLinteger,x);
+ }
+ return(i);
+}
+
float
object_to_float(object x)
{
Index: cmpnew/gcl_cmptop.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/cmpnew/gcl_cmptop.lsp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- cmpnew/gcl_cmptop.lsp 17 Jun 2006 19:26:58 -0000 1.38
+++ cmpnew/gcl_cmptop.lsp 20 Jun 2006 22:53:16 -0000 1.39
@@ -1738,7 +1738,9 @@
(wt-h header ";")
(wt-nl1 "{")
(wt-nl1 "object *vs=vs_top;")
- (wt-nl1 "object *old_top=vs_top+" vs-size ";")
+ (when (or (> vs-size 0)
+ (some (lambda (x) (or (not (stringp x)) (not (constantp x)))) body))
+ (wt-nl1 "object *old_top=vs_top+" vs-size ";"))
(when (> vs-size 0) (wt-nl "vs_top=old_top;"))
(wt-nl1 "{")
(dolist** (s body)
@@ -1806,7 +1808,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 int fixnum float double string)))
"The C-type ~s is illegal." x))
(setq cfspec (caddr args))
(cond ((symbolp cfspec)
@@ -1816,7 +1818,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 int fixnum float double
string))
(consp (cdr cfspec))
(or (symbolp (cadr cfspec)) (stringp (cadr cfspec)))
@@ -1852,7 +1854,7 @@
(do ((types arg-types (cdr types))
(i 0 (1+ i)))
(nil)
- (declare (object types) (fixnum i))
+ (declare (fixnum i))
(case (car types)
(object (wt-nl "vs_base[" i "]"))
(otherwise
@@ -1868,7 +1870,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: cmpnew/gcl_cmptype.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/cmpnew/gcl_cmptype.lsp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- cmpnew/gcl_cmptype.lsp 19 Jun 2006 00:52:07 -0000 1.36
+++ cmpnew/gcl_cmptype.lsp 20 Jun 2006 22:53:16 -0000 1.37
@@ -662,18 +662,20 @@
(let ((t1 (cmpntww type1))
(t2 (cmpntww type2)))
(let ((z (type-and t1 t2)))
- (when (and (equal z t2) (not (eq z t2))) (cmpwarn "eq type2 prob: ~s
~s~%" t1 t2))
+; (when (and (equal z t2) (not (eq z t2))) (cmpwarn "eq type2 prob: ~s
~s~%" t1 t2))
; (when (not (eq type1 (cmp-norm-tp
type1))) (cmpwarn "unnorm type1 ~s~%" type1))
; (when (not (eq type2 (cmp-norm-tp
type2))) (cmpwarn "unnorm type2 ~s~%" type2))
- (equal z t2))))
+; (equal z t2)
+ (eq z t2))))
(defun type<= (type1 type2)
(let ((t1 (cmpntww type1))
(t2 (cmpntww type2)))
(let ((z (type-and t2 t1)))
- (when (and (equal z t1) (not (eq z t1))) (cmpwarn "eq type1 prob: ~s
~s~%" t1 t2))
+; (when (and (equal z t1) (not (eq z t1))) (cmpwarn "eq type1 prob: ~s
~s~%" t1 t2))
; (when (not (eq type1 (cmp-norm-tp
type1))) (cmpwarn "unnorm type1 ~s~%" type1))
; (when (not (eq type2 (cmp-norm-tp
type2))) (cmpwarn "unnorm type2 ~s~%" type2))
- (equal z t1))))
+; (equal z t1))))
+ (eq z t1))))
; (equal (type-and type2 type1) type1))
Index: debian/changelog
===================================================================
RCS file: /cvsroot/gcl/gcl/debian/changelog,v
retrieving revision 1.1093
retrieving revision 1.1094
diff -u -b -r1.1093 -r1.1094
--- debian/changelog 20 Jun 2006 15:12:17 -0000 1.1093
+++ debian/changelog 20 Jun 2006 22:53:16 -0000 1.1094
@@ -184,8 +184,10 @@
* preliminary temp stream facility
* integrate temp-file facility into do-recompile
* restore automatic heap start lowering
+ * xgcl integration; smaller images; fewer recompiles; eq type
+ comparison;128M more heap
- -- Camm Maguire <address@hidden> Tue, 20 Jun 2006 15:11:52 +0000
+ -- Camm Maguire <address@hidden> Tue, 20 Jun 2006 22:50:41 +0000
gclcvs (2.7.0-53) unstable; urgency=low
Index: h/protoize.h
===================================================================
RCS file: /cvsroot/gcl/gcl/h/protoize.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- h/protoize.h 16 May 2006 16:46:30 -0000 1.65
+++ h/protoize.h 20 Jun 2006 22:53:16 -0000 1.66
@@ -142,6 +142,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: unixport/init_ansi_gcl.lsp.in
===================================================================
RCS file: /cvsroot/gcl/gcl/unixport/init_ansi_gcl.lsp.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- unixport/init_ansi_gcl.lsp.in 5 Jun 2006 22:02:46 -0000 1.26
+++ unixport/init_ansi_gcl.lsp.in 20 Jun 2006 22:53:16 -0000 1.27
@@ -1,3 +1,4 @@
+(setq si::*optimize-maximum-pages* nil)
(push :common-lisp *features*)
(push :ansi-cl *features*)
@@ -300,12 +301,8 @@
(setf system:*default-time-zone* (get-system-time-zone))
(setf system:*default-time-zone* 6)))
- (if (fboundp 'si::user-init) (si::user-init))
- (setq si::*disable-recompile* nil)
- (si::do-recompile "gcl_recompile.lsp")
- (maphash (lambda (x y) (when (si::call-sig y) (proclaim `(ftype (function
,@(si::call-sig y)) ,x)))) si::*call-hash-table*)
- (conditions::install-clcs-symbols)
(si::set-up-top-level)
+ (if (fboundp 'si::user-init) (si::user-init))
(setq si::*gcl-extra-version* @LI-EXTVERS@
si::*gcl-minor-version* @LI-MINVERS@
Index: unixport/init_gcl.lsp.in
===================================================================
RCS file: /cvsroot/gcl/gcl/unixport/init_gcl.lsp.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- unixport/init_gcl.lsp.in 5 Jun 2006 22:02:46 -0000 1.24
+++ unixport/init_gcl.lsp.in 20 Jun 2006 22:53:16 -0000 1.25
@@ -1,3 +1,4 @@
+(setq si::*optimize-maximum-pages* nil)
(make-package "COMPILER" :use '("LISP"))
(make-package "SLOOP" :use '("LISP"))
(make-package "SERROR" :use '("LISP" "SLOOP"))
@@ -77,13 +78,6 @@
(si::set-up-top-level)
(if (fboundp 'si::user-init) (si::user-init))
-;(break)
-; (si::use-fast-links nil)
- (setq si::*disable-recompile* nil)
- (si::do-recompile "gcl_recompile.lsp")
- (maphash (lambda (x y) (when (si::call-sig y) (proclaim `(ftype (function
,@(si::call-sig y)) ,x)))) si::*call-hash-table*)
-; (si::use-fast-links t)
-; (si::set-up-top-level)
(setq si::*gcl-extra-version* @LI-EXTVERS@
si::*gcl-minor-version* @LI-MINVERS@
Index: unixport/init_mod_gcl.lsp.in
===================================================================
RCS file: /cvsroot/gcl/gcl/unixport/init_mod_gcl.lsp.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- unixport/init_mod_gcl.lsp.in 5 Jun 2006 22:02:46 -0000 1.11
+++ unixport/init_mod_gcl.lsp.in 20 Jun 2006 22:53:16 -0000 1.12
@@ -68,11 +68,8 @@
(setf system:*default-time-zone* (get-system-time-zone))
(setf system:*default-time-zone* 6)))
- (if (fboundp 'si::user-init) (si::user-init))
- (setq si::*disable-recompile* nil)
- (si::do-recompile "gcl_recompile.lsp")
- (maphash (lambda (x y) (when (si::call-sig y) (proclaim `(ftype (function
,@(si::call-sig y)) ,x)))) si::*call-hash-table*)
(si::set-up-top-level)
+ (if (fboundp 'si::user-init) (si::user-init))
(setq si::*gcl-version* @LI-MINVERS@ si::*gcl-major-version* @LI-MAJVERS@)
(setq compiler::*cc* @LI-CC@)
Index: unixport/init_pcl_gcl.lsp.in
===================================================================
RCS file: /cvsroot/gcl/gcl/unixport/init_pcl_gcl.lsp.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- unixport/init_pcl_gcl.lsp.in 5 Jun 2006 22:02:46 -0000 1.16
+++ unixport/init_pcl_gcl.lsp.in 20 Jun 2006 22:53:16 -0000 1.17
@@ -86,11 +86,8 @@
(setf system:*default-time-zone* (get-system-time-zone))
(setf system:*default-time-zone* 6)))
- (if (fboundp 'si::user-init) (si::user-init))
- (setq si::*disable-recompile* nil)
- (si::do-recompile "gcl_recompile.lsp")
- (maphash (lambda (x y) (when (si::call-sig y) (proclaim `(ftype (function
,@(si::call-sig y)) ,x)))) si::*call-hash-table*)
(si::set-up-top-level)
+ (if (fboundp 'si::user-init) (si::user-init))
(setq si::*gcl-extra-version* @LI-EXTVERS@
si::*gcl-minor-version* @LI-MINVERS@
Index: unixport/makefile
===================================================================
RCS file: /cvsroot/gcl/gcl/unixport/makefile,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- unixport/makefile 5 Jun 2006 22:02:46 -0000 1.72
+++ unixport/makefile 20 Jun 2006 22:53:16 -0000 1.73
@@ -113,16 +113,24 @@
$(CMPDIR)/gcl_cmpopt.lsp $(HDIR)/cmpinclude.h \
$(LSPDIR)/gcl_auto_new.lsp
- cp init_$*.lsp foo
- echo " (in-package \"USER\")(system:save-system \"address@hidden")"
>>foo
-# cp $(PORTDIR)/raw_$*$(EXE) $(PORTDIR)/raw_$*.bak$(EXE)
+
+ cat init_$*.lsp >foo
+ [ "$@" != "$(FLISP)" ] || echo "(let ((si::*disable-recompile* nil))
(si::do-recompile \"gcl_recompile.lsp\"))" >>foo
+ [ "$@" = "$(FLISP)" ] || echo " (in-package
\"USER\")(system:save-system \"address@hidden")" >>foo
rm -f gcl_recompile*
$(MAKE) raw_$*$(EXE)
$(PORTDIR)/raw_$*$(EXE) $(PORTDIR)/ $(LISPFLAGS) -libdir $(GCLDIR)/ <
foo
- $(MAKE) raw_$*$(EXE)
- $(PORTDIR)/raw_$*$(EXE) $(PORTDIR)/ $(LISPFLAGS) -libdir $(GCLDIR)/ <
foo
- ar x lib$*.a gcl_recompile.o
- touch -r lib$*.a gcl_recompile.o
+
+
+#*optimize-maximum-pages* setting is redundant here, but for good measure
+ [ "$@" != "$(FLISP)" ] || (echo "(setq si::*optimize-maximum-pages*
nil)" >foo;\
+ cat init_$*.lsp >>foo;\
+ echo "(setq si::*optimize-maximum-pages* t
si::*disable-recompile* nil)" >>foo;\
+ echo " (in-package \"USER\")(system:save-system
\"address@hidden")" >>foo;\
+ $(MAKE) raw_$*$(EXE);\
+ $(PORTDIR)/raw_$*$(EXE) $(PORTDIR)/
$(LISPFLAGS) -libdir $(GCLDIR)/ < foo;\
+ ar x lib$*.a gcl_recompile.o;\
+ touch -r lib$*.a gcl_recompile.o)
$(RSYM): $(SPECIAL_RSYM) $(HDIR)/mdefs.h
$(CC) $(CFLAGS) -I$(HDIR) -I$(ODIR) -o $(RSYM) $(SPECIAL_RSYM)
Index: xgcl-2/Events.c
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/Events.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xgcl-2/Events.c 20 Mar 2003 15:29:40 -0000 1.2
+++ xgcl-2/Events.c 20 Jun 2006 22:53:16 -0000 1.3
@@ -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.2
diff -u -b -r1.1.1.1 -r1.2
--- xgcl-2/XStruct-2.c 13 Aug 2002 03:24:28 -0000 1.1.1.1
+++ xgcl-2/XStruct-2.c 20 Jun 2006 22:53:17 -0000 1.2
@@ -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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- xgcl-2/XStruct-4.c 5 Jan 2006 19:00:57 -0000 1.3
+++ xgcl-2/XStruct-4.c 20 Jun 2006 22:53:17 -0000 1.4
@@ -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.2
diff -u -b -r1.1.1.1 -r1.2
--- xgcl-2/Xutil-2.c 13 Aug 2002 03:24:29 -0000 1.1.1.1
+++ xgcl-2/Xutil-2.c 20 Jun 2006 22:53:17 -0000 1.2
@@ -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/dwdoc.tex
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/dwdoc.tex,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -r1.1.1.1 -r1.2
--- xgcl-2/dwdoc.tex 13 Aug 2002 03:24:30 -0000 1.1.1.1
+++ xgcl-2/dwdoc.tex 20 Jun 2006 22:53:17 -0000 1.2
@@ -1,5 +1,5 @@
% dwdoc.tex Gordon S. Novak Jr.
-% 08 Oct 92; 08 Oct 93; 16 Nov 94; 05 Jan 95
+% 08 Oct 92; 08 Oct 93; 16 Nov 94; 05 Jan 95; 25 Jan 06; 26 Jan 06
\documentstyle[12pt]{article}
\setlength{\oddsidemargin}{0 in}
@@ -12,17 +12,21 @@
\begin{document}
-\begin{center}\Large{{\bf Interface from GCL to X Windows}} \\
+\Large
+\begin{center} {\bf Interface from GCL to X Windows} \\ \end{center}
+
+\normalsize
\vspace*{0.1in}
+\begin{center}
\large{Gordon S. Novak Jr. \\
Department of Computer Sciences \\
University of Texas at Austin \\
Austin, TX 78712} \\
\end{center}
-Software copyright \copyright 1994 by Gordon S. Novak Jr. and
+Software copyright \copyright \/ by Gordon S. Novak Jr. and
The University of Texas at Austin. Distribution and use are allowed
under the Gnu Public License. Also see the copyright section at the end
of this document for the copyright on X Consortium software.
@@ -33,7 +37,7 @@
This document describes a relatively easy-to-use interface between
XGCL (X version of Gnu Common Lisp) and X windows. The interface
-consists of two parts:
+consists of several parts:
\begin{enumerate}
\item Hiep Huu Nguyen has written (and adapted from X Consortium software)
an interface between GCL and Xlib, the X library in C.
@@ -44,6 +48,9 @@
\item The {\tt dwindow} functions described in this document, which call
the Xlib functions and provide an easier interface for Lisp programs.
+
+\item It is possible to make an interactive graphical interface
+within a web page; this is described in a section below.
\end{enumerate}
The source file for the interface (written in GLISP) is
{\tt dwindow.lsp}; this file is compiled into a file in plain Lisp,
@@ -62,8 +69,8 @@
({\tt window} is a Lisp data structure used by the {\tt dwindow} functions).
Both the Xlib and {\tt dwindow} functions are in the package {\tt xlib:}.
-The file {\tt imports.lsp} may be used to import the {\tt dwindow} symbols
-to the {\tt :user} package.
+In order to use these functions, the Lisp command {\tt (use-package 'xlib)}
+should be used to import the {\tt dwindow} symbols.
\section{Examples and Utilities}
@@ -93,6 +100,16 @@
{\tt (draw-out file names)} will write definitions of drawings in the
list {\tt names} to the file {\tt file}.
+\subsection{{\tt editors}}
+
+The file {\tt editorstrans.lsp} contains some interactive editing programs;
+it is a translation of the file {\tt editors.lsp} .
+One useful editor is the color editor; after entering {\tt (wtesta)}
+(in file {\tt dwtest.lsp}), enter {\tt (edit-color myw)} to edit a
+color. The result is an {\tt rgb} list as used in {\tt window-set-color}.
+
+A simple line editor and an Emacs-like text editor are described in sections
+\ref{texted} and \ref{emacsed} below.
\section{Menus}
@@ -227,10 +244,10 @@
Each of the {\tt buttons} in a picmenu is a list: \\
\vspace{-0.1in}
-{\tt \hspace*{0.5in} (name offset size highlightfn unhighlightfn)} \\
+{\tt \hspace*{0.5in} (buttonname offset size highlightfn unhighlightfn)} \\
\vspace{-0.1in}
-{\tt name} is the name of the button; it is the value returned when that
+{\tt buttonname} is the name of the button; it is the value returned when that
button is selected.
{\tt offset} is a vector {\tt (x y)} that gives the offset of the center
of the button from the lower-left corner of the picture.
@@ -556,7 +573,7 @@
{\tt *window-xcolor*}, or the specified color.
-\subsection{Character Input}
+\subsection{Character Input} \label{texted}
Characters can be input within a window by the call:
@@ -572,6 +589,27 @@
{\tt size} (default 100) is erased to the right of the initial caret.
+\subsection{Emacs-like Editing} \label{emacsed}
+
+{\tt window-edit} allows editing of text using an Emacs-subset editor.
+Only a few simple Emacs commands are implemented.
+\begin{verbatim}
+ (window-edit w x y width height &optional strings boxflg scroll endp)
+\end{verbatim}
+{\tt x y width height} specify the offset and size of the editing
+area; it is a good idea to draw a box around this area first.
+{\tt strings} is an initial list of strings; the return value is a list
+of strings.
+{\tt scroll} is number of lines to scroll down before displaying text,
+ or {\tt T} to have one line only and terminate on return.
+{\tt endp} is {\tt T} to begin editing at the end of the first line.
+Example:
+\begin{verbatim}
+ (window-draw-box-xy myw 48 48 204 204)
+ (window-edit myw 50 50 200 200 '("Now is the time" "for all" "good"))
+\end{verbatim}
+
+
\section{Mouse Interaction}
{\tt \hspace*{0.5in} (window-get-point w)} \\
@@ -705,6 +743,22 @@
due to an error.
+\section{Examples}
+
+Several interactive programs using this software for their graphical
+interface can be found at {\tt http://www.cs.utexas.edu/users/novak/}
+under the heading Software Demos.
+
+
+\section{Web Interface}
+
+This software allows a Lisp program to be used interactively within
+a web page. There are two approaches, either using an X server on
+the computer of the person viewing the web page, or using WeirdX, a
+Java program that emulates an X server. Details can be found at:
+{\tt http://www.cs.utexas.edu/users/novak/dwindow.html}
+
+
\section{Files}
\begin{tabular}{ll}
@@ -713,13 +767,19 @@
{\tt drawtrans.lsp} & {\tt draw.lsp} translated into plain Lisp \\
{\tt draw-gates.lsp} & Code to draw {\tt nand} gates etc. \\
{\tt dwdoc.tex} & \LaTeX \ source for this document \\
+{\tt dwexports.lsp} & exported symbols \\
+{\tt dwimportsb.lsp} & imported symbols \\
{\tt dwindow.lsp} & GLISP source code for {\tt dwindow} functions \\
{\tt dwtest.lsp} & Examples of use of {\tt dwindow} functions \\
{\tt dwtrans.lsp} & {\tt dwindow.lsp} translated into plain Lisp \\
+{\tt editors.lsp} & Editors for colors etc. \\
+{\tt editorstrans.lsp} & translation of {\tt editors.lsp} \\
{\tt gnu.license} & GNU General Public License \\
{\tt ice-cream.lsp} & Drawing of an ice cream cone made with {\tt draw} \\
-{\tt imports.lsp} & file to import symbols to {\tt :user} package \\
+{\tt lispserver.lsp} & Example web demo: a Lisp server \\
+{\tt lispservertrans.lsp} & translation of {\tt lispserver.lsp} \\
{\tt menu-set.lsp} & GLISP source code for menu-set functions \\
+{\tt menu-settrans.lsp} & translation of {\tt menu-set.lsp} \\
{\tt pcalc.lsp} & Pocket calculator implemented as a {\tt picmenu} \\
\end{tabular}
@@ -786,7 +846,7 @@
\vspace*{-.2in}
\begin{verbatim}
-(picmenu-button (list (name symbol)
+(picmenu-button (list (buttonname symbol)
(offset vector)
(size vector)
(highlightfn anything)
Index: xgcl-2/gcl_X.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_X.lsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xgcl-2/gcl_X.lsp 5 Jan 2006 19:00:57 -0000 1.2
+++ xgcl-2/gcl_X.lsp 20 Jun 2006 22:53:17 -0000 1.3
@@ -518,7 +518,7 @@
;; Polygon shapes
-(defconstant Complex 0 ) ;; paths may intersect
+;(defconstant Complex 0 ) ;; paths may intersect
(defconstant Nonconvex 1 ) ;; no paths intersect, but not convex
(defconstant Convex 2 ) ;; wholly convex
@@ -684,6 +684,6 @@
(defconstant MSBFirst 1)
-(defconstant NULL 0)
+;(defconstant NULL 0)
Index: xgcl-2/gcl_XStruct-l-3.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_XStruct-l-3.lsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xgcl-2/gcl_XStruct-l-3.lsp 5 Jan 2006 19:00:57 -0000 1.2
+++ xgcl-2/gcl_XStruct-l-3.lsp 20 Jun 2006 22:53:17 -0000 1.3
@@ -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_Xinit.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_Xinit.lsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xgcl-2/gcl_Xinit.lsp 5 Jan 2006 19:00:57 -0000 1.2
+++ xgcl-2/gcl_Xinit.lsp 20 Jun 2006 22:53:17 -0000 1.3
@@ -124,7 +124,7 @@
(set-xsizehints-height *default-size-hints* win-height)
(set-xsizehints-flags *default-size-hints* (+ Psize Pposition))
(XsetStandardProperties *default-display* a-window (get-c-string
window-name)
- (get-c-string icon-name) none null null
*default-size-hints*)
+ (get-c-string icon-name) none 0 0
*default-size-hints*)
;; the events or input a window can have are set with Xselectinput
;; (Xselectinput *default-display* a-window
Index: xgcl-2/gcl_Xlib.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_Xlib.lsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xgcl-2/gcl_Xlib.lsp 5 Jan 2006 19:00:57 -0000 1.2
+++ xgcl-2/gcl_Xlib.lsp 20 Jun 2006 22:53:17 -0000 1.3
@@ -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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xgcl-2/gcl_Xstruct.lsp 5 Jan 2006 19:00:57 -0000 1.2
+++ xgcl-2/gcl_Xstruct.lsp 20 Jun 2006 22:53:17 -0000 1.3
@@ -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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xgcl-2/gcl_Xutil.lsp 5 Jan 2006 19:00:57 -0000 1.2
+++ xgcl-2/gcl_Xutil.lsp 20 Jun 2006 22:53:17 -0000 1.3
@@ -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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xgcl-2/gcl_defentry-events.lsp 5 Jan 2006 19:00:57 -0000 1.2
+++ xgcl-2/gcl_defentry-events.lsp 20 Jun 2006 22:53:17 -0000 1.3
@@ -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_draw-gates.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_draw-gates.lsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xgcl-2/gcl_draw-gates.lsp 5 Jan 2006 19:00:57 -0000 1.2
+++ xgcl-2/gcl_draw-gates.lsp 20 Jun 2006 22:53:17 -0000 1.3
@@ -1,6 +1,6 @@
; draw-gates.lsp Gordon S. Novak Jr. 20 Oct 94
-; Copyright (c) 1994 Gordon S. Novak Jr. and The University of Texas at Austin.
+; Copyright (c) 1995 Gordon S. Novak Jr. and The University of Texas at Austin.
; See the file gnu.license .
@@ -21,8 +21,6 @@
; Written by: Gordon S. Novak Jr., Department of Computer Sciences,
; University of Texas at Austin 78712. address@hidden
-(in-package :user)
-
(defun draw-nand (w x y)
(window-draw-arc-xy w (+ x 24) (+ y 16) 16 16 -90 180)
(window-draw-circle-xy w (+ x 45) (+ y 16) 4)
Index: xgcl-2/gcl_draw.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_draw.lsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xgcl-2/gcl_draw.lsp 5 Jan 2006 19:00:57 -0000 1.2
+++ xgcl-2/gcl_draw.lsp 20 Jun 2006 22:53:17 -0000 1.3
@@ -1,10 +1,12 @@
-; draw.lsp Gordon S. Novak Jr. 11 Nov 94
+; draw.lsp Gordon S. Novak Jr. ; 05 Jan 04
; Functions to make drawings interactively
-; Copyright (c) 1994 Gordon S. Novak Jr. and The University of Texas at Austin.
+; Copyright (c) 2004 Gordon S. Novak Jr. and The University of Texas at Austin.
-; See the file gnu.license .
+; 11 Nov 94; 05 Jan 95; 15 Jan 98; 09 Feb 99; 04 Dec 00; 28 Feb 02
+
+; See the file gnu.license
; This program is free software; you can redistribute it and/or modify
; it under the terms of the GNU General Public License as published by
@@ -34,8 +36,6 @@
; The small square in the drawing menu is a "button" for picture menus.
; If buttons are used, a picmenu-spec will be produced with the program.
-(in-package :user)
-
(defvar *draw-window* nil)
(defvar *draw-window-width* 600)
(defvar *draw-window-height* 600)
@@ -151,15 +151,15 @@
(radius ((max radiusx radiusy)))
(center (offset + size / 2))
(delta ((sqrt (abs (radiusx ^ 2 - radiusy ^ 2)))))
- (p1 ((if (radiusx > radiusy)
- then (a vector x = (x center) - delta
+ (p1 ((if (radiusx > radiusy) ; 05 Jan 04
+ (a vector x = (x center) - delta
y = (y center))
- else (a vector x = (x center)
+ (a vector x = (x center)
y = (y center) - delta))))
(p2 ((if (radiusx > radiusy)
- then (a vector x = (x center) + delta
+ (a vector x = (x center) + delta
y = (y center))
- else (a vector x = (x center)
+ (a vector x = (x center)
y = (y center) + delta)))) )
msg ((draw draw-ellipse-draw)
(snap draw-ellipse-snap)
@@ -225,13 +225,14 @@
) ; glispobjects
+; 05 Jan 04
; Get drawing description associated with name
-(gldefun draw-desc (name\:symbol)
+(gldefun draw-desc ((name symbol))
(result draw-desc)
- (let (dd\:draw-desc)
- (dd \:= (draw-descr name))
- (if ~ dd then (dd \:= (a draw-desc with name = name))
- (setf (draw-descr name) dd))
+ (let ((dd draw-desc))
+ (dd = (draw-descr name))
+ (if ~ dd (progn (dd = (a draw-desc with name = name))
+ (setf (draw-descr name) dd)))
dd))
; Make a window to draw in.
@@ -243,22 +244,23 @@
"Draw window"))) )
; 09 Sep 92; 11 Sep 92; 14 Sep 92; 16 Sep 92; 21 Oct 92; 21 May 93; 17 Dec 93
-(gldefun draw (name\:symbol)
- (let (w dd done sel (redraw t) new\:draw-object)
- (w \:= (draw-window))
+; 05 Jan 04
+(gldefun draw ((name symbol))
+ (let (w dd done sel (redraw t) (new draw-object))
+ (w = (draw-window))
(open w)
(or *draw-menu-set* (draw-init-menus))
- (dd \:= (draw-desc name))
+ (dd = (draw-desc name))
(unless (member name *draw-objects*)
(setq *draw-objects* (nconc *draw-objects* (list name))))
(draw dd w)
(while ~ done do
- (sel \:= (menu-set-select *draw-menu-set* redraw))
- (redraw \:= nil)
+ (sel = (menu-set-select *draw-menu-set* redraw))
+ (redraw = nil)
(case (menu-name sel)
(command
(case (port sel)
- (done (done \:= t))
+ (done (done = t))
(move (draw-desc-move dd w))
(delete (draw-desc-delete dd w))
(copy (draw-desc-copy dd w))
@@ -275,192 +277,193 @@
(format t "Latex Mode is now ~A~%" *draw-latex-mode*))
))
(draw
- (new \:= nil)
+ (new = nil)
(case (port sel)
- (rectangle (new \:= (draw-box-get dd w)))
- (rcbox (new \:= (draw-rcbox-get dd w)))
- (circle (new \:= (draw-circle-get dd w)))
- (ellipse (new \:= (draw-ellipse-get dd w)))
- (line (new \:= (draw-line-get dd w)))
- (arrow (new \:= (draw-arrow-get dd w)))
- (dot (new \:= (draw-dot-get dd w)))
- (erase (new \:= (draw-erase-get dd w)))
- (button (new \:= (draw-button-get dd w)))
- (text (new \:= (draw-text-get dd w)))
- (refpt (new \:= (draw-refpt-get dd w))))
+ (rectangle (new = (draw-box-get dd w)))
+ (rcbox (new = (draw-rcbox-get dd w)))
+ (circle (new = (draw-circle-get dd w)))
+ (ellipse (new = (draw-ellipse-get dd w)))
+ (line (new = (draw-line-get dd w)))
+ (arrow (new = (draw-arrow-get dd w)))
+ (dot (new = (draw-dot-get dd w)))
+ (erase (new = (draw-erase-get dd w)))
+ (button (new = (draw-button-get dd w)))
+ (text (new = (draw-text-get dd w)))
+ (refpt (new = (draw-refpt-get dd w))))
(if new
- then ((offset new) _- (offset dd))
+ (progn ((offset new) _- (offset dd))
((objects dd) _+ new)
- (draw new w (offset dd))))
+ (draw new w (offset dd)))))
(background nil)) )
(setf (draw-descr name) dd)
(unless *draw-leave-window* (close w))
name ))
; 09 Sep 92
-(gldefun draw-desc-draw (dd\:draw-desc w\:window)
+(gldefun draw-desc-draw ((dd draw-desc) (w window))
(let ( (off (offset dd)) )
(clear w)
(for obj in (objects dd) (draw obj w off))
(force-output w) ))
-; 11 Sep 92; 12 Sep 92; 06 Oct 92
+; 11 Sep 92; 12 Sep 92; 06 Oct 92; 05 Jan 04
; Find a draw-object such that point p selects it
-(gldefun draw-desc-selected (dd\:draw-desc p\:vector)
+(gldefun draw-desc-selected ((dd draw-desc) (p vector))
(result draw-object)
(let (objs objsb obj)
- (objs \:= (for obj in objects when (selectedp obj p (offset dd))
+ (objs = (for obj in objects when (selectedp obj p (offset dd))
collect obj))
(if objs
- then (if (null (rest objs))
- then (obj \:= (first objs))
- else (objsb \:= (for z in objs
+ (if (null (rest objs))
+ (obj = (first objs))
+ (progn (objsb = (for z in objs
when (member (first z)
'(draw-button draw-dot))
collect z))
(if (and objsb (null (rest objsb)))
- then (obj \:= (first objsb)))) )
+ (obj = (first objsb)))) ) )
obj))
-; 11 Sep 92; 12 Sep 92; 13 Sep 92
+; 11 Sep 92; 12 Sep 92; 13 Sep 92; 05 Jan 04
; Find a draw-object such that point p selects it
-(gldefun draw-desc-find (dd\:draw-desc w\:window &optional crossflg\:boolean)
+(gldefun draw-desc-find ((dd draw-desc) (w window) &optional (crossflg
boolean))
(result draw-object)
(let (p obj)
(while ~ obj do
- (p \:= (if crossflg then (draw-get-cross dd w)
- else (draw-get-crosshairs dd w)))
- (obj \:= (draw-desc-selected dd p)) )
+ (p = (if crossflg (draw-get-cross dd w)
+ (draw-get-crosshairs dd w)))
+ (obj = (draw-desc-selected dd p)) )
obj))
; 15 Sep 92
-(gldefun draw-get-cross (dd\:draw-desc w\:window)
+(gldefun draw-get-cross ((dd draw-desc) (w window))
(result vector)
(draw-desc-snap dd (window-get-cross w)))
; 15 Sep 92
-(gldefun draw-get-crosshairs (dd\:draw-desc w\:window)
+(gldefun draw-get-crosshairs ((dd draw-desc) (w window))
(result vector)
(draw-desc-snap dd (window-get-crosshairs w)))
; 12 Sep 92; 14 Sep 92; 06 Oct 92
; Delete selected object
-(gldefun draw-desc-delete (dd\:draw-desc w\:window)
+(gldefun draw-desc-delete ((dd draw-desc) (w window))
(let (obj)
- (obj \:= (draw-desc-find dd w t))
+ (obj = (draw-desc-find dd w t))
(erase obj w (offset dd))
((objects dd) _- obj) ))
; 12 Sep 92; 07 Oct 92
; Copy selected object
-(gldefun draw-desc-copy (dd\:draw-desc w\:window)
- (let (obj objb\:draw-object)
- (obj \:= (draw-desc-find dd w))
- (objb \:= (copy-tree obj))
+(gldefun draw-desc-copy ((dd draw-desc) (w window))
+ (let (obj (objb draw-object))
+ (obj = (draw-desc-find dd w))
+ (objb = (copy-tree obj))
(draw-get-object-pos objb w)
((offset objb) _- (offset dd))
(draw objb w (offset dd))
(force-output w)
((objects dd) _+ objb) ))
-; 12 Sep 92; 13 Sep 92; 07 Oct 92
+; 12 Sep 92; 13 Sep 92; 07 Oct 92; 05 Jan 04
; Move selected object
-(gldefun draw-desc-move (dd\:draw-desc w\:window)
+(gldefun draw-desc-move ((dd draw-desc) (w window))
(let (obj)
- (if (obj \:= (draw-desc-find dd w))
- then (move obj w (offset dd))) ))
+ (if (obj = (draw-desc-find dd w))
+ (move obj w (offset dd))) ))
-; 14 Sep 92
+; 14 Sep 92; 28 Feb 02; 05 Jan 04
; Reset origin of object group
-(gldefun draw-desc-origin (dd\:draw-desc w\:window)
+(gldefun draw-desc-origin ((dd draw-desc) (w window))
(let (sel)
(draw-desc-bounds dd)
- (sel \:= (menu '(("To zero" . zero) ("Select" . select))))
- (if (sel = 'select)
- then ((offset dd) \:= (get-box-position w (x (size dd)) (y (size dd))))
- elseif (sel = 'zero) then ((offset dd) \:= (a vector x 0 y 0)) ) ))
+ (sel = (menu '(("To zero" . zero) ("Select" . select))))
+ (if (sel == 'select)
+ ((offset dd) = (get-box-position w (x (size dd)) (y (size dd))))
+ (if (sel == 'zero) ((offset dd) = (a vector x 0 y 0)) ) )))
; 14 Sep 92
; Compute boundaries of objects in a drawing; set offset and size of
; the draw-desc and reset offsets of items relative to it.
-(gldefun draw-desc-bounds (dd\:draw-desc)
+(gldefun draw-desc-bounds ((dd draw-desc))
(let ((xmin 9999) (ymin 9999) (xmax 0) (ymax 0) basev)
(for obj in objects do
- (xmin \:= (min xmin (x (offset obj))
+ (xmin = (min xmin (x (offset obj))
((x (offset obj)) + (x (size obj)))))
- (ymin \:= (min ymin (y (offset obj))
+ (ymin = (min ymin (y (offset obj))
((y (offset obj)) + (y (size obj)))))
- (xmax \:= (max xmax (x (offset obj))
+ (xmax = (max xmax (x (offset obj))
((x (offset obj)) + (x (size obj)))))
- (ymax \:= (max ymax (y (offset obj))
+ (ymax = (max ymax (y (offset obj))
((y (offset obj)) + (y (size obj))))) )
- ((x (size dd)) \:= (xmax - xmin))
- ((y (size dd)) \:= (ymax - ymin))
- (basev \:= (a vector with x = xmin y = ymin))
- ((offset dd) \:= basev)
+ ((x (size dd)) = (xmax - xmin))
+ ((y (size dd)) = (ymax - ymin))
+ (basev = (a vector with x = xmin y = ymin))
+ ((offset dd) = basev)
(for obj in objects do ((offset obj) _- basev)) ))
-; 14 Sep 92; 16 Sep 92; 19 Dec 93
+; 14 Sep 92; 16 Sep 92; 19 Dec 93; 15 Jan 98
; Produce LaTex output for object group.
; LaTex can only *approximately* reproduce the picture.
-(gldefun draw-desc-latex (dd\:draw-desc)
+(gldefun draw-desc-latex ((dd draw-desc))
(let (base bx by sx sy)
- (format t " \\begin{picture}(~5,2F,~5,2F)(0,0)~%"
+ (format t " \\begin{picture}(~5,0F,~5,0F)(0,0)~%"
(x (size dd) * *draw-latex-factor*)
(y (size dd) * *draw-latex-factor*) )
(for obj in (objects dd) do
- (base \:= (offset dd) + (offset obj))
- (bx \:= (x base) * *draw-latex-factor*)
- (by \:= (y base) * *draw-latex-factor*)
- (sx \:= (x (size obj)) * *draw-latex-factor*)
- (sy \:= (y (size obj)) * *draw-latex-factor*)
+ (base = (offset dd) + (offset obj))
+ (bx = (x base) * *draw-latex-factor*)
+ (by = (y base) * *draw-latex-factor*)
+ (sx = (x (size obj)) * *draw-latex-factor*)
+ (sy = (y (size obj)) * *draw-latex-factor*)
(case (first obj)
(draw-line (latex-line (x base) (y base)
((x base) + sx) ((y base) + sy)))
(draw-arrow (latex-line (x base) (y base)
((x base) + sx) ((y base) + sy) t) )
(draw-box
- (format t " \\put(~5,2F,~5,2F) {\\framebox(~5,2F,~5,2F)}~%"
+ (format t " \\put(~5,0F,~5,0F) {\\framebox(~5,0F,~5,0F)}~%"
bx by sx sy))
(draw-rcbox
- (format t " \\put(~5,2F,~5,2F) {\\oval(~5,2F,~5,2F)}~%"
+ (format t " \\put(~5,0F,~5,0F) {\\oval(~5,0F,~5,0F)}~%"
(bx + sx / 2) (by + sy / 2) sx sy))
(draw-circle
- (format t " \\put(~5,2F,~5,2F) {\\circle{~5,2F}}~%"
+ (format t " \\put(~5,0F,~5,0F) {\\circle{~5,0F}}~%"
(bx + sx / 2) (by + sy / 2) sx))
(draw-ellipse
- (format t " \\put(~5,2F,~5,2F) {\\oval(~5,2F,~5,2F)}~%"
+ (format t " \\put(~5,0F,~5,0F) {\\oval(~5,0F,~5,0F)}~%"
(bx + sx / 2) (by + sy / 2) sx sy))
(draw-button
- (format t " \\put(~5,2F,~5,2F) {\\framebox(~5,2F,~5,2F)}~%"
+ (format t " \\put(~5,0F,~5,0F) {\\framebox(~5,0F,~5,0F)}~%"
bx by sx sy))
(draw-erase )
(draw-dot
- (format t " \\put(~5,2F,~5,2F) {\\circle*{~5,2F}}~%"
+ (format t " \\put(~5,0F,~5,0F) {\\circle*{~5,0F}}~%"
(bx + sx / 2) (by + sy / 2) sx))
(draw-text
- (format t " \\put(~5,2F,~5,2F) {~A}~%"
+ (format t " \\put(~5,0F,~5,0F) {~A}~%"
bx (by + 4 * *draw-latex-factor*) (contents obj)) ) ) )
(format t " \\end{picture}~%") ))
-; 14 Sep 92; 15 Sep 92; 16 Sep 92; 05 Oct 92; 17 Dec 93; 21 Dec 93
+; 14 Sep 92; 15 Sep 92; 16 Sep 92; 05 Oct 92; 17 Dec 93; 21 Dec 93; 28 Feb 02
+; 05 Jan 04
; Produce program to draw object group
-(gldefun draw-desc-program (dd\:draw-desc)
+(gldefun draw-desc-program ((dd draw-desc))
(let (base bx by sx sy tox toy r rx ry s code fncode fnname cd)
- (code \:= (for obj in (objects dd) when
- (cd \:= (progn
- (base \:= (offset dd) + (offset obj) - (refpt dd))
- (bx \:= (x base))
- (by \:= (y base))
- (sx \:= (x (size obj)))
- (sy \:= (y (size obj)))
- (tox \:= bx + sx)
- (toy \:= by + sy)
- (if ((car obj) = 'draw-circle)
- then (r \:= (x (size obj)) / 2))
- (if ((car obj) = 'draw-ellipse)
- then (rx \:= (x (size obj)) / 2)
- (ry \:= (y (size obj)) / 2))
+ (code = (for obj in (objects dd) when
+ (cd = (progn
+ (base = (offset dd) + (offset obj) - (refpt dd))
+ (bx = (x base))
+ (by = (y base))
+ (sx = (x (size obj)))
+ (sy = (y (size obj)))
+ (tox = bx + sx)
+ (toy = by + sy)
+ (if ((car obj) == 'draw-circle)
+ (r = (x (size obj)) / 2))
+ (if ((car obj) == 'draw-ellipse)
+ (progn (rx = (x (size obj)) / 2)
+ (ry = (y (size obj)) / 2)))
(draw-optimize
(case (first obj)
(draw-line `(window-draw-line-xy w (+ x ,bx) (+ y ,by)
@@ -482,15 +485,15 @@
,sx ,sy))
(draw-dot `(window-draw-dot-xy w (+ x ,(+ 2 bx))
(+ y ,(+ 2 by))))
- (draw-text (s \:= (stringify (contents obj)))
+ (draw-text (s = (stringify (contents obj)))
`(window-printat-xy w ,s (+ x ,bx) (+ y ,by)))
)) ))
collect cd))
- (fncode \:= (cons 'lambda (cons (list 'w 'x 'y)
+ (fncode = (cons 'lambda (cons (list 'w 'x 'y)
(nconc code
(list (list 'window-force-output
'w))))))
- (fnname \:= (fnname dd))
+ (fnname = (fnname dd))
(setf (symbol-function fnname) fncode)
(format t "Constructed program (~A w x y)~%" fnname)
(draw-desc-picmenu dd)
@@ -501,35 +504,35 @@
(defun draw-optimize (x) (if (fboundp 'glunwrap) (glunwrap x nil) x))
; 14 Sep 92
-(gldefun draw-desc-fnname (dd\:draw-desc)
+(gldefun draw-desc-fnname ((dd draw-desc))
(intern (concatenate 'string "DRAW-" (symbol-name (name dd)))) )
-; 14 Sep 92; 06 Oct 92; 08 Apr 93
+; 14 Sep 92; 06 Oct 92; 08 Apr 93; 28 Feb 02; 05 Jan 04
; Produce a picmenu-spec from the buttons of a drawing description
-(gldefun draw-desc-picmenu (dd\:draw-desc)
+(gldefun draw-desc-picmenu ((dd draw-desc))
(let (buttons)
- (buttons \:= (for obj in (objects dd) when ((first obj) = 'draw-button)
+ (buttons = (for obj in (objects dd) when ((first obj) == 'draw-button)
collect (list (contents obj)
((a vector x 2 y 2) + (offset obj)
+ (offset dd) )) ) )
(if buttons
- then (setf (get (name dd) 'picmenu-spec)
+ (setf (get (name dd) 'picmenu-spec)
(list 'picmenu-spec (x (size dd)) (y (size dd)) buttons
t (fnname dd) '9x15))) ))
-; 15 Sep 92
-(gldefun draw-desc-snap (dd\:draw-desc p\:vector)
+; 15 Sep 92; 05 Jan 04
+(gldefun draw-desc-snap ((dd draw-desc) (p vector))
(result vector)
(let (psnap obj (objs (objects dd)) )
(if *draw-snap-flag*
- then (while objs and ~ psnap do
- (obj \:= (pop objs))
- (psnap \:= (draw-object-snap obj p (offset dd))) ) )
+ (while objs and ~ psnap do
+ (obj = (pop objs))
+ (psnap = (draw-object-snap obj p (offset dd))) ) )
(or psnap p) ))
; 10 Sep 92; 12 Sep 92
; Move specified object
-(gldefun draw-object-move (d\:draw-object w\:window off\:vector)
+(gldefun draw-object-move ((d draw-object) (w window) (off vector))
(let ()
(erase d w off)
(draw-get-object-pos d w)
@@ -558,63 +561,63 @@
(defun draw-object-selectedp (d w off)
(funcall (glmethod (car d) 'selectedp) d w off) )
-; 12 Sep 92; 07 Oct 92
-(gldefun draw-get-object-pos (d\:draw-object w\:window)
+; 12 Sep 92; 07 Oct 92; 28 Feb 02; 05 Jan 04
+(gldefun draw-get-object-pos ((d draw-object) (w window))
(window-get-icon-position w
- (if ((first d) = 'draw-text) then #'draw-text-draw-outline
- else #'draw-object-draw-at)
+ (if ((first d) == 'draw-text) #'draw-text-draw-outline
+ #'draw-object-draw-at)
(list d)) )
-; 10 Sep 92; 15 Sep 92
-(gldefun draw-object-erase (d\:draw-object w\:window off\:vector)
+; 10 Sep 92; 15 Sep 92; 05 Jan 04
+(gldefun draw-object-erase ((d draw-object) (w window) (off vector))
(let ()
(if ((first d) <> 'draw-erase)
- then (set-xor w)
+ (progn (set-xor w)
(draw d w off)
- (unset w)) ))
+ (unset w)) )))
-; 09 Sep 92; 17 Dec 93; 19 Dec 93
-(gldefun draw-line-draw (d\:draw-line w\:window off\:vector)
- (let ((from (off + (offset d))) (to (off + (offset d)) + (size d)) )
+; 09 Sep 92; 17 Dec 93; 19 Dec 93; 04 Dec 00
+(gldefun draw-line-draw ((d draw-line) (w window) (off vector))
+ (let ((from (off + (offset d))) (to ((off + (offset d)) + (size d))) )
(draw-line-xy w (x from) (y from) (x to) (y to)) ))
-; 11 Sep 92; 17 Dec 93; 19 Dec 93
-(gldefun draw-arrow-draw (d\:draw-arrow w\:window off\:vector)
- (let ((from (off + (offset d))) (to (off + (offset d)) + (size d)) )
+; 11 Sep 92; 17 Dec 93; 19 Dec 93; 04 Dec 00
+(gldefun draw-arrow-draw ((d draw-arrow) (w window) (off vector))
+ (let ((from (off + (offset d))) (to ((off + (offset d)) + (size d))) )
(draw-arrow-xy w (x from) (y from) (x to) (y to)) ))
; 09 Sep 92; 10 Sep 92; 12 Sep 92
-(gldefun draw-line-selectedp (d\:draw-line pt\:vector off\:vector)
+(gldefun draw-line-selectedp ((d draw-line) (pt vector) (off vector))
(let ((ptp (pt - off)))
(and (contains? (vregion d) ptp)
((distance (line d) ptp) < 5) ) ))
-; 09 Sep 92; 10 Sep 92; 15 Sep 92; 17 Dec 93
-(gldefun draw-line-get (dd\:draw-desc w\:window)
+; 09 Sep 92; 10 Sep 92; 15 Sep 92; 17 Dec 93; 05 Jan 04
+(gldefun draw-line-get ((dd draw-desc) (w window))
(let (from to)
- (from \:= (draw-get-crosshairs dd w))
- (to \:= (if *draw-latex-mode*
- then (window-get-latex-position w (x from) (y from) nil)
- else (draw-desc-snap dd
+ (from = (draw-get-crosshairs dd w))
+ (to = (if *draw-latex-mode*
+ (window-get-latex-position w (x from) (y from) nil)
+ (draw-desc-snap dd
(window-get-line-position w (x from) (y from)))))
(a draw-line with offset = from size = (to - from)) ))
-; 11 Sep 92; 15 Sep 92; 17 Dec 93
-(gldefun draw-arrow-get (dd\:draw-desc w\:window)
+; 11 Sep 92; 15 Sep 92; 17 Dec 93; 05 Jan 04
+(gldefun draw-arrow-get ((dd draw-desc) (w window))
(let (from to)
- (from \:= (draw-get-crosshairs dd w))
- (to \:= (if *draw-latex-mode*
- then (window-get-latex-position w (x from) (y from) nil)
- else (draw-desc-snap dd
+ (from = (draw-get-crosshairs dd w))
+ (to = (if *draw-latex-mode*
+ (window-get-latex-position w (x from) (y from) nil)
+ (draw-desc-snap dd
(window-get-line-position w (x from) (y from)))))
(a draw-arrow with offset = from size = (to - from)) ))
; 09 Sep 92
-(gldefun draw-box-draw (d\:draw-box w\:window off\:vector)
+(gldefun draw-box-draw ((d draw-box) (w window) (off vector))
(draw-box w (off + (offset d)) (size d)) )
; 09 Sep 92; 11 Sep 92
-(gldefun draw-box-selectedp (d\:draw-box p\:vector off\:vector)
+(gldefun draw-box-selectedp ((d draw-box) (p vector) (off vector))
(let ((pt (p - off)))
(or (and ((y pt) < (top (vregion d)) + 5)
((y pt) > (bottom (vregion d)) - 5)
@@ -626,20 +629,20 @@
((abs (y pt) - (bottom (vregion d))) < 5))) ) ))
; 11 Sep 92
-(gldefun draw-box-get (dd\:draw-desc w\:window)
+(gldefun draw-box-get ((dd draw-desc) (w window))
(let (box)
- (box \:= (window-get-region w))
+ (box = (window-get-region w))
(a draw-box with offset = (start box) size = (size box)) ))
; (dotimes (i 10) (print (draw-box-selectedp db (window-get-point dw))))
; 16 Sep 92
-(gldefun draw-rcbox-draw (d\:draw-box w\:window off\:vector)
+(gldefun draw-rcbox-draw ((d draw-box) (w window) (off vector))
(draw-rcbox-xy w ((x off) + (x (offset d))) ((y off) + (y (offset d)))
(x (size d)) (y (size d)) 8) )
; 16 Sep 92
-(gldefun draw-rcbox-selectedp (d\:draw-box p\:vector off\:vector)
+(gldefun draw-rcbox-selectedp ((d draw-box) (p vector) (off vector))
(let ((pt (p - off)))
(or (and ((y pt) < (top (vregion d)) - 3)
((y pt) > (bottom (vregion d)) + 3)
@@ -651,37 +654,37 @@
((abs (y pt) - (bottom (vregion d))) < 5))) ) ))
; 16 Sep 92
-(gldefun draw-rcbox-get (dd\:draw-desc w\:window)
+(gldefun draw-rcbox-get ((dd draw-desc) (w window))
(let (box)
- (box \:= (window-get-region w))
+ (box = (window-get-region w))
(a draw-rcbox with offset = (start box) size = (size box)) ))
; 09 Sep 92
-(gldefun draw-circle-draw (d\:draw-circle w\:window off\:vector)
+(gldefun draw-circle-draw ((d draw-circle) (w window) (off vector))
(draw-circle w (off + (center d)) (radius d)) )
; 09 Sep 92; 11 Sep 92; 17 Sep 92
-(gldefun draw-circle-selectedp (d\:draw-circle p\:vector off\:vector)
+(gldefun draw-circle-selectedp ((d draw-circle) (p vector) (off vector))
((abs (radius d) - (magnitude ((center d) + off) - p)) < 5) )
; 11 Sep 92; 15 Sep 92
-(gldefun draw-circle-get (dd\:draw-desc w\:window)
+(gldefun draw-circle-get ((dd draw-desc) (w window))
(let (cir cent)
- (cent \:= (draw-get-crosshairs dd w))
- (cir \:= (window-get-circle w cent))
+ (cent = (draw-get-crosshairs dd w))
+ (cir = (window-get-circle w cent))
(a draw-circle with
offset = (a vector with x = ( (x (center cir)) - (radius cir) )
y = ( (y (center cir)) - (radius cir) ))
size = (a vector with x = 2 * (radius cir) y = 2 * (radius cir))) ))
; 11 Sep 92
-(gldefun draw-ellipse-draw (d\:draw-ellipse w\:window off\:vector)
+(gldefun draw-ellipse-draw ((d draw-ellipse) (w window) (off vector))
(let ((c (off + (center d))))
(draw-ellipse-xy w (x c) (y c) (radiusx d) (radiusy d)) ))
; 11 Sep 92; 15 Sep 92; 17 Sep 92
; Uses the fact that sum of distances from foci is constant.
-(gldefun draw-ellipse-selectedp (d\:draw-ellipse p\:vector off\:vector)
+(gldefun draw-ellipse-selectedp ((d draw-ellipse) (p vector) (off vector))
(let ((pt (p - off)))
( (abs ( (magnitude ((p1 d) - pt)) + (magnitude ((p2 d) - pt)) )
- 2 * (radius d)) < 2) ))
@@ -698,10 +701,10 @@
(terpri)) ))
; 11 Sep 92
-(gldefun draw-ellipse-get (dd\:draw-desc w\:window)
+(gldefun draw-ellipse-get ((dd draw-desc) (w window))
(let (ell cent)
- (cent \:= (draw-get-crosshairs dd w))
- (ell \:= (window-get-ellipse w cent))
+ (cent = (draw-get-crosshairs dd w))
+ (ell = (window-get-ellipse w cent))
(a draw-ellipse with
offset = (a vector with x = ( (x (center ell)) - (x (halfsize ell)) )
y = ( (y (center ell)) - (y (halfsize ell)) ))
@@ -709,142 +712,142 @@
y = 2 * (y (halfsize ell)))) ))
; 10 Sep 92
-(gldefun draw-null-draw (d\:draw-null w\:window off\:vector) nil)
+(gldefun draw-null-draw ((d draw-null) (w window) (off vector)) nil)
; 10 Sep 92; 11 Sep 92
-(gldefun draw-null-selectedp (d\:draw-null pt\:vector off\:vector) nil)
+(gldefun draw-null-selectedp ((d draw-null) (pt vector) (off vector)) nil)
; 11 Sep 92
-(gldefun draw-button-draw (d\:draw-button w\:window off\:vector)
+(gldefun draw-button-draw ((d draw-button) (w window) (off vector))
(draw-box w (off + (offset d)) (a vector x = 4 y = 4)) )
; 11 Sep 92
-(gldefun draw-button-selectedp (d\:draw-button p\:vector off\:vector)
+(gldefun draw-button-selectedp ((d draw-button) (p vector) (off vector))
(let ( (ptx (((x p) - (x off)) - (x (offset d))))
(pty (((y p) - (y off)) - (y (offset d)))) )
(and (ptx > -2) (ptx < 6) (pty > -2) (pty < 6) ) ))
))
; 11 Sep 92
-(gldefun draw-button-get (dd\:draw-desc w\:window)
+(gldefun draw-button-get ((dd draw-desc) (w window))
(let (cent var)
(princ "Enter button name: ")
- (var \:= (read))
- (cent \:= (draw-get-crosshairs dd w))
+ (var = (read))
+ (cent = (draw-get-crosshairs dd w))
(a draw-button with
offset = (a vector with x = ((x cent) - 2) y = ((y cent) - 2))
size = (a vector with x = 4 y = 4)
contents = var) ))
; 14 Sep 92
-(gldefun draw-erase-draw (d\:draw-box w\:window off\:vector)
+(gldefun draw-erase-draw ((d draw-box) (w window) (off vector))
(erase-area w (off + (offset d)) (size d)) )
; 14 Sep 92
-(gldefun draw-erase-selectedp (d\:draw-box p\:vector off\:vector)
+(gldefun draw-erase-selectedp ((d draw-box) (p vector) (off vector))
(let ((pt (p - off)))
(contains? (region d) pt) ))
; 14 Sep 92
-(gldefun draw-erase-get (dd\:draw-desc w\:window)
+(gldefun draw-erase-get ((dd draw-desc) (w window))
(let (box)
- (box \:= (window-get-region w))
+ (box = (window-get-region w))
(a draw-erase with offset = (start box) size = (size box)) ))
; 11 Sep 92; 14 Sep 92
-(gldefun draw-dot-draw (d\:draw-dot w\:window off\:vector)
+(gldefun draw-dot-draw ((d draw-dot) (w window) (off vector))
(window-draw-dot-xy w ((x off) + (x (offset d)) + 2)
((y off) + (y (offset d)) + 2) ) )
; 11 Sep 92; 15 Sep 92
-(gldefun draw-dot-get (dd\:draw-desc w\:window)
+(gldefun draw-dot-get ((dd draw-desc) (w window))
(let (cent)
- (cent \:= (draw-get-crosshairs dd w))
+ (cent = (draw-get-crosshairs dd w))
(a draw-dot with
offset = (a vector with x = ((x cent) - 2) y = ((y cent) - 2))
size = (a vector with x = 4 y = 4)) ))
; 17 Dec 93
-(gldefun draw-refpt-draw (d\:draw-refpt w\:window off\:vector)
+(gldefun draw-refpt-draw ((d draw-refpt) (w window) (off vector))
(window-draw-crosshairs-xy w ((x off) + (x (offset d)))
((y off) + (y (offset d))) ) )
; 17 Dec 93
-(gldefun draw-refpt-selectedp (d\:draw-button p\:vector off\:vector)
+(gldefun draw-refpt-selectedp ((d draw-button) (p vector) (off vector))
(let ( (ptx (((x p) - (x off)) - (x (offset d))))
(pty (((y p) - (y off)) - (y (offset d)))) )
(and (ptx > -3) (ptx < 3) (pty > -3) (pty < 3) ) ))
-; 17 Dec 93
-(gldefun draw-refpt-get (dd\:draw-desc w\:window)
+; 17 Dec 93; 05 Jan 04
+(gldefun draw-refpt-get ((dd draw-desc) (w window))
(let (cent refpt)
- (if (refpt \:= (assoc 'draw-refpt (objects dd)))
- then (set-erase *draw-window*)
+ (if (refpt = (assoc 'draw-refpt (objects dd)))
+ (progn (set-erase *draw-window*)
(draw refpt *draw-window* (a vector with x = 0 y = 0))
(unset *draw-window*)
- ((objects dd) _- refpt) )
- (cent \:= (draw-get-crosshairs dd w))
+ ((objects dd) _- refpt) ) )
+ (cent = (draw-get-crosshairs dd w))
(a draw-refpt with offset = cent
size = (a vector with x = 0 y = 0)) ))
-; 17 Dec 93
-(gldefun draw-desc-refpt (dd\:draw-desc) (result vector)
+; 17 Dec 93; 05 Jan 04
+(gldefun draw-desc-refpt ((dd draw-desc)) (result vector)
(let (refpt)
- (refpt \:= (assoc 'draw-refpt (objects dd)))
- (if refpt then (offset refpt)
- else (a vector x = 0 y = 0)) ))
+ (refpt = (assoc 'draw-refpt (objects dd)))
+ (if refpt (offset refpt)
+ (a vector x = 0 y = 0)) ))
; 11 Sep 92; 06 Oct 92; 19 Dec 93; 11 Nov 94
-(gldefun draw-text-draw (d\:draw-text w\:window off\:vector)
+(gldefun draw-text-draw ((d draw-text) (w window) (off vector))
(printat-xy w (contents d) ((x off) + (x (offset d)))
((y off) + (y (offset d)))) )
; 07 Oct 92
-(gldefun draw-text-draw-outline (w\:window x\:integer y\:integer d\:draw-text)
+(gldefun draw-text-draw-outline ((w window) (x integer) (y integer) (d
draw-text))
(setf (second d) (list x y))
(draw-box-xy w x (y + 2) (x (size d)) (y (size d))) )
; 11 Sep 92
-(gldefun draw-text-selectedp (d\:draw-text pt\:vector off\:vector)
+(gldefun draw-text-selectedp ((d draw-text) (pt vector) (off vector))
(let ((ptp (pt - off)))
(contains? (vregion d) ptp)))
; 11 Sep 92; 17 Sep 92; 06 Oct 92; 11 Nov 94
-(gldefun draw-text-get (dd\:draw-desc w\:window)
+(gldefun draw-text-get ((dd draw-desc) (w window))
(let (txt lng off)
(princ "Enter text string: ")
- (txt \:= (stringify (read)))
- (lng \:= (string-width w txt))
- (off \:= (get-box-position w lng 14))
+ (txt = (stringify (read)))
+ (lng = (string-width w txt))
+ (off = (get-box-position w lng 14))
(a draw-text with offset = (off + (a vector x 0 y 4))
size = (a vector with x = lng y = 14)
contents = txt) ))
-; 15 Sep 92
+; 15 Sep 92; 05 Jan 04
; Test if a point p1 is close to a point p2. If so, result is p2, else nil.
-(gldefun draw-snapp (p1\:vector off\:vector p2x\:integer p2y\:integer)
+(gldefun draw-snapp ((p1 vector) (off vector) (p2x integer) (p2y integer))
(if (and ((abs ((x p1) - (x off) - p2x)) < 4)
((abs ((y p1) - (y off) - p2y)) < 4) )
- then (a vector with x = ((x off) + p2x) y = ((y off) + p2y)) ))
+ (a vector with x = ((x off) + p2x) y = ((y off) + p2y)) ))
; 15 Sep 92
-(gldefun draw-dot-snap (d\:draw-dot p\:vector off\:vector)
+(gldefun draw-dot-snap ((d draw-dot) (p vector) (off vector))
(draw-snapp p off ((x (offset d)) + 2)
((y (offset d)) + 2) ) )
; 17 Dec 93
-(gldefun draw-refpt-snap (d\:draw-refpt p\:vector off\:vector)
+(gldefun draw-refpt-snap ((d draw-refpt) (p vector) (off vector))
(draw-snapp p off (x (offset d)) (y (offset d)) ) )
; 15 Sep 92
-(gldefun draw-line-snap (d\:draw-line p\:vector off\:vector)
+(gldefun draw-line-snap ((d draw-line) (p vector) (off vector))
(or (draw-snapp p off (x (offset d)) (y (offset d)))
(draw-snapp p off ( (x (offset d)) + (x (size d)) )
( (y (offset d)) + (y (size d)) ) ) ))
; 15 Sep 92; 19 Dec 93
; Snap for square: corners, middle of sides.
-(gldefun draw-box-snap (d\:draw-box p\:vector off\:vector)
+(gldefun draw-box-snap ((d draw-box) (p vector) (off vector))
(let ((xoff (x (offset d))) (yoff (y (offset d)))
(xsize (x (size d)) ) (ysize (y (size d)) ) )
(or (draw-snapp p off xoff yoff)
@@ -857,7 +860,7 @@
(draw-snapp p off (xoff + xsize) (yoff + ysize / 2)) ) ))
; 15 Sep 92
-(gldefun draw-circle-snap (d\:draw-circle p\:vector off\:vector)
+(gldefun draw-circle-snap ((d draw-circle) (p vector) (off vector))
(or (draw-snapp p off ( (x (offset d)) + (radius d) )
( (y (offset d)) + (radius d) ) )
(draw-snapp p off ( (x (offset d)) + (radius d) )
@@ -870,7 +873,7 @@
( (y (offset d)) + (radius d) ) ) ))
; 15 Sep 92
-(gldefun draw-ellipse-snap (d\:draw-ellipse p\:vector off\:vector)
+(gldefun draw-ellipse-snap ((d draw-ellipse) (p vector) (off vector))
(or (draw-snapp p off ( (x (offset d)) + (radiusx d) )
( (y (offset d)) + (radiusy d) ) )
(draw-snapp p off ( (x (offset d)) + (radiusx d) )
@@ -883,7 +886,7 @@
( (y (offset d)) + (radiusy d) ) ) ))
; 16 Sep 92
-(gldefun draw-rcbox-snap (d\:draw-rcbox p\:vector off\:vector)
+(gldefun draw-rcbox-snap ((d draw-rcbox) (p vector) (off vector))
(let ( (rx ((x (size d)) / 2)) (ry ((y (size d)) / 2)) )
(or (draw-snapp p off ( (x (offset d)) + rx ) (y (offset d)) )
(draw-snapp p off (x (offset d)) ( (y (offset d)) + ry ) )
@@ -893,10 +896,10 @@
( (y (offset d)) + ry ) ) ) ))
; 15 Sep 92
-(gldefun draw-no-snap (d\:draw-ellipse p\:vector off\:vector) nil)
+(gldefun draw-no-snap ((d draw-ellipse) (p vector) (off vector)) nil)
; 11 Sep 92
-(gldefun draw-multi-draw (d\:draw-multi w\:window off\:vector)
+(gldefun draw-multi-draw ((d draw-multi) (w window) (off vector))
(let ( (totaloff ((offset d) + off)) )
(for subd in (contents d) do
(draw subd w totaloff)) ))
@@ -959,7 +962,7 @@
(window-draw-crosshairs-xy w (+ x 15) (+ y 9))
(window-draw-circle-xy w (+ x 15) (+ y 9) 2))
-; 14 Sep 92
+; 14 Sep 92; 15 Jan 98
; Draw a line or arrow in LaTex form
(defun latex-line (fromx fromy x y &optional arrowflg)
(let (dx dy sx sy siz err errb)
@@ -989,7 +992,7 @@
(setq sy (1+ j))))))
(setq sx (* sx (latex-sign dx)))
(setq sy (* sy (latex-sign dy))) )))
- (format t " \\put(~5,2F,~5,2F) {\\~A(~D,~D){~5,2F}}~%"
+ (format t " \\put(~5,0F,~5,0F) {\\~A(~D,~D){~5,0F}}~%"
(* fromx *draw-latex-factor*) (* fromy *draw-latex-factor*)
(if arrowflg "vector" "line") sx sy siz) ))
@@ -1052,10 +1055,11 @@
"glisp/draw-header.lsp") ; header file
(cf drawtrans) )
-; 16 Nov 92; 08 Apr 93; 08 Oct 93; 20 Apr 94; 29 Oct 94
+; 16 Nov 92; 08 Apr 93; 08 Oct 93; 20 Apr 94; 29 Oct 94; 09 Feb 99
; Output drawing descriptions and functions to the specified file
-(defun draw-out (&optional file names)
+(defun draw-out (&optional names file)
(or names (setq names *draw-objects*))
(if (not (consp names)) (setq names (list names)))
(draw-output (or file "glisp/draw.del") names)
- (setq *draw-objects* (set-difference *draw-objects* names)) )
+ (setq *draw-objects* (set-difference *draw-objects* names))
+ names )
Index: xgcl-2/gcl_drawtrans.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_drawtrans.lsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xgcl-2/gcl_drawtrans.lsp 5 Jan 2006 19:00:57 -0000 1.2
+++ xgcl-2/gcl_drawtrans.lsp 20 Jun 2006 22:53:17 -0000 1.3
@@ -1,14 +1,12 @@
-; 29 Oct 1994 14:39:13
+; 27 Jan 2006 14:58:53 CST
; drawtrans.lsp -- translation of draw.lsp Gordon S. Novak Jr.
-; Copyright (c) 1994 Gordon S. Novak Jr. and The University of Texas at Austin.
-
-; See the file gnu.license .
+; Copyright (c) 2006 Gordon S. Novak Jr. and The University of Texas at Austin.
; This program is free software; you can redistribute it and/or modify
; it under the terms of the GNU General Public License as published by
-; the Free Software Foundation; either version 1, or (at your option)
-; any later version.
+; the Free Software Foundation; either version 2 of the License, or
+; (at your option) any later version.
; This program is distributed in the hope that it will be useful,
; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,12 +15,11 @@
; You should have received a copy of the GNU General Public License
; along with this program; if not, write to the Free Software
-; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
; Written by: Gordon S. Novak Jr., Department of Computer Sciences,
; University of Texas at Austin 78712. address@hidden
-
(IN-PACKAGE :USER)
(defmacro while (test &rest forms) `(loop (unless ,test (return)) ,@forms) )
@@ -32,8 +29,6 @@
(defmacro glmethod (class selector)
`(cadr (assoc ,selector (getf (cdr (get ,class 'glstructure)) 'msg))) )
-(IN-PACKAGE :USER)
-
(SETF (GET 'MENU-SET 'GLSTRUCTURE)
'((LISTOBJECT (WINDOW WINDOW) (MENU-ITEMS (LISTOF MENU-SET-ITEM))
(COMMANDFN ANYTHING))
@@ -62,6 +57,8 @@
'((TRANSPARENT MENU) MSG ((DRAW MENU-MDRAW))))
(SETF (GET 'MENU-PORT 'GLSTRUCTURE)
'((LIST (PORT SYMBOL) (MENU-NAME SYMBOL))))
+(SETF (GET 'MENU-SELECTION 'GLSTRUCTURE)
+ '((LIST (PORT SYMBOL) (MENU-NAME SYMBOL) (BUTTON INTEGER))))
(SETF (GET 'MENU-SET-CONN 'GLSTRUCTURE)
'((LIST (FROM MENU-PORT) (TO MENU-PORT))))
(SETF (GET 'MENU-CONNS 'GLSTRUCTURE)
@@ -78,48 +75,57 @@
(REMOVE-ITEMS MENU-CONNS-REMOVE-ITEMS)
(FIND-CONNS MENU-CONNS-FIND-CONNS)
(CONNECTED-PORTS MENU-CONNS-CONNECTED-PORTS)
- (NAMED-MENU MENU-CONNS-NAMED-MENU))))
+ (NEW-CONN MENU-CONNS-NEW-CONN)
+ (NAMED-MENU MENU-CONNS-NAMED-MENU)
+ (NAMED-ITEM MENU-CONNS-NAMED-ITEM))))
(DEFUN MENU-SET-CREATE (W &OPTIONAL FN) (LIST 'MENU-SET W NIL FN))
+(SETF (GET 'MENU-SET-CREATE 'GLARGUMENTS)
+ '((W WINDOW) (&OPTIONAL NIL) (FN NIL)))
(SETF (GET 'MENU-SET-CREATE 'GLFNRESULTTYPE) 'MENU-SET)
(DEFUN MENU-SET-SELECT (MS &OPTIONAL REDRAW ENABLED)
(LET (RES RESB ITM SEL LASTX LASTY)
(IF REDRAW (MENU-SET-DRAW MS))
- (TAGBODY
- GLLABEL4237
- (UNLESS (OR RES RESB)
+ (WHILE (NOT (OR RES RESB))
(SETQ ITM
(WINDOW-TRACK-MOUSE (CADR MS)
#'(LAMBDA (X Y CODE)
(OR (AND (PLUSP CODE) (SETQ LASTX X)
(SETQ LASTY Y) CODE)
- (FIND-IF #'(LAMBDA (GLVAR4236)
+ (SOME #'(LAMBDA (GLVAR22053)
+ (IF
(AND
(>= X
- (FIFTH (CADDR GLVAR4236)))
+ (FIFTH (CADDR GLVAR22053)))
(<= X
- (+ (FIFTH (CADDR GLVAR4236))
- (SEVENTH (CADDR GLVAR4236))))
+ (+ (FIFTH (CADDR GLVAR22053))
+ (SEVENTH (CADDR GLVAR22053))))
(>= Y
- (SIXTH (CADDR GLVAR4236)))
+ (SIXTH (CADDR GLVAR22053)))
(<= Y
- (+ (SIXTH (CADDR GLVAR4236))
- (EIGHTH (CADDR GLVAR4236))))))
+ (+ (SIXTH (CADDR GLVAR22053))
+ (EIGHTH (CADDR GLVAR22053)))))
+ GLVAR22053))
(CADDR MS))))))
(IF (NUMBERP ITM)
- (SETQ RESB (LIST 'BACKGROUND (LIST LASTX LASTY) ITM))
+ (SETQ RESB (LIST (LIST LASTX LASTY) 'BACKGROUND ITM))
(WHEN (OR (ATOM ENABLED) (MEMBER (CAR ITM) ENABLED))
(SETQ SEL (MENU-MSELECT (CADDR ITM) (EQ ENABLED T)))
- (IF SEL (SETQ RES (LIST SEL (CAR ITM)))
- (UNLESS (ZEROP *WINDOW-MENU-CODE*)
- (SETQ RES (LIST NIL (CAR ITM)))))))
- (GO GLLABEL4237)))
- (XFLUSH *WINDOW-DISPLAY*)
+ (IF SEL
+ (SETQ RES (LIST SEL (CAR ITM) *WINDOW-MENU-CODE*))
+ (IF (AND *WINDOW-MENU-CODE*
+ (NOT (ZEROP *WINDOW-MENU-CODE*)))
+ (SETQ RES
+ (LIST NIL (CAR ITM) *WINDOW-MENU-CODE*)))))))
+ (WINDOW-FORCE-OUTPUT (CADR MS))
(OR RES RESB)))
-(SETF (GET 'MENU-SET-SELECT 'GLFNRESULTTYPE) 'MENU-PORT)
+(SETF (GET 'MENU-SET-SELECT 'GLARGUMENTS)
+ '((MS MENU-SET) (&OPTIONAL NIL) (REDRAW BOOLEAN)
+ (ENABLED (LISTOF SYMBOL))))
+(SETF (GET 'MENU-SET-SELECT 'GLFNRESULTTYPE) 'MENU-SELECTION)
(DEFUN MENU-SET-ADD-MENU (MS NAME SYM TITLE ITEMS &OPTIONAL OFFSET)
@@ -128,22 +134,23 @@
(MENU-CREATE ITEMS TITLE (CADR MS) (CAR OFFSET) (CADR OFFSET)
T T))
(MENU-INIT MENU)
- (UNLESS OFFSET
+ (IF (NOT OFFSET)
(SETQ OFFSET
(WINDOW-GET-BOX-POSITION (CADR MS) (SEVENTH MENU)
(EIGHTH MENU))))
(SETF (FIFTH MENU) (CAR OFFSET))
(SETF (SIXTH MENU) (CADR OFFSET))
(MENU-SET-ADD-ITEM MS NAME SYM MENU)))
-(SETF (GET 'MENU-SET-ADD-MENU 'GLFNRESULTTYPE) '(LISTOF MENU-SET-ITEM))
-
(DEFUN MENU-SET-ADD-ITEM (MS NAME SYM MENU)
(SETF (CADDR MS) (NCONC (CADDR MS) (CONS (LIST NAME SYM MENU) NIL))))
+(SETF (GET 'MENU-SET-ADD-ITEM 'GLARGUMENTS)
+ '((MS MENU-SET) (NAME SYMBOL) (SYM SYMBOL) (MENU MENU)))
(SETF (GET 'MENU-SET-ADD-ITEM 'GLFNRESULTTYPE) '(LISTOF MENU-SET-ITEM))
(DEFUN MENU-SET-REMOVE-ITEMS (MS) (SETF (CADDR MS) NIL))
+(SETF (GET 'MENU-SET-REMOVE-ITEMS 'GLARGUMENTS) '((MS MENU-SET)))
(SETF (GET 'MENU-SET-REMOVE-ITEMS 'GLFNRESULTTYPE)
'(LISTOF MENU-SET-ITEM))
@@ -151,82 +158,112 @@
(DEFUN MENU-SET-ADD-PICMENU
(MS NAME SYM TITLE SPEC &OPTIONAL OFFSET NOBOX)
(LET (MENU MAXWIDTH MAXHEIGHT)
- (IF (SYMBOLP SPEC) (SETQ SPEC (GET SPEC 'PICMENU-SPEC)))
+ (IF (AND SPEC (SYMBOLP SPEC)) (SETQ SPEC (GET SPEC 'PICMENU-SPEC)))
(SETQ MENU
(PICMENU-CREATE-FROM-SPEC SPEC TITLE (CADR MS) (CAR OFFSET)
(CADR OFFSET) T T (NOT NOBOX)))
(SETQ MAXWIDTH
(MAX (IF TITLE (+ 6 (* 9 (LENGTH TITLE))) 0) (CADR SPEC)))
(SETQ MAXHEIGHT (+ (IF TITLE 15 0) (CADDR SPEC)))
- (UNLESS OFFSET
+ (IF (NOT OFFSET)
(SETQ OFFSET
(WINDOW-GET-BOX-POSITION (CADR MS) MAXWIDTH MAXHEIGHT)))
(SETF (FIFTH MENU) (CAR OFFSET))
(SETF (SIXTH MENU) (CADR OFFSET))
(MENU-SET-ADD-ITEM MS NAME SYM MENU)))
+(SETF (GET 'MENU-SET-ADD-PICMENU 'GLARGUMENTS)
+ '((MS MENU-SET) (NAME SYMBOL) (SYM SYMBOL) (TITLE STRING)
+ (SPEC PICMENU-SPEC) (&OPTIONAL NIL) (OFFSET VECTOR)
+ (NOBOX BOOLEAN)))
(SETF (GET 'MENU-SET-ADD-PICMENU 'GLFNRESULTTYPE)
'(LISTOF MENU-SET-ITEM))
(DEFUN MENU-SET-ADD-COMPONENT (MS NAME &OPTIONAL OFFSET)
(MENU-SET-ADD-PICMENU MS (MENU-SET-NAME NAME) NAME NIL NAME OFFSET T))
+(SETF (GET 'MENU-SET-ADD-COMPONENT 'GLARGUMENTS)
+ '((MS MENU-SET) (NAME SYMBOL) (&OPTIONAL NIL) (OFFSET VECTOR)))
(SETF (GET 'MENU-SET-ADD-COMPONENT 'GLFNRESULTTYPE)
'(LISTOF MENU-SET-ITEM))
(DEFUN MENU-SET-ADD-BARMENU (MS NAME SYM MENU TITLE &OPTIONAL OFFSET)
(BARMENU-INIT MENU)
- (UNLESS OFFSET
+ (IF (NOT OFFSET)
(SETQ OFFSET
(WINDOW-GET-BOX-POSITION (CADR MS) (SEVENTH MENU)
(EIGHTH MENU))))
(SETF (FIFTH MENU) (CAR OFFSET))
(SETF (SIXTH MENU) (CADR OFFSET))
(MENU-SET-ADD-ITEM MS NAME SYM MENU))
+(SETF (GET 'MENU-SET-ADD-BARMENU 'GLARGUMENTS)
+ '((MS MENU-SET) (NAME SYMBOL) (SYM SYMBOL) (MENU BARMENU)
+ (TITLE STRING) (&OPTIONAL NIL) (OFFSET VECTOR)))
(SETF (GET 'MENU-SET-ADD-BARMENU 'GLFNRESULTTYPE)
'(LISTOF MENU-SET-ITEM))
(DEFUN MENU-SET-NAME (NM)
(INTERN (SYMBOL-NAME (GENSYM (SYMBOL-NAME NM)))))
+(SETF (GET 'MENU-SET-NAME 'GLARGUMENTS) '((NM SYMBOL)))
(SETF (GET 'MENU-SET-NAME 'GLFNRESULTTYPE) 'SYMBOL)
(DEFUN MENU-SET-NAMED-ITEM (MS NAME) (ASSOC NAME (CADDR MS)))
+(SETF (GET 'MENU-SET-NAMED-ITEM 'GLARGUMENTS)
+ '((MS MENU-SET) (NAME SYMBOL)))
(SETF (GET 'MENU-SET-NAMED-ITEM 'GLFNRESULTTYPE) 'MENU-SET-ITEM)
(DEFUN MENU-SET-NAMED-MENU (MS NAME)
(CADDR (MENU-SET-NAMED-ITEM MS NAME)))
+(SETF (GET 'MENU-SET-NAMED-MENU 'GLARGUMENTS)
+ '((MS MENU-SET) (NAME SYMBOL)))
(SETF (GET 'MENU-SET-NAMED-MENU 'GLFNRESULTTYPE) 'MENU-SET-MENU)
+(DEFUN MENU-CONNS-NAMED-ITEM (MC NAME)
+ (MENU-SET-NAMED-ITEM (CADR MC) NAME))
+(SETF (GET 'MENU-CONNS-NAMED-ITEM 'GLARGUMENTS)
+ '((MC MENU-CONNS) (NAME SYMBOL)))
+(SETF (GET 'MENU-CONNS-NAMED-ITEM 'GLFNRESULTTYPE) 'MENU-SET-ITEM)
+
+
(DEFUN MENU-CONNS-NAMED-MENU (MC NAME)
(MENU-SET-NAMED-MENU (CADR MC) NAME))
+(SETF (GET 'MENU-CONNS-NAMED-MENU 'GLARGUMENTS)
+ '((MC MENU-CONNS) (NAME SYMBOL)))
(SETF (GET 'MENU-CONNS-NAMED-MENU 'GLFNRESULTTYPE) 'MENU-SET-MENU)
(DEFUN MENU-SET-FIND-ITEM (MS POS)
(LET (MITEM)
(DOLIST (MI (CADDR MS))
- (IF (LET ((GLVAR4241 (CADDR MI)))
- (AND (>= (CAR POS)
- (IF (CADDR GLVAR4241) (FIFTH GLVAR4241) 0))
+ (IF (AND (>= (CAR POS)
+ (LET ((SELF (CADDR MI)))
+ (IF (CADDR SELF) (FIFTH SELF) 0)))
(<= (CAR POS)
- (+ (IF (CADDR GLVAR4241) (FIFTH GLVAR4241) 0)
- (SEVENTH GLVAR4241)))
+ (+ (LET ((SELF (CADDR MI)))
+ (IF (CADDR SELF) (FIFTH SELF) 0))
+ (SEVENTH (CADDR MI))))
(>= (CADR POS)
- (IF (CADDR GLVAR4241) (SIXTH GLVAR4241) 0))
+ (LET ((SELF (CADDR MI)))
+ (IF (CADDR SELF) (SIXTH SELF) 0)))
(<= (CADR POS)
- (+ (IF (CADDR GLVAR4241) (SIXTH GLVAR4241) 0)
- (EIGHTH GLVAR4241)))))
+ (+ (LET ((SELF (CADDR MI)))
+ (IF (CADDR SELF) (SIXTH SELF) 0))
+ (EIGHTH (CADDR MI)))))
(SETQ MITEM MI)))
MITEM))
+(SETF (GET 'MENU-SET-FIND-ITEM 'GLARGUMENTS)
+ '((MS MENU-SET) (POS VECTOR)))
(SETF (GET 'MENU-SET-FIND-ITEM 'GLFNRESULTTYPE) 'MENU-SET-ITEM)
(DEFUN MENU-SET-DELETE-ITEM (MS MI)
(SETF (CADDR MS) (REMOVE MI (CADDR MS))))
+(SETF (GET 'MENU-SET-DELETE-ITEM 'GLARGUMENTS)
+ '((MS MENU-SET) (MI MENU-SET-ITEM)))
(SETF (GET 'MENU-SET-DELETE-ITEM 'GLFNRESULTTYPE)
'(LISTOF MENU-SET-ITEM))
@@ -236,14 +273,14 @@
(SETQ SEL (MENU-SET-SELECT MS NIL T))
(SETQ M (MENU-SET-NAMED-MENU MS (CADR SEL)))
(MENU-REPOSITION M)))
-(SETF (GET 'MENU-SET-MOVE 'GLFNRESULTTYPE) 'INTEGER)
-
(DEFUN MENU-MDRAW (M)
(CASE (FIRST M)
(MENU (MENU-DRAW M))
(PICMENU (PICMENU-DRAW M))
(BARMENU (BARMENU-DRAW M))
+ (TEXTMENU (TEXTMENU-DRAW M))
+ (EDITMENU (EDITMENU-DRAW M))
(T (GLSEND M DRAW))))
(DEFUN MENU-MSELECT (M &OPTIONAL ANYCLICK)
@@ -251,6 +288,8 @@
(MENU (MENU-SELECT M T))
(PICMENU (PICMENU-SELECT M T ANYCLICK))
(BARMENU (BARMENU-SELECT M))
+ (TEXTMENU (TEXTMENU-SELECT M T))
+ (EDITMENU (EDITMENU-SELECT M T))
(T (GLSEND M SELECT))))
(DEFUN MENU-MITEM-POSITION (M NAME LOC)
@@ -260,10 +299,7 @@
(T (GLSEND M ITEM-POSITION NAME LOC))))
(DEFUN MENU-SET-DRAW (MS)
- (LET ((GLVAR4242 (CADR MS)))
- (XMAPWINDOW *WINDOW-DISPLAY* (CADR GLVAR4242))
- (XFLUSH *WINDOW-DISPLAY*)
- (WINDOW-WAIT-EXPOSURE GLVAR4242))
+ (WINDOW-OPEN (CADR MS))
(DOLIST (ITEM (CADDR MS)) (MENU-MDRAW (CADDR ITEM))))
(DEFUN MENU-SET-ITEM-POSITION (MS DESC &OPTIONAL LOC)
@@ -271,6 +307,8 @@
(SETQ M (MENU-SET-NAMED-MENU MS (CADR DESC)))
(OR (MENU-MITEM-POSITION M (CAR DESC) LOC)
(MENU-MITEM-POSITION M NIL LOC))))
+(SETF (GET 'MENU-SET-ITEM-POSITION 'GLARGUMENTS)
+ '((MS MENU-SET) (DESC MENU-PORT) (&OPTIONAL NIL) (LOC SYMBOL)))
(SETF (GET 'MENU-SET-ITEM-POSITION 'GLFNRESULTTYPE) 'VECTOR)
@@ -284,11 +322,10 @@
(SETQ DESCB TMP))
(SETQ PA (MENU-SET-ITEM-POSITION MS DESCA 'RIGHT))
(SETQ PB (MENU-SET-ITEM-POSITION MS DESCB 'LEFT))
- (WINDOW-DRAW-CIRCLE-XY (CADR MS) (CAR PA) (CADR PA) 3 NIL)
- (WINDOW-DRAW-LINE-XY (CADR MS) (CAR PA) (CADR PA) (CAR PB)
- (CADR PB) NIL)
- (WINDOW-DRAW-CIRCLE-XY (CADR MS) (CAR PB) (CADR PB) 3 NIL)
- (XFLUSH *WINDOW-DISPLAY*)))
+ (WINDOW-DRAW-CIRCLE (CADR MS) PA 3)
+ (WINDOW-DRAW-LINE (CADR MS) PA PB)
+ (WINDOW-DRAW-CIRCLE (CADR MS) PB 3)
+ (WINDOW-FORCE-OUTPUT (CADR MS))))
(DEFUN MENU-SET-ADJUST (MS NAME EDGE FROM OFFSET)
(LET (M FROMM PLACE)
@@ -316,10 +353,14 @@
(LEFT (SETF (FIFTH (CADDR M)) (+ PLACE OFFSET)))
(RIGHT (SETF (FIFTH (CADDR M))
(- (- PLACE (SEVENTH (CADDR M))) OFFSET)))))))
+(SETF (GET 'MENU-SET-ADJUST 'GLARGUMENTS)
+ '((MS MENU-SET) (NAME SYMBOL) (EDGE SYMBOL) (FROM SYMBOL)
+ (OFFSET INTEGER)))
(SETF (GET 'MENU-SET-ADJUST 'GLFNRESULTTYPE) 'INTEGER)
(DEFUN MENU-CONNS-CREATE (MS) (LIST 'MENU-CONNS MS NIL))
+(SETF (GET 'MENU-CONNS-CREATE 'GLARGUMENTS) '((MS MENU-SET)))
(SETF (GET 'MENU-CONNS-CREATE 'GLFNRESULTTYPE) 'MENU-CONNS)
@@ -329,13 +370,11 @@
(DEFUN MENU-CONNS-MOVE (MC)
(MENU-SET-MOVE (CADR MC))
- (XCLEARWINDOW *WINDOW-DISPLAY* (CADR (CADADR MC)))
- (XFLUSH *WINDOW-DISPLAY*)
+ (WINDOW-CLEAR (CADADR MC))
(MENU-CONNS-DRAW MC))
(DEFUN MENU-CONNS-REDRAW (MC)
- (XCLEARWINDOW *WINDOW-DISPLAY* (CADR (CADADR MC)))
- (XFLUSH *WINDOW-DISPLAY*)
+ (WINDOW-CLEAR (CADADR MC))
(MENU-CONNS-DRAW MC))
(DEFUN MENU-CONNS-ADD-CONN (MC)
@@ -344,14 +383,30 @@
(IF (EQ (CADR SEL) 'BACKGROUND) SEL
(PROGN
(SETQ SELB (MENU-SET-SELECT (CADR MC)))
- (UNLESS (EQ (CAR SELB) 'BACKGROUND)
+ (WHEN (NOT (EQ (CADR SELB) 'BACKGROUND))
(SETQ CONN (LIST SEL SELB))
(MENU-SET-DRAW-CONN (CADR MC) CONN)
(SETF (CADDR MC) (NCONC (CADDR MC) (CONS CONN NIL))))
NIL))))
+(SETF (GET 'MENU-CONNS-ADD-CONN 'GLARGUMENTS) '((MC MENU-CONNS)))
+(SETF (GET 'MENU-CONNS-ADD-CONN 'GLFNRESULTTYPE) 'MENU-SELECTION)
+
+
+(DEFUN MENU-CONNS-NEW-CONN (MC FROMNAME FROMPORT TONAME TOPORT)
+ (LET (CONN)
+ (SETQ CONN (LIST (LIST FROMPORT FROMNAME) (LIST TOPORT TONAME)))
+ (SETF (CADDR MC) (NCONC (CADDR MC) (CONS CONN NIL)))))
+(SETF (GET 'MENU-CONNS-NEW-CONN 'GLARGUMENTS)
+ '((MC MENU-CONNS) (FROMNAME SYMBOL) (FROMPORT SYMBOL)
+ (TONAME SYMBOL) (TOPORT SYMBOL)))
+(SETF (GET 'MENU-CONNS-NEW-CONN 'GLFNRESULTTYPE)
+ '(LISTOF MENU-SET-CONN))
+
(DEFUN MENU-CONNS-ADD-ITEM (MC NAME SYM MENU)
(MENU-SET-ADD-ITEM (CADR MC) NAME SYM MENU))
+(SETF (GET 'MENU-CONNS-ADD-ITEM 'GLARGUMENTS)
+ '((MC MENU-CONNS) (NAME SYMBOL) (SYM SYMBOL) (MENU MENU)))
(SETF (GET 'MENU-CONNS-ADD-ITEM 'GLFNRESULTTYPE)
'(LISTOF MENU-SET-ITEM))
@@ -372,24 +427,31 @@
(SETQ DESCB TMP))
(SETF (CAR LS) (MENU-SET-ITEM-POSITION MS DESCA 'RIGHT))
(SETF (CADR LS) (MENU-SET-ITEM-POSITION MS DESCB 'LEFT))
- (WHEN (< (ABS (LET ((DX (- (CAADR LS) (CAAR LS)))
- (DY (- (CADADR LS) (CADAR LS))))
- (/ (- (* DX (- (CADR PT) (CADAR LS)))
- (* DY (- (CAR PT) (CAAR LS))))
- (SQRT (+ (EXPT DX 2) (EXPT DY 2))))))
+ (WHEN (< (ABS (/ (- (* (- (CAADR LS) (CAAR LS))
+ (- (CADR PT) (CADAR LS)))
+ (* (- (CADADR LS) (CADAR LS))
+ (- (CAR PT) (CAAR LS))))
+ (SQRT (+ (EXPT (- (CAADR LS) (CAAR LS)) 2)
+ (EXPT (- (CADADR LS) (CADAR LS)) 2)))))
5)
(SETQ FOUND T)
(SETQ RES CONN))))
RES))
+(SETF (GET 'MENU-CONNS-FIND-CONN 'GLARGUMENTS)
+ '((MC MENU-CONNS) (PT VECTOR)))
(SETF (GET 'MENU-CONNS-FIND-CONN 'GLFNRESULTTYPE) 'MENU-SET-CONN)
(DEFUN MENU-CONNS-FIND-ITEM (MC PT) (MENU-SET-FIND-ITEM (CADR MC) PT))
+(SETF (GET 'MENU-CONNS-FIND-ITEM 'GLARGUMENTS)
+ '((MC MENU-CONNS) (PT VECTOR)))
(SETF (GET 'MENU-CONNS-FIND-ITEM 'GLFNRESULTTYPE) 'MENU-SET-ITEM)
(DEFUN MENU-CONNS-DELETE-CONN (MC CONN)
(SETF (CADDR MC) (REMOVE CONN (CADDR MC))))
+(SETF (GET 'MENU-CONNS-DELETE-CONN 'GLARGUMENTS)
+ '((MC MENU-CONNS) (CONN MENU-SET-CONN)))
(SETF (GET 'MENU-CONNS-DELETE-CONN 'GLFNRESULTTYPE)
'(LISTOF MENU-SET-CONN))
@@ -405,6 +467,7 @@
(DEFUN MENU-CONNS-REMOVE-ITEMS (MC)
(MENU-SET-REMOVE-ITEMS (CADR MC))
(SETF (CADDR MC) NIL))
+(SETF (GET 'MENU-CONNS-REMOVE-ITEMS 'GLARGUMENTS) '((MC MENU-CONNS)))
(SETF (GET 'MENU-CONNS-REMOVE-ITEMS 'GLFNRESULTTYPE)
'(LISTOF MENU-SET-CONN))
@@ -424,6 +487,8 @@
(IF (AND (EQ BOXNAME (CADAR CONN)) (EQ PORT (CAAR CONN)))
(SETQ RES (NCONC RES (CONS (CADR CONN) NIL)))))
RES))
+(SETF (GET 'MENU-CONNS-FIND-CONNS 'GLARGUMENTS)
+ '((MC MENU-CONNS) (BOXNAME SYMBOL) (PORT SYMBOL)))
(SETF (GET 'MENU-CONNS-FIND-CONNS 'GLFNRESULTTYPE) '(LISTOF MENU-PORT))
@@ -433,7 +498,11 @@
"glisp/menu-set-header.lsp")
(COMPILE-FILE "glisp/menu-settrans.lsp"))
-(IN-PACKAGE :USER)
+(DEFUN COMPILE-MENU-SETB ()
+ (GLCOMPFILES *DIRECTORY*
+ '("glisp/vector.lsp" "X/dwindow.lsp" "X/dwnoopen.lsp")
+ '("glisp/menu-set.lsp") "glisp/menu-settrans.lsp"
+ "glisp/menu-set-header.lsp"))
(DEFVAR *DRAW-WINDOW* NIL)
@@ -539,11 +608,11 @@
((RADIUSX ((X SIZE) / 2)) (RADIUSY ((Y SIZE) / 2))
(RADIUS ((MAX RADIUSX RADIUSY))) (CENTER (OFFSET + SIZE / 2))
(DELTA ((SQRT (ABS (RADIUSX ^ 2 - RADIUSY ^ 2)))))
- (P1 ((IF (RADIUSX > RADIUSY) THEN
- (A VECTOR X = (X CENTER) - DELTA Y = (Y CENTER)) ELSE
+ (P1 ((IF (RADIUSX > RADIUSY)
+ (A VECTOR X = (X CENTER) - DELTA Y = (Y CENTER))
(A VECTOR X = (X CENTER) Y = (Y CENTER) - DELTA))))
- (P2 ((IF (RADIUSX > RADIUSY) THEN
- (A VECTOR X = (X CENTER) + DELTA Y = (Y CENTER)) ELSE
+ (P2 ((IF (RADIUSX > RADIUSY)
+ (A VECTOR X = (X CENTER) + DELTA Y = (Y CENTER))
(A VECTOR X = (X CENTER) Y = (Y CENTER) + DELTA)))))
MSG
((DRAW DRAW-ELLIPSE-DRAW) (SNAP DRAW-ELLIPSE-SNAP)
@@ -596,12 +665,13 @@
(DEFUN DRAW-DESC (NAME)
(LET (DD)
(SETQ DD (DRAW-DESCR NAME))
- (UNLESS DD
+ (WHEN (NOT DD)
(SETQ DD
(LIST 'DRAW-DESC NAME NIL (COPY-LIST '(0 0))
(COPY-LIST '(0 0))))
(SETF (DRAW-DESCR NAME) DD))
DD))
+(SETF (GET 'DRAW-DESC 'GLARGUMENTS) '((NAME SYMBOL)))
(SETF (GET 'DRAW-DESC 'GLFNRESULTTYPE) 'DRAW-DESC)
@@ -616,17 +686,13 @@
(DEFUN DRAW (NAME)
(LET (W DD DONE SEL (REDRAW T) NEW)
(SETQ W (DRAW-WINDOW))
- (XMAPWINDOW *WINDOW-DISPLAY* (CADR W))
- (XFLUSH *WINDOW-DISPLAY*)
- (WINDOW-WAIT-EXPOSURE W)
+ (WINDOW-OPEN W)
(OR *DRAW-MENU-SET* (DRAW-INIT-MENUS))
(SETQ DD (DRAW-DESC NAME))
(UNLESS (MEMBER NAME *DRAW-OBJECTS*)
(SETQ *DRAW-OBJECTS* (NCONC *DRAW-OBJECTS* (LIST NAME))))
(DRAW-DESC-DRAW DD W)
- (TAGBODY
- GLLABEL4253
- (UNLESS DONE
+ (WHILE (NOT DONE)
(SETQ SEL (MENU-SET-SELECT *DRAW-MENU-SET* REDRAW))
(SETQ REDRAW NIL)
(CASE (CADR SEL)
@@ -635,17 +701,14 @@
(MOVE (DRAW-DESC-MOVE DD W))
(DELETE (DRAW-DESC-DELETE DD W))
(COPY (DRAW-DESC-COPY DD W))
- (REDRAW (XCLEARWINDOW *WINDOW-DISPLAY* (CADR W))
- (XFLUSH *WINDOW-DISPLAY*) (SETQ REDRAW T)
+ (REDRAW (WINDOW-CLEAR W) (SETQ REDRAW T)
(DRAW-DESC-DRAW DD W))
(ORIGIN (DRAW-DESC-ORIGIN DD W)
- (XCLEARWINDOW *WINDOW-DISPLAY* (CADR W))
- (XFLUSH *WINDOW-DISPLAY*) (SETQ REDRAW T)
+ (WINDOW-CLEAR W) (SETQ REDRAW T)
(DRAW-DESC-DRAW DD W))
(PROGRAM (DRAW-DESC-PROGRAM DD))
(LATEX (DRAW-DESC-LATEX DD))
- (LATEXMODE
- (SETQ *DRAW-LATEX-MODE*
+ (LATEXMODE (SETQ *DRAW-LATEX-MODE*
(NOT *DRAW-LATEX-MODE*))
(FORMAT T "Latex Mode is now ~A~%"
*DRAW-LATEX-MODE*))))
@@ -664,29 +727,24 @@
(REFPT (SETQ NEW (DRAW-REFPT-GET DD W))))
(WHEN NEW
(SETF (CADR NEW)
- (LET ((GLVAR4251 (CADR NEW))
- (GLVAR4252 (CADDDR DD)))
- (LIST (- (CAR GLVAR4251) (CAR GLVAR4252))
- (- (CADR GLVAR4251) (CADR GLVAR4252)))))
- (SETF (CADDR DD) (NCONC (CADDR DD) (CONS NEW NIL)))
+ (LIST (- (CAADR NEW) (CAR (CADDDR DD)))
+ (- (CADADR NEW) (CADR (CADDDR DD)))))
+ (SETF (CADDR DD)
+ (NCONC (CADDR DD) (CONS NEW NIL)))
(DRAW-OBJECT-DRAW NEW W (CADDDR DD))))
- (BACKGROUND))
- (GO GLLABEL4253)))
+ (BACKGROUND)))
(SETF (DRAW-DESCR NAME) DD)
- (UNLESS *DRAW-LEAVE-WINDOW*
- (PROGN
- (XUNMAPWINDOW *WINDOW-DISPLAY* (CADR W))
- (XFLUSH *WINDOW-DISPLAY*)
- (WINDOW-WAIT-UNMAP W)))
+ (UNLESS *DRAW-LEAVE-WINDOW* (WINDOW-CLOSE W))
NAME))
+(SETF (GET 'DRAW 'GLARGUMENTS) '((NAME SYMBOL)))
(SETF (GET 'DRAW 'GLFNRESULTTYPE) 'SYMBOL)
(DEFUN DRAW-DESC-DRAW (DD W)
- (XCLEARWINDOW *WINDOW-DISPLAY* (CADR W))
- (XFLUSH *WINDOW-DISPLAY*)
- (DOLIST (OBJ (CADDR DD)) (DRAW-OBJECT-DRAW OBJ W (CADDDR DD)))
- (XFLUSH *WINDOW-DISPLAY*))
+ (LET ((OFF (CADDDR DD)))
+ (WINDOW-CLEAR W)
+ (DOLIST (OBJ (CADDR DD)) (DRAW-OBJECT-DRAW OBJ W OFF))
+ (WINDOW-FORCE-OUTPUT W)))
(DEFUN DRAW-DESC-SELECTED (DD P)
(LET (OBJS OBJSB OBJ)
@@ -696,7 +754,7 @@
(CONS OBJ NIL)))
(CADDR DD)))
(IF OBJS
- (IF (REST OBJS)
+ (IF (NULL (REST OBJS)) (SETQ OBJ (FIRST OBJS))
(PROGN
(SETQ OBJSB
(MAPCAN #'(LAMBDA (Z)
@@ -705,32 +763,35 @@
(CONS Z NIL)))
OBJS))
(IF (AND OBJSB (NULL (REST OBJSB)))
- (SETQ OBJ (FIRST OBJSB))))
- (SETQ OBJ (FIRST OBJS))))
+ (SETQ OBJ (FIRST OBJSB))))))
OBJ))
+(SETF (GET 'DRAW-DESC-SELECTED 'GLARGUMENTS)
+ '((DD DRAW-DESC) (P VECTOR)))
(SETF (GET 'DRAW-DESC-SELECTED 'GLFNRESULTTYPE) 'DRAW-OBJECT)
(DEFUN DRAW-DESC-FIND (DD W &OPTIONAL CROSSFLG)
(LET (P OBJ)
- (TAGBODY
- GLLABEL4254
- (UNLESS OBJ
+ (WHILE (NOT OBJ)
(SETQ P
(IF CROSSFLG (DRAW-GET-CROSS DD W)
(DRAW-GET-CROSSHAIRS DD W)))
- (SETQ OBJ (DRAW-DESC-SELECTED DD P))
- (GO GLLABEL4254)))
+ (SETQ OBJ (DRAW-DESC-SELECTED DD P)))
OBJ))
+(SETF (GET 'DRAW-DESC-FIND 'GLARGUMENTS)
+ '((DD DRAW-DESC) (W WINDOW) (&OPTIONAL NIL) (CROSSFLG BOOLEAN)))
(SETF (GET 'DRAW-DESC-FIND 'GLFNRESULTTYPE) 'DRAW-OBJECT)
(DEFUN DRAW-GET-CROSS (DD W) (DRAW-DESC-SNAP DD (WINDOW-GET-CROSS W)))
+(SETF (GET 'DRAW-GET-CROSS 'GLARGUMENTS) '((DD DRAW-DESC) (W WINDOW)))
(SETF (GET 'DRAW-GET-CROSS 'GLFNRESULTTYPE) 'VECTOR)
(DEFUN DRAW-GET-CROSSHAIRS (DD W)
(DRAW-DESC-SNAP DD (WINDOW-GET-CROSSHAIRS W)))
+(SETF (GET 'DRAW-GET-CROSSHAIRS 'GLARGUMENTS)
+ '((DD DRAW-DESC) (W WINDOW)))
(SETF (GET 'DRAW-GET-CROSSHAIRS 'GLFNRESULTTYPE) 'VECTOR)
@@ -739,6 +800,8 @@
(SETQ OBJ (DRAW-DESC-FIND DD W T))
(DRAW-OBJECT-ERASE OBJ W (CADDDR DD))
(SETF (CADDR DD) (REMOVE OBJ (CADDR DD)))))
+(SETF (GET 'DRAW-DESC-DELETE 'GLARGUMENTS)
+ '((DD DRAW-DESC) (W WINDOW)))
(SETF (GET 'DRAW-DESC-DELETE 'GLFNRESULTTYPE) '(LISTOF DRAW-OBJECT))
@@ -748,12 +811,12 @@
(SETQ OBJB (COPY-TREE OBJ))
(DRAW-GET-OBJECT-POS OBJB W)
(SETF (CADR OBJB)
- (LET ((GLVAR4255 (CADR OBJB)) (GLVAR4256 (CADDDR DD)))
- (LIST (- (CAR GLVAR4255) (CAR GLVAR4256))
- (- (CADR GLVAR4255) (CADR GLVAR4256)))))
+ (LIST (- (CAADR OBJB) (CAR (CADDDR DD)))
+ (- (CADADR OBJB) (CADR (CADDDR DD)))))
(DRAW-OBJECT-DRAW OBJB W (CADDDR DD))
- (XFLUSH *WINDOW-DISPLAY*)
+ (WINDOW-FORCE-OUTPUT W)
(SETF (CADDR DD) (NCONC (CADDR DD) (CONS OBJB NIL)))))
+(SETF (GET 'DRAW-DESC-COPY 'GLARGUMENTS) '((DD DRAW-DESC) (W WINDOW)))
(SETF (GET 'DRAW-DESC-COPY 'GLFNRESULTTYPE) '(LISTOF DRAW-OBJECT))
@@ -765,13 +828,14 @@
(DEFUN DRAW-DESC-ORIGIN (DD W)
(LET (SEL)
(DRAW-DESC-BOUNDS DD)
- (SETQ SEL (MENU '(("To zero" . ZERO) ("Select" . SELECT))))
- (COND
- ((EQ SEL 'SELECT)
+ (SETQ SEL (MENU '(("To zero" . TOZERO) ("Select" . SELECT))))
+ (IF (EQ SEL 'SELECT)
(SETF (CADDDR DD)
(WINDOW-GET-BOX-POSITION W (CAR (FIFTH DD))
- (CADR (FIFTH DD)))))
- ((EQ SEL 'ZERO) (SETF (CADDDR DD) (COPY-LIST '(0 0)))))))
+ (CADR (FIFTH DD))))
+ (IF (EQ SEL 'TOZERO) (SETF (CADDDR DD) (COPY-LIST '(0 0)))))))
+(SETF (GET 'DRAW-DESC-ORIGIN 'GLARGUMENTS)
+ '((DD DRAW-DESC) (W WINDOW)))
(SETF (GET 'DRAW-DESC-ORIGIN 'GLFNRESULTTYPE) 'VECTOR)
@@ -790,20 +854,18 @@
(SETF (CADDDR DD) BASEV)
(DOLIST (OBJ (CADDR DD))
(SETF (CADR OBJ)
- (LET ((GLVAR4257 (CADR OBJ)))
- (LIST (- (CAR GLVAR4257) (CAR BASEV))
- (- (CADR GLVAR4257) (CADR BASEV))))))))
+ (LIST (- (CAADR OBJ) (CAR BASEV))
+ (- (CADADR OBJ) (CADR BASEV)))))))
(DEFUN DRAW-DESC-LATEX (DD)
(LET (BASE BX BY SX SY)
- (FORMAT T " \\begin{picture}(~5,2F,~5,2F)(0,0)~%"
+ (FORMAT T " \\begin{picture}(~5,0F,~5,0F)(0,0)~%"
(* (CAR (FIFTH DD)) *DRAW-LATEX-FACTOR*)
(* (CADR (FIFTH DD)) *DRAW-LATEX-FACTOR*))
(DOLIST (OBJ (CADDR DD))
(SETQ BASE
- (LET ((GLVAR4260 (CADDDR DD)) (GLVAR4261 (CADR OBJ)))
- (LIST (+ (CAR GLVAR4260) (CAR GLVAR4261))
- (+ (CADR GLVAR4260) (CADR GLVAR4261)))))
+ (LIST (+ (CAR (CADDDR DD)) (CAADR OBJ))
+ (+ (CADR (CADDDR DD)) (CADADR OBJ))))
(SETQ BX (* (CAR BASE) *DRAW-LATEX-FACTOR*))
(SETQ BY (* (CADR BASE) *DRAW-LATEX-FACTOR*))
(SETQ SX (* (CAADDR OBJ) *DRAW-LATEX-FACTOR*))
@@ -817,27 +879,27 @@
(+ (CADR BASE) SY) T))
(DRAW-BOX
(FORMAT T
- " \\put(~5,2F,~5,2F) {\\framebox(~5,2F,~5,2F)}~%"
+ " \\put(~5,0F,~5,0F) {\\framebox(~5,0F,~5,0F)}~%"
BX BY SX SY))
(DRAW-RCBOX
- (FORMAT T " \\put(~5,2F,~5,2F) {\\oval(~5,2F,~5,2F)}~%"
+ (FORMAT T " \\put(~5,0F,~5,0F) {\\oval(~5,0F,~5,0F)}~%"
(+ BX (/ SX 2)) (+ BY (/ SY 2)) SX SY))
(DRAW-CIRCLE
- (FORMAT T " \\put(~5,2F,~5,2F) {\\circle{~5,2F}}~%"
+ (FORMAT T " \\put(~5,0F,~5,0F) {\\circle{~5,0F}}~%"
(+ BX (/ SX 2)) (+ BY (/ SY 2)) SX))
(DRAW-ELLIPSE
- (FORMAT T " \\put(~5,2F,~5,2F) {\\oval(~5,2F,~5,2F)}~%"
+ (FORMAT T " \\put(~5,0F,~5,0F) {\\oval(~5,0F,~5,0F)}~%"
(+ BX (/ SX 2)) (+ BY (/ SY 2)) SX SY))
(DRAW-BUTTON
(FORMAT T
- " \\put(~5,2F,~5,2F) {\\framebox(~5,2F,~5,2F)}~%"
+ " \\put(~5,0F,~5,0F) {\\framebox(~5,0F,~5,0F)}~%"
BX BY SX SY))
(DRAW-ERASE)
(DRAW-DOT
- (FORMAT T " \\put(~5,2F,~5,2F) {\\circle*{~5,2F}}~%"
+ (FORMAT T " \\put(~5,0F,~5,0F) {\\circle*{~5,0F}}~%"
(+ BX (/ SX 2)) (+ BY (/ SY 2)) SX))
(DRAW-TEXT
- (FORMAT T " \\put(~5,2F,~5,2F) {~A}~%" BX
+ (FORMAT T " \\put(~5,0F,~5,0F) {~A}~%" BX
(+ BY (* 4 *DRAW-LATEX-FACTOR*)) (CADDDR OBJ)))))
(FORMAT T " \\end{picture}~%")))
@@ -849,21 +911,18 @@
(PROGN
(SETQ BASE
(LET
- ((GLVAR4264
- (LET
- ((GLVAR4262 (CADDDR DD))
- (GLVAR4263 (CADR OBJ)))
+ ((GLVAR25425
(LIST
- (+ (CAR GLVAR4262)
- (CAR GLVAR4263))
- (+ (CADR GLVAR4262)
- (CADR GLVAR4263)))))
- (GLVAR4265 (DRAW-DESC-REFPT DD)))
+ (+ (CAR (CADDDR DD))
+ (CAADR OBJ))
+ (+ (CADR (CADDDR DD))
+ (CADADR OBJ))))
+ (GLVAR25428 (DRAW-DESC-REFPT DD)))
(LIST
- (- (CAR GLVAR4264)
- (CAR GLVAR4265))
- (- (CADR GLVAR4264)
- (CADR GLVAR4265)))))
+ (- (CAR GLVAR25425)
+ (CAR GLVAR25428))
+ (- (CADR GLVAR25425)
+ (CADR GLVAR25428)))))
(SETQ BX (CAR BASE))
(SETQ BY (CADR BASE))
(SETQ SX (CAADDR OBJ))
@@ -871,12 +930,10 @@
(SETQ TOX (+ BX SX))
(SETQ TOY (+ BY SY))
(IF (EQ (CAR OBJ) 'DRAW-CIRCLE)
- (SETQ R (TRUNCATE (CAADDR OBJ) 2)))
+ (SETQ R (/ (CAADDR OBJ) 2)))
(WHEN (EQ (CAR OBJ) 'DRAW-ELLIPSE)
- (SETQ RX
- (TRUNCATE (CAADDR OBJ) 2))
- (SETQ RY
- (TRUNCATE (CADR (CADDR OBJ)) 2)))
+ (SETQ RX (/ (CAADDR OBJ) 2))
+ (SETQ RY (/ (CADR (CADDR OBJ)) 2)))
(DRAW-OPTIMIZE
(CASE (FIRST OBJ)
(DRAW-LINE
@@ -931,6 +988,7 @@
(SETF (SYMBOL-FUNCTION FNNAME) FNCODE)
(FORMAT T "Constructed program (~A w x y)~%" FNNAME)
(DRAW-DESC-PICMENU DD)))
+(SETF (GET 'DRAW-DESC-PROGRAM 'GLARGUMENTS) '((DD DRAW-DESC)))
(SETF (GET 'DRAW-DESC-PROGRAM 'GLFNRESULTTYPE)
'(LIST GLTYPE INTEGER INTEGER (LISTOF (LIST ANYTHING VECTOR))
BOOLEAN SYMBOL SYMBOL))
@@ -940,6 +998,7 @@
(DEFUN DRAW-DESC-FNNAME (DD)
(INTERN (CONCATENATE 'STRING "DRAW-" (SYMBOL-NAME (CADR DD)))))
+(SETF (GET 'DRAW-DESC-FNNAME 'GLARGUMENTS) '((DD DRAW-DESC)))
(SETF (GET 'DRAW-DESC-FNNAME 'GLFNRESULTTYPE) 'SYMBOL)
@@ -950,28 +1009,27 @@
(AND (EQ (FIRST OBJ) 'DRAW-BUTTON)
(CONS (LIST (CADDDR OBJ)
(LET
- ((GLVAR4268
+ ((GLVAR25733
(LET
- ((GLVAR4266
- (COPY-LIST '(2 2)))
- (GLVAR4267 (CADR OBJ)))
+ ((GLVAR25709
+ (COPY-LIST '(2 2))))
(LIST
- (+ (CAR GLVAR4266)
- (CAR GLVAR4267))
- (+ (CADR GLVAR4266)
- (CADR GLVAR4267)))))
- (GLVAR4269 (CADDDR DD)))
+ (+ (CAR GLVAR25709)
+ (CAADR OBJ))
+ (+ (CADR GLVAR25709)
+ (CADADR OBJ))))))
(LIST
- (+ (CAR GLVAR4268)
- (CAR GLVAR4269))
- (+ (CADR GLVAR4268)
- (CADR GLVAR4269)))))
+ (+ (CAR GLVAR25733)
+ (CAR (CADDDR DD)))
+ (+ (CADR GLVAR25733)
+ (CADR (CADDDR DD))))))
NIL)))
(CADDR DD)))
(IF BUTTONS
(SETF (GET (CADR DD) 'PICMENU-SPEC)
(LIST 'PICMENU-SPEC (CAR (FIFTH DD)) (CADR (FIFTH DD))
BUTTONS T (DRAW-DESC-FNNAME DD) '9X15)))))
+(SETF (GET 'DRAW-DESC-PICMENU 'GLARGUMENTS) '((DD DRAW-DESC)))
(SETF (GET 'DRAW-DESC-PICMENU 'GLFNRESULTTYPE)
'(LIST GLTYPE INTEGER INTEGER (LISTOF (LIST ANYTHING VECTOR))
BOOLEAN SYMBOL SYMBOL))
@@ -980,13 +1038,10 @@
(DEFUN DRAW-DESC-SNAP (DD P)
(LET (PSNAP OBJ (OBJS (CADDR DD)))
(IF *DRAW-SNAP-FLAG*
- (TAGBODY
- GLLABEL4270
- (WHEN (AND OBJS (NOT PSNAP))
- (SETQ OBJ (POP OBJS))
- (SETQ PSNAP (DRAW-OBJECT-SNAP OBJ P (CADDDR DD)))
- (GO GLLABEL4270))))
+ (WHILE (AND OBJS (NOT PSNAP)) (SETQ OBJ (POP OBJS))
+ (SETQ PSNAP (DRAW-OBJECT-SNAP OBJ P (CADDDR DD)))))
(OR PSNAP P)))
+(SETF (GET 'DRAW-DESC-SNAP 'GLARGUMENTS) '((DD DRAW-DESC) (P VECTOR)))
(SETF (GET 'DRAW-DESC-SNAP 'GLFNRESULTTYPE) 'VECTOR)
@@ -994,11 +1049,9 @@
(DRAW-OBJECT-ERASE D W OFF)
(DRAW-GET-OBJECT-POS D W)
(SETF (CADR D)
- (LET ((GLVAR4271 (CADR D)))
- (LIST (- (CAR GLVAR4271) (CAR OFF))
- (- (CADR GLVAR4271) (CADR OFF)))))
+ (LIST (- (CAADR D) (CAR OFF)) (- (CADADR D) (CADR OFF))))
(DRAW-OBJECT-DRAW D W OFF)
- (XFLUSH *WINDOW-DISPLAY*))
+ (WINDOW-FORCE-OUTPUT W))
(DEFUN DRAW-OBJECT-DRAW-AT (W X Y D)
(SETF (SECOND D) (LIST X Y))
@@ -1018,61 +1071,33 @@
(IF (EQ (FIRST D) 'DRAW-TEXT) #'DRAW-TEXT-DRAW-OUTLINE
#'DRAW-OBJECT-DRAW-AT)
(LIST D)))
+(SETF (GET 'DRAW-GET-OBJECT-POS 'GLARGUMENTS)
+ '((D DRAW-OBJECT) (W WINDOW)))
(SETF (GET 'DRAW-GET-OBJECT-POS 'GLFNRESULTTYPE) 'VECTOR)
(DEFUN DRAW-OBJECT-ERASE (D W OFF)
- (UNLESS (EQ (FIRST D) 'DRAW-ERASE)
- (LET ((GC (CADDR W)))
- (SETQ *WINDOW-SAVE-FUNCTION*
- (PROGN
- (XGETGCVALUES *WINDOW-DISPLAY* (CADDR W) GCFUNCTION
- *GC-VALUES*)
- (XGCVALUES-FUNCTION *GC-VALUES*)))
- (XSETFUNCTION *WINDOW-DISPLAY* GC GXXOR)
- (SETQ *WINDOW-SAVE-FOREGROUND*
- (PROGN
- (XGETGCVALUES *WINDOW-DISPLAY* (CADDR W) GCFOREGROUND
- *GC-VALUES*)
- (XGCVALUES-FOREGROUND *GC-VALUES*)))
- (XSETFOREGROUND *WINDOW-DISPLAY* GC
- (LOGXOR *WINDOW-SAVE-FOREGROUND*
- (PROGN
- (XGETGCVALUES *WINDOW-DISPLAY* (CADDR W)
- GCBACKGROUND *GC-VALUES*)
- (XGCVALUES-BACKGROUND *GC-VALUES*)))))
+ (WHEN (NOT (EQ (FIRST D) 'DRAW-ERASE))
+ (WINDOW-SET-XOR W)
(DRAW-OBJECT-DRAW D W OFF)
- (LET ((GC (CADDR W)))
- (XSETFUNCTION *WINDOW-DISPLAY* GC *WINDOW-SAVE-FUNCTION*)
- (XSETFOREGROUND *WINDOW-DISPLAY* GC *WINDOW-SAVE-FOREGROUND*))))
+ (WINDOW-UNSET W)))
(DEFUN DRAW-LINE-DRAW (D W OFF)
- (LET ((FROM (LET ((GLVAR4272 (CADR D)))
- (LIST (+ (CAR OFF) (CAR GLVAR4272))
- (+ (CADR OFF) (CADR GLVAR4272)))))
- (TO (LET ((GLVAR4274
- (LET ((GLVAR4273 (CADR D)))
- (LIST (+ (CAR OFF) (CAR GLVAR4273))
- (+ (CADR OFF) (CADR GLVAR4273)))))
- (GLVAR4275 (CADDR D)))
- (LIST (+ (CAR GLVAR4274) (CAR GLVAR4275))
- (+ (CADR GLVAR4274) (CADR GLVAR4275))))))
- (LET ((QQWHEIGHT (CADDDR W)))
- (XDRAWLINE *WINDOW-DISPLAY* (CADR W) (CADDR W) (CAR FROM)
- (- QQWHEIGHT (CADR FROM)) (CAR TO) (- QQWHEIGHT (CADR TO)))
- NIL)))
+ (LET ((FROM (LIST (+ (CAR OFF) (CAADR D)) (+ (CADR OFF) (CADADR D))))
+ (TO (LET ((GLVAR26041
+ (LIST (+ (CAR OFF) (CAADR D))
+ (+ (CADR OFF) (CADADR D)))))
+ (LIST (+ (CAR GLVAR26041) (CAADDR D))
+ (+ (CADR GLVAR26041) (CADR (CADDR D)))))))
+ (WINDOW-DRAW-LINE-XY W (CAR FROM) (CADR FROM) (CAR TO) (CADR TO))))
(DEFUN DRAW-ARROW-DRAW (D W OFF)
- (LET ((FROM (LET ((GLVAR4280 (CADR D)))
- (LIST (+ (CAR OFF) (CAR GLVAR4280))
- (+ (CADR OFF) (CADR GLVAR4280)))))
- (TO (LET ((GLVAR4282
- (LET ((GLVAR4281 (CADR D)))
- (LIST (+ (CAR OFF) (CAR GLVAR4281))
- (+ (CADR OFF) (CADR GLVAR4281)))))
- (GLVAR4283 (CADDR D)))
- (LIST (+ (CAR GLVAR4282) (CAR GLVAR4283))
- (+ (CADR GLVAR4282) (CADR GLVAR4283))))))
+ (LET ((FROM (LIST (+ (CAR OFF) (CAADR D)) (+ (CADR OFF) (CADADR D))))
+ (TO (LET ((GLVAR26179
+ (LIST (+ (CAR OFF) (CAADR D))
+ (+ (CADR OFF) (CADADR D)))))
+ (LIST (+ (CAR GLVAR26179) (CAADDR D))
+ (+ (CADR GLVAR26179) (CADR (CADDR D)))))))
(WINDOW-DRAW-ARROW-XY W (CAR FROM) (CADR FROM) (CAR TO) (CADR TO))))
(DEFUN DRAW-LINE-SELECTEDP (D PT OFF)
@@ -1086,11 +1111,13 @@
(+ 2
(+ (+ (CADADR D) (MIN 0 (CADR (CADDR D))))
(ABS (CADR (CADDR D))))))
- (< (ABS (LET ((DX (CAADDR D)) (DY (CADR (CADDR D))))
- (/ (- (* DX (- (CADR PTP) (CADADR D)))
- (* DY (- (CAR PTP) (CAADR D))))
- (SQRT (+ (EXPT DX 2) (EXPT DY 2))))))
+ (< (ABS (/ (- (* (CAADDR D) (- (CADR PTP) (CADADR D)))
+ (* (CADR (CADDR D)) (- (CAR PTP) (CAADR D))))
+ (SQRT (+ (EXPT (CAADDR D) 2)
+ (EXPT (CADR (CADDR D)) 2)))))
5))))
+(SETF (GET 'DRAW-LINE-SELECTEDP 'GLARGUMENTS)
+ '((D DRAW-LINE) (PT VECTOR) (OFF VECTOR)))
(SETF (GET 'DRAW-LINE-SELECTEDP 'GLFNRESULTTYPE) 'BOOLEAN)
@@ -1105,6 +1132,7 @@
(LIST 'DRAW-LINE FROM
(LIST (- (CAR TO) (CAR FROM)) (- (CADR TO) (CADR FROM))) NIL
0)))
+(SETF (GET 'DRAW-LINE-GET 'GLARGUMENTS) '((DD DRAW-DESC) (W WINDOW)))
(SETF (GET 'DRAW-LINE-GET 'GLFNRESULTTYPE) 'DRAW-LINE)
@@ -1119,17 +1147,14 @@
(LIST 'DRAW-ARROW FROM
(LIST (- (CAR TO) (CAR FROM)) (- (CADR TO) (CADR FROM))) NIL
0)))
+(SETF (GET 'DRAW-ARROW-GET 'GLARGUMENTS) '((DD DRAW-DESC) (W WINDOW)))
(SETF (GET 'DRAW-ARROW-GET 'GLFNRESULTTYPE) 'DRAW-ARROW)
(DEFUN DRAW-BOX-DRAW (D W OFF)
- (LET ((GLVAR4289
- (LET ((GLVAR4288 (CADR D)))
- (LIST (+ (CAR OFF) (CAR GLVAR4288))
- (+ (CADR OFF) (CADR GLVAR4288)))))
- (GLVAR4290 (CADDR D)))
- (WINDOW-DRAW-BOX-XY W (CAR GLVAR4289) (CADR GLVAR4289)
- (CAR GLVAR4290) (CADR GLVAR4290) NIL)))
+ (WINDOW-DRAW-BOX W
+ (LIST (+ (CAR OFF) (CAADR D)) (+ (CADR OFF) (CADADR D)))
+ (CADDR D)))
(DEFUN DRAW-BOX-SELECTEDP (D P OFF)
(LET ((PT (LIST (- (CAR P) (CAR OFF)) (- (CADR P) (CADR OFF)))))
@@ -1163,6 +1188,8 @@
(- (CADR PT)
(+ (CADADR D) (MIN 0 (CADR (CADDR D)))))))
5))))))
+(SETF (GET 'DRAW-BOX-SELECTEDP 'GLARGUMENTS)
+ '((D DRAW-BOX) (P VECTOR) (OFF VECTOR)))
(SETF (GET 'DRAW-BOX-SELECTEDP 'GLFNRESULTTYPE) 'BOOLEAN)
@@ -1170,6 +1197,7 @@
(LET (BOX)
(SETQ BOX (WINDOW-GET-REGION W))
(LIST 'DRAW-BOX (CAR BOX) (CADR BOX) NIL 0)))
+(SETF (GET 'DRAW-BOX-GET 'GLARGUMENTS) '((DD DRAW-DESC) (W WINDOW)))
(SETF (GET 'DRAW-BOX-GET 'GLFNRESULTTYPE) 'DRAW-BOX)
@@ -1206,6 +1234,8 @@
(- (CADR PT)
(+ (CADADR D) (MIN 0 (CADR (CADDR D)))))))
5))))))
+(SETF (GET 'DRAW-RCBOX-SELECTEDP 'GLARGUMENTS)
+ '((D DRAW-BOX) (P VECTOR) (OFF VECTOR)))
(SETF (GET 'DRAW-RCBOX-SELECTEDP 'GLFNRESULTTYPE) 'BOOLEAN)
@@ -1213,50 +1243,46 @@
(LET (BOX)
(SETQ BOX (WINDOW-GET-REGION W))
(LIST 'DRAW-RCBOX (CAR BOX) (CADR BOX) NIL 0)))
+(SETF (GET 'DRAW-RCBOX-GET 'GLARGUMENTS) '((DD DRAW-DESC) (W WINDOW)))
(SETF (GET 'DRAW-RCBOX-GET 'GLFNRESULTTYPE) 'DRAW-RCBOX)
(DEFUN DRAW-CIRCLE-DRAW (D W OFF)
- (LET ((GLVAR4295
- (LET ((GLVAR4294
- (LET ((GLVAR4292 (CADR D))
- (GLVAR4293
- (LET ((GLVAR4291 (CADDR D)))
- (LIST (TRUNCATE (CAR GLVAR4291) 2)
- (TRUNCATE (CADR GLVAR4291) 2)))))
- (LIST (+ (CAR GLVAR4292) (CAR GLVAR4293))
- (+ (CADR GLVAR4292) (CADR GLVAR4293))))))
- (LIST (+ (CAR OFF) (CAR GLVAR4294))
- (+ (CADR OFF) (CADR GLVAR4294))))))
- (WINDOW-DRAW-CIRCLE-XY W (CAR GLVAR4295) (CADR GLVAR4295)
- (TRUNCATE (CAADDR D) 2) NIL)))
+ (WINDOW-DRAW-CIRCLE W
+ (LET ((GLVAR27825
+ (LET ((GLVAR27802
+ (LIST (/ (CAADDR D) 2)
+ (/ (CADR (CADDR D)) 2))))
+ (LIST (+ (CAADR D) (CAR GLVAR27802))
+ (+ (CADADR D) (CADR GLVAR27802))))))
+ (LIST (+ (CAR OFF) (CAR GLVAR27825))
+ (+ (CADR OFF) (CADR GLVAR27825))))
+ (/ (CAADDR D) 2)))
(DEFUN DRAW-CIRCLE-SELECTEDP (D P OFF)
- (< (ABS (- (TRUNCATE (CAADDR D) 2)
- (LET ((SELF (LET ((GLVAR4301
+ (< (ABS (- (/ (CAADDR D) 2)
+ (SQRT (LET ((SELF (LET ((GLVAR27972
(LET
- ((GLVAR4300
+ ((GLVAR27949
(LET
- ((GLVAR4298 (CADR D))
- (GLVAR4299
- (LET ((GLVAR4297 (CADDR D)))
- (LIST
- (TRUNCATE (CAR GLVAR4297)
- 2)
- (TRUNCATE (CADR GLVAR4297)
- 2)))))
+ ((GLVAR27928
+ (LIST (/ (CAADDR D) 2)
+ (/ (CADR (CADDR D)) 2))))
(LIST
- (+ (CAR GLVAR4298)
- (CAR GLVAR4299))
- (+ (CADR GLVAR4298)
- (CADR GLVAR4299))))))
+ (+ (CAADR D)
+ (CAR GLVAR27928))
+ (+ (CADADR D)
+ (CADR GLVAR27928))))))
(LIST
- (+ (CAR GLVAR4300) (CAR OFF))
- (+ (CADR GLVAR4300) (CADR OFF))))))
- (LIST (- (CAR GLVAR4301) (CAR P))
- (- (CADR GLVAR4301) (CADR P))))))
- (SQRT (+ (EXPT (CAR SELF) 2) (EXPT (CADR SELF) 2))))))
+ (+ (CAR GLVAR27949) (CAR OFF))
+ (+ (CADR GLVAR27949)
+ (CADR OFF))))))
+ (LIST (- (CAR GLVAR27972) (CAR P))
+ (- (CADR GLVAR27972) (CADR P))))))
+ (+ (EXPT (CAR SELF) 2) (EXPT (CADR SELF) 2))))))
5))
+(SETF (GET 'DRAW-CIRCLE-SELECTEDP 'GLARGUMENTS)
+ '((D DRAW-CIRCLE) (P VECTOR) (OFF VECTOR)))
(SETF (GET 'DRAW-CIRCLE-SELECTEDP 'GLFNRESULTTYPE) 'BOOLEAN)
@@ -1267,111 +1293,100 @@
(LIST 'DRAW-CIRCLE
(LIST (- (CAAR CIR) (CADR CIR)) (- (CADAR CIR) (CADR CIR)))
(LIST (* 2 (CADR CIR)) (* 2 (CADR CIR))) NIL 0)))
+(SETF (GET 'DRAW-CIRCLE-GET 'GLARGUMENTS) '((DD DRAW-DESC) (W WINDOW)))
(SETF (GET 'DRAW-CIRCLE-GET 'GLFNRESULTTYPE) 'DRAW-CIRCLE)
(DEFUN DRAW-ELLIPSE-DRAW (D W OFF)
- (LET ((C (LET ((GLVAR4305
- (LET ((GLVAR4303 (CADR D))
- (GLVAR4304
- (LET ((GLVAR4302 (CADDR D)))
- (LIST (TRUNCATE (CAR GLVAR4302) 2)
- (TRUNCATE (CADR GLVAR4302) 2)))))
- (LIST (+ (CAR GLVAR4303) (CAR GLVAR4304))
- (+ (CADR GLVAR4303) (CADR GLVAR4304))))))
- (LIST (+ (CAR OFF) (CAR GLVAR4305))
- (+ (CADR OFF) (CADR GLVAR4305))))))
- (LET ((GLVAR4308 (TRUNCATE (CAADDR D) 2))
- (GLVAR4309 (TRUNCATE (CADR (CADDR D)) 2)))
- (XDRAWARC *WINDOW-DISPLAY* (CADR W) (CADDR W)
- (- (CAR C) GLVAR4308) (- (CADDDR W) (+ (CADR C) GLVAR4309))
- (* 2 GLVAR4308) (* 2 GLVAR4309) 0 23040)
- NIL)))
+ (LET ((C (LET ((GLVAR28162
+ (LET ((GLVAR28139
+ (LIST (/ (CAADDR D) 2)
+ (/ (CADR (CADDR D)) 2))))
+ (LIST (+ (CAADR D) (CAR GLVAR28139))
+ (+ (CADADR D) (CADR GLVAR28139))))))
+ (LIST (+ (CAR OFF) (CAR GLVAR28162))
+ (+ (CADR OFF) (CADR GLVAR28162))))))
+ (WINDOW-DRAW-ELLIPSE-XY W (CAR C) (CADR C) (/ (CAADDR D) 2)
+ (/ (CADR (CADDR D)) 2))))
(DEFUN DRAW-ELLIPSE-SELECTEDP (D P OFF)
(LET ((PT (LIST (- (CAR P) (CAR OFF)) (- (CADR P) (CADR OFF)))))
- (< (ABS (- (+ (LET ((SELF (LET ((GLVAR4323
+ (< (ABS (- (+ (SQRT (LET ((SELF (LET
+ ((GLVAR28502
(IF
- (> (TRUNCATE (CAADDR D) 2)
- (TRUNCATE (CADR (CADDR D)) 2))
+ (> (/ (CAADDR D) 2)
+ (/ (CADR (CADDR D)) 2))
(LIST
(ROUND
(-
(+ (CAADR D)
- (TRUNCATE (CAADDR D) 2))
+ (/ (CAADDR D) 2))
(SQRT
(ABS
- (-
- (EXPT
- (TRUNCATE (CAADDR D) 2) 2)
- (EXPT
- (TRUNCATE (CADR (CADDR D))
- 2)
- 2))))))
+ (/
+ (- (EXPT (CAADDR D) 2)
+ (EXPT (CADR (CADDR D))
+ 2))
+ 4)))))
(+ (CADADR D)
- (TRUNCATE (CADR (CADDR D)) 2)))
+ (/ (CADR (CADDR D)) 2)))
(LIST
- (+ (CAADR D)
- (TRUNCATE (CAADDR D) 2))
+ (+ (CAADR D) (/ (CAADDR D) 2))
(ROUND
(-
(+ (CADADR D)
- (TRUNCATE (CADR (CADDR D)) 2))
+ (/ (CADR (CADDR D)) 2))
(SQRT
(ABS
- (-
- (EXPT
- (TRUNCATE (CAADDR D) 2) 2)
- (EXPT
- (TRUNCATE (CADR (CADDR D))
- 2)
- 2))))))))))
- (LIST (- (CAR GLVAR4323) (CAR PT))
- (- (CADR GLVAR4323) (CADR PT))))))
- (SQRT (+ (EXPT (CAR SELF) 2) (EXPT (CADR SELF) 2))))
- (LET ((SELF (LET ((GLVAR4336
+ (/
+ (- (EXPT (CAADDR D) 2)
+ (EXPT (CADR (CADDR D))
+ 2))
+ 4)))))))))
+ (LIST
+ (- (CAR GLVAR28502) (CAR PT))
+ (- (CADR GLVAR28502) (CADR PT))))))
+ (+ (EXPT (CAR SELF) 2) (EXPT (CADR SELF) 2))))
+ (SQRT (LET ((SELF (LET
+ ((GLVAR28750
(IF
- (> (TRUNCATE (CAADDR D) 2)
- (TRUNCATE (CADR (CADDR D)) 2))
+ (> (/ (CAADDR D) 2)
+ (/ (CADR (CADDR D)) 2))
(LIST
(ROUND
(+
(+ (CAADR D)
- (TRUNCATE (CAADDR D) 2))
+ (/ (CAADDR D) 2))
(SQRT
(ABS
- (-
- (EXPT
- (TRUNCATE (CAADDR D) 2) 2)
- (EXPT
- (TRUNCATE (CADR (CADDR D))
- 2)
- 2))))))
+ (/
+ (- (EXPT (CAADDR D) 2)
+ (EXPT (CADR (CADDR D))
+ 2))
+ 4)))))
(+ (CADADR D)
- (TRUNCATE (CADR (CADDR D)) 2)))
+ (/ (CADR (CADDR D)) 2)))
(LIST
- (+ (CAADR D)
- (TRUNCATE (CAADDR D) 2))
+ (+ (CAADR D) (/ (CAADDR D) 2))
(ROUND
(+
(+ (CADADR D)
- (TRUNCATE (CADR (CADDR D)) 2))
+ (/ (CADR (CADDR D)) 2))
(SQRT
(ABS
- (-
- (EXPT
- (TRUNCATE (CAADDR D) 2) 2)
- (EXPT
- (TRUNCATE (CADR (CADDR D))
- 2)
- 2))))))))))
- (LIST (- (CAR GLVAR4336) (CAR PT))
- (- (CADR GLVAR4336) (CADR PT))))))
- (SQRT (+ (EXPT (CAR SELF) 2) (EXPT (CADR SELF) 2)))))
- (* 2
- (MAX (TRUNCATE (CAADDR D) 2)
- (TRUNCATE (CADR (CADDR D)) 2)))))
+ (/
+ (- (EXPT (CAADDR D) 2)
+ (EXPT (CADR (CADDR D))
+ 2))
+ 4)))))))))
+ (LIST
+ (- (CAR GLVAR28750) (CAR PT))
+ (- (CADR GLVAR28750) (CADR PT))))))
+ (+ (EXPT (CAR SELF) 2) (EXPT (CADR SELF) 2)))))
+ (* 2 (MAX (/ (CAADDR D) 2) (/ (CADR (CADDR D)) 2)))))
2)))
+(SETF (GET 'DRAW-ELLIPSE-SELECTEDP 'GLARGUMENTS)
+ '((D DRAW-ELLIPSE) (P VECTOR) (OFF VECTOR)))
(SETF (GET 'DRAW-ELLIPSE-SELECTEDP 'GLFNRESULTTYPE) 'BOOLEAN)
@@ -1394,6 +1409,8 @@
(LIST (- (CAAR ELL) (CAADR ELL))
(- (CADAR ELL) (CADADR ELL)))
(LIST (* 2 (CAADR ELL)) (* 2 (CADADR ELL))) NIL 0)))
+(SETF (GET 'DRAW-ELLIPSE-GET 'GLARGUMENTS)
+ '((DD DRAW-DESC) (W WINDOW)))
(SETF (GET 'DRAW-ELLIPSE-GET 'GLFNRESULTTYPE) 'DRAW-ELLIPSE)
@@ -1402,18 +1419,16 @@
(DEFUN DRAW-NULL-SELECTEDP (D PT OFF) NIL)
(DEFUN DRAW-BUTTON-DRAW (D W OFF)
- (LET ((GLVAR4338
- (LET ((GLVAR4337 (CADR D)))
- (LIST (+ (CAR OFF) (CAR GLVAR4337))
- (+ (CADR OFF) (CADR GLVAR4337)))))
- (GLVAR4339 (COPY-LIST '(4 4))))
- (WINDOW-DRAW-BOX-XY W (CAR GLVAR4338) (CADR GLVAR4338)
- (CAR GLVAR4339) (CADR GLVAR4339) NIL)))
+ (WINDOW-DRAW-BOX W
+ (LIST (+ (CAR OFF) (CAADR D)) (+ (CADR OFF) (CADADR D)))
+ (COPY-LIST '(4 4))))
(DEFUN DRAW-BUTTON-SELECTEDP (D P OFF)
(LET ((PTX (- (- (CAR P) (CAR OFF)) (CAADR D)))
(PTY (- (- (CADR P) (CADR OFF)) (CADADR D))))
(AND (> PTX -2) (< PTX 6) (> PTY -2) (< PTY 6))))
+(SETF (GET 'DRAW-BUTTON-SELECTEDP 'GLARGUMENTS)
+ '((D DRAW-BUTTON) (P VECTOR) (OFF VECTOR)))
(SETF (GET 'DRAW-BUTTON-SELECTEDP 'GLFNRESULTTYPE) 'BOOLEAN)
@@ -1424,23 +1439,22 @@
(SETQ CENT (DRAW-GET-CROSSHAIRS DD W))
(LIST 'DRAW-BUTTON (LIST (+ -2 (CAR CENT)) (+ -2 (CADR CENT)))
(COPY-LIST '(4 4)) VAR 0)))
+(SETF (GET 'DRAW-BUTTON-GET 'GLARGUMENTS) '((DD DRAW-DESC) (W WINDOW)))
(SETF (GET 'DRAW-BUTTON-GET 'GLFNRESULTTYPE) 'DRAW-BUTTON)
(DEFUN DRAW-ERASE-DRAW (D W OFF)
- (LET ((GLVAR4341
- (LET ((GLVAR4340 (CADR D)))
- (LIST (+ (CAR OFF) (CAR GLVAR4340))
- (+ (CADR OFF) (CADR GLVAR4340)))))
- (GLVAR4342 (CADDR D)))
- (WINDOW-ERASE-AREA-XY W (CAR GLVAR4341) (CADR GLVAR4341)
- (CAR GLVAR4342) (CADR GLVAR4342))))
+ (WINDOW-ERASE-AREA W
+ (LIST (+ (CAR OFF) (CAADR D)) (+ (CADR OFF) (CADADR D)))
+ (CADDR D)))
(DEFUN DRAW-ERASE-SELECTEDP (D P OFF)
(LET ((PT (LIST (- (CAR P) (CAR OFF)) (- (CADR P) (CADR OFF)))))
(AND (>= (CAR PT) (CAADR D)) (<= (CAR PT) (+ (CAADR D) (CAADDR D)))
(>= (CADR PT) (CADADR D))
(<= (CADR PT) (+ (CADADR D) (CADR (CADDR D)))))))
+(SETF (GET 'DRAW-ERASE-SELECTEDP 'GLARGUMENTS)
+ '((D DRAW-BOX) (P VECTOR) (OFF VECTOR)))
(SETF (GET 'DRAW-ERASE-SELECTEDP 'GLFNRESULTTYPE) 'BOOLEAN)
@@ -1448,6 +1462,7 @@
(LET (BOX)
(SETQ BOX (WINDOW-GET-REGION W))
(LIST 'DRAW-ERASE (CAR BOX) (CADR BOX) NIL 0)))
+(SETF (GET 'DRAW-ERASE-GET 'GLARGUMENTS) '((DD DRAW-DESC) (W WINDOW)))
(SETF (GET 'DRAW-ERASE-GET 'GLFNRESULTTYPE) 'DRAW-ERASE)
@@ -1460,6 +1475,7 @@
(SETQ CENT (DRAW-GET-CROSSHAIRS DD W))
(LIST 'DRAW-DOT (LIST (+ -2 (CAR CENT)) (+ -2 (CADR CENT)))
(COPY-LIST '(4 4)) NIL 0)))
+(SETF (GET 'DRAW-DOT-GET 'GLARGUMENTS) '((DD DRAW-DESC) (W WINDOW)))
(SETF (GET 'DRAW-DOT-GET 'GLFNRESULTTYPE) 'DRAW-DOT)
@@ -1471,36 +1487,21 @@
(LET ((PTX (- (- (CAR P) (CAR OFF)) (CAADR D)))
(PTY (- (- (CADR P) (CADR OFF)) (CADADR D))))
(AND (> PTX -3) (< PTX 3) (> PTY -3) (< PTY 3))))
+(SETF (GET 'DRAW-REFPT-SELECTEDP 'GLARGUMENTS)
+ '((D DRAW-BUTTON) (P VECTOR) (OFF VECTOR)))
(SETF (GET 'DRAW-REFPT-SELECTEDP 'GLFNRESULTTYPE) 'BOOLEAN)
(DEFUN DRAW-REFPT-GET (DD W)
(LET (CENT REFPT)
(WHEN (SETQ REFPT (ASSOC 'DRAW-REFPT (CADDR DD)))
- (LET ((GC (CADDR *DRAW-WINDOW*)))
- (SETQ *WINDOW-SAVE-FUNCTION*
- (PROGN
- (XGETGCVALUES *WINDOW-DISPLAY* (CADDR *DRAW-WINDOW*)
- GCFUNCTION *GC-VALUES*)
- (XGCVALUES-FUNCTION *GC-VALUES*)))
- (XSETFUNCTION *WINDOW-DISPLAY* GC GXCOPY)
- (SETQ *WINDOW-SAVE-FOREGROUND*
- (PROGN
- (XGETGCVALUES *WINDOW-DISPLAY* (CADDR *DRAW-WINDOW*)
- GCFOREGROUND *GC-VALUES*)
- (XGCVALUES-FOREGROUND *GC-VALUES*)))
- (XSETFOREGROUND *WINDOW-DISPLAY* GC
- (PROGN
- (XGETGCVALUES *WINDOW-DISPLAY* (CADDR *DRAW-WINDOW*)
- GCBACKGROUND *GC-VALUES*)
- (XGCVALUES-BACKGROUND *GC-VALUES*))))
+ (WINDOW-SET-ERASE *DRAW-WINDOW*)
(DRAW-OBJECT-DRAW REFPT *DRAW-WINDOW* (COPY-LIST '(0 0)))
- (LET ((GC (CADDR *DRAW-WINDOW*)))
- (XSETFUNCTION *WINDOW-DISPLAY* GC *WINDOW-SAVE-FUNCTION*)
- (XSETFOREGROUND *WINDOW-DISPLAY* GC *WINDOW-SAVE-FOREGROUND*))
+ (WINDOW-UNSET *DRAW-WINDOW*)
(SETF (CADDR DD) (REMOVE REFPT (CADDR DD))))
(SETQ CENT (DRAW-GET-CROSSHAIRS DD W))
(LIST 'DRAW-REFPT CENT (COPY-LIST '(0 0)) NIL 0)))
+(SETF (GET 'DRAW-REFPT-GET 'GLARGUMENTS) '((DD DRAW-DESC) (W WINDOW)))
(SETF (GET 'DRAW-REFPT-GET 'GLFNRESULTTYPE) 'DRAW-REFPT)
@@ -1508,15 +1509,13 @@
(LET (REFPT)
(SETQ REFPT (ASSOC 'DRAW-REFPT (CADDR DD)))
(IF REFPT (CADR REFPT) (COPY-LIST '(0 0)))))
+(SETF (GET 'DRAW-DESC-REFPT 'GLARGUMENTS) '((DD DRAW-DESC)))
(SETF (GET 'DRAW-DESC-REFPT 'GLFNRESULTTYPE) 'VECTOR)
(DEFUN DRAW-TEXT-DRAW (D W OFF)
- (LET ((SSTR (STRINGIFY (CADDDR D))))
- (XDRAWIMAGESTRING *WINDOW-DISPLAY* (CADR W) (CADDR W)
- (+ (CAR OFF) (CAADR D))
- (+ -4 (- (CADDDR W) (+ (CADR OFF) (CADADR D))))
- (GET-C-STRING SSTR) (LENGTH SSTR))))
+ (WINDOW-PRINTAT-XY W (CADDDR D) (+ (CAR OFF) (CAADR D))
+ (+ (CADR OFF) (CADADR D))))
(DEFUN DRAW-TEXT-DRAW-OUTLINE (W X Y D)
(SETF (SECOND D) (LIST X Y))
@@ -1533,6 +1532,8 @@
(+ 2
(+ (+ (CADADR D) (MIN 0 (CADR (CADDR D))))
(ABS (CADR (CADDR D)))))))))
+(SETF (GET 'DRAW-TEXT-SELECTEDP 'GLARGUMENTS)
+ '((D DRAW-TEXT) (PT VECTOR) (OFF VECTOR)))
(SETF (GET 'DRAW-TEXT-SELECTEDP 'GLFNRESULTTYPE) 'BOOLEAN)
@@ -1540,11 +1541,14 @@
(LET (TXT LNG OFF)
(PRINC "Enter text string: ")
(SETQ TXT (STRINGIFY (READ)))
- (SETQ LNG
- (LET ((SSTR (STRINGIFY TXT)))
- (XTEXTWIDTH (SEVENTH W) (GET-C-STRING SSTR) (LENGTH SSTR))))
+ (SETQ LNG (WINDOW-STRING-WIDTH W TXT))
(SETQ OFF (WINDOW-GET-BOX-POSITION W LNG 14))
- (LIST 'DRAW-TEXT OFF (LIST LNG 14) TXT 0)))
+ (LIST 'DRAW-TEXT
+ (LET ((GLVAR29986 (COPY-LIST '(0 4))))
+ (LIST (+ (CAR OFF) (CAR GLVAR29986))
+ (+ (CADR OFF) (CADR GLVAR29986))))
+ (LIST LNG 14) TXT 0)))
+(SETF (GET 'DRAW-TEXT-GET 'GLARGUMENTS) '((DD DRAW-DESC) (W WINDOW)))
(SETF (GET 'DRAW-TEXT-GET 'GLFNRESULTTYPE) 'DRAW-TEXT)
@@ -1552,16 +1556,22 @@
(IF (AND (< (ABS (- (- (CAR P1) (CAR OFF)) P2X)) 4)
(< (ABS (- (- (CADR P1) (CADR OFF)) P2Y)) 4))
(LIST (+ (CAR OFF) P2X) (+ (CADR OFF) P2Y))))
+(SETF (GET 'DRAW-SNAPP 'GLARGUMENTS)
+ '((P1 VECTOR) (OFF VECTOR) (P2X INTEGER) (P2Y INTEGER)))
(SETF (GET 'DRAW-SNAPP 'GLFNRESULTTYPE) 'VECTOR)
(DEFUN DRAW-DOT-SNAP (D P OFF)
(DRAW-SNAPP P OFF (+ 2 (CAADR D)) (+ 2 (CADADR D))))
+(SETF (GET 'DRAW-DOT-SNAP 'GLARGUMENTS)
+ '((D DRAW-DOT) (P VECTOR) (OFF VECTOR)))
(SETF (GET 'DRAW-DOT-SNAP 'GLFNRESULTTYPE) 'VECTOR)
(DEFUN DRAW-REFPT-SNAP (D P OFF)
(DRAW-SNAPP P OFF (CAADR D) (CADADR D)))
+(SETF (GET 'DRAW-REFPT-SNAP 'GLARGUMENTS)
+ '((D DRAW-REFPT) (P VECTOR) (OFF VECTOR)))
(SETF (GET 'DRAW-REFPT-SNAP 'GLFNRESULTTYPE) 'VECTOR)
@@ -1569,6 +1579,8 @@
(OR (DRAW-SNAPP P OFF (CAADR D) (CADADR D))
(DRAW-SNAPP P OFF (+ (CAADR D) (CAADDR D))
(+ (CADADR D) (CADR (CADDR D))))))
+(SETF (GET 'DRAW-LINE-SNAP 'GLARGUMENTS)
+ '((D DRAW-LINE) (P VECTOR) (OFF VECTOR)))
(SETF (GET 'DRAW-LINE-SNAP 'GLFNRESULTTYPE) 'VECTOR)
@@ -1579,60 +1591,62 @@
(DRAW-SNAPP P OFF (+ XOFF XSIZE) (+ YOFF YSIZE))
(DRAW-SNAPP P OFF (+ XOFF XSIZE) YOFF)
(DRAW-SNAPP P OFF XOFF (+ YOFF YSIZE))
- (DRAW-SNAPP P OFF (+ XOFF (TRUNCATE XSIZE 2)) YOFF)
- (DRAW-SNAPP P OFF XOFF (+ YOFF (TRUNCATE YSIZE 2)))
- (DRAW-SNAPP P OFF (+ XOFF (TRUNCATE XSIZE 2)) (+ YOFF YSIZE))
- (DRAW-SNAPP P OFF (+ XOFF XSIZE) (+ YOFF (TRUNCATE YSIZE 2))))))
+ (DRAW-SNAPP P OFF (+ XOFF (/ XSIZE 2)) YOFF)
+ (DRAW-SNAPP P OFF XOFF (+ YOFF (/ YSIZE 2)))
+ (DRAW-SNAPP P OFF (+ XOFF (/ XSIZE 2)) (+ YOFF YSIZE))
+ (DRAW-SNAPP P OFF (+ XOFF XSIZE) (+ YOFF (/ YSIZE 2))))))
+(SETF (GET 'DRAW-BOX-SNAP 'GLARGUMENTS)
+ '((D DRAW-BOX) (P VECTOR) (OFF VECTOR)))
(SETF (GET 'DRAW-BOX-SNAP 'GLFNRESULTTYPE) 'VECTOR)
(DEFUN DRAW-CIRCLE-SNAP (D P OFF)
- (OR (DRAW-SNAPP P OFF (+ (CAADR D) (TRUNCATE (CAADDR D) 2))
- (+ (CADADR D) (TRUNCATE (CAADDR D) 2)))
- (DRAW-SNAPP P OFF (+ (CAADR D) (TRUNCATE (CAADDR D) 2))
- (CADADR D))
- (DRAW-SNAPP P OFF (CAADR D)
- (+ (CADADR D) (TRUNCATE (CAADDR D) 2)))
- (DRAW-SNAPP P OFF (+ (CAADR D) (TRUNCATE (CAADDR D) 2))
+ (OR (DRAW-SNAPP P OFF (+ (CAADR D) (/ (CAADDR D) 2))
+ (+ (CADADR D) (/ (CAADDR D) 2)))
+ (DRAW-SNAPP P OFF (+ (CAADR D) (/ (CAADDR D) 2)) (CADADR D))
+ (DRAW-SNAPP P OFF (CAADR D) (+ (CADADR D) (/ (CAADDR D) 2)))
+ (DRAW-SNAPP P OFF (+ (CAADR D) (/ (CAADDR D) 2))
(+ (CADADR D) (CADR (CADDR D))))
(DRAW-SNAPP P OFF (+ (CAADR D) (CAADDR D))
- (+ (CADADR D) (TRUNCATE (CAADDR D) 2)))))
+ (+ (CADADR D) (/ (CAADDR D) 2)))))
+(SETF (GET 'DRAW-CIRCLE-SNAP 'GLARGUMENTS)
+ '((D DRAW-CIRCLE) (P VECTOR) (OFF VECTOR)))
(SETF (GET 'DRAW-CIRCLE-SNAP 'GLFNRESULTTYPE) 'VECTOR)
(DEFUN DRAW-ELLIPSE-SNAP (D P OFF)
- (OR (DRAW-SNAPP P OFF (+ (CAADR D) (TRUNCATE (CAADDR D) 2))
- (+ (CADADR D) (TRUNCATE (CADR (CADDR D)) 2)))
- (DRAW-SNAPP P OFF (+ (CAADR D) (TRUNCATE (CAADDR D) 2))
- (CADADR D))
+ (OR (DRAW-SNAPP P OFF (+ (CAADR D) (/ (CAADDR D) 2))
+ (+ (CADADR D) (/ (CADR (CADDR D)) 2)))
+ (DRAW-SNAPP P OFF (+ (CAADR D) (/ (CAADDR D) 2)) (CADADR D))
(DRAW-SNAPP P OFF (CAADR D)
- (+ (CADADR D) (TRUNCATE (CADR (CADDR D)) 2)))
- (DRAW-SNAPP P OFF (+ (CAADR D) (TRUNCATE (CAADDR D) 2))
+ (+ (CADADR D) (/ (CADR (CADDR D)) 2)))
+ (DRAW-SNAPP P OFF (+ (CAADR D) (/ (CAADDR D) 2))
(+ (CADADR D) (CADR (CADDR D))))
(DRAW-SNAPP P OFF (+ (CAADR D) (CAADDR D))
- (+ (CADADR D) (TRUNCATE (CADR (CADDR D)) 2)))))
+ (+ (CADADR D) (/ (CADR (CADDR D)) 2)))))
+(SETF (GET 'DRAW-ELLIPSE-SNAP 'GLARGUMENTS)
+ '((D DRAW-ELLIPSE) (P VECTOR) (OFF VECTOR)))
(SETF (GET 'DRAW-ELLIPSE-SNAP 'GLFNRESULTTYPE) 'VECTOR)
(DEFUN DRAW-RCBOX-SNAP (D P OFF)
- (LET ((RX (TRUNCATE (CAADDR D) 2))
- (RY (TRUNCATE (CADR (CADDR D)) 2)))
+ (LET ((RX (/ (CAADDR D) 2)) (RY (/ (CADR (CADDR D)) 2)))
(OR (DRAW-SNAPP P OFF (+ (CAADR D) RX) (CADADR D))
(DRAW-SNAPP P OFF (CAADR D) (+ (CADADR D) RY))
(DRAW-SNAPP P OFF (+ (CAADR D) RX)
(+ (CADADR D) (CADR (CADDR D))))
(DRAW-SNAPP P OFF (+ (CAADR D) (CAADDR D)) (+ (CADADR D) RY)))))
+(SETF (GET 'DRAW-RCBOX-SNAP 'GLARGUMENTS)
+ '((D DRAW-RCBOX) (P VECTOR) (OFF VECTOR)))
(SETF (GET 'DRAW-RCBOX-SNAP 'GLFNRESULTTYPE) 'VECTOR)
(DEFUN DRAW-NO-SNAP (D P OFF) NIL)
(DEFUN DRAW-MULTI-DRAW (D W OFF)
- (DOLIST (SUBD (CADDDR D))
- (DRAW-OBJECT-DRAW SUBD W
- (LET ((GLVAR4346 (CADR D)))
- (LIST (+ (CAR GLVAR4346) (CAR OFF))
- (+ (CADR GLVAR4346) (CADR OFF)))))))
+ (LET ((TOTALOFF
+ (LIST (+ (CAADR D) (CAR OFF)) (+ (CADADR D) (CADR OFF)))))
+ (DOLIST (SUBD (CADDDR D)) (DRAW-OBJECT-DRAW SUBD W TOTALOFF))))
(DEFUN DRAW-INIT-MENUS ()
(LET ((W (DRAW-WINDOW)))
@@ -1720,7 +1734,7 @@
(SETQ SY (1+ J))))))
(SETQ SX (* SX (LATEX-SIGN DX)))
(SETQ SY (* SY (LATEX-SIGN DY))))))
- (FORMAT T " \\put(~5,2F,~5,2F) {\\~A(~D,~D){~5,2F}}~%"
+ (FORMAT T " \\put(~5,0F,~5,0F) {\\~A(~D,~D){~5,0F}}~%"
(* FROMX *DRAW-LATEX-FACTOR*) (* FROMY *DRAW-LATEX-FACTOR*)
(IF ARROWFLG "vector" "line") SX SY SIZ)))
@@ -1783,8 +1797,15 @@
"glisp/draw-header.lsp")
(CF DRAWTRANS))
-(DEFUN DRAW-OUT (&OPTIONAL FILE NAMES)
+(DEFUN COMPILE-DRAWB ()
+ (GLCOMPFILES *DIRECTORY*
+ '("glisp/vector.lsp" "X/dwindow.lsp" "X/dwnoopen.lsp")
+ '("glisp/menu-set.lsp" "glisp/draw.lsp") "glisp/drawtrans.lsp"
+ "glisp/draw-header.lsp"))
+
+(DEFUN DRAW-OUT (&OPTIONAL NAMES FILE)
(OR NAMES (SETQ NAMES *DRAW-OBJECTS*))
(IF (NOT (CONSP NAMES)) (SETQ NAMES (LIST NAMES)))
(DRAW-OUTPUT (OR FILE "glisp/draw.del") NAMES)
- (SETQ *DRAW-OBJECTS* (SET-DIFFERENCE *DRAW-OBJECTS* NAMES)))
+ (SETQ *DRAW-OBJECTS* (SET-DIFFERENCE *DRAW-OBJECTS* NAMES))
+ NAMES)
Index: xgcl-2/gcl_dwindow.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_dwindow.lsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xgcl-2/gcl_dwindow.lsp 5 Jan 2006 19:00:57 -0000 1.2
+++ xgcl-2/gcl_dwindow.lsp 20 Jun 2006 22:53:17 -0000 1.3
@@ -1,15 +1,18 @@
-; dwindow.lsp Gordon S. Novak Jr. 14 Mar 95
+; dwindow.lsp Gordon S. Novak Jr. ; 26 Jan 06
; Window types and interface functions for using X windows from GNU Common Lisp
-; Copyright (c) 1995 Gordon S. Novak Jr. and The University of Texas at Austin.
+; Copyright (c) 2006 Gordon S. Novak Jr. and The University of Texas at Austin.
+
+; 08 Jan 97; 17 May 02; 17 May 04; 18 May 04; 01 Jun 04; 18 Aug 04; 24 Jan 06
+; 26 Jan 06
; See the files gnu.license and dec.copyright .
; This program is free software; you can redistribute it and/or modify
; it under the terms of the GNU General Public License as published by
-; the Free Software Foundation; either version 1, or (at your option)
-; any later version.
+; the Free Software Foundation; either version 2 of the License, or
+; (at your option) any later version.
; This program is distributed in the hope that it will be useful,
; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +21,7 @@
; You should have received a copy of the GNU General Public License
; along with this program; if not, write to the Free Software
-; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
; Some of the files that interface to the Xlib are adapted from DEC/MIT files.
; See the file dec.copyright for details.
@@ -42,7 +45,10 @@
(defvar *window-fonts* (list
(list 'courier-bold-12
"*-*-courier-bold-r-*-*-12-*-*-*-*-*-iso8859-1")
- (list '8x10 "8x10")
+ (list 'courier-medium-12
+ "*-*-courier-medium-r-*-*-12-*-*-*-*-*-iso8859-1")
+ (list '6x12 "6x12")
+ (list '8x13 "8x13")
(list '9x15 "9x15")))
(glispglobals (*window-menu* menu)
@@ -100,12 +106,6 @@
(defvar *window-meta*) ; set if meta down when char is pressed
(defvar *window-ctrl*) ; set if ctrl down when char is pressed
(defvar *window-shift*) ; set if shift down when char is pressed
-(defvar *window-string* (make-string 100))
-(defvar *window-string-count*)
-(defvar *window-string-max*)
-(defvar *window-input-string-x*)
-(defvar *window-input-string-y*)
-(defvar *window-input-string-charwidth*)
(defvar *window-shift-keys* nil)
(defvar *window-control-keys* nil)
@@ -139,8 +139,8 @@
(title-present (title and ((length title) > 0)))
(width (picture-width))
(height (picture-height))
- (base-x ((if flat then parent-offset-x else 0)))
- (base-y ((if flat then parent-offset-y else 0)))
+ (base-x ((if flat parent-offset-x 0)))
+ (base-y ((if flat parent-offset-y 0)))
(offset menu-offset)
(size menu-size)
(region ((virtual region with start = voffset size = vsize)))
@@ -206,7 +206,7 @@
(drawfn anything)
(menu-font symbol) ))
-(picmenu-button (list (name symbol)
+(picmenu-button (list (buttonname symbol)
(offset vector)
(size vector)
(highlightfn anything)
@@ -230,10 +230,10 @@
(subtrackfn anything)
(subtrackparms (listof anything)))
prop ((menuw (menu-window or (barmenu-init self)) result window)
- (picture-width ((if (horizontal m) then (maxval m)
- else (barwidth m)) ))
- (picture-height ((if (horizontal m) then (barwidth m)
- else (maxval m)) )) )
+ (picture-width ((if (horizontal m) (maxval m)
+ (barwidth m)) ))
+ (picture-height ((if (horizontal m) (barwidth m)
+ (maxval m)) )) )
msg ((init barmenu-init)
(init? ((menu-window and (picture-height > 0))
or (init self)))
@@ -244,6 +244,67 @@
(calculate-size barmenu-calculate-size) )
supers (menu))
+; Note: data through 'permanent' must be same as in menu.
+(textmenu (listobject (menu-window window)
+ (flat boolean)
+ (parent-window drawable)
+ (parent-offset-x integer)
+ (parent-offset-y integer)
+ (picture-width integer)
+ (picture-height integer)
+ (title string)
+ (permanent boolean)
+ (text string)
+ (drawing-width integer)
+ (drawing-height integer)
+ (boxflg boolean)
+ (menu-font symbol) )
+
+ prop ((menuw (menu-window or (textmenu-init self)) result window) )
+ msg ((init textmenu-init)
+ (init? ((menu-window and (picture-height > 0)) or (init self)))
+ (create textmenu-create result textmenu)
+ (select textmenu-select)
+ (draw textmenu-draw)
+ (calculate-size textmenu-calculate-size)
+ (set-text textmenu-set-text open t) )
+ supers (menu) )
+
+; Note: data through 'permanent' must be same as in menu.
+(editmenu (listobject (menu-window window)
+ (flat boolean)
+ (parent-window drawable)
+ (parent-offset-x integer)
+ (parent-offset-y integer)
+ (picture-width integer)
+ (picture-height integer)
+ (title string)
+ (permanent boolean)
+ (text (listof string))
+ (drawing-width integer)
+ (drawing-height integer)
+ (boxflg boolean)
+ (menu-font symbol)
+ (column integer)
+ (line integer)
+ (scrollval integer) )
+ prop ((menuw (menu-window or (editmenu-init self)) result window)
+ (scroll ((if (numberp scrollval)
+ scrollval
+ 0))) )
+
+ msg ((init editmenu-init)
+ (init? ((menu-window and (picture-height > 0)) or (init self)))
+ (create editmenu-create result editmenu)
+ (select editmenu-select)
+ (draw editmenu-draw)
+ (edit editmenu-edit)
+ (carat editmenu-carat)
+ (display editmenu-display)
+ (calculate-size editmenu-calculate-size)
+ (line-y editmenu-line-y open t) )
+ supers (menu) )
+
(window (listobject (parent drawable)
(gcontext anything)
(drawable-height integer)
@@ -261,7 +322,9 @@
(yposition window-yposition result integer open t)
(wfunction window-wfunction open t)
(foreground window-foreground open t)
- (background window-background open t) )
+ (background window-background open t)
+ (font-width ((string-width self "W")))
+ (font-height ((string-height self "Tg"))) )
msg ((force-output window-force-output open t)
(set-font window-set-font)
(set-foreground window-set-foreground open t)
@@ -355,6 +418,10 @@
(free-color window-free-color)
(get-chars window-get-chars)
(input-string window-input-string)
+ (string-width window-string-width)
+ (string-extents window-string-extents)
+ (string-height window-string-height)
+ (draw-carat window-draw-carat)
))
(rgb (list (red integer) (green integer) (blue integer)))
@@ -408,20 +475,21 @@
(setq *mouse-window* (int-pos *child-return* 0)) )
; 13 Aug 91; 14 Aug 91; 06 Sep 91; 12 Sep 91; 06 Dec 91; 01 May 92; 01 Sep 92
+(setf (glfnresulttype 'window-create) 'window)
(gldefun window-create (width height &optional str parentw pos-x pos-y font)
(let (w pw fg-color bg-color)
(or *window-display* (window-Xinit))
(setq fg-color *default-fg-color*)
(setq bg-color *default-bg-color*)
- (unless pos-x (pos-x \:= *window-default-pos-x*))
- (unless pos-y (pos-y \:= *window-default-pos-y*))
- (w \:= (a window with
+ (unless pos-x (pos-x = *window-default-pos-x*))
+ (unless pos-y (pos-y = *window-default-pos-y*))
+ (w = (a window with
drawable-width = width
drawable-height = height
- label = (if str (stringify str) else " ") ))
- (pw \:= (or parentw *root-window*))
+ label = (if str (stringify str) " ") ))
+ (pw = (or parentw *root-window*))
(window-get-geometry-b pw)
- ((parent w) \:=
+ ((parent w) =
(XCreateSimpleWindow *window-display* pw
pos-x
((int-pos *height-return* 0)
@@ -440,7 +508,7 @@
(get-c-string (label w)) ; icon name
none null null
*default-size-hints*)
- ((gcontext w) \:= (XCreateGC *window-display* (parent w) 0 null))
+ ((gcontext w) = (XCreateGC *window-display* (parent w) 0 null))
(set-foreground w fg-color)
(set-background w bg-color)
(set-font w (or font *window-default-font-name*))
@@ -456,20 +524,19 @@
(open w)
w ))
-; 06 Aug 91
+; 06 Aug 91; 17 May 04
; Set the font for a window to the one specified by fontsymbol.
; derived from Nguyen's my-load-font.
-(gldefun window-set-font (w\:window fontsymbol\:symbol)
+(gldefun window-set-font ((w window) (fontsymbol symbol))
(let (fontstring font-info (display *window-display*))
- (fontstring \:= (or (cadr (assoc fontsymbol *window-fonts*))
+ (fontstring = (or (cadr (assoc fontsymbol *window-fonts*))
(stringify fontsymbol)))
- (font-info \:= (XloadQueryFont display
+ (font-info = (XloadQueryFont display
(get-c-string fontstring)))
(if (eql 0 font-info)
- then (format t "~%can't open font ~a ~a~%" fontsymbol fontstring)
- else (XsetFont display (gcontext w)
- (Xfontstruct-fid font-info))
- ((font w) \:= font-info) ) ))
+ (format t "~%can't open font ~a ~a~%" fontsymbol fontstring)
+ (progn (XsetFont display (gcontext w) (Xfontstruct-fid font-info))
+ ((font w) = font-info)) ) ))
; 15 Oct 91
(defun window-font-info (fontsymbol)
@@ -480,45 +547,45 @@
; Functions to allow access to window properties from plain Lisp
-(gldefun window-gcontext (w\:window) (gcontext w))
-(gldefun window-parent (w\:window) (parent w))
-(gldefun window-drawable-height (w\:window) (drawable-height w))
-(gldefun window-drawable-width (w\:window) (drawable-width w))
-(gldefun window-label (w\:window) (label w))
-(gldefun window-font (w\:window) (font w))
+(gldefun window-gcontext ((w window)) (gcontext w))
+(gldefun window-parent ((w window)) (parent w))
+(gldefun window-drawable-height ((w window)) (drawable-height w))
+(gldefun window-drawable-width ((w window)) (drawable-width w))
+(gldefun window-label ((w window)) (label w))
+(gldefun window-font ((w window)) (font w))
; 07 Aug 91; 14 Aug 91
-(gldefun window-foreground (w\:window)
+(gldefun window-foreground ((w window))
(XGetGCValues *window-display* (gcontext w) GCForeground
*GC-Values*)
(XGCValues-foreground *GC-Values*) )
-(gldefun window-set-foreground (w\:window fg-color\:integer)
+(gldefun window-set-foreground ((w window) (fg-color integer))
(XsetForeground *window-display* (gcontext w) fg-color))
-(gldefun window-background (w\:window)
+(gldefun window-background ((w window))
(XGetGCValues *window-display* (gcontext w) GCBackground
*GC-Values*)
(XGCValues-Background *GC-Values*) )
-(gldefun window-set-background (w\:window bg-color\:integer)
+(gldefun window-set-background ((w window) (bg-color integer))
(XsetBackground *window-display* (gcontext w) bg-color))
; 08 Aug 91
-(gldefun window-wfunction (w\:window)
+(gldefun window-wfunction ((w window))
(XGetGCValues *window-display* (gcontext w) GCFunction
*GC-Values*)
(XGCValues-function *GC-Values*) )
; 08 Aug 91
; Get the geometry parameters of a window into global variables
-(gldefun window-get-geometry (w\:window) (window-get-geometry-b (parent w)))
+(gldefun window-get-geometry ((w window)) (window-get-geometry-b (parent w)))
; 06 Dec 91
; Set cursor to a selected cursor number
-(gldefun window-set-cursor (w\:window n\:integer)
+(gldefun window-set-cursor ((w window) (n integer))
(let (c)
- (c \:= (XCreateFontCursor *window-display* n) )
+ (c = (XCreateFontCursor *window-display* n) )
(XDefineCursor *window-display* (parent w) c) ))
(defun window-get-geometry-b (w)
@@ -528,7 +595,7 @@
; 15 Aug 91
; clear event queue of previous motion events
-(gldefun window-sync (w\:window)
+(gldefun window-sync ((w window))
(Xsync *window-display* 1) )
; 03 Oct 91; 06 Oct 94
@@ -538,12 +605,12 @@
; 08 Aug 91; 12 Sep 91; 28 Oct 91
; Make a list of window geometry, (x y width height border-width).
-(gldefun window-geometry (w\:window)
+(gldefun window-geometry ((w window))
(let (sh)
- (sh \:= (window-screen-height))
+ (sh = (window-screen-height))
(get-geometry w)
- ((drawable-width w) \:= (int-pos *width-return* 0))
- ((drawable-height w) \:= (int-pos *height-return* 0))
+ ((drawable-width w) = (int-pos *width-return* 0))
+ ((drawable-height w) = (int-pos *height-return* 0))
(list (int-pos *x-return* 0)
(sh - (int-pos *y-return* 0)
- (int-pos *height-return* 0))
@@ -552,43 +619,44 @@
(int-pos *border-width-return* 0)) ))
; 27 Nov 91
-(gldefun window-size (w\:window) (result vector)
+(gldefun window-size ((w window)) (result vector)
(get-geometry w)
- (list ((drawable-width w) \:= (int-pos *width-return* 0))
- ((drawable-height w) \:= (int-pos *height-return* 0)) ) )
+ (list ((drawable-width w) = (int-pos *width-return* 0))
+ ((drawable-height w) = (int-pos *height-return* 0)) ) )
-(gldefun window-left (w\:window)
+(gldefun window-left ((w window))
(get-geometry w)
(int-pos *x-return* 0))
; Get top of window in X (y increasing downwards) coordinates.
-(gldefun window-top-neg-y (w\:window)
+(gldefun window-top-neg-y ((w window))
(get-geometry w)
(int-pos *y-return* 0))
; 08 Aug 91
; Reset the local geometry parameters of a window from its X values.
; Needed, for example, if the user resizes the window by mouse command.
-(gldefun window-reset-geometry (w\:window)
+(gldefun window-reset-geometry ((w window))
(get-geometry w)
- ((drawable-width w) \:= (int-pos *width-return* 0))
- ((drawable-height w) \:= (int-pos *height-return* 0)) )
+ ((drawable-width w) = (int-pos *width-return* 0))
+ ((drawable-height w) = (int-pos *height-return* 0)) )
-(gldefun window-force-output (&optional w\:window)
+(gldefun window-force-output (&optional (w window))
(Xflush *window-display*))
-(gldefun window-query-pointer (w\:window) (window-query-pointer-b (parent w)) )
+(gldefun window-query-pointer ((w window))
+ (window-query-pointer-b (parent w)) )
(defun window-query-pointer-b (w)
(XQueryPointer *window-display* w
*root-return* *child-return* *root-x-return* *root-y-return*
*win-x-return* *win-y-return* *mask-return*) )
-(gldefun window-positive-y (w\:\window y\:integer) ((height w) - y))
+(gldefun window-positive-y ((w window) (y integer)) ((height w) - y))
; 08 Aug 91
; Set parameters of a window for drawing by XOR, saving old values.
-(gldefun window-set-xor (w\:window)
+(gldefun window-set-xor ((w window))
(let ((gc (gcontext w)) )
(setq *window-save-function* (wfunction w))
(XsetFunction *window-display* gc GXxor)
@@ -598,14 +666,14 @@
; 08 Aug 91
; Reset parameters of a window after change, using saved values.
-(gldefun window-unset (w\:window)
+(gldefun window-unset ((w window))
(let ((gc (gcontext w)) )
(XsetFunction *window-display* gc *window-save-function*)
(XsetForeground *window-display* gc *window-save-foreground*) ))
; 04 Sep 91
; Reset parameters of a window, using default values.
-(gldefun window-reset (w\:window)
+(gldefun window-reset ((w window))
(let ((gc (gcontext w)) )
(XsetFunction *window-display* gc GXcopy)
(XsetForeground *window-display* gc *default-fg-color*)
@@ -613,14 +681,14 @@
; 09 Aug 91; 03 Sep 92
; Set parameters of a window for erasing, saving old values.
-(gldefun window-set-erase (w\:window)
+(gldefun window-set-erase ((w window))
(let ((gc (gcontext w)) )
(setq *window-save-function* (wfunction w))
(XsetFunction *window-display* gc GXcopy)
(setq *window-save-foreground* (foreground w))
(XsetForeground *window-display* gc (background w)) ))
-(gldefun window-set-copy (w\:window)
+(gldefun window-set-copy ((w window))
(let ((gc (gcontext w)) )
(setq *window-save-function* (wfunction w))
(XsetFunction *window-display* gc GXcopy)
@@ -628,7 +696,7 @@
; 12 Aug 91
; Set parameters of a window for inversion, saving old values.
-(gldefun window-set-invert (w\:window)
+(gldefun window-set-invert ((w window))
(let ((gc (gcontext w)) )
(setq *window-save-function* (wfunction w))
(XsetFunction *window-display* gc GXxor)
@@ -637,7 +705,7 @@
(logxor *window-save-foreground* (background w))) ))
; 13 Aug 91
-(gldefun window-set-line-width (w\:window width\:integer)
+(gldefun window-set-line-width ((w window) (width integer))
(set-line-attr w width nil nil nil))
; 13 Aug 91; 12 Sep 91
@@ -651,21 +719,21 @@
; 13 Aug 91
; Set standard line attributes
-(gldefun window-std-line-attr (w\:window)
+(gldefun window-std-line-attr ((w window))
(XsetLineAttributes *window-display* (gcontext w)
1 LineSolid CapButt JoinMiter) )
; 06 Aug 91; 08 Aug 91; 12 Sep 91
-(gldefun window-draw-line (w\:window from\:vector to\:vector
+(gldefun window-draw-line ((w window) (from vector) (to vector)
&optional linewidth)
(window-draw-line-xy w (x from) (y from) (x to) (y to) linewidth) )
; 19 Dec 90; 07 Aug 91; 08 Aug 91; 09 Aug 91; 13 Aug 91; 12 Sep 91; 28 Sep 94
-(gldefun window-draw-line-xy (w\:window fromx\:integer
- fromy\:integer
- tox\:integer toy\:integer
+(gldefun window-draw-line-xy ((w window) (fromx integer)
+ (fromy integer)
+ (tox integer) (toy integer)
&optional linewidth
- operation\:atom)
+ (operation atom))
(let ( (qqwheight (drawable-height w)) )
(if (linewidth and (linewidth <> 1)) (set-line-width w linewidth))
(case operation
@@ -711,7 +779,7 @@
; 08 Aug 91; 14 Aug 91; 12 Sep 91
(gldefun window-draw-box
- (w\:window offset\:vector size\:vector &optional linewidth)
+ ((w window) (offset vector) (size vector) &optional linewidth)
(window-draw-box-xy w (x offset) (y offset) (x size) (y size) linewidth) )
; 08 Aug 91; 12 Sep 91; 11 Dec 91; 01 Sep 92; 02 Sep 92
@@ -719,16 +787,16 @@
; was (XDrawRectangle *window-display* (parent w) (gcontext w)
; offsetx (- qqwheight (offsety + sizey)) sizex sizey)
(gldefun window-draw-box-xy
- (w\:window offsetx\:integer offsety\:integer
- sizex\:integer sizey\:integer
+ ((w window) (offsetx integer) (offsety integer)
+ (sizex integer) (sizey integer)
&optional linewidth)
(let ((qqwheight (drawable-height w)) miny lw lw2 lw2b (pw (parent w))
(gc (gcontext w)))
(if (linewidth and (linewidth <> 1)) (set-line-width w linewidth))
- (lw \:= (or linewidth 1))
- (lw2 \:= lw / 2)
- (lw2b \:= (lw + 1) / 2)
- (miny \:= offsety - lw2b)
+ (lw = (or linewidth 1))
+ (lw2 = lw / 2)
+ (lw2b = (lw + 1) / 2)
+ (miny = offsety - lw2b)
(XdrawLine *window-display* pw gc offsetx (- qqwheight miny)
offsetx (- qqwheight (miny + sizey + lw)))
(XdrawLine *window-display* pw gc
@@ -744,8 +812,8 @@
; 26 Nov 91
(gldefun window-xor-box-xy
- (w\:window offsetx\:integer offsety\:integer
- sizex\:integer sizey\:integer
+ ((w window) (offsetx integer) (offsety integer)
+ (sizex integer) (sizey integer)
&optional linewidth)
(window-set-xor w)
(window-draw-box-xy w offsetx offsety sizex sizey linewidth)
@@ -753,23 +821,24 @@
; 15 Aug 91; 12 Sep 91
; Draw a box whose corners are specified
-(gldefun window-draw-box-corners (w\:window xa\:integer ya\:integer
- xb\:integer yb\:integer
+(gldefun window-draw-box-corners ((w window) (xa integer) (ya integer)
+ (xb integer) (yb integer)
&optional lw)
(draw-box-xy w (min xa xb) (min ya yb) (abs (- xa xb)) (abs (- ya yb)) lw) )
; 13 Sep 91
; Draw a box with round corners
-(gldefun window-draw-rcbox-xy (w\:window x\:integer y\:integer width\:integer
- height\:integer radius\:integer
+(gldefun window-draw-rcbox-xy ((w window) (x integer) (y integer)
+ (width integer)
+ (height integer) (radius integer)
&optional linewidth)
(let (x1 x2 y1 y2 r)
- (r \:= (max 0 (min radius (truncate (abs width) 2)
+ (r = (max 0 (min radius (truncate (abs width) 2)
(truncate (abs height) 2))))
- (x1 \:= x + r)
- (x2 \:= x + width - r)
- (y1 \:= y + r)
- (y2 \:= y + height - r)
+ (x1 = x + r)
+ (x2 = x + width - r)
+ (y1 = y + r)
+ (y2 = y + height - r)
(draw-line-xy w x1 y x2 y linewidth)
(draw-line-xy w (x + width) y1 (x + width) y2 linewidth)
(draw-line-xy w x1 (y + height) x2 (y + height) linewidth)
@@ -780,9 +849,9 @@
(draw-arc-xy w x1 y2 r r 90 90 linewidth) ))
; 13 Aug 91; 15 Aug 91; 12 Sep 91
-(gldefun window-draw-arc-xy (w\:window x\:integer y\:integer
- radiusx\:integer radiusy\:integer
- anglea\:number angleb\:number
+(gldefun window-draw-arc-xy ((w window) (x integer) (y integer)
+ (radiusx integer) (radiusy integer)
+ (anglea number) (angleb number)
&optional linewidth)
(if (linewidth and (linewidth <> 1)) (set-line-width w linewidth))
(XdrawArc *window-display* (parent w) (gcontext w)
@@ -792,8 +861,8 @@
(if (linewidth and (linewidth <> 1)) (set-line-width w 1)) )
; 08 Aug 91; 12 Sep 91
-(gldefun window-draw-circle-xy (w\:window x\:integer y\:integer
- radius\:integer
+(gldefun window-draw-circle-xy ((w window) (x integer) (y integer)
+ (radius integer)
&optional linewidth)
(if (linewidth and (linewidth <> 1)) (set-line-width w linewidth))
(XdrawArc *window-display* (parent w) (gcontext w)
@@ -802,26 +871,26 @@
(if (linewidth and (linewidth <> 1)) (set-line-width w 1)) )
; 06 Aug 91; 14 Aug 91; 12 Sep 91
-(gldefun window-draw-circle (w\:window pos\:vector radius\:integer
+(gldefun window-draw-circle ((w window) (pos vector) (radius integer)
&optional linewidth)
(window-draw-circle-xy w (x pos) (y pos) radius linewidth) )
; 08 Aug 91; 09 Sep 91
-(gldefun window-erase-area (w\:window offset\:vector size\:vector)
+(gldefun window-erase-area ((w window) (offset vector) (size vector))
(window-erase-area-xy w (x offset) (y offset) (x size) (y size)))
; 09 Sep 91; 11 Dec 91
-(gldefun window-erase-area-xy (w\:window xoff\:integer yoff\:integer
- xsize\:integer ysize\:integer)
+(gldefun window-erase-area-xy ((w window) (xoff integer) (yoff integer)
+ (xsize integer) (ysize integer))
(XClearArea *window-display* (parent w)
xoff (positive-y w (yoff + ysize - 1))
xsize ysize
0 )) ; exposures
; 21 Dec 93
-(gldefun window-erase-box-xy (w\:window xoff\:integer yoff\:integer
- xsize\:integer ysize\:integer
- &optional linewidth\:integer)
+(gldefun window-erase-box-xy ((w window) (xoff integer) (yoff integer)
+ (xsize integer) (ysize integer)
+ &optional (linewidth integer))
(XClearArea *window-display* (parent w)
(xoff - (or linewidth 1) / 2)
(positive-y w (yoff + ysize + (or linewidth 1) / 2))
@@ -830,13 +899,13 @@
0 )) ; exposures
; 15 Aug 91; 12 Sep 91
-(gldefun window-draw-ellipse-xy (w\:window x\:integer y\:integer
- rx\:integer ry\:integer &optional lw)
+(gldefun window-draw-ellipse-xy ((w window) (x integer) (y integer)
+ (rx integer) (ry integer) &optional lw)
(draw-arc-xy w x y rx ry 0 360 lw))
; 09 Aug 91
-(gldefun window-copy-area-xy (w\:window fromx fromy\:integer
- tox toy\:integer width height)
+(gldefun window-copy-area-xy ((w window) fromx (fromy integer)
+ tox (toy integer) width height)
(let ((qqwheight (drawable-height w)))
(set-copy w)
(XCopyArea *window-display* (parent w) (parent w) (gcontext w)
@@ -846,16 +915,16 @@
(unset w) ))
; 07 Dec 90; 09 Aug 91; 12 Sep 91
-(gldefun window-invertarea (w\:window area\:region)
+(gldefun window-invertarea ((w window) (area region))
(window-invert-area-xy w (left area) (bottom area)
(width area) (height area)))
; 07 Dec 90; 09 Aug 91; 12 Sep 91
-(gldefun window-invert-area (w\:window offset\:vector size\:vector)
+(gldefun window-invert-area ((w window) (offset vector) (size vector))
(window-invert-area-xy w (x offset) (y offset) (x size) (y size)) )
; 12 Aug 91; 15 Aug 91; 13 Dec 91
-(gldefun window-invert-area-xy (w\:window left bottom\:integer width height)
+(gldefun window-invert-area-xy ((w window) left (bottom integer) width height)
(set-invert w)
(XFillRectangle *window-display* (parent w) (gcontext w)
left (- (drawable-height w) (bottom + height - 1))
@@ -863,56 +932,88 @@
(unset w) )
; 05 Dec 90; 15 Aug 91
-(gldefun window-prettyprintat (w\:window s\:string pos\:vector)
+(gldefun window-prettyprintat ((w window) (s string) (pos vector))
(printat w s pos) )
-(gldefun window-prettyprintat-xy (w\:window s\:string x\:integer y\:integer)
+(gldefun window-prettyprintat-xy ((w window) (s string) (x integer)
+ (y integer))
(printat-xy w s x y))
; 06 Aug 91; 08 Aug 91; 15 Aug 91
-(gldefun window-printat (w\:window s\:string pos\:vector)
+(gldefun window-printat ((w window) (s string) (pos vector))
(printat-xy w s (x pos) (y pos)) )
; 06 Aug 91; 08 Aug 91; 12 Aug 91
-(gldefun window-printat-xy (w\:window s\:string x\:integer y\:integer)
+(gldefun window-printat-xy ((w window) (s string) (x integer) (y integer))
(let ( (sstr (stringify s)) )
(XdrawImageString *window-display* (parent w) (gcontext w)
x (- (drawable-height w) y)
(get-c-string sstr) (length sstr)) ))
+; 19 Apr 95; 02 May 95; 17 May 04
+; Print a string that may contain #\Newline characters in a window.
+(gldefun window-print-line ((w window) (str string) (x integer) (y integer)
+ &optional (deltay integer))
+ (let ((lng (length str)) (n 0) end strb done)
+ (while ~done
+ (end = (position #\Newline str :test #'char= :start n))
+ (strb = (subseq str n end))
+ (printat-xy w strb x y)
+ (if (numberp end)
+ (n = (1+ end))
+ (done = t))
+ (y _- (or deltay 16))
+ (if (y < 0) (done = t)))
+ (force-output w) ))
+
+; 02 May 95; 08 May 95
+; Print a list of strings in a window.
+(gldefun window-print-lines ((w window) (lines (listof string))
+ (x integer) (y integer)
+ &optional (deltay integer))
+ (for str in lines when (y > 0) (printat-xy w str x y) (y _- (or deltay 16)))
)
+
; 08 Aug 91
; Find the width of a string when printed in a given window
-(gldefun window-string-width (w\:window s\:string)
+(gldefun window-string-width ((w window) (s string))
(let ((sstr (stringify s)))
(XTextWidth (font w) (get-c-string sstr) (length sstr)) ))
; 01 Dec 93
; Find the ascent and descent of a string when printed in a given window
-(gldefun window-string-extents (w\:window s\:string)
+(gldefun window-string-extents ((w window) (s string))
(let ((sstr (stringify s)))
(XTextExtents (font w) (get-c-string sstr) (length sstr)
*direction-return* *ascent-return* *descent-return* *overall-return*)
(list (int-pos *ascent-return* 0)
(int-pos *descent-return* 0)) ))
+; Find the height (ascent + descent) of a string when printed in a given window
+(gldefun window-string-height ((w window) (s string))
+ (let ((sstr (stringify s)))
+ (XTextExtents (font w) (get-c-string sstr) (length sstr)
+ *direction-return* *ascent-return* *descent-return* *overall-return*)
+ (+ (int-pos *ascent-return* 0)
+ (int-pos *descent-return* 0)) ))
+
; 15 Oct 91
-(gldefun window-font-string-width (font s\:string)
+(gldefun window-font-string-width (font (s string))
(let ((sstr (stringify s)))
(XTextWidth font (get-c-string sstr) (length sstr)) ))
-(gldefun window-yposition (w\:window)
+(gldefun window-yposition ((w window))
(window-get-mouse-position)
(positive-y w (- *mouse-y* (top-neg-y w))) )
-(gldefun window-centeroffset (w\:window v\:vector)
+(gldefun window-centeroffset ((w window) (v vector))
(a vector with x = (truncate ((width w) - (x v)) 2)
y = (truncate ((height w) - (y v)) 2)))
; 18 Aug 89; 15 Aug 91
; Command to a window display manager
-(gldefun dowindowcom (w\:window)
+(gldefun dowindowcom ((w window))
(let (comm)
- (comm \:= (select (window-menu)) )
+ (comm = (select (window-menu)) )
(case comm
(close (close w))
(paint (paint w))
@@ -928,30 +1029,30 @@
(a menu with items = '(close paint clear move)))) )
; 06 Dec 90; 11 Mar 93
-(gldefun window-close (w\:window)
+(gldefun window-close ((w window))
(unmap w)
(force-output w)
(window-wait-unmap w))
-(gldefun window-unmap (w\:window)
+(gldefun window-unmap ((w window))
(XUnMapWindow *window-display* (parent w)) )
; 06 Aug 91; 22 Aug 91
-(gldefun window-open (w\:window)
+(gldefun window-open ((w window))
(mapw w)
(force-output w)
(wait-exposure w) )
-(gldefun window-map (w\:window)
+(gldefun window-map ((w window))
(XMapWindow *window-display* (parent w)) )
; 08 Aug 91; 02 Sep 91
-(gldefun window-destroy (w\:window)
+(gldefun window-destroy ((w window))
(XDestroyWindow *window-display* (parent w))
(force-output w)
- ((parent w) \:= nil)
+ ((parent w) = nil)
(XFreeGC *window-display* (gcontext w))
- ((gcontext w) \:= nil) )
+ ((gcontext w) = nil) )
; 09 Sep 91
; Wait 3 seconds, then destroy the window where the mouse is. Use with care.
@@ -968,12 +1069,12 @@
(Xflush *window-display*))) ))
; 07 Aug 91
-(gldefun window-clear (w\:window)
+(gldefun window-clear ((w window))
(XClearWindow *window-display* (parent w))
(force-output w) )
; 08 Aug 91
-(gldefun window-moveto-xy (w\:window x\:integer y\:integer)
+(gldefun window-moveto-xy ((w window) (x integer) (y integer))
(XMoveWindow *window-display* (parent w)
x (- (window-screen-height) y)) )
@@ -991,13 +1092,13 @@
; 15 Aug 91; 06 May 93
; Move a window.
-(gldefun window-move (w\:window)
+(gldefun window-move ((w window))
(window-get-mouse-position)
(XMoveWindow *window-display* (parent w)
*mouse-x* (- (window-screen-height) *mouse-y*)) )
; 15 Sep 93; 06 Jan 94
-(gldefun window-draw-border (w\:window)
+(gldefun window-draw-border ((w window))
(draw-box-xy w 0 1 ((x (size w)) - 1) ((y (size w)) - 1))
(force-output w) )
@@ -1106,12 +1207,12 @@
; 14 Dec 90; 17 Dec 90; 13 Aug 91; 20 Aug 91; 30 Aug 91; 09 Sep 91; 11 Sep 91
; 15 Oct 91; 16 Oct 91; 10 Feb 92; 25 Sep 92; 26 Sep 92
; Initialize a menu
-(gldefun menu-init (m\:menu)
+(gldefun menu-init ((m menu))
(let ()
(or *window-display* (window-Xinit)) ; init windows if necessary
(calculate-size m)
(if ~ (flat m)
- ((menu-window m) \:= (window-create (picture-width m)
+ ((menu-window m) = (window-create (picture-width m)
(picture-height m)
((title m) or "")
(parent-window m)
@@ -1119,186 +1220,189 @@
(parent-offset-y m)
(menu-font m) )) ) ))
-; 25 Sep 92; 26 Sep 92; 11 Mar 93; 05 Oct 93; 08 Oct 93
+; 25 Sep 92; 26 Sep 92; 11 Mar 93; 05 Oct 93; 08 Oct 93; 17 May 04
; Calculate the displayed size of a menu
-(gldefun menu-calculate-size (m\:menu)
+(gldefun menu-calculate-size ((m menu))
(let (maxwidth maxheight nitems)
- (or (menu-font m) ((menu-font m) \:= '9x15))
- (maxwidth \:= (find-item-width m (title m))
+ (or (menu-font m) ((menu-font m) = '9x15))
+ (maxwidth = (find-item-width m (title m))
+ (if (or (flat m) *window-add-menu-title*)
- then 0 else *menu-title-pad*))
- (maxheight \:= 13) ; ***** fix for font
- (nitems \:= (if (and (title-present m)
+ 0
+ *menu-title-pad*))
+ (maxheight = 13) ; ***** fix for font
+ (nitems = (if (and (title-present m)
(or (flat m) *window-add-menu-title*))
- then 1 else 0))
+ 1 0))
(for item in (items m) do
(nitems _+ 1)
- (maxwidth \:= (max maxwidth (find-item-width m item)))
- (maxheight \:= (max maxheight (find-item-height m item))) )
- ((item-width m) \:= maxwidth + 6)
- ((picture-width m) \:= (item-width m) + 1)
- ((item-height m) \:= maxheight + 2)
- ((picture-height m) \:= ((item-height m) * nitems) + 2)
+ (maxwidth = (max maxwidth (find-item-width m item)))
+ (maxheight = (max maxheight (find-item-height m item))) )
+ ((item-width m) = maxwidth + 6)
+ ((picture-width m) = (item-width m) + 1)
+ ((item-height m) = maxheight + 2)
+ ((picture-height m) = ((item-height m) * nitems) + 2)
(adjust-offset m) ))
-; 06 Sep 91; 09 Sep 91; 10 Sep 91; 21 May 93
+; 06 Sep 91; 09 Sep 91; 10 Sep 91; 21 May 93; 30 May 02; 17 May 04
; Adjust a menu's offset position if necessary to keep it in parent window.
-(gldefun menu-adjust-offset (m\:menu)
+(gldefun menu-adjust-offset ((m menu))
(let (xbase ybase wbase hbase xoff yoff wgm width height)
- (width \:= (picture-width m))
- (height \:= (picture-height m))
+ (width = (picture-width m))
+ (height = (picture-height m))
(if ~ (parent-window m)
- then (window-get-mouse-position) ; put it where the mouse is
- (wgm \:= t) ; set flag that we got mouse position
- ((parent-window m) \:= *root-window*)) ; 21 May 93 was
*mouse-window*
+ (progn (window-get-mouse-position) ; put it where the mouse is
+ (wgm = t) ; set flag that we got mouse position
+ ((parent-window m) = *root-window*))) ; 21 May 93 was
*mouse-window*
(window-get-geometry-b (parent-window m))
(setq xbase (int-pos *x-return* 0))
(setq ybase (int-pos *y-return* 0))
(setq wbase (int-pos *width-return* 0))
(setq hbase (int-pos *height-return* 0))
- (if (~ (parent-offset-x m) or (parent-offset-x m) = 0)
- then (or wgm (window-get-mouse-position))
- (xoff \:= ((*mouse-x* - xbase) - (width / 2) - 4))
- (yoff \:= ((hbase - (*mouse-y* - ybase)) - (height / 2)))
- else (xoff \:= (parent-offset-x m))
- (yoff \:= (parent-offset-y m)))
- ((parent-offset-x m) \:= (max 0 (min xoff (wbase - width))))
- ((parent-offset-y m) \:= (max 0 (min yoff (hbase - height)))) ))
+ (if (~ (parent-offset-x m) or (parent-offset-x m) == 0)
+ (progn (or wgm (window-get-mouse-position))
+ (xoff = ((*mouse-x* - xbase) - (width / 2) - 4))
+ (yoff = ((hbase - (*mouse-y* - ybase)) - (height / 2))))
+ (progn (xoff = (parent-offset-x m))
+ (yoff = (parent-offset-y m))))
+ ((parent-offset-x m) = (max 0 (min xoff (wbase - width))))
+ ((parent-offset-y m) = (max 0 (min yoff (hbase - height)))) ))
; 07 Dec 90; 14 Dec 90; 12 Aug 91; 22 Aug 91; 09 Sep 91; 10 Sep 91; 28 Jan 92;
-; 10 Feb 92; 26 Sep 92; 11 Mar 93; 08 Oct 93
-(gldefun menu-draw (m\:menu)
+; 10 Feb 92; 26 Sep 92; 11 Mar 93; 08 Oct 93; 17 May 04
+(gldefun menu-draw ((m menu))
(let (mw xzero yzero bottom)
(init? m)
- (xzero \:= (menu-x m 0))
- (yzero \:= (menu-y m 0))
- (mw \:= (menu-window m))
+ (xzero = (menu-x m 0))
+ (yzero = (menu-y m 0))
+ (mw = (menu-window m))
(open mw)
(clear m)
(if (flat m) (draw-box-xy mw (xzero - 1) yzero ((picture-width m) + 2)
((picture-height m) + 1) 1))
- (bottom \:= (yzero + (picture-height m) + 3))
+ (bottom = (yzero + (picture-height m) + 3))
(if (and (title-present m)
(or (flat m) *window-add-menu-title*))
- then (bottom _- (item-height m))
+ (progn (bottom _- (item-height m))
(printat-xy mw (stringify (title m)) (+ xzero 3) bottom)
(invert-area-xy mw xzero (bottom - 2)
- ((picture-width m) + 1) (item-height m)))
+ ((picture-width m) + 1) (item-height m))))
(for item in (items m) do
(bottom _- (item-height m))
(display-item m item (+ xzero 3) bottom) )
(force-output mw) ))
+; 17 May 04
(gldefun menu-item-value (self item)
- (if (consp item) then (cdr item) else item))
+ (if (consp item) (cdr item) item))
-; 06 Sep 91; 11 Sep 91; 15 Oct 91; 16 Oct 91; 23 Oct 91
-(gldefun menu-find-item-width (self\:menu item)
- (let (tmp\:vector)
+; 06 Sep 91; 11 Sep 91; 15 Oct 91; 16 Oct 91; 23 Oct 91; 17 May 04
+(gldefun menu-find-item-width ((self menu) item)
+ (let ((tmp vector))
(if (and (consp item)
(symbolp (car item))
(fboundp (car item)))
- then (or (and (tmp \:= (get (car item) 'display-size))
+ (or (and (tmp = (get (car item) 'display-size))
(x tmp))
40)
- else (window-font-string-width
+ (window-font-string-width
(or (and (flat self)
(menu-window self)
(font (menu-window self)))
(window-font-info (menu-font self)))
- (stringify (if (consp item) then (car item) else item)))) ))
+ (stringify (if (consp item) (car item) item)))) ))
-; 09 Sep 91; 10 Sep 91; 11 Sep 91
-(gldefun menu-find-item-height (self\:menu item) ; ***** fix for font
- (let (tmp\:vector)
+; 09 Sep 91; 10 Sep 91; 11 Sep 91; 17 mAY 04
+(gldefun menu-find-item-height ((self menu) item) ; ***** fix for font
+ (let ((tmp vector))
(if (and (consp item)
(symbolp (car item))
- (tmp \:= (get (car item) 'display-size)))
- then ((y tmp) + 3)
- else 15) ))
+ (tmp = (get (car item) 'display-size)))
+ ((y tmp) + 3)
+ 15) ))
-; 09 Sep 91; 10 Sep 91; 10 Feb 92
-(gldefun menu-clear (m\:menu)
+; 09 Sep 91; 10 Sep 91; 10 Feb 92; 17 May 04
+(gldefun menu-clear ((m menu))
(if (flat m)
(erase-area-xy (menu-window m) ((base-x m) - 1) ((base-y m) - 1)
((picture-width m) + 3) ((picture-height m) + 3))
- else (clear (menu-window m))) )
+ (clear (menu-window m))) )
-; 06 Sep 91; 04 Dec 91
-(gldefun menu-display-item (self\:menu item x y)
+; 06 Sep 91; 04 Dec 91; 17 May 04
+(gldefun menu-display-item ((self menu) item x y)
(let ((mw (menu-window self)))
(if (consp item)
- then (if (and (symbolp (car item))
+ (if (and (symbolp (car item))
(fboundp (car item)))
- then (funcall (car item) mw x y)
- elseif (or (stringp (car item)) (symbolp (car item))
+ (funcall (car item) mw x y)
+ (if (or (stringp (car item)) (symbolp (car item))
(numberp (car item)))
- then (printat-xy mw (car item) x y)
- else (printat-xy mw (stringify item) x y))
- else (printat-xy mw (stringify item) x y)) ))
+ (printat-xy mw (car item) x y)
+ (printat-xy mw (stringify item) x y)))
+ (printat-xy mw (stringify item) x y)) ))
; 07 Dec 90; 18 Dec 90; 15 Aug 91; 27 Aug 91; 06 Sep 91; 10 Sep 91; 29 Sep 92
-; 04 Aug 93; 07 Jan 94
-(gldefun menu-choose (m\:menu inside\:boolean)
+; 04 Aug 93; 07 Jan 94; 17 May 04; 18 May 04
+(gldefun menu-choose ((m menu) (inside boolean))
(let (mw current-item-n newn itemh itms nitems val maxx xzero yzero)
(init? m)
- (mw \:= (menu-window m))
+ (mw = (menu-window m))
(draw m)
- (xzero \:= (menu-x m 0))
- (yzero \:= (menu-y m 0))
- (maxx \:= (+ xzero (picture-width m)))
- (itemh \:= (item-height m))
- (itms \:= (items m))
- (nitems \:= (length itms))
+ (xzero = (menu-x m 0))
+ (yzero = (menu-y m 0))
+ (maxx = (+ xzero (picture-width m)))
+ (itemh = (item-height m))
+ (itms = (items m))
+ (nitems = (length itms))
(track-mouse mw
#'(lambda (x y code)
(setq *window-menu-code* code)
(setq newn (1- (- nitems (truncate (- y (+ yzero 3)) itemh))))
(if ((x >= xzero) and (x <= maxx)
and (newn >= 0) and (newn < nitems))
- then
+ (progn
(if current-item-n
- then (if (/= newn current-item-n)
- then (unbox-item m current-item-n)
+ (if (/= newn current-item-n)
+ (progn (unbox-item m current-item-n)
(box-item m newn)
- (current-item-n \:= newn))
- else (inside \:= t)
+ (current-item-n = newn)))
+ (progn (inside = t)
(box-item m newn)
- (current-item-n \:= newn))
+ (current-item-n = newn)))
(if (and current-item-n (> code 0))
- (unbox-item m current-item-n)
- (val \:= current-item-n))
- else (if current-item-n
- then (unbox-item m current-item-n)
- (current-item-n \:= nil))
+ (progn (unbox-item m current-item-n)
+ (val = current-item-n))))
+ (progn (if current-item-n
+ (progn (unbox-item m current-item-n)
+ (current-item-n = nil)))
(if (> code 0) or
(inside and ((x < xzero) or (x > maxx)
or (y < yzero)
or (y > (yzero + (picture-height m)))))
- then (val \:= -777))))
+ (val = -777)))))
t)
(if (val <> -777) (item-value m (nth val itms)) ) ))
; 07 Dec 90; 12 Aug 91; 10 Sep 91; 05 Oct 92
-(gldefun menu-box-item (m\:menu item\:integer)
+(gldefun menu-box-item ((m menu) (item integer))
(let (itemh nitems (mw (menuw m)) )
- (itemh \:= (item-height m))
- (nitems \:= (length (items m)))
+ (itemh = (item-height m))
+ (nitems = (length (items m)))
(set-xor mw)
(draw-box-xy mw (menu-x m 1) (menu-y m ((nitems - item - 1) * itemh + 2))
((item-width m) - 2) itemh 1)
(unset mw) ))
; 07 Dec 90; 12 Aug 91; 14 Aug 91; 15 Aug 91; 05 Oct 92
-(gldefun menu-unbox-item (m\:menu item\:integer)
+(gldefun menu-unbox-item ((m menu) (item integer))
(box-item m item) )
; 11 Sep 91; 08 Sep 92; 28 Sep 92; 18 Jan 94
-(gldefun menu-item-position (m\:menu itemname\:symbol &optional place\:symbol)
+(gldefun menu-item-position ((m menu) (itemname symbol)
+ &optional (place symbol))
(let ((n 0) found itms item (xsize (item-width m)) (ysize (item-height m)))
- (itms \:= (items m))
- (found \:= (null itemname))
+ (itms = (items m))
+ (found = (null itemname))
(while itms and ~ found do
(n _+ 1)
(item -_ itms)
@@ -1310,7 +1414,7 @@
(eq (cdr item) itemname)
(and (consp (cdr item))
(eq (cadr item) itemname)))))
- (found \:= t)))
+ (found = t)))
(if found (a vector with
x = ((menu-x m 0) +
(case place
@@ -1325,25 +1429,26 @@
(top ysize)
else 0)) )) ))
-; 10 Dec 90; 13 Dec 90; 10 Sep 91; 29 Sep 92
+; 10 Dec 90; 13 Dec 90; 10 Sep 91; 29 Sep 92; 17 May 04
; Choose from menu, then close it
-(gldefun menu-select (m\:menu &optional inside) (menu-select-b m nil inside))
-(gldefun menu-select! (m\:menu) (menu-select-b m t nil))
-(gldefun menu-select-b (m\:menu flg\:boolean inside\:boolean)
+(gldefun menu-select ((m menu) &optional inside) (menu-select-b m nil inside))
+(gldefun menu-select! ((m menu)) (menu-select-b m t nil))
+(gldefun menu-select-b ((m menu) (flg boolean) (inside boolean))
(prog (res)
-lp (res \:= (choose m inside))
+lp (res = (choose m inside))
(if (flg and ~res) (go lp))
(if ~(permanent m)
- (if (flat m) then (clear m)
- (force-output (menu-window m))
- else (close (menu-window m))))
+ (if (flat m)
+ (progn (clear m)
+ (force-output (menu-window m)))
+ (close (menu-window m))))
(return res)))
-; 12 Aug 91
-(gldefun menu-destroy (m\:menu)
+; 12 Aug 91; 17 May 04
+(gldefun menu-destroy ((m menu))
(if ~ (flat m)
- then (destroy (menu-window m))
- ((menu-window m) \:= nil) ))
+ (progn (destroy (menu-window m))
+ ((menu-window m) = nil) )))
; 19 Aug 91; 02 Sep 91
; Easy interface to make a menu, select from it, and destroy it.
@@ -1354,12 +1459,13 @@
(menu-destroy m)
res ))
-; 12 Aug 91; 15 Aug 91; 06 Sep 91; 09 Sep 91; 12 Sep 91; 23 Oct 91
+; 12 Aug 91; 15 Aug 91; 06 Sep 91; 09 Sep 91; 12 Sep 91; 23 Oct 91; 17 May 04
; Simple call from plain Lisp to make a menu.
-(gldefun menu-create (items &optional title parentw\:window x y
- perm\:boolean flat\:boolean font\:symbol)
- (a menu with title = (if title (stringify title) else "")
- menu-window = (if flat then parentw)
+(setf (glfnresulttype 'menu-create) 'menu)
+(gldefun menu-create (items &optional title (parentw window) x y
+ (perm boolean) (flat boolean) (font symbol))
+ (a menu with title = (if title (stringify title) "")
+ menu-window = (if flat parentw)
items = items
parent-window = (parent parentw)
parent-offset-x = x
@@ -1369,48 +1475,53 @@
menu-font = font ))
; 15 Oct 91; 30 Oct 91
-(gldefun menu-offset (m\:menu)
+(gldefun menu-offset ((m menu))
(result vector)
(a vector with x = (base-x m) y = (base-y m)))
-; 15 Oct 91; 30 Oct 91; 25 Sep 92; 29 Sep 92
-(gldefun menu-size (m\:menu)
+; 15 Oct 91; 30 Oct 91; 25 Sep 92; 29 Sep 92; 18 Apr 95; 25 Jul 96
+(gldefun menu-size ((m menu))
(result vector)
(if ((picture-width m) <= 0)
- (if ((first m) = 'picmenu)
- then (picmenu-calculate-size m)
- else (menu-calculate-size m)))
+ (case (first m)
+ (picmenu (picmenu-calculate-size m))
+ (barmenu (barmenu-calculate-size m))
+ (textmenu (textmenu-calculate-size m))
+ (editmenu (editmenu-calculate-size m))
+ (t (menu-calculate-size m))))
(a vector with x = (picture-width m) y = (picture-height m)) )
-; 15 Oct 91
-(gldefun menu-moveto-xy (m\:menu x\:integer y\:integer)
+; 15 Oct 91; 17 May 04
+(gldefun menu-moveto-xy ((m menu) (x integer) (y integer))
(if (flat m)
- then ((parent-offset-x m) \:= x)
- ((parent-offset-y m) \:= y)
- (adjust-offset m)) )
+ (progn ((parent-offset-x m) = x)
+ ((parent-offset-y m) = y)
+ (adjust-offset m)) ))
-; 27 Nov 92
+; 27 Nov 92; 17 May 04
; Reposition a menu to a position specified by the user by mouse click
-(gldefun menu-reposition (m\:menu)
+(gldefun menu-reposition ((m menu))
(let (sizev pos)
(if (flat m)
- (sizev \:= (size m))
- (pos \:= (get-box-position (menu-window m) (x sizev) (y sizev)))
- (moveto-xy m (x pos) (y pos)) ) ))
+ (progn (sizev = (size m))
+ (pos = (get-box-position (menu-window m) (x sizev) (y sizev)))
+ (moveto-xy m (x pos) (y pos)) ) )))
; 09 Sep 91; 11 Sep 91; 12 Sep 91; 14 Sep 91
; Simple call from plain Lisp to make a picture menu.
+(setf (glfnresulttype 'picmenu-create) 'picmenu)
(gldefun picmenu-create
- (buttons width\:integer height\:integer drawfn
- &optional title dotflg\:boolean parentw\:window x y
- perm\:boolean flat\:boolean font\:symbol boxflg\:boolean)
+ (buttons (width integer) (height integer) drawfn
+ &optional title (dotflg boolean) (parentw window) x y (perm boolean)
+ (flat boolean) (font symbol) (boxflg boolean))
(picmenu-create-from-spec
(picmenu-create-spec buttons width height drawfn dotflg font)
title parentw x y perm flat boxflg))
; 14 Sep 91
-(gldefun picmenu-create-spec (buttons width\:integer height\:integer drawfn
- &optional dotflg\:boolean font\:symbol)
+(setf (glfnresulttype 'picmenu-create-spec) 'picmenu-spec)
+(gldefun picmenu-create-spec (buttons (width integer) (height integer) drawfn
+ &optional (dotflg boolean) (font symbol))
(a picmenu-spec with drawing-width = width
drawing-height = height
buttons = buttons
@@ -1418,12 +1529,13 @@
drawfn = drawfn
menu-font = (font or '9x15)))
-; 14 Sep 91
+; 14 Sep 91; 17 May 04
+(setf (glfnresulttype 'picmenu-create-from-spec) 'picmenu)
(gldefun picmenu-create-from-spec
- (spec\:picmenu-spec &optional title parentw\:window x y
- perm\:boolean flat\:boolean boxflg\:boolean)
- (a picmenu with title = (if title (stringify title) else "")
- menu-window = (if flat then parentw)
+ ((spec picmenu-spec) &optional title (parentw window) x y
+ (perm boolean) (flat boolean) (boxflg boolean))
+ (a picmenu with title = (if title (stringify title) "")
+ menu-window = (if flat parentw)
parent-window = (if parentw (parent parentw))
parent-offset-x = x
parent-offset-y = y
@@ -1432,27 +1544,27 @@
spec = spec
boxflg = boxflg))
-; 29 Sep 92; 13 Oct 93
-(gldefun picmenu-calculate-size (m\:picmenu)
+; 29 Sep 92; 13 Oct 93; 17 May 04
+(gldefun picmenu-calculate-size ((m picmenu))
(let (maxwidth maxheight)
- (maxwidth \:= (max (if (title m) then ((* 9 (length (title m))) + 6)
- else 0)
+ (maxwidth = (max (if (title m) ((* 9 (length (title m))) + 6)
+ 0)
(drawing-width m)))
- (maxheight \:= (if (and (title-present m)
+ (maxheight = (if (and (title-present m)
(or (flat m) *window-add-menu-title*))
- then 15 else 0)
+ 15 0)
+ (drawing-height m))
- ((picture-width m) \:= maxwidth)
- ((picture-height m) \:= maxheight) ))
+ ((picture-width m) = maxwidth)
+ ((picture-height m) = maxheight) ))
; 09 Sep 91; 10 Sep 91; 29 Sep 92
; Initialize a picture menu
-(gldefun picmenu-init (m\:picmenu)
+(gldefun picmenu-init ((m picmenu))
(let ()
(calculate-size m)
(adjust-offset m)
(if ~ (flat m)
- ((menu-window m) \:= (window-create (picture-width m)
+ ((menu-window m) = (window-create (picture-width m)
(picture-height m)
((title m) or "")
(parent-window m)
@@ -1461,30 +1573,31 @@
(menu-font m) )) ) ))
; 09 Sep 91; 10 Sep 91; 11 Sep 91; 10 Feb 92; 05 Oct 92; 30 Oct 92; 13 Oct 93
+; 17 May 04
; Draw a picture menu
-(gldefun picmenu-draw (m\:picmenu)
+(gldefun picmenu-draw ((m picmenu))
(let (mw bottom xzero yzero)
(init? m)
- (mw \:= (menu-window m))
+ (mw = (menu-window m))
(open mw)
(clear m)
- (xzero \:= (menu-x m 0))
- (yzero \:= (menu-y m 0))
- (bottom \:= yzero + (picture-height m))
+ (xzero = (menu-x m 0))
+ (yzero = (menu-y m 0))
+ (bottom = yzero + (picture-height m))
(if (and (title-present m)
(or (flat m) *window-add-menu-title*))
- then (printat-xy mw (stringify (title m)) (xzero + 3) (bottom - 13))
- (invert-area-xy mw xzero (bottom - 15) (picture-width m) 16))
+ (progn (printat-xy mw (stringify (title m)) (xzero + 3) (bottom - 13))
+ (invert-area-xy mw xzero (bottom - 15) (picture-width m) 16)))
(funcall (drawfn m) mw xzero yzero)
(if (boxflg m) (draw-box-xy mw xzero yzero
(picture-width m) (picture-height m) 1))
(if (dotflg m)
- then (for b in (buttons m) do (draw-button m b)) )
- ((deleted-buttons m) \:= nil)
+ (for b in (buttons m) do (draw-button m b)) )
+ ((deleted-buttons m) = nil)
(force-output mw) ))
; 05 Oct 92
-(gldefun picmenu-draw-button (m\:picmenu b\:picmenu-button)
+(gldefun picmenu-draw-button ((m picmenu) (b picmenu-button))
(let ((mw (menu-window m)))
(set-invert mw)
(draw-box-xy mw ((menu-x m 0) + (x (offset b)) - 2)
@@ -1492,115 +1605,117 @@
4 4 1)
(unset mw) ))
-; 05 Oct 92; 30 Oct 92
+; 05 Oct 92; 30 Oct 92; 17 May 04
; Delete a button and erase it from the display
-(gldefun picmenu-delete-named-button (m\:picmenu name\:symbol)
+(gldefun picmenu-delete-named-button ((m picmenu) (name symbol))
(let (b)
- (if (and (b \:= (assoc name (buttons m)))
+ (if (and (b = (assoc name (buttons m)))
~ (name <= (deleted-buttons m)))
- then (if (dotflg m) (draw-button m b))
- ((deleted-buttons m) +_ name) )
+ (progn (if (dotflg m) (draw-button m b))
+ ((deleted-buttons m) +_ name) ))
(force-output (menu-window m)) ))
; 09 Sep 91; 10 Sep 91; 18 Sep 91; 29 Sep 92; 26 Oct 92; 30 Oct 92; 06 May 93
-; 04 Aug 93; 07 JAN 94
+; 04 Aug 93; 07 Jan 94; 30 May 02; 17 May 04; 18 May 04; 01 Jun 04; 24 Jan 06
; inside = t if the mouse is already inside the menu area
; anyclick = value to return for a mouse click that is not on a button.
-(gldefun picmenu-select (m\:picmenu &optional inside anyclick)
- (let (mw current-button\:picmenu-button item items val\:picmenu-button
+(gldefun picmenu-select ((m picmenu) &optional inside anyclick)
+ (let (mw (current-button picmenu-button) item items (val picmenu-button)
xzero yzero codeval)
- (mw \:= (menuw m))
+ (mw = (menuw m))
(if ~ (permanent m) (draw m))
- (xzero \:= (menu-x m 0))
- (yzero \:= (menu-y m 0))
+ (xzero = (menu-x m 0))
+ (yzero = (menu-y m 0))
(track-mouse mw
#'(lambda (x y code)
(setq *window-menu-code* code)
- (x \:= (x - xzero))
- (y \:= (y - yzero))
+ (x = (x - xzero))
+ (y = (y - yzero))
(if ((x >= 0) and (x <= (picture-width m))
and (y >= 0) and (y <= (picture-height m)))
- then (inside \:= t))
+ (inside = t))
(if current-button
(if ~ (containsxy? current-button x y)
- then (unbox-item m current-button)
- (current-button \:= nil)))
+ (progn (unbox-item m current-button)
+ (current-button = nil))))
(if ~ current-button
- then (items \:= (buttons m))
+ (progn (items = (buttons m))
(while ~ current-button and (item -_ items) do
(if (and (containsxy? item x y)
- ~ ((name item) <= (deleted-buttons m)))
- then (box-item m item)
- (current-button \:= item))))
+ (not ((buttonname item) <=
+ (deleted-buttons m))))
+ (progn (box-item m item)
+ (current-button = item))))))
(if (or (> code 0)
(and inside (or (x < 0) (x > (picture-width m))
(y < 0) (y > (picture-height m)))))
- then (if current-button then (unbox-item m current-button))
- (codeval \:= code)
- (val \:= (if (and (> code 0) current-button)
- then current-button
- else *picmenu-no-selection*)) ))
+ (progn (if current-button (unbox-item m current-button))
+ (codeval = code)
+ (val = (if (and (> code 0) current-button)
+ current-button
+ *picmenu-no-selection*)) )))
t)
(if ~(permanent m)
- (if (flat m) then (clear m)
- (force-output (menu-window m))
- else (close (menu-window m))))
- (if (val = *picmenu-no-selection*)
- then (and (> codeval 0) anyclick)
- else (name val)) ))
+ (if (flat m) (progn (clear m)
+ (force-output (menu-window m)))
+ (close (menu-window m))))
+ (if (val == *picmenu-no-selection*)
+ (and (> codeval 0) anyclick)
+ (buttonname val)) ))
-; 09 Sep 91; 10 Sep 91
-(gldefun picmenu-box-item (m\:picmenu item\:picmenu-button)
+; 09 Sep 91; 10 Sep 91; 17 May 04
+(gldefun picmenu-box-item ((m picmenu) (item picmenu-button))
(let ((mw (menuw m)) xoff yoff siz)
- (xoff \:= (menu-x m (x (offset item))))
- (yoff \:= (menu-y m (y (offset item))))
+ (xoff = (menu-x m (x (offset item))))
+ (yoff = (menu-y m (y (offset item))))
(if (highlightfn item)
- then (funcall (highlightfn item) (menuw m) xoff yoff)
- else (set-xor mw)
- (if (siz \:= (size item))
- then (draw-box-xy mw (xoff - (x siz) / 2)
+ (funcall (highlightfn item) (menuw m) xoff yoff)
+ (progn (set-xor mw)
+ (if (siz = (size item))
+ (draw-box-xy mw (xoff - (x siz) / 2)
(yoff - (y siz) / 2)
(x siz) (y siz) 1)
- else (draw-box-xy mw (xoff - 6) (yoff - 6) 12 12 1))
+ (draw-box-xy mw (xoff - 6) (yoff - 6) 12 12 1))
(unset mw)
- (force-output mw) ) ))
+ (force-output mw) ) )))
-; 09 Sep 91; 06 May 93
-(gldefun picmenu-unbox-item (m\:picmenu item\:picmenu-button)
+; 09 Sep 91; 06 May 93; 17 May 04
+(gldefun picmenu-unbox-item ((m picmenu) (item picmenu-button))
(let ((mw (menuw m)))
(if (unhighlightfn item)
- then (funcall (unhighlightfn item) (menuw m)
+ (progn (funcall (unhighlightfn item) (menuw m)
(x (offset item)) (y (offset item)))
- (force-output mw)
- else (box-item m item) ) ))
+ (force-output mw))
+ (box-item m item) ) ))
(defun picmenu-destroy (m) (menu-destroy m))
; 09 Sep 91; 10 Sep 91; 11 Sep 91
-(gldefun picmenu-button-containsxy? (b\:picmenu-button x\:integer y\:integer)
+(gldefun picmenu-button-containsxy? ((b picmenu-button) (x integer)
+ (y integer))
(let ((xsize 6) (ysize 6))
- (if (size b) then (xsize \:= (x (size b)) / 2)
- (ysize \:= (y (size b)) / 2))
+ (if (size b) (progn (xsize = (x (size b)) / 2)
+ (ysize = (y (size b)) / 2)))
((x >= ((x (offset b)) - xsize)) and (x <= ((x (offset b)) + xsize)) and
(y >= ((y (offset b)) - ysize)) and (y <= ((y (offset b)) + ysize)) ) ))
-; 11 Sep 91; 08 Sep 92; 18 Jan 94
-(gldefun picmenu-item-position (m\:picmenu itemname\:symbol
- &optional place\:symbol)
- (let (b\:picmenu-button (xsize 0) (ysize 0) xoff yoff)
+; 11 Sep 91; 08 Sep 92; 18 Jan 94; 30 May 02; 17 May 04; 24 Jan 06
+(gldefun picmenu-item-position ((m picmenu) (itemname symbol)
+ &optional (place symbol))
+ (let ((b picmenu-button) (xsize 0) (ysize 0) xoff yoff)
(if (null itemname)
- then (xsize \:= (picture-width m))
- (ysize \:= ((picture-height m) - (drawing-height m)) / 2)
- (xoff \:= xsize / 2)
- (yoff \:= (drawing-height m) + ysize / 2)
- else (if (b \:= (that (buttons m) with name = itemname))
- then (if (size b)
- then (xsize \:= (x (size b)))
- (ysize \:= (y (size b))))
- (xoff \:= (x (offset b)))
- (yoff \:= (y (offset b))) ) )
- (if xoff then (a vector with
+ (progn (xsize = (picture-width m))
+ (ysize = ((picture-height m) - (drawing-height m)) / 2)
+ (xoff = xsize / 2)
+ (yoff = (drawing-height m) + ysize / 2))
+ (if (b = (that (buttons m) with buttonname == itemname))
+ (progn (if (size b)
+ (progn (xsize = (x (size b)))
+ (ysize = (y (size b)))))
+ (xoff = (x (offset b)))
+ (yoff = (y (offset b))) ) ))
+ (if xoff (a vector with
x = ((menu-x m xoff) + (case place
((center top bottom) 0)
(left (- (xsize / 2)))
@@ -1612,14 +1727,15 @@
(top (ysize / 2))
else 0))) ) ))
-; 03 Jan 94; 18 Jan 94
+; 03 Jan 94; 18 Jan 94; 17 May 04
; Simple call from plain Lisp to make a picture menu.
+(setf (glfnresulttype 'barmenu-create) 'barmenu)
(gldefun barmenu-create
- (maxval\:integer initval\:integer barwidth\:integer
- &optional title horizontal\:boolean subtrackfn subtrackparms
- parentw\:window x y perm\:boolean flat\:boolean color\:rgb)
- (a barmenu with title = (if title (stringify title) else "")
- menu-window = (if flat then parentw)
+ ((maxval integer) (initval integer) (barwidth integer)
+ &optional title (horizontal boolean) subtrackfn subtrackparms
+ (parentw window) x y (perm boolean) (flat boolean) (color rgb))
+ (a barmenu with title = (if title (stringify title) "")
+ menu-window = (if flat parentw)
parent-window = (if parentw (parent parentw))
parent-offset-x = (or x 0)
parent-offset-y = (or y 0)
@@ -1633,97 +1749,198 @@
subtrackparms = subtrackparms
color = color) )
-; 03 Jan 94
-(gldefun barmenu-calculate-size (m\:barmenu)
+; 03 Jan 94; 17 May 04
+(gldefun barmenu-calculate-size ((m barmenu))
(let (maxwidth maxheight)
- (maxwidth \:= (max (if (title m) then ((* 9 (length (title m))) + 6)
- else 0)
+ (maxwidth = (max (if (title m) ((* 9 (length (title m))) + 6)
+ 0)
(barwidth m)))
- (maxheight \:= (if (and (title-present m)
+ (maxheight = (if (and (title-present m)
(or (flat m) *window-add-menu-title*))
- then 15 else 0)
+ 15 0)
+ (maxval m))
- ((picture-width m) \:= maxwidth)
- ((picture-height m) \:= maxheight) ))
+ ((picture-width m) = maxwidth)
+ ((picture-height m) = maxheight) ))
; 03 Jan 94
; Initialize a picture menu
-(gldefun barmenu-init (m\:barmenu)
+(gldefun barmenu-init ((m barmenu))
(let ()
(calculate-size m)
(adjust-offset m)
(if ~ (flat m)
- ((menu-window m) \:= (window-create (picture-width m)
+ ((menu-window m) = (window-create (picture-width m)
(picture-height m)
((title m) or "")
(parent-window m)
(parent-offset-x m)
(parent-offset-y m) )) ) ))
-; 03 Jan 94; 18 Jan 94
+; 03 Jan 94; 18 Jan 94; 17 May 04; 18 May 04
; Draw a picture menu
-(gldefun barmenu-draw (m\:barmenu)
+(gldefun barmenu-draw ((m barmenu))
(let (mw xzero yzero)
(init? m)
- (mw \:= (menu-window m))
+ (mw = (menu-window m))
(open mw)
(clear m)
- (xzero \:= (menu-x m ((picture-width m) / 2)))
- (yzero \:= (menu-y m 0))
- (if (color m) then (window-set-color mw (color m)))
+ (xzero = (menu-x m ((picture-width m) / 2)))
+ (yzero = (menu-y m 0))
+ (if (color m) (window-set-color mw (color m)))
(if (horizontal m)
- then (draw-line-xy (menu-window m) xzero yzero
+ (draw-line-xy (menu-window m) xzero yzero
(xzero + (value m)) yzero (barwidth m))
- else (draw-line-xy (menu-window m) xzero yzero
+ (draw-line-xy (menu-window m) xzero yzero
xzero (+ yzero (value m)) (barwidth m)) )
- (if (color m) then (window-reset-color mw))
+ (if (color m) (window-reset-color mw))
(force-output mw) ))
; 03 Jan 94; 04 Jan 94; 07 Jan 94; 18 Jan 94
; inside = t if the mouse is already inside the menu area
-(gldefun barmenu-select (m\:barmenu &optional inside)
+(gldefun barmenu-select ((m barmenu) &optional inside)
(let (mw xzero yzero val)
- (mw \:= (menuw m))
+ (mw = (menuw m))
(if ~ (permanent m) (draw m))
- (xzero \:= (menu-x m ((picture-width m) / 2)))
- (yzero \:= (menu-y m 0))
+ (xzero = (menu-x m ((picture-width m) / 2)))
+ (yzero = (menu-y m 0))
(when (window-track-mouse-in-region mw (menu-x m 0) yzero
(picture-width m) (picture-height m) t t)
(track-mouse mw
#'(lambda (x y code)
(setq *window-menu-code* code)
- (val \:= (if (horizontal m) then (x - xzero) else (y - yzero)))
+ (val = (if (horizontal m) (x - xzero) (y - yzero)))
(update-value m val)
(if (> code 0) code) ))
val) ))
-; 03 Jan 93
+; 03 Jan 93; 17 May 04
(defvar *barmenu-update-value-cons* (cons nil nil)) ; reusable cons
-(gldefun barmenu-update-value (m\:barmenu val\:integer)
+(gldefun barmenu-update-value ((m barmenu) (val integer))
(let ((mw (menuw m)) xzero yzero)
- (val \:= (max 0 (min val (maxval m))))
+ (val = (max 0 (min val (maxval m))))
(if (val <> (value m))
- then (if (val < (value m))
- then (set-erase mw)
- else (if (color m) then (window-set-color mw (color m))))
- (xzero \:= (menu-x m ((picture-width m) / 2)))
- (yzero \:= (menu-y m 0))
+ (progn (if (val < (value m))
+ (set-erase mw)
+ (if (color m) (window-set-color mw (color m))))
+ (xzero = (menu-x m ((picture-width m) / 2)))
+ (yzero = (menu-y m 0))
(if (horizontal m)
- then (draw-line-xy (menu-window m)
+ (draw-line-xy (menu-window m)
(+ xzero (value m)) yzero
(+ xzero val) yzero (barwidth m))
- else (draw-line-xy (menu-window m)
+ (draw-line-xy (menu-window m)
xzero (+ yzero (value m))
xzero (+ yzero val) (barwidth m)) )
(if (val < (value m))
- then (unset mw)
- else (if (color m) then (window-reset-color mw)) )
- ((value m) \:= val)
+ (unset mw)
+ (if (color m) (window-reset-color mw)) )
+ ((value m) = val)
(if (subtrackfn m)
- then ((car *barmenu-update-value-cons*) \:= val)
- ((cdr *barmenu-update-value-cons*) \:= (subtrackparms m))
- (apply (subtrackfn m) *barmenu-update-value-cons*))
- (force-output mw) ) ))
+ (progn ((car *barmenu-update-value-cons*) = val)
+ ((cdr *barmenu-update-value-cons*) = (subtrackparms m))
+ (apply (subtrackfn m) *barmenu-update-value-cons*)))
+ (force-output mw) ) )))
+
+; Functions for text input "menus". Derived from picmenu code.
+; Making text input analogous to menus allows use with menu-sets.
+
+; 18 Apr 95; 17 May 04
+; (setq tm (textmenu-create 200 30 nil myw 50 50 t t '9x15 t "Rutabagas"))
+; Simple call from plain Lisp to make a text menu.
+(setf (glfnresulttype 'textmenu-create) 'textmenu)
+(gldefun textmenu-create ((width integer) (height integer)
+ &optional title (parentw window) x y
+ (perm boolean) (flat boolean)
+ (font symbol) (boxflg boolean)
+ (initial-text string))
+ (a textmenu with title = (if title (stringify title) "")
+ menu-window = (if flat parentw)
+ parent-window = (if parentw (parent parentw))
+ parent-offset-x = (or x 0)
+ parent-offset-y = (or y 0)
+ permanent = perm
+ flat = flat
+ drawing-width = width
+ drawing-height = height
+ menu-font = (font or '9x15)
+ boxflg = boxflg
+ text = initial-text) )
+
+; 18 Apr 95; 17 May 04
+(gldefun textmenu-calculate-size ((m textmenu))
+ (let (maxwidth maxheight)
+ (maxwidth = (max (if (title m) ((* 9 (length (title m))) + 6)
+ 0)
+ (drawing-width m)))
+ (maxheight = (if (and (title-present m)
+ (or (flat m) *window-add-menu-title*))
+ 15 0)
+ + (drawing-height m))
+ ((picture-width m) = maxwidth)
+ ((picture-height m) = maxheight) ))
+
+; 18 Apr 95
+; Initialize a picture menu
+(gldefun textmenu-init ((m textmenu))
+ (let ()
+ (calculate-size m)
+ (adjust-offset m)
+ (if ~ (flat m)
+ ((menu-window m) =
+ (window-create (picture-width m) (picture-height m)
+ ((title m) or "") (parent-window m)
+ (parent-offset-x m) (parent-offset-y m)
+ (menu-font m) )) ) ))
+
+; 18 Apr 95; 14 Aug 96; 17 May 04
+; Draw a picture menu
+(gldefun textmenu-draw ((m textmenu))
+ (let (mw bottom xzero yzero)
+ (init? m)
+ (mw = (menu-window m))
+ (open mw)
+ (clear m)
+ (xzero = (menu-x m 0))
+ (yzero = (menu-y m 0))
+ (bottom = yzero + (picture-height m))
+ (if (and (title-present m)
+ (or (flat m) *window-add-menu-title*))
+ (progn (printat-xy mw (stringify (title m)) (xzero + 3) (bottom - 13))
+ (invert-area-xy mw xzero (bottom - 15) (picture-width m) 16)))
+ (if (text m)
+ (printat-xy mw (text m) (xzero + 10)
+ (yzero + (picture-height m) / 2 - 8)))
+ (if (boxflg m) (draw-box-xy mw xzero yzero
+ (picture-width m) (picture-height m) 1))
+ (force-output mw) ))
+
+; 18 Apr 95; 20 Apr 95; 21 Apr 95; 14 Aug 96; 17 May 04; 01 Jun 04
+(gldefun textmenu-select ((m textmenu) &optional inside)
+ (let (mw xzero yzero codeval res)
+ (mw = (menuw m))
+ (if ~ (permanent m) (draw m))
+ (xzero = (menu-x m 0))
+ (yzero = (menu-y m 0))
+ (track-mouse mw
+ #'(lambda (x y code)
+ (setq *window-menu-code* code)
+ (x = (x - xzero))
+ (y = (y - yzero))
+ (if (or (> code 0)
+ (or (x < 0) (x > (picture-width m))
+ (y < 0) (y > (picture-height m))))
+ (codeval = code)) )
+ t)
+ (if (and (not (permanent m)) (not (flat m)))
+ (close (menu-window m)))
+ (if (codeval > 0)
+ (progn (draw m)
+ (input-string mw (text m) (xzero + 10)
+ (yzero + (picture-height m) / 2 - 8)
+ ((picture-width m) - 12)) ) )))
+
+(gldefun textmenu-set-text ((m textmenu) &optional (s string))
+ ((text m) = (or s "")))
; 15 Aug 91
; Get a point position by mouse click. Returns (x y).
@@ -2036,7 +2253,7 @@
; 31 Dec 93
; Reset window colors to default foreground and background.
-(gldefun window-reset-color (w\:window)
+(gldefun window-reset-color ((w window))
(XSetForeground *window-display* (gcontext w) *default-fg-color*)
(XSetBackground *window-display* (gcontext w) *default-bg-color*) )
@@ -2077,10 +2294,11 @@
(XFreeColors *window-display*
*default-colormap* xcolor 1 0)) ) )
-; 31 Dec 93
-; Get characters within a window, calling function fn with arg (char).
+; 31 Dec 93; 18 Jul 96; 25 Jul 96
+; Get characters or mouse clicks within a window, calling function fn
+; with arguments (char button x y args).
; Tracking continues until fn returns non-nil; result is that value.
-(defun window-get-chars (w fn)
+(defun window-get-chars (w fn &optional args)
(let (win res)
(or *window-keyinit* (window-init-keymap))
(setq *window-shift* nil)
@@ -2089,22 +2307,23 @@
(setq win (window-parent w))
(Xsync *window-display* 1) ; clear event queue of prev motion events
(Xselectinput *window-display* win
- (+ KeyPressMask KeyReleaseMask))
+ (+ KeyPressMask KeyReleaseMask ButtonPressMask))
;; Event processing loop: stop when function returns non-nil.
(while (null res)
(XNextEvent *window-display* *window-event*)
(let ((type (XAnyEvent-type *window-event*))
(eventwindow (XAnyEvent-window *window-event*)))
(if (eql eventwindow win)
- (setq res (window-process-char-event w type fn))) ))
+ (setq res (window-process-char-event w type fn args))) ))
res))
-; 31 Dec 93; 18 Jan 94; 04 Oct 94
+; 31 Dec 93; 18 Jan 94; 04 Oct 94; 18 Jul 96; 19 Jul 96; 22 Jul 96; 23 Jul 96
+; 25 Jul 96
; Process a character event. type is event type.
; For Control, Shift, and Meta, global flags are set.
-; fn is called for other characters.
-(defun window-process-char-event (w type fn)
- (let (code)
+; (fn char button x y) is called for other characters.
+(defun window-process-char-event (w type fn args)
+ (let (code eventwindow)
(if (eql type KeyRelease)
(progn
(setq code (XButtonEvent-button *window-event*))
@@ -2123,11 +2342,26 @@
(progn (setq *window-ctrl* t) nil)
(if (member code *window-meta-keys*)
(progn (setq *window-meta* t) nil)
- (funcall fn w (or (aref (if *window-shift*
- *window-shiftkeymap*
- *window-keymap*)
- code)
- #\Space)) ))))) ) ))
+ (funcall fn w (window-char-decode code) 0 0 0
+ args) ))))
+ (if (eql type ButtonPress)
+ (funcall fn w 0 (XButtonEvent-button *window-event*)
+ (XMotionEvent-x *window-event*)
+ (- (window-drawable-height w)
+ (XMotionEvent-y *window-event*))
+ args)) ) ) ))
+
+; 23 Jul 96; 23 Dec 96
+; Change keyboard code into character; assumes ASCII for control chars
+(defun window-char-decode (code)
+ (let (char)
+ (setq char (aref (if *window-shift* *window-shiftkeymap* *window-keymap*)
+ code))
+ (if (and char *window-ctrl*)
+ (setq char (code-char (- (char-code (char-upcase char)) 64))))
+ (if (and char *window-meta*) ; simulate meta using 128
+ (setq char (code-char (+ (char-code (char-upcase char)) 128))))
+ (or char #\Space) ))
; 31 Dec 93; 04 Oct 94; 16 Nov 94
; Get character within a window, calling function fn with arg (char).
@@ -2152,68 +2386,450 @@
(setq res (XButtonEvent-button *window-event*)) ) ))
res))
-; 31 Dec 93
+; 31 Dec 93; 19 Jul 96; 12 Aug 96; 13 Aug 96
; Input a string from keyboard, echo in window. str is initial string.
; Backspace is handled; terminate with return. Size is max width in pixels.
(defun window-input-string (w str x y &optional size)
+ (car (window-edit w x y (or size 100) 16 (list (or str "")) nil t t) ) )
+
+; 19 Jul 96; 22 Jul 96; 12 Aug 96; 13 Aug 96
+; Edit strings in a window area with Emacs-subset editor
+; strings is a list of strings, which is the return value
+; scroll is number of lines to scroll down before displaying text,
+; or t to have one line only and terminate on return.
+; endp is T to begin edit at end of first line
+; e.g. (window-draw-box-xy myw 48 48 204 204)
+; (window-edit myw 50 50 200 200 '("Now is the time" "for all" "good"))
+(gldefun window-edit (w x y width height &optional strings boxflg scroll endp)
+ (let (em)
+ (em = (editmenu-create width height nil w x y nil t '9x15 boxflg
+ strings scroll endp))
+ (edit em)
+ (carat em) ; erase the carat
+ (text em) ))
+
+; 25 Jul 96; 26 Jul 96; 12 Aug 96; 13 Aug 96; 15 Aug 96; 17 May 04
+; (setq em (editmenu-create 200 30 nil myw 50 50 t t '9x15 t ("Rutabagas")))
+; Simple call from plain Lisp to make an edit menu.
+(setf (glfnresulttype 'editmenu-create) 'editmenu)
+(gldefun editmenu-create ((width integer) (height integer)
+ &optional title (parentw window) x y
+ (perm boolean) (flat boolean)
+ (font symbol) (boxflg boolean)
+ (initial-text (listof string))
+ scrollval (endp boolean))
+ (an editmenu with title = (if title (stringify title) "")
+ menu-window = (if flat parentw)
+ parent-window = (if parentw (parent parentw))
+ parent-offset-x = (or x 0)
+ parent-offset-y = (or y 0)
+ permanent = perm
+ flat = flat
+ drawing-width = width
+ drawing-height = height
+ menu-font = (font or '9x15)
+ boxflg = boxflg
+ text = (or initial-text (list ""))
+ scrollval = (or scrollval 0)
+ line = (if (numberp scrollval)
+ scrollval
+ 0)
+ column = (if endp
+ (length (car (nthcdr
+ (if (numberp scrollval)
+ scrollval
+ 0)
+ initial-text)))
+ 0)) )
+
+; 25 Jul 96
+(gldefun editmenu-calculate-size ((m editmenu))
+ ((picture-width m) = (drawing-width m))
+ ((picture-height m) = (drawing-height m)) )
+
+; 18 Apr 95
+; Initialize a picture menu
+(gldefun editmenu-init ((m editmenu))
(let ()
- (setq *window-input-string-x* x)
- (setq *window-input-string-y* y)
- (setq *window-input-string-charwidth* (window-string-width w "M"))
- (setq *window-string-max* (if size
- (/ size *window-input-string-charwidth*)
- 100))
- (setq *window-string-count* (if str (min (length str)
- *window-string-max*)
- 0))
- (window-erase-area-xy w x (- y 2) (or size 100) 14)
- (if (> *window-string-count* 0)
- (progn (dotimes (i *window-string-count*)
- (setf (char *window-string* i) (char str i)) )
- (window-printat-xy w str x y)))
- (window-draw-carat w)
- (window-get-chars w #'window-input-char-fn) ))
+ (calculate-size m)
+ (adjust-offset m)
+ (if ~ (flat m)
+ ((menu-window m) =
+ (window-create (picture-width m) (picture-height m)
+ ((title m) or "") (parent-window m)
+ (parent-offset-x m) (parent-offset-y m)
+ (menu-font m) )) ) ))
-; 31 Dec 93
-; Process input characters for window-input-string
-(defun window-input-char-fn (w char)
- (let ((tmpstring "Z"))
- (window-draw-carat w) ; erase the input pointer
- (if (char= char #\Return)
- (subseq *window-string* 0 *window-string-count*)
- (progn
- (if (char= char #\Backspace)
- (if (> *window-string-count* 0)
- (progn (decf *window-string-count*)
- (window-printat-xy w " "
- (+ *window-input-string-x*
- (* *window-string-count*
- *window-input-string-charwidth*))
- *window-input-string-y*)
- (window-draw-carat w)))
- (if (< *window-string-count* *window-string-max*)
- (progn (setf (char *window-string* *window-string-count*)
- char)
- (incf *window-string-count*)
- (setf (char tmpstring 0) char)
- (window-printat-xy w tmpstring
- (+ *window-input-string-x*
- (* (1- *window-string-count*)
- *window-input-string-charwidth*))
- *window-input-string-y*)
- (window-draw-carat w))))
- nil) ) )) ; return nil to continue input
+; 25 Jul 96; 31 July 96; 14 Aug 96
+(gldefun editmenu-draw ((m editmenu))
+ (let (mw xzero yzero)
+ (init? m)
+ (mw = (menu-window m))
+ (open mw)
+ (clear m)
+ (xzero = (menu-x m 0))
+ (yzero = (menu-y m 0))
+ (if (boxflg m) (draw-box-xy mw xzero yzero
+ (picture-width m) (picture-height m) 1))
+ (display m 0 0 (not (numberp scrollval))) ))
-; 31 Dec 93
-(defun window-draw-carat (w)
- (let ((origx *window-input-string-x*) (y *window-input-string-y*) x)
- (setq x (+ origx (* *window-input-string-charwidth*
- *window-string-count*)))
+; 19 Jul 96; 22 Jul 96; 23 Jul 96; 25 Jul 96; 31 July 96; 01 Aug 96; 17 May 04
+; 18 Aug 04; 27 Jan 06
+; Display contents of edit area
+; Begin with the specified line and char number; one line only if only is T.
+(gldefun editmenu-display ((m editmenu) line char only)
+ (let (lines y maxwidth linewidth (w (menuw m)))
+ (setq lines (nthcdr line (text m)))
+ (setq y (line-y m (- line (scroll m))))
+ (setq maxwidth (truncate (- (picture-width m) 6) (font-width (menuw m))))
+ (while (and lines (>= y (menu-y m 4)))
+ (when (< char maxwidth)
+ (if (> char 0)
+ (printat-xy w (subseq (first lines) char
+ (min maxwidth (length (first lines))))
+ (menu-x m (+ 2 (* char (font-width (menuw m)))))
+ y)
+ (printat-xy w (if (<= (length (first lines)) maxwidth)
+ (first lines)
+ (subseq (first lines) 0 maxwidth))
+ (menu-x m 2) y)))
+ (setq linewidth (+ 2 (* (font-width (menuw m)) (length (first lines)))))
+ (window-erase-area-xy w (menu-x m linewidth)
+ (- y 2)
+ (- (picture-width m) (+ linewidth 2))
+ (font-height (menuw m)))
+ (y _- (font-height (menuw m)))
+ (if only (setq lines nil)
+ (progn (pop lines)
+ (if (and (null lines) (>= y (menu-y m 4)))
+ ; erase an extra line at the end
+ (window-erase-area-xy w (menu-x m 2)
+ (- y 2)
+ (- (picture-width m) 4)
+ (font-height (menuw m))) ) ))
+ (setq char 0) )
+ (force-output w) ))
+
+; 19 Jul 96; 22 Jul 96; 25 Jul 96; 31 Jul 96; 01 Aug 96
+; draw/erase carat at the specified position
+(gldefun editmenu-carat ((m editmenu))
+ (let ((w (menuw m)))
+ (draw-carat w (menu-x m (+ 2 (* (column m) (font-width (menuw m)))))
+ (- (line-y m (line m)) 2))
+ (force-output w) ))
+
+; 19 Jul 96; 25 Jul 96; 31 Jul 96; 01 Aug 96; 17 May 04
+; erase at the current position. onep = t to erase only one char
+(gldefun editmenu-erase ((m editmenu) onep)
+ (let ((w (menuw m)) xw)
+ (xw = (+ 2 (* (font-width w) (column m))))
+ (erase-area-xy w (menu-x m xw)
+ (- (line-y m (line m)) (cadr (string-extents w "Tg")))
+ (if onep (font-width w)
+ (- (picture-width m) xw))
+ (font-height w))
+ (force-output w) ))
+
+; 01 Aug 96
+; Calculate the y position of the current line
+(gldefun editmenu-line-y ((m editmenu) (line integer))
+ (menu-y m (- (picture-height m)
+ (+ -1 (* (font-height (menuw m))
+ (1+ (- line (scroll m))))))) )
+
+; 25 Jul 96; 30 Jul 96; 31 Jul 96; 01 Aug 96; 13 Aug 96; 24 Sep 96; 08 Jan 97
+; 17 May 04
+(gldefun editmenu-select ((m editmenu) &optional inside)
+ (let (mw codeval res xval yval)
+ (mw = (menuw m))
+ (if ~ (permanent m) (draw m))
+ (track-mouse mw
+ #'(lambda (x y code)
+ (setq *window-menu-code* code)
+ (if (or (> code 0)
+ (x < (parent-offset-x m))
+ (x > (+ (parent-offset-x m) (picture-width m)))
+ (y < (parent-offset-y m))
+ (y > (+ (parent-offset-y m) (picture-height m))))
+ (progn (codeval = code)
+ (xval = x)
+ (yval = y)) ))
+ t)
+; (if (and (not (permanent m)) (not (flat m)) (close (menu-window m)))) ; ??
+ (if (codeval > 0)
+ (editmenu-edit m codeval xval yval)) ))
+
+; 13 Aug 96; 15 Aug 96
+; begin active editing of an editmenu.
+; (code x y), if present, represent a mouse click in the window.
+(gldefun editmenu-edit ((m editmenu) &optional code x y)
+ (let ((mw (menuw m)))
+ (draw m)
+ (carat m)
+ (if code (editmenu-edit-fn mw nil code x y (list m)) )
+ (setq *window-editmenu-kill-strings* nil)
+ (window-get-chars mw #'editmenu-edit-fn (list m))
+ (text m) ))
+
+
+; 31 Dec 93; 18 Jul 96; 19 Jul 96; 22 Jul 96; 23 Jul 96; 25 Jul 96; 26 Jul 96
+; 30 Jul 96; 13 Aug 96; 14 Aug 96; 23 Dec 96; 17 May 04; 18 May 04
+; Process input characters and mouse clicks for editmenu eidting
+(gldefun editmenu-edit-fn ((w window) char (button integer) (buttonx integer)
+ (buttony integer) args)
+ (let (m\:editmenu inside done)
+ (m = (car args))
+ (carat m) ; erase carat
+ (if (and (numberp button)
+ (not (zerop button)))
+ (progn (inside = (editmenu-setxy m buttonx buttony))
+ (case button
+ (1 (if inside
+ (progn (carat m) nil) ; return nil to continue input
+ t)) ; quit on click outside the editing area
+ (2 (if inside
+ (progn (editmenu-yank m)
+ (carat m)
+ nil)) )))
+ (progn (if (< (char-code char) 32)
+ (case char of
+ (#\Return (if (numberp (scrollval m))
+ (editmenu-return m)
+ (done = t)) )
+ (#\Backspace (editmenu-backspace m))
+ (#\^D (editmenu-delete m))
+ (#\^N (if (numberp (scrollval m))
+ (editmenu-next m)))
+ (#\^P (editmenu-previous m))
+ (#\^F (editmenu-forward m))
+ (#\^B (editmenu-backward m))
+ (#\^A (editmenu-beginning m))
+ (#\^E (editmenu-end m))
+ (#\^K (editmenu-kill m))
+ (#\^Y (editmenu-yank m))
+ else nil)
+ (if (> (char-code char) 128)
+ (progn (setq char (code-char
+ (- (char-code char) 128)))
+ (case char of
+ (#\B (editmenu-meta-b m))
+ (#\F (editmenu-meta-f m))
+ else nil))
+ (editmenu-char m char)))
+ (carat m)
+ done) ))) ; return nil to continue input
+
+; 31 Jul 96; 15 Aug 96; 17 May 04
+; Set cursor location based on mouse click; returns T if inside menu region
+(gldefun editmenu-setxy ((m editmenu) (buttonx integer) (buttony integer))
+ (let (linecons okay)
+ (setq okay
+ (and (>= buttonx (parent-offset-x m))
+ (<= buttonx (+ (parent-offset-x m) (picture-width m)))
+ (>= buttony (parent-offset-y m))
+ (<= buttony (+ (parent-offset-y m) (picture-height m))) ))
+ (if okay
+ (progn ((line m) = (min (1- (length (text m)))
+ (+ (scroll m)
+ (truncate (- (menu-y m (- (picture-height m) 6))
+ buttony)
+ (font-height (menuw m))))))
+ (linecons = (nthcdr (line m) (text m)))
+ ((column m) = (min (length (car linecons))
+ (truncate (- buttonx (menu-x m 2))
+ (font-width (menuw m))))) ))
+ okay))
+
+; 19 Jul 96; 22 Jul 96; 25 Jul 96; 17 May 04
+; Process an ordinary input character
+(gldefun editmenu-char ((m editmenu) char)
+ (let ((linecons (nthcdr (line m) (text m))) )
+ (if (<= (length (car linecons)) (column m))
+ ((car linecons) = ; insert char at end of line
+ (concatenate 'string (car linecons) (string char)))
+ ((car linecons) = ; insert char in middle of line
+ (concatenate 'string
+ (subseq (car linecons) 0 (column m))
+ (string char)
+ (subseq (car linecons) (column m)))) )
+ (display m (line m) (column m) t)
+ ((column m) _+ 1) ))
+
+; 23 Dec 96
+; Get the current character in an editment
+(gldefun editmenu-current-char ((m editmenu))
+ (let ((linecons (nthcdr (line m) (text m))) )
+ (char (car linecons) (column m)) ))
+
+; 19 Jul 96; 22 Jul 96; 25 Jul 96; 17 May 04
+; Process a Return character
+(gldefun editmenu-return ((m editmenu))
+ (let ((linecons (nthcdr (line m) (text m))))
+ (if (<= (length (car linecons)) (column m))
+ ((cdr linecons) = (cons "" (cdr linecons))) ; end of line
+ (progn ((cdr linecons) = (cons (subseq (car linecons) (column m))
+ (cdr linecons)))
+ ((car linecons) = (subseq (car linecons) 0 (column m)))))
+ (display m (line m) 0 nil)
+ ((line m) _+ 1)
+ ((column m) = 0) ))
+
+; 19 Jul 96; 22 Jul 96; 25 Jul 96; 30 Jul 96; 31 Jul 96; 17 May 04
+; Process a backspace
+(gldefun editmenu-backspace ((m editmenu))
+ (let (tmp linedel (linecons (nthcdr (line m) (text m))))
+ (if (> (column m) 0)
+ (progn ((column m) _- 1) ; middle/end of line
+ ((car linecons) =
+ (concatenate 'string
+ (subseq (car linecons) 0 (column m))
+ (subseq (car linecons)
+ (1+ (column m))))))
+ (if (> (line m) 0)
+ (progn ((line m) _- 1)
+ (linedel = t)
+ (linecons = (nthcdr (line m) (text m)))
+ ((column m) = (length (car linecons)))
+ (tmp = (concatenate 'string (car linecons)
+ (cadr linecons)))
+ ((cdr linecons) = (cddr linecons))
+ ((car linecons) = tmp) ) ))
+ (display m (line m) (column m) (not linedel)) ))
+
+; 23 Jul 96; 25 Jul 96
+; Move cursor to end of line: C-E
+(gldefun editmenu-end ((m editmenu))
+ (let ((linecons (nthcdr (line m) (text m))) )
+ ((column m) = (length (car linecons))) ))
+
+; 23 Jul 96; 25 Jul 96
+; Move cursor to beginning of line: C-A
+(gldefun editmenu-beginning ((m editmenu))
+ ((column m) = 0))
+
+; 22 Jul 96; 25 Jul 96; 14 Aug 96; 17 May 04
+; Move cursor forward: C-F
+(gldefun editmenu-forward ((m editmenu))
+ (let ((linecons (nthcdr (line m) (text m))))
+ (if (< (column m) (length (car linecons)))
+ ((column m) _+ 1)
+ (if (numberp (scrollval m))
+ (progn ((line m) _+ 1)
+ (if (null (cdr linecons))
+ ((cdr linecons) = (list "")))
+ ((column m) = 0)) ) )))
+
+; 23 Dec 96; 17 May 04
+; Move cursor forward over a word: M-F
+(gldefun editmenu-meta-f ((m editmenu))
+ (let (found done)
+ (while (and (or (< (line m) (1- (length (text m))))
+ (< (column m) (length (nth (line m) (text m)))))
+ (not found))
+ (if (editmenu-alphanumbericp (editmenu-current-char m))
+ (found = t)
+ (editmenu-forward m) ) )
+ (if found
+ (while (and (or (< (line m) (1- (length (text m))))
+ (< (column m) (length (nth (line m) (text m)))))
+ (not done))
+ (if (editmenu-alphanumbericp (editmenu-current-char m))
+ (editmenu-forward m)
+ (done = t) )) ) ))
+
+; 23 Dec 96
+; alphanumbericp not defined in gcl
+(defun editmenu-alphanumbericp (x)
+ (or (alpha-char-p x) (not (null (digit-char-p x)))) )
+
+; 22 Jul 96; 25 Jul 96
+; Move cursor to next line: C-N
+(gldefun editmenu-next ((m editmenu))
+ (let ((linecons (nthcdr (line m) (text m))))
+ ((line m)_+ 1)
+ (if (null (cdr linecons))
+ ((cdr linecons) = (list "")))
+ (setq linecons (cdr linecons))
+ ((column m) = (min (column m) (length (car linecons)))) ))
+
+; 22 Jul 96; 23 Jul 96; 25 Jul 96; 30 Jul 96; 17 May 04
+; Move cursor backward: C-B
+(gldefun editmenu-backward ((m editmenu))
+ (if (> (column m) 0)
+ ((column m) _- 1)
+ (if (> (line m) 0)
+ (progn ((line m) _- 1)
+ ((column m) = (length (nth (line m) (text m)))) ) ) ))
+
+; 23 Dec 96; 17 May 04
+; Move cursor backward over a word: M-B
+(gldefun editmenu-meta-b ((m editmenu))
+ (let (found done)
+ (while (and (or (> (column m) 0) (> (line m) 0))
+ (not found))
+ (editmenu-backward m)
+ (if (editmenu-alphanumbericp (editmenu-current-char m))
+ (found = t)))
+ (if found
+ (progn (while (and (or (> (column m) 0) (> (line m) 0))
+ (not done))
+ (if (editmenu-alphanumbericp (editmenu-current-char m))
+ (editmenu-backward m)
+ (done = t) ))
+ (unless (editmenu-alphanumbericp (editmenu-current-char m))
+ (editmenu-forward m)) ) )))
+
+; 22 Jul 96; 23 Jul 96; 25 Jul 96; 17 May 04
+; Move cursor to previous line: C-P
+(gldefun editmenu-previous ((m editmenu))
+ (if (> (line m) 0)
+ (progn ((line m) _- 1)
+ ((column m) = (min (column m)
+ (length (nth (line m) (text m))))))))
+
+; 23 Jul 96; 25 Jul 96
+; Delete character ahead of cursor: C-D
+(gldefun editmenu-delete ((m editmenu))
+ (editmenu-forward m)
+ (editmenu-backspace m))
+
+(defvar *window-editmenu-kill-strings* nil)
+
+; 31 Jul 96; 17 May 04
+(gldefun editmenu-kill ((m editmenu))
+ (let ((linecons (nthcdr (line m) (text m))))
+ (if ((column m) < (length (car linecons)))
+ (progn (setq *window-editmenu-kill-strings*
+ (list (subseq (car linecons) (column m))))
+ ((car linecons) = (subseq (car linecons) 0 (column m)))
+ (display m (line m) (column m) t))
+ (editmenu-delete m) ) ))
+
+; 31 Jul 96; 01 Aug 96; 17 May 04
+(gldefun editmenu-yank ((m editmenu))
+ (let ((linecons (nthcdr (line m) (text m))) (col (column m)))
+ (when *window-editmenu-kill-strings*
+ (if (<= (length (car linecons)) (column m))
+ (progn ((car linecons) = ; insert at end of line
+ (concatenate 'string (car linecons)
+ (car *window-editmenu-kill-strings*)))
+ ((column m) = (length (car linecons))))
+ (progn ((car linecons) = ; insert in middle of line
+ (concatenate 'string
+ (subseq (car linecons) 0 col)
+ (car *window-editmenu-kill-strings*)
+ (subseq (car linecons) col)))
+ ((column m) _+ (length (car *window-editmenu-kill-strings*))) ))
+ (display m (line m) col t) ) ))
+
+; 31 Dec 93; 19 Jul 96
+; Draw a carat symbol /\ centered at x and with top at y.
+(defun window-draw-carat (w x y)
(window-set-xor w)
- (window-draw-line-xy w (- x 2) (- y 2) (+ x 3) y)
- (window-draw-line-xy w (+ x 3) y (+ x 8) (- y 2))
+ (window-draw-line-xy w (- x 5) (- y 2) x y)
+ (window-draw-line-xy w x y (+ x 5) (- y 2))
(window-unset w)
- (window-force-output w) ))
+ (window-force-output w) )
; 31 Dec 93; 04 Oct 94; 15 Nov 94; 16 Nov 94; 14 Mar 95
; Initialize mapping between keys and ASCII.
Index: xgcl-2/gcl_dwtest.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_dwtest.lsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xgcl-2/gcl_dwtest.lsp 5 Jan 2006 19:00:57 -0000 1.2
+++ xgcl-2/gcl_dwtest.lsp 20 Jun 2006 22:53:17 -0000 1.3
@@ -1,8 +1,8 @@
-; dwtest.lsp Gordon S. Novak Jr. 20 Oct 94
+; dwtest.lsp Gordon S. Novak Jr. 10 Jan 96
; Some examples for testing the window interface in dwindow.lsp / dwtrans.lsp
-; Copyright (c) 1994 Gordon S. Novak Jr. and The University of Texas at Austin.
+; Copyright (c) 1996 Gordon S. Novak Jr. and The University of Texas at Austin.
; See the file gnu.license .
@@ -23,62 +23,66 @@
; Written by: Gordon S. Novak Jr., Department of Computer Sciences,
; University of Texas at Austin 78712. address@hidden
+(use-package :xlib)
+(defmacro while (test &rest forms)
+ `(loop (unless ,test (return)) ,@forms) )
-(defvar myw) ; my window
+(defvar *myw*) ; my window
+(defvar myw)
; Make a window to play in.
(defun wtesta ()
- (setq myw (window-create 300 300 "test window")) )
+ (setq myw (setq *myw* (window-create 300 300 "test window"))) )
; 15 Aug 91; 12 Sep 91; 05 Oct 94; 06 Oct 94
; Draw some basic things in the window
(defun wtestb ()
- (window-clear myw)
- (window-draw-box-xy myw 50 50 50 20 1)
- (window-printat myw "howdy" '(58 55))
- (window-draw-line myw '(100 70) '(200 170))
- (window-draw-arrow-xy myw 200 170 165 205)
- (window-draw-circle-xy myw 200 170 50 2)
- (window-draw-ellipse-xy myw 100 170 40 20 1)
- (window-printat-xy myw "ellipse" 70 165)
- (window-draw-arc-xy myw 100 250 20 20 0 90 1)
- (window-draw-arc-xy myw 100 250 20 20 0 -90 1)
- (window-printat-xy myw "arcs" 80 244)
- (window-printat-xy myw "invert" 54 200)
- (window-invert-area-xy myw 50 160 60 60)
- (window-copy-area-xy myw 40 150 200 50 60 40)
- (window-printat-xy myw "copy" 210 100)
- (window-set-color-rgb myw 65535 0 0) ; red foreground
- (window-printat-xy myw "Red" 20 20)
- (window-draw-rcbox-xy myw 15 15 32 20 5)
- (window-set-color-rgb myw 0 0 65535 t) ; blue background
- (window-set-color-rgb myw 0 65535 0) ; green foreground
- (window-printat-xy myw "Green" 120 20)
- (window-set-color-rgb myw 0 65535 0 t) ; green background
- (window-set-color-rgb myw 0 0 65535) ; blue foreground
- (window-printat-xy myw "Blue" 220 20)
- (window-reset-color myw)
- (window-force-output myw) )
+ (window-clear *myw*)
+ (window-draw-box-xy *myw* 50 50 50 20 1)
+ (window-printat *myw* "howdy" '(58 55))
+ (window-draw-line *myw* '(100 70) '(200 170))
+ (window-draw-arrow-xy *myw* 200 170 165 205)
+ (window-draw-circle-xy *myw* 200 170 50 2)
+ (window-draw-ellipse-xy *myw* 100 170 40 20 1)
+ (window-printat-xy *myw* "ellipse" 70 165)
+ (window-draw-arc-xy *myw* 100 250 20 20 0 90 1)
+ (window-draw-arc-xy *myw* 100 250 20 20 0 -90 1)
+ (window-printat-xy *myw* "arcs" 80 244)
+ (window-printat-xy *myw* "invert" 54 200)
+ (window-invert-area-xy *myw* 50 160 60 60)
+ (window-copy-area-xy *myw* 40 150 200 50 60 40)
+ (window-printat-xy *myw* "copy" 210 100)
+ (window-set-color-rgb *myw* 65535 0 0) ; red foreground
+ (window-printat-xy *myw* "Red" 20 20)
+ (window-draw-rcbox-xy *myw* 15 15 32 20 5)
+ (window-set-color-rgb *myw* 0 0 65535 t) ; blue background
+ (window-set-color-rgb *myw* 0 65535 0) ; green foreground
+ (window-printat-xy *myw* "Green" 120 20)
+ (window-set-color-rgb *myw* 0 65535 0 t) ; green background
+ (window-set-color-rgb *myw* 0 0 65535) ; blue foreground
+ (window-printat-xy *myw* "Blue" 220 20)
+ (window-reset-color *myw*)
+ (window-force-output *myw*) )
-; 15 Aug 91; 19 Aug 91; 03 Sep 91
+; 15 Aug 91; 19 Aug 91; 03 Sep 91; 21 Apr 95
; Illustrate mouse interaction:
-; click in window myw (2 times for line, 3 times for region).
+; click in window *myw* (2 times for line, 3 times for region).
(defun wtestc ()
- (prog (command mymenu result start)
+ (let (mymenu result start done)
(setq mymenu (menu-create '(quit point line box region) "Choose One:"))
- lp (setq command (menu-select mymenu))
- (setq result (case command
- (quit (menu-destroy mymenu)
- (return))
- (point (window-get-point myw))
- (line (setq start (window-get-point myw))
+ (while (not done)
+ (setq result
+ (case (menu-select mymenu)
+ (quit (setq done t))
+ (point (window-get-point *myw*))
+ (line (setq start (window-get-point *myw*))
(list start
- (window-get-line-position myw (car start)
+ (window-get-line-position *myw* (car start)
(cadr start))))
- (box (window-get-box-position myw 40 20))
- (region (window-get-region myw)) ))
- (format t "Result: ~A~%" result)
- (go lp) ))
+ (box (window-get-box-position *myw* 40 20))
+ (region (window-get-region *myw*)) ))
+ (format t "Result: ~A~%" result) )
+ (menu-destroy mymenu) ))
; 09 Sep 91
; Illustrate icons in menus
@@ -122,12 +126,12 @@
(defvar mypm nil)
; 10 Sep 91; 11 Sep 91; 12 Sep 91; 14 Sep 91; 17 Sep 91
-; A picmenu that is "flat" within another window, in this case myw.
+; A picmenu that is "flat" within another window, in this case *myw*.
; Must do (wtesta) first.
(defun wtestf ()
(or mypms (mypms-init))
(or mypm (setq mypm (picmenu-create-from-spec mypms "Points on Square"
- myw 50 50 nil t t)))
+ *myw* 50 50 nil t t)))
(picmenu-select mypm))
(defun wteste-draw-square (w x y)
@@ -135,49 +139,49 @@
(defvar mym nil)
; 10 Sep 91; 17 Sep 91
-; A menu that is "flat" within another window, in this case myw.
+; A menu that is "flat" within another window, in this case *myw*.
; Must do (wtesta) first.
(defun wtestg ()
- (or mym (setq mym (menu-create '(red white blue) "Flag" myw 50 50 nil t)))
+ (or mym (setq mym (menu-create '(red white blue) "Flag" *myw* 50 50 nil t)))
(menu-select mym))
; 09 Oct 91
; Demonstrate arrows. Optional arg is line width.
(defun wtesth ( &optional (lw 1))
- (window-clear myw)
- (dotimes (i 5) (window-draw-arrow-xy myw 100 100 (+ 40 (* i 30)) 160 lw))
- (dotimes (i 5) (window-draw-arrow-xy myw 100 100 (+ 40 (* i 30)) 40 lw))
- (dotimes (i 5) (window-draw-arrow-xy myw 100 100 40 (+ 40 (* i 30)) lw))
- (dotimes (i 5) (window-draw-arrow-xy myw 100 100 160 (+ 40 (* i 30)) lw))
- (dotimes (i 5) (window-draw-arrow-xy myw 200 (+ 40 (* i 30))
+ (window-clear *myw*)
+ (dotimes (i 5) (window-draw-arrow-xy *myw* 100 100 (+ 40 (* i 30)) 160 lw))
+ (dotimes (i 5) (window-draw-arrow-xy *myw* 100 100 (+ 40 (* i 30)) 40 lw))
+ (dotimes (i 5) (window-draw-arrow-xy *myw* 100 100 40 (+ 40 (* i 30)) lw))
+ (dotimes (i 5) (window-draw-arrow-xy *myw* 100 100 160 (+ 40 (* i 30)) lw))
+ (dotimes (i 5) (window-draw-arrow-xy *myw* 200 (+ 40 (* i 30))
240 (+ 40 (* i 30))
(1+ i) ))
- (window-force-output myw) )
+ (window-force-output *myw*) )
; 04 Jan 94
; Redo some of the arrows from wtesth in color
(defun wtesti ()
- (window-set-color-rgb myw 65535 0 0)
- (window-draw-arrow-xy myw 200 70 240 70 2)
- (window-set-color-rgb myw 0 65535 0)
- (window-draw-arrow-xy myw 200 100 240 100 3)
- (window-set-color-rgb myw 0 0 65535)
- (window-draw-arrow-xy myw 200 130 240 130 4)
- (window-reset-color myw)
- (window-force-output myw) )
+ (window-set-color-rgb *myw* 65535 0 0)
+ (window-draw-arrow-xy *myw* 200 70 240 70 2)
+ (window-set-color-rgb *myw* 0 65535 0)
+ (window-draw-arrow-xy *myw* 200 100 240 100 3)
+ (window-set-color-rgb *myw* 0 0 65535)
+ (window-draw-arrow-xy *myw* 200 130 240 130 4)
+ (window-reset-color *myw*)
+ (window-force-output *myw*) )
; 04 Jan 94
; Get text from a window. Move mouse pointer into test window.
; Add characters and/or backspace, Return.
; Note: it might be necessary to change the keyboard mapping, using
-; (window-init-keyboard-mapping myw) and (window-print-keyboard-mapping)
-(defun wtestj () (window-input-string myw "Foo" 50 200 200))
+; (window-init-keyboard-mapping *myw*) and (window-print-keyboard-mapping)
+(defun wtestj () (window-input-string *myw* "Foo" 50 200 200))
; 04 Jan 94
; Change foreground and background colors and input a string
(defun wtestk ()
- (window-set-color-rgb myw 0 65535 0) ; green foreground
- (window-set-color-rgb myw 0 0 65535 t) ; blue background
- (prog1 (window-input-string myw "Foo" 50 200 200)
- (window-reset-color myw)
- (window-force-output myw) ) )
+ (window-set-color-rgb *myw* 0 65535 0) ; green foreground
+ (window-set-color-rgb *myw* 0 0 65535 t) ; blue background
+ (prog1 (window-input-string *myw* "Foo" 50 200 200)
+ (window-reset-color *myw*)
+ (window-force-output *myw*) ) )
Index: xgcl-2/gcl_dwtrans.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_dwtrans.lsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xgcl-2/gcl_dwtrans.lsp 5 Jan 2006 19:00:57 -0000 1.2
+++ xgcl-2/gcl_dwtrans.lsp 20 Jun 2006 22:53:17 -0000 1.3
@@ -1,14 +1,14 @@
-; 15 Mar 1995 15:50:07
+; 26 Jan 2006 15:17:04 CST ; 27 Jan 06
; dwtrans.lsp -- translation of dwindow.lsp
-; Copyright (c) 1995 Gordon S. Novak Jr. and The University of Texas at Austin.
+; Copyright (c) 2006 Gordon S. Novak Jr. and The University of Texas at Austin.
; See the files gnu.license and dec.copyright .
; This program is free software; you can redistribute it and/or modify
; it under the terms of the GNU General Public License as published by
-; the Free Software Foundation; either version 1, or (at your option)
-; any later version.
+; the Free Software Foundation; either version 2 of the License, or
+; (at your option) any later version.
; This program is distributed in the hope that it will be useful,
; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,7 +17,7 @@
; You should have received a copy of the GNU General Public License
; along with this program; if not, write to the Free Software
-; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
; Some of the files that interface to the Xlib are adapted from DEC/MIT files.
; See the file dec.copyright for details.
@@ -30,6 +30,158 @@
(defmacro while (test &rest forms) `(loop (unless ,test (return)) ,@forms) )
+; dwexports.lsp Gordon S. Novak Jr. 24 Jan 2006
+
+(setf (get 'xlib::int-pos 'user::glfnresulttype) 'lisp::integer)
+
+; exported symbols: from dwimports.lsp
+(dolist (x '( menu stringify window picmenu textmenu editmenu barmenu
+ display-size
+ window-get-mouse-position window-create window-set-font
+ window-font-info window-gcontext window-parent
+ window-drawable-height window-drawable-width window-label
+ window-font window-foreground window-set-foreground
+ window-background window-set-background window-wfunction
+ window-get-geometry window-get-geometry-b window-sync
+ window-screen-height window-geometry window-size
+ window-left window-top-neg-y window-reset-geometry
+ window-force-output window-query-pointer window-set-xor
+ window-unset window-reset window-set-erase
+ window-set-copy window-set-invert window-set-line-width
+ window-set-line-attr window-std-line-attr window-draw-line
+ window-draw-line-xy window-draw-arrowhead-xy
+ window-draw-arrow-xy window-draw-arrow2-xy window-draw-box
+ window-draw-box-xy window-xor-box-xy window-draw-box-corners
+ window-draw-rcbox-xy window-draw-arc-xy
+ window-draw-circle-xy window-draw-circle window-erase-area
+ window-erase-area-xy window-erase-box-xy
+ window-draw-ellipse-xy window-copy-area-xy window-invertarea
+ window-invert-area window-invert-area-xy
+ window-prettyprintat window-prettyprintat-xy window-printat
+ window-printat-xy window-string-width window-string-height
+ window-string-extents window-font-string-width
+ window-yposition window-centeroffset dowindowcom
+ window-menu window-close window-unmap window-open
+ window-map window-destroy window-destroy-selected-window
+ window-clear window-moveto-xy window-paint
+ window-move window-draw-border window-track-mouse
+ window-wait-exposure window-wait-unmap
+ window-init-mouse-poll window-poll-mouse menu-init
+ menu-calculate-size menu-adjust-offset menu-draw
+ menu-item-value menu-find-item-width menu-find-item-height
+ menu-clear menu-display-item menu-choose menu-box-item
+ menu-unbox-item menu-item-position menu-select
+ menu-select! menu-select-b menu-destroy
+ menu-create menu-offset menu-size menu-moveto-xy
+ menu-reposition picmenu-create picmenu-create-spec
+ picmenu-create-from-spec picmenu-calculate-size picmenu-init
+ picmenu-draw picmenu-draw-button picmenu-delete-named-button
+ picmenu-select picmenu-box-item picmenu-unbox-item
+ picmenu-destroy picmenu-button-containsxy?
+ picmenu-item-position barmenu-create
+ barmenu-calculate-size barmenu-init barmenu-draw
+ barmenu-select barmenu-update-value window-get-point
+ window-get-click window-get-line-position
+ window-get-latex-position window-get-box-position
+ window-get-icon-position window-get-region
+ window-get-box-size window-track-mouse-in-region
+ window-adjust-box-side window-adj-box-xy window-get-circle
+ window-circle-radius window-draw-circle-pt
+ window-get-ellipse window-draw-ellipse-pt
+ window-draw-vector-pt window-get-vector-end
+ window-get-crosshairs window-draw-crosshairs-xy
+ window-get-cross window-draw-cross-xy window-draw-dot-xy
+ window-draw-latex-xy window-reset-color
+ window-set-color-rgb window-set-xcolor window-set-color
+ window-set-color window-free-color window-get-chars
+ window-process-char-event window-input-string
+ window-input-char-fn window-draw-carat window-init-keymap
+ window-set-cursor window-positive-y window-code-char
+ window-get-raw-char
+ window-print-line window-print-lines textmenu-create
+ textmenu-calculate-size textmenu-init textmenu-draw
+ textmenu-select textmenu-set-text textmenu
+ editmenu editmenu-create editmenu-calculate-size
+ editmenu-init editmenu-draw editmenu-display
+ window-edit
+ window-edit-display editmenu-carat editmenu-erase
+ window-edit-erase editmenu-select editmenu-edit-fn
+ window-edit-fn editmenu-setxy editmenu-char
+ editmenu-edit
+ *window-editmenu-kill-strings*
+*window-add-menu-title*
+*window-menu*
+*mouse-x*
+*mouse-y*
+*mouse-window*
+*window-fonts*
+*window-display*
+*window-screen*
+*root-window*
+*black-pixel*
+*white-pixel*
+*default-fg-color*
+*default-bg-color*
+*default-size-hints*
+*default-GC*
+*default-colormap*
+*window-event*
+*window-default-pos-x*
+*window-default-pos-y*
+*window-default-border*
+*window-default-font-name*
+*window-default-cursor*
+*window-save-foreground*
+*window-save-function*
+*window-attributes*
+*window-attr*
+*menu-title-pad*
+*root-return*
+*child-return*
+*root-x-return*
+*root-y-return*
+*win-x-return*
+*win-y-return*
+*mask-return*
+*x-return*
+*y-return*
+*width-return*
+*height-return*
+*depth-return*
+*border-width-return*
+*text-width-return*
+*direction-return*
+*ascent-return*
+*descent-return*
+*overall-return*
+*GC-Values*
+*window-xcolor*
+*window-menu-code*
+
+*window-keymap*
+*window-shiftkeymap*
+*window-keyinit*
+*window-meta*
+*window-ctrl*
+*window-shift*
+*window-string*
+*window-string-count*
+*window-string-max*
+*window-input-string-x*
+*window-input-string-y*
+*window-input-string-charwidth*
+
+*window-shift-keys*
+*window-control-keys*
+*window-meta-keys*
+*barmenu-update-value-cons*
+*picmenu-no-selection*
+*min-keycodes-return*
+*max-keycodes-return*
+*keycodes-return*
+ ))
+ (export x)) ; export the above symbols
+
(DEFVAR *WINDOW-ADD-MENU-TITLE* NIL)
(DEFVAR *WINDOW-MENU* NIL)
@@ -43,7 +195,10 @@
(DEFVAR *WINDOW-FONTS*
(LIST (LIST 'COURIER-BOLD-12
"*-*-courier-bold-r-*-*-12-*-*-*-*-*-iso8859-1")
- (LIST '8X10 "8x10") (LIST '9X15 "9x15")))
+ (LIST 'COURIER-MEDIUM-12
+ "*-*-courier-medium-r-*-*-12-*-*-*-*-*-iso8859-1")
+ (LIST '6X12 "6x12") (LIST '8X13 "8x13")
+ (LIST '9X15 "9x15")))
@@ -143,18 +298,6 @@
(DEFVAR *WINDOW-SHIFT*)
-(DEFVAR *WINDOW-STRING* (MAKE-STRING 100))
-
-(DEFVAR *WINDOW-STRING-COUNT*)
-
-(DEFVAR *WINDOW-STRING-MAX*)
-
-(DEFVAR *WINDOW-INPUT-STRING-X*)
-
-(DEFVAR *WINDOW-INPUT-STRING-Y*)
-
-(DEFVAR *WINDOW-INPUT-STRING-CHARWIDTH*)
-
(DEFVAR *WINDOW-SHIFT-KEYS* NIL)
(DEFVAR *WINDOW-CONTROL-KEYS* NIL)
@@ -212,6 +355,8 @@
(SETQ *MOUSE-Y* (INT-POS *ROOT-Y-RETURN* 0))
(SETQ *MOUSE-WINDOW* (INT-POS *CHILD-RETURN* 0)))
+
+
(DEFUN WINDOW-CREATE
(WIDTH HEIGHT &OPTIONAL STR PARENTW POS-X POS-Y FONT)
(LET (W PW FG-COLOR BG-COLOR)
@@ -256,15 +401,17 @@
W))
(DEFUN WINDOW-SET-FONT (W FONTSYMBOL)
- (LET (FONTSTRING FONT-INFO (DISPLAY *WINDOW-DISPLAY*))
+ (LET (FONTSTRING FONT-INFO)
(SETQ FONTSTRING
(OR (CADR (ASSOC FONTSYMBOL *WINDOW-FONTS*))
(STRINGIFY FONTSYMBOL)))
- (SETQ FONT-INFO (XLOADQUERYFONT DISPLAY (GET-C-STRING FONTSTRING)))
+ (SETQ FONT-INFO
+ (XLOADQUERYFONT *WINDOW-DISPLAY* (GET-C-STRING FONTSTRING)))
(IF (ZEROP FONT-INFO)
(FORMAT T "~%can't open font ~a ~a~%" FONTSYMBOL FONTSTRING)
(PROGN
- (XSETFONT DISPLAY (CADDR W) (XFONTSTRUCT-FID FONT-INFO))
+ (XSETFONT *WINDOW-DISPLAY* (CADDR W)
+ (XFONTSTRUCT-FID FONT-INFO))
(SETF (SEVENTH W) FONT-INFO)))))
(DEFUN WINDOW-FONT-INFO (FONTSYMBOL)
@@ -315,7 +462,7 @@
*WIDTH-RETURN* *HEIGHT-RETURN* *BORDER-WIDTH-RETURN*
*DEPTH-RETURN*))
-(DEFUN WINDOW-SYNC (W) (XSYNC *WINDOW-DISPLAY* 1))
+(DEFUN WINDOW-SYNC (W) (declare (ignore w)) (XSYNC *WINDOW-DISPLAY* 1))
(DEFUN WINDOW-SCREEN-HEIGHT ()
(WINDOW-GET-GEOMETRY-B *ROOT-WINDOW*)
@@ -350,7 +497,7 @@
(SETF (FIFTH W) (INT-POS *WIDTH-RETURN* 0))
(SETF (CADDDR W) (INT-POS *HEIGHT-RETURN* 0)))
-(DEFUN WINDOW-FORCE-OUTPUT (&OPTIONAL W) (XFLUSH *WINDOW-DISPLAY*))
+(DEFUN WINDOW-FORCE-OUTPUT (&OPTIONAL W) (declare (ignore w))(XFLUSH
*WINDOW-DISPLAY*))
(DEFUN WINDOW-QUERY-POINTER (W) (WINDOW-QUERY-POINTER-B (CADR W)))
@@ -544,8 +691,8 @@
(XSETLINEATTRIBUTES *WINDOW-DISPLAY* (CADDR W) (OR LINEWIDTH 1)
0 1 0))
(SETQ LW (OR LINEWIDTH 1))
- (SETQ LW2 (TRUNCATE LW 2))
- (SETQ LW2B (TRUNCATE (1+ LW) 2))
+ (SETQ LW2 (/ LW 2))
+ (SETQ LW2B (/ (1+ LW) 2))
(SETQ MINY (- OFFSETY LW2B))
(XDRAWLINE *WINDOW-DISPLAY* PW GC OFFSETX (- QQWHEIGHT MINY)
OFFSETX (- QQWHEIGHT (+ (+ MINY SIZEY) LW)))
@@ -676,9 +823,8 @@
(DEFUN WINDOW-ERASE-BOX-XY
(W XOFF YOFF XSIZE YSIZE &OPTIONAL LINEWIDTH)
- (XCLEARAREA *WINDOW-DISPLAY* (CADR W)
- (- XOFF (TRUNCATE (OR LINEWIDTH 1) 2))
- (- (CADDDR W) (+ (+ YOFF YSIZE) (TRUNCATE (OR LINEWIDTH 1) 2)))
+ (XCLEARAREA *WINDOW-DISPLAY* (CADR W) (- XOFF (/ (OR LINEWIDTH 1) 2))
+ (- (CADDDR W) (+ (+ YOFF YSIZE) (/ (OR LINEWIDTH 1) 2)))
(+ XSIZE (OR LINEWIDTH 1)) (+ YSIZE (OR LINEWIDTH 1)) 0))
(DEFUN WINDOW-DRAW-ELLIPSE-XY (W X Y RX RY &OPTIONAL LW)
@@ -758,6 +904,26 @@
(XDRAWIMAGESTRING *WINDOW-DISPLAY* (CADR W) (CADDR W) X
(- (CADDDR W) Y) (GET-C-STRING SSTR) (LENGTH SSTR))))
+(DEFUN WINDOW-PRINT-LINE (W STR X Y &OPTIONAL DELTAY)
+ (LET ((N 0) END STRB DONE)
+ (WHILE (NOT DONE)
+ (SETQ END (POSITION #\Newline STR :TEST #'CHAR= :START N))
+ (SETQ STRB (SUBSEQ STR N END))
+ (LET ((SSTR (STRINGIFY STRB)))
+ (XDRAWIMAGESTRING *WINDOW-DISPLAY* (CADR W) (CADDR W) X
+ (- (CADDDR W) Y) (GET-C-STRING SSTR) (LENGTH SSTR)))
+ (IF (NUMBERP END) (SETQ N (1+ END)) (SETQ DONE T))
+ (DECF Y (OR DELTAY 16)) (IF (MINUSP Y) (SETQ DONE T)))
+ (XFLUSH *WINDOW-DISPLAY*)))
+
+(DEFUN WINDOW-PRINT-LINES (W LINES X Y &OPTIONAL DELTAY)
+ (DOLIST (STR LINES)
+ (WHEN (PLUSP Y)
+ (LET ((SSTR (STRINGIFY STR)))
+ (XDRAWIMAGESTRING *WINDOW-DISPLAY* (CADR W) (CADDR W) X
+ (- (CADDDR W) Y) (GET-C-STRING SSTR) (LENGTH SSTR)))
+ (DECF Y (OR DELTAY 16)))))
+
(DEFUN WINDOW-STRING-WIDTH (W S)
(LET ((SSTR (STRINGIFY S)))
(XTEXTWIDTH (SEVENTH W) (GET-C-STRING SSTR) (LENGTH SSTR))))
@@ -769,6 +935,13 @@
*OVERALL-RETURN*)
(LIST (INT-POS *ASCENT-RETURN* 0) (INT-POS *DESCENT-RETURN* 0))))
+(DEFUN WINDOW-STRING-HEIGHT (W S)
+ (LET ((SSTR (STRINGIFY S)))
+ (XTEXTEXTENTS (SEVENTH W) (GET-C-STRING SSTR) (LENGTH SSTR)
+ *DIRECTION-RETURN* *ASCENT-RETURN* *DESCENT-RETURN*
+ *OVERALL-RETURN*)
+ (+ (INT-POS *ASCENT-RETURN* 0) (INT-POS *DESCENT-RETURN* 0))))
+
(DEFUN WINDOW-FONT-STRING-WIDTH (FONT S)
(LET ((SSTR (STRINGIFY S)))
(XTEXTWIDTH FONT (GET-C-STRING SSTR) (LENGTH SSTR))))
@@ -957,7 +1130,7 @@
(DEFUN MENU-INIT (M)
(OR *WINDOW-DISPLAY* (WINDOW-XINIT))
(MENU-CALCULATE-SIZE M)
- (UNLESS (CADDR M)
+ (IF (NOT (CADDR M))
(SETF (CADR M)
(WINDOW-CREATE (SEVENTH M) (EIGHTH M) (OR (NINTH M) "")
(CADDDR M) (FIFTH M) (SIXTH M) (NTH 10 M)))))
@@ -988,7 +1161,7 @@
(LET (XBASE YBASE WBASE HBASE XOFF YOFF WGM WIDTH HEIGHT)
(SETQ WIDTH (SEVENTH M))
(SETQ HEIGHT (EIGHTH M))
- (UNLESS (CADDDR M)
+ (WHEN (NOT (CADDDR M))
(WINDOW-GET-MOUSE-POSITION)
(SETQ WGM T)
(SETF (CADDDR M) *ROOT-WINDOW*))
@@ -1000,9 +1173,8 @@
(IF (OR (NOT (FIFTH M)) (ZEROP (FIFTH M)))
(PROGN
(OR WGM (WINDOW-GET-MOUSE-POSITION))
- (SETQ XOFF (+ -4 (- (- *MOUSE-X* XBASE) (TRUNCATE WIDTH 2))))
- (SETQ YOFF
- (- (- HBASE (- *MOUSE-Y* YBASE)) (TRUNCATE HEIGHT 2))))
+ (SETQ XOFF (+ -4 (- (- *MOUSE-X* XBASE) (/ WIDTH 2))))
+ (SETQ YOFF (- (- HBASE (- *MOUSE-Y* YBASE)) (/ HEIGHT 2))))
(PROGN (SETQ XOFF (FIFTH M)) (SETQ YOFF (SIXTH M))))
(SETF (FIFTH M) (MAX 0 (MIN XOFF (- WBASE WIDTH))))
(SETF (SIXTH M) (MAX 0 (MIN YOFF (- HBASE HEIGHT))))))
@@ -1028,7 +1200,6 @@
(XDRAWIMAGESTRING *WINDOW-DISPLAY* (CADR MW) (CADDR MW)
(+ 3 XZERO) (- (CADDDR MW) BOTTOM) (GET-C-STRING SSTR)
(LENGTH SSTR)))
- (LET ((GLVAR1420 (NTH 12 M)))
(LET ((GC (CADDR MW)))
(SETQ *WINDOW-SAVE-FUNCTION*
(PROGN
@@ -1048,17 +1219,17 @@
*GC-VALUES*)
(XGCVALUES-BACKGROUND *GC-VALUES*)))))
(XFILLRECTANGLE *WINDOW-DISPLAY* (CADR MW) (CADDR MW) XZERO
- (- (CADDDR MW) (1- (+ (+ -2 BOTTOM) GLVAR1420)))
- (1+ (SEVENTH M)) GLVAR1420)
+ (- (CADDDR MW) (1- (+ (+ -2 BOTTOM) (NTH 12 M))))
+ (1+ (SEVENTH M)) (NTH 12 M))
(LET ((GC (CADDR MW)))
(XSETFUNCTION *WINDOW-DISPLAY* GC *WINDOW-SAVE-FUNCTION*)
- (XSETFOREGROUND *WINDOW-DISPLAY* GC *WINDOW-SAVE-FOREGROUND*))))
+ (XSETFOREGROUND *WINDOW-DISPLAY* GC *WINDOW-SAVE-FOREGROUND*)))
(DOLIST (ITEM (NTH 13 M))
(DECF BOTTOM (NTH 12 M))
(MENU-DISPLAY-ITEM M ITEM (+ 3 XZERO) BOTTOM))
(XFLUSH *WINDOW-DISPLAY*)))
-(DEFUN MENU-ITEM-VALUE (SELF ITEM) (IF (CONSP ITEM) (CDR ITEM) ITEM))
+(DEFUN MENU-ITEM-VALUE (SELF ITEM) (declare (ignore self))(IF (CONSP ITEM)
(CDR ITEM) ITEM))
(DEFUN MENU-FIND-ITEM-WIDTH (SELF ITEM)
(LET (TMP)
@@ -1071,6 +1242,7 @@
(STRINGIFY (IF (CONSP ITEM) (CAR ITEM) ITEM))))))
(DEFUN MENU-FIND-ITEM-HEIGHT (SELF ITEM)
+ (declare (ignore self))
(LET (TMP)
(IF (AND (CONSP ITEM) (SYMBOLP (CAR ITEM))
(SETQ TMP (GET (CAR ITEM) 'DISPLAY-SIZE)))
@@ -1078,12 +1250,12 @@
(DEFUN MENU-CLEAR (M)
(IF (CADDR M)
- (LET ((GLVAR1421 (CADR M)) (GLVAR1425 (+ 3 (EIGHTH M))))
- (XCLEARAREA *WINDOW-DISPLAY* (CADR GLVAR1421)
+ (LET ((GLVAR96260 (+ 3 (EIGHTH M))))
+ (XCLEARAREA *WINDOW-DISPLAY* (CADADR M)
(1- (IF (CADDR M) (FIFTH M) 0))
- (- (CADDDR GLVAR1421)
- (1- (+ (1- (IF (CADDR M) (SIXTH M) 0)) GLVAR1425)))
- (+ 3 (SEVENTH M)) GLVAR1425 0))
+ (- (CADDDR (CADR M))
+ (1- (+ (1- (IF (CADDR M) (SIXTH M) 0)) GLVAR96260)))
+ (+ 3 (SEVENTH M)) GLVAR96260 0))
(PROGN
(XCLEARWINDOW *WINDOW-DISPLAY* (CADADR M))
(XFLUSH *WINDOW-DISPLAY*))))
@@ -1091,18 +1263,18 @@
(DEFUN MENU-DISPLAY-ITEM (SELF ITEM X Y)
(LET ((MW (CADR SELF)))
(IF (CONSP ITEM)
- (COND
- ((AND (SYMBOLP (CAR ITEM)) (FBOUNDP (CAR ITEM)))
- (FUNCALL (CAR ITEM) MW X Y))
- ((OR (STRINGP (CAR ITEM)) (SYMBOLP (CAR ITEM))
+ (IF (AND (SYMBOLP (CAR ITEM)) (FBOUNDP (CAR ITEM)))
+ (FUNCALL (CAR ITEM) MW X Y)
+ (IF (OR (STRINGP (CAR ITEM)) (SYMBOLP (CAR ITEM))
(NUMBERP (CAR ITEM)))
(LET ((SSTR (STRINGIFY (CAR ITEM))))
- (XDRAWIMAGESTRING *WINDOW-DISPLAY* (CADR MW) (CADDR MW) X
- (- (CADDDR MW) Y) (GET-C-STRING SSTR) (LENGTH SSTR))))
- (T (LET ((SSTR (STRINGIFY (STRINGIFY ITEM))))
- (XDRAWIMAGESTRING *WINDOW-DISPLAY* (CADR MW) (CADDR MW)
- X (- (CADDDR MW) Y) (GET-C-STRING SSTR)
- (LENGTH SSTR)))))
+ (XDRAWIMAGESTRING *WINDOW-DISPLAY* (CADR MW)
+ (CADDR MW) X (- (CADDDR MW) Y)
+ (GET-C-STRING SSTR) (LENGTH SSTR)))
+ (LET ((SSTR (STRINGIFY (STRINGIFY ITEM))))
+ (XDRAWIMAGESTRING *WINDOW-DISPLAY* (CADR MW)
+ (CADDR MW) X (- (CADDDR MW) Y)
+ (GET-C-STRING SSTR) (LENGTH SSTR)))))
(LET ((SSTR (STRINGIFY (STRINGIFY ITEM))))
(XDRAWIMAGESTRING *WINDOW-DISPLAY* (CADR MW) (CADDR MW) X
(- (CADDDR MW) Y) (GET-C-STRING SSTR) (LENGTH SSTR))))))
@@ -1149,8 +1321,7 @@
(SETQ VAL -777)))))
T)
(IF (/= VAL -777)
- (LET ((GLVAR1433 (NTH VAL ITMS)))
- (IF (CONSP GLVAR1433) (CDR GLVAR1433) GLVAR1433)))))
+ (IF (CONSP (NTH VAL ITMS)) (CDR (NTH VAL ITMS)) (NTH VAL ITMS)))))
(DEFUN MENU-BOX-ITEM (M ITEM)
(LET (ITEMH NITEMS (MW (OR (CADR M) (MENU-INIT M))))
@@ -1186,32 +1357,28 @@
(LET ((N 0) FOUND ITMS ITEM (XSIZE (NTH 11 M)) (YSIZE (NTH 12 M)))
(SETQ ITMS (NTH 13 M))
(SETQ FOUND (NULL ITEMNAME))
- (TAGBODY
- GLLABEL1437
- (WHEN (AND ITMS (NOT FOUND))
- (INCF N)
- (SETQ ITEM (POP ITMS))
+ (WHILE (AND ITMS (NOT FOUND)) (INCF N) (SETQ ITEM (POP ITMS))
(IF (OR (EQ ITEM ITEMNAME)
(AND (CONSP ITEM)
(OR (EQ ITEMNAME (CAR ITEM))
(AND (STRINGP (CAR ITEM))
- (STRING= (STRINGIFY ITEMNAME) (CAR ITEM)))
+ (STRING= (STRINGIFY ITEMNAME)
+ (CAR ITEM)))
(EQ (CDR ITEM) ITEMNAME)
(AND (CONSP (CDR ITEM))
(EQ (CADR ITEM) ITEMNAME)))))
- (SETQ FOUND T))
- (GO GLLABEL1437)))
+ (SETQ FOUND T)))
(IF FOUND
(LIST (+ (IF (CADDR M) (FIFTH M) 0)
(CASE PLACE
- ((CENTER TOP BOTTOM) (TRUNCATE XSIZE 2))
+ ((CENTER TOP BOTTOM) (/ XSIZE 2))
(LEFT -1)
(RIGHT (+ 2 XSIZE))
(T 0)))
(+ (+ (IF (CADDR M) (SIXTH M) 0)
(* (- (LENGTH (NTH 13 M)) N) YSIZE))
(CASE PLACE
- ((CENTER RIGHT LEFT) (TRUNCATE YSIZE 2))
+ ((CENTER RIGHT LEFT) (/ YSIZE 2))
(BOTTOM 0)
(TOP YSIZE)
(T 0)))))))
@@ -1225,22 +1392,21 @@
LP
(SETQ RES (MENU-CHOOSE M INSIDE))
(IF (AND FLG (NOT RES)) (GO LP))
- (UNLESS (TENTH M)
+ (IF (NOT (TENTH M))
(IF (CADDR M) (PROGN (MENU-CLEAR M) (XFLUSH *WINDOW-DISPLAY*))
- (LET ((GLVAR1440 (CADR M)))
- (XUNMAPWINDOW *WINDOW-DISPLAY* (CADR GLVAR1440))
+ (PROGN
+ (XUNMAPWINDOW *WINDOW-DISPLAY* (CADADR M))
(XFLUSH *WINDOW-DISPLAY*)
- (WINDOW-WAIT-UNMAP GLVAR1440))))
+ (WINDOW-WAIT-UNMAP (CADR M)))))
(RETURN RES)))
(DEFUN MENU-DESTROY (M)
- (UNLESS (CADDR M)
- (LET ((GLVAR1441 (CADR M)))
- (XDESTROYWINDOW *WINDOW-DISPLAY* (CADR GLVAR1441))
+ (WHEN (NOT (CADDR M))
+ (XDESTROYWINDOW *WINDOW-DISPLAY* (CADADR M))
(XFLUSH *WINDOW-DISPLAY*)
- (SETF (CADR GLVAR1441) NIL)
- (XFREEGC *WINDOW-DISPLAY* (CADDR GLVAR1441))
- (SETF (CADDR GLVAR1441) NIL))
+ (SETF (CADADR M) NIL)
+ (XFREEGC *WINDOW-DISPLAY* (CADDR (CADR M)))
+ (SETF (CADDR (CADR M)) NIL)
(SETF (CADR M) NIL)))
(DEFUN MENU (ITEMS &OPTIONAL TITLE)
@@ -1250,6 +1416,8 @@
(MENU-DESTROY M)
RES))
+
+
(DEFUN MENU-CREATE (ITEMS &OPTIONAL TITLE PARENTW X Y PERM FLAT FONT)
(LIST 'MENU (IF FLAT PARENTW) FLAT (CADR PARENTW) X Y 0 0
(IF TITLE (STRINGIFY TITLE) "") PERM FONT 0 0 ITEMS))
@@ -1259,8 +1427,12 @@
(DEFUN MENU-SIZE (M)
(IF (<= (SEVENTH M) 0)
- (IF (EQ (FIRST M) 'PICMENU) (PICMENU-CALCULATE-SIZE M)
- (MENU-CALCULATE-SIZE M)))
+ (CASE (FIRST M)
+ (PICMENU (PICMENU-CALCULATE-SIZE M))
+ (BARMENU (BARMENU-CALCULATE-SIZE M))
+ (TEXTMENU (TEXTMENU-CALCULATE-SIZE M))
+ (EDITMENU (EDITMENU-CALCULATE-SIZE M))
+ (T (MENU-CALCULATE-SIZE M))))
(LIST (SEVENTH M) (EIGHTH M)))
(DEFUN MENU-MOVETO-XY (M X Y)
@@ -1277,6 +1449,8 @@
(WINDOW-GET-BOX-POSITION (CADR M) (CAR SIZEV) (CADR SIZEV)))
(MENU-MOVETO-XY M (CAR POS) (CADR POS)))))
+
+
(DEFUN PICMENU-CREATE
(BUTTONS WIDTH HEIGHT DRAWFN &OPTIONAL TITLE DOTFLG PARENTW X Y
PERM FLAT FONT BOXFLG)
@@ -1284,11 +1458,15 @@
(PICMENU-CREATE-SPEC BUTTONS WIDTH HEIGHT DRAWFN DOTFLG FONT)
TITLE PARENTW X Y PERM FLAT BOXFLG))
+
+
(DEFUN PICMENU-CREATE-SPEC
(BUTTONS WIDTH HEIGHT DRAWFN &OPTIONAL DOTFLG FONT)
(LIST 'PICMENU-SPEC WIDTH HEIGHT BUTTONS DOTFLG DRAWFN
(OR FONT '9X15)))
+
+
(DEFUN PICMENU-CREATE-FROM-SPEC
(SPEC &OPTIONAL TITLE PARENTW X Y PERM FLAT BOXFLG)
(LIST 'PICMENU (IF FLAT PARENTW) FLAT (IF PARENTW (CADR PARENTW)) X Y
@@ -1310,7 +1488,7 @@
(DEFUN PICMENU-INIT (M)
(PICMENU-CALCULATE-SIZE M)
(MENU-ADJUST-OFFSET M)
- (UNLESS (CADDR M)
+ (IF (NOT (CADDR M))
(SETF (CADR M)
(WINDOW-CREATE (SEVENTH M) (EIGHTH M) (OR (NINTH M) "")
(CADDDR M) (FIFTH M) (SIXTH M) (SEVENTH (NTH 10 M))))))
@@ -1399,7 +1577,7 @@
(DEFUN PICMENU-SELECT (M &OPTIONAL INSIDE ANYCLICK)
(LET (MW CURRENT-BUTTON ITEM ITEMS VAL XZERO YZERO CODEVAL)
(SETQ MW (OR (CADR M) (PICMENU-INIT M)))
- (UNLESS (TENTH M) (PICMENU-DRAW M))
+ (IF (NOT (TENTH M)) (PICMENU-DRAW M))
(SETQ XZERO (IF (CADDR M) (FIFTH M) 0))
(SETQ YZERO (IF (CADDR M) (SIXTH M) 0))
(WINDOW-TRACK-MOUSE MW
@@ -1411,21 +1589,18 @@
(<= Y (EIGHTH M)))
(SETQ INSIDE T))
(IF CURRENT-BUTTON
- (UNLESS (PICMENU-BUTTON-CONTAINSXY? CURRENT-BUTTON X Y)
+ (WHEN (NOT (PICMENU-BUTTON-CONTAINSXY? CURRENT-BUTTON X
+ Y))
(PICMENU-UNBOX-ITEM M CURRENT-BUTTON)
(SETQ CURRENT-BUTTON NIL)))
- (UNLESS CURRENT-BUTTON
+ (WHEN (NOT CURRENT-BUTTON)
(SETQ ITEMS (CADDDR (NTH 10 M)))
- (TAGBODY
- GLLABEL1454
- (WHEN (AND (NOT CURRENT-BUTTON)
- (SETQ ITEM (POP ITEMS)))
+ (WHILE (AND (NOT CURRENT-BUTTON) (SETQ ITEM (POP ITEMS)))
(WHEN (AND (PICMENU-BUTTON-CONTAINSXY? ITEM X Y)
- (NOT (MEMBER (CAR ITEM) (NTH 12 M) :TEST
- #'EQUAL)))
+ (NOT (MEMBER (CAR ITEM) (NTH 12 M)
+ :TEST #'EQUAL)))
(PICMENU-BOX-ITEM M ITEM)
- (SETQ CURRENT-BUTTON ITEM))
- (GO GLLABEL1454))))
+ (SETQ CURRENT-BUTTON ITEM))))
(WHEN (OR (PLUSP CODE)
(AND INSIDE
(OR (MINUSP X) (> X (SEVENTH M)) (MINUSP Y)
@@ -1436,12 +1611,12 @@
(IF (AND (PLUSP CODE) CURRENT-BUTTON)
CURRENT-BUTTON *PICMENU-NO-SELECTION*))))
T)
- (UNLESS (TENTH M)
+ (IF (NOT (TENTH M))
(IF (CADDR M) (PROGN (MENU-CLEAR M) (XFLUSH *WINDOW-DISPLAY*))
- (LET ((GLVAR1456 (CADR M)))
- (XUNMAPWINDOW *WINDOW-DISPLAY* (CADR GLVAR1456))
+ (PROGN
+ (XUNMAPWINDOW *WINDOW-DISPLAY* (CADADR M))
(XFLUSH *WINDOW-DISPLAY*)
- (WINDOW-WAIT-UNMAP GLVAR1456))))
+ (WINDOW-WAIT-UNMAP (CADR M)))))
(IF (EQUAL VAL *PICMENU-NO-SELECTION*)
(AND (PLUSP CODEVAL) ANYCLICK) (CAR VAL))))
@@ -1472,9 +1647,8 @@
*GC-VALUES*)
(XGCVALUES-BACKGROUND *GC-VALUES*)))))
(IF (SETQ SIZ (CADDR ITEM))
- (WINDOW-DRAW-BOX-XY MW (- XOFF (TRUNCATE (CAR SIZ) 2))
- (- YOFF (TRUNCATE (CADR SIZ) 2)) (CAR SIZ) (CADR SIZ)
- 1)
+ (WINDOW-DRAW-BOX-XY MW (- XOFF (/ (CAR SIZ) 2))
+ (- YOFF (/ (CADR SIZ) 2)) (CAR SIZ) (CADR SIZ) 1)
(WINDOW-DRAW-BOX-XY MW (+ -6 XOFF) (+ -6 YOFF) 12 12 1))
(LET ((GC (CADDR MW)))
(XSETFUNCTION *WINDOW-DISPLAY* GC *WINDOW-SAVE-FUNCTION*)
@@ -1495,39 +1669,41 @@
(DEFUN PICMENU-BUTTON-CONTAINSXY? (B X Y)
(LET ((XSIZE 6) (YSIZE 6))
(WHEN (CADDR B)
- (SETQ XSIZE (TRUNCATE (CAADDR B) 2))
- (SETQ YSIZE (TRUNCATE (CADR (CADDR B)) 2)))
+ (SETQ XSIZE (/ (CAADDR B) 2))
+ (SETQ YSIZE (/ (CADR (CADDR B)) 2)))
(AND (>= X (- (CAADR B) XSIZE)) (<= X (+ (CAADR B) XSIZE))
(>= Y (- (CADADR B) YSIZE)) (<= Y (+ (CADADR B) YSIZE)))))
(DEFUN PICMENU-ITEM-POSITION (M ITEMNAME &OPTIONAL PLACE)
(LET (B (XSIZE 0) (YSIZE 0) XOFF YOFF)
- (IF ITEMNAME
+ (IF (NULL ITEMNAME)
+ (PROGN
+ (SETQ XSIZE (SEVENTH M))
+ (SETQ YSIZE (/ (- (EIGHTH M) (CADDR (NTH 10 M))) 2))
+ (SETQ XOFF (/ XSIZE 2))
+ (SETQ YOFF (+ (CADDR (NTH 10 M)) (/ YSIZE 2))))
(WHEN (SETQ B (ASSOC ITEMNAME (CADDDR (NTH 10 M))))
(WHEN (CADDR B)
(SETQ XSIZE (CAADDR B))
(SETQ YSIZE (CADR (CADDR B))))
(SETQ XOFF (CAADR B))
- (SETQ YOFF (CADADR B)))
- (PROGN
- (SETQ XSIZE (SEVENTH M))
- (SETQ YSIZE (TRUNCATE (- (EIGHTH M) (CADDR (NTH 10 M))) 2))
- (SETQ XOFF (TRUNCATE XSIZE 2))
- (SETQ YOFF (+ (CADDR (NTH 10 M)) (TRUNCATE YSIZE 2)))))
+ (SETQ YOFF (CADADR B))))
(IF XOFF
(LIST (+ (+ (IF (CADDR M) (FIFTH M) 0) XOFF)
(CASE PLACE
((CENTER TOP BOTTOM) 0)
- (LEFT (- (TRUNCATE XSIZE 2)))
- (RIGHT (TRUNCATE XSIZE 2))
+ (LEFT (- (/ XSIZE 2)))
+ (RIGHT (/ XSIZE 2))
(T 0)))
(+ (+ (IF (CADDR M) (SIXTH M) 0) YOFF)
(CASE PLACE
((CENTER RIGHT LEFT) 0)
- (BOTTOM (- (TRUNCATE YSIZE 2)))
- (TOP (TRUNCATE YSIZE 2))
+ (BOTTOM (- (/ YSIZE 2)))
+ (TOP (/ YSIZE 2))
(T 0)))))))
+
+
(DEFUN BARMENU-CREATE
(MAXVAL INITVAL BARWIDTH &OPTIONAL TITLE HORIZONTAL SUBTRACKFN
SUBTRACKPARMS PARENTW X Y PERM FLAT COLOR)
@@ -1552,7 +1728,7 @@
(DEFUN BARMENU-INIT (M)
(BARMENU-CALCULATE-SIZE M)
(MENU-ADJUST-OFFSET M)
- (UNLESS (CADDR M)
+ (IF (NOT (CADDR M))
(SETF (CADR M)
(WINDOW-CREATE (SEVENTH M) (EIGHTH M) (OR (NINTH M) "")
(CADDDR M) (FIFTH M) (SIXTH M)))))
@@ -1565,42 +1741,39 @@
(XFLUSH *WINDOW-DISPLAY*)
(WINDOW-WAIT-EXPOSURE MW)
(MENU-CLEAR M)
- (SETQ XZERO
- (+ (IF (CADDR M) (FIFTH M) 0) (TRUNCATE (SEVENTH M) 2)))
+ (SETQ XZERO (+ (IF (CADDR M) (FIFTH M) 0) (/ (SEVENTH M) 2)))
(SETQ YZERO (IF (CADDR M) (SIXTH M) 0))
(IF (NTH 10 M) (WINDOW-SET-COLOR MW (NTH 10 M)))
(IF (NTH 14 M)
- (LET ((GLVAR1493 (CADR M)) (GLVAR1495 (NTH 13 M)))
- (LET ((QQWHEIGHT (CADDDR GLVAR1493)))
- (IF (AND GLVAR1495 (/= GLVAR1495 1))
- (XSETLINEATTRIBUTES *WINDOW-DISPLAY* (CADDR GLVAR1493)
- (OR GLVAR1495 1) 0 1 0))
- (XDRAWLINE *WINDOW-DISPLAY* (CADR GLVAR1493)
- (CADDR GLVAR1493) XZERO (- QQWHEIGHT YZERO)
- (+ XZERO (NTH 11 M)) (- QQWHEIGHT YZERO))
- (IF (AND GLVAR1495 (/= GLVAR1495 1))
- (XSETLINEATTRIBUTES *WINDOW-DISPLAY* (CADDR GLVAR1493)
- 1 0 1 0))))
- (LET ((GLVAR1496 (CADR M)) (GLVAR1498 (NTH 13 M)))
- (LET ((QQWHEIGHT (CADDDR GLVAR1496)))
- (IF (AND GLVAR1498 (/= GLVAR1498 1))
- (XSETLINEATTRIBUTES *WINDOW-DISPLAY* (CADDR GLVAR1496)
- (OR GLVAR1498 1) 0 1 0))
- (XDRAWLINE *WINDOW-DISPLAY* (CADR GLVAR1496)
- (CADDR GLVAR1496) XZERO (- QQWHEIGHT YZERO) XZERO
+ (LET ((QQWHEIGHT (CADDDR (CADR M))))
+ (IF (AND (NTH 13 M) (/= (NTH 13 M) 1))
+ (XSETLINEATTRIBUTES *WINDOW-DISPLAY* (CADDR (CADR M))
+ (OR (NTH 13 M) 1) 0 1 0))
+ (XDRAWLINE *WINDOW-DISPLAY* (CADADR M) (CADDR (CADR M)) XZERO
+ (- QQWHEIGHT YZERO) (+ XZERO (NTH 11 M))
+ (- QQWHEIGHT YZERO))
+ (IF (AND (NTH 13 M) (/= (NTH 13 M) 1))
+ (XSETLINEATTRIBUTES *WINDOW-DISPLAY* (CADDR (CADR M)) 1 0
+ 1 0)))
+ (LET ((QQWHEIGHT (CADDDR (CADR M))))
+ (IF (AND (NTH 13 M) (/= (NTH 13 M) 1))
+ (XSETLINEATTRIBUTES *WINDOW-DISPLAY* (CADDR (CADR M))
+ (OR (NTH 13 M) 1) 0 1 0))
+ (XDRAWLINE *WINDOW-DISPLAY* (CADADR M) (CADDR (CADR M)) XZERO
+ (- QQWHEIGHT YZERO) XZERO
(- QQWHEIGHT (+ YZERO (NTH 11 M))))
- (IF (AND GLVAR1498 (/= GLVAR1498 1))
- (XSETLINEATTRIBUTES *WINDOW-DISPLAY* (CADDR GLVAR1496)
- 1 0 1 0)))))
+ (IF (AND (NTH 13 M) (/= (NTH 13 M) 1))
+ (XSETLINEATTRIBUTES *WINDOW-DISPLAY* (CADDR (CADR M)) 1 0
+ 1 0))))
(IF (NTH 10 M) (WINDOW-RESET-COLOR MW))
(XFLUSH *WINDOW-DISPLAY*)))
(DEFUN BARMENU-SELECT (M &OPTIONAL INSIDE)
+ (declare (ignore inside))
(LET (MW XZERO YZERO VAL)
(SETQ MW (OR (CADR M) (BARMENU-INIT M)))
- (UNLESS (TENTH M) (BARMENU-DRAW M))
- (SETQ XZERO
- (+ (IF (CADDR M) (FIFTH M) 0) (TRUNCATE (SEVENTH M) 2)))
+ (IF (NOT (TENTH M)) (BARMENU-DRAW M))
+ (SETQ XZERO (+ (IF (CADDR M) (FIFTH M) 0) (/ (SEVENTH M) 2)))
(SETQ YZERO (IF (CADDR M) (SIXTH M) 0))
(WHEN (WINDOW-TRACK-MOUSE-IN-REGION MW (IF (CADDR M) (FIFTH M) 0)
YZERO (SEVENTH M) (EIGHTH M) T T)
@@ -1637,34 +1810,29 @@
*GC-VALUES*)
(XGCVALUES-BACKGROUND *GC-VALUES*))))
(IF (NTH 10 M) (WINDOW-SET-COLOR MW (NTH 10 M))))
- (SETQ XZERO
- (+ (IF (CADDR M) (FIFTH M) 0) (TRUNCATE (SEVENTH M) 2)))
+ (SETQ XZERO (+ (IF (CADDR M) (FIFTH M) 0) (/ (SEVENTH M) 2)))
(SETQ YZERO (IF (CADDR M) (SIXTH M) 0))
(IF (NTH 14 M)
- (LET ((GLVAR1503 (CADR M)) (GLVAR1506 (NTH 13 M)))
- (LET ((QQWHEIGHT (CADDDR GLVAR1503)))
- (IF (AND GLVAR1506 (/= GLVAR1506 1))
- (XSETLINEATTRIBUTES *WINDOW-DISPLAY*
- (CADDR GLVAR1503) (OR GLVAR1506 1) 0 1 0))
- (XDRAWLINE *WINDOW-DISPLAY* (CADR GLVAR1503)
- (CADDR GLVAR1503) (+ XZERO (NTH 11 M))
- (- QQWHEIGHT YZERO) (+ XZERO VAL)
+ (LET ((QQWHEIGHT (CADDDR (CADR M))))
+ (IF (AND (NTH 13 M) (/= (NTH 13 M) 1))
+ (XSETLINEATTRIBUTES *WINDOW-DISPLAY* (CADDR (CADR M))
+ (OR (NTH 13 M) 1) 0 1 0))
+ (XDRAWLINE *WINDOW-DISPLAY* (CADADR M) (CADDR (CADR M))
+ (+ XZERO (NTH 11 M)) (- QQWHEIGHT YZERO) (+ XZERO VAL)
(- QQWHEIGHT YZERO))
- (IF (AND GLVAR1506 (/= GLVAR1506 1))
- (XSETLINEATTRIBUTES *WINDOW-DISPLAY*
- (CADDR GLVAR1503) 1 0 1 0))))
- (LET ((GLVAR1507 (CADR M)) (GLVAR1510 (NTH 13 M)))
- (LET ((QQWHEIGHT (CADDDR GLVAR1507)))
- (IF (AND GLVAR1510 (/= GLVAR1510 1))
- (XSETLINEATTRIBUTES *WINDOW-DISPLAY*
- (CADDR GLVAR1507) (OR GLVAR1510 1) 0 1 0))
- (XDRAWLINE *WINDOW-DISPLAY* (CADR GLVAR1507)
- (CADDR GLVAR1507) XZERO
- (- QQWHEIGHT (+ YZERO (NTH 11 M))) XZERO
+ (IF (AND (NTH 13 M) (/= (NTH 13 M) 1))
+ (XSETLINEATTRIBUTES *WINDOW-DISPLAY* (CADDR (CADR M)) 1
+ 0 1 0)))
+ (LET ((QQWHEIGHT (CADDDR (CADR M))))
+ (IF (AND (NTH 13 M) (/= (NTH 13 M) 1))
+ (XSETLINEATTRIBUTES *WINDOW-DISPLAY* (CADDR (CADR M))
+ (OR (NTH 13 M) 1) 0 1 0))
+ (XDRAWLINE *WINDOW-DISPLAY* (CADADR M) (CADDR (CADR M))
+ XZERO (- QQWHEIGHT (+ YZERO (NTH 11 M))) XZERO
(- QQWHEIGHT (+ YZERO VAL)))
- (IF (AND GLVAR1510 (/= GLVAR1510 1))
- (XSETLINEATTRIBUTES *WINDOW-DISPLAY*
- (CADDR GLVAR1507) 1 0 1 0)))))
+ (IF (AND (NTH 13 M) (/= (NTH 13 M) 1))
+ (XSETLINEATTRIBUTES *WINDOW-DISPLAY* (CADDR (CADR M)) 1
+ 0 1 0))))
(IF (< VAL (NTH 11 M))
(LET ((GC (CADDR MW)))
(XSETFUNCTION *WINDOW-DISPLAY* GC *WINDOW-SAVE-FUNCTION*)
@@ -1680,6 +1848,113 @@
+(DEFUN TEXTMENU-CREATE
+ (WIDTH HEIGHT &OPTIONAL TITLE PARENTW X Y PERM FLAT FONT BOXFLG
+ INITIAL-TEXT)
+ (LIST 'TEXTMENU (IF FLAT PARENTW) FLAT (IF PARENTW (CADR PARENTW))
+ (OR X 0) (OR Y 0) 0 0 (IF TITLE (STRINGIFY TITLE) "") PERM
+ INITIAL-TEXT WIDTH HEIGHT BOXFLG (OR FONT '9X15)))
+
+(DEFUN TEXTMENU-CALCULATE-SIZE (M)
+ (LET (MAXWIDTH MAXHEIGHT)
+ (SETQ MAXWIDTH
+ (MAX (IF (NINTH M) (+ 6 (* 9 (LENGTH (NINTH M)))) 0)
+ (NTH 11 M)))
+ (SETQ MAXHEIGHT
+ (+ (IF (AND (NINTH M) (PLUSP (LENGTH (NINTH M)))
+ (OR (CADDR M) *WINDOW-ADD-MENU-TITLE*))
+ 15 0)
+ (NTH 12 M)))
+ (SETF (SEVENTH M) MAXWIDTH)
+ (SETF (EIGHTH M) MAXHEIGHT)))
+
+(DEFUN TEXTMENU-INIT (M)
+ (TEXTMENU-CALCULATE-SIZE M)
+ (MENU-ADJUST-OFFSET M)
+ (IF (NOT (CADDR M))
+ (SETF (CADR M)
+ (WINDOW-CREATE (SEVENTH M) (EIGHTH M) (OR (NINTH M) "")
+ (CADDDR M) (FIFTH M) (SIXTH M) (NTH 14 M)))))
+
+(DEFUN TEXTMENU-DRAW (M)
+ (LET (MW BOTTOM XZERO YZERO)
+ (OR (AND (CADR M) (PLUSP (EIGHTH M))) (TEXTMENU-INIT M))
+ (SETQ MW (CADR M))
+ (XMAPWINDOW *WINDOW-DISPLAY* (CADR MW))
+ (XFLUSH *WINDOW-DISPLAY*)
+ (WINDOW-WAIT-EXPOSURE MW)
+ (MENU-CLEAR M)
+ (SETQ XZERO (IF (CADDR M) (FIFTH M) 0))
+ (SETQ YZERO (IF (CADDR M) (SIXTH M) 0))
+ (SETQ BOTTOM (+ YZERO (EIGHTH M)))
+ (WHEN (AND (NINTH M) (PLUSP (LENGTH (NINTH M)))
+ (OR (CADDR M) *WINDOW-ADD-MENU-TITLE*))
+ (LET ((SSTR (STRINGIFY (STRINGIFY (NINTH M)))))
+ (XDRAWIMAGESTRING *WINDOW-DISPLAY* (CADR MW) (CADDR MW)
+ (+ 3 XZERO) (+ 13 (- (CADDDR MW) BOTTOM))
+ (GET-C-STRING SSTR) (LENGTH SSTR)))
+ (LET ((GC (CADDR MW)))
+ (SETQ *WINDOW-SAVE-FUNCTION*
+ (PROGN
+ (XGETGCVALUES *WINDOW-DISPLAY* (CADDR MW) 1
+ *GC-VALUES*)
+ (XGCVALUES-FUNCTION *GC-VALUES*)))
+ (XSETFUNCTION *WINDOW-DISPLAY* GC 6)
+ (SETQ *WINDOW-SAVE-FOREGROUND*
+ (PROGN
+ (XGETGCVALUES *WINDOW-DISPLAY* (CADDR MW) 4
+ *GC-VALUES*)
+ (XGCVALUES-FOREGROUND *GC-VALUES*)))
+ (XSETFOREGROUND *WINDOW-DISPLAY* GC
+ (LOGXOR *WINDOW-SAVE-FOREGROUND*
+ (PROGN
+ (XGETGCVALUES *WINDOW-DISPLAY* (CADDR MW) 8
+ *GC-VALUES*)
+ (XGCVALUES-BACKGROUND *GC-VALUES*)))))
+ (XFILLRECTANGLE *WINDOW-DISPLAY* (CADR MW) (CADDR MW) XZERO
+ (- (CADDDR MW) BOTTOM) (SEVENTH M) 16)
+ (LET ((GC (CADDR MW)))
+ (XSETFUNCTION *WINDOW-DISPLAY* GC *WINDOW-SAVE-FUNCTION*)
+ (XSETFOREGROUND *WINDOW-DISPLAY* GC *WINDOW-SAVE-FOREGROUND*)))
+ (IF (NTH 10 M)
+ (LET ((SSTR (STRINGIFY (NTH 10 M))))
+ (XDRAWIMAGESTRING *WINDOW-DISPLAY* (CADR MW) (CADDR MW)
+ (+ 10 XZERO)
+ (+ 8 (- (CADDDR MW) (+ YZERO (/ (EIGHTH M) 2))))
+ (GET-C-STRING SSTR) (LENGTH SSTR))))
+ (IF (NTH 13 M)
+ (WINDOW-DRAW-BOX-XY MW XZERO YZERO (SEVENTH M) (EIGHTH M) 1))
+ (XFLUSH *WINDOW-DISPLAY*)))
+
+(DEFUN TEXTMENU-SELECT (M &OPTIONAL INSIDE)
+ (declare (ignore inside))
+ (LET (MW XZERO YZERO CODEVAL)
+ (SETQ MW (OR (CADR M) (TEXTMENU-INIT M)))
+ (IF (NOT (TENTH M)) (TEXTMENU-DRAW M))
+ (SETQ XZERO (IF (CADDR M) (FIFTH M) 0))
+ (SETQ YZERO (IF (CADDR M) (SIXTH M) 0))
+ (WINDOW-TRACK-MOUSE MW
+ #'(LAMBDA (X Y CODE)
+ (SETQ *WINDOW-MENU-CODE* CODE)
+ (DECF X XZERO)
+ (DECF Y YZERO)
+ (IF (OR (PLUSP CODE) (MINUSP X) (> X (SEVENTH M))
+ (MINUSP Y) (> Y (EIGHTH M)))
+ (SETQ CODEVAL CODE)))
+ T)
+ (WHEN (AND (NOT (TENTH M)) (NOT (CADDR M)))
+ (XUNMAPWINDOW *WINDOW-DISPLAY* (CADADR M))
+ (XFLUSH *WINDOW-DISPLAY*)
+ (WINDOW-WAIT-UNMAP (CADR M)))
+ (WHEN (PLUSP CODEVAL)
+ (TEXTMENU-DRAW M)
+ (WINDOW-INPUT-STRING MW (NTH 10 M) (+ 10 XZERO)
+ (+ -8 (+ YZERO (/ (EIGHTH M) 2))) (+ -12 (SEVENTH M))))))
+
+(DEFUN TEXTMENU-SET-TEXT (M &OPTIONAL S) (SETF (NTH 10 M) (OR S "")))
+
+
+
(DEFUN WINDOW-GET-POINT (W)
(LET (ORGX ORGY)
(WINDOW-TRACK-MOUSE W
@@ -1876,6 +2151,7 @@
(LIST CENTER (LIST RADIUSX (ABS (- (CADR PT) (CADR CENTER)))))))
(DEFUN WINDOW-DRAW-ELLIPSE-PT (W X Y CENTER RADIUSX)
+ (declare (ignore x))
(WINDOW-DRAW-ELLIPSE-XY W (CAR CENTER) (CADR CENTER) RADIUSX
(ABS (- Y (CADR CENTER)))))
@@ -1972,13 +2248,14 @@
BACKGROUND))
(DEFUN WINDOW-FREE-COLOR (W &OPTIONAL XCOLOR)
+ (declare (ignore w))
(OR XCOLOR (SETQ XCOLOR *WINDOW-XCOLOR*))
(IF XCOLOR
(UNLESS (OR (EQL XCOLOR *DEFAULT-FG-COLOR*)
(EQL XCOLOR *DEFAULT-BG-COLOR*))
(XFREECOLORS *WINDOW-DISPLAY* *DEFAULT-COLORMAP* XCOLOR 1 0))))
-(DEFUN WINDOW-GET-CHARS (W FN)
+(DEFUN WINDOW-GET-CHARS (W FN &OPTIONAL ARGS)
(LET (WIN RES)
(OR *WINDOW-KEYINIT* (WINDOW-INIT-KEYMAP))
(SETQ *WINDOW-SHIFT* NIL)
@@ -1986,16 +2263,18 @@
(SETQ *WINDOW-META* NIL)
(SETQ WIN (WINDOW-PARENT W))
(XSYNC *WINDOW-DISPLAY* 1)
- (XSELECTINPUT *WINDOW-DISPLAY* WIN (+ KEYPRESSMASK KEYRELEASEMASK))
+ (XSELECTINPUT *WINDOW-DISPLAY* WIN
+ (+ KEYPRESSMASK KEYRELEASEMASK BUTTONPRESSMASK))
(WHILE (NULL RES) (XNEXTEVENT *WINDOW-DISPLAY* *WINDOW-EVENT*)
(LET ((TYPE (XANYEVENT-TYPE *WINDOW-EVENT*))
(EVENTWINDOW (XANYEVENT-WINDOW *WINDOW-EVENT*)))
(IF (EQL EVENTWINDOW WIN)
- (SETQ RES (WINDOW-PROCESS-CHAR-EVENT W TYPE FN)))))
+ (SETQ RES (WINDOW-PROCESS-CHAR-EVENT W TYPE FN ARGS)))))
RES))
-(DEFUN WINDOW-PROCESS-CHAR-EVENT (W TYPE FN)
- (LET (CODE)
+(DEFUN WINDOW-PROCESS-CHAR-EVENT (W TYPE FN ARGS)
+ (LET (CODE EVENTWINDOW)
+ (declare (ignore eventwindow))
(IF (EQL TYPE KEYRELEASE)
(PROGN
(SETQ CODE (XBUTTONEVENT-BUTTON *WINDOW-EVENT*))
@@ -2014,14 +2293,26 @@
(PROGN (SETQ *WINDOW-CTRL* T) NIL)
(IF (MEMBER CODE *WINDOW-META-KEYS*)
(PROGN (SETQ *WINDOW-META* T) NIL)
- (FUNCALL FN W
- (OR
- (AREF
- (IF *WINDOW-SHIFT*
- *WINDOW-SHIFTKEYMAP*
+ (FUNCALL FN W (WINDOW-CHAR-DECODE CODE) 0 0 0
+ ARGS)))))
+ (IF (EQL TYPE BUTTONPRESS)
+ (FUNCALL FN W 0 (XBUTTONEVENT-BUTTON *WINDOW-EVENT*)
+ (XMOTIONEVENT-X *WINDOW-EVENT*)
+ (- (WINDOW-DRAWABLE-HEIGHT W)
+ (XMOTIONEVENT-Y *WINDOW-EVENT*))
+ ARGS))))))
+
+(DEFUN WINDOW-CHAR-DECODE (CODE)
+ (LET (CHAR)
+ (SETQ CHAR
+ (AREF (IF *WINDOW-SHIFT* *WINDOW-SHIFTKEYMAP*
*WINDOW-KEYMAP*)
- CODE)
- #\Space))))))))))
+ CODE))
+ (IF (AND CHAR *WINDOW-CTRL*)
+ (SETQ CHAR (CODE-CHAR (- (CHAR-CODE (CHAR-UPCASE CHAR)) 64))))
+ (IF (AND CHAR *WINDOW-META*)
+ (SETQ CHAR (CODE-CHAR (+ (CHAR-CODE (CHAR-UPCASE CHAR)) 128))))
+ (OR CHAR #\Space)))
(DEFUN WINDOW-GET-RAW-CHAR (W)
(LET (WIN RES)
@@ -2040,63 +2331,434 @@
RES))
(DEFUN WINDOW-INPUT-STRING (W STR X Y &OPTIONAL SIZE)
- (LET ()
- (SETQ *WINDOW-INPUT-STRING-X* X)
- (SETQ *WINDOW-INPUT-STRING-Y* Y)
- (SETQ *WINDOW-INPUT-STRING-CHARWIDTH* (WINDOW-STRING-WIDTH W "M"))
- (SETQ *WINDOW-STRING-MAX*
- (IF SIZE (/ SIZE *WINDOW-INPUT-STRING-CHARWIDTH*) 100))
- (SETQ *WINDOW-STRING-COUNT*
- (IF STR (MIN (LENGTH STR) *WINDOW-STRING-MAX*) 0))
- (WINDOW-ERASE-AREA-XY W X (- Y 2) (OR SIZE 100) 14)
- (IF (> *WINDOW-STRING-COUNT* 0)
- (PROGN
- (DOTIMES (I *WINDOW-STRING-COUNT*)
- (SETF (CHAR *WINDOW-STRING* I) (CHAR STR I)))
- (WINDOW-PRINTAT-XY W STR X Y)))
- (WINDOW-DRAW-CARAT W)
- (WINDOW-GET-CHARS W #'WINDOW-INPUT-CHAR-FN)))
-
-(DEFUN WINDOW-INPUT-CHAR-FN (W CHAR)
- (LET ((TMPSTRING "Z"))
- (WINDOW-DRAW-CARAT W)
- (IF (CHAR= CHAR #\Return)
- (SUBSEQ *WINDOW-STRING* 0 *WINDOW-STRING-COUNT*)
- (PROGN
- (IF (CHAR= CHAR #\Backspace)
- (IF (> *WINDOW-STRING-COUNT* 0)
- (PROGN
- (DECF *WINDOW-STRING-COUNT*)
- (WINDOW-PRINTAT-XY W " "
- (+ *WINDOW-INPUT-STRING-X*
- (* *WINDOW-STRING-COUNT*
- *WINDOW-INPUT-STRING-CHARWIDTH*))
- *WINDOW-INPUT-STRING-Y*)
- (WINDOW-DRAW-CARAT W)))
- (IF (< *WINDOW-STRING-COUNT* *WINDOW-STRING-MAX*)
- (PROGN
- (SETF (CHAR *WINDOW-STRING* *WINDOW-STRING-COUNT*)
- CHAR)
- (INCF *WINDOW-STRING-COUNT*)
- (SETF (CHAR TMPSTRING 0) CHAR)
- (WINDOW-PRINTAT-XY W TMPSTRING
- (+ *WINDOW-INPUT-STRING-X*
- (* (1- *WINDOW-STRING-COUNT*)
- *WINDOW-INPUT-STRING-CHARWIDTH*))
- *WINDOW-INPUT-STRING-Y*)
- (WINDOW-DRAW-CARAT W))))
- NIL))))
-
-(DEFUN WINDOW-DRAW-CARAT (W)
- (LET ((ORIGX *WINDOW-INPUT-STRING-X*) (Y *WINDOW-INPUT-STRING-Y*) X)
- (SETQ X
- (+ ORIGX
- (* *WINDOW-INPUT-STRING-CHARWIDTH* *WINDOW-STRING-COUNT*)))
+ (CAR (WINDOW-EDIT W X Y (OR SIZE 100) 16 (LIST (OR STR "")) NIL T T)))
+
+(DEFUN WINDOW-EDIT
+ (W X Y WIDTH HEIGHT &OPTIONAL STRINGS BOXFLG SCROLL ENDP)
+ (LET (EM)
+ (SETQ EM
+ (EDITMENU-CREATE WIDTH HEIGHT NIL W X Y NIL T '9X15 BOXFLG
+ STRINGS SCROLL ENDP))
+ (EDITMENU-EDIT EM)
+ (EDITMENU-CARAT EM)
+ (NTH 10 EM)))
+
+
+
+(DEFUN EDITMENU-CREATE
+ (WIDTH HEIGHT &OPTIONAL TITLE PARENTW X Y PERM FLAT FONT BOXFLG
+ INITIAL-TEXT SCROLLVAL ENDP)
+ (LIST 'EDITMENU (IF FLAT PARENTW) FLAT (IF PARENTW (CADR PARENTW))
+ (OR X 0) (OR Y 0) 0 0 (IF TITLE (STRINGIFY TITLE) "") PERM
+ (OR INITIAL-TEXT (LIST "")) WIDTH HEIGHT BOXFLG (OR FONT '9X15)
+ (IF ENDP
+ (LENGTH (NTH (IF (NUMBERP SCROLLVAL) SCROLLVAL 0)
+ INITIAL-TEXT))
+ 0)
+ (IF (NUMBERP SCROLLVAL) SCROLLVAL 0) (OR SCROLLVAL 0)))
+
+(DEFUN EDITMENU-CALCULATE-SIZE (M)
+ (SETF (SEVENTH M) (NTH 11 M))
+ (SETF (EIGHTH M) (NTH 12 M)))
+
+(DEFUN EDITMENU-INIT (M)
+ (EDITMENU-CALCULATE-SIZE M)
+ (MENU-ADJUST-OFFSET M)
+ (IF (NOT (CADDR M))
+ (SETF (CADR M)
+ (WINDOW-CREATE (SEVENTH M) (EIGHTH M) (OR (NINTH M) "")
+ (CADDDR M) (FIFTH M) (SIXTH M) (NTH 14 M)))))
+
+(DEFUN EDITMENU-DRAW (M)
+ (LET (MW XZERO YZERO)
+ (OR (AND (CADR M) (PLUSP (EIGHTH M))) (EDITMENU-INIT M))
+ (SETQ MW (CADR M))
+ (XMAPWINDOW *WINDOW-DISPLAY* (CADR MW))
+ (XFLUSH *WINDOW-DISPLAY*)
+ (WINDOW-WAIT-EXPOSURE MW)
+ (MENU-CLEAR M)
+ (SETQ XZERO (IF (CADDR M) (FIFTH M) 0))
+ (SETQ YZERO (IF (CADDR M) (SIXTH M) 0))
+ (IF (NTH 13 M)
+ (WINDOW-DRAW-BOX-XY MW XZERO YZERO (SEVENTH M) (EIGHTH M) 1))
+ (EDITMENU-DISPLAY M 0 0 (NOT (NUMBERP (NTH 17 M))))))
+
+(DEFUN EDITMENU-DISPLAY (M LINE CHAR ONLY)
+ (LET (LINES Y MAXWIDTH LINEWIDTH (W (OR (CADR M) (EDITMENU-INIT M))))
+ (SETQ LINES (NTHCDR LINE (NTH 10 M)))
+ (SETQ Y
+ (+ (IF (CADDR M) (SIXTH M) 0)
+ (- (EIGHTH M)
+ (1- (* (WINDOW-STRING-HEIGHT
+ (OR (CADR M) (EDITMENU-INIT M)) "Tg")
+ (1+ (- (- LINE
+ (IF (NUMBERP (NTH 17 M)) (NTH 17 M) 0))
+ (IF (NUMBERP (NTH 17 M)) (NTH 17 M) 0))))))))
+ (SETQ MAXWIDTH
+ (TRUNCATE (+ -6 (SEVENTH M))
+ (LET ((SSTR (STRINGIFY "W")))
+ (XTEXTWIDTH (SEVENTH (OR (CADR M) (EDITMENU-INIT M)))
+ (GET-C-STRING SSTR) (LENGTH SSTR)))))
+ (WHILE (AND LINES (>= Y (+ 4 (IF (CADDR M) (SIXTH M) 0)))) ; = by hand
+ (IF (< CHAR MAXWIDTH)
+ (IF (PLUSP CHAR)
+ (LET ((SSTR (STRINGIFY
+ (SUBSEQ (FIRST LINES) CHAR
+ (MIN MAXWIDTH
+ (LENGTH (FIRST LINES)))))))
+ (XDRAWIMAGESTRING *WINDOW-DISPLAY* (CADR W)
+ (CADDR W)
+ (+ (IF (CADDR M) (FIFTH M) 0)
+ (+ 2
+ (* CHAR
+ (LET ((SSTR (STRINGIFY "W")))
+ (XTEXTWIDTH
+ (SEVENTH
+ (OR (CADR M) (EDITMENU-INIT M)))
+ (GET-C-STRING SSTR) (LENGTH SSTR))))))
+ (- (CADDDR W) Y) (GET-C-STRING SSTR)
+ (LENGTH SSTR)))
+ (LET ((SSTR (STRINGIFY
+ (IF
+ (<= (LENGTH (FIRST LINES))
+ MAXWIDTH)
+ (FIRST LINES)
+ (SUBSEQ (FIRST LINES) 0 MAXWIDTH)))))
+ (XDRAWIMAGESTRING *WINDOW-DISPLAY* (CADR W)
+ (CADDR W) (+ 2 (IF (CADDR M) (FIFTH M) 0))
+ (- (CADDDR W) Y) (GET-C-STRING SSTR)
+ (LENGTH SSTR)))))
+ (SETQ LINEWIDTH
+ (+ 2
+ (* (LET ((SSTR (STRINGIFY "W")))
+ (XTEXTWIDTH
+ (SEVENTH (OR (CADR M) (EDITMENU-INIT M)))
+ (GET-C-STRING SSTR) (LENGTH SSTR)))
+ (LENGTH (FIRST LINES)))))
+ (WINDOW-ERASE-AREA-XY W
+ (+ (IF (CADDR M) (FIFTH M) 0) LINEWIDTH) (+ -2 Y)
+ (+ -2 (- (SEVENTH M) LINEWIDTH))
+ (WINDOW-STRING-HEIGHT (OR (CADR M) (EDITMENU-INIT M))
+ "Tg"))
+ (DECF Y
+ (WINDOW-STRING-HEIGHT (OR (CADR M) (EDITMENU-INIT M))
+ "Tg"))
+ (IF ONLY (SETQ LINES NIL)
+ (PROGN
+ (POP LINES)
+ (IF (AND (NULL LINES)
+ (>= Y (+ 4 (IF (CADDR M) (SIXTH M) 0))))
+ (WINDOW-ERASE-AREA-XY W
+ (+ 2 (IF (CADDR M) (FIFTH M) 0)) (+ -2 Y)
+ (+ -4 (SEVENTH M))
+ (WINDOW-STRING-HEIGHT
+ (OR (CADR M) (EDITMENU-INIT M)) "Tg")))))
+ (SETQ CHAR 0))
+ (XFLUSH *WINDOW-DISPLAY*)))
+
+(DEFUN EDITMENU-CARAT (M)
+ (WINDOW-DRAW-CARAT (OR (CADR M) (EDITMENU-INIT M))
+ (+ (IF (CADDR M) (FIFTH M) 0)
+ (+ 2
+ (* (NTH 15 M)
+ (LET ((SSTR (STRINGIFY "W")))
+ (XTEXTWIDTH (SEVENTH (OR (CADR M) (EDITMENU-INIT M)))
+ (GET-C-STRING SSTR) (LENGTH SSTR))))))
+ (+ -2
+ (+ (IF (CADDR M) (SIXTH M) 0)
+ (- (EIGHTH M)
+ (1- (* (WINDOW-STRING-HEIGHT
+ (OR (CADR M) (EDITMENU-INIT M)) "Tg")
+ (1+ (- (NTH 16 M)
+ (IF (NUMBERP (NTH 17 M)) (NTH 17 M) 0)))))))))
+ (XFLUSH *WINDOW-DISPLAY*))
+
+(DEFUN EDITMENU-ERASE (M ONEP)
+ (LET ((W (OR (CADR M) (EDITMENU-INIT M))) XW)
+ (SETQ XW
+ (+ 2
+ (* (LET ((SSTR (STRINGIFY "W")))
+ (XTEXTWIDTH (SEVENTH W) (GET-C-STRING SSTR)
+ (LENGTH SSTR)))
+ (NTH 15 M))))
+ (LET ((GLVAR113882 (WINDOW-STRING-HEIGHT W "Tg")))
+ (XCLEARAREA *WINDOW-DISPLAY* (CADR W)
+ (+ (IF (CADDR M) (FIFTH M) 0) XW)
+ (- (CADDDR W)
+ (1- (+ (- (+ (IF (CADDR M) (SIXTH M) 0)
+ (- (EIGHTH M)
+ (1- (* (WINDOW-STRING-HEIGHT
+ (OR (CADR M) (EDITMENU-INIT M))
+ "Tg")
+ (1+
+ (- (NTH 16 M)
+ (IF (NUMBERP (NTH 17 M))
+ (NTH 17 M) 0)))))))
+ (CADR (LET ((SSTR (STRINGIFY "Tg")))
+ (XTEXTEXTENTS (SEVENTH W)
+ (GET-C-STRING SSTR) (LENGTH SSTR)
+ *DIRECTION-RETURN* *ASCENT-RETURN*
+ *DESCENT-RETURN* *OVERALL-RETURN*)
+ (LIST (INT-POS *ASCENT-RETURN* 0)
+ (INT-POS *DESCENT-RETURN* 0)))))
+ GLVAR113882)))
+ (IF ONEP
+ (LET ((SSTR (STRINGIFY "W")))
+ (XTEXTWIDTH (SEVENTH W) (GET-C-STRING SSTR)
+ (LENGTH SSTR)))
+ (- (SEVENTH M) XW))
+ GLVAR113882 0))
+ (XFLUSH *WINDOW-DISPLAY*)))
+
+(DEFUN EDITMENU-LINE-Y (M LINE)
+ (+ (IF (CADDR M) (SIXTH M) 0)
+ (- (EIGHTH M)
+ (1- (* (WINDOW-STRING-HEIGHT (OR (CADR M) (EDITMENU-INIT M))
+ "Tg")
+ (1+ (- LINE (IF (NUMBERP (NTH 17 M)) (NTH 17 M) 0))))))))
+
+(DEFUN EDITMENU-SELECT (M &OPTIONAL INSIDE)
+ (declare (ignore inside))
+ (LET (MW CODEVAL XVAL YVAL)
+ (SETQ MW (OR (CADR M) (EDITMENU-INIT M)))
+ (IF (NOT (TENTH M)) (EDITMENU-DRAW M))
+ (WINDOW-TRACK-MOUSE MW
+ #'(LAMBDA (X Y CODE)
+ (SETQ *WINDOW-MENU-CODE* CODE)
+ (WHEN (OR (PLUSP CODE) (< X (FIFTH M))
+ (> X (+ (FIFTH M) (SEVENTH M))) (< Y (SIXTH M))
+ (> Y (+ (SIXTH M) (EIGHTH M))))
+ (SETQ CODEVAL CODE)
+ (SETQ XVAL X)
+ (SETQ YVAL Y)))
+ T)
+ (IF (PLUSP CODEVAL) (EDITMENU-EDIT M CODEVAL XVAL YVAL))))
+
+(DEFVAR *WINDOW-EDITMENU-KILL-STRINGS* NIL)
+
+(DEFUN EDITMENU-EDIT (M &OPTIONAL CODE X Y)
+ (LET ((MW (OR (CADR M) (EDITMENU-INIT M))))
+ (EDITMENU-DRAW M)
+ (EDITMENU-CARAT M)
+ (IF CODE (EDITMENU-EDIT-FN MW NIL CODE X Y (LIST M)))
+ (SETQ *WINDOW-EDITMENU-KILL-STRINGS* NIL)
+ (WINDOW-GET-CHARS MW #'EDITMENU-EDIT-FN (LIST M))
+ (NTH 10 M)))
+
+(DEFUN EDITMENU-EDIT-FN (W CHAR BUTTON BUTTONX BUTTONY ARGS)
+ (declare (ignore w))
+ (LET (M INSIDE DONE)
+ (SETQ M (CAR ARGS))
+ (EDITMENU-CARAT M)
+ (IF (AND (NUMBERP BUTTON) (NOT (ZEROP BUTTON)))
+ (PROGN
+ (SETQ INSIDE (EDITMENU-SETXY M BUTTONX BUTTONY))
+ (CASE BUTTON
+ (1 (IF INSIDE (PROGN (EDITMENU-CARAT M) NIL) T))
+ (2 (WHEN INSIDE (EDITMENU-YANK M) (EDITMENU-CARAT M) NIL))))
+ (PROGN
+ (IF (< (CHAR-CODE CHAR) 32)
+ (CASE CHAR
+ (#\Return
+ (IF (NUMBERP (NTH 17 M)) (EDITMENU-RETURN M)
+ (SETQ DONE T)))
+ (#\Backspace (EDITMENU-BACKSPACE M))
+ (#\^D (EDITMENU-DELETE M))
+ (#\^N (IF (NUMBERP (NTH 17 M)) (EDITMENU-NEXT M)))
+ (#\^P (EDITMENU-PREVIOUS M))
+ (#\^F (EDITMENU-FORWARD M))
+ (#\^B (EDITMENU-BACKWARD M))
+ (#\^A (EDITMENU-BEGINNING M))
+ (#\^E (EDITMENU-END M))
+ (#\^K (EDITMENU-KILL M))
+ (#\^Y (EDITMENU-YANK M))
+ (T NIL))
+ (IF (> (CHAR-CODE CHAR) 128)
+ (PROGN
+ (SETQ CHAR (CODE-CHAR (+ -128 (CHAR-CODE CHAR))))
+ (CASE CHAR
+ (#\B (EDITMENU-META-B M))
+ (#\F (EDITMENU-META-F M))
+ (T NIL)))
+ (EDITMENU-CHAR M CHAR)))
+ (EDITMENU-CARAT M)
+ DONE))))
+
+(DEFUN EDITMENU-SETXY (M BUTTONX BUTTONY)
+ (LET (LINECONS OKAY)
+ (SETQ OKAY
+ (AND (>= BUTTONX (FIFTH M))
+ (<= BUTTONX (+ (FIFTH M) (SEVENTH M)))
+ (>= BUTTONY (SIXTH M))
+ (<= BUTTONY (+ (SIXTH M) (EIGHTH M)))))
+ (WHEN OKAY
+ (SETF (NTH 16 M)
+ (MIN (1- (LENGTH (NTH 10 M)))
+ (+ (IF (NUMBERP (NTH 17 M)) (NTH 17 M) 0)
+ (TRUNCATE
+ (- (+ (IF (CADDR M) (SIXTH M) 0)
+ (+ -6 (EIGHTH M)))
+ BUTTONY)
+ (WINDOW-STRING-HEIGHT
+ (OR (CADR M) (EDITMENU-INIT M)) "Tg")))))
+ (SETQ LINECONS (NTHCDR (NTH 16 M) (NTH 10 M)))
+ (SETF (NTH 15 M)
+ (MIN (LENGTH (CAR LINECONS))
+ (TRUNCATE
+ (+ -2 (- BUTTONX (IF (CADDR M) (FIFTH M) 0)))
+ (LET ((SSTR (STRINGIFY "W")))
+ (XTEXTWIDTH
+ (SEVENTH (OR (CADR M) (EDITMENU-INIT M)))
+ (GET-C-STRING SSTR) (LENGTH SSTR)))))))
+ OKAY))
+
+(DEFUN EDITMENU-CHAR (M CHAR)
+ (LET ((LINECONS (NTHCDR (NTH 16 M) (NTH 10 M))))
+ (IF (<= (LENGTH (CAR LINECONS)) (NTH 15 M))
+ (SETF (CAR LINECONS)
+ (CONCATENATE 'STRING (CAR LINECONS) (STRING CHAR)))
+ (SETF (CAR LINECONS)
+ (CONCATENATE 'STRING (SUBSEQ (CAR LINECONS) 0 (NTH 15 M))
+ (STRING CHAR) (SUBSEQ (CAR LINECONS) (NTH 15 M)))))
+ (EDITMENU-DISPLAY M (NTH 16 M) (NTH 15 M) T)
+ (INCF (NTH 15 M))))
+
+(DEFUN EDITMENU-CURRENT-CHAR (M)
+ (CHAR (NTH (NTH 16 M) (NTH 10 M)) (NTH 15 M)))
+
+(DEFUN EDITMENU-RETURN (M)
+ (LET ((LINECONS (NTHCDR (NTH 16 M) (NTH 10 M))))
+ (IF (<= (LENGTH (CAR LINECONS)) (NTH 15 M))
+ (PUSH "" (CDR LINECONS))
+ (PROGN
+ (PUSH (SUBSEQ (CAR LINECONS) (NTH 15 M)) (CDR LINECONS))
+ (SETF (CAR LINECONS) (SUBSEQ (CAR LINECONS) 0 (NTH 15 M)))))
+ (EDITMENU-DISPLAY M (NTH 16 M) 0 NIL)
+ (INCF (NTH 16 M))
+ (SETF (NTH 15 M) 0)))
+
+(DEFUN EDITMENU-BACKSPACE (M)
+ (LET (TMP LINEDEL (LINECONS (NTHCDR (NTH 16 M) (NTH 10 M))))
+ (IF (PLUSP (NTH 15 M))
+ (PROGN
+ (DECF (NTH 15 M))
+ (SETF (CAR LINECONS)
+ (CONCATENATE 'STRING
+ (SUBSEQ (CAR LINECONS) 0 (NTH 15 M))
+ (SUBSEQ (CAR LINECONS) (1+ (NTH 15 M))))))
+ (WHEN (PLUSP (NTH 16 M))
+ (DECF (NTH 16 M))
+ (SETQ LINEDEL T)
+ (SETQ LINECONS (NTHCDR (NTH 16 M) (NTH 10 M)))
+ (SETF (NTH 15 M) (LENGTH (CAR LINECONS)))
+ (SETQ TMP
+ (CONCATENATE 'STRING (CAR LINECONS) (CADR LINECONS)))
+ (SETF (CDR LINECONS) (CDDR LINECONS))
+ (SETF (CAR LINECONS) TMP)))
+ (EDITMENU-DISPLAY M (NTH 16 M) (NTH 15 M) (NOT LINEDEL))))
+
+(DEFUN EDITMENU-END (M)
+ (SETF (NTH 15 M) (LENGTH (NTH (NTH 16 M) (NTH 10 M)))))
+
+(DEFUN EDITMENU-BEGINNING (M) (SETF (NTH 15 M) 0))
+
+(DEFUN EDITMENU-FORWARD (M)
+ (LET ((LINECONS (NTHCDR (NTH 16 M) (NTH 10 M))))
+ (IF (< (NTH 15 M) (LENGTH (CAR LINECONS))) (INCF (NTH 15 M))
+ (WHEN (NUMBERP (NTH 17 M))
+ (INCF (NTH 16 M))
+ (IF (NULL (CDR LINECONS)) (SETF (CDR LINECONS) (LIST "")))
+ (SETF (NTH 15 M) 0)))))
+
+(DEFUN EDITMENU-META-F (M)
+ (LET (FOUND DONE)
+ (WHILE (AND (OR (< (NTH 16 M) (1- (LENGTH (NTH 10 M))))
+ (< (NTH 15 M) (LENGTH (NTH (NTH 16 M) (NTH 10 M)))))
+ (NOT FOUND))
+ (IF (EDITMENU-ALPHANUMBERICP (EDITMENU-CURRENT-CHAR M))
+ (SETQ FOUND T) (EDITMENU-FORWARD M)))
+ (IF FOUND
+ (WHILE (AND (OR (< (NTH 16 M) (1- (LENGTH (NTH 10 M))))
+ (< (NTH 15 M)
+ (LENGTH (NTH (NTH 16 M) (NTH 10 M)))))
+ (NOT DONE))
+ (IF (EDITMENU-ALPHANUMBERICP (EDITMENU-CURRENT-CHAR M))
+ (EDITMENU-FORWARD M) (SETQ DONE T))))))
+
+(DEFUN EDITMENU-ALPHANUMBERICP (X)
+ (OR (ALPHA-CHAR-P X) (NOT (NULL (DIGIT-CHAR-P X)))))
+
+(DEFUN EDITMENU-NEXT (M)
+ (LET ((LINECONS (NTHCDR (NTH 16 M) (NTH 10 M))))
+ (INCF (NTH 16 M))
+ (IF (NULL (CDR LINECONS)) (SETF (CDR LINECONS) (LIST "")))
+ (SETQ LINECONS (CDR LINECONS))
+ (SETF (NTH 15 M) (MIN (NTH 15 M) (LENGTH (CAR LINECONS))))))
+
+(DEFUN EDITMENU-BACKWARD (M)
+ (IF (PLUSP (NTH 15 M)) (DECF (NTH 15 M))
+ (WHEN (PLUSP (NTH 16 M))
+ (DECF (NTH 16 M))
+ (SETF (NTH 15 M) (LENGTH (NTH (NTH 16 M) (NTH 10 M)))))))
+
+(DEFUN EDITMENU-META-B (M)
+ (LET (FOUND DONE)
+ (WHILE (AND (OR (PLUSP (NTH 15 M)) (PLUSP (NTH 16 M))) (NOT FOUND))
+ (EDITMENU-BACKWARD M)
+ (IF (EDITMENU-ALPHANUMBERICP (EDITMENU-CURRENT-CHAR M))
+ (SETQ FOUND T)))
+ (WHEN FOUND
+ (WHILE (AND (OR (PLUSP (NTH 15 M)) (PLUSP (NTH 16 M)))
+ (NOT DONE))
+ (IF (EDITMENU-ALPHANUMBERICP (EDITMENU-CURRENT-CHAR M))
+ (EDITMENU-BACKWARD M) (SETQ DONE T)))
+ (UNLESS (EDITMENU-ALPHANUMBERICP (EDITMENU-CURRENT-CHAR M))
+ (EDITMENU-FORWARD M)))))
+
+(DEFUN EDITMENU-PREVIOUS (M)
+ (WHEN (PLUSP (NTH 16 M))
+ (DECF (NTH 16 M))
+ (SETF (NTH 15 M)
+ (MIN (NTH 15 M) (LENGTH (NTH (NTH 16 M) (NTH 10 M)))))))
+
+(DEFUN EDITMENU-DELETE (M)
+ (EDITMENU-FORWARD M)
+ (EDITMENU-BACKSPACE M))
+
+(DEFUN EDITMENU-KILL (M)
+ (LET ((LINECONS (NTHCDR (NTH 16 M) (NTH 10 M))))
+ (IF (< (NTH 15 M) (LENGTH (CAR LINECONS)))
+ (PROGN
+ (SETQ *WINDOW-EDITMENU-KILL-STRINGS*
+ (LIST (SUBSEQ (CAR LINECONS) (NTH 15 M))))
+ (SETF (CAR LINECONS) (SUBSEQ (CAR LINECONS) 0 (NTH 15 M)))
+ (EDITMENU-DISPLAY M (NTH 16 M) (NTH 15 M) T))
+ (EDITMENU-DELETE M))))
+
+(DEFUN EDITMENU-YANK (M)
+ (LET ((LINECONS (NTHCDR (NTH 16 M) (NTH 10 M))) (COL (NTH 15 M)))
+ (WHEN *WINDOW-EDITMENU-KILL-STRINGS*
+ (IF (<= (LENGTH (CAR LINECONS)) (NTH 15 M))
+ (PROGN
+ (SETF (CAR LINECONS)
+ (CONCATENATE 'STRING (CAR LINECONS)
+ (CAR *WINDOW-EDITMENU-KILL-STRINGS*)))
+ (SETF (NTH 15 M) (LENGTH (CAR LINECONS))))
+ (PROGN
+ (SETF (CAR LINECONS)
+ (CONCATENATE 'STRING (SUBSEQ (CAR LINECONS) 0 COL)
+ (CAR *WINDOW-EDITMENU-KILL-STRINGS*)
+ (SUBSEQ (CAR LINECONS) COL)))
+ (INCF (NTH 15 M)
+ (LENGTH (CAR *WINDOW-EDITMENU-KILL-STRINGS*)))))
+ (EDITMENU-DISPLAY M (NTH 16 M) COL T))))
+
+(DEFUN WINDOW-DRAW-CARAT (W X Y)
(WINDOW-SET-XOR W)
- (WINDOW-DRAW-LINE-XY W (- X 2) (- Y 2) (+ X 3) Y)
- (WINDOW-DRAW-LINE-XY W (+ X 3) Y (+ X 8) (- Y 2))
+ (WINDOW-DRAW-LINE-XY W (- X 5) (- Y 2) X Y)
+ (WINDOW-DRAW-LINE-XY W X Y (+ X 5) (- Y 2))
(WINDOW-UNSET W)
- (WINDOW-FORCE-OUTPUT W)))
+ (WINDOW-FORCE-OUTPUT W))
(DEFUN WINDOW-INIT-KEYMAP ()
(LET (MINCODE MAXCODE KEYCODE KEYSYM KEYNUM SHIFTKEYNUM CHAR)
Index: xgcl-2/gcl_general.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_general.lsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xgcl-2/gcl_general.lsp 5 Jan 2006 19:00:57 -0000 1.2
+++ xgcl-2/gcl_general.lsp 20 Jun 2006 22:53:17 -0000 1.3
@@ -1,5 +1,5 @@
(in-package :XLIB)
-; general.lsp Hiep Huu Nguyen 27 Aug 92
+; general.lsp Hiep Huu Nguyen ; 15 Sep 05; 24 Jan 06
; Copyright (c) 1994 Hiep Huu Nguyen and The University of Texas at Austin.
@@ -22,19 +22,24 @@
; Some of the files that interface to the Xlib are adapted from DEC/MIT files.
; See the file dec.copyright for details.
-(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))
+; 27 Aug 92
+; 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.
+
+(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))
@@ -42,36 +47,27 @@
(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)
( get-st-point2 (concatenate 'string string "")))
-(defentry vertex-array (int) (int vertex_array))
-(defentry vertex-pos-x (int int) (int vertex_pos_x))
-(defentry vertex-pos-y (int int) (int vertex_pos_y))
-(defentry vertex-pos-flag (int int) (int vertex_pos_flag))
-(defentry set-vertex-array (int int int int int) (void set_vertex_array))
-;(defentry Xdraw (int int int int int) (int "XDraw"))
-;(defentry Xdrawfilled (int int int int int) (int "XDrawFilled"))
-
Index: xgcl-2/gcl_menu-set.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_menu-set.lsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xgcl-2/gcl_menu-set.lsp 5 Jan 2006 19:00:57 -0000 1.2
+++ xgcl-2/gcl_menu-set.lsp 20 Jun 2006 22:53:17 -0000 1.3
@@ -1,8 +1,8 @@
-; menu-set.lsp Gordon S. Novak Jr. 05 Jan 95
+; menu-set.lsp Gordon S. Novak Jr. ; 02 Aug 04
; Functions to handle a set of menus within a single window.
-; Copyright (c) 1995 Gordon S. Novak Jr. and The University of Texas at Austin.
+; Copyright (c) 2004 Gordon S. Novak Jr. and The University of Texas at Austin.
; See the file gnu.license .
@@ -23,6 +23,8 @@
; Written by: Gordon S. Novak Jr., Department of Computer Sciences,
; University of Texas at Austin 78712. address@hidden
+; 12 Aug 96; 04 Nov 97; 28 Feb 02; 05 Jan 04; 03 Mar 04; 30 Jul 04
+
; (wtesta) ; in dwtest.lsp, to create window myw
; (setq ms (menu-set-create myw nil))
@@ -44,8 +46,6 @@
; repeat above as desired
; (menu-conns-move mc) ; click a menu and move it
-(in-package :user)
-
(glispobjects
(menu-set (listobject (window window)
@@ -82,6 +82,8 @@
(menu-port (list (port symbol) (menu-name symbol)) )
+(menu-selection (list (port symbol) (menu-name symbol) (button integer)) )
+
(menu-set-conn (list (from menu-port)
(to menu-port)))
@@ -100,25 +102,28 @@
(remove-items menu-conns-remove-items)
(find-conns menu-conns-find-conns)
(connected-ports menu-conns-connected-ports)
- (named-menu menu-conns-named-menu) ) )
+ (new-conn menu-conns-new-conn)
+ (named-menu menu-conns-named-menu)
+ (named-item menu-conns-named-item) ) )
) ; glispobjects
; 04 Sep 92; 09 Feb 94; 12 Oct 94
-(gldefun menu-set-create (w\:window &optional fn)
+(gldefun menu-set-create ((w window) &optional fn)
(a menu-set with window = w commandfn = fn))
; 05 Sep 92; 09 Sep 92; 10 Sep 92; 02 Nov 92; 05 May 93; 07 May 93; 04 Aug 93
-; 03 Jan 94; 07 Jan 94; 03 May 94; 05 Jan 95
+; 03 Jan 94; 07 Jan 94; 03 May 94; 05 Jan 95; 11 Apr 95; 03 Nov 97; 05 Jan 04
; Select from multiple menu-like regions within a window.
-; Result is a list of the name of the menu and the value selected from it,
-; e.g., (COMMAND QUIT) for selecting the QUIT item from the COMMAND menu.
+; Result is a menu-selection, i.e., a list of the value selected,
+; menu name, and button used,
+; e.g., (QUIT COMMAND 1) for selecting the QUIT item from the COMMAND menu.
; A click outside any menu returns ((x y) BACKGROUND button-code).
; enabled, if specified, is a list of names of menus enabled for selection.
-(gldefun menu-set-select (ms\:menu-set &optional redraw\:boolean
- enabled\:(listof symbol))
- (result menu-port)
- (let (res\:menu-port resb itm\:menu-set-item sel\:symbol lastx lasty)
+(gldefun menu-set-select ((ms menu-set) &optional (redraw boolean)
+ (enabled (listof symbol)))
+ (result menu-selection)
+ (let ((res menu-selection) resb (itm menu-set-item) (sel symbol) lastx lasty)
(if redraw (draw ms))
(while ~ (or res resb)
(setq itm (window-track-mouse (window ms)
@@ -130,147 +135,162 @@
(that menu-item with
(contains-xy (that menu-item) x y))))))
(if (numberp itm)
- then (resb \:= (list (a vector with x = lastx y = lasty)
- 'background itm))
- else (if (or (atom enabled)
+ (resb = (a menu-selection with
+ port (a vector with x = lastx y = lasty)
+ menu-name 'background
+ button itm))
+ (if (or (atom enabled)
(member (menu-name itm) enabled))
- then (sel \:= (menu-mselect (menu itm) (eq enabled t)))
+ (progn (sel = (menu-mselect (menu itm) (eq enabled t)))
(if sel
- then (res \:= (a menu-port with
+ (res = (a menu-selection with
menu-name (menu-name itm)
- port sel))
- else (if (*window-menu-code* <> 0)
- then (res \:= (a menu-port with
+ port sel
+ button *window-menu-code*))
+ (if (and *window-menu-code*
+ (*window-menu-code* <> 0))
+ (res = (a menu-selection with
menu-name (menu-name itm)
- port nil)))) ) ) )
+ port nil
+ button *window-menu-code*)))) ) )
))
(force-output (window ms))
(or res resb) ))
; 05 Sep 92; 25 Sep 92; 29 Sep 92
; Add a menu to a menu set.
; name is the name of the menu. sym is extra info such as data type.
-(gldefun menu-set-add-menu (ms\:menu-set name\:symbol sym\:symbol
- title\:string items
- &optional offset\:vector)
+(gldefun menu-set-add-menu ((ms menu-set) (name symbol) (sym symbol)
+ (title string) items
+ &optional (offset vector))
(let (menu)
- (menu \:= (menu-create items title (window ms) (x offset) (y offset) t t))
+ (menu = (menu-create items title (window ms) (x offset) (y offset) t t))
(init menu)
- (if ~ offset (offset \:= (get-box-position (window ms)
+ (if ~ offset (offset = (get-box-position (window ms)
(picture-width menu)
(picture-height menu))))
- ((parent-offset-x menu) \:= (x offset))
- ((parent-offset-y menu) \:= (y offset))
+ ((parent-offset-x menu) = (x offset))
+ ((parent-offset-y menu) = (y offset))
(add-item ms name sym menu) ))
; 25 Sep 92; 29 Sep 92; 07 May 93
-(gldefun menu-set-add-item (ms\:menu-set name\:symbol sym\:symbol menu\:menu)
+(gldefun menu-set-add-item ((ms menu-set) (name symbol) (sym symbol)
+ (menu menu))
((menu-items ms) _+ (a menu-set-item with menu-name = name sym = sym
menu = menu)) )
; 25 Sep 92
-(gldefun menu-set-remove-items (ms\:menu-set)
- ((menu-items ms) \:= nil) )
+(gldefun menu-set-remove-items ((ms menu-set))
+ ((menu-items ms) = nil) )
-; 06 Sep 92; 08 Sep 92; 14 Sep 92; 25 Sep 92; 29 Sep 92
-(gldefun menu-set-add-picmenu (ms\:menu-set name\:symbol sym\:symbol
- title\:string
- spec\:picmenu-spec
- &optional offset\:vector
- nobox\:boolean)
+; 06 Sep 92; 08 Sep 92; 14 Sep 92; 25 Sep 92; 29 Sep 92; 05 Jan 04; 23 Jun 04
+(gldefun menu-set-add-picmenu ((ms menu-set) (name symbol) (sym symbol)
+ (title string)
+ (spec picmenu-spec)
+ &optional (offset vector)
+ (nobox boolean))
(let (menu maxwidth maxheight)
- (if (symbolp spec)
- then (spec \:= (get spec 'picmenu-spec)) )
- (menu \:= (picmenu-create-from-spec spec title (window ms)
+ (if (and spec (symbolp spec))
+ (spec = (get spec 'picmenu-spec)) )
+ (menu = (picmenu-create-from-spec spec title (window ms)
(x offset) (y offset) t t (not nobox)))
- (maxwidth \:= (max (if title then ((* 9 (length title)) + 6)
- else 0)
+ (maxwidth = (max (if title ((* 9 (length title)) + 6) 0)
(drawing-width spec)))
- (maxheight \:= (if title then 15 else 0) + (drawing-height spec))
- (if ~ offset (offset \:= (get-box-position (window ms)
- maxwidth maxheight)))
- ((parent-offset-x menu) \:= (x offset))
- ((parent-offset-y menu) \:= (y offset))
+ (maxheight = (if title 15 0) + (drawing-height spec))
+ (if ~ offset (offset = (get-box-position (window ms) maxwidth maxheight)))
+ ((parent-offset-x menu) = (x offset))
+ ((parent-offset-y menu) = (y offset))
(add-item ms name sym menu) ))
; 11 Oct 93
-(gldefun menu-set-add-component (ms\:menu-set name\:symbol
- &optional offset\:vector)
+(gldefun menu-set-add-component ((ms menu-set) (name symbol)
+ &optional (offset vector))
(menu-set-add-picmenu ms (menu-set-name name) name nil name offset t))
-; 03 Jan 94
+; 03 Jan 94; 05 Jan 04
; Add a barmenu to a menu set.
-(gldefun menu-set-add-barmenu (ms\:menu-set name\:symbol sym\:symbol
- menu\:barmenu
- title\:string &optional offset\:vector)
+(gldefun menu-set-add-barmenu ((ms menu-set) (name symbol) (sym symbol)
+ (menu barmenu)
+ (title string) &optional (offset vector))
(let ()
(init menu)
- (if ~ offset (offset \:= (get-box-position (window ms)
- (picture-width menu)
- (picture-height menu))))
- ((parent-offset-x menu) \:= (x offset))
- ((parent-offset-y menu) \:= (y offset))
+ (if ~ offset
+ (offset = (get-box-position (window ms)
+ (picture-width menu) (picture-height menu))))
+ ((parent-offset-x menu) = (x offset))
+ ((parent-offset-y menu) = (y offset))
(add-item ms name sym menu) ))
; 11 Oct 93
-(gldefun menu-set-name (nm\:symbol) (result symbol)
+(gldefun menu-set-name ((nm symbol)) (result symbol)
(intern (symbol-name (gensym (symbol-name nm)))) )
-; 29 Sep 92; 07 May 93
-(gldefun menu-set-named-item (ms\:menu-set name\:symbol)
+; 29 Sep 92; 07 May 93; 28 Feb 02
+(gldefun menu-set-named-item ((ms menu-set) (name symbol))
(result menu-set-item)
- (that menu-item with (menu-name (that menu-item)) = name) )
+ (that menu-item with (menu-name (that menu-item)) == name) )
; 08 Sep 92; 29 Sep 92
-(gldefun menu-set-named-menu (ms\:menu-set name\:symbol)
+(gldefun menu-set-named-menu ((ms menu-set) (name symbol))
(result menu-set-menu)
(menu (named-item ms name)))
+; 30 Jul 04
+(gldefun menu-conns-named-item ((mc menu-conns) (name symbol))
+ (result menu-set-item)
+ (named-item (menu-set mc) name) )
+
; 01 Feb 94
-(gldefun menu-conns-named-menu (mc\:menu-conns name\:symbol)
+(gldefun menu-conns-named-menu ((mc menu-conns) (name symbol))
(result menu-set-menu)
(named-menu (menu-set mc) name) )
-; 29 Apr 93; 30 Apr 93
+; 29 Apr 93; 30 Apr 93; 05 Jan 04
; Find the item at specified position, if any
-(gldefun menu-set-find-item (ms\:menu-set pos\:vector)
+(gldefun menu-set-find-item ((ms menu-set) (pos vector))
(result menu-set-item)
(let (mitem)
(for mi in (menu-items ms) do
- (if (contains? (menu mi) pos) then (mitem \:= mi)))
+ (if (contains? (menu mi) pos)
+ (mitem = mi)))
mitem))
; 29 Apr 93
; Delete an item
-(gldefun menu-set-delete-item (ms\:menu-set mi\:menu-set-item)
+(gldefun menu-set-delete-item ((ms menu-set) (mi menu-set-item))
((menu-items ms) _- mi))
; 08 Sep 92; 10 Sep 92; 05 May 93; 06 May 93; 07 May 93
-(gldefun menu-set-move (ms\:menu-set)
+(gldefun menu-set-move ((ms menu-set))
(let (sel m)
- (sel \:= (menu-set-select ms nil t))
- (m \:= (named-menu ms (menu-name sel)))
+ (sel = (menu-set-select ms nil t))
+ (m = (named-menu ms (menu-name sel)))
(menu-reposition m) ))
-; 10 Sep 92; 05 Jan 94; 06 Jan 94
+; 10 Sep 92; 05 Jan 94; 06 Jan 94; 20 Apr 95; 12 Aug 96
; Draw either a menu or picmenu
(gldefun menu-mdraw (m)
(case (first m)
(menu (menu-draw m))
(picmenu (picmenu-draw m))
(barmenu (barmenu-draw m))
+ (textmenu (textmenu-draw m))
+ (editmenu (editmenu-draw m))
(t (glsend m draw)) ) )
-; 10 Sep 92; 29 Sep 92; 05 May 93; 03 Jan 94; 06 Jan 94
+; 10 Sep 92; 29 Sep 92; 05 May 93; 03 Jan 94; 06 Jan 94; 20 Apr 95; 21 Apr 95
+; 12 Aug 96
; Select from either a menu or picmenu
(gldefun menu-mselect (m &optional anyclick)
(case (first m)
(menu (menu-select m t))
(picmenu (picmenu-select m t anyclick))
(barmenu (barmenu-select m))
+ (textmenu (textmenu-select m t))
+ (editmenu (editmenu-select m t))
(t (glsend m select)) ) )
; 10 Sep 92; 06 Jan 94
-; Get item position from either a menu or picmenu
+; Get item position from either a menu or picmenu; 20 Apr 95
(gldefun menu-mitem-position (m name loc)
(case (first m)
(menu (menu-item-position m name loc))
@@ -278,170 +298,181 @@
(t (glsend m item-position name loc)) ) )
; 05 Sep 92; 08 Sep 92
-(gldefun menu-set-draw (ms\:menu-set)
+(gldefun menu-set-draw ((ms menu-set))
(let ()
(open (window ms))
(for item in (menu-items ms) do (draw (menu item))) ))
; 08 Sep 92; 28 Sep 92; 07 May 93; 25 Jan 94
-(gldefun menu-set-item-position (ms\:menu-set desc\:menu-port
- &optional loc\:symbol)
+(gldefun menu-set-item-position ((ms menu-set) (desc menu-port)
+ &optional (loc symbol))
(result vector)
(let (m)
- (m \:= (named-menu ms (menu-name desc)))
+ (m = (named-menu ms (menu-name desc)))
(or (menu-mitem-position m (port desc) loc)
(menu-mitem-position m nil loc)) )) ; header if it cannot be found
-; 08 Sep 92
-(gldefun menu-set-draw-conn (ms\:menu-set conn\:menu-set-conn)
+; 08 Sep 92; 05 Jan 04
+(gldefun menu-set-draw-conn ((ms menu-set) (conn menu-set-conn))
(let (pa pb tmp (desca (from conn)) (descb (to conn)))
- (pa \:= (menu-set-item-position ms desca 'center))
- (pb \:= (menu-set-item-position ms descb 'center))
+ (pa = (menu-set-item-position ms desca 'center))
+ (pb = (menu-set-item-position ms descb 'center))
(if ((x pa) > (x pb))
- then (tmp \:= desca)
- (desca \:= descb)
- (descb \:= tmp))
- (pa \:= (menu-set-item-position ms desca 'right))
- (pb \:= (menu-set-item-position ms descb 'left))
+ (progn (tmp = desca)
+ (desca = descb)
+ (descb = tmp)))
+ (pa = (menu-set-item-position ms desca 'right))
+ (pb = (menu-set-item-position ms descb 'left))
(draw-circle (window ms) pa 3)
(draw-line (window ms) pa pb)
(draw-circle (window ms) pb 3)
(force-output (window ms)) ))
-; 02 Dec 93; 07 Jan 94
-(gldefun menu-set-adjust (ms\:menu-set name\:symbol edge\:symbol
- from\:symbol offset\:integer)
+; 02 Dec 93; 07 Jan 94; 05 Jan 04
+(gldefun menu-set-adjust ((ms menu-set) (name symbol) (edge symbol)
+ (from symbol) (offset integer))
(let (m fromm place)
- (if (m \:= (named-item ms name))
- then (if from
- then (fromm \:= (named-item ms from))
- (place \:= (case edge
+ (if (m = (named-item ms name))
+ (progn
+ (if from
+ (progn (fromm = (named-item ms from))
+ (place = (case edge
(top (bottom fromm))
(bottom (top fromm))
(left (right fromm))
- (right (left fromm))))
- else (place \:= (case edge
+ (right (left fromm)))))
+ (place = (case edge
(top (height (window ms)))
((bottom left) 0)
(right (width (window ms))) )) )
- (case edge (top ((bottom m) \:= place - (height m) - offset))
- (bottom ((bottom m) \:= place + offset))
- (left ((left m) \:= place + offset))
- (right ((left m) \:= place - (width m) - offset)))) ))
+ (case edge (top ((bottom m) = place - (height m) - offset))
+ (bottom ((bottom m) = place + offset))
+ (left ((left m) = place + offset))
+ (right ((left m) = place - (width m) - offset)))) ) ))
-; 12 Oct 94
-(gldefun menu-conns-create (ms\:menu-set)
+; 12 Oct 94; 28 Feb 02
+(gldefun menu-conns-create ((ms menu-set))
(a menu-conns with menu-set = ms))
; 08 Sep 92
-(gldefun menu-conns-draw (mc\:menu-conns)
+(gldefun menu-conns-draw ((mc menu-conns))
(let ()
(draw (menu-set mc))
(for c in (connections mc) (draw-conn (menu-set mc) c)) ))
; 08 Sep 92
-(gldefun menu-conns-move (mc\:menu-conns)
+(gldefun menu-conns-move ((mc menu-conns))
(let ()
(menu-set-move (menu-set mc))
(clear (window mc))
(draw mc) ))
; 29 Apr 93
-(gldefun menu-conns-redraw (mc\:menu-conns)
+(gldefun menu-conns-redraw ((mc menu-conns))
(let ()
(clear (window mc))
(draw mc) ))
-; 08 Sep 92; 07 May 93; 21 Oct 93; 05 Jan 95
-(gldefun menu-conns-add-conn (mc\:menu-conns)
+; 08 Sep 92; 07 May 93; 21 Oct 93; 05 Jan 95; 28 Feb 02; 05 Jan 04
+(gldefun menu-conns-add-conn ((mc menu-conns))
(let (sel selb conn)
- (sel \:= (select (menu-set mc)))
- (if ((menu-name sel) = 'background)
- then sel
- else (selb \:= (select (menu-set mc)))
+ (sel = (select (menu-set mc)))
+ (if ((menu-name sel) == 'background)
+ sel
+ (progn (selb = (select (menu-set mc)))
(if ((menu-name selb) <> 'background)
- then (conn \:= (a menu-set-conn with from = sel to = selb))
+ (progn (conn = (a menu-set-conn with from = sel to = selb))
(draw-conn (menu-set mc) conn)
- ((connections mc) _+ conn))
- nil) ))
+ ((connections mc) _+ conn)))
+ nil) ) ))
+
+; 02 Aug 04
+(gldefun menu-conns-new-conn ((mc menu-conns) (fromname symbol)
+ (fromport symbol) (toname symbol)
+ (toport symbol))
+ (let (conn)
+ (conn = (a menu-set-conn with
+ from = (a menu-port with menu-name = fromname port = fromport)
+ to = (a menu-port with menu-name = toname port = toport)))
+ ((connections mc) _+ conn) ))
; 30 Apr 93
(gldefun menu-conns-add-item
- (mc\:menu-conns name\:symbol sym\:symbol menu\:menu)
+ ((mc menu-conns) (name symbol) (sym symbol) (menu menu))
(add-item (menu-set mc) name sym menu))
-; 29 Apr 93
+; 29 Apr 93; 05 Jan 04
; Find the connection that is selected by the given point, if any.
-(gldefun menu-conns-find-conn (mc\:menu-conns pt\:vector)
+(gldefun menu-conns-find-conn ((mc menu-conns) (pt vector))
(result menu-set-conn)
(let (ms ls found res pa pb tmp desca descb)
- (ls \:= (a line-segment))
- (ms \:= (menu-set mc))
+ (ls = (a line-segment))
+ (ms = (menu-set mc))
(for conn in (connections mc) when (not found) do
- (desca \:= (from conn))
- (descb \:= (to conn))
- (pa \:= (menu-set-item-position ms desca 'center))
- (pb \:= (menu-set-item-position ms descb 'center))
+ (desca = (from conn))
+ (descb = (to conn))
+ (pa = (menu-set-item-position ms desca 'center))
+ (pb = (menu-set-item-position ms descb 'center))
(if ((x pa) > (x pb))
- then (tmp \:= desca)
- (desca \:= descb)
- (descb \:= tmp))
- ((p1 ls) \:= (menu-set-item-position ms desca 'right))
- ((p2 ls) \:= (menu-set-item-position ms descb 'left))
+ (progn (tmp = desca)
+ (desca = descb)
+ (descb = tmp)))
+ ((p1 ls) = (menu-set-item-position ms desca 'right))
+ ((p2 ls) = (menu-set-item-position ms descb 'left))
(if (< (distance ls pt) 5)
- then (found \:= t)
- (res \:= conn)) )
+ (progn (found = t)
+ (res = conn)) ))
res))
; 29 Apr 93; 30 Apr 93
; Find the menu item that is selected by the given point, if any.
-(gldefun menu-conns-find-item (mc\:menu-conns pt\:vector)
+(gldefun menu-conns-find-item ((mc menu-conns) (pt vector))
(result menu-set-item)
(find-item (menu-set mc) pt))
; 29 Apr 93
; Delete a connection
-(gldefun menu-conns-delete-conn (mc\:menu-conns conn\:menu-set-conn)
+(gldefun menu-conns-delete-conn ((mc menu-conns) (conn menu-set-conn))
((connections mc) _- conn))
-; 29 Apr 93; 07 May 93
+; 29 Apr 93; 07 May 93; 28 Feb 02; 05 Jan 04
; Delete a menu item and all its connections
-(gldefun menu-conns-delete-item (mc\:menu-conns mi\:menu-set-item)
+(gldefun menu-conns-delete-item ((mc menu-conns) (mi menu-set-item))
(let (ms)
- (ms \:= (menu-set mc))
+ (ms = (menu-set mc))
(delete-item ms mi)
(for conn in (connections mc) do
- (if (or ((menu-name (from conn)) = (menu-name mi))
- ((menu-name (to conn)) = (menu-name mi)))
- then (delete-conn mc conn))) ))
+ (if (or ((menu-name (from conn)) == (menu-name mi))
+ ((menu-name (to conn)) == (menu-name mi)))
+ (delete-conn mc conn))) ))
; 30 Apr 93
-(gldefun menu-conns-remove-items (mc\:menu-conns)
+(gldefun menu-conns-remove-items ((mc menu-conns))
(remove-items (menu-set mc))
- ((connections mc) \:= nil))
+ ((connections mc) = nil))
-; 30 Apr 93; 07 May 93
+; 30 Apr 93; 07 May 93; 28 Feb 02; 05 Jan 04
; find all ports of a given named menu that are connected to something
-(gldefun menu-conns-connected-ports (mc\:menu-conns boxname\:symbol)
+(gldefun menu-conns-connected-ports ((mc menu-conns) (boxname symbol))
(let (ports)
(for conn in (connections mc) do
- (if (boxname = (menu-name (to conn)))
- then (pushnew (port (to conn)) ports)
- else (if (boxname = (menu-name (from conn)))
- then (pushnew (port (from conn)) ports))))
+ (if (boxname == (menu-name (to conn)))
+ (pushnew (port (to conn)) ports)
+ (if (boxname == (menu-name (from conn)))
+ (pushnew (port (from conn)) ports))))
ports))
-; 30 Apr 93; 07 May 93
+; 30 Apr 93; 07 May 93; 28 Feb 02
; Find connections of a given port of a named box
-(gldefun menu-conns-find-conns (mc\:menu-conns boxname\:symbol port\:symbol)
+(gldefun menu-conns-find-conns ((mc menu-conns) (boxname symbol) (port symbol))
(result (listof menu-port))
(let (res)
(for conn in (connections mc) do
- (if (and (boxname = (menu-name (to conn)))
- (port = (port (to conn))))
+ (if (and (boxname == (menu-name (to conn)))
+ (port == (port (to conn))))
(res _+ (from conn)))
- (if (and (boxname = (menu-name (from conn)))
- (port = (port (from conn))))
+ (if (and (boxname == (menu-name (from conn)))
+ (port == (port (from conn))))
(res _+ (to conn))) )
res))
Index: xgcl-2/gcl_sysinit.lsp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/gcl_sysinit.lsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- xgcl-2/gcl_sysinit.lsp 5 Jan 2006 19:06:14 -0000 1.3
+++ xgcl-2/gcl_sysinit.lsp 20 Jun 2006 22:53:17 -0000 1.4
@@ -48,7 +48,7 @@
(clines "load1(\"../xgcl-2/sysdef.lisp\");")
,@(sloop::sloop for x in files
for f = (substitute #\_ #\- x)
- for ff = (or (probe-file (format nil "~a.o" x)) (probe-file (format nil
"~a.lsp" 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- xgcl-2/general-c.c 5 Jan 2006 19:00:57 -0000 1.3
+++ xgcl-2/general-c.c 20 Jun 2006 22:53:17 -0000 1.4
@@ -1,4 +1,4 @@
-/* general-c.c Hiep Huu Nguyen 27 Aug 92 */
+/* general-c.c Hiep Huu Nguyen 27 Aug 92; 24 Jan 06 */
/* ; Copyright (c) 1994 Hiep Huu Nguyen and The University of Texas at Austin.
@@ -21,187 +21,37 @@
; Some of the files that interface to the Xlib are adapted from DEC/MIT files.
; See the file dec.copyright for details. */
+/* 24 Jan 06: edited by G. Novak to remove vertex_array functions,
+ remove includes, change function arg lists to new form */
#include <stdlib.h>
-#include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-/* $Xorg: X10.h,v 1.3 2000/08/17 19:46:42 cpqbld Exp $ */
-/*
- *
-Copyright 1985, 1986, 1987, 1998 The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- * The X Window System is a Trademark of The Open Group.
- *
- */
-
-
-/*
- * X10.h - Header definition and support file for the C subroutine
- * interface library for V10 support routines.
- */
-#ifndef _X10_H_
-#define _X10_H_
-
-/* Used in XDraw and XDrawFilled */
-
-typedef struct {
- short x, y;
- unsigned short flags;
-} Vertex;
-
-/* The meanings of the flag bits. If the bit is 1 the predicate is true */
-
-#define VertexRelative 0x0001 /* else absolute */
-#define VertexDontDraw 0x0002 /* else draw */
-#define VertexCurved 0x0004 /* else straight */
-#define VertexStartClosed 0x0008 /* else not */
-#define VertexEndClosed 0x0010 /* else not */
-/*#define VertexDrawLastPoint 0x0020 */ /* else don't */
-
-/*
-The VertexDrawLastPoint option has not been implemented in XDraw and
-XDrawFilled so it shouldn't be defined.
-*/
-
-/*
- * XAssoc - Associations used in the XAssocTable data structure. The
- * associations are used as circular queue entries in the association table
- * which is contains an array of circular queues (buckets).
- */
-typedef struct _XAssoc {
- struct _XAssoc *next; /* Next object in this bucket. */
- struct _XAssoc *prev; /* Previous obejct in this bucket. */
- Display *display; /* Display which ownes the id. */
- XID x_id; /* X Window System id. */
- char *data; /* Pointer to untyped memory. */
-} XAssoc;
-
-/*
- * XAssocTable - X Window System id to data structure pointer association
- * table. An XAssocTable is a hash table whose buckets are circular
- * queues of XAssoc's. The XAssocTable is constructed from an array of
- * XAssoc's which are the circular queue headers (bucket headers).
- * An XAssocTable consists an XAssoc pointer that points to the first
- * bucket in the bucket array and an integer that indicates the number
- * of buckets in the array.
- */
-typedef struct {
- XAssoc *buckets; /* Pointer to first bucket in bucket array.*/
- int size; /* Table size (number of buckets). */
-} XAssocTable;
-
-XAssocTable *XCreateAssocTable();
-char *XLookUpAssoc();
-
-#endif /* _X10_H_ */
-/* #include <X11/X10.h> */
-
-
-int char_array(size)
-int size;
+#define int long
+int char_array(int size)
{
return ((int) calloc (size, sizeof(char)));
}
-char char_pos (array, pos)
-char* array;
-int pos;
-{
- return (array[pos]);
-}
-
-
-int int_array(size)
-int size;
-{
- return ((int) calloc (size, sizeof(int)));
-}
-
-
-
-int int_pos (array, pos)
-int* array;
-int pos;
+char char_pos (char* array, int pos)
{
return (array[pos]);
}
-
-void set_char_array (array, pos, val)
-char* array;
-int pos;
-char val;
+void set_char_array (char* array, int pos, char val)
{
array[pos] = val;
}
-void set_int_array (array, pos, val)
-int* array;
-int pos;
-int val;
+int int_array(int size)
{
-array[pos] = val;
-}
-
-
-
-
-int vertex_array (size)
-int size;
-{
- return ((int) calloc (size, sizeof(Vertex)));
-
-}
-
-int vertex_pos_x (array, pos)
-Vertex* array;
-int pos;
-{
- return ((int) array[pos].x);
+ return ((int) calloc (size, sizeof(int)));
}
-int vertex_pos_y (array, pos)
-Vertex* array;
-int pos;
+int int_pos (int* array, int pos)
{
- return ((int) array[pos].y);
+ return (array[pos]);
}
-int vertex_pos_flag (array, pos)
-Vertex* array;
-int pos;
+void set_int_array (int* array, int pos, int val)
{
- return ((int) array[pos].flags);
+array[pos] = val;
}
-
-
-
-void set_vertex_array (array, pos, x, y, flag)
-Vertex* array;
-int pos;
-int x, y;
-int flag;
-{
- array[pos].x = x;
- array[pos].y = y;
- array[pos].flags = flag;
-
-}
Index: xgcl-2/makefile
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- xgcl-2/makefile 5 Jan 2006 19:00:57 -0000 1.5
+++ xgcl-2/makefile 20 Jun 2006 22:53:17 -0000 1.6
@@ -1,76 +1,8 @@
-############ BEGIN Things you may have to change ##########
-
-include ../makedefs
-# The main gcl source directory. Expects to find $(GCLDIR)/o/*.o etc.
-# and it will put saved_xgcl in $(GCLDIR)/unixport/saved_xgcl
-#GCLDIR = /fix/t2/camm/b/gcl
-
-# The current directory:
-SYSDIR = $(GCLDIR)/xgcl-2
-# way to get xlibraries:
-#X_LIBS = -L/usr/X11R6/lib -lXaw -lXmu -lXt -lXext -lX11
-# for RS6000 at UT:
-#X_LIBS = -L/usr/local/X11R5/lib -lXaw -lXmu -lXt -lXext -lX11
-
-# for Sun's at UT use -I/usr/local/X11R5/include
-IFLAGS = -I../h -I../o $(X_CFLAGS)
-
-############ END Things you may have to change ###############
-
-SYSTEM=xgcl
-
-# How to invoke gcl
-LISP = $(PORTDIR)/saved_gcl $(PORTDIR)/
-
-SRC = .
-PORTDIR =$(GCLDIR)/unixport
-
-CFLAGS += $(IFLAGS)
-
-C_OBJS=$(SYSDIR)/Xutil-2.o $(SYSDIR)/Events.o $(SYSDIR)/XStruct-2.o \
- $(SYSDIR)/XStruct-4.o $(SYSDIR)/general-c.o
-
-all: $(PORTDIR)/saved_$(SYSTEM) Xgcl
-
-maxobjs: $(shell echo *.lsp) $(PORTDIR)/saved_gcl
- echo '(load "sysdef.lisp")(setq si::*multiply-stacks* 2)'\
- '(xlib::compile-xgcl)' | $(LISP)
-
-$(PORTDIR)/saved_$(SYSTEM): $(C_OBJS) maxobjs
- (cd $(PORTDIR) ; $(MAKE) saved_xgcl INIT_SYSTEM_LSP="init_gcl.lsp"
SYSTEM="$(SYSTEM)" SYSTEM_OBJS="`cat $(SYSDIR)/maxobjs` $(C_OBJS) "
"EXTRA_LD_LIBS= $(X_LIBS)" PORTDIR="$(PORTDIR)")
- rm -f $(PORTDIR)/raw_$(SYSTEM)
-
-Xgcl:
- echo $(PORTDIR)/saved_$(SYSTEM) $(PORTDIR)/ > Xgcl
- chmod a+x Xgcl
-
-############ the C code ###############
-
-cmpinclude.h: ../h/cmpinclude.h
- ln -snf $< $@
-
-$(SYSDIR)/Xutil-2.o: cmpinclude.h $(SYSDIR)/Xutil-2.c
- $(CC) -c Xutil-2.c $(CFLAGS)
-
-$(SYSDIR)/Events.o: cmpinclude.h $(SYSDIR)/Events.c
- $(CC) -c Events.c $(CFLAGS)
-
-$(SYSDIR)/XStruct-2.o: cmpinclude.h $(SYSDIR)/XStruct-2.c
- $(CC) -c XStruct-2.c $(CFLAGS)
-
-$(SYSDIR)/XStruct-4.o: cmpinclude.h $(SYSDIR)/XStruct-4.c
- $(CC) -c XStruct-4.c $(CFLAGS)
-
-general-c.o: cmpinclude.h general-c.c
- $(CC) -c general-c.c $(CFLAGS)
-
-tar:
- $(MAKE) tar1 TARD=xgcl-`cat version`
-
-tar1:
- (cd .. ; tar cvf - $(TARD)/*.lsp $(TARD)/*.lisp $(TARD)/*.c
$(TARD)/*.paper $(TARD)/README $(TARD)/makefile $(TARD)/version | gzip -c >
$(TARD).tgz)
+saved_%: $(LISP)
+ echo '(load "sysdef.lisp")(xlib::compile-xgcl)(xlib::save-xgcl "$@")' |
$(LISP)
clean:
- rm -f *.o *.data Xgcl maxobjs $(PORTDIR)/saved_$(SYSTEM) cmpinclude.h
+ rm -f *.o *.data saved_* cmpinclude.h gcl*.c gmon.out
Index: xgcl-2/sysdef.lisp
===================================================================
RCS file: /cvsroot/gcl/gcl/xgcl-2/sysdef.lisp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- xgcl-2/sysdef.lisp 5 Jan 2006 19:00:57 -0000 1.3
+++ xgcl-2/sysdef.lisp 20 Jun 2006 22:53:17 -0000 1.4
@@ -35,19 +35,48 @@
"gcl_X10"
"gcl_Xinit"
"gcl_dwtrans"
- "gcl_sysinit"
+; "gcl_sysinit"
))
(defun compile-xgcl()
- (mapcar #'(lambda (x)
- (compile-file (format nil "~a.lsp" x) :system-p t)) *files*)
- )
+ (mapc (lambda (x)
+ (let ((x (concatenate 'string compiler::*cc* "-I../h " (namestring
x))))
+ (unless (zerop (system x))
+ (error "compile failure: ~s~%" x))))
+ (directory "*.c"))
+ (mapc (lambda (x)
+ (compile-file (format nil "~a.lsp" x) :system-p t)) *files*))
(defun load-xgcl()
- (mapcar #'(lambda (x) (load (format nil "~a.o" x))) *files*))
+ (mapcar (lambda (x) (load (format nil "~a.o" x))) *files*))
+(defun load-interp-xgcl()
+ (mapcar (lambda (x) (load (format nil "~a.lsp" x))) *files*))
+
+(defun save-xgcl (pn)
+ (let* ((x (mapcar (lambda (x) (probe-file (concatenate 'string x ".o")))
*files*))
+ (y (directory "*.o"))
+ (z (set-difference y x :test 'equal)))
+ (compiler::link x
+ (namestring pn)
+ (format nil "(load ~s)
+ (mapc 'load '~s)
+ (let ((si::*disable-recompile* nil))
+ (si::do-recompile ~s))"
+ "sysdef.lisp" x (let ((q "gcl_xrecompile.lsp"))
(when (probe-file q) (delete-file q)) q))
+ (reduce (lambda (&rest xy) (when xy (concatenate 'string
(namestring (car xy)) " " (cadr xy)))) z
+ :initial-value " -lXmu -lXt -lXext -lXaw6 -lX11"
:from-end t) nil)
+ (let ((x (append x (list "gcl_xrecompile.o"))))
+ (compiler::link x
+ (namestring pn)
+ (format nil "(load ~s)
+ (mapc 'load '~s)
+ (setq si::*optimize-maximum-pages* t
si::*disable-recompile* nil)"
+ "sysdef.lisp" x (let ((q "gcl_xrecompile.lsp"))
(when (probe-file q) (delete-file q)) q))
+ (reduce (lambda (&rest xy) (when xy (concatenate 'string
(namestring (car xy)) " " (cadr xy)))) z
+ :initial-value " -lXmu -lXt -lXext -lXaw6 -lX11"
:from-end t) nil))))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gcl-commits] gcl makefile o/cmpaux.c cmpnew/gcl_cmptop.lsp c...,
Camm Maguire <=