#include <errno.h>
#include <setjmp.h>
#include <sys/stat.h>
-#include <sys/param.h>
+/* Caused redefinition of DBL_DIG on Netbsd; seems not to be needed. */
+/* #include <sys/param.h> */
+#include "frame.h"
#include "dispextern.h"
#include "termhooks.h"
#include "termopts.h"
#include "sinkmask.h"
#endif /* ! 0 */
#include "gnu.h"
-#include "frame.h"
#include "disptab.h"
#include "buffer.h"
#include "window.h"
#include "intervals.h"
#ifdef USE_X_TOOLKIT
-extern XtAppContext Xt_app_con;
-extern Widget Xt_app_shell;
extern void free_frame_menubar ();
extern void _XEditResCheckMessages ();
#endif /* USE_X_TOOLKIT */
#endif
#endif
-#define XMapWindow XMapRaised /* Raise them when mapping. */
-
-#ifdef FD_SET
-/* We could get this from param.h, but better not to depend on finding that.
- And better not to risk that it might define other symbols used in this
- file. */
-#ifdef FD_SETSIZE
-#define MAXDESC FD_SETSIZE
-#else
-#define MAXDESC 64
-#endif
-#define SELECT_TYPE fd_set
-#else /* no FD_SET */
-#define MAXDESC 32
-#define SELECT_TYPE int
-
-/* Define the macros to access a single-int bitmap of descriptors. */
-#define FD_SET(n, p) (*(p) |= (1 << (n)))
-#define FD_CLR(n, p) (*(p) &= ~(1 << (n)))
-#define FD_ISSET(n, p) (*(p) & (1 << (n)))
-#define FD_ZERO(p) (*(p) = 0)
-#endif /* no FD_SET */
-
-/* For sending Meta-characters. Do we need this? */
-#define METABIT 0200
-
#define min(a,b) ((a)<(b) ? (a) : (b))
#define max(a,b) ((a)>(b) ? (a) : (b))
\f
-/* Nonzero means we must reprint all windows
- because 1) we received an ExposeWindow event
- or 2) we received too many ExposeRegion events to record.
-
- This is never needed under X11. */
-static int expose_all_windows;
-
-/* Nonzero means we must reprint all icon windows. */
-
-static int expose_all_icons;
-
-#if defined (SIGIO) && defined (FIONREAD)
-int BLOCK_INPUT_mask;
-#endif /* ! defined (SIGIO) && defined (FIONREAD) */
-
-/* The id of a bitmap used for icon windows, in frames
- for which no specific bitmap was specified.
- This is 0 if we have not yet had a need to create the bitmap. */
-
-static int icon_bitmap;
-
-/* Font used for text icons. */
+/* This is a chain of structures for all the X displays currently in use. */
+struct x_display_info *x_display_list;
-static FONT_TYPE *icon_font_info;
-
-/* Stuff for dealing with the main icon title. */
-
-extern Lisp_Object Vcommand_line_args, Vsystem_name;
-char *x_id_name;
-
-/* Initial values of argv and argc. */
-extern char **initial_argv;
-extern int initial_argc;
-
-/* This is the X connection that we are using. */
-
-Display *x_current_display;
-
-/* The cursor to use for vertical scroll bars on x_current_display. */
-static Cursor x_vertical_scroll_bar_cursor;
+/* This is a list of cons cells, each of the form (NAME . FONT-LIST-CACHE),
+ one for each element of x_display_list and in the same order.
+ NAME is the name of the frame.
+ FONT-LIST-CACHE records previous values returned by x-list-fonts. */
+Lisp_Object x_display_name_list;
/* Frame being updated by update_frame. This is declared in term.c.
This is set by update_begin and looked at by all the
minibuffer. */
static struct frame *x_highlight_frame;
-/* From .Xdefaults, the value of "emacs.WarpMouse". If non-zero,
- mouse is moved to inside of frame when frame is de-iconified. */
-
-static int warp_mouse_on_deiconify;
+#ifdef USE_X_TOOLKIT
+/* The application context for Xt use. */
+XtAppContext Xt_app_con;
+#endif
/* During an update, maximum vpos for ins/del line operations to affect. */
static int curs_x;
static int curs_y;
-/* Reusable Graphics Context for drawing a cursor in a non-default face. */
-static GC scratch_cursor_gc;
-
/* Mouse movement.
In order to avoid asking for motion events and then throwing most
to Qnil, to tell XTmouse_position to return an ordinary motion event. */
static Lisp_Object last_mouse_scroll_bar;
-/* Record which buttons are currently pressed. */
-unsigned int x_mouse_grabbed;
-
/* This is a hack. We would really prefer that XTmouse_position would
return the time associated with the position it returns, but there
doesn't seem to be any way to wrest the timestamp from the server
it's somewhat accurate. */
static Time last_mouse_movement_time;
-/* These variables describe the range of text currently shown
- in its mouse-face, together with the window they apply to.
- As long as the mouse stays within this range, we need not
- redraw anything on its account. */
-static int mouse_face_beg_row, mouse_face_beg_col;
-static int mouse_face_end_row, mouse_face_end_col;
-static int mouse_face_past_end;
-static Lisp_Object mouse_face_window;
-static int mouse_face_face_id;
-
-/* 1 if a mouse motion event came and we didn't handle it right away because
- gc was in progress. */
-static int mouse_face_deferred_gc;
-
-/* FRAME and X, Y position of mouse when last checked for
- highlighting. X and Y can be negative or out of range for the frame. */
-static FRAME_PTR mouse_face_mouse_frame;
-static int mouse_face_mouse_x, mouse_face_mouse_y;
-
-/* Nonzero means defer mouse-motion highlighting. */
-static int mouse_face_defer;
-
/* Incremented by XTread_socket whenever it really tries to read events. */
#ifdef __STDC__
static int volatile input_signal_count;
static int input_signal_count;
#endif
-/* `t' if a mouse button is depressed. */
+/* Used locally within XTread_socket. */
+static int x_noop_count;
-extern Lisp_Object Vmouse_depressed;
+/* Initial values of argv and argc. */
+extern char **initial_argv;
+extern int initial_argc;
+
+extern Lisp_Object Vcommand_line_args, Vsystem_name;
/* Tells if a window manager is present or not. */
extern Lisp_Object Vx_no_window_manager;
-/* Timestamp that we requested selection data was made. */
-extern Time requestor_time;
-
-/* ID of the window requesting selection data. */
-extern Window requestor_window;
-
/* Nonzero enables some debugging for the X interface code. */
extern int _Xdebug;
extern Lisp_Object Qface, Qmouse_face;
-static int x_noop_count;
-
-
-/* From time to time we get info on an Emacs window, here. */
-
-static WINDOWINFO_TYPE windowinfo;
-
extern int errno;
/* A mask of extra modifier bits to put into every keyboard char. */
extern int extra_keyboard_modifiers;
-extern Display *XOpenDisplay ();
-extern Window XCreateWindow ();
+extern XrmDatabase x_load_resources ();
-extern Cursor XCreateCursor ();
-extern FONT_TYPE *XOpenFont ();
+void x_delete_display ();
static void flashback ();
static void redraw_previous_char ();
static void show_mouse_face ();
static void do_line_dance ();
-void dumpborder ();
static int XTcursor_to ();
static int XTclear_end_of_line ();
+static int x_io_error_quitter ();
+\f
+/* Return the struct x_display_info corresponding to DPY. */
+
+struct x_display_info *
+x_display_info_for_display (dpy)
+ Display *dpy;
+{
+ struct x_display_info *dpyinfo;
+
+ for (dpyinfo = x_display_list; dpyinfo; dpyinfo = dpyinfo->next)
+ if (dpyinfo->display == dpy)
+ return dpyinfo;
+ return 0;
+}
+
+#ifdef MULTI_PERDISPLAY
+/* Return the perdisplay struct corresponding to FRAME. */
+#undef get_perdisplay
+
+PERDISPLAY *
+get_perdisplay(frame)
+ FRAME_PTR frame;
+{
+ return get_perdisplay_macro (frame);
+}
+#define get_perdisplay(frame) get_perdisplay_macro (frame)
+#endif
\f
/* Starting and ending updates.
should never be called except during an update, the only exceptions
being XTcursor_to, XTwrite_glyphs and XTreassert_line_highlight. */
-extern int mouse_track_top, mouse_track_left, mouse_track_width;
-
static
XTupdate_begin (f)
struct frame *f;
BLOCK_INPUT;
- if (f == mouse_face_mouse_frame)
+ if (f == FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_frame)
{
/* Don't do highlighting for mouse motion during the update. */
- mouse_face_defer = 1;
- if (!NILP (mouse_face_window))
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_defer = 1;
+
+ /* If the frame needs to be redrawn,
+ simply forget about any prior mouse highlighting. */
+ if (FRAME_GARBAGED_P (f))
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_window = Qnil;
+
+ if (!NILP (FRAME_X_DISPLAY_INFO (f)->mouse_face_window))
{
int firstline, lastline, i;
- struct window *w = XWINDOW (mouse_face_window);
+ struct window *w = XWINDOW (FRAME_X_DISPLAY_INFO (f)->mouse_face_window);
/* Find the first, and the last+1, lines affected by redisplay. */
for (firstline = 0; firstline < f->height; firstline++)
}
/* Can we tell that this update does not affect the window
- where the mouse highlight is? If so, no need to turn off. */
+ where the mouse highlight is? If so, no need to turn off.
+ Likewise, don't do anything if the frame is garbaged;
+ in that case, the FRAME_CURRENT_GLYPHS that we would use
+ are all wrong, and we will redisplay that line anyway. */
if (! (firstline > (XFASTINT (w->top) + window_internal_height (w))
|| lastline < XFASTINT (w->top)))
- /* Otherwise turn off the mouse highlight now. */
- clear_mouse_face ();
+ clear_mouse_face (FRAME_X_DISPLAY_INFO (f));
}
}
do_line_dance ();
x_display_cursor (f, 1);
- if (f == mouse_face_mouse_frame)
- mouse_face_defer = 0;
+ if (f == FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_frame)
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_defer = 0;
#if 0
/* This fails in the case of having updated only the echo area
if we have switched buffers. In that case, FRAME_CURRENT_GLYPHS
have no relation to the contents of the window-buffer.
I don't know a clean way to check
for that case. window_end_valid isn't set up yet. */
- if (f == mouse_face_mouse_frame)
- note_mouse_highlight (f, mouse_face_mouse_x, mouse_face_mouse_y);
+ if (f == FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_frame)
+ note_mouse_highlight (f, FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_x,
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_y);
#endif
- XFlushQueue ();
+ XFlush (FRAME_X_DISPLAY (f));
UNBLOCK_INPUT;
}
XTframe_up_to_date (f)
FRAME_PTR f;
{
- if (mouse_face_deferred_gc || f == mouse_face_mouse_frame)
+ if (FRAME_X_DISPLAY_INFO (f)->mouse_face_deferred_gc
+ || f == FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_frame)
{
- note_mouse_highlight (mouse_face_mouse_frame,
- mouse_face_mouse_x, mouse_face_mouse_y);
- mouse_face_deferred_gc = 0;
+ note_mouse_highlight (FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_frame,
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_x,
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_y);
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_deferred_gc = 0;
}
}
\f
{
BLOCK_INPUT;
x_display_cursor (selected_frame, 1);
- XFlushQueue ();
+ XFlush (FRAME_X_DISPLAY (selected_frame));
UNBLOCK_INPUT;
}
}
determined by the face code CF. */
{
struct face *face = FRAME_DEFAULT_FACE (f);
- FONT_TYPE *font = FACE_FONT (face);
+ XFontStruct *font = FACE_FONT (face);
GC gc = FACE_GC (face);
int stippled = 0;
/* HL = 3 means use a mouse face previously chosen. */
if (hl == 3)
- cf = mouse_face_face_id;
+ cf = FRAME_X_DISPLAY_INFO (f)->mouse_face_face_id;
/* First look at the face of the text itself. */
if (cf != 0)
xgcv.font = face->font->fid;
xgcv.graphics_exposures = 0;
mask = GCForeground | GCBackground | GCFont | GCGraphicsExposures;
- if (scratch_cursor_gc)
- XChangeGC (x_current_display, scratch_cursor_gc, mask, &xgcv);
+ if (FRAME_X_DISPLAY_INFO (f)->scratch_cursor_gc)
+ XChangeGC (FRAME_X_DISPLAY (f),
+ FRAME_X_DISPLAY_INFO (f)->scratch_cursor_gc,
+ mask, &xgcv);
else
- scratch_cursor_gc
- = XCreateGC (x_current_display, window, mask, &xgcv);
- gc = scratch_cursor_gc;
+ FRAME_X_DISPLAY_INFO (f)->scratch_cursor_gc
+ = XCreateGC (FRAME_X_DISPLAY (f), window, mask, &xgcv);
+ gc = FRAME_X_DISPLAY_INFO (f)->scratch_cursor_gc;
#if 0
/* If this code is restored, it must also reset to the default stipple
if necessary. */
if (face->stipple && face->stipple != FACE_DEFAULT)
- XSetStipple (x_current_display, gc, face->stipple);
+ XSetStipple (FRAME_X_DISPLAY (f), gc, face->stipple);
#endif
}
}
font = f->display.x->font;
if (just_foreground)
- XDrawString (x_current_display, window, gc,
+ XDrawString (FRAME_X_DISPLAY (f), window, gc,
left, top + FONT_BASE (font), buf, len);
else
{
XSetFillStyle (FRAME_X_DISPLAY (f), gc, FillOpaqueStippled);
/* Draw stipple on background. */
- XFillRectangle (x_current_display, window, gc,
+ XFillRectangle (FRAME_X_DISPLAY (f), window, gc,
left, top,
FONT_WIDTH (font) * len,
FONT_HEIGHT (font));
XSetFillStyle (FRAME_X_DISPLAY (f), gc, FillSolid);
/* Draw the text, solidly, onto the stipple pattern. */
- XDrawString (x_current_display, window, gc,
+ XDrawString (FRAME_X_DISPLAY (f), window, gc,
left, top + FONT_BASE (font), buf, len);
}
else
- XDrawImageString (x_current_display, window, gc,
+ XDrawImageString (FRAME_X_DISPLAY (f), window, gc,
left, top + FONT_BASE (font), buf, len);
/* Clear the rest of the line's height. */
if (f->display.x->line_height != FONT_HEIGHT (font))
- XClearArea (x_current_display, window, left,
+ XClearArea (FRAME_X_DISPLAY (f), window, left,
top + FONT_HEIGHT (font),
FONT_WIDTH (font) * len,
/* This is how many pixels of height
underline_position = font->descent - 1;
if (face->underline)
- XFillRectangle (x_current_display, FRAME_X_WINDOW (f),
+ XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
FACE_GC (face),
left, (top
+ FONT_BASE (font)
register GLYPH *gp; /* Points to first GLYPH. */
register int n; /* Number of glyphs to display. */
int hl;
- FONT_TYPE *font;
+ XFontStruct *font;
{
register int len;
Window window = FRAME_X_WINDOW (f);
: f->display.x->normal_gc));
if (sizeof (GLYPH) == sizeof (XChar2b))
- XDrawImageString16 (x_current_display, window, drawing_gc,
+ XDrawImageString16 (FRAME_X_DISPLAY (f), window, drawing_gc,
left, top + FONT_BASE (font), (XChar2b *) gp, n);
else if (sizeof (GLYPH) == sizeof (unsigned char))
- XDrawImageString (x_current_display, window, drawing_gc,
+ XDrawImageString (FRAME_X_DISPLAY (f), window, drawing_gc,
left, top + FONT_BASE (font), (char *) gp, n);
else
/* What size of glyph ARE you using? And does X have a function to
BLOCK_INPUT;
+ do_line_dance ();
+
/* Notice if the cursor will be cleared by this operation. */
if (curs_y == f->phys_cursor_y
&& curs_x <= f->phys_cursor_x
&& f->phys_cursor_x < first_unused)
f->phys_cursor_x = -1;
- XClearArea (x_current_display, FRAME_X_WINDOW (f),
+ XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
CHAR_TO_PIXEL_COL (f, curs_x),
CHAR_TO_PIXEL_ROW (f, curs_y),
FONT_WIDTH (f->display.x->font) * (first_unused - curs_x),
BLOCK_INPUT;
- XClear (FRAME_X_WINDOW (f));
+ XClearWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
/* We have to clear the scroll bars, too. If we have changed
colors or something like that, then they should be notified. */
x_scroll_bar_clear (f);
- XFlushQueue ();
+ XFlush (FRAME_X_DISPLAY (f));
UNBLOCK_INPUT;
}
\f
int start_x = x - 2;
if (start_x < 0)
start_x = 0;
- XClearArea (x_current_display, FRAME_X_WINDOW (f),
+ XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
CHAR_TO_PIXEL_COL (f, x - 1),
CHAR_TO_PIXEL_ROW (f, y),
FONT_WIDTH (f->display.x->font),
int end_x = x + 2;
if (end_x > limit)
end_x = limit;
- XClearArea (x_current_display, FRAME_X_WINDOW (f),
+ XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
CHAR_TO_PIXEL_COL (f, x),
CHAR_TO_PIXEL_ROW (f, y),
FONT_WIDTH (f->display.x->font),
values.foreground = (f->display.x->foreground_pixel
^ f->display.x->background_pixel);
- gc = XCreateGC (x_current_display, FRAME_X_WINDOW (f),
+ gc = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
GCFunction | GCForeground, &values);
}
int width = PIXEL_WIDTH (f);
int height = PIXEL_HEIGHT (f);
- XFillRectangle (x_current_display, FRAME_X_WINDOW (f), gc,
+ XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), gc,
width/4, height/4, width/2, height/2);
- XFlush (x_current_display);
+ XFlush (FRAME_X_DISPLAY (f));
{
struct timeval wakeup, now;
}
}
- XFillRectangle (x_current_display, FRAME_X_WINDOW (f), gc,
+ XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), gc,
width/4, height/4, width/2, height/2);
- XFreeGC (x_current_display, gc);
- XFlush (x_current_display);
+ XFreeGC (FRAME_X_DISPLAY (f), gc);
+ XFlush (FRAME_X_DISPLAY (f));
}
}
/* Make audible bell. */
-#define XRINGBELL XBell (x_current_display, 0)
+#define XRINGBELL XBell (FRAME_X_DISPLAY (selected_frame), 0)
XTring_bell ()
{
- if (x_current_display == 0)
+ if (FRAME_X_DISPLAY (selected_frame) == 0)
return;
#if defined (HAVE_TIMEVAL) && defined (HAVE_SELECT)
{
BLOCK_INPUT;
XRINGBELL;
- XFlushQueue ();
+ XFlush (FRAME_X_DISPLAY (selected_frame));
UNBLOCK_INPUT;
}
}
flexlines = n;
}
\f
+/* These variables need not be per frame
+ because redisplay is done on a frame-by-frame basis
+ and the line dance for one frame is finished before
+ anything is done for anoter frame. */
+
/* Array of line numbers from cached insert/delete operations.
line_dance[i] is the old position of the line that we want
to move to line i, or -1 if we want a blank line there. */
for (j = i; (j < ht && line_dance[j] != -1
&& line_dance[j]-j == distance); ++j);
/* Copy [i,j) upward from [i+distance,j+distance) */
- XCopyArea (x_current_display, FRAME_X_WINDOW (f),
+ XCopyArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
FRAME_X_WINDOW (f), f->display.x->normal_gc,
intborder, CHAR_TO_PIXEL_ROW (f, i+distance),
f->width * FONT_WIDTH (f->display.x->font),
if (line_dance[i] != -1 && (distance = line_dance[i]-i) < 0)
{
for (j = i; (--j >= 0 && line_dance[j] != -1
- && line_dance[j]-j == distance); --j);
+ && line_dance[j]-j == distance););
/* Copy (j,i] downward from (j+distance, i+distance] */
- XCopyArea (x_current_display, FRAME_X_WINDOW (f),
+ XCopyArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
FRAME_X_WINDOW (f), f->display.x->normal_gc,
intborder, CHAR_TO_PIXEL_ROW (f, j+1+distance),
f->width * FONT_WIDTH (f->display.x->font),
{
for (j = i; j < ht && line_dance[j] == -1; ++j);
/* Clear [i,j) */
- XClearArea (x_current_display, FRAME_X_WINDOW (f),
+ XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
intborder, CHAR_TO_PIXEL_ROW (f, i),
f->width * FONT_WIDTH (f->display.x->font),
(j-i) * f->display.x->line_height, False);
}
\f
static void
-frame_highlight (frame)
- struct frame *frame;
+frame_highlight (f)
+ struct frame *f;
{
/* We used to only do this if Vx_no_window_manager was non-nil, but
the ICCCM (section 4.1.6) says that the window's border pixmap
and border pixel are window attributes which are "private to the
client", so we can always change it to whatever we want. */
BLOCK_INPUT;
- XSetWindowBorder (x_current_display, FRAME_X_WINDOW (frame),
- frame->display.x->border_pixel);
+ XSetWindowBorder (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+ f->display.x->border_pixel);
UNBLOCK_INPUT;
- x_display_cursor (frame, 1);
+ x_display_cursor (f, 1);
}
static void
-frame_unhighlight (frame)
- struct frame *frame;
+frame_unhighlight (f)
+ struct frame *f;
{
/* We used to only do this if Vx_no_window_manager was non-nil, but
the ICCCM (section 4.1.6) says that the window's border pixmap
and border pixel are window attributes which are "private to the
client", so we can always change it to whatever we want. */
BLOCK_INPUT;
- XSetWindowBorderPixmap (x_current_display, FRAME_X_WINDOW (frame),
- frame->display.x->border_tile);
+ XSetWindowBorderPixmap (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+ f->display.x->border_tile);
UNBLOCK_INPUT;
- x_display_cursor (frame, 1);
+ x_display_cursor (f, 1);
}
static void XTframe_rehighlight ();
/* The focus has changed. Update the frames as necessary to reflect
the new situation. Note that we can't change the selected frame
- here, because the lisp code we are interrupting might become confused.
+ here, because the Lisp code we are interrupting might become confused.
Each event gets marked with the frame in which it occurred, so the
- lisp code can tell when the switch took place by examining the events. */
+ Lisp code can tell when the switch took place by examining the events. */
static void
x_new_focus_frame (frame)
XTframe_rehighlight ();
}
+/* Handle an event saying the mouse has moved out of an Emacs frame. */
+
+void
+x_mouse_leave ()
+{
+ if (! x_focus_event_frame)
+ x_new_focus_frame (NULL);
+ else
+ x_new_focus_frame (x_focus_event_frame); /* Was f, but that seems wrong. */
+}
/* The focus has changed, or we have redirected a frame's focus to
another frame (this happens when a frame uses a surrogate
if (x_focus_frame)
{
- x_highlight_frame =
- ((XGCTYPE (FRAME_FOCUS_FRAME (x_focus_frame)) == Lisp_Frame)
- ? XFRAME (FRAME_FOCUS_FRAME (x_focus_frame))
- : x_focus_frame);
+ x_highlight_frame
+ = ((GC_FRAMEP (FRAME_FOCUS_FRAME (x_focus_frame)))
+ ? XFRAME (FRAME_FOCUS_FRAME (x_focus_frame))
+ : x_focus_frame);
if (! FRAME_LIVE_P (x_highlight_frame))
{
FRAME_FOCUS_FRAME (x_focus_frame) = Qnil;
\f
/* Keyboard processing - modifier keys, vendor-specific keysyms, etc. */
-/* Which modifier keys are on which modifier bits?
-
- With each keystroke, X returns eight bits indicating which modifier
- keys were held down when the key was pressed. The interpretation
- of the top five modifier bits depends on what keys are attached
- to them. If the Meta_L and Meta_R keysyms are on mod5, then mod5
- is the meta bit.
-
- x_meta_mod_mask is a mask containing the bits used for the meta key.
- It may have more than one bit set, if more than one modifier bit
- has meta keys on it. Basically, if EVENT is a KeyPress event,
- the meta key is pressed if (EVENT.state & x_meta_mod_mask) != 0.
-
- x_shift_lock_mask is LockMask if the XK_Shift_Lock keysym is on the
- lock modifier bit, or zero otherwise. Non-alphabetic keys should
- only be affected by the lock modifier bit if XK_Shift_Lock is in
- use; XK_Caps_Lock should only affect alphabetic keys. With this
- arrangement, the lock modifier should shift the character if
- (EVENT.state & x_shift_lock_mask) != 0. */
-static int x_meta_mod_mask, x_shift_lock_mask;
-
-/* These are like x_meta_mod_mask, but for different modifiers. */
-static int x_alt_mod_mask, x_super_mod_mask, x_hyper_mod_mask;
-
/* Initialize mode_switch_bit and modifier_meaning. */
static void
-x_find_modifier_meanings ()
+x_find_modifier_meanings (dpyinfo)
+ struct x_display_info *dpyinfo;
{
int min_code, max_code;
KeySym *syms;
int syms_per_code;
XModifierKeymap *mods;
- x_meta_mod_mask = 0;
- x_shift_lock_mask = 0;
- x_alt_mod_mask = 0;
- x_super_mod_mask = 0;
- x_hyper_mod_mask = 0;
+ dpyinfo->meta_mod_mask = 0;
+ dpyinfo->shift_lock_mask = 0;
+ dpyinfo->alt_mod_mask = 0;
+ dpyinfo->super_mod_mask = 0;
+ dpyinfo->hyper_mod_mask = 0;
#ifdef HAVE_X11R4
- XDisplayKeycodes (x_current_display, &min_code, &max_code);
+ XDisplayKeycodes (dpyinfo->display, &min_code, &max_code);
#else
- min_code = x_current_display->min_keycode;
- max_code = x_current_display->max_keycode;
+ min_code = display->min_keycode;
+ max_code = display->max_keycode;
#endif
- syms = XGetKeyboardMapping (x_current_display,
+ syms = XGetKeyboardMapping (dpyinfo->display,
min_code, max_code - min_code + 1,
&syms_per_code);
- mods = XGetModifierMapping (x_current_display);
+ mods = XGetModifierMapping (dpyinfo->display);
/* Scan the modifier table to see which modifier bits the Meta and
Alt keysyms are on. */
for (row = 3; row < 8; row++)
for (col = 0; col < mods->max_keypermod; col++)
{
- KeyCode code =
- mods->modifiermap[(row * mods->max_keypermod) + col];
+ KeyCode code
+ = mods->modifiermap[(row * mods->max_keypermod) + col];
/* Zeroes are used for filler. Skip them. */
if (code == 0)
{
case XK_Meta_L:
case XK_Meta_R:
- x_meta_mod_mask |= (1 << row);
+ dpyinfo->meta_mod_mask |= (1 << row);
break;
case XK_Alt_L:
case XK_Alt_R:
- x_alt_mod_mask |= (1 << row);
+ dpyinfo->alt_mod_mask |= (1 << row);
break;
case XK_Hyper_L:
case XK_Hyper_R:
- x_hyper_mod_mask |= (1 << row);
+ dpyinfo->hyper_mod_mask |= (1 << row);
break;
case XK_Super_L:
case XK_Super_R:
- x_super_mod_mask |= (1 << row);
+ dpyinfo->super_mod_mask |= (1 << row);
break;
case XK_Shift_Lock:
/* Ignore this if it's not on the lock modifier. */
if ((1 << row) == LockMask)
- x_shift_lock_mask = LockMask;
+ dpyinfo->shift_lock_mask = LockMask;
break;
}
}
}
/* If we couldn't find any meta keys, accept any alt keys as meta keys. */
- if (! x_meta_mod_mask)
+ if (! dpyinfo->meta_mod_mask)
{
- x_meta_mod_mask = x_alt_mod_mask;
- x_alt_mod_mask = 0;
+ dpyinfo->meta_mod_mask = dpyinfo->alt_mod_mask;
+ dpyinfo->alt_mod_mask = 0;
}
/* If some keys are both alt and meta,
make them just meta, not alt. */
- if (x_alt_mod_mask & x_meta_mod_mask)
+ if (dpyinfo->alt_mod_mask & dpyinfo->meta_mod_mask)
{
- x_alt_mod_mask &= ~x_meta_mod_mask;
+ dpyinfo->alt_mod_mask &= ~dpyinfo->meta_mod_mask;
}
XFree ((char *) syms);
/* Convert between the modifier bits X uses and the modifier bits
Emacs uses. */
static unsigned int
-x_x_to_emacs_modifiers (state)
+x_x_to_emacs_modifiers (dpyinfo, state)
+ struct x_display_info *dpyinfo;
unsigned int state;
{
- return ( ((state & (ShiftMask | x_shift_lock_mask)) ? shift_modifier : 0)
- | ((state & ControlMask) ? ctrl_modifier : 0)
- | ((state & x_meta_mod_mask) ? meta_modifier : 0)
- | ((state & x_alt_mod_mask) ? alt_modifier : 0)
- | ((state & x_super_mod_mask) ? super_modifier : 0)
- | ((state & x_hyper_mod_mask) ? hyper_modifier : 0));
+ return ( ((state & (ShiftMask | dpyinfo->shift_lock_mask)) ? shift_modifier : 0)
+ | ((state & ControlMask) ? ctrl_modifier : 0)
+ | ((state & dpyinfo->meta_mod_mask) ? meta_modifier : 0)
+ | ((state & dpyinfo->alt_mod_mask) ? alt_modifier : 0)
+ | ((state & dpyinfo->super_mod_mask) ? super_modifier : 0)
+ | ((state & dpyinfo->hyper_mod_mask) ? hyper_modifier : 0));
}
static unsigned int
-x_emacs_to_x_modifiers (state)
+x_emacs_to_x_modifiers (dpyinfo, state)
+ struct x_display_info *dpyinfo;
unsigned int state;
{
- return ( ((state & alt_modifier) ? x_alt_mod_mask : 0)
- | ((state & super_modifier) ? x_super_mod_mask : 0)
- | ((state & hyper_modifier) ? x_hyper_mod_mask : 0)
- | ((state & shift_modifier) ? ShiftMask : 0)
- | ((state & ctrl_modifier) ? ControlMask : 0)
- | ((state & meta_modifier) ? x_meta_mod_mask : 0));
+ return ( ((state & alt_modifier) ? dpyinfo->alt_mod_mask : 0)
+ | ((state & super_modifier) ? dpyinfo->super_mod_mask : 0)
+ | ((state & hyper_modifier) ? dpyinfo->hyper_mod_mask : 0)
+ | ((state & shift_modifier) ? ShiftMask : 0)
+ | ((state & ctrl_modifier) ? ControlMask : 0)
+ | ((state & meta_modifier) ? dpyinfo->meta_mod_mask : 0));
}
\f
/* Mouse clicks and mouse movement. Rah. */
result->kind = mouse_click;
result->code = event->button - Button1;
result->timestamp = event->time;
- result->modifiers = (x_x_to_emacs_modifiers (event->state)
+ result->modifiers = (x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f),
+ event->state)
| (event->type == ButtonRelease
? up_modifier
: down_modifier));
result->kind = mouse_click;
XSETINT (result->code, event->button - Button1);
result->timestamp = event->time;
- result->modifiers = (x_x_to_emacs_modifiers (event->state)
+ result->modifiers = (x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f),
+ event->state)
| (event->type == ButtonRelease
? up_modifier
: down_modifier));
if (disable_mouse_highlight)
return;
- mouse_face_mouse_x = x;
- mouse_face_mouse_y = y;
- mouse_face_mouse_frame = f;
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_x = x;
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_y = y;
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_frame = f;
- if (mouse_face_defer)
+ if (FRAME_X_DISPLAY_INFO (f)->mouse_face_defer)
return;
if (gc_in_progress)
{
- mouse_face_deferred_gc = 1;
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_deferred_gc = 1;
return;
}
/* Find out which glyph the mouse is on. */
pixel_to_glyph_coords (f, x, y, &column, &row,
- &new_glyph, x_mouse_grabbed);
+ &new_glyph, FRAME_X_DISPLAY_INFO (f)->grabbed);
/* Which window is that in? */
window = window_from_coordinates (f, column, row, &portion);
w = XWINDOW (window);
/* If we were displaying active text in another window, clear that. */
- if (! EQ (window, mouse_face_window))
- clear_mouse_face ();
+ if (! EQ (window, FRAME_X_DISPLAY_INFO (f)->mouse_face_window))
+ clear_mouse_face (FRAME_X_DISPLAY_INFO (f));
/* Are we in a window whose display is up to date?
And verify the buffer's text has not changed. */
pos = ptr[i];
/* Is it outside the displayed active region (if any)? */
if (pos <= 0)
- clear_mouse_face ();
- else if (! (EQ (window, mouse_face_window)
- && row >= mouse_face_beg_row
- && row <= mouse_face_end_row
- && (row > mouse_face_beg_row || column >= mouse_face_beg_col)
- && (row < mouse_face_end_row || column < mouse_face_end_col
- || mouse_face_past_end)))
+ clear_mouse_face (FRAME_X_DISPLAY_INFO (f));
+ else if (! (EQ (window, FRAME_X_DISPLAY_INFO (f)->mouse_face_window)
+ && row >= FRAME_X_DISPLAY_INFO (f)->mouse_face_beg_row
+ && row <= FRAME_X_DISPLAY_INFO (f)->mouse_face_end_row
+ && (row > FRAME_X_DISPLAY_INFO (f)->mouse_face_beg_row
+ || column >= FRAME_X_DISPLAY_INFO (f)->mouse_face_beg_col)
+ && (row < FRAME_X_DISPLAY_INFO (f)->mouse_face_end_row
+ || column < FRAME_X_DISPLAY_INFO (f)->mouse_face_end_col
+ || FRAME_X_DISPLAY_INFO (f)->mouse_face_past_end)))
{
Lisp_Object mouse_face, overlay, position;
Lisp_Object *overlay_vec;
ZV = Z;
/* Yes. Clear the display of the old active region, if any. */
- clear_mouse_face ();
+ clear_mouse_face (FRAME_X_DISPLAY_INFO (f));
/* Is this char mouse-active? */
XSETINT (position, pos);
before = Foverlay_start (overlay);
after = Foverlay_end (overlay);
/* Record this as the current active region. */
- fast_find_position (window, before, &mouse_face_beg_col,
- &mouse_face_beg_row);
- mouse_face_past_end
- = !fast_find_position (window, after, &mouse_face_end_col,
- &mouse_face_end_row);
- mouse_face_window = window;
- mouse_face_face_id = compute_char_face (f, w, pos, 0, 0,
- &ignore, pos + 1, 1);
+ fast_find_position (window, before,
+ &FRAME_X_DISPLAY_INFO (f)->mouse_face_beg_col,
+ &FRAME_X_DISPLAY_INFO (f)->mouse_face_beg_row);
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_past_end
+ = !fast_find_position (window, after,
+ &FRAME_X_DISPLAY_INFO (f)->mouse_face_end_col,
+ &FRAME_X_DISPLAY_INFO (f)->mouse_face_end_row);
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_window = window;
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_face_id
+ = compute_char_face (f, w, pos, 0, 0,
+ &ignore, pos + 1, 1);
/* Display it as active. */
- show_mouse_face (1);
+ show_mouse_face (FRAME_X_DISPLAY_INFO (f), 1);
}
/* Handle the text property case. */
else if (! NILP (mouse_face))
= Fnext_single_property_change (position, Qmouse_face,
w->buffer, end);
/* Record this as the current active region. */
- fast_find_position (window, before, &mouse_face_beg_col,
- &mouse_face_beg_row);
- mouse_face_past_end
- = !fast_find_position (window, after, &mouse_face_end_col,
- &mouse_face_end_row);
- mouse_face_window = window;
- mouse_face_face_id
+ fast_find_position (window, before,
+ &FRAME_X_DISPLAY_INFO (f)->mouse_face_beg_col,
+ &FRAME_X_DISPLAY_INFO (f)->mouse_face_beg_row);
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_past_end
+ = !fast_find_position (window, after,
+ &FRAME_X_DISPLAY_INFO (f)->mouse_face_end_col,
+ &FRAME_X_DISPLAY_INFO (f)->mouse_face_end_row);
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_window = window;
+ FRAME_X_DISPLAY_INFO (f)->mouse_face_face_id
= compute_char_face (f, w, pos, 0, 0,
&ignore, pos + 1, 1);
/* Display it as active. */
- show_mouse_face (1);
+ show_mouse_face (FRAME_X_DISPLAY_INFO (f), 1);
}
BEGV = obegv;
ZV = ozv;
int width = window_internal_width (w);
int *charstarts;
int lastcol;
+ int maybe_next_line = 0;
/* Find the right row. */
for (i = 0;
int linestart = FRAME_CURRENT_GLYPHS (f)->charstarts[top + i][left];
if (linestart > pos)
break;
+ /* If the position sought is the end of the buffer,
+ don't include the blank lines at the bottom of the window. */
+ if (linestart == pos && pos == BUF_ZV (XBUFFER (w->buffer)))
+ {
+ maybe_next_line = 1;
+ break;
+ }
if (linestart > 0)
row = i;
}
lastcol = left + i;
}
+ /* If we're looking for the end of the buffer,
+ and we didn't find it in the line we scanned,
+ use the start of the following line. */
+ if (maybe_next_line)
+ {
+ row++;
+ i = 0;
+ }
+
*rowp = row + top;
*columnp = lastcol;
return 0;
in its mouse-face if HL > 0, in its normal face if HL = 0. */
static void
-show_mouse_face (hl)
+show_mouse_face (dpyinfo, hl)
+ struct x_display_info *dpyinfo;
int hl;
{
- struct window *w = XWINDOW (mouse_face_window);
+ struct window *w = XWINDOW (dpyinfo->mouse_face_window);
int width = window_internal_width (w);
FRAME_PTR f = XFRAME (WINDOW_FRAME (w));
int i;
curs_x = f->phys_cursor_x;
curs_y = f->phys_cursor_y;
- for (i = mouse_face_beg_row; i <= mouse_face_end_row; i++)
+ for (i = FRAME_X_DISPLAY_INFO (f)->mouse_face_beg_row;
+ i <= FRAME_X_DISPLAY_INFO (f)->mouse_face_end_row; i++)
{
- int column = (i == mouse_face_beg_row ? mouse_face_beg_col : w->left);
- int endcolumn = (i == mouse_face_end_row ? mouse_face_end_col : w->left + width);
+ int column = (i == FRAME_X_DISPLAY_INFO (f)->mouse_face_beg_row
+ ? FRAME_X_DISPLAY_INFO (f)->mouse_face_beg_col
+ : w->left);
+ int endcolumn = (i == FRAME_X_DISPLAY_INFO (f)->mouse_face_end_row
+ ? FRAME_X_DISPLAY_INFO (f)->mouse_face_end_col
+ : w->left + width);
endcolumn = min (endcolumn, FRAME_CURRENT_GLYPHS (f)->used[i]);
/* If the cursor's in the text we are about to rewrite,
turn the cursor off. */
if (i == curs_y
- && curs_x >= mouse_face_beg_col - 1 && curs_x <= mouse_face_end_col)
+ && curs_x >= FRAME_X_DISPLAY_INFO (f)->mouse_face_beg_col - 1
+ && curs_x <= FRAME_X_DISPLAY_INFO (f)->mouse_face_end_col)
{
x_display_cursor (f, 0);
cursor_off = 1;
/* Change the mouse cursor according to the value of HL. */
if (hl > 0)
- XDefineCursor (XDISPLAY FRAME_X_WINDOW (f), f->display.x->cross_cursor);
+ XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+ f->display.x->cross_cursor);
else
- XDefineCursor (XDISPLAY FRAME_X_WINDOW (f), f->display.x->text_cursor);
+ XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+ f->display.x->text_cursor);
}
/* Clear out the mouse-highlighted active region.
Redraw it unhighlighted first. */
static void
-clear_mouse_face ()
+clear_mouse_face (dpyinfo)
+ struct x_display_info *dpyinfo;
{
- if (! NILP (mouse_face_window))
- show_mouse_face (0);
+ if (! NILP (dpyinfo->mouse_face_window))
+ show_mouse_face (dpyinfo, 0);
- mouse_face_beg_row = mouse_face_beg_col = -1;
- mouse_face_end_row = mouse_face_end_col = -1;
- mouse_face_window = Qnil;
+ dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1;
+ dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_end_col = -1;
+ dpyinfo->mouse_face_window = Qnil;
}
\f
static struct scroll_bar *x_window_to_scroll_bar ();
again. */
static void
-XTmouse_position (f, bar_window, part, x, y, time)
- FRAME_PTR *f;
+XTmouse_position (fp, bar_window, part, x, y, time)
+ FRAME_PTR *fp;
Lisp_Object *bar_window;
enum scroll_bar_part *part;
Lisp_Object *x, *y;
BLOCK_INPUT;
if (! NILP (last_mouse_scroll_bar))
- x_scroll_bar_report_motion (f, bar_window, part, x, y, time);
+ x_scroll_bar_report_motion (fp, bar_window, part, x, y, time);
else
{
Window root;
last_mouse_scroll_bar = Qnil;
/* Figure out which root window we're on. */
- XQueryPointer (x_current_display,
- DefaultRootWindow (x_current_display),
+ XQueryPointer (FRAME_X_DISPLAY (*fp),
+ DefaultRootWindow (FRAME_X_DISPLAY (*fp)),
/* The root window which contains the pointer. */
&root,
win = root;
- if (x_mouse_grabbed && last_mouse_frame
+ if (FRAME_X_DISPLAY_INFO (*fp)->grabbed && last_mouse_frame
&& FRAME_LIVE_P (last_mouse_frame))
{
/* If mouse was grabbed on a frame, give coords for that frame
even if the mouse is now outside it. */
- XTranslateCoordinates (x_current_display,
+ XTranslateCoordinates (FRAME_X_DISPLAY (*fp),
/* From-window, to-window. */
root, FRAME_X_WINDOW (last_mouse_frame),
{
while (1)
{
- XTranslateCoordinates (x_current_display,
+ XTranslateCoordinates (FRAME_X_DISPLAY (*fp),
/* From-window, to-window. */
root, win,
/* Ok, we found a frame. Store all the values. */
pixel_to_glyph_coords (f1, win_x, win_y, &ignore1, &ignore2,
- &last_mouse_glyph, x_mouse_grabbed);
+ &last_mouse_glyph,
+ FRAME_X_DISPLAY_INFO (f1)->grabbed);
*bar_window = Qnil;
*part = 0;
- *f = f1;
+ *fp = f1;
XSETINT (*x, win_x);
XSETINT (*y, win_y);
*time = last_mouse_movement_time;
frame = XCONS (tail)->car;
/* All elements of Vframe_list should be frames. */
- if (XGCTYPE (frame) != Lisp_Frame)
+ if (! GC_FRAMEP (frame))
abort ();
/* Scan this frame's scroll bar list for a scroll bar with the
struct window *window;
int top, left, width, height;
{
- FRAME_PTR frame = XFRAME (WINDOW_FRAME (window));
- struct scroll_bar *bar =
- XSCROLL_BAR (Fmake_vector (make_number (SCROLL_BAR_VEC_SIZE), Qnil));
+ FRAME_PTR f = XFRAME (WINDOW_FRAME (window));
+ struct scroll_bar *bar
+ = XSCROLL_BAR (Fmake_vector (make_number (SCROLL_BAR_VEC_SIZE), Qnil));
BLOCK_INPUT;
{
XSetWindowAttributes a;
unsigned long mask;
- a.background_pixel = frame->display.x->background_pixel;
+ a.background_pixel = f->display.x->background_pixel;
a.event_mask = (ButtonPressMask | ButtonReleaseMask
| ButtonMotionMask | PointerMotionHintMask
| ExposureMask);
- a.cursor = x_vertical_scroll_bar_cursor;
+ a.cursor = FRAME_X_DISPLAY_INFO (f)->vertical_scroll_bar_cursor;
mask = (CWBackPixel | CWEventMask | CWCursor);
XtSetArg (al[ac], XtNborderWidth, 0); ac++;
sb_widget = XtCreateManagedWidget ("box",
boxWidgetClass,
- frame->display.x->edit_widget, al, ac);
+ f->display.x->edit_widget, al, ac);
SET_SCROLL_BAR_X_WINDOW
(bar, sb_widget->core.window);
#endif
SET_SCROLL_BAR_X_WINDOW
(bar,
- XCreateWindow (x_current_display, FRAME_X_WINDOW (frame),
+ XCreateWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
/* Position and size of scroll bar. */
left, top, width, height,
bar->dragging = Qnil;
/* Add bar to its frame's list of scroll bars. */
- bar->next = FRAME_SCROLL_BARS (frame);
+ bar->next = FRAME_SCROLL_BARS (f);
bar->prev = Qnil;
- XSETVECTOR (FRAME_SCROLL_BARS (frame), bar);
+ XSETVECTOR (FRAME_SCROLL_BARS (f), bar);
if (! NILP (bar->next))
XSETVECTOR (XSCROLL_BAR (bar->next)->prev, bar);
- XMapWindow (x_current_display, SCROLL_BAR_X_WINDOW (bar));
+ XMapRaised (FRAME_X_DISPLAY (f), SCROLL_BAR_X_WINDOW (bar));
UNBLOCK_INPUT;
{
int dragging = ! NILP (bar->dragging);
Window w = SCROLL_BAR_X_WINDOW (bar);
- GC gc = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)))->display.x->normal_gc;
+ FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
+ GC gc = f->display.x->normal_gc;
/* If the display is already accurate, do nothing. */
if (! rebuild
/* Draw the empty space above the handle. Note that we can't clear
zero-height areas; that means "clear to end of window." */
if (0 < start)
- XClearArea (x_current_display, w,
+ XClearArea (FRAME_X_DISPLAY (f), w,
/* x, y, width, height, and exposures. */
VERTICAL_SCROLL_BAR_LEFT_BORDER,
False);
/* Draw the handle itself. */
- XFillRectangle (x_current_display, w, gc,
+ XFillRectangle (FRAME_X_DISPLAY (f), w, gc,
/* x, y, width, height */
VERTICAL_SCROLL_BAR_LEFT_BORDER,
/* Draw the empty space below the handle. Note that we can't
clear zero-height areas; that means "clear to end of window." */
if (end < inside_height)
- XClearArea (x_current_display, w,
+ XClearArea (FRAME_X_DISPLAY (f), w,
/* x, y, width, height, and exposures. */
VERTICAL_SCROLL_BAR_LEFT_BORDER,
struct scroll_bar *bar;
int top, left, width, height;
{
+ Window w = SCROLL_BAR_X_WINDOW (bar);
+ FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
+
BLOCK_INPUT;
{
if (height != XINT (bar->height)) mask |= CWHeight;
if (mask)
- XConfigureWindow (x_current_display, SCROLL_BAR_X_WINDOW (bar),
+ XConfigureWindow (FRAME_X_DISPLAY (f), SCROLL_BAR_X_WINDOW (bar),
mask, &wc);
}
BLOCK_INPUT;
/* Destroy the window. */
- XDestroyWindow (x_current_display, SCROLL_BAR_X_WINDOW (bar));
+ XDestroyWindow (FRAME_X_DISPLAY (f), SCROLL_BAR_X_WINDOW (bar));
/* Disassociate this scroll bar from its window. */
XWINDOW (bar->window)->vertical_scroll_bar = Qnil;
dragged. */
if (NILP (bar->dragging))
{
- int top_range =
- VERTICAL_SCROLL_BAR_TOP_RANGE (pixel_height);
+ int top_range = VERTICAL_SCROLL_BAR_TOP_RANGE (pixel_height);
if (whole == 0)
x_scroll_bar_set_handle (bar, 0, top_range, 0);
XEvent *event;
{
Window w = SCROLL_BAR_X_WINDOW (bar);
- GC gc = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)))->display.x->normal_gc;
+ FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
+ GC gc = f->display.x->normal_gc;
BLOCK_INPUT;
x_scroll_bar_set_handle (bar, XINT (bar->start), XINT (bar->end), 1);
/* Draw a one-pixel border just inside the edges of the scroll bar. */
- XDrawRectangle (x_current_display, w, gc,
+ XDrawRectangle (FRAME_X_DISPLAY (f), w, gc,
/* x, y, width, height */
0, 0, XINT (bar->width) - 1, XINT (bar->height) - 1);
XEvent *event;
struct input_event *emacs_event;
{
- if (XGCTYPE (bar->window) != Lisp_Window)
+ if (! GC_WINDOWP (bar->window))
abort ();
emacs_event->kind = scroll_bar_click;
emacs_event->code = event->xbutton.button - Button1;
- emacs_event->modifiers =
- (x_x_to_emacs_modifiers (event->xbutton.state)
- | (event->type == ButtonRelease
- ? up_modifier
- : down_modifier));
+ emacs_event->modifiers
+ = (x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO
+ (XFRAME (WINDOW_FRAME (XWINDOW (bar->window)))),
+ event->xbutton.state)
+ | (event->type == ButtonRelease
+ ? up_modifier
+ : down_modifier));
emacs_event->frame_or_window = bar->window;
emacs_event->timestamp = event->xbutton.time;
{
- int internal_height =
- VERTICAL_SCROLL_BAR_INSIDE_HEIGHT (XINT (bar->height));
- int top_range =
- VERTICAL_SCROLL_BAR_TOP_RANGE (XINT (bar->height));
+ int internal_height
+ = VERTICAL_SCROLL_BAR_INSIDE_HEIGHT (XINT (bar->height));
+ int top_range
+ = VERTICAL_SCROLL_BAR_TOP_RANGE (XINT (bar->height));
int y = event->xbutton.y - VERTICAL_SCROLL_BAR_TOP_BORDER;
if (y < 0) y = 0;
/* Return information to the user about the current position of the mouse
on the scroll bar. */
static void
-x_scroll_bar_report_motion (f, bar_window, part, x, y, time)
- FRAME_PTR *f;
+x_scroll_bar_report_motion (fp, bar_window, part, x, y, time)
+ FRAME_PTR *fp;
Lisp_Object *bar_window;
enum scroll_bar_part *part;
Lisp_Object *x, *y;
unsigned long *time;
{
struct scroll_bar *bar = XSCROLL_BAR (last_mouse_scroll_bar);
+ Window w = SCROLL_BAR_X_WINDOW (bar);
+ FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
int win_x, win_y;
Window dummy_window;
int dummy_coord;
/* Get the mouse's position relative to the scroll bar window, and
report that. */
- if (! XQueryPointer (x_current_display,
- SCROLL_BAR_X_WINDOW (bar),
+ if (! XQueryPointer (FRAME_X_DISPLAY (f), w,
/* Root, child, root x and root y. */
&dummy_window, &dummy_window,
/* Mouse buttons and modifier keys. */
&dummy_mask))
- *f = 0;
+ ;
else
{
int inside_height
if (win_y > top_range)
win_y = top_range;
- *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
+ *fp = f;
*bar_window = bar->window;
if (! NILP (bar->dragging))
for (bar = FRAME_SCROLL_BARS (f); VECTORP (bar);
bar = XSCROLL_BAR (bar)->next)
- XClearArea (x_current_display, SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar)),
+ XClearArea (FRAME_X_DISPLAY (f), SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar)),
0, 0, 0, 0, True);
}
/* Queue up an X event *EVENT, to be processed later. */
static void
-x_queue_event (event)
+x_queue_event (f, event)
+ FRAME_PTR f;
XEvent *event;
{
struct selection_event_queue *queue_tmp
so that they get processed afresh. */
static void
-x_unqueue_events ()
+x_unqueue_events (display)
+ Display *display;
{
while (queue != NULL)
{
struct selection_event_queue *queue_tmp = queue;
- XPutBackEvent (XDISPLAY &queue_tmp->event);
+ XPutBackEvent (display, &queue_tmp->event);
queue = queue_tmp->next;
free ((char *)queue_tmp);
}
/* Start queuing SelectionRequest events. */
void
-x_start_queuing_selection_requests ()
+x_start_queuing_selection_requests (display)
+ Display *display;
{
x_queue_selection_requests++;
}
/* Stop queuing SelectionRequest events. */
void
-x_stop_queuing_selection_requests ()
+x_stop_queuing_selection_requests (display)
+ Display *display;
{
x_queue_selection_requests--;
- x_unqueue_events ();
+ x_unqueue_events (display);
}
\f
/* The main X event-reading loop - XTread_socket. */
given for enter_timestamp, above. */
static XComposeStatus compose_status;
-/* Communication with window managers. */
-Atom Xatom_wm_protocols;
-
-/* Kinds of protocol things we may receive. */
-Atom Xatom_wm_take_focus;
-Atom Xatom_wm_save_yourself;
-Atom Xatom_wm_delete_window;
-
-/* Other WM communication */
-Atom Xatom_wm_configure_denied; /* When our config request is denied */
-Atom Xatom_wm_window_moved; /* When the WM moves us. */
-
-/* Window manager communication. */
-Atom Xatom_wm_change_state;
-
-/* EditRes protocol */
-Atom Xatom_editres_name;
-
/* Record the last 100 characters stored
to help debug the loss-of-chars-during-GC problem. */
int temp_index;
short temp_buffer[100];
+/* Set this to nonzero to fake an "X I/O error"
+ on a particular display. */
+struct x_display_info *XTread_socket_fake_io_error;
+
/* Read events coming from the X server.
This routine is called by the SIGIO handler.
We return as soon as there are no more events to be read.
int event_found = 0;
int prefix;
Lisp_Object part;
+ struct x_display_info *dpyinfo;
if (interrupt_input_blocked)
{
if (numchars <= 0)
abort (); /* Don't think this happens. */
+ /* Find the display we are supposed to read input for.
+ It's the one communicating on descriptor SD. */
+ for (dpyinfo = x_display_list; dpyinfo; dpyinfo = dpyinfo->next)
+ {
+#if 0 /* This ought to be unnecessary; let's verify it. */
#ifdef FIOSNBIO
- /* If available, Xlib uses FIOSNBIO to make the socket
- non-blocking, and then looks for EWOULDBLOCK. If O_NDELAY is set,
- FIOSNBIO is ignored, and instead of signalling EWOULDBLOCK,
- a read returns 0, which Xlib interprets as equivalent to EPIPE. */
- fcntl (fileno (stdin), F_SETFL, 0);
+ /* If available, Xlib uses FIOSNBIO to make the socket
+ non-blocking, and then looks for EWOULDBLOCK. If O_NDELAY is set,
+ FIOSNBIO is ignored, and instead of signalling EWOULDBLOCK,
+ a read returns 0, which Xlib interprets as equivalent to EPIPE. */
+ fcntl (dpyinfo->connection, F_SETFL, 0);
#endif /* ! defined (FIOSNBIO) */
+#endif
+#if 0 /* This code can't be made to work, with multiple displays,
+ and appears not to be used on any system any more.
+ Also keyboard.c doesn't turn O_NDELAY on and off
+ for X connections. */
#ifndef SIGIO
#ifndef HAVE_SELECT
- if (! (fcntl (fileno (stdin), F_GETFL, 0) & O_NDELAY))
- {
- extern int read_alarm_should_throw;
- read_alarm_should_throw = 1;
- XPeekEvent (XDISPLAY &event);
- read_alarm_should_throw = 0;
- }
+ if (! (fcntl (dpyinfo->connection, F_GETFL, 0) & O_NDELAY))
+ {
+ extern int read_alarm_should_throw;
+ read_alarm_should_throw = 1;
+ XPeekEvent (dpyinfo->display, &event);
+ read_alarm_should_throw = 0;
+ }
#endif /* HAVE_SELECT */
#endif /* SIGIO */
+#endif
- while (XStuffPending () != 0)
- {
- XNextEvent (XDISPLAY &event);
- event_found = 1;
+ /* For debugging, this gives a way to fake an I/O error. */
+ if (dpyinfo == XTread_socket_fake_io_error)
+ {
+ XTread_socket_fake_io_error = 0;
+ x_io_error_quitter (dpyinfo->display);
+ }
- switch (event.type)
+ while (XPending (dpyinfo->display) != 0)
{
- case ClientMessage:
- {
- if (event.xclient.message_type == Xatom_wm_protocols
- && event.xclient.format == 32)
+ XNextEvent (dpyinfo->display, &event);
+ event_found = 1;
+
+ switch (event.type)
+ {
+ case ClientMessage:
{
- if (event.xclient.data.l[0] == Xatom_wm_take_focus)
- {
- f = x_window_to_frame (event.xclient.window);
- /* Since we set WM_TAKE_FOCUS, we must call
- XSetInputFocus explicitly. But not if f is null,
- since that might be an event for a deleted frame. */
- if (f)
- XSetInputFocus (event.xclient.display,
- event.xclient.window,
- RevertToPointerRoot,
- event.xclient.data.l[1]);
- /* Not certain about handling scroll bars here */
- }
- else if (event.xclient.data.l[0] == Xatom_wm_save_yourself)
+ if (event.xclient.message_type
+ == dpyinfo->Xatom_wm_protocols
+ && event.xclient.format == 32)
{
- /* Save state modify the WM_COMMAND property to
- something which can reinstate us. This notifies
- the session manager, who's looking for such a
- PropertyNotify. Can restart processing when
- a keyboard or mouse event arrives. */
- if (numchars > 0)
+ if (event.xclient.data.l[0]
+ == dpyinfo->Xatom_wm_take_focus)
{
- /* This is just so we only give real data once
- for a single Emacs process. */
- if (x_top_window_to_frame (event.xclient.window)
- == selected_frame)
- XSetCommand (x_current_display,
- event.xclient.window,
- initial_argv, initial_argc);
- else
- XSetCommand (x_current_display,
- event.xclient.window,
- 0, 0);
+ f = x_window_to_frame (event.xclient.window);
+ /* Since we set WM_TAKE_FOCUS, we must call
+ XSetInputFocus explicitly. But not if f is null,
+ since that might be an event for a deleted frame. */
+ if (f)
+ XSetInputFocus (event.xclient.display,
+ event.xclient.window,
+ RevertToPointerRoot,
+ event.xclient.data.l[1]);
+ /* Not certain about handling scroll bars here */
}
- }
- else if (event.xclient.data.l[0] == Xatom_wm_delete_window)
- {
- struct frame *f = x_any_window_to_frame (event.xclient.window);
-
- if (f)
+ else if (event.xclient.data.l[0]
+ == dpyinfo->Xatom_wm_save_yourself)
+ {
+ /* Save state modify the WM_COMMAND property to
+ something which can reinstate us. This notifies
+ the session manager, who's looking for such a
+ PropertyNotify. Can restart processing when
+ a keyboard or mouse event arrives. */
+ if (numchars > 0)
+ {
+ f = x_top_window_to_frame (event.xclient.window);
+
+ /* This is just so we only give real data once
+ for a single Emacs process. */
+ if (f == selected_frame)
+ XSetCommand (FRAME_X_DISPLAY (f),
+ event.xclient.window,
+ initial_argv, initial_argc);
+ else
+ XSetCommand (FRAME_X_DISPLAY (f),
+ event.xclient.window,
+ 0, 0);
+ }
+ }
+ else if (event.xclient.data.l[0]
+ == dpyinfo->Xatom_wm_delete_window)
{
- if (numchars == 0)
- abort ();
+ struct frame *f = x_any_window_to_frame (event.xclient.window);
- bufp->kind = delete_window_event;
- XSETFRAME (bufp->frame_or_window, f);
- bufp++;
+ if (f)
+ {
+ if (numchars == 0)
+ abort ();
- count += 1;
- numchars -= 1;
+ bufp->kind = delete_window_event;
+ XSETFRAME (bufp->frame_or_window, f);
+ bufp++;
+
+ count += 1;
+ numchars -= 1;
+ }
}
}
- }
- else if (event.xclient.message_type == Xatom_wm_configure_denied)
- {
- }
- else if (event.xclient.message_type == Xatom_wm_window_moved)
- {
- int new_x, new_y;
- struct frame *f = x_window_to_frame (event.xclient.window);
+ else if (event.xclient.message_type
+ == dpyinfo->Xatom_wm_configure_denied)
+ {
+ }
+ else if (event.xclient.message_type
+ == dpyinfo->Xatom_wm_window_moved)
+ {
+ int new_x, new_y;
+ struct frame *f = x_window_to_frame (event.xclient.window);
- new_x = event.xclient.data.s[0];
- new_y = event.xclient.data.s[1];
+ new_x = event.xclient.data.s[0];
+ new_y = event.xclient.data.s[1];
- if (f)
- {
- f->display.x->left_pos = new_x;
- f->display.x->top_pos = new_y;
+ if (f)
+ {
+ f->display.x->left_pos = new_x;
+ f->display.x->top_pos = new_y;
+ }
}
- }
#if defined (USE_X_TOOLKIT) && defined (HAVE_X11R5)
- else if (event.xclient.message_type == Xatom_editres_name)
- {
- struct frame *f = x_any_window_to_frame (event.xclient.window);
- _XEditResCheckMessages (f->display.x->widget, NULL, &event, NULL);
- }
+ else if (event.xclient.message_type
+ == dpyinfo->Xatom_editres)
+ {
+ struct frame *f = x_any_window_to_frame (event.xclient.window);
+ _XEditResCheckMessages (f->display.x->widget, NULL, &event, NULL);
+ }
#endif /* USE_X_TOOLKIT and HAVE_X11R5 */
- }
- break;
+ }
+ break;
- case SelectionNotify:
+ case SelectionNotify:
#ifdef USE_X_TOOLKIT
- if (! x_window_to_frame (event.xselection.requestor))
- goto OTHER;
+ if (! x_window_to_frame (event.xselection.requestor))
+ goto OTHER;
#endif /* not USE_X_TOOLKIT */
- x_handle_selection_notify (&event);
- break;
+ x_handle_selection_notify (&event);
+ break;
- case SelectionClear: /* Someone has grabbed ownership. */
+ case SelectionClear: /* Someone has grabbed ownership. */
#ifdef USE_X_TOOLKIT
- if (! x_window_to_frame (event.xselectionclear.window))
- goto OTHER;
+ if (! x_window_to_frame (event.xselectionclear.window))
+ goto OTHER;
#endif /* USE_X_TOOLKIT */
- {
- XSelectionClearEvent *eventp = (XSelectionClearEvent *) &event;
+ {
+ XSelectionClearEvent *eventp = (XSelectionClearEvent *) &event;
- if (numchars == 0)
- abort ();
+ if (numchars == 0)
+ abort ();
- bufp->kind = selection_clear_event;
- SELECTION_EVENT_DISPLAY (bufp) = eventp->display;
- SELECTION_EVENT_SELECTION (bufp) = eventp->selection;
- SELECTION_EVENT_TIME (bufp) = eventp->time;
- bufp++;
+ bufp->kind = selection_clear_event;
+ SELECTION_EVENT_DISPLAY (bufp) = eventp->display;
+ SELECTION_EVENT_SELECTION (bufp) = eventp->selection;
+ SELECTION_EVENT_TIME (bufp) = eventp->time;
+ bufp++;
- count += 1;
- numchars -= 1;
- }
- break;
+ count += 1;
+ numchars -= 1;
+ }
+ break;
- case SelectionRequest: /* Someone wants our selection. */
+ case SelectionRequest: /* Someone wants our selection. */
#ifdef USE_X_TOOLKIT
- if (!x_window_to_frame (event.xselectionrequest.owner))
- goto OTHER;
+ if (!x_window_to_frame (event.xselectionrequest.owner))
+ goto OTHER;
#endif /* USE_X_TOOLKIT */
- if (x_queue_selection_requests)
- x_queue_event (&event);
- else
- {
- XSelectionRequestEvent *eventp = (XSelectionRequestEvent *) &event;
-
- if (numchars == 0)
- abort ();
-
- bufp->kind = selection_request_event;
- SELECTION_EVENT_DISPLAY (bufp) = eventp->display;
- SELECTION_EVENT_REQUESTOR (bufp) = eventp->requestor;
- SELECTION_EVENT_SELECTION (bufp) = eventp->selection;
- SELECTION_EVENT_TARGET (bufp) = eventp->target;
- SELECTION_EVENT_PROPERTY (bufp) = eventp->property;
- SELECTION_EVENT_TIME (bufp) = eventp->time;
- bufp++;
-
- count += 1;
- numchars -= 1;
- }
- break;
+ if (x_queue_selection_requests)
+ x_queue_event (x_window_to_frame (event.xselectionrequest.owner),
+ &event);
+ else
+ {
+ XSelectionRequestEvent *eventp = (XSelectionRequestEvent *) &event;
- case PropertyNotify:
+ if (numchars == 0)
+ abort ();
+
+ bufp->kind = selection_request_event;
+ SELECTION_EVENT_DISPLAY (bufp) = eventp->display;
+ SELECTION_EVENT_REQUESTOR (bufp) = eventp->requestor;
+ SELECTION_EVENT_SELECTION (bufp) = eventp->selection;
+ SELECTION_EVENT_TARGET (bufp) = eventp->target;
+ SELECTION_EVENT_PROPERTY (bufp) = eventp->property;
+ SELECTION_EVENT_TIME (bufp) = eventp->time;
+ bufp++;
+
+ count += 1;
+ numchars -= 1;
+ }
+ break;
+
+ case PropertyNotify:
#ifdef USE_X_TOOLKIT
- if (!x_any_window_to_frame (event.xproperty.window))
- goto OTHER;
+ if (!x_any_window_to_frame (event.xproperty.window))
+ goto OTHER;
#endif /* not USE_X_TOOLKIT */
- x_handle_property_notify (&event);
- break;
+ x_handle_property_notify (&event);
+ break;
- case ReparentNotify:
- f = x_top_window_to_frame (event.xreparent.window);
- if (f)
- {
- int x, y;
- f->display.x->parent_desc = event.xreparent.parent;
- x_real_positions (f, &x, &y);
- f->display.x->left_pos = x;
- f->display.x->top_pos = y;
- }
- break;
+ case ReparentNotify:
+ f = x_top_window_to_frame (event.xreparent.window);
+ if (f)
+ {
+ int x, y;
+ f->display.x->parent_desc = event.xreparent.parent;
+ x_real_positions (f, &x, &y);
+ f->display.x->left_pos = x;
+ f->display.x->top_pos = y;
+ }
+ break;
- case Expose:
- f = x_window_to_frame (event.xexpose.window);
- if (f)
- {
- if (f->async_visible == 0)
+ case Expose:
+ f = x_window_to_frame (event.xexpose.window);
+ if (f)
{
- f->async_visible = 1;
- f->async_iconified = 0;
- SET_FRAME_GARBAGED (f);
+ if (f->async_visible == 0)
+ {
+ f->async_visible = 1;
+ f->async_iconified = 0;
+ SET_FRAME_GARBAGED (f);
+ }
+ else
+ dumprectangle (x_window_to_frame (event.xexpose.window),
+ event.xexpose.x, event.xexpose.y,
+ event.xexpose.width, event.xexpose.height);
}
else
- dumprectangle (x_window_to_frame (event.xexpose.window),
- event.xexpose.x, event.xexpose.y,
- event.xexpose.width, event.xexpose.height);
- }
- else
- {
- struct scroll_bar *bar
- = x_window_to_scroll_bar (event.xexpose.window);
+ {
+ struct scroll_bar *bar
+ = x_window_to_scroll_bar (event.xexpose.window);
- if (bar)
- x_scroll_bar_expose (bar, &event);
+ if (bar)
+ x_scroll_bar_expose (bar, &event);
#ifdef USE_X_TOOLKIT
- else
- goto OTHER;
+ else
+ goto OTHER;
#endif /* USE_X_TOOLKIT */
- }
- break;
+ }
+ break;
- case GraphicsExpose: /* This occurs when an XCopyArea's
- source area was obscured or not
- available.*/
- f = x_window_to_frame (event.xgraphicsexpose.drawable);
- if (f)
- {
- dumprectangle (f,
- event.xgraphicsexpose.x, event.xgraphicsexpose.y,
- event.xgraphicsexpose.width,
- event.xgraphicsexpose.height);
- }
+ case GraphicsExpose: /* This occurs when an XCopyArea's
+ source area was obscured or not
+ available.*/
+ f = x_window_to_frame (event.xgraphicsexpose.drawable);
+ if (f)
+ {
+ dumprectangle (f,
+ event.xgraphicsexpose.x, event.xgraphicsexpose.y,
+ event.xgraphicsexpose.width,
+ event.xgraphicsexpose.height);
+ }
#ifdef USE_X_TOOLKIT
- else
- goto OTHER;
+ else
+ goto OTHER;
#endif /* USE_X_TOOLKIT */
- break;
+ break;
- case NoExpose: /* This occurs when an XCopyArea's
- source area was completely
- available */
- break;
+ case NoExpose: /* This occurs when an XCopyArea's
+ source area was completely
+ available */
+ break;
- case UnmapNotify:
- f = x_any_window_to_frame (event.xunmap.window);
- if (f) /* F may no longer exist if
- the frame was deleted. */
- {
- /* While a frame is unmapped, display generation is
- disabled; you don't want to spend time updating a
- display that won't ever be seen. */
- f->async_visible = 0;
- /* We can't distinguish, from the event, whether the window
- has become iconified or invisible. So assume, if it
- was previously visible, than now it is iconified.
- We depend on x_make_frame_invisible to mark it iconified. */
- if (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f))
- f->async_iconified = 1;
- }
+ case UnmapNotify:
+ f = x_any_window_to_frame (event.xunmap.window);
+ if (f) /* F may no longer exist if
+ the frame was deleted. */
+ {
+ /* While a frame is unmapped, display generation is
+ disabled; you don't want to spend time updating a
+ display that won't ever be seen. */
+ f->async_visible = 0;
+ /* We can't distinguish, from the event, whether the window
+ has become iconified or invisible. So assume, if it
+ was previously visible, than now it is iconified.
+ We depend on x_make_frame_invisible to mark it iconified. */
+ if (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f))
+ f->async_iconified = 1;
+
+ bufp->kind = iconify_event;
+ XSETFRAME (bufp->frame_or_window, f);
+ bufp++;
+ count++;
+ numchars--;
+ }
#ifdef USE_X_TOOLKIT
- goto OTHER;
+ goto OTHER;
#endif /* USE_X_TOOLKIT */
- break;
+ break;
- case MapNotify:
- /* We use x_top_window_to_frame because map events can come
- for subwindows and they don't mean that the frame is visible. */
- f = x_top_window_to_frame (event.xmap.window);
- if (f)
- {
- f->async_visible = 1;
- f->async_iconified = 0;
+ case MapNotify:
+ /* We use x_top_window_to_frame because map events can come
+ for subwindows and they don't mean that the frame is visible. */
+ f = x_top_window_to_frame (event.xmap.window);
+ if (f)
+ {
+ f->async_visible = 1;
+ f->async_iconified = 0;
- /* wait_reading_process_input will notice this and update
- the frame's display structures. */
- SET_FRAME_GARBAGED (f);
- }
+ /* wait_reading_process_input will notice this and update
+ the frame's display structures. */
+ SET_FRAME_GARBAGED (f);
+
+ bufp->kind = deiconify_event;
+ XSETFRAME (bufp->frame_or_window, f);
+ bufp++;
+ count++;
+ numchars--;
+ }
#ifdef USE_X_TOOLKIT
- goto OTHER;
+ goto OTHER;
#endif /* USE_X_TOOLKIT */
- break;
+ break;
- /* Turn off processing if we become fully obscured. */
- case VisibilityNotify:
- break;
+ /* Turn off processing if we become fully obscured. */
+ case VisibilityNotify:
+ break;
- case KeyPress:
- f = x_any_window_to_frame (event.xkey.window);
+ case KeyPress:
+ f = x_any_window_to_frame (event.xkey.window);
- if (f != 0)
- {
- KeySym keysym, orig_keysym;
- /* al%imercury@uunet.uu.net says that making this 81 instead of
- 80 fixed a bug whereby meta chars made his Emacs hang. */
- unsigned char copy_buffer[81];
- int modifiers;
+ if (f != 0)
+ {
+ KeySym keysym, orig_keysym;
+ /* al%imercury@uunet.uu.net says that making this 81 instead of
+ 80 fixed a bug whereby meta chars made his Emacs hang. */
+ unsigned char copy_buffer[81];
+ int modifiers;
- event.xkey.state
- |= x_emacs_to_x_modifiers (extra_keyboard_modifiers);
- modifiers = event.xkey.state;
+ event.xkey.state
+ |= x_emacs_to_x_modifiers (FRAME_X_DISPLAY_INFO (f),
+ extra_keyboard_modifiers);
+ modifiers = event.xkey.state;
- /* This will have to go some day... */
+ /* This will have to go some day... */
- /* make_lispy_event turns chars into control chars.
- Don't do it here because XLookupString is too eager. */
- event.xkey.state &= ~ControlMask;
- nbytes =
- XLookupString (&event.xkey, copy_buffer, 80, &keysym,
- &compose_status);
+ /* make_lispy_event turns chars into control chars.
+ Don't do it here because XLookupString is too eager. */
+ event.xkey.state &= ~ControlMask;
+ nbytes = XLookupString (&event.xkey, copy_buffer,
+ 80, &keysym, &compose_status);
- orig_keysym = keysym;
+ orig_keysym = keysym;
- if (numchars > 1)
- {
- if (((keysym >= XK_BackSpace && keysym <= XK_Escape)
- || keysym == XK_Delete
- || IsCursorKey (keysym) /* 0xff50 <= x < 0xff60 */
- || IsMiscFunctionKey (keysym) /* 0xff60 <= x < VARIES */
+ if (numchars > 1)
+ {
+ if (((keysym >= XK_BackSpace && keysym <= XK_Escape)
+ || keysym == XK_Delete
+ || IsCursorKey (keysym) /* 0xff50 <= x < 0xff60 */
+ || IsMiscFunctionKey (keysym) /* 0xff60 <= x < VARIES */
#ifdef HPUX
- /* This recognizes the "extended function keys".
- It seems there's no cleaner way.
- Test IsModifierKey to avoid handling mode_switch
- incorrectly. */
- || ((unsigned) (keysym) >= XK_Select
- && (unsigned)(keysym) < XK_KP_Space)
+ /* This recognizes the "extended function keys".
+ It seems there's no cleaner way.
+ Test IsModifierKey to avoid handling mode_switch
+ incorrectly. */
+ || ((unsigned) (keysym) >= XK_Select
+ && (unsigned)(keysym) < XK_KP_Space)
#endif
#ifdef XK_dead_circumflex
- || orig_keysym == XK_dead_circumflex
+ || orig_keysym == XK_dead_circumflex
#endif
#ifdef XK_dead_grave
- || orig_keysym == XK_dead_grave
+ || orig_keysym == XK_dead_grave
#endif
#ifdef XK_dead_tilde
- || orig_keysym == XK_dead_tilde
+ || orig_keysym == XK_dead_tilde
#endif
#ifdef XK_dead_diaeresis
- || orig_keysym == XK_dead_diaeresis
+ || orig_keysym == XK_dead_diaeresis
#endif
#ifdef XK_dead_macron
- || orig_keysym == XK_dead_macron
+ || orig_keysym == XK_dead_macron
#endif
#ifdef XK_dead_degree
- || orig_keysym == XK_dead_degree
+ || orig_keysym == XK_dead_degree
#endif
#ifdef XK_dead_acute
- || orig_keysym == XK_dead_acute
+ || orig_keysym == XK_dead_acute
#endif
#ifdef XK_dead_cedilla
- || orig_keysym == XK_dead_cedilla
+ || orig_keysym == XK_dead_cedilla
#endif
#ifdef XK_dead_breve
- || orig_keysym == XK_dead_breve
+ || orig_keysym == XK_dead_breve
#endif
#ifdef XK_dead_ogonek
- || orig_keysym == XK_dead_ogonek
+ || orig_keysym == XK_dead_ogonek
#endif
#ifdef XK_dead_caron
- || orig_keysym == XK_dead_caron
+ || orig_keysym == XK_dead_caron
#endif
#ifdef XK_dead_doubleacute
- || orig_keysym == XK_dead_doubleacute
+ || orig_keysym == XK_dead_doubleacute
#endif
#ifdef XK_dead_abovedot
- || orig_keysym == XK_dead_abovedot
+ || orig_keysym == XK_dead_abovedot
#endif
- || IsKeypadKey (keysym) /* 0xff80 <= x < 0xffbe */
- || IsFunctionKey (keysym) /* 0xffbe <= x < 0xffe1 */
- /* Any "vendor-specific" key is ok. */
- || (orig_keysym & (1 << 28)))
- && ! (IsModifierKey (orig_keysym)
+ || IsKeypadKey (keysym) /* 0xff80 <= x < 0xffbe */
+ || IsFunctionKey (keysym) /* 0xffbe <= x < 0xffe1 */
+ /* Any "vendor-specific" key is ok. */
+ || (orig_keysym & (1 << 28)))
+ && ! (IsModifierKey (orig_keysym)
#ifndef HAVE_X11R5
#ifdef XK_Mode_switch
- || ((unsigned)(orig_keysym) == XK_Mode_switch)
+ || ((unsigned)(orig_keysym) == XK_Mode_switch)
#endif
#ifdef XK_Num_Lock
- || ((unsigned)(orig_keysym) == XK_Num_Lock)
+ || ((unsigned)(orig_keysym) == XK_Num_Lock)
#endif
#endif /* not HAVE_X11R5 */
- ))
- {
- if (temp_index == sizeof temp_buffer / sizeof (short))
- temp_index = 0;
- temp_buffer[temp_index++] = keysym;
- bufp->kind = non_ascii_keystroke;
- bufp->code = keysym;
- XSETFRAME (bufp->frame_or_window, f);
- bufp->modifiers = x_x_to_emacs_modifiers (modifiers);
- bufp->timestamp = event.xkey.time;
- bufp++;
- count++;
- numchars--;
- }
- else if (numchars > nbytes)
- {
- register int i;
-
- for (i = 0; i < nbytes; i++)
+ ))
{
if (temp_index == sizeof temp_buffer / sizeof (short))
temp_index = 0;
- temp_buffer[temp_index++] = copy_buffer[i];
- bufp->kind = ascii_keystroke;
- bufp->code = copy_buffer[i];
+ temp_buffer[temp_index++] = keysym;
+ bufp->kind = non_ascii_keystroke;
+ bufp->code = keysym;
XSETFRAME (bufp->frame_or_window, f);
- bufp->modifiers = x_x_to_emacs_modifiers (modifiers);
+ bufp->modifiers
+ = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f),
+ modifiers);
bufp->timestamp = event.xkey.time;
bufp++;
+ count++;
+ numchars--;
}
-
- count += nbytes;
- numchars -= nbytes;
+ else if (numchars > nbytes)
+ {
+ register int i;
+
+ for (i = 0; i < nbytes; i++)
+ {
+ if (temp_index == sizeof temp_buffer / sizeof (short))
+ temp_index = 0;
+ temp_buffer[temp_index++] = copy_buffer[i];
+ bufp->kind = ascii_keystroke;
+ bufp->code = copy_buffer[i];
+ XSETFRAME (bufp->frame_or_window, f);
+ bufp->modifiers
+ = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f),
+ modifiers);
+ bufp->timestamp = event.xkey.time;
+ bufp++;
+ }
+
+ count += nbytes;
+ numchars -= nbytes;
+ }
+ else
+ abort ();
}
else
abort ();
}
- else
- abort ();
- }
- break;
+ break;
- /* Here's a possible interpretation of the whole
- FocusIn-EnterNotify FocusOut-LeaveNotify mess. If you get a
- FocusIn event, you have to get a FocusOut event before you
- relinquish the focus. If you haven't received a FocusIn event,
- then a mere LeaveNotify is enough to free you. */
+ /* Here's a possible interpretation of the whole
+ FocusIn-EnterNotify FocusOut-LeaveNotify mess. If you get a
+ FocusIn event, you have to get a FocusOut event before you
+ relinquish the focus. If you haven't received a FocusIn event,
+ then a mere LeaveNotify is enough to free you. */
- case EnterNotify:
- f = x_any_window_to_frame (event.xcrossing.window);
+ case EnterNotify:
+ f = x_any_window_to_frame (event.xcrossing.window);
- if (event.xcrossing.focus) /* Entered Window */
- {
- /* Avoid nasty pop/raise loops. */
- if (f && (!(f->auto_raise)
- || !(f->auto_lower)
- || (event.xcrossing.time - enter_timestamp) > 500))
+ if (event.xcrossing.focus) /* Entered Window */
{
- x_new_focus_frame (f);
- enter_timestamp = event.xcrossing.time;
+ /* Avoid nasty pop/raise loops. */
+ if (f && (!(f->auto_raise)
+ || !(f->auto_lower)
+ || (event.xcrossing.time - enter_timestamp) > 500))
+ {
+ x_new_focus_frame (f);
+ enter_timestamp = event.xcrossing.time;
+ }
}
- }
- else if (f == x_focus_frame)
- x_new_focus_frame (0);
- /* EnterNotify counts as mouse movement,
- so update things that depend on mouse position. */
- if (f)
- note_mouse_movement (f, &event.xmotion);
+ else if (f == x_focus_frame)
+ x_new_focus_frame (0);
+ /* EnterNotify counts as mouse movement,
+ so update things that depend on mouse position. */
+ if (f)
+ note_mouse_movement (f, &event.xmotion);
#ifdef USE_X_TOOLKIT
- goto OTHER;
+ goto OTHER;
#endif /* USE_X_TOOLKIT */
- break;
+ break;
- case FocusIn:
- f = x_any_window_to_frame (event.xfocus.window);
- if (event.xfocus.detail != NotifyPointer)
- x_focus_event_frame = f;
- if (f)
- x_new_focus_frame (f);
+ case FocusIn:
+ f = x_any_window_to_frame (event.xfocus.window);
+ if (event.xfocus.detail != NotifyPointer)
+ x_focus_event_frame = f;
+ if (f)
+ x_new_focus_frame (f);
#ifdef USE_X_TOOLKIT
- goto OTHER;
+ goto OTHER;
#endif /* USE_X_TOOLKIT */
- break;
-
+ break;
- case LeaveNotify:
- f = x_top_window_to_frame (event.xcrossing.window);
- if (f)
- {
- if (f == mouse_face_mouse_frame)
- /* If we move outside the frame,
- then we're certainly no longer on any text in the frame. */
- clear_mouse_face ();
- if (event.xcrossing.focus)
+ case LeaveNotify:
+ f = x_top_window_to_frame (event.xcrossing.window);
+ if (f)
{
- if (! x_focus_event_frame)
- x_new_focus_frame (0);
+ if (f == dpyinfo->mouse_face_mouse_frame)
+ /* If we move outside the frame,
+ then we're certainly no longer on any text in the frame. */
+ clear_mouse_face (dpyinfo);
+
+ if (event.xcrossing.focus)
+ x_mouse_leave ();
else
- x_new_focus_frame (f);
- }
- else
- {
- if (f == x_focus_event_frame)
- x_focus_event_frame = 0;
- if (f == x_focus_frame)
- x_new_focus_frame (0);
+ {
+ if (f == x_focus_event_frame)
+ x_focus_event_frame = 0;
+ if (f == x_focus_frame)
+ x_new_focus_frame (0);
+ }
}
- }
#ifdef USE_X_TOOLKIT
- goto OTHER;
+ goto OTHER;
#endif /* USE_X_TOOLKIT */
- break;
+ break;
- case FocusOut:
- f = x_any_window_to_frame (event.xfocus.window);
- if (event.xfocus.detail != NotifyPointer
- && f == x_focus_event_frame)
- x_focus_event_frame = 0;
- if (f && f == x_focus_frame)
- x_new_focus_frame (0);
+ case FocusOut:
+ f = x_any_window_to_frame (event.xfocus.window);
+ if (event.xfocus.detail != NotifyPointer
+ && f == x_focus_event_frame)
+ x_focus_event_frame = 0;
+ if (f && f == x_focus_frame)
+ x_new_focus_frame (0);
#ifdef USE_X_TOOLKIT
- goto OTHER;
+ goto OTHER;
#endif /* USE_X_TOOLKIT */
- break;
+ break;
- case MotionNotify:
- {
- if (x_mouse_grabbed && last_mouse_frame
- && FRAME_LIVE_P (last_mouse_frame))
- f = last_mouse_frame;
- else
- f = x_window_to_frame (event.xmotion.window);
- if (f)
- note_mouse_movement (f, &event.xmotion);
- else
+ case MotionNotify:
{
- struct scroll_bar *bar
- = x_window_to_scroll_bar (event.xmotion.window);
+ if (dpyinfo->grabbed && last_mouse_frame
+ && FRAME_LIVE_P (last_mouse_frame))
+ f = last_mouse_frame;
+ else
+ f = x_window_to_frame (event.xmotion.window);
+ if (f)
+ note_mouse_movement (f, &event.xmotion);
+ else
+ {
+ struct scroll_bar *bar
+ = x_window_to_scroll_bar (event.xmotion.window);
- if (bar)
- x_scroll_bar_note_movement (bar, &event);
+ if (bar)
+ x_scroll_bar_note_movement (bar, &event);
- /* If we move outside the frame,
- then we're certainly no longer on any text in the frame. */
- clear_mouse_face ();
+ /* If we move outside the frame,
+ then we're certainly no longer on any text in the frame. */
+ clear_mouse_face (dpyinfo);
+ }
}
- }
#if 0 /* This should be unnecessary, since the toolkit has no use
- for motion events that happen outside of the menu event loop,
- and it seems to cause the bug that mouse events stop coming
- after a while. */
+ for motion events that happen outside of the menu event loop,
+ and it seems to cause the bug that mouse events stop coming
+ after a while. */
#ifdef USE_X_TOOLKIT
- goto OTHER;
+ goto OTHER;
#endif /* USE_X_TOOLKIT */
#endif
- break;
+ break;
- case ConfigureNotify:
- f = x_any_window_to_frame (event.xconfigure.window);
+ case ConfigureNotify:
+ f = x_any_window_to_frame (event.xconfigure.window);
#ifdef USE_X_TOOLKIT
- if (f
+ if (f
#if 0
- && ! event.xconfigure.send_event
+ && ! event.xconfigure.send_event
#endif
- && (event.xconfigure.window == XtWindow (f->display.x->widget)))
- {
- Window win, child;
- int win_x, win_y;
-
- /* Find the position of the outside upper-left corner of
- the window, in the root coordinate system. Don't
- refer to the parent window here; we may be processing
- this event after the window manager has changed our
- parent, but before we have reached the ReparentNotify. */
- XTranslateCoordinates (x_current_display,
-
- /* From-window, to-window. */
- XtWindow (f->display.x->widget),
- ROOT_WINDOW,
-
- /* From-position, to-position. */
- -event.xconfigure.border_width,
- -event.xconfigure.border_width,
- &win_x, &win_y,
-
- /* Child of win. */
- &child);
- event.xconfigure.x = win_x;
- event.xconfigure.y = win_y;
-
- f->display.x->pixel_width = event.xconfigure.width;
- f->display.x->pixel_height = event.xconfigure.height;
- f->display.x->left_pos = event.xconfigure.x;
- f->display.x->top_pos = event.xconfigure.y;
-
- /* What we have now is the position of Emacs's own window.
- Convert that to the position of the window manager window. */
- {
- int x, y;
- x_real_positions (f, &x, &y);
- f->display.x->left_pos = x;
- f->display.x->top_pos = y;
- }
- }
- goto OTHER;
-#else /* not USE_X_TOOLKIT */
- if (f)
- {
- int rows = PIXEL_TO_CHAR_HEIGHT (f, event.xconfigure.height);
- int columns = PIXEL_TO_CHAR_WIDTH (f, event.xconfigure.width);
-
- /* Even if the number of character rows and columns has
- not changed, the font size may have changed, so we need
- to check the pixel dimensions as well. */
- if (columns != f->width
- || rows != f->height
- || event.xconfigure.width != f->display.x->pixel_width
- || event.xconfigure.height != f->display.x->pixel_height)
- {
- change_frame_size (f, rows, columns, 0, 1);
- SET_FRAME_GARBAGED (f);
- }
-
- if (! event.xconfigure.send_event)
+ && (event.xconfigure.window == XtWindow (f->display.x->widget)))
{
Window win, child;
int win_x, win_y;
refer to the parent window here; we may be processing
this event after the window manager has changed our
parent, but before we have reached the ReparentNotify. */
- XTranslateCoordinates (x_current_display,
+ XTranslateCoordinates (FRAME_X_DISPLAY (f),
/* From-window, to-window. */
- f->display.x->window_desc,
- ROOT_WINDOW,
+ XtWindow (f->display.x->widget),
+ FRAME_X_DISPLAY_INFO (f)->root_window,
/* From-position, to-position. */
-event.xconfigure.border_width,
&child);
event.xconfigure.x = win_x;
event.xconfigure.y = win_y;
- }
- f->display.x->pixel_width = event.xconfigure.width;
- f->display.x->pixel_height = event.xconfigure.height;
- f->display.x->left_pos = event.xconfigure.x;
- f->display.x->top_pos = event.xconfigure.y;
+ f->display.x->pixel_width = event.xconfigure.width;
+ f->display.x->pixel_height = event.xconfigure.height;
+ f->display.x->left_pos = event.xconfigure.x;
+ f->display.x->top_pos = event.xconfigure.y;
- /* What we have now is the position of Emacs's own window.
- Convert that to the position of the window manager window. */
- {
- int x, y;
- x_real_positions (f, &x, &y);
- f->display.x->left_pos = x;
- f->display.x->top_pos = y;
- if (y != event.xconfigure.y)
+ /* What we have now is the position of Emacs's own window.
+ Convert that to the position of the window manager window. */
{
- /* Since the WM decorations come below top_pos now,
- we must put them below top_pos in the future. */
- f->display.x->win_gravity = NorthWestGravity;
- x_wm_set_size_hint (f, 0, 0);
+ int x, y;
+ x_real_positions (f, &x, &y);
+ f->display.x->left_pos = x;
+ f->display.x->top_pos = y;
}
- }
- }
-#endif /* not USE_X_TOOLKIT */
- break;
+ }
+ goto OTHER;
+#else /* not USE_X_TOOLKIT */
+ if (f)
+ {
+ int rows = PIXEL_TO_CHAR_HEIGHT (f, event.xconfigure.height);
+ int columns = PIXEL_TO_CHAR_WIDTH (f, event.xconfigure.width);
+
+ /* Even if the number of character rows and columns has
+ not changed, the font size may have changed, so we need
+ to check the pixel dimensions as well. */
+ if (columns != f->width
+ || rows != f->height
+ || event.xconfigure.width != f->display.x->pixel_width
+ || event.xconfigure.height != f->display.x->pixel_height)
+ {
+ change_frame_size (f, rows, columns, 0, 1);
+ SET_FRAME_GARBAGED (f);
+ }
- case ButtonPress:
- case ButtonRelease:
- {
- /* If we decide we want to generate an event to be seen
- by the rest of Emacs, we put it here. */
- struct input_event emacs_event;
- emacs_event.kind = no_event;
+ if (! event.xconfigure.send_event)
+ {
+ Window win, child;
+ int win_x, win_y;
+
+ /* Find the position of the outside upper-left corner of
+ the window, in the root coordinate system. Don't
+ refer to the parent window here; we may be processing
+ this event after the window manager has changed our
+ parent, but before we have reached the ReparentNotify. */
+ XTranslateCoordinates (FRAME_X_DISPLAY (f),
+
+ /* From-window, to-window. */
+ f->display.x->window_desc,
+ FRAME_X_DISPLAY_INFO (f)->root_window,
+
+ /* From-position, to-position. */
+ -event.xconfigure.border_width,
+ -event.xconfigure.border_width,
+ &win_x, &win_y,
+
+ /* Child of win. */
+ &child);
+ event.xconfigure.x = win_x;
+ event.xconfigure.y = win_y;
+ }
- bzero (&compose_status, sizeof (compose_status));
+ f->display.x->pixel_width = event.xconfigure.width;
+ f->display.x->pixel_height = event.xconfigure.height;
+ f->display.x->left_pos = event.xconfigure.x;
+ f->display.x->top_pos = event.xconfigure.y;
- f = x_window_to_frame (event.xbutton.window);
- if (f)
- {
- if (!x_focus_frame || (f == x_focus_frame))
- construct_mouse_click (&emacs_event, &event, f);
- }
- else
+ /* What we have now is the position of Emacs's own window.
+ Convert that to the position of the window manager window. */
+ {
+ int x, y;
+ x_real_positions (f, &x, &y);
+ f->display.x->left_pos = x;
+ f->display.x->top_pos = y;
+ if (y != event.xconfigure.y)
+ {
+ /* Since the WM decorations come below top_pos now,
+ we must put them below top_pos in the future. */
+ f->display.x->win_gravity = NorthWestGravity;
+ x_wm_set_size_hint (f, 0, 0);
+ }
+ }
+ }
+#endif /* not USE_X_TOOLKIT */
+ break;
+
+ case ButtonPress:
+ case ButtonRelease:
{
- struct scroll_bar *bar
- = x_window_to_scroll_bar (event.xbutton.window);
+ /* If we decide we want to generate an event to be seen
+ by the rest of Emacs, we put it here. */
+ struct input_event emacs_event;
+ emacs_event.kind = no_event;
- if (bar)
- x_scroll_bar_handle_click (bar, &event, &emacs_event);
-#ifdef USE_X_TOOLKIT
+ bzero (&compose_status, sizeof (compose_status));
+
+ if (dpyinfo->grabbed && last_mouse_frame
+ && FRAME_LIVE_P (last_mouse_frame))
+ f = last_mouse_frame;
else
+ f = x_window_to_frame (event.xmotion.window);
+
+ if (f)
{
- /* Assume we have a menubar button press. A bad
- assumption should behave benignly. */
- popup_get_selection (&event);
- break;
+ if (!x_focus_frame || (f == x_focus_frame))
+ construct_mouse_click (&emacs_event, &event, f);
}
+ else
+ {
+ struct scroll_bar *bar
+ = x_window_to_scroll_bar (event.xbutton.window);
+
+ if (bar)
+ x_scroll_bar_handle_click (bar, &event, &emacs_event);
+#ifdef USE_X_TOOLKIT
+ else
+ {
+ /* Assume we have a menubar button press. A bad
+ assumption should behave benignly. */
+ popup_get_selection (&event);
+ break;
+ }
#endif /* USE_X_TOOLKIT */
- }
+ }
- if (event.type == ButtonPress)
- {
- x_mouse_grabbed |= (1 << event.xbutton.button);
- Vmouse_depressed = Qt;
- last_mouse_frame = f;
- }
- else
- {
- x_mouse_grabbed &= ~(1 << event.xbutton.button);
- if (!x_mouse_grabbed)
- Vmouse_depressed = Qnil;
- }
+ if (event.type == ButtonPress)
+ {
+ dpyinfo->grabbed |= (1 << event.xbutton.button);
+ last_mouse_frame = f;
+ }
+ else
+ {
+ dpyinfo->grabbed &= ~(1 << event.xbutton.button);
+ }
- if (numchars >= 1 && emacs_event.kind != no_event)
- {
- bcopy (&emacs_event, bufp, sizeof (struct input_event));
- bufp++;
- count++;
- numchars--;
- }
+ if (numchars >= 1 && emacs_event.kind != no_event)
+ {
+ bcopy (&emacs_event, bufp, sizeof (struct input_event));
+ bufp++;
+ count++;
+ numchars--;
+ }
#ifdef USE_X_TOOLKIT
- goto OTHER;
+ goto OTHER;
#endif /* USE_X_TOOLKIT */
- }
- break;
+ }
+ break;
- case CirculateNotify:
- break;
- case CirculateRequest:
- break;
+ case CirculateNotify:
+ break;
+ case CirculateRequest:
+ break;
- case MappingNotify:
- /* Someone has changed the keyboard mapping - update the
- local cache. */
- switch (event.xmapping.request)
- {
- case MappingModifier:
- x_find_modifier_meanings ();
- /* This is meant to fall through. */
- case MappingKeyboard:
- XRefreshKeyboardMapping (&event.xmapping);
- }
+ case MappingNotify:
+ /* Someone has changed the keyboard mapping - update the
+ local cache. */
+ switch (event.xmapping.request)
+ {
+ case MappingModifier:
+ x_find_modifier_meanings (dpyinfo);
+ /* This is meant to fall through. */
+ case MappingKeyboard:
+ XRefreshKeyboardMapping (&event.xmapping);
+ }
#ifdef USE_X_TOOLKIT
- goto OTHER;
+ goto OTHER;
#endif /* USE_X_TOOLKIT */
- break;
+ break;
- default:
+ default:
#ifdef USE_X_TOOLKIT
- OTHER:
- BLOCK_INPUT;
- XtDispatchEvent (&event);
- UNBLOCK_INPUT;
+ OTHER:
+ BLOCK_INPUT;
+ XtDispatchEvent (&event);
+ UNBLOCK_INPUT;
#endif /* USE_X_TOOLKIT */
- break;
+ break;
+ }
}
}
if (x_noop_count >= 100)
{
x_noop_count=0;
- XNoOp (x_current_display);
+ /* Use the first display in the list. Why not? */
+ XNoOp (x_display_list->display);
}
}
-#if 0 /* This fails for serial-line connections to the X server,
- because the characters arrive one by one, and a partial
- command makes select return but gives nothing to read.
- We'll have to hope that the bug that this tried to fix
- in 1988 has been fixed in Xlib or the X server. */
-#ifdef HAVE_SELECT
- if (expected && ! event_found)
- {
- /* AOJ 880406: if select returns true but XPending doesn't, it means that
- there is an EOF condition; in other words, that X has died.
- Act as if there had been a hangup. */
- int fd = ConnectionNumber (x_current_display);
- SELECT_TYPE mask, junk1, junk2;
- EMACS_TIME timeout;
-
- FD_ZERO (&mask);
- FD_SET (fd, &mask);
- EMACS_SET_SECS_USECS (timeout, 0, 0);
- FD_ZERO (&junk1);
- FD_ZERO (&junk2);
- if (0 != select (fd + 1, &mask, &junk1, &junk2, &timeout)
- && !XStuffPending ())
- kill (getpid (), SIGHUP);
- }
-#endif /* HAVE_SELECT */
-#endif /* 0 */
-
/* If the focus was just given to an autoraising frame,
raise it now. */
+ /* ??? This ought to be able to handle more than one such frame. */
if (pending_autoraise_frame)
{
x_raise_frame (pending_autoraise_frame);
int width = FONT_WIDTH (f->display.x->font);
int height = f->display.x->line_height;
- XDrawRectangle (x_current_display, FRAME_X_WINDOW (f),
+ XDrawRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
f->display.x->cursor_gc,
left, top, width - 1, height - 1);
}
&& curs_x < current_glyphs->used[curs_y])
? current_glyphs->glyphs[curs_y][curs_x]
: SPACEGLYPH);
- XFillRectangle (x_current_display, FRAME_X_WINDOW (f),
+ XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
f->display.x->cursor_gc,
CHAR_TO_PIXEL_COL (f, curs_x),
CHAR_TO_PIXEL_ROW (f, curs_y),
- 1, f->display.x->line_height);
+ max (f->display.x->cursor_width, 1),
+ f->display.x->line_height);
f->phys_cursor_x = curs_x;
f->phys_cursor_y = curs_y;
}
if (updating_frame != f)
- XFlushQueue ();
+ XFlush (FRAME_X_DISPLAY (f));
}
&& (f != x_highlight_frame))))
{
int mouse_face_here = 0;
+ struct frame_glyphs *active_glyphs = FRAME_CURRENT_GLYPHS (f);
/* If the cursor is in the mouse face area, redisplay that when
we clear the cursor. */
- if (f == mouse_face_mouse_frame
+ if (f == FRAME_X_DISPLAY_INFO (f)->mouse_face_mouse_frame
&&
- (f->phys_cursor_y > mouse_face_beg_row
- || (f->phys_cursor_y == mouse_face_beg_row
- && f->phys_cursor_x >= mouse_face_beg_col))
+ (f->phys_cursor_y > FRAME_X_DISPLAY_INFO (f)->mouse_face_beg_row
+ || (f->phys_cursor_y == FRAME_X_DISPLAY_INFO (f)->mouse_face_beg_row
+ && f->phys_cursor_x >= FRAME_X_DISPLAY_INFO (f)->mouse_face_beg_col))
&&
- (f->phys_cursor_y < mouse_face_end_row
- || (f->phys_cursor_y == mouse_face_end_row
- && f->phys_cursor_x < mouse_face_end_col)))
+ (f->phys_cursor_y < FRAME_X_DISPLAY_INFO (f)->mouse_face_end_row
+ || (f->phys_cursor_y == FRAME_X_DISPLAY_INFO (f)->mouse_face_end_row
+ && f->phys_cursor_x < FRAME_X_DISPLAY_INFO (f)->mouse_face_end_col))
+ /* Don't redraw the cursor's spot in mouse face
+ if it is at the end of a line (on a newline).
+ The cursor appears there, but mouse highlighting does not. */
+ && active_glyphs->used[f->phys_cursor_y] > f->phys_cursor_x)
mouse_face_here = 1;
/* If the font is not as tall as a whole line,
we must explicitly clear the line's whole height. */
if (FONT_HEIGHT (f->display.x->font) != f->display.x->line_height)
- XClearArea (x_current_display, FRAME_X_WINDOW (f),
+ XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
CHAR_TO_PIXEL_COL (f, f->phys_cursor_x),
CHAR_TO_PIXEL_ROW (f, f->phys_cursor_y),
FONT_WIDTH (f->display.x->font),
}
if (updating_frame != f)
- XFlushQueue ();
+ XFlush (FRAME_X_DISPLAY (f));
}
x_display_cursor (f, on)
else
{
/* Create the GNU bitmap if necessary. */
- if (!icon_bitmap)
- icon_bitmap = x_create_bitmap_from_data (f, gnu_bits,
- gnu_width, gnu_height);
+ if (FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id < 0)
+ FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id
+ = x_create_bitmap_from_data (f, gnu_bits,
+ gnu_width, gnu_height);
/* The first time we create the GNU bitmap,
this increments the refcount one extra time.
As a result, the GNU bitmap is never freed.
That way, we don't have to worry about allocating it again. */
- x_reference_bitmap (f, icon_bitmap);
+ x_reference_bitmap (f, FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id);
- bitmap_id = icon_bitmap;
+ bitmap_id = FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id;
}
x_wm_set_icon_pixmap (f, bitmap_id);
f->display.x->icon_label = " *emacs* ";
#if 0
- XSetIconName (x_current_display, FRAME_X_WINDOW (f),
+ XSetIconName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
(char *) f->display.x->icon_label);
#endif
\f
/* Handling X errors. */
-/* Shut down Emacs in an orderly fashion, because of a SIGPIPE on the
- X server's connection, or an error reported via the X protocol. */
+/* Handle the loss of connection to display DISPLAY. */
static SIGTYPE
-x_connection_closed ()
+x_connection_closed (display, error_message)
+ Display *display;
+ char *error_message;
{
+ struct x_display_info *dpyinfo = x_display_info_for_display (display);
+ Lisp_Object frame, tail;
+
if (_Xdebug)
abort ();
- shut_down_emacs (0, 1, Qnil);
+ /* First delete frames whose minibuffers are on frames
+ that are on the dead display. */
+ FOR_EACH_FRAME (tail, frame)
+ {
+ Lisp_Object minibuf_frame;
+ minibuf_frame
+ = WINDOW_FRAME (XWINDOW (FRAME_MINIBUF_WINDOW (XFRAME (frame))));
+ if (! EQ (frame, minibuf_frame)
+ && FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo)
+ Fdelete_frame (frame, Qt);
+ }
+
+ /* Now delete all remaining frames on the dead display.
+ We are now sure none of these is used as the minibuffer
+ for another frame that we need to delete. */
+ FOR_EACH_FRAME (tail, frame)
+ if (FRAME_X_DISPLAY_INFO (XFRAME (frame)) == dpyinfo)
+ Fdelete_frame (frame, Qt);
+
+ x_delete_display (dpyinfo);
+
+ if (x_display_list == 0)
+ {
+ fprintf (stderr, "%s", error_message);
+ shut_down_emacs (0, 0, Qnil);
+ exit (70);
+ }
+
+ /* Ordinary stack unwind doesn't deal with these. */
+#ifdef SIGIO
+ sigunblock (sigmask (SIGIO));
+#endif
+ sigunblock (sigmask (SIGALRM));
+ TOTALLY_UNBLOCK_INPUT;
+
+ error ("%s", error_message);
+}
+static SIGTYPE
+x_connection_signal (signalnum) /* If we don't have an argument, */
+ int signalnum; /* some compilers complain in signal calls. */
+{
+ /* We really ought to close the connection to the display
+ that actually failed.
+ But do we actually get this signal ever with X11? */
+ fprintf (stderr, "X connection closed");
+ shut_down_emacs (0, 0, Qnil);
exit (70);
}
-/* An X error handler which prints an error message and then kills
- Emacs. This is what's normally installed as Xlib's handler for
- protocol errors. */
+/* This is the usual handler for X protocol errors.
+ It kills all frames on the display that we got the error for.
+ If that was the only one, it prints an error message and kills Emacs. */
+
static int
x_error_quitter (display, error)
Display *display;
XErrorEvent *error;
{
- char buf[256];
+ char buf[256], buf1[356];
/* Note that there is no real way portable across R3/R4 to get the
original error handler. */
XGetErrorText (display, error->error_code, buf, sizeof (buf));
- fprintf (stderr, "X protocol error: %s on protocol request %d\n",
+ sprintf (buf1, "X protocol error: %s on protocol request %d",
buf, error->request_code);
-
-#if 0
- /* While we're testing Emacs 19, we'll just dump core whenever we
- get an X error, so we can figure out why it happened. */
- abort ();
-#endif
-
- x_connection_closed ();
+ x_connection_closed (display, buf1);
}
-/* A handler for X IO errors which prints an error message and then
- kills Emacs. This is what is always installed as Xlib's handler
- for I/O errors. */
+/* This is the handler for X IO errors, always.
+ It kills all frames on the display that we lost touch with.
+ If that was the only one, it prints an error message and kills Emacs. */
+
static int
x_io_error_quitter (display)
Display *display;
{
- fprintf (stderr, "Connection to X server %s lost.\n",
- XDisplayName (DisplayString (display)));
-
-#if 0
- /* While we're testing Emacs 19, we'll just dump core whenever we
- get an X error, so we can figure out why it happened. */
- abort ();
-#endif
+ char buf[256];
- x_connection_closed ();
+ sprintf (buf, "Connection lost to X server `%s'", DisplayString (display));
+ x_connection_closed (display, buf);
}
-
+\f
/* A buffer for storing X error messages. */
static char *x_caught_error_message;
#define X_CAUGHT_ERROR_MESSAGE_SIZE 200
/* An X error handler which stores the error message in
x_caught_error_message. This is what's installed when
x_catch_errors is in effect. */
+
static int
x_error_catcher (display, error)
Display *display;
}
-/* Begin trapping X errors.
+/* Begin trapping X errors for display DPY. Actually we trap X errors
+ for all displays, but DPY should be the display you are actually
+ operating on.
After calling this function, X protocol errors no longer cause
Emacs to exit; instead, they are recorded in x_cfc_error_message.
void x_catch_errors (), x_check_errors (), x_uncatch_errors ();
void
-x_catch_errors ()
+x_catch_errors (dpy)
+ Display *dpy;
{
/* Make sure any errors from previous requests have been dealt with. */
- XSync (x_current_display, False);
+ XSync (dpy, False);
/* Set up the error buffer. */
x_caught_error_message
x_caught_error_message[0] = '\0';
/* Install our little error handler. */
- XHandleError (x_error_catcher);
+ XSetErrorHandler (x_error_catcher);
}
/* If any X protocol errors have arrived since the last call to
sprintf (a buffer, FORMAT, the x error message text) as the text. */
void
-x_check_errors (format)
+x_check_errors (dpy, format)
+ Display *dpy;
char *format;
{
/* Make sure to catch any errors incurred so far. */
- XSync (x_current_display, False);
+ XSync (dpy, False);
if (x_caught_error_message[0])
{
char buf[X_CAUGHT_ERROR_MESSAGE_SIZE + 56];
sprintf (buf, format, x_caught_error_message);
- x_uncatch_errors ();
+ x_uncatch_errors (dpy);
error (buf);
}
}
/* Nonzero if we had any X protocol errors since we did x_catch_errors. */
int
-x_had_errors_p ()
+x_had_errors_p (dpy)
+ Display *dpy;
{
/* Make sure to catch any errors incurred so far. */
- XSync (x_current_display, False);
+ XSync (dpy, False);
return x_caught_error_message[0] != 0;
}
/* Stop catching X protocol errors and let them make Emacs die. */
void
-x_uncatch_errors ()
+x_uncatch_errors (dpy)
+ Display *dpy;
{
xfree (x_caught_error_message);
x_caught_error_message = 0;
- XHandleError (x_error_quitter);
+ XSetErrorHandler (x_error_quitter);
}
#if 0
\f
/* Changing the font of the frame. */
-/* Set the font of the x-window specified by frame F
- to the font named NEWNAME. This is safe to use
- even before F has an actual x-window. */
-
-struct font_info
-{
- XFontStruct *font;
- char *name;
- char *full_name;
-};
-
-/* A table of all the fonts we have already loaded. */
-static struct font_info *x_font_table;
-
-/* The current capacity of x_font_table. */
-static int x_font_table_size;
-
-/* The number of fonts actually stored in x_font_table.
- x_font_table[n] is used and valid iff 0 <= n < n_fonts.
- 0 <= n_fonts <= x_font_table_size. */
-static int n_fonts;
-
/* Give frame F the font named FONTNAME as its default font, and
return the full name of that font. FONTNAME may be a wildcard
pattern; in that case, we choose some font that fits the pattern.
/* Get a list of all the fonts that match this name. Once we
have a list of matching fonts, we compare them against the fonts
we already have by comparing font ids. */
- font_names = (char **) XListFonts (x_current_display, fontname,
+ font_names = (char **) XListFonts (FRAME_X_DISPLAY (f), fontname,
1024, &n_matching_fonts);
/* Apparently it doesn't set n_matching_fonts to zero when it can't
find any matches; font_names == 0 is the only clue. */
{
int i, j;
- for (i = 0; i < n_fonts; i++)
+ for (i = 0; i < FRAME_X_DISPLAY_INFO (f)->n_fonts; i++)
for (j = 0; j < n_matching_fonts; j++)
- if (!strcmp (x_font_table[i].name, font_names[j])
- || !strcmp (x_font_table[i].full_name, font_names[j]))
+ if (!strcmp (FRAME_X_DISPLAY_INFO (f)->font_table[i].name, font_names[j])
+ || !strcmp (FRAME_X_DISPLAY_INFO (f)->font_table[i].full_name, font_names[j]))
{
already_loaded = i;
- fontname = x_font_table[i].full_name;
+ fontname = FRAME_X_DISPLAY_INFO (f)->font_table[i].full_name;
goto found_font;
}
}
/* If we have, just return it from the table. */
if (already_loaded >= 0)
- f->display.x->font = x_font_table[already_loaded].font;
+ f->display.x->font = FRAME_X_DISPLAY_INFO (f)->font_table[already_loaded].font;
/* Otherwise, load the font and add it to the table. */
else
{
int i;
char *full_name;
XFontStruct *font;
+ int n_fonts;
/* Try to find a character-cell font in the list. */
#if 0
if (n_matching_fonts != 0)
fontname = font_names[i];
- font = (XFontStruct *) XLoadQueryFont (x_current_display, fontname);
+ font = (XFontStruct *) XLoadQueryFont (FRAME_X_DISPLAY (f), fontname);
if (! font)
{
/* Free the information from XListFonts. */
}
/* Do we need to create the table? */
- if (x_font_table_size == 0)
+ if (FRAME_X_DISPLAY_INFO (f)->font_table_size == 0)
{
- x_font_table_size = 16;
- x_font_table
- = (struct font_info *) xmalloc (x_font_table_size
- * sizeof (x_font_table[0]));
+ FRAME_X_DISPLAY_INFO (f)->font_table_size = 16;
+ FRAME_X_DISPLAY_INFO (f)->font_table
+ = (struct font_info *) xmalloc (FRAME_X_DISPLAY_INFO (f)->font_table_size
+ * sizeof (struct font_info));
}
/* Do we need to grow the table? */
- else if (n_fonts >= x_font_table_size)
+ else if (FRAME_X_DISPLAY_INFO (f)->n_fonts
+ >= FRAME_X_DISPLAY_INFO (f)->font_table_size)
{
- x_font_table_size *= 2;
- x_font_table
- = (struct font_info *) xrealloc (x_font_table,
- (x_font_table_size
- * sizeof (x_font_table[0])));
+ FRAME_X_DISPLAY_INFO (f)->font_table_size *= 2;
+ FRAME_X_DISPLAY_INFO (f)->font_table
+ = (struct font_info *) xrealloc (FRAME_X_DISPLAY_INFO (f)->font_table,
+ (FRAME_X_DISPLAY_INFO (f)->font_table_size
+ * sizeof (struct font_info)));
}
/* Try to get the full name of FONT. Put it in full_name. */
for (i = 0; i < font->n_properties; i++)
{
char *atom
- = XGetAtomName (x_current_display, font->properties[i].name);
+ = XGetAtomName (FRAME_X_DISPLAY (f), font->properties[i].name);
if (!strcmp (atom, "FONT"))
{
- char *name = XGetAtomName (x_current_display,
+ char *name = XGetAtomName (FRAME_X_DISPLAY (f),
(Atom) (font->properties[i].card32));
char *p = name;
int dashes = 0;
XFree (atom);
}
- x_font_table[n_fonts].name = (char *) xmalloc (strlen (fontname) + 1);
- bcopy (fontname, x_font_table[n_fonts].name, strlen (fontname) + 1);
+ n_fonts = FRAME_X_DISPLAY_INFO (f)->n_fonts;
+ FRAME_X_DISPLAY_INFO (f)->font_table[n_fonts].name = (char *) xmalloc (strlen (fontname) + 1);
+ bcopy (fontname, FRAME_X_DISPLAY_INFO (f)->font_table[n_fonts].name, strlen (fontname) + 1);
if (full_name != 0)
- x_font_table[n_fonts].full_name = full_name;
+ FRAME_X_DISPLAY_INFO (f)->font_table[n_fonts].full_name = full_name;
else
- x_font_table[n_fonts].full_name = x_font_table[n_fonts].name;
- f->display.x->font = x_font_table[n_fonts++].font = font;
+ FRAME_X_DISPLAY_INFO (f)->font_table[n_fonts].full_name = FRAME_X_DISPLAY_INFO (f)->font_table[n_fonts].name;
+ f->display.x->font = FRAME_X_DISPLAY_INFO (f)->font_table[n_fonts].font = font;
+ FRAME_X_DISPLAY_INFO (f)->n_fonts++;
if (full_name)
fontname = full_name;
/* Now make the frame display the given font. */
if (FRAME_X_WINDOW (f) != 0)
{
- XSetFont (x_current_display, f->display.x->normal_gc,
+ XSetFont (FRAME_X_DISPLAY (f), f->display.x->normal_gc,
f->display.x->font->fid);
- XSetFont (x_current_display, f->display.x->reverse_gc,
+ XSetFont (FRAME_X_DISPLAY (f), f->display.x->reverse_gc,
f->display.x->font->fid);
- XSetFont (x_current_display, f->display.x->cursor_gc,
+ XSetFont (FRAME_X_DISPLAY (f), f->display.x->cursor_gc,
f->display.x->font->fid);
frame_update_line_height (f);
/* Find the position of the outside upper-left corner of
the inner window, with respect to the outer window. */
- if (f->display.x->parent_desc != ROOT_WINDOW)
+ if (f->display.x->parent_desc != FRAME_X_DISPLAY_INFO (f)->root_window)
{
BLOCK_INPUT;
- XTranslateCoordinates (x_current_display,
+ XTranslateCoordinates (FRAME_X_DISPLAY (f),
/* From-window, to-window. */
f->display.x->window_desc,
/* Treat negative positions as relative to the leftmost bottommost
position that fits on the screen. */
if (flags & XNegative)
- f->display.x->left_pos = (x_screen_width
+ f->display.x->left_pos = (FRAME_X_DISPLAY_INFO (f)->width
- 2 * f->display.x->border_width - win_x
- PIXEL_WIDTH (f)
+ f->display.x->left_pos);
if (flags & YNegative)
- f->display.x->top_pos = (x_screen_height
+ f->display.x->top_pos = (FRAME_X_DISPLAY_INFO (f)->height
- 2 * f->display.x->border_width - win_y
- PIXEL_HEIGHT (f)
+ f->display.x->top_pos);
x_wm_set_size_hint (f, 0, 0);
#ifdef USE_X_TOOLKIT
- XMoveWindow (XDISPLAY XtWindow (f->display.x->widget),
+ XMoveWindow (FRAME_X_DISPLAY (f), XtWindow (f->display.x->widget),
f->display.x->left_pos, f->display.x->top_pos);
#else /* not USE_X_TOOLKIT */
- XMoveWindow (XDISPLAY FRAME_X_WINDOW (f),
+ XMoveWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
f->display.x->left_pos, f->display.x->top_pos);
#endif /* not USE_X_TOOLKIT */
UNBLOCK_INPUT;
f->display.x->win_gravity = NorthWestGravity;
x_wm_set_size_hint (f, 0, 0);
- XSync (x_current_display, False);
- XChangeWindowSize (FRAME_X_WINDOW (f), pixelwidth, pixelheight);
+ XSync (FRAME_X_DISPLAY (f), False);
+ XResizeWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+ pixelwidth, pixelheight);
/* Now, strictly speaking, we can't be sure that this is accurate,
but the window manager will get around to dealing with the size
we have to make sure to do it here. */
SET_FRAME_GARBAGED (f);
- XFlushQueue ();
+ XFlush (FRAME_X_DISPLAY (f));
UNBLOCK_INPUT;
#endif /* not USE_X_TOOLKIT */
}
BLOCK_INPUT;
- XWarpMousePointer (FRAME_X_WINDOW (f), pix_x, pix_y);
+ XWarpPointer (FRAME_X_DISPLAY (f), None, FRAME_X_WINDOW (f),
+ 0, 0, 0, 0, pix_x, pix_y);
UNBLOCK_INPUT;
}
{
BLOCK_INPUT;
- XWarpMousePointer (FRAME_X_WINDOW (f), pix_x, pix_y);
+ XWarpPointer (FRAME_X_DISPLAY (f), None, FRAME_X_WINDOW (f),
+ 0, 0, 0, 0, pix_x, pix_y);
UNBLOCK_INPUT;
}
/* I don't think that the ICCCM allows programs to do things like this
without the interaction of the window manager. Whatever you end up
doing with this code, do it to x_unfocus_frame too. */
- XSetInputFocus (x_current_display, FRAME_X_WINDOW (f),
+ XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
RevertToPointerRoot, CurrentTime);
#endif /* ! 0 */
}
#if 0
/* Look at the remarks in x_focus_on_frame. */
if (x_focus_frame == f)
- XSetInputFocus (x_current_display, PointerRoot,
+ XSetInputFocus (FRAME_X_DISPLAY (f), PointerRoot,
RevertToPointerRoot, CurrentTime);
#endif /* ! 0 */
}
{
BLOCK_INPUT;
#ifdef USE_X_TOOLKIT
- XRaiseWindow (XDISPLAY XtWindow (f->display.x->widget));
+ XRaiseWindow (FRAME_X_DISPLAY (f), XtWindow (f->display.x->widget));
#else /* not USE_X_TOOLKIT */
- XRaiseWindow (XDISPLAY FRAME_X_WINDOW (f));
+ XRaiseWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
#endif /* not USE_X_TOOLKIT */
- XFlushQueue ();
+ XFlush (FRAME_X_DISPLAY (f));
UNBLOCK_INPUT;
}
}
{
BLOCK_INPUT;
#ifdef USE_X_TOOLKIT
- XLowerWindow (XDISPLAY XtWindow (f->display.x->widget));
+ XLowerWindow (FRAME_X_DISPLAY (f), XtWindow (f->display.x->widget));
#else /* not USE_X_TOOLKIT */
- XLowerWindow (XDISPLAY FRAME_X_WINDOW (f));
+ XLowerWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
#endif /* not USE_X_TOOLKIT */
- XFlushQueue ();
+ XFlush (FRAME_X_DISPLAY (f));
UNBLOCK_INPUT;
}
}
/* This was XtPopup, but that did nothing for an iconified frame. */
XtMapWidget (f->display.x->widget);
#else /* not USE_X_TOOLKIT */
- XMapWindow (XDISPLAY FRAME_X_WINDOW (f));
+ XMapRaised (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
#endif /* not USE_X_TOOLKIT */
#if 0 /* This seems to bring back scroll bars in the wrong places
if the window configuration has changed. They seem
to come back ok without this. */
if (FRAME_HAS_VERTICAL_SCROLL_BARS (f))
- XMapSubwindows (x_current_display, FRAME_X_WINDOW (f));
+ XMapSubwindows (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
#endif
}
- XFlushQueue ();
+ XFlush (FRAME_X_DISPLAY (f));
/* Synchronize to ensure Emacs knows the frame is visible
before we do anything else. We do this loop with input not blocked
while (1)
{
- x_sync (frame);
+ x_sync (f);
/* Once we have handled input events,
we should have received the MapNotify if one is coming.
So if we have not got it yet, stop looping.
#ifdef HAVE_X11R4
- if (! XWithdrawWindow (x_current_display, window,
- DefaultScreen (x_current_display)))
+ if (! XWithdrawWindow (FRAME_X_DISPLAY (f), window,
+ DefaultScreen (FRAME_X_DISPLAY (f))))
{
UNBLOCK_INPUT_RESIGNAL;
error ("Can't notify window manager of window withdrawal");
unmap.xunmap.type = UnmapNotify;
unmap.xunmap.window = window;
- unmap.xunmap.event = DefaultRootWindow (x_current_display);
+ unmap.xunmap.event = DefaultRootWindow (FRAME_X_DISPLAY (f));
unmap.xunmap.from_configure = False;
- if (! XSendEvent (x_current_display,
- DefaultRootWindow (x_current_display),
+ if (! XSendEvent (FRAME_X_DISPLAY (f),
+ DefaultRootWindow (FRAME_X_DISPLAY (f)),
False,
SubstructureRedirectMask|SubstructureNotifyMask,
&unmap))
}
/* Unmap the window ourselves. Cheeky! */
- XUnmapWindow (x_current_display, window);
+ XUnmapWindow (FRAME_X_DISPLAY (f), window);
#endif /* ! defined (HAVE_X11R4) */
/* We can't distinguish this from iconification
f->async_visible = 0;
f->async_iconified = 0;
- x_sync ();
+ x_sync (f);
UNBLOCK_INPUT;
}
return;
}
- result = XIconifyWindow (x_current_display,
+ result = XIconifyWindow (FRAME_X_DISPLAY (f),
XtWindow (f->display.x->widget),
- DefaultScreen (x_current_display));
+ DefaultScreen (FRAME_X_DISPLAY (f)));
UNBLOCK_INPUT;
if (!result)
f->async_iconified = 1;
BLOCK_INPUT;
- XFlushQueue ();
+ XFlush (FRAME_X_DISPLAY (f));
UNBLOCK_INPUT;
#else /* not USE_X_TOOLKIT */
message.xclient.window = FRAME_X_WINDOW (f);
message.xclient.type = ClientMessage;
- message.xclient.message_type = Xatom_wm_change_state;
+ message.xclient.message_type = FRAME_X_DISPLAY_INFO (f)->Xatom_wm_change_state;
message.xclient.format = 32;
message.xclient.data.l[0] = IconicState;
- if (! XSendEvent (x_current_display,
- DefaultRootWindow (x_current_display),
+ if (! XSendEvent (FRAME_X_DISPLAY (f),
+ DefaultRootWindow (FRAME_X_DISPLAY (f)),
False,
SubstructureRedirectMask | SubstructureNotifyMask,
&message))
if (!FRAME_VISIBLE_P (f))
{
/* If the frame was withdrawn, before, we must map it. */
- XMapWindow (XDISPLAY FRAME_X_WINDOW (f));
-#if 0 /* We don't have subwindows in the icon. */
- if (FRAME_HAS_VERTICAL_SCROLL_BARS (f))
- XMapSubwindows (x_current_display, FRAME_X_WINDOW (f));
-#endif
+ XMapRaised (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
}
f->async_iconified = 1;
- XFlushQueue ();
+ XFlush (FRAME_X_DISPLAY (f));
UNBLOCK_INPUT;
#endif /* not USE_X_TOOLKIT */
}
x_destroy_window (f)
struct frame *f;
{
+ struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
+
BLOCK_INPUT;
if (f->display.x->icon_desc != 0)
- XDestroyWindow (XDISPLAY f->display.x->icon_desc);
- XDestroyWindow (XDISPLAY f->display.x->window_desc);
+ XDestroyWindow (FRAME_X_DISPLAY (f), f->display.x->icon_desc);
+ XDestroyWindow (FRAME_X_DISPLAY (f), f->display.x->window_desc);
#ifdef USE_X_TOOLKIT
XtDestroyWidget (f->display.x->widget);
free_frame_menubar (f);
#endif /* USE_X_TOOLKIT */
free_frame_faces (f);
- XFlushQueue ();
-
- FRAME_X_SCREEN (f)->reference_count--;
-#if 0
- if (FRAME_X_SCREEN (f)->reference_count == 0)
- free (FRAME_X_SCREEN (f));
-#endif
+ XFlush (FRAME_X_DISPLAY (f));
xfree (f->display.x);
f->display.x = 0;
if (f == x_focus_frame)
x_focus_frame = 0;
+ if (f == x_focus_event_frame)
+ x_focus_event_frame = 0;
if (f == x_highlight_frame)
x_highlight_frame = 0;
- if (f == mouse_face_mouse_frame)
+ dpyinfo->reference_count--;
+
+ if (f == dpyinfo->mouse_face_mouse_frame)
{
- mouse_face_beg_row = mouse_face_beg_col = -1;
- mouse_face_end_row = mouse_face_end_col = -1;
- mouse_face_window = Qnil;
+ dpyinfo->mouse_face_beg_row
+ = dpyinfo->mouse_face_beg_col = -1;
+ dpyinfo->mouse_face_end_row
+ = dpyinfo->mouse_face_end_col = -1;
+ dpyinfo->mouse_face_window = Qnil;
}
UNBLOCK_INPUT;
size_hints.width_inc = FONT_WIDTH (f->display.x->font);
size_hints.height_inc = f->display.x->line_height;
- size_hints.max_width = x_screen_width - CHAR_TO_PIXEL_WIDTH (f, 0);
- size_hints.max_height = x_screen_height - CHAR_TO_PIXEL_HEIGHT (f, 0);
+ size_hints.max_width
+ = FRAME_X_DISPLAY_INFO (f)->width - CHAR_TO_PIXEL_WIDTH (f, 0);
+ size_hints.max_height
+ = FRAME_X_DISPLAY_INFO (f)->height - CHAR_TO_PIXEL_HEIGHT (f, 0);
{
int base_width, base_height;
int value;
#ifdef HAVE_X11R4
- value = XGetWMNormalHints (x_current_display, window, &hints,
+ value = XGetWMNormalHints (FRAME_X_DISPLAY (f), window, &hints,
&supplied_return);
#else
- value = XGetNormalHints (x_current_display, window, &hints);
+ value = XGetNormalHints (FRAME_X_DISPLAY (f), window, &hints);
#endif
if (value == 0)
#endif /* PWinGravity */
#ifdef HAVE_X11R4
- XSetWMNormalHints (x_current_display, window, &size_hints);
+ XSetWMNormalHints (FRAME_X_DISPLAY (f), window, &size_hints);
#else
- XSetNormalHints (x_current_display, window, &size_hints);
+ XSetNormalHints (FRAME_X_DISPLAY (f), window, &size_hints);
#endif
}
f->display.x->wm_hints.flags |= StateHint;
f->display.x->wm_hints.initial_state = state;
- XSetWMHints (x_current_display, window, &f->display.x->wm_hints);
+ XSetWMHints (FRAME_X_DISPLAY (f), window, &f->display.x->wm_hints);
#endif /* not USE_X_TOOLKIT */
}
if (pixmap_id > 0)
{
- Pixmap icon_pixmap = x_lookup_pixmap (pixmap_id);
+ Pixmap icon_pixmap = x_bitmap_pixmap (f, pixmap_id);
f->display.x->wm_hints.icon_pixmap = icon_pixmap;
f->display.x->wm_hints.flags |= IconPixmapHint;
}
f->display.x->wm_hints.flags &= ~IconPixmapHint;
}
- XSetWMHints (x_current_display, window, &f->display.x->wm_hints);
+ XSetWMHints (FRAME_X_DISPLAY (f), window, &f->display.x->wm_hints);
}
x_wm_set_icon_position (f, icon_x, icon_y)
f->display.x->wm_hints.icon_x = icon_x;
f->display.x->wm_hints.icon_y = icon_y;
- XSetWMHints (x_current_display, window, &f->display.x->wm_hints);
+ XSetWMHints (FRAME_X_DISPLAY (f), window, &f->display.x->wm_hints);
}
\f
};
#endif /* USE_X_TOOLKIT */
-void
+static int x_initialized;
+
+struct x_display_info *
x_term_init (display_name, xrm_option, resource_name)
- char *display_name;
+ Lisp_Object display_name;
char *xrm_option;
char *resource_name;
{
Lisp_Object frame;
char *defaultvalue;
- int argc = 0;
- char** argv = 0;
-#ifndef F_SETOWN_BUG
-#ifdef F_SETOWN
- extern int old_fcntl_owner;
-#endif /* ! defined (F_SETOWN) */
-#endif /* F_SETOWN_BUG */
+ int connection;
+ Display *dpy;
+ struct x_display_info *dpyinfo;
+ XrmDatabase xrdb;
- x_noop_count = 0;
-
- x_focus_frame = x_highlight_frame = 0;
+ if (!x_initialized)
+ {
+ x_initialize ();
+ x_initialized = 1;
+ }
#ifdef USE_X_TOOLKIT
#ifdef HAVE_X11R5
XtSetLanguageProc (NULL, NULL, NULL);
#endif
- argv = (char **) XtMalloc (7 * sizeof (char *));
- argv[0] = "";
- argv[1] = "-display";
- argv[2] = display_name;
- argv[3] = "-name";
- /* Usually `emacs', but not always. */
- argv[4] = resource_name;
- argc = 5;
- if (xrm_option)
- {
- argv[argc++] = "-xrm";
- argv[argc++] = xrm_option;
- }
- Xt_app_shell = XtAppInitialize (&Xt_app_con, "Emacs",
- emacs_options, XtNumber (emacs_options),
- &argc, argv,
- NULL, NULL, 0);
- XtFree ((char *)argv);
- x_current_display = XtDisplay (Xt_app_shell);
+ {
+ int argc = 0;
+ char *argv[3];
+
+ argv[0] = "";
+ argc = 1;
+ if (xrm_option)
+ {
+ argv[argc++] = "-xrm";
+ argv[argc++] = xrm_option;
+ }
+ dpy = XtOpenDisplay (Xt_app_con, XSTRING (display_name)->data,
+ resource_name, EMACS_CLASS,
+ emacs_options, XtNumber (emacs_options),
+ &argc, argv);
+ }
#else /* not USE_X_TOOLKIT */
#ifdef HAVE_X11R5
XSetLocaleModifiers ("");
#endif
- x_current_display = XOpenDisplay (display_name);
+ dpy = XOpenDisplay (XSTRING (display_name)->data);
#endif /* not USE_X_TOOLKIT */
- if (x_current_display == 0)
- fatal ("X server %s not responding.\n\
-Check the DISPLAY environment variable or use \"-d\"\n",
- display_name);
- {
+ /* Detect failure. */
+ if (dpy == 0)
+ return 0;
+
+ /* We have definitely succeeded. Record the new connection. */
+
+ dpyinfo = (struct x_display_info *) xmalloc (sizeof (struct x_display_info));
+
+#ifdef MULTI_PERDISPLAY
+ init_perdisplay (&dpyinfo->perdisplay);
+ dpyinfo->perdisplay.next_perdisplay = all_perdisplays;
+ all_perdisplays = &dpyinfo->perdisplay;
+#endif
+
+ /* Put this display on the chain. */
+ dpyinfo->next = x_display_list;
+ x_display_list = dpyinfo;
+
+ /* Put it on x_display_name_list as well, to keep them parallel. */
+ x_display_name_list = Fcons (Fcons (display_name, Qnil),
+ x_display_name_list);
+ dpyinfo->name_list_element = XCONS (x_display_name_list)->car;
+
+ dpyinfo->display = dpy;
+
#if 0
- XSetAfterFunction (x_current_display, x_trace_wire);
+ XSetAfterFunction (x_current_display, x_trace_wire);
#endif /* ! 0 */
- x_id_name = (char *) xmalloc (XSTRING (Vinvocation_name)->size
- + XSTRING (Vsystem_name)->size
- + 2);
- sprintf (x_id_name, "%s@%s",
- XSTRING (Vinvocation_name)->data, XSTRING (Vsystem_name)->data);
- }
+
+ dpyinfo->x_id_name
+ = (char *) xmalloc (XSTRING (Vinvocation_name)->size
+ + XSTRING (Vsystem_name)->size
+ + 2);
+ sprintf (dpyinfo->x_id_name, "%s@%s",
+ XSTRING (Vinvocation_name)->data, XSTRING (Vsystem_name)->data);
/* Figure out which modifier bits mean what. */
- x_find_modifier_meanings ();
+ x_find_modifier_meanings (dpyinfo);
/* Get the scroll bar cursor. */
- x_vertical_scroll_bar_cursor
- = XCreateFontCursor (x_current_display, XC_sb_v_double_arrow);
+ dpyinfo->vertical_scroll_bar_cursor
+ = XCreateFontCursor (dpyinfo->display, XC_sb_v_double_arrow);
-#if 0
- /* Watch for PropertyNotify events on the root window; we use them
- to figure out when to invalidate our cache of the cut buffers. */
- x_watch_cut_buffer_cache ();
+ xrdb = x_load_resources (dpyinfo->display, xrm_option,
+ resource_name, EMACS_CLASS);
+#ifdef HAVE_XRMSETDATABASE
+ XrmSetDatabase (dpyinfo->display, xrdb);
+#else
+ dpyinfo->display->db = xrdb;
#endif
+ /* Put thr rdb where we can find it in a way that works on
+ all versions. */
+ dpyinfo->xrdb = xrdb;
+
+ dpyinfo->screen = ScreenOfDisplay (dpyinfo->display,
+ DefaultScreen (dpyinfo->display));
+ dpyinfo->visual = select_visual (dpyinfo->display, dpyinfo->screen,
+ &dpyinfo->n_planes);
+ dpyinfo->height = HeightOfScreen (dpyinfo->screen);
+ dpyinfo->width = WidthOfScreen (dpyinfo->screen);
+ dpyinfo->root_window = RootWindowOfScreen (dpyinfo->screen);
+ dpyinfo->grabbed = 0;
+ dpyinfo->reference_count = 0;
+ dpyinfo->icon_bitmap_id = -1;
+ dpyinfo->n_fonts = 0;
+ dpyinfo->font_table_size = 0;
+ dpyinfo->bitmaps = 0;
+ dpyinfo->bitmaps_size = 0;
+ dpyinfo->bitmaps_last = 0;
+ dpyinfo->scratch_cursor_gc = 0;
+ dpyinfo->mouse_face_mouse_frame = 0;
+ dpyinfo->mouse_face_deferred_gc = 0;
+ dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1;
+ dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_end_col = -1;
+ dpyinfo->mouse_face_face_id = 0;
+ dpyinfo->mouse_face_window = Qnil;
+ dpyinfo->mouse_face_mouse_x = dpyinfo->mouse_face_mouse_y = 0;
+ dpyinfo->mouse_face_defer = 0;
+
+ dpyinfo->Xatom_wm_protocols
+ = XInternAtom (dpyinfo->display, "WM_PROTOCOLS", False);
+ dpyinfo->Xatom_wm_take_focus
+ = XInternAtom (dpyinfo->display, "WM_TAKE_FOCUS", False);
+ dpyinfo->Xatom_wm_save_yourself
+ = XInternAtom (dpyinfo->display, "WM_SAVE_YOURSELF", False);
+ dpyinfo->Xatom_wm_delete_window
+ = XInternAtom (dpyinfo->display, "WM_DELETE_WINDOW", False);
+ dpyinfo->Xatom_wm_change_state
+ = XInternAtom (dpyinfo->display, "WM_CHANGE_STATE", False);
+ dpyinfo->Xatom_wm_configure_denied
+ = XInternAtom (dpyinfo->display, "WM_CONFIGURE_DENIED", False);
+ dpyinfo->Xatom_wm_window_moved
+ = XInternAtom (dpyinfo->display, "WM_MOVED", False);
+ dpyinfo->Xatom_editres
+ = XInternAtom (dpyinfo->display, "Editres", False);
+ dpyinfo->Xatom_CLIPBOARD
+ = XInternAtom (dpyinfo->display, "CLIPBOARD", False);
+ dpyinfo->Xatom_TIMESTAMP
+ = XInternAtom (dpyinfo->display, "TIMESTAMP", False);
+ dpyinfo->Xatom_TEXT
+ = XInternAtom (dpyinfo->display, "TEXT", False);
+ dpyinfo->Xatom_DELETE
+ = XInternAtom (dpyinfo->display, "DELETE", False);
+ dpyinfo->Xatom_MULTIPLE
+ = XInternAtom (dpyinfo->display, "MULTIPLE", False);
+ dpyinfo->Xatom_INCR
+ = XInternAtom (dpyinfo->display, "INCR", False);
+ dpyinfo->Xatom_EMACS_TMP
+ = XInternAtom (dpyinfo->display, "_EMACS_TMP_", False);
+ dpyinfo->Xatom_TARGETS
+ = XInternAtom (dpyinfo->display, "TARGETS", False);
+ dpyinfo->Xatom_NULL
+ = XInternAtom (dpyinfo->display, "NULL", False);
+ dpyinfo->Xatom_ATOM_PAIR
+ = XInternAtom (dpyinfo->display, "ATOM_PAIR", False);
+
+ connection = ConnectionNumber (dpyinfo->display);
+ dpyinfo->connection = connection;
#ifdef subprocesses
/* This is only needed for distinguishing keyboard and process input. */
- if (ConnectionNumber (x_current_display) != 0)
- change_keyboard_wait_descriptor (ConnectionNumber (x_current_display));
+ if (connection != 0)
+ add_keyboard_wait_descriptor (connection);
#endif
- change_input_fd (ConnectionNumber (x_current_display));
#ifndef F_SETOWN_BUG
#ifdef F_SETOWN
- old_fcntl_owner = fcntl (ConnectionNumber (x_current_display), F_GETOWN, 0);
#ifdef F_SETOWN_SOCK_NEG
/* stdin is a socket here */
- fcntl (ConnectionNumber (x_current_display), F_SETOWN, -getpid ());
+ fcntl (connection, F_SETOWN, -getpid ());
#else /* ! defined (F_SETOWN_SOCK_NEG) */
- fcntl (ConnectionNumber (x_current_display), F_SETOWN, getpid ());
+ fcntl (connection, F_SETOWN, getpid ());
#endif /* ! defined (F_SETOWN_SOCK_NEG) */
#endif /* ! defined (F_SETOWN) */
#endif /* F_SETOWN_BUG */
#ifdef SIGIO
- init_sigio ();
+ init_sigio (connection);
#endif /* ! defined (SIGIO) */
- expose_all_windows = 0;
+ return dpyinfo;
+}
+\f
+/* Get rid of display DPYINFO, assuming all frames are already gone,
+ and without sending any more commands to the X server. */
+void
+x_delete_display (dpyinfo)
+ struct x_display_info *dpyinfo;
+{
+ delete_keyboard_wait_descriptor (dpyinfo->connection);
+
+ /* Discard this display from x_display_name_list and x_display_list.
+ We can't use Fdelq because that can quit. */
+ if (! NILP (x_display_name_list)
+ && EQ (XCONS (x_display_name_list)->car, dpyinfo->name_list_element))
+ x_display_name_list = XCONS (x_display_name_list)->cdr;
+ else
+ {
+ Lisp_Object tail;
+
+ tail = x_display_name_list;
+ while (CONSP (tail) && CONSP (XCONS (tail)->cdr))
+ {
+ if (EQ (XCONS (XCONS (tail)->cdr)->car,
+ dpyinfo->name_list_element))
+ {
+ XCONS (tail)->cdr = XCONS (XCONS (tail)->cdr)->cdr;
+ break;
+ }
+ tail = XCONS (tail)->cdr;
+ }
+ }
+
+ if (x_display_list == dpyinfo)
+ x_display_list = dpyinfo->next;
+ else
+ {
+ struct x_display_info *tail;
+
+ for (tail = x_display_list; tail; tail = tail->next)
+ if (tail->next == dpyinfo)
+ tail->next = tail->next->next;
+ }
+
+#ifndef USE_X_TOOLKIT
+ /* I'm told Xt does this itself. */
+ XrmDestroyDatabase (dpyinfo->xrdb);
+#endif
+#ifdef MULTI_PERDISPLAY
+ {
+ PERDISPLAY **perdp;
+ for (perdp = &all_perdisplays; *perdp != &dpyinfo->perdisplay;
+ perdp = &(*perdp)->next_perdisplay)
+ if (*perdp == NULL)
+ abort ();
+ *perdp = dpyinfo->perdisplay.next_perdisplay;
+ }
+ wipe_perdisplay (&dpyinfo->perdisplay);
+#endif
+ xfree (dpyinfo->font_table);
+ xfree (dpyinfo->x_id_name);
+ xfree (dpyinfo);
+}
+\f
+/* Set up use of X before we make the first connection. */
+
+x_initialize ()
+{
clear_frame_hook = XTclear_frame;
clear_end_of_line_hook = XTclear_end_of_line;
ins_del_lines_hook = XTins_del_lines;
off the bottom */
baud_rate = 19200;
+ x_noop_count = 0;
+
+ x_focus_frame = x_highlight_frame = 0;
+
/* Try to use interrupt input; if we can't, then start polling. */
Fset_input_mode (Qt, Qnil, Qt, Qnil);
+#ifdef USE_X_TOOLKIT
+ XtToolkitInitialize ();
+ Xt_app_con = XtCreateApplicationContext ();
+#endif
+
/* Note that there is no real way portable across R3/R4 to get the
original error handler. */
- XHandleError (x_error_quitter);
- XHandleIOError (x_io_error_quitter);
+ XSetErrorHandler (x_error_quitter);
+ XSetIOErrorHandler (x_io_error_quitter);
/* Disable Window Change signals; they are handled by X events. */
#ifdef SIGWINCH
signal (SIGWINCH, SIG_DFL);
#endif /* ! defined (SIGWINCH) */
- signal (SIGPIPE, x_connection_closed);
+ signal (SIGPIPE, x_connection_signal);
}
void
syms_of_xterm ()
{
+ staticpro (&x_display_name_list);
+ x_display_name_list = Qnil;
+
staticpro (&last_mouse_scroll_bar);
last_mouse_scroll_bar = Qnil;
- staticpro (&mouse_face_window);
- mouse_face_window = Qnil;
}
#endif /* ! defined (HAVE_X_WINDOWS) */
HCoop / bpt / emacs.git / blobdiff