comparison src/xterm.h @ 100401:5a21f5d2ef24

(struct xim_inst_t): Definition moved from xterm.c. (struct x_display_info): Remove unused member null_pixel. New member xim_callback_data.
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 13 Dec 2008 05:41:55 +0000
parents 72976c727c57
children e038c1a8307c
comparison
equal deleted inserted replaced
100400:81a626d61e0e 100401:5a21f5d2ef24
85 | StructureNotifyMask \ 85 | StructureNotifyMask \
86 | FocusChangeMask \ 86 | FocusChangeMask \
87 | LeaveWindowMask \ 87 | LeaveWindowMask \
88 | EnterWindowMask \ 88 | EnterWindowMask \
89 | VisibilityChangeMask) 89 | VisibilityChangeMask)
90
91 #ifdef HAVE_X11R6_XIM
92 /* Data structure passed to xim_instantiate_callback. */
93 struct xim_inst_t
94 {
95 struct x_display_info *dpyinfo;
96 char *resource_name;
97 };
98 #endif /* HAVE_X11R6_XIM */
90 99
91 /* Structure recording X pixmap and reference count. 100 /* Structure recording X pixmap and reference count.
92 If REFCOUNT is 0 then this record is free to be reused. */ 101 If REFCOUNT is 0 then this record is free to be reused. */
93 102
94 struct x_bitmap_record 103 struct x_bitmap_record
303 event). It points to the X focus frame's selected window's 312 event). It points to the X focus frame's selected window's
304 frame. It differs from x_focus_frame when we're using a global 313 frame. It differs from x_focus_frame when we're using a global
305 minibuffer. */ 314 minibuffer. */
306 struct frame *x_highlight_frame; 315 struct frame *x_highlight_frame;
307 316
308 /* The null pixel used for filling a character background with
309 background color of a gc. */
310 Pixmap null_pixel;
311
312 /* The gray pixmap. */ 317 /* The gray pixmap. */
313 Pixmap gray; 318 Pixmap gray;
314 319
315 #ifdef HAVE_X_I18N 320 #ifdef HAVE_X_I18N
316 /* XIM (X Input method). */ 321 /* XIM (X Input method). */
317 XIM xim; 322 XIM xim;
318 XIMStyles *xim_styles; 323 XIMStyles *xim_styles;
324 struct xim_inst_t *xim_callback_data;
319 #endif 325 #endif
320 326
321 /* If non-null, a cache of the colors in the color map. Don't 327 /* If non-null, a cache of the colors in the color map. Don't
322 use this directly, call x_color_cells instead. */ 328 use this directly, call x_color_cells instead. */
323 XColor *color_cells; 329 XColor *color_cells;