[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src xterm.h
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/src xterm.h |
Date: |
Sat, 13 Dec 2008 05:41:55 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 08/12/13 05:41:55
Modified files:
src : xterm.h
Log message:
(struct xim_inst_t): Definition moved from xterm.c.
(struct x_display_info): Remove unused member null_pixel. New
member xim_callback_data.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.h?cvsroot=emacs&r1=1.207&r2=1.208
Patches:
Index: xterm.h
===================================================================
RCS file: /sources/emacs/emacs/src/xterm.h,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -b -r1.207 -r1.208
--- xterm.h 18 Sep 2008 18:09:45 -0000 1.207
+++ xterm.h 13 Dec 2008 05:41:55 -0000 1.208
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src xterm.h,
Chong Yidong <=