Mercurial > hg > xemacs-beta
annotate src/ui-gtk.h @ 5139:a48ef26d87ee
Clean up prototypes for Lisp variables/symbols. Put decls for them with
the other stuff related to the file they're in. In the process, fix a few
places with incorrect initialization of symbols and variables.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-12 Ben Wing <ben@xemacs.org>
* lisp.h:
* lisp.h (redo-symbols): Removed.
Put the Lisp variables and symbols where they belong, with other
stuff related to the file they're in.
* event-Xt.c (THIS_IS_X):
* event-Xt.c (syms_of_event_Xt):
* event-Xt.c (reinit_vars_of_event_Xt):
* event-gtk.c:
* event-gtk.c (syms_of_event_gtk):
* event-gtk.c (reinit_vars_of_event_gtk):
* event-stream.c:
* event-stream.c (syms_of_event_stream):
* event-stream.c (reinit_vars_of_event_stream):
* events.c (reinit_vars_of_events):
* events.c (vars_of_events):
`sans-modifiers' was defsymbol'ed more than once. Move it to
events-stream.c. `self-insert-command' was defsymbol'ed more than once.
Vevent_resource should be staticpro_nodump()ed as it's declared in
a reinit_*() method.
* lread.c (vars_of_lread):
Vfile_domain wasn't staticpro'ed.
* minibuf.c:
* minibuf.c (reinit_complex_vars_of_minibuf):
Vminibuffer_zero and Vecho_area_buffer weren't staticpro'ed.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 12 Mar 2010 20:23:50 -0600 |
parents | b3ce27ca7647 |
children | b5df3737028a |
rev | line source |
---|---|
462 | 1 /* ui-gtk.h |
2 ** | |
3 ** Description: | |
4 ** | |
5 ** Created by: William M. Perry | |
6 ** Copyright (c) 2000 Aventail Corporation | |
7 ** | |
4709
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
3017
diff
changeset
|
8 ** This file is part of XEmacs. |
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
3017
diff
changeset
|
9 ** |
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
3017
diff
changeset
|
10 ** XEmacs is free software; you can redistribute it and/or modify it |
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
3017
diff
changeset
|
11 ** under the terms of the GNU General Public License as published by the |
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
3017
diff
changeset
|
12 ** Free Software Foundation; either version 2, or (at your option) any |
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
3017
diff
changeset
|
13 ** later version. |
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
3017
diff
changeset
|
14 ** |
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
3017
diff
changeset
|
15 ** XEmacs is distributed in the hope that it will be useful, but WITHOUT |
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
3017
diff
changeset
|
16 ** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
3017
diff
changeset
|
17 ** FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
3017
diff
changeset
|
18 ** for more details. |
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
3017
diff
changeset
|
19 ** |
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
3017
diff
changeset
|
20 ** You should have received a copy of the GNU General Public License |
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
3017
diff
changeset
|
21 ** along with XEmacs; see the file COPYING. If not, write to |
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
3017
diff
changeset
|
22 ** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, |
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
3017
diff
changeset
|
23 ** Boston, MA 02111-1301, USA. */ |
462 | 24 |
25 #ifndef __UI_GTK_H__ | |
26 #define __UI_GTK_H__ | |
27 | |
28 /* Encapsulate a foreign function call */ | |
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
29 |
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
30 #include "sysgtk.h" |
462 | 31 #include "sysdll.h" |
32 | |
33 typedef void (*ffi_actual_function) (void); | |
34 typedef void (*ffi_marshalling_function) (ffi_actual_function, GtkArg *); | |
35 | |
36 #define MAX_GTK_ARGS 100 | |
37 | |
38 typedef struct { | |
3017 | 39 struct LCRECORD_HEADER header; |
462 | 40 GtkType return_type; |
41 GtkType args[MAX_GTK_ARGS]; | |
42 gint n_args; | |
43 Lisp_Object function_name; | |
44 dll_func function_ptr; | |
45 ffi_marshalling_function marshal; | |
46 } emacs_ffi_data; | |
47 | |
48 DECLARE_LRECORD (emacs_ffi, emacs_ffi_data); | |
49 | |
50 #define XFFI(x) XRECORD (x, emacs_ffi, emacs_ffi_data) | |
617 | 51 #define wrap_emacs_ffi(p) wrap_record (p, emacs_ffi) |
462 | 52 #define FFIP(x) RECORDP (x, emacs_ffi) |
53 #define CHECK_FFI(x) CHECK_RECORD (x, emacs_ffi) | |
54 | |
55 /* Encapsulate a GtkObject in Lisp */ | |
56 typedef struct { | |
3017 | 57 struct LCRECORD_HEADER header; |
462 | 58 gboolean alive_p; |
59 GtkObject *object; | |
60 Lisp_Object plist; | |
61 } emacs_gtk_object_data; | |
62 | |
63 DECLARE_LRECORD (emacs_gtk_object, emacs_gtk_object_data); | |
64 | |
65 #define XGTK_OBJECT(x) XRECORD (x, emacs_gtk_object, emacs_gtk_object_data) | |
617 | 66 #define wrap_emacs_gtk_object(p) wrap_record (p, emacs_gtk_object) |
462 | 67 #define GTK_OBJECTP(x) RECORDP (x, emacs_gtk_object) |
68 #define CHECK_GTK_OBJECT(x) CHECK_RECORD (x, emacs_gtk_object) | |
69 | |
70 extern Lisp_Object build_gtk_object (GtkObject *obj); | |
71 | |
72 /* Encapsulate a GTK_TYPE_BOXED in lisp */ | |
73 typedef struct { | |
3017 | 74 struct LCRECORD_HEADER header; |
462 | 75 GtkType object_type; |
76 void *object; | |
77 } emacs_gtk_boxed_data; | |
78 | |
79 DECLARE_LRECORD (emacs_gtk_boxed, emacs_gtk_boxed_data); | |
80 | |
81 #define XGTK_BOXED(x) XRECORD (x, emacs_gtk_boxed, emacs_gtk_boxed_data) | |
617 | 82 #define wrap_emacs_gtk_boxed(p) wrap_record (p, emacs_gtk_boxed) |
462 | 83 #define GTK_BOXEDP(x) RECORDP (x, emacs_gtk_boxed) |
84 #define CHECK_GTK_BOXED(x) CHECK_RECORD (x, emacs_gtk_boxed) | |
85 | |
778 | 86 extern Lisp_Object build_gtk_boxed (void *obj, GtkType t); |
87 | |
462 | 88 #endif /* __UI_GTK_H__ */ |