annotate src/ui-gtk.h @ 5222:18c0b5909d16

Use keywords in structure syntax; new #define, NEED_TO_HANDLE_21_4_CODE 1 src/ChangeLog addition: 2010-05-31 Aidan Kehoe <kehoea@parhasard.net> * rangetab.c (print_range_table, rangetab_instantiate) (structure_type_create_rangetab): * chartab.c (print_char_table, chartab_instantiate) (structure_type_create_chartab): * faces.c (syms_of_faces, print_face, face_validate): Move structure syntax in these files to using keywords by default, as is done in Common Lisp and GNU Emacs, accepting for the moment the older non-keywords syntax too. * glyphs.h: No need to have Q_data here. * general-slots.h: Add Q_data, Q_type here. * config.h.in (NEED_TO_HANDLE_21_4_CODE): New #define, always 1 for the moment, replacing the previous never-really-used NO_NEED_TO_HANDLE_21_4_CODE, and avoiding confusing syntax. * eval.c (Ffuncall): Wrap the hack that allows #'throw to be funcalled in #ifdef NEED_TO_HANDLE_21_4_CODE. * elhash.c (syms_of_elhash): Move Q_type, Q_data to general-slots.h. Change to NEED_TO_HANDLE_21_4_CODE throughout this file. lisp/ChangeLog addition: 2010-05-31 Aidan Kehoe <kehoea@parhasard.net> * specifier.el (current-display-table): Use keywords in the structure syntax here, now we've moved to that by default in C.
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 31 May 2010 16:47:44 +0100
parents a9c41067dd88
children ba07c880114a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
1 /* ui-gtk.h
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
2 **
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
3 ** Description:
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
4 **
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
5 ** Created by: William M. Perry
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
6 ** Copyright (c) 2000 Aventail Corporation
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
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
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
24
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
25 #ifndef __UI_GTK_H__
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
26 #define __UI_GTK_H__
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
27
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
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
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
31 #include "sysdll.h"
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
32
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
33 typedef void (*ffi_actual_function) (void);
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
34 typedef void (*ffi_marshalling_function) (ffi_actual_function, GtkArg *);
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
35
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
36 #define MAX_GTK_ARGS 100
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
37
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
38 typedef struct {
5127
a9c41067dd88 more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents: 5125
diff changeset
39 NORMAL_LISP_OBJECT_HEADER header;
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
40 GtkType return_type;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
41 GtkType args[MAX_GTK_ARGS];
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
42 gint n_args;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
43 Lisp_Object function_name;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
44 dll_func function_ptr;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
45 ffi_marshalling_function marshal;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
46 } emacs_ffi_data;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
47
5118
e0db3c197671 merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents: 4709
diff changeset
48 DECLARE_LISP_OBJECT (emacs_ffi, emacs_ffi_data);
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
49
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
50 #define XFFI(x) XRECORD (x, emacs_ffi, emacs_ffi_data)
617
af57a77cbc92 [xemacs-hg @ 2001-06-18 07:09:50 by ben]
ben
parents: 462
diff changeset
51 #define wrap_emacs_ffi(p) wrap_record (p, emacs_ffi)
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
52 #define FFIP(x) RECORDP (x, emacs_ffi)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
53 #define CHECK_FFI(x) CHECK_RECORD (x, emacs_ffi)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
54
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
55 /* Encapsulate a GtkObject in Lisp */
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
56 typedef struct {
5127
a9c41067dd88 more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents: 5125
diff changeset
57 NORMAL_LISP_OBJECT_HEADER header;
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
58 gboolean alive_p;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
59 GtkObject *object;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
60 Lisp_Object plist;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
61 } emacs_gtk_object_data;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
62
5118
e0db3c197671 merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents: 4709
diff changeset
63 DECLARE_LISP_OBJECT (emacs_gtk_object, emacs_gtk_object_data);
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
64
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
65 #define XGTK_OBJECT(x) XRECORD (x, emacs_gtk_object, emacs_gtk_object_data)
617
af57a77cbc92 [xemacs-hg @ 2001-06-18 07:09:50 by ben]
ben
parents: 462
diff changeset
66 #define wrap_emacs_gtk_object(p) wrap_record (p, emacs_gtk_object)
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
67 #define GTK_OBJECTP(x) RECORDP (x, emacs_gtk_object)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
68 #define CHECK_GTK_OBJECT(x) CHECK_RECORD (x, emacs_gtk_object)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
69
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
70 extern Lisp_Object build_gtk_object (GtkObject *obj);
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
71
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
72 /* Encapsulate a GTK_TYPE_BOXED in lisp */
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
73 typedef struct {
5127
a9c41067dd88 more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents: 5125
diff changeset
74 NORMAL_LISP_OBJECT_HEADER header;
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
75 GtkType object_type;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
76 void *object;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
77 } emacs_gtk_boxed_data;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
78
5118
e0db3c197671 merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents: 4709
diff changeset
79 DECLARE_LISP_OBJECT (emacs_gtk_boxed, emacs_gtk_boxed_data);
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
80
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
81 #define XGTK_BOXED(x) XRECORD (x, emacs_gtk_boxed, emacs_gtk_boxed_data)
617
af57a77cbc92 [xemacs-hg @ 2001-06-18 07:09:50 by ben]
ben
parents: 462
diff changeset
82 #define wrap_emacs_gtk_boxed(p) wrap_record (p, emacs_gtk_boxed)
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
83 #define GTK_BOXEDP(x) RECORDP (x, emacs_gtk_boxed)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
84 #define CHECK_GTK_BOXED(x) CHECK_RECORD (x, emacs_gtk_boxed)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
85
778
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents: 617
diff changeset
86 extern Lisp_Object build_gtk_boxed (void *obj, GtkType t);
2923009caf47 [xemacs-hg @ 2002-03-16 10:38:59 by ben]
ben
parents: 617
diff changeset
87
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
88 #endif /* __UI_GTK_H__ */