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
bd36a64
..
1850c21
100644
(file)
--- a/
src/console-x.h
+++ b/
src/console-x.h
@@
-35,10
+35,13
@@
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/StringDefs.h>
#include <X11/Xatom.h>
#include <X11/StringDefs.h>
@@
-373,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,
@@
-405,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);