Mercurial > hg > xemacs-beta
annotate src/gtk-glue.c @ 5074:8af6a32b170d
Modify XLIKE_get_gc's prototype
src/ChangeLog addition:
2010-02-24 Didier Verna <didier@xemacs.org>
Modify XLIKE_get_gc's prototype.
* redisplay-xlike-inc.c (XLIKE_get_gc): Take a frame instead of a
device as first argument.
* redisplay-xlike-inc.c (XLIKE_output_string): Update caller.
* redisplay-xlike-inc.c (XLIKE_output_pixmap): Ditto.
* redisplay-xlike-inc.c (XLIKE_output_blank): Ditto.
* redisplay-xlike-inc.c (XLIKE_output_horizontal_line): Ditto.
* redisplay-xlike-inc.c (XLIKE_clear_region): Ditto.
* redisplay-xlike-inc.c (XLIKE_output_eol_cursor): Ditto.
* console-gtk.h (gtk_get_gc): Take a frame instead of a device as
first argument.
* gtk-glue.c (face_to_gc): Update caller.
| author | Didier Verna <didier@lrde.epita.fr> |
|---|---|
| date | Wed, 24 Feb 2010 15:45:20 +0100 |
| parents | e813cf16c015 |
| children | 5502045ec510 |
| rev | line source |
|---|---|
|
4709
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
2500
diff
changeset
|
1 /* |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
2500
diff
changeset
|
2 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:
2500
diff
changeset
|
3 |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
2500
diff
changeset
|
4 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:
2500
diff
changeset
|
5 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:
2500
diff
changeset
|
6 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:
2500
diff
changeset
|
7 later version. |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
2500
diff
changeset
|
8 |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
2500
diff
changeset
|
9 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:
2500
diff
changeset
|
10 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:
2500
diff
changeset
|
11 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:
2500
diff
changeset
|
12 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:
2500
diff
changeset
|
13 |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
2500
diff
changeset
|
14 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:
2500
diff
changeset
|
15 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:
2500
diff
changeset
|
16 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:
2500
diff
changeset
|
17 Boston, MA 02111-1301, USA. */ |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
2500
diff
changeset
|
18 |
| 462 | 19 GtkType GTK_TYPE_ARRAY = 0; |
| 20 GtkType GTK_TYPE_STRING_ARRAY = 0; | |
| 21 GtkType GTK_TYPE_FLOAT_ARRAY = 0; | |
| 22 GtkType GTK_TYPE_INT_ARRAY = 0; | |
| 23 GtkType GTK_TYPE_LISTOF = 0; | |
| 24 GtkType GTK_TYPE_STRING_LIST = 0; | |
| 25 GtkType GTK_TYPE_OBJECT_LIST = 0; | |
| 26 GtkType GTK_TYPE_GDK_GC = 0; | |
| 27 | |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
28 #include "console-gtk.h" |
| 876 | 29 #include "objects-gtk-impl.h" |
| 30 | |
| 462 | 31 static GtkType |
| 32 xemacs_type_register (gchar *name, GtkType parent) | |
| 33 { | |
| 34 GtkType type_id; | |
| 35 GtkTypeInfo info; | |
| 36 | |
| 37 info.type_name = name; | |
| 38 info.object_size = 0; | |
| 39 info.class_size = 0; | |
| 40 info.class_init_func = NULL; | |
| 41 info.object_init_func = NULL; | |
| 42 info.reserved_1 = NULL; | |
| 43 info.reserved_2 = NULL; | |
| 44 | |
| 45 type_id = gtk_type_unique (parent, &info); | |
| 46 | |
| 47 return (type_id); | |
| 48 } | |
| 49 | |
| 50 static void | |
| 51 xemacs_init_gtk_classes (void) | |
| 52 { | |
| 53 if (!GTK_TYPE_ARRAY) | |
| 54 { | |
| 55 GTK_TYPE_ARRAY = xemacs_type_register ("GtkArrayOf", 0); | |
| 56 GTK_TYPE_STRING_ARRAY = xemacs_type_register ("GtkArrayOfString", GTK_TYPE_ARRAY); | |
| 57 GTK_TYPE_FLOAT_ARRAY = xemacs_type_register ("GtkArrayOfFloat", GTK_TYPE_ARRAY); | |
| 58 GTK_TYPE_INT_ARRAY = xemacs_type_register ("GtkArrayOfInteger", GTK_TYPE_ARRAY); | |
| 59 GTK_TYPE_LISTOF = xemacs_type_register ("GtkListOf", 0); | |
| 60 GTK_TYPE_STRING_LIST = xemacs_type_register ("GtkListOfString", GTK_TYPE_LISTOF); | |
| 61 GTK_TYPE_OBJECT_LIST = xemacs_type_register ("GtkListOfObject", GTK_TYPE_LISTOF); | |
| 62 GTK_TYPE_GDK_GC = xemacs_type_register ("GdkGC", GTK_TYPE_BOXED); | |
| 63 } | |
| 64 } | |
| 65 | |
| 66 static void | |
| 67 xemacs_list_to_gtklist (Lisp_Object obj, GtkArg *arg) | |
| 68 { | |
| 69 CHECK_LIST (obj); | |
| 70 | |
| 71 if (arg->type == GTK_TYPE_STRING_LIST) | |
| 72 { | |
| 73 Lisp_Object temp = obj; | |
| 74 GList *strings = NULL; | |
| 75 | |
| 76 while (!NILP (temp)) | |
| 77 { | |
| 78 CHECK_STRING (XCAR (temp)); | |
| 79 temp = XCDR (temp); | |
| 80 } | |
| 81 | |
| 82 temp = obj; | |
| 83 | |
| 84 while (!NILP (temp)) | |
| 85 { | |
| 86 strings = g_list_append (strings, XSTRING_DATA (XCAR (temp))); | |
| 87 temp = XCDR (temp); | |
| 88 } | |
| 89 | |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
90 GTK_VALUE_POINTER (*arg) = strings; |
| 462 | 91 } |
| 92 else if (arg->type == GTK_TYPE_OBJECT_LIST) | |
| 93 { | |
| 94 Lisp_Object temp = obj; | |
| 95 GList *objects = NULL; | |
| 96 | |
| 97 while (!NILP (temp)) | |
| 98 { | |
| 99 CHECK_GTK_OBJECT (XCAR (temp)); | |
| 100 temp = XCDR (temp); | |
| 101 } | |
| 102 | |
| 103 temp = obj; | |
| 104 | |
| 105 while (!NILP (temp)) | |
| 106 { | |
| 107 objects = g_list_append (objects, XGTK_OBJECT (XCAR (temp))->object); | |
| 108 temp = XCDR (temp); | |
| 109 } | |
| 110 | |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
111 GTK_VALUE_POINTER (*arg) = objects; |
| 462 | 112 } |
| 113 else | |
| 114 { | |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
115 ABORT (); |
| 462 | 116 } |
| 117 } | |
| 118 | |
| 119 static void | |
| 120 __make_gtk_object_mapper (gpointer data, gpointer user_data) | |
| 121 { | |
| 122 Lisp_Object *rv = (Lisp_Object *) user_data; | |
| 123 | |
| 124 *rv = Fcons (build_gtk_object (GTK_OBJECT (data)), *rv); | |
| 125 } | |
| 126 | |
| 127 static void | |
| 128 __make_string_mapper (gpointer data, gpointer user_data) | |
| 129 { | |
| 130 Lisp_Object *rv = (Lisp_Object *) user_data; | |
| 131 | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
132 *rv = Fcons (build_cistring ((char *)data), *rv); |
| 462 | 133 } |
| 134 | |
| 135 static Lisp_Object | |
| 136 xemacs_gtklist_to_list (GtkArg *arg) | |
| 137 { | |
| 138 Lisp_Object rval = Qnil; | |
| 139 | |
| 140 if (GTK_VALUE_POINTER (*arg)) | |
| 141 { | |
| 142 if (arg->type == GTK_TYPE_STRING_LIST) | |
| 143 { | |
| 2054 | 144 g_list_foreach ((GList*) GTK_VALUE_POINTER (*arg), __make_string_mapper, &rval); |
| 462 | 145 } |
| 146 else if (arg->type == GTK_TYPE_OBJECT_LIST) | |
| 147 { | |
| 2054 | 148 g_list_foreach ((GList*) GTK_VALUE_POINTER (*arg), __make_gtk_object_mapper, &rval); |
| 462 | 149 } |
| 150 else | |
| 151 { | |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
152 ABORT (); |
| 462 | 153 } |
| 154 } | |
| 155 return (rval); | |
| 156 } | |
| 157 | |
| 158 static void | |
| 159 xemacs_list_to_array (Lisp_Object obj, GtkArg *arg) | |
| 160 { | |
| 161 CHECK_LIST (obj); | |
| 162 | |
| 163 #define FROB(ret_type,check_fn,extract_fn) \ | |
| 164 do { \ | |
| 165 Lisp_Object temp = obj; \ | |
| 166 int length = 0; \ | |
| 167 ret_type *array = NULL; \ | |
| 168 \ | |
| 169 while (!NILP (temp)) \ | |
| 170 { \ | |
| 171 check_fn (XCAR (temp)); \ | |
| 172 length++; \ | |
| 173 temp = XCDR (temp); \ | |
| 174 } \ | |
| 175 \ | |
| 176 array = xnew_array_and_zero (ret_type, length + 2); \ | |
| 177 temp = obj; \ | |
| 178 length = 0; \ | |
| 179 \ | |
| 180 while (!NILP (temp)) \ | |
| 181 { \ | |
| 182 array[length++] = extract_fn (XCAR (temp)); \ | |
| 183 temp = XCDR (temp); \ | |
| 184 } \ | |
| 185 \ | |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
186 GTK_VALUE_POINTER (*arg) = array; \ |
| 462 | 187 } while (0); |
| 188 | |
| 189 if (arg->type == GTK_TYPE_STRING_ARRAY) | |
| 190 { | |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
191 FROB (gchar *, CHECK_STRING, (gchar*) XSTRING_DATA); |
| 462 | 192 } |
| 193 else if (arg->type == GTK_TYPE_FLOAT_ARRAY) | |
| 194 { | |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
195 FROB (gfloat, CHECK_FLOAT, extract_float); |
| 462 | 196 } |
| 197 else if (arg->type == GTK_TYPE_INT_ARRAY) | |
| 198 { | |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
199 FROB (gint, CHECK_INT, XINT); |
| 462 | 200 } |
| 201 else | |
| 202 { | |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
203 ABORT (); |
| 462 | 204 } |
| 205 #undef FROB | |
| 206 } | |
| 207 | |
| 208 static GdkGC * | |
| 209 face_to_gc (Lisp_Object face) | |
| 210 { | |
|
5074
8af6a32b170d
Modify XLIKE_get_gc's prototype
Didier Verna <didier@lrde.epita.fr>
parents:
4962
diff
changeset
|
211 Lisp_Object frame = Fselected_frame (Qnil); |
| 462 | 212 |
|
5074
8af6a32b170d
Modify XLIKE_get_gc's prototype
Didier Verna <didier@lrde.epita.fr>
parents:
4962
diff
changeset
|
213 return (gtk_get_gc (XFRAME (frame), |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
214 Fspecifier_instance (Fget (face, Qfont, Qnil), |
|
5074
8af6a32b170d
Modify XLIKE_get_gc's prototype
Didier Verna <didier@lrde.epita.fr>
parents:
4962
diff
changeset
|
215 frame, Qnil, Qnil), |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
216 Fspecifier_instance (Fget (face, Qforeground, Qnil), |
|
5074
8af6a32b170d
Modify XLIKE_get_gc's prototype
Didier Verna <didier@lrde.epita.fr>
parents:
4962
diff
changeset
|
217 frame, Qnil, Qnil), |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
218 Fspecifier_instance (Fget (face, Qbackground, Qnil), |
|
5074
8af6a32b170d
Modify XLIKE_get_gc's prototype
Didier Verna <didier@lrde.epita.fr>
parents:
4962
diff
changeset
|
219 frame, Qnil, Qnil), |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
220 Fspecifier_instance (Fget (face, Qbackground_pixmap, |
|
5074
8af6a32b170d
Modify XLIKE_get_gc's prototype
Didier Verna <didier@lrde.epita.fr>
parents:
4962
diff
changeset
|
221 Qnil), |
|
8af6a32b170d
Modify XLIKE_get_gc's prototype
Didier Verna <didier@lrde.epita.fr>
parents:
4962
diff
changeset
|
222 frame, Qnil, Qnil), |
| 462 | 223 Qnil)); |
| 224 } | |
| 225 | |
| 226 static GtkStyle * | |
| 227 face_to_style (Lisp_Object face) | |
| 228 { | |
| 229 Lisp_Object device = Fselected_device (Qnil); | |
| 230 GtkStyle *style = gtk_style_new (); | |
| 231 int i; | |
| 232 | |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
233 Lisp_Object font = Fspecifier_instance (Fget (face, Qfont, Qnil), |
|
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
234 device, Qnil, Qnil); |
|
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
235 Lisp_Object fg = Fspecifier_instance (Fget (face, Qforeground, Qnil), |
|
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
236 device, Qnil, Qnil); |
|
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
237 Lisp_Object bg = Fspecifier_instance (Fget (face, Qbackground, Qnil), |
|
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
238 device, Qnil, Qnil); |
|
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
239 Lisp_Object pm = Fspecifier_instance (Fget (face, Qbackground_pixmap, |
|
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
240 Qnil), device, Qnil, Qnil); |
| 462 | 241 |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
242 for (i = 0; i < 5; i++) |
|
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
243 style->fg[i] = *COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (fg)); |
|
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
244 for (i = 0; i < 5; i++) |
|
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
245 style->bg[i] = *COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (bg)); |
| 462 | 246 |
| 247 if (IMAGE_INSTANCEP (pm)) | |
| 248 { | |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
249 for (i = 0; i < 5; i++) |
|
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
250 style->bg_pixmap[i] = XIMAGE_INSTANCE_GTK_PIXMAP (pm); |
| 462 | 251 } |
| 252 | |
| 253 style->font = FONT_INSTANCE_GTK_FONT (XFONT_INSTANCE (font)); | |
| 254 | |
| 255 return (style); | |
| 256 } | |
| 257 | |
| 258 static Lisp_Object | |
|
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
4709
diff
changeset
|
259 gdk_event_to_emacs_event (GdkEvent *ev) |
| 462 | 260 { |
| 1204 | 261 Lisp_Object event = Qnil; |
| 462 | 262 |
| 263 if (ev) | |
| 264 { | |
| 1204 | 265 Lisp_Event *emacs_event; |
| 266 | |
| 267 event = Fmake_event (Qnil, Qnil); | |
| 268 emacs_event = XEVENT (event); | |
| 269 | |
| 270 if (!gtk_event_to_emacs_event (NULL, ev, emacs_event)) | |
| 462 | 271 { |
| 272 /* We need to handle a few more cases than the normal event | |
| 273 ** loop does. Mainly the double/triple click events. | |
| 274 */ | |
| 275 if ((ev->type == GDK_2BUTTON_PRESS) || (ev->type == GDK_3BUTTON_PRESS)) | |
| 276 { | |
| 1204 | 277 set_event_type (emacs_event, misc_user_event); |
| 278 SET_EVENT_MISC_USER_BUTTON (emacs_event, ev->button.button); | |
| 279 SET_EVENT_MISC_USER_MODIFIERS (emacs_event, 0); | |
| 2054 | 280 SET_EVENT_MISC_USER_X (emacs_event, (int) ev->button.x); |
| 281 SET_EVENT_MISC_USER_Y (emacs_event, (int) ev->button.y); | |
| 462 | 282 if (ev->type == GDK_2BUTTON_PRESS) |
| 1204 | 283 SET_EVENT_MISC_USER_FUNCTION (emacs_event, intern ("double-click")); |
| 462 | 284 else |
| 1204 | 285 SET_EVENT_MISC_USER_FUNCTION (emacs_event, intern ("triple-click")); |
| 462 | 286 } |
| 287 else | |
| 288 { | |
| 1204 | 289 Fdeallocate_event (event); |
| 290 event = Qnil; | |
| 462 | 291 } |
| 292 } | |
| 293 } | |
| 1204 | 294 return (event); |
| 462 | 295 } |