Mercurial > emacs

changeset 100401:5a21f5d2ef24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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 81a626d61e0e
children 6a2e1b91fbd1
files src/xterm.h
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/xterm.h	Sat Dec 13 05:40:29 2008 +0000
+++ b/src/xterm.h	Sat Dec 13 05:41:55 2008 +0000
@@ -88,6 +88,15 @@
    | EnterWindowMask		\
    | VisibilityChangeMask)
 
+#ifdef HAVE_X11R6_XIM
+/* Data structure passed to xim_instantiate_callback.  */
+struct xim_inst_t
+{
+  struct x_display_info *dpyinfo;
+  char *resource_name;
+};
+#endif /* HAVE_X11R6_XIM */
+
 /* Structure recording X pixmap and reference count.
    If REFCOUNT is 0 then this record is free to be reused.  */
 
@@ -305,10 +314,6 @@
      minibuffer.  */
   struct frame *x_highlight_frame;
 
-  /* The null pixel used for filling a character background with
-     background color of a gc.  */
-  Pixmap null_pixel;
-
   /* The gray pixmap.  */
   Pixmap gray;
 
@@ -316,6 +321,7 @@
   /* XIM (X Input method).  */
   XIM xim;
   XIMStyles *xim_styles;
+  struct xim_inst_t *xim_callback_data;
 #endif
 
   /* If non-null, a cache of the colors in the color map.  Don't