projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update.
[chise/xemacs-chise.git-]
/
src
/
console-x.h
diff --git
a/src/console-x.h
b/src/console-x.h
index
85bc5a3
..
1850c21
100644
(file)
--- a/
src/console-x.h
+++ b/
src/console-x.h
@@
-35,22
+35,14
@@
Boston, MA 02111-1307, USA. */
#ifdef HAVE_X_WINDOWS
#include "console.h"
#ifdef HAVE_X_WINDOWS
#include "console.h"
+/* must come before Xutil.h, which is included indirectly from xintrinsic.h,
+ to avoid breakage in keysym-parsing macros from X11R6, at least X.org as
+ of 2005-01-17, and probably XFree86 too from reports on c.e.x */
+#include <X11/keysym.h>
#include "xintrinsic.h"
#include <X11/cursorfont.h>
#include "xintrinsic.h"
#include <X11/cursorfont.h>
-#include <X11/keysym.h>
#include <X11/Xatom.h>
#include <X11/Xatom.h>
-
-#if 0 /* mrb - Xos sux. */
-#ifdef USG
-#undef USG /* ####KLUDGE for Solaris 2.2 and up */
-#include <X11/Xos.h>
-#define USG
-#else
-#include <X11/Xos.h>
-#endif
-#endif /* 0 */
-
#include <X11/StringDefs.h>
#ifdef HAVE_XPM
#include <X11/StringDefs.h>
#ifdef HAVE_XPM
@@
-76,7
+68,7
@@
struct x_device
/* Xt application info. */
Widget Xt_app_shell;
/* Xt application info. */
Widget Xt_app_shell;
- /* Cache of GC's for frame's on this device. */
+ /* Cache of GC's for frames on this device. */
struct gc_cache *gc_cache;
/* Selected visual, depth and colormap for this device */
struct gc_cache *gc_cache;
/* Selected visual, depth and colormap for this device */
@@
-181,6
+173,7
@@
struct x_device
unsigned int need_to_add_mask, down_mask;
KeyCode last_downkey;
Time release_time;
unsigned int need_to_add_mask, down_mask;
KeyCode last_downkey;
Time release_time;
+ Time modifier_release_time;
};
#define DEVICE_X_DATA(d) DEVICE_TYPE_DATA (d, x)
};
#define DEVICE_X_DATA(d) DEVICE_TYPE_DATA (d, x)
@@
-383,7
+376,7
@@
extern Lisp_Object Vdefault_x_device;
/* Number of pixels below each line. */
extern int x_interline_space; /* #### implement me */
/* Number of pixels below each line. */
extern int x_interline_space; /* #### implement me */
-extern int x_selection_timeout;
+extern Fixnum x_selection_timeout;
struct frame *x_any_window_to_frame (struct device *d, Window);
struct frame *x_any_widget_or_parent_to_frame (struct device *d,
struct frame *x_any_window_to_frame (struct device *d, Window);
struct frame *x_any_widget_or_parent_to_frame (struct device *d,
@@
-415,7
+408,7
@@
int x_IO_error_handler (Display *disp);
void x_redraw_exposed_area (struct frame *f, int x, int y,
int width, int height);
void x_output_string (struct window *w, struct display_line *dl,
void x_redraw_exposed_area (struct frame *f, int x, int y,
int width, int height);
void x_output_string (struct window *w, struct display_line *dl,
- Emchar_dynarr *buf, int xpos, int xoffset,
+ Charc_dynarr *buf, int xpos, int xoffset,
int start_pixpos, int width, face_index findex,
int cursor, int cursor_start, int cursor_width,
int cursor_height);
int start_pixpos, int width, face_index findex,
int cursor, int cursor_start, int cursor_width,
int cursor_height);