/* X Communication module for terminals which understand the X protocol.
- Copyright (C) 1989, 1992, 1993 Free Software Foundation, Inc.
+ Copyright (C) 1989, 1993 Free Software Foundation, Inc.
This file is part of GNU Emacs.
*/
+#define NEW_SELECTIONS
+
+/* On 4.3 these lose if they come after xterm.h. */
+/* On HP-UX 8.0 signal.h loses if it comes after config.h. */
+/* Putting these at the beginning seems to be standard for other .c files. */
+#include <stdio.h>
+#include <signal.h>
+
#include "config.h"
#ifdef HAVE_X_WINDOWS
#include "lisp.h"
-
-/* On 4.3 these lose if they come after xterm.h. */
-#include <stdio.h>
-#include <signal.h>
+#include "blockinput.h"
/* This may include sys/types.h, and that somehow loses
if this is not done before the other system files. */
#include <sys/ioctl.h>
#include <strings.h>
#else /* ! defined (BSD) */
-#include <sys/termio.h>
+#ifndef VMS
#include <string.h>
+#endif
#endif /* ! defined (BSD) */
-/* Allow m- file to inhibit use of FIONREAD. */
-#ifdef BROKEN_FIONREAD
-#undef FIONREAD
-#endif /* ! defined (BROKEN_FIONREAD) */
-
-/* We are unable to use interrupts if FIONREAD is not available,
- so flush SIGIO so we won't try. */
-#ifndef FIONREAD
-#ifdef SIGIO
-#undef SIGIO
-#endif /* ! defined (SIGIO) */
-#endif /* FIONREAD */
-
+#include "systty.h"
#include "systime.h"
#include <fcntl.h>
/*#include <X/Xproto.h> */
#endif /* ! defined (HAVE_X11) */
+#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
struct event_queue x_mouse_queue;
#endif /* HAVE_X11 */
-/* Nonzero after BLOCK_INPUT; prevents input events from being
- processed until later. */
-
-int x_input_blocked;
-
#if defined (SIGIO) && defined (FIONREAD)
int BLOCK_INPUT_mask;
#endif /* ! defined (SIGIO) && defined (FIONREAD) */
-/* Nonzero if input events came in while x_input_blocked was nonzero.
- UNBLOCK_INPUT checks for this. */
-
-int x_pending_input;
-
/* The id of a bitmap used for icon windows.
One such map is shared by all Emacs icon windows.
This is zero if we have not yet had a need to create the bitmap. */
extern Lisp_Object Vcommand_line_args;
char *hostname, *x_id_name;
-Lisp_Object invocation_name;
/* This is the X connection that we are using. */
Display *x_current_display;
-/* The cursor to use for vertical scrollbars on x_current_display. */
-static Cursor x_vertical_scrollbar_cursor;
+/* The cursor to use for vertical scroll bars on x_current_display. */
+static Cursor x_vertical_scroll_bar_cursor;
-/* Frame being updated by update_frame. */
-/* This is set by XTupdate_begin and looked at by all the
+/* Frame being updated by update_frame. This is declared in term.c.
+ This is set by update_begin and looked at by all the
XT functions. It is zero while not inside an update.
In that case, the XT functions assume that `selected_frame'
is the frame to apply to. */
-
-static struct frame *updating_frame;
+extern struct frame *updating_frame;
/* The frame (if any) which has the X window that has keyboard focus.
Zero if none. This is examined by Ffocus_frame in frame.c. Note
extern int errno;
-/* See keyboard.c. */
+/* A mask of extra modifier bits to put into every keyboard char. */
extern int extra_keyboard_modifiers;
extern Display *XOpenDisplay ();
extern FONT_TYPE *XOpenFont ();
static void flashback ();
+static void redraw_previous_char ();
#ifndef HAVE_X11
static void dumpqueue ();
of the frame being updated, so that the XT... functions do not
need to take a frame as argument. Most of the XT... functions
should never be called except during an update, the only exceptions
- being XTcursor_to, XTwrite_char and XTreassert_line_highlight. */
+ being XTcursor_to, XTwrite_glyphs and XTreassert_line_highlight. */
extern int mouse_track_top, mouse_track_left, mouse_track_width;
if (f == 0)
abort ();
- updating_frame = f;
flexlines = f->height;
highlight = 0;
x_display_cursor (f, 1);
- updating_frame = 0;
XFlushQueue ();
UNBLOCK_INPUT;
}
WINDOW is the x-window to output to. LEFT and TOP are starting coords.
HL is 1 if this text is highlighted, 2 if the cursor is on it.
- FONT is the default font to use (for glyphs whose font-code is 0). */
+ FONT is the default font to use (for glyphs whose font-code is 0).
-static void
-dumpglyphs (f, left, top, gp, n, hl, font)
- struct frame *f;
- int left, top;
- register GLYPH *gp; /* Points to first GLYPH. */
- register int n; /* Number of glyphs to display. */
- int hl;
- FONT_TYPE *font;
-{
- register int len;
- Window window = FRAME_X_WINDOW (f);
- GC drawing_gc = (hl == 2 ? f->display.x->cursor_gc
- : (hl ? f->display.x->reverse_gc
- : f->display.x->normal_gc));
+ Since the display generation code is responsible for calling
+ compute_char_face and compute_glyph_face on everything it puts in
+ the display structure, we can assume that the face code on each
+ glyph is a valid index into FRAME_COMPUTED_FACES (f), and the one
+ to which we can actually apply intern_face. */
- if (sizeof (GLYPH) == sizeof (XChar2b))
- XDrawImageString16 (x_current_display, 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,
- left, top + FONT_BASE (font), (char *) gp, n);
- else
- /* What size of glyph ARE you using? And does X have a function to
- draw them? */
- abort ();
-}
+#if 1
+/* This is the multi-face code. */
-#if 0
static void
-dumpglyphs (f, left, top, gp, n, hl, font)
+dumpglyphs (f, left, top, gp, n, hl)
struct frame *f;
int left, top;
register GLYPH *gp; /* Points to first GLYPH. */
register int n; /* Number of glyphs to display. */
int hl;
- FONT_TYPE *font;
{
- char buf[f->width]; /* Holds characters to be displayed. */
+ /* Holds characters to be displayed. */
+ char *buf = (char *) alloca (f->width * sizeof (*buf));
register char *cp; /* Steps through buf[]. */
register int tlen = GLYPH_TABLE_LENGTH;
register Lisp_Object *tbase = GLYPH_TABLE_BASE;
Window window = FRAME_X_WINDOW (f);
- int cursor_pixel = f->display.x->cursor_pixel;
- int fg_pixel = f->display.x->foreground_pixel;
- int bg_pixel = f->display.x->background_pixel;
- int intborder = f->display.x->internal_border_width;
- while (n)
+ while (n > 0)
{
/* Get the face-code of the next GLYPH. */
int cf, len;
int g = *gp;
- while (GLYPH_ALIAS_P (tbase, tlen, g))
- g = GLYPH_ALIAS (tbase, g);
-
- cf = g >> 8;
+ GLYPH_FOLLOW_ALIASES (tbase, tlen, g);
+ cf = GLYPH_FACE (g);
/* Find the run of consecutive glyphs with the same face-code.
Extract their character codes into BUF. */
while (n > 0)
{
g = *gp;
- while (GLYPH_ALIAS_P (tbase, tlen, g))
- g = GLYPH_ALIAS (tbase, g);
- if ((g >> 8) != cf)
+ GLYPH_FOLLOW_ALIASES (tbase, tlen, g);
+ if (GLYPH_FACE (g) != cf)
break;
- *cp++ = 0377 & g;
+ *cp++ = GLYPH_CHAR (g);
--n;
++gp;
}
/* Now output this run of chars, with the font and pixel values
determined by the face code CF. */
- if (cf == 0)
- {
-#ifdef HAVE_X11
- GC GC_cursor = f->display.x->cursor_gc;
- GC GC_reverse = f->display.x->reverse_gc;
- GC GC_normal = f->display.x->normal_gc;
-
- XDrawImageString (x_current_display, window,
- (hl == 2
- ? GC_cursor
- : (hl ? GC_reverse : GC_normal)),
- left, top + FONT_BASE (font), buf, len);
-#else /* ! defined (HAVE_X11) */
- XText (window, left, top,
- buf,
- len,
- font->id,
- (hl == 2
- ? (cursor_pixel == fg_pixel ? bg_pixel : fg_pixel)
- : hl ? bg_pixel : fg_pixel),
- (hl == 2 ? cursor_pixel
- : hl ? fg_pixel : bg_pixel));
-#endif /* ! defined (HAVE_X11) */
- }
- else
+ {
+ struct face *face = FRAME_DEFAULT_FACE (f);
+ FONT_TYPE *font = FACE_FONT (face);
+ GC gc = FACE_GC (face);
+ int defaulted = 1;
+ int gc_temporary = 0;
+
+ /* First look at the face of the text itself. */
+ if (cf != 0)
+ {
+ /* The face codes on the glyphs must be valid indices into the
+ frame's face table. */
+ if (cf < 0 || cf >= FRAME_N_COMPUTED_FACES (f)
+ || FRAME_COMPUTED_FACES (f) [cf] == 0)
+ abort ();
+
+ if (cf == 1)
+ face = FRAME_MODE_LINE_FACE (f);
+ else
+ face = intern_face (f, FRAME_COMPUTED_FACES (f) [cf]);
+ font = FACE_FONT (face);
+ gc = FACE_GC (face);
+ defaulted = 0;
+ }
+
+ /* Then comes the distinction between modeline and normal text. */
+ else if (hl == 0)
+ ;
+ else if (hl == 1)
+ {
+ face = FRAME_MODE_LINE_FACE (f);
+ font = FACE_FONT (face);
+ gc = FACE_GC (face);
+ defaulted = 0;
+ }
+
+#define FACE_DEFAULT (~0)
+
+ /* Now override that if the cursor's on this character. */
+ if (hl == 2)
+ {
+ if (defaulted
+ || !face->font
+ || (int) face->font == FACE_DEFAULT)
+ {
+ gc = f->display.x->cursor_gc;
+ }
+ /* Cursor on non-default face: must merge. */
+ else
+ {
+ XGCValues xgcv;
+ unsigned long mask;
+
+ xgcv.background = f->display.x->cursor_pixel;
+ xgcv.foreground = f->display.x->cursor_foreground_pixel;
+ xgcv.font = face->font->fid;
+ xgcv.graphics_exposures = 0;
+ mask = GCForeground | GCBackground | GCFont | GCGraphicsExposures;
+ gc = XCreateGC (x_current_display, FRAME_X_WINDOW (f),
+ mask, &xgcv);
+#if 0
+ if (face->stipple && face->stipple != FACE_DEFAULT)
+ XSetStipple (x_current_display, gc, face->stipple);
+#endif
+ gc_temporary = 1;
+ }
+ }
+
+ if ((int) font == FACE_DEFAULT)
+ font = f->display.x->font;
+
+ XDrawImageString (x_current_display, window, gc,
+ left, top + FONT_BASE (font), buf, len);
+
+ if (gc_temporary)
+ XFreeGC (x_current_display, gc);
+
+ /* We should probably check for XA_UNDERLINE_POSITION and
+ XA_UNDERLINE_THICKNESS properties on the font, but let's
+ just get the thing working, and come back to that. */
{
-#ifdef HAVE_X11
- if (FACE_IS_FONT (cf))
- XDrawImageString (x_current_display, FRAME_X_WINDOW (f),
- FACE_GC (cf),
- left, top + FONT_BASE (FACE_FONT (cf)),
- buf, len);
- else if (FACE_IS_IMAGE (cf))
- XCopyPlane (x_current_display, FACE_IMAGE (cf),
- FRAME_X_WINDOW (f),
- f->display.x->normal_gc,
- 0, 0,
- FACE_IMAGE_WIDTH (cf),
- FACE_IMAGE_HEIGHT (cf), left, top);
- else
- abort ();
-#else /* ! defined (HAVE_X11) */
- register struct face *fp = x_face_table[cf];
-
- XText (window, left, top,
- buf,
- len,
- fp->font->id,
- (hl == 2
- ? (cursor_pixel == fp->fg ? fp->bg : fp->fg)
- : hl ? fp->bg : fp->fg),
- (hl == 2 ? cursor_pixel
- : hl ? fp->fg : fp->bg));
-#endif /* ! defined (HAVE_X11) */
+ int underline_position = 1;
+
+ if (font->descent <= underline_position)
+ underline_position = font->descent - 1;
+
+ if (face->underline)
+ XFillRectangle (x_current_display, FRAME_X_WINDOW (f),
+ FACE_GC (face),
+ left, (top
+ + FONT_BASE (font)
+ + underline_position),
+ len * FONT_WIDTH (font), 1);
}
- left += len * FONT_WIDTH (font);
+
+ left += len * FONT_WIDTH (font);
+ }
}
}
-#endif /* ! 0 */
+#endif /* 1 */
+
+#if 0
+/* This is the old single-face code. */
+
+static void
+dumpglyphs (f, left, top, gp, n, hl, font)
+ struct frame *f;
+ int left, top;
+ register GLYPH *gp; /* Points to first GLYPH. */
+ register int n; /* Number of glyphs to display. */
+ int hl;
+ FONT_TYPE *font;
+{
+ register int len;
+ Window window = FRAME_X_WINDOW (f);
+ GC drawing_gc = (hl == 2 ? f->display.x->cursor_gc
+ : (hl ? f->display.x->reverse_gc
+ : f->display.x->normal_gc));
+
+ if (sizeof (GLYPH) == sizeof (XChar2b))
+ XDrawImageString16 (x_current_display, 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,
+ left, top + FONT_BASE (font), (char *) gp, n);
+ else
+ /* What size of glyph ARE you using? And does X have a function to
+ draw them? */
+ abort ();
+}
+#endif
\f
/* Output some text at the nominal frame cursor position.
Advance the cursor over the text.
dumpglyphs (f,
CHAR_TO_PIXEL_COL (f, curs_x),
CHAR_TO_PIXEL_ROW (f, curs_y),
- start, len, highlight, f->display.x->font);
+ start, len, highlight);
/* If we drew on top of the cursor, note that it is turned off. */
if (curs_y == f->phys_cursor_y
CHAR_TO_PIXEL_ROW (f, curs_y),
FONT_WIDTH (f->display.x->font) * (first_unused - curs_x),
FONT_HEIGHT (f->display.x->font), False);
-
+#if 0
+ redraw_previous_char (f, curs_x, curs_y);
+#endif
#else /* ! defined (HAVE_X11) */
XPixSet (FRAME_X_WINDOW (f),
CHAR_TO_PIXEL_COL (f, curs_x),
UNBLOCK_INPUT;
}
+/* Erase the character (if any) at the position just before X, Y in frame F,
+ then redraw it and the character before it.
+ This is necessary when we erase starting at X,
+ in case the character after X overlaps into the one before X. */
+
+static void
+redraw_previous_char (f, x, y)
+ FRAME_PTR f;
+ int x, y;
+{
+ /* Erase the character before the new ones, in case
+ what was here before overlaps it.
+ Reoutput that character, and the previous character
+ (in case the previous character overlaps it). */
+ if (x > 0)
+ {
+ int start_x = x - 2;
+ if (start_x < 0)
+ start_x = 0;
+ XClearArea (x_current_display, FRAME_X_WINDOW (f),
+ CHAR_TO_PIXEL_COL (f, x - 1),
+ CHAR_TO_PIXEL_ROW (f, y),
+ FONT_WIDTH (f->display.x->font),
+ FONT_HEIGHT (f->display.x->font), False);
+
+ dumpglyphs (f, CHAR_TO_PIXEL_COL (f, start_x),
+ CHAR_TO_PIXEL_ROW (f, y),
+ &FRAME_CURRENT_GLYPHS (f)->glyphs[y][start_x],
+ x - start_x, highlight);
+ }
+}
+
static
XTclear_frame ()
{
XClear (FRAME_X_WINDOW (f));
- /* We have to clear the scrollbars, too. If we have changed
+ /* We have to clear the scroll bars, too. If we have changed
colors or something like that, then they should be notified. */
- x_scrollbar_clear (f);
+ x_scroll_bar_clear (f);
#ifndef HAVE_X11
dumpborder (f, 0);
/* Invert the middle quarter of the frame for .15 sec. */
/* We use the select system call to do the waiting, so we have to make sure
- it's avaliable. If it isn't, we just won't do visual bells. */
+ it's available. If it isn't, we just won't do visual bells. */
#if defined (HAVE_TIMEVAL) && defined (HAVE_SELECT)
/* Subtract the `struct timeval' values X and Y,
XTring_bell ()
{
+ if (x_current_display == 0)
+ return;
+
#if defined (HAVE_TIMEVAL) && defined (HAVE_SELECT)
if (visible_bell)
XTflash (selected_frame);
|| right > intborder + f->width * FONT_WIDTH (f->display.x->font))
dumpborder (f, 0);
}
-#endif /* HAVE_X11 /* Window manger does this for X11. */ */
+#endif /* HAVE_X11 Window manger does this for X11. */
/* Convert rectangle edges in pixels to edges in chars.
Round down for left and top, up for right and bottom. */
CHAR_TO_PIXEL_COL (f, left),
CHAR_TO_PIXEL_ROW (f, y),
line, min (cols, active_frame->used[y] - left),
- active_frame->highlight[y], f->display.x->font);
+ active_frame->highlight[y]);
}
/* Turn the cursor on if we turned it off. */
int intborder;
frame = XCONS (tail)->car;
- if (XTYPE (frame) != Lisp_Frame)
+ if (XGCTYPE (frame) != Lisp_Frame)
continue;
f = XFRAME (frame);
if (! FRAME_X_P (f))
clear_cursor (f);
XGetWindowInfo (FRAME_X_WINDOW (f), &windowinfo);
temp_width = ((windowinfo.width - 2 * intborder
- - f->display.x->v_scrollbar_width)
+ - f->display.x->v_scroll_bar_width)
/ FONT_WIDTH (f->display.x->font));
temp_height = ((windowinfo.height- 2 * intborder
- - f->display.x->h_scrollbar_height)
+ - f->display.x->h_scroll_bar_height)
/ FONT_HEIGHT (f->display.x->font));
if (temp_width != f->width || temp_height != f->height)
{
change_frame_size (f, max (1, temp_height),
max (1, temp_width), 0, 1);
- x_resize_scrollbars (f);
+ x_resize_scroll_bars (f);
}
f->display.x->left_pos = windowinfo.x;
f->display.x->top_pos = windowinfo.y;
frame_highlight (frame)
struct frame *frame;
{
- if (! EQ (Vx_no_window_manager, Qnil))
- XSetWindowBorder (x_current_display, FRAME_X_WINDOW (frame),
- frame->display.x->border_pixel);
+ /* 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);
+ UNBLOCK_INPUT;
x_display_cursor (frame, 1);
}
frame_unhighlight (frame)
struct frame *frame;
{
- if (! EQ (Vx_no_window_manager, Qnil))
- XSetWindowBorderPixmap (x_current_display, FRAME_X_WINDOW (frame),
- frame->display.x->border_tile);
+ /* 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);
+ UNBLOCK_INPUT;
x_display_cursor (frame, 1);
}
#else /* ! defined (HAVE_X11) */
/* 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.
- Each event gets marked with the frame in which it occured, so the
+ 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. */
static void
if (x_focus_frame)
{
x_highlight_frame =
- ((XTYPE (FRAME_FOCUS_FRAME (x_focus_frame)) == Lisp_Frame)
+ ((XGCTYPE (FRAME_FOCUS_FRAME (x_focus_frame)) == Lisp_Frame)
? XFRAME (FRAME_FOCUS_FRAME (x_focus_frame))
: x_focus_frame);
if (! FRAME_LIVE_P (x_highlight_frame))
}
}
\f
-/* Mouse clicks and mouse movement. Rah. */
-#ifdef HAVE_X11
-
-/* Given a pixel position (PIX_X, PIX_Y) on the frame F, return
- glyph co-ordinates in (*X, *Y). Set *BOUNDS to the rectangle
- that the glyph at X, Y occupies, if BOUNDS != 0. */
-static void
-pixel_to_glyph_coords (f, pix_x, pix_y, x, y, bounds)
- FRAME_PTR f;
- register unsigned int pix_x, pix_y;
- register int *x, *y;
- XRectangle *bounds;
-{
- pix_x = PIXEL_TO_CHAR_COL (f, pix_x);
- pix_y = PIXEL_TO_CHAR_ROW (f, pix_y);
-
- if (bounds)
- {
- bounds->width = FONT_WIDTH (f->display.x->font);
- bounds->height = FONT_HEIGHT (f->display.x->font);
- bounds->x = CHAR_TO_PIXEL_COL (f, pix_x);
- bounds->y = CHAR_TO_PIXEL_ROW (f, pix_y);
- }
-
- if (pix_x < 0) pix_x = 0;
- else if (pix_x > f->width) pix_x = f->width;
-
- if (pix_y < 0) pix_y = 0;
- else if (pix_y > f->height) pix_y = f->height;
-
- *x = pix_x;
- *y = pix_y;
-}
-
-/* Any buttons grabbed. */
-unsigned int x_mouse_grabbed;
+/* Keyboard processing - modifier keys, vendor-specific keysyms, etc. */
/* Which modifier keys are on which modifier bits?
(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 ()
KeySym *syms;
int syms_per_code;
XModifierKeymap *mods;
- int alt_mod_mask = 0;
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;
+#ifdef HAVE_X11R4
XDisplayKeycodes (x_current_display, &min_code, &max_code);
+#else
+ min_code = x_current_display->min_keycode;
+ max_code = x_current_display->max_keycode;
+#endif
+
syms = XGetKeyboardMapping (x_current_display,
min_code, max_code - min_code + 1,
&syms_per_code);
case XK_Alt_L:
case XK_Alt_R:
- alt_mod_mask |= (1 << row);
+ x_alt_mod_mask |= (1 << row);
+ break;
+
+ case XK_Hyper_L:
+ case XK_Hyper_R:
+ x_hyper_mod_mask |= (1 << row);
+ break;
+
+ case XK_Super_L:
+ case XK_Super_R:
+ x_super_mod_mask |= (1 << row);
break;
case XK_Shift_Lock:
/* If we couldn't find any meta keys, accept any alt keys as meta keys. */
if (! x_meta_mod_mask)
- x_meta_mod_mask = alt_mod_mask;
+ {
+ x_meta_mod_mask = x_alt_mod_mask;
+ x_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)
+ {
+ x_alt_mod_mask &= ~x_meta_mod_mask;
+ }
+
XFree ((char *) syms);
XFreeModifiermap (mods);
}
-/* Convert a set of X modifier bits to the proper form for a
- struct input_event modifiers value. */
-
+/* Convert between the modifier bits X uses and the modifier bits
+ Emacs uses. */
static unsigned int
-x_convert_modifiers (state)
+x_x_to_emacs_modifiers (state)
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_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));
+}
+
+static unsigned int
+x_emacs_to_x_modifiers (state)
+ 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 true iff KEYSYM is a vendor-specific keysym that we should
+ return as a function key. If you add a keysym to this, you should
+ make sure that the tables make_lispy_event uses contain a suitable
+ name for it. */
+static int
+x_is_vendor_fkey (sym)
+ KeySym sym;
+{
+ return 0
+#ifdef DXK_Remove
+ || (sym == DXK_Remove)
+#endif
+ ;
+}
+
+\f
+/* Mouse clicks and mouse movement. Rah. */
+#ifdef HAVE_X11
+
+/* Given a pixel position (PIX_X, PIX_Y) on the frame F, return
+ glyph co-ordinates in (*X, *Y). Set *BOUNDS to the rectangle
+ that the glyph at X, Y occupies, if BOUNDS != 0. */
+static void
+pixel_to_glyph_coords (f, pix_x, pix_y, x, y, bounds)
+ FRAME_PTR f;
+ register unsigned int pix_x, pix_y;
+ register int *x, *y;
+ XRectangle *bounds;
+{
+ pix_x = PIXEL_TO_CHAR_COL (f, pix_x);
+ pix_y = PIXEL_TO_CHAR_ROW (f, pix_y);
+
+ if (bounds)
+ {
+ bounds->width = FONT_WIDTH (f->display.x->font);
+ bounds->height = FONT_HEIGHT (f->display.x->font);
+ bounds->x = CHAR_TO_PIXEL_COL (f, pix_x);
+ bounds->y = CHAR_TO_PIXEL_ROW (f, pix_y);
+ }
+
+ if (pix_x < 0) pix_x = 0;
+ else if (pix_x > f->width) pix_x = f->width;
+
+ if (pix_y < 0) pix_y = 0;
+ else if (pix_y > f->height) pix_y = f->height;
+
+ *x = pix_x;
+ *y = pix_y;
}
+/* Any buttons grabbed. */
+unsigned int x_mouse_grabbed;
+
/* Prepare a mouse-event in *RESULT for placement in the input queue.
If the event is a button press, then note that we have grabbed
result->kind = mouse_click;
XSET (result->code, Lisp_Int, event->button - Button1);
result->timestamp = event->time;
- result->modifiers = (x_convert_modifiers (event->state)
+ result->modifiers = (x_x_to_emacs_modifiers (event->state)
| (event->type == ButtonRelease
? up_modifier
: down_modifier));
static FRAME_PTR last_mouse_frame;
static XRectangle last_mouse_glyph;
-/* The scrollbar in which the last X motion event occurred.
+/* The scroll bar in which the last X motion event occurred.
- If the last X motion event occured in a scrollbar, we set this
- so XTmouse_position can know whether to report a scrollbar motion or
+ If the last X motion event occurred in a scroll bar, we set this
+ so XTmouse_position can know whether to report a scroll bar motion or
an ordinary motion.
- If the last X motion event didn't occur in a scrollbar, we set this
+ If the last X motion event didn't occur in a scroll bar, we set this
to Qnil, to tell XTmouse_position to return an ordinary motion event. */
-static Lisp_Object last_mouse_scrollbar;
+static Lisp_Object last_mouse_scroll_bar;
/* This is a hack. We would really prefer that XTmouse_position would
return the time associated with the position it returns, but there
|| event->y >= last_mouse_glyph.y + last_mouse_glyph.height)
{
mouse_moved = 1;
- last_mouse_scrollbar = Qnil;
+ last_mouse_scroll_bar = Qnil;
}
else
{
}
}
-static struct scrollbar *x_window_to_scrollbar ();
-static void x_scrollbar_report_motion ();
+static struct scroll_bar *x_window_to_scroll_bar ();
+static void x_scroll_bar_report_motion ();
/* Return the current position of the mouse.
- If the mouse movement started in a scrollbar, set *f, *bar_window,
- and *part to the frame, window, and scrollbar part that the mouse
+ If the mouse movement started in a scroll bar, set *f, *bar_window,
+ and *part to the frame, window, and scroll bar part that the mouse
is over. Set *x and *y to the portion and whole of the mouse's
- position on the scrollbar.
+ position on the scroll bar.
If the mouse movement started elsewhere, set *f to the frame the
mouse is on, *bar_window to nil, and *x and *y to the character cell
Set *time to the server timestamp for the time at which the mouse
was at this position.
+ Don't store anything if we don't have a valid set of values to report.
+
This clears the mouse_moved flag, so we can wait for the next mouse
movement. This also calls XQueryPointer, which will cause the
server to give us another MotionNotify when the mouse moves
XTmouse_position (f, bar_window, part, x, y, time)
FRAME_PTR *f;
Lisp_Object *bar_window;
- enum scrollbar_part *part;
+ enum scroll_bar_part *part;
Lisp_Object *x, *y;
unsigned long *time;
{
+ FRAME_PTR f1;
+
BLOCK_INPUT;
- if (! NILP (last_mouse_scrollbar))
- x_scrollbar_report_motion (f, bar_window, part, x, y, time);
+ if (! NILP (last_mouse_scroll_bar))
+ x_scroll_bar_report_motion (f, bar_window, part, x, y, time);
else
{
Window root;
int dummy;
mouse_moved = 0;
- last_mouse_scrollbar = Qnil;
+ last_mouse_scroll_bar = Qnil;
/* Figure out which root window we're on. */
XQueryPointer (x_current_display,
never use them in that case.) */
/* Is win one of our frames? */
- *f = x_window_to_frame (win);
+ f1 = x_window_to_frame (win);
- /* If not, is it one of our scrollbars? */
- if (! *f)
+ /* If not, is it one of our scroll bars? */
+ if (! f1)
{
- struct scrollbar *bar = x_window_to_scrollbar (win);
+ struct scroll_bar *bar = x_window_to_scroll_bar (win);
if (bar)
{
- *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
+ f1 = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
win_x = parent_x;
win_y = parent_y;
}
}
- if (*f)
+ if (f1)
{
- pixel_to_glyph_coords (*f, win_x, win_y, &win_x, &win_y,
+ /* Ok, we found a frame. Convert from pixels to characters
+ and store all the values. */
+
+ pixel_to_glyph_coords (f1, win_x, win_y, &win_x, &win_y,
&last_mouse_glyph);
*bar_window = Qnil;
*part = 0;
+ *f = f1;
XSET (*x, Lisp_Int, win_x);
XSET (*y, Lisp_Int, win_y);
*time = last_mouse_movement_time;
#define XEvent XKeyPressedEvent
#endif /* ! defined (HAVE_X11) */
\f
-/* Scrollbar support. */
+/* Scroll bar support. */
-/* Given an X window ID, find the struct scrollbar which manages it. */
-static struct scrollbar *
-x_window_to_scrollbar (window_id)
+/* Given an X window ID, find the struct scroll_bar which manages it.
+ This can be called in GC, so we have to make sure to strip off mark
+ bits. */
+static struct scroll_bar *
+x_window_to_scroll_bar (window_id)
Window window_id;
{
Lisp_Object tail, frame;
- for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr)
+ for (tail = Vframe_list;
+ XGCTYPE (tail) == Lisp_Cons;
+ tail = XCONS (tail)->cdr)
{
Lisp_Object frame = XCONS (tail)->car;
Lisp_Object bar, condemned;
/* All elements of Vframe_list should be frames. */
- if (XTYPE (frame) != Lisp_Frame)
+ if (XGCTYPE (frame) != Lisp_Frame)
abort ();
- /* Scan this frame's scrollbar list for a scrollbar with the
+ /* Scan this frame's scroll bar list for a scroll bar with the
right window ID. */
- condemned = FRAME_CONDEMNED_SCROLLBARS (XFRAME (frame));
- for (bar = FRAME_SCROLLBARS (XFRAME (frame));
+ condemned = FRAME_CONDEMNED_SCROLL_BARS (XFRAME (frame));
+ for (bar = FRAME_SCROLL_BARS (XFRAME (frame));
/* This trick allows us to search both the ordinary and
- condemned scrollbar lists with one loop. */
- ! NILP (bar) || (bar = condemned, condemned = Qnil, ! NILP (bar));
- bar = XSCROLLBAR(bar)->next)
- if (SCROLLBAR_X_WINDOW (XSCROLLBAR (bar)) == window_id)
- return XSCROLLBAR (bar);
+ condemned scroll bar lists with one loop. */
+ ! GC_NILP (bar) || (bar = condemned,
+ condemned = Qnil,
+ ! GC_NILP (bar));
+ bar = XSCROLL_BAR(bar)->next)
+ if (SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar)) == window_id)
+ return XSCROLL_BAR (bar);
}
return 0;
}
-/* Open a new X window to serve as a scrollbar, and return the
- scrollbar vector for it. */
-static struct scrollbar *
-x_scrollbar_create (window, top, left, width, height)
+/* Open a new X window to serve as a scroll bar, and return the
+ scroll bar vector for it. */
+static struct scroll_bar *
+x_scroll_bar_create (window, top, left, width, height)
struct window *window;
int top, left, width, height;
{
FRAME_PTR frame = XFRAME (WINDOW_FRAME (window));
- struct scrollbar *bar =
- XSCROLLBAR (Fmake_vector (make_number (SCROLLBAR_VEC_SIZE), Qnil));
+ struct scroll_bar *bar =
+ XSCROLL_BAR (Fmake_vector (make_number (SCROLL_BAR_VEC_SIZE), Qnil));
BLOCK_INPUT;
a.event_mask = (ButtonPressMask | ButtonReleaseMask
| ButtonMotionMask | PointerMotionHintMask
| ExposureMask);
- a.cursor = x_vertical_scrollbar_cursor;
+ a.cursor = x_vertical_scroll_bar_cursor;
mask = (CWBackPixel | CWEventMask | CWCursor);
- SET_SCROLLBAR_X_WINDOW
+ SET_SCROLL_BAR_X_WINDOW
(bar,
XCreateWindow (x_current_display, FRAME_X_WINDOW (frame),
- /* Position and size of scrollbar. */
+ /* Position and size of scroll bar. */
left, top, width, height,
/* Border width, depth, class, and visual. */
bar->dragging = Qnil;
/* Add bar to its frame's list of scroll bars. */
- bar->next = FRAME_SCROLLBARS (frame);
+ bar->next = FRAME_SCROLL_BARS (frame);
bar->prev = Qnil;
- XSET (FRAME_SCROLLBARS (frame), Lisp_Vector, bar);
+ XSET (FRAME_SCROLL_BARS (frame), Lisp_Vector, bar);
if (! NILP (bar->next))
- XSET (XSCROLLBAR (bar->next)->prev, Lisp_Vector, bar);
+ XSET (XSCROLL_BAR (bar->next)->prev, Lisp_Vector, bar);
- XMapWindow (x_current_display, SCROLLBAR_X_WINDOW (bar));
+ XMapWindow (x_current_display, SCROLL_BAR_X_WINDOW (bar));
UNBLOCK_INPUT;
events.)
Normally, we want to constrain the start and end of the handle to
- fit inside its rectangle, but if the user is dragging the scrollbar
+ fit inside its rectangle, but if the user is dragging the scroll bar
handle, we want to let them drag it down all the way, so that the
bar's top is as far down as it goes; otherwise, there's no way to
move to the very end of the buffer. */
static void
-x_scrollbar_set_handle (bar, start, end, rebuild)
- struct scrollbar *bar;
+x_scroll_bar_set_handle (bar, start, end, rebuild)
+ struct scroll_bar *bar;
int start, end;
int rebuild;
{
int dragging = ! NILP (bar->dragging);
- Window w = SCROLLBAR_X_WINDOW (bar);
+ Window w = SCROLL_BAR_X_WINDOW (bar);
GC gc = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)))->display.x->normal_gc;
/* If the display is already accurate, do nothing. */
BLOCK_INPUT;
{
- int inside_width = VERTICAL_SCROLLBAR_INSIDE_WIDTH (XINT (bar->width));
- int inside_height = VERTICAL_SCROLLBAR_INSIDE_HEIGHT (XINT (bar->height));
- int top_range = VERTICAL_SCROLLBAR_TOP_RANGE (XINT (bar->height));
+ int inside_width = VERTICAL_SCROLL_BAR_INSIDE_WIDTH (XINT (bar->width));
+ int inside_height = VERTICAL_SCROLL_BAR_INSIDE_HEIGHT (XINT (bar->height));
+ int top_range = VERTICAL_SCROLL_BAR_TOP_RANGE (XINT (bar->height));
/* Make sure the values are reasonable, and try to preserve
the distance between start and end. */
end = top_range;
}
- /* Store the adjusted setting in the scrollbar. */
+ /* Store the adjusted setting in the scroll bar. */
XSET (bar->start, Lisp_Int, start);
XSET (bar->end, Lisp_Int, end);
if (end > top_range)
end = top_range;
- /* Draw bottom positions VERTICAL_SCROLLBAR_MIN_HANDLE pixels
+ /* Draw bottom positions VERTICAL_SCROLL_BAR_MIN_HANDLE pixels
below top positions, to make sure the handle is always at least
that many pixels tall. */
- end += VERTICAL_SCROLLBAR_MIN_HANDLE;
+ end += VERTICAL_SCROLL_BAR_MIN_HANDLE;
/* Draw the empty space above the handle. Note that we can't clear
zero-height areas; that means "clear to end of window." */
XClearArea (x_current_display, w,
/* x, y, width, height, and exposures. */
- VERTICAL_SCROLLBAR_LEFT_BORDER,
- VERTICAL_SCROLLBAR_TOP_BORDER,
+ VERTICAL_SCROLL_BAR_LEFT_BORDER,
+ VERTICAL_SCROLL_BAR_TOP_BORDER,
inside_width, start,
False);
XFillRectangle (x_current_display, w, gc,
/* x, y, width, height */
- VERTICAL_SCROLLBAR_LEFT_BORDER,
- VERTICAL_SCROLLBAR_TOP_BORDER + start,
+ VERTICAL_SCROLL_BAR_LEFT_BORDER,
+ VERTICAL_SCROLL_BAR_TOP_BORDER + start,
inside_width, end - start);
XClearArea (x_current_display, w,
/* x, y, width, height, and exposures. */
- VERTICAL_SCROLLBAR_LEFT_BORDER,
- VERTICAL_SCROLLBAR_TOP_BORDER + end,
+ VERTICAL_SCROLL_BAR_LEFT_BORDER,
+ VERTICAL_SCROLL_BAR_TOP_BORDER + end,
inside_width, inside_height - end,
False);
UNBLOCK_INPUT;
}
-/* Move a scrollbar around on the screen, to accomodate changing
+/* Move a scroll bar around on the screen, to accommodate changing
window configurations. */
static void
-x_scrollbar_move (bar, top, left, width, height)
- struct scrollbar *bar;
+x_scroll_bar_move (bar, top, left, width, height)
+ struct scroll_bar *bar;
int top, left, width, height;
{
BLOCK_INPUT;
if (height != XINT (bar->height)) mask |= CWHeight;
if (mask)
- XConfigureWindow (x_current_display, SCROLLBAR_X_WINDOW (bar),
+ XConfigureWindow (x_current_display, SCROLL_BAR_X_WINDOW (bar),
mask, &wc);
}
UNBLOCK_INPUT;
}
-/* Destroy the X window for BAR, and set its Emacs window's scrollbar
+/* Destroy the X window for BAR, and set its Emacs window's scroll bar
to nil. */
static void
-x_scrollbar_remove (bar)
- struct scrollbar *bar;
+x_scroll_bar_remove (bar)
+ struct scroll_bar *bar;
{
FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
BLOCK_INPUT;
/* Destroy the window. */
- XDestroyWindow (x_current_display, SCROLLBAR_X_WINDOW (bar));
+ XDestroyWindow (x_current_display, SCROLL_BAR_X_WINDOW (bar));
- /* Disassociate this scrollbar from its window. */
- XWINDOW (bar->window)->vertical_scrollbar = Qnil;
+ /* Disassociate this scroll bar from its window. */
+ XWINDOW (bar->window)->vertical_scroll_bar = Qnil;
UNBLOCK_INPUT;
}
/* Set the handle of the vertical scroll bar for WINDOW to indicate
that we are displaying PORTION characters out of a total of WHOLE
- characters, starting at POSITION. If WINDOW has no scrollbar,
+ characters, starting at POSITION. If WINDOW has no scroll bar,
create one. */
static void
-XTset_vertical_scrollbar (window, portion, whole, position)
+XTset_vertical_scroll_bar (window, portion, whole, position)
struct window *window;
int portion, whole, position;
{
FRAME_PTR f = XFRAME (WINDOW_FRAME (window));
int top = XINT (window->top);
- int left = WINDOW_VERTICAL_SCROLLBAR_COLUMN (window);
- int height = WINDOW_VERTICAL_SCROLLBAR_HEIGHT (window);
+ int left = WINDOW_VERTICAL_SCROLL_BAR_COLUMN (window);
+ int height = WINDOW_VERTICAL_SCROLL_BAR_HEIGHT (window);
- /* Where should this scrollbar be, pixelwise? */
+ /* Where should this scroll bar be, pixelwise? */
int pixel_top = CHAR_TO_PIXEL_ROW (f, top);
int pixel_left = CHAR_TO_PIXEL_COL (f, left);
- int pixel_width = VERTICAL_SCROLLBAR_PIXEL_WIDTH (f);
- int pixel_height = VERTICAL_SCROLLBAR_PIXEL_HEIGHT (f, height);
+ int pixel_width = VERTICAL_SCROLL_BAR_PIXEL_WIDTH (f);
+ int pixel_height = VERTICAL_SCROLL_BAR_PIXEL_HEIGHT (f, height);
- struct scrollbar *bar;
+ struct scroll_bar *bar;
- /* Does the scrollbar exist yet? */
- if (NILP (window->vertical_scrollbar))
- bar = x_scrollbar_create (window,
+ /* Does the scroll bar exist yet? */
+ if (NILP (window->vertical_scroll_bar))
+ bar = x_scroll_bar_create (window,
pixel_top, pixel_left,
pixel_width, pixel_height);
else
{
/* It may just need to be moved and resized. */
- bar = XSCROLLBAR (window->vertical_scrollbar);
- x_scrollbar_move (bar, pixel_top, pixel_left, pixel_width, pixel_height);
+ bar = XSCROLL_BAR (window->vertical_scroll_bar);
+ x_scroll_bar_move (bar, pixel_top, pixel_left, pixel_width, pixel_height);
}
- /* Set the scrollbar's current state, unless we're currently being
+ /* Set the scroll bar's current state, unless we're currently being
dragged. */
if (NILP (bar->dragging))
{
int top_range =
- VERTICAL_SCROLLBAR_TOP_RANGE (pixel_height);
+ VERTICAL_SCROLL_BAR_TOP_RANGE (pixel_height);
if (whole == 0)
- x_scrollbar_set_handle (bar, 0, top_range, 0);
+ x_scroll_bar_set_handle (bar, 0, top_range, 0);
else
{
- int start = (position * top_range) / whole;
- int end = ((position + portion) * top_range) / whole;
+ int start = ((double) position * top_range) / whole;
+ int end = ((double) (position + portion) * top_range) / whole;
- x_scrollbar_set_handle (bar, start, end, 0);
+ x_scroll_bar_set_handle (bar, start, end, 0);
}
}
- XSET (window->vertical_scrollbar, Lisp_Vector, bar);
+ XSET (window->vertical_scroll_bar, Lisp_Vector, bar);
}
/* The following three hooks are used when we're doing a thorough
- redisplay of the frame. We don't explicitly know which scrollbars
+ redisplay of the frame. We don't explicitly know which scroll bars
are going to be deleted, because keeping track of when windows go
away is a real pain - "Can you say set-window-configuration, boys
and girls?" Instead, we just assert at the beginning of redisplay
- that *all* scrollbars are to be removed, and then save a scrollbar
+ that *all* scroll bars are to be removed, and then save a scroll bar
from the fiery pit when we actually redisplay its window. */
-/* Arrange for all scrollbars on FRAME to be removed at the next call
- to `*judge_scrollbars_hook'. A scrollbar may be spared if
- `*redeem_scrollbar_hook' is applied to its window before the judgement. */
+/* Arrange for all scroll bars on FRAME to be removed at the next call
+ to `*judge_scroll_bars_hook'. A scroll bar may be spared if
+ `*redeem_scroll_bar_hook' is applied to its window before the judgement. */
static void
-XTcondemn_scrollbars (frame)
+XTcondemn_scroll_bars (frame)
FRAME_PTR frame;
{
/* The condemned list should be empty at this point; if it's not,
then the rest of Emacs isn't using the condemn/redeem/judge
protocol correctly. */
- if (! NILP (FRAME_CONDEMNED_SCROLLBARS (frame)))
+ if (! NILP (FRAME_CONDEMNED_SCROLL_BARS (frame)))
abort ();
/* Move them all to the "condemned" list. */
- FRAME_CONDEMNED_SCROLLBARS (frame) = FRAME_SCROLLBARS (frame);
- FRAME_SCROLLBARS (frame) = Qnil;
+ FRAME_CONDEMNED_SCROLL_BARS (frame) = FRAME_SCROLL_BARS (frame);
+ FRAME_SCROLL_BARS (frame) = Qnil;
}
-/* Unmark WINDOW's scrollbar for deletion in this judgement cycle.
+/* Unmark WINDOW's scroll bar for deletion in this judgement cycle.
Note that WINDOW isn't necessarily condemned at all. */
static void
-XTredeem_scrollbar (window)
+XTredeem_scroll_bar (window)
struct window *window;
{
- struct scrollbar *bar;
+ struct scroll_bar *bar;
- /* We can't redeem this window's scrollbar if it doesn't have one. */
- if (NILP (window->vertical_scrollbar))
+ /* We can't redeem this window's scroll bar if it doesn't have one. */
+ if (NILP (window->vertical_scroll_bar))
abort ();
- bar = XSCROLLBAR (window->vertical_scrollbar);
+ bar = XSCROLL_BAR (window->vertical_scroll_bar);
/* Unlink it from the condemned list. */
{
{
/* If the prev pointer is nil, it must be the first in one of
the lists. */
- if (EQ (FRAME_SCROLLBARS (f), window->vertical_scrollbar))
+ if (EQ (FRAME_SCROLL_BARS (f), window->vertical_scroll_bar))
/* It's not condemned. Everything's fine. */
return;
- else if (EQ (FRAME_CONDEMNED_SCROLLBARS (f),
- window->vertical_scrollbar))
- FRAME_CONDEMNED_SCROLLBARS (f) = bar->next;
+ else if (EQ (FRAME_CONDEMNED_SCROLL_BARS (f),
+ window->vertical_scroll_bar))
+ FRAME_CONDEMNED_SCROLL_BARS (f) = bar->next;
else
/* If its prev pointer is nil, it must be at the front of
one or the other! */
abort ();
}
else
- XSCROLLBAR (bar->prev)->next = bar->next;
+ XSCROLL_BAR (bar->prev)->next = bar->next;
if (! NILP (bar->next))
- XSCROLLBAR (bar->next)->prev = bar->prev;
+ XSCROLL_BAR (bar->next)->prev = bar->prev;
- bar->next = FRAME_SCROLLBARS (f);
+ bar->next = FRAME_SCROLL_BARS (f);
bar->prev = Qnil;
- XSET (FRAME_SCROLLBARS (f), Lisp_Vector, bar);
+ XSET (FRAME_SCROLL_BARS (f), Lisp_Vector, bar);
if (! NILP (bar->next))
- XSET (XSCROLLBAR (bar->next)->prev, Lisp_Vector, bar);
+ XSET (XSCROLL_BAR (bar->next)->prev, Lisp_Vector, bar);
}
}
-/* Remove all scrollbars on FRAME that haven't been saved since the
- last call to `*condemn_scrollbars_hook'. */
+/* Remove all scroll bars on FRAME that haven't been saved since the
+ last call to `*condemn_scroll_bars_hook'. */
static void
-XTjudge_scrollbars (f)
+XTjudge_scroll_bars (f)
FRAME_PTR f;
{
Lisp_Object bar, next;
- bar = FRAME_CONDEMNED_SCROLLBARS (f);
+ bar = FRAME_CONDEMNED_SCROLL_BARS (f);
/* Clear out the condemned list now so we won't try to process any
- more events on the hapless scrollbars. */
- FRAME_CONDEMNED_SCROLLBARS (f) = Qnil;
+ more events on the hapless scroll bars. */
+ FRAME_CONDEMNED_SCROLL_BARS (f) = Qnil;
for (; ! NILP (bar); bar = next)
{
- struct scrollbar *b = XSCROLLBAR (bar);
+ struct scroll_bar *b = XSCROLL_BAR (bar);
- x_scrollbar_remove (b);
+ x_scroll_bar_remove (b);
next = b->next;
b->next = b->prev = Qnil;
}
- /* Now there should be no references to the condemned scrollbars,
+ /* Now there should be no references to the condemned scroll bars,
and they should get garbage-collected. */
}
-/* Handle an Expose or GraphicsExpose event on a scrollbar. */
+/* Handle an Expose or GraphicsExpose event on a scroll bar.
+
+ This may be called from a signal handler, so we have to ignore GC
+ mark bits. */
static void
-x_scrollbar_expose (bar, event)
- struct scrollbar *bar;
+x_scroll_bar_expose (bar, event)
+ struct scroll_bar *bar;
XEvent *event;
{
- Window w = SCROLLBAR_X_WINDOW (bar);
+ Window w = SCROLL_BAR_X_WINDOW (bar);
GC gc = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)))->display.x->normal_gc;
BLOCK_INPUT;
- x_scrollbar_set_handle (bar, XINT (bar->start), XINT (bar->end), 1);
+ x_scroll_bar_set_handle (bar, XINT (bar->start), XINT (bar->end), 1);
- /* Draw a one-pixel border just inside the edges of the scrollbar. */
+ /* Draw a one-pixel border just inside the edges of the scroll bar. */
XDrawRectangle (x_current_display, w, gc,
/* x, y, width, height */
UNBLOCK_INPUT;
}
-/* Handle a mouse click on the scrollbar BAR. If *EMACS_EVENT's kind
- is set to something other than no_event, it is enqueued. */
+/* Handle a mouse click on the scroll bar BAR. If *EMACS_EVENT's kind
+ is set to something other than no_event, it is enqueued.
+
+ This may be called from a signal handler, so we have to ignore GC
+ mark bits. */
static void
-x_scrollbar_handle_click (bar, event, emacs_event)
- struct scrollbar *bar;
+x_scroll_bar_handle_click (bar, event, emacs_event)
+ struct scroll_bar *bar;
XEvent *event;
struct input_event *emacs_event;
{
- if (XTYPE (bar->window) != Lisp_Window)
+ if (XGCTYPE (bar->window) != Lisp_Window)
abort ();
- emacs_event->kind = scrollbar_click;
+ emacs_event->kind = scroll_bar_click;
XSET (emacs_event->code, Lisp_Int, event->xbutton.button - Button1);
emacs_event->modifiers =
- (x_convert_modifiers (event->xbutton.state)
+ (x_x_to_emacs_modifiers (event->xbutton.state)
| (event->type == ButtonRelease
? up_modifier
: down_modifier));
emacs_event->timestamp = event->xbutton.time;
{
int internal_height =
- VERTICAL_SCROLLBAR_INSIDE_HEIGHT (XINT (bar->height));
+ VERTICAL_SCROLL_BAR_INSIDE_HEIGHT (XINT (bar->height));
int top_range =
- VERTICAL_SCROLLBAR_TOP_RANGE (XINT (bar->height));
- int y = event->xbutton.y - VERTICAL_SCROLLBAR_TOP_BORDER;
+ VERTICAL_SCROLL_BAR_TOP_RANGE (XINT (bar->height));
+ int y = event->xbutton.y - VERTICAL_SCROLL_BAR_TOP_BORDER;
if (y < 0) y = 0;
if (y > top_range) y = top_range;
if (y < XINT (bar->start))
- emacs_event->part = scrollbar_above_handle;
- else if (y < XINT (bar->end) + VERTICAL_SCROLLBAR_MIN_HANDLE)
- emacs_event->part = scrollbar_handle;
+ emacs_event->part = scroll_bar_above_handle;
+ else if (y < XINT (bar->end) + VERTICAL_SCROLL_BAR_MIN_HANDLE)
+ emacs_event->part = scroll_bar_handle;
else
- emacs_event->part = scrollbar_below_handle;
-
+ emacs_event->part = scroll_bar_below_handle;
+
+ /* Just because the user has clicked on the handle doesn't mean
+ they want to drag it. Lisp code needs to be able to decide
+ whether or not we're dragging. */
+#if 0
/* If the user has just clicked on the handle, record where they're
holding it. */
if (event->type == ButtonPress
- && emacs_event->part == scrollbar_handle)
+ && emacs_event->part == scroll_bar_handle)
XSET (bar->dragging, Lisp_Int, y - XINT (bar->start));
+#endif
/* If the user has released the handle, set it to its final position. */
if (event->type == ButtonRelease
int new_start = y - XINT (bar->dragging);
int new_end = new_start + (XINT (bar->end) - XINT (bar->start));
- x_scrollbar_set_handle (bar, new_start, new_end, 0);
+ x_scroll_bar_set_handle (bar, new_start, new_end, 0);
bar->dragging = Qnil;
}
- /* Clicks on the handle are always reported as occuring at the top of
+ /* Same deal here as the other #if 0. */
+#if 0
+ /* Clicks on the handle are always reported as occurring at the top of
the handle. */
- if (emacs_event->part == scrollbar_handle)
+ if (emacs_event->part == scroll_bar_handle)
emacs_event->x = bar->start;
else
XSET (emacs_event->x, Lisp_Int, y);
+#else
+ XSET (emacs_event->x, Lisp_Int, y);
+#endif
XSET (emacs_event->y, Lisp_Int, top_range);
}
}
-/* Handle some mouse motion while someone is dragging the scrollbar. */
+/* Handle some mouse motion while someone is dragging the scroll bar.
+
+ This may be called from a signal handler, so we have to ignore GC
+ mark bits. */
static void
-x_scrollbar_note_movement (bar, event)
- struct scrollbar *bar;
+x_scroll_bar_note_movement (bar, event)
+ struct scroll_bar *bar;
XEvent *event;
{
last_mouse_movement_time = event->xmotion.time;
mouse_moved = 1;
- XSET (last_mouse_scrollbar, Lisp_Vector, bar);
+ XSET (last_mouse_scroll_bar, Lisp_Vector, bar);
/* If we're dragging the bar, display it. */
- if (! NILP (bar->dragging))
+ if (! GC_NILP (bar->dragging))
{
/* Where should the handle be now? */
int new_start = event->xmotion.y - XINT (bar->dragging);
{
int new_end = new_start + (XINT (bar->end) - XINT (bar->start));
- x_scrollbar_set_handle (bar, new_start, new_end, 0);
+ x_scroll_bar_set_handle (bar, new_start, new_end, 0);
}
}
}
/* Return information to the user about the current position of the mouse
- on the scrollbar. */
+ on the scroll bar. */
static void
-x_scrollbar_report_motion (f, bar_window, part, x, y, time)
+x_scroll_bar_report_motion (f, bar_window, part, x, y, time)
FRAME_PTR *f;
Lisp_Object *bar_window;
- enum scrollbar_part *part;
+ enum scroll_bar_part *part;
Lisp_Object *x, *y;
unsigned long *time;
{
- struct scrollbar *bar = XSCROLLBAR (last_mouse_scrollbar);
+ struct scroll_bar *bar = XSCROLL_BAR (last_mouse_scroll_bar);
int win_x, win_y;
+ Window dummy_window;
+ int dummy_coord;
+ unsigned int dummy_mask;
BLOCK_INPUT;
- /* Get the mouse's position relative to the scrollbar window, and
+ /* Get the mouse's position relative to the scroll bar window, and
report that. */
- {
- Window dummy_window;
- int dummy_coord;
- unsigned int dummy_mask;
-
- if (! XQueryPointer (x_current_display,
- SCROLLBAR_X_WINDOW (bar),
+ if (! XQueryPointer (x_current_display,
+ SCROLL_BAR_X_WINDOW (bar),
- /* Root, child, root x and root y. */
- &dummy_window, &dummy_window,
- &dummy_coord, &dummy_coord,
+ /* Root, child, root x and root y. */
+ &dummy_window, &dummy_window,
+ &dummy_coord, &dummy_coord,
- /* Position relative to scrollbar. */
- &win_x, &win_y,
-
- /* Mouse buttons and modifier keys. */
- &dummy_mask))
- {
- *f = 0;
- goto done;
- }
- }
-
- {
- int inside_height = VERTICAL_SCROLLBAR_INSIDE_HEIGHT (XINT (bar->height));
- int top_range = VERTICAL_SCROLLBAR_TOP_RANGE (XINT (bar->height));
+ /* Position relative to scroll bar. */
+ &win_x, &win_y,
- win_y -= VERTICAL_SCROLLBAR_TOP_BORDER;
-
- if (! NILP (bar->dragging))
- win_y -= XINT (bar->dragging);
-
- if (win_y < 0)
- win_y = 0;
- if (win_y > top_range)
- win_y = top_range;
-
- *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
- *bar_window = bar->window;
+ /* Mouse buttons and modifier keys. */
+ &dummy_mask))
+ *f = 0;
+ else
+ {
+ int inside_height
+ = VERTICAL_SCROLL_BAR_INSIDE_HEIGHT (XINT (bar->height));
+ int top_range
+ = VERTICAL_SCROLL_BAR_TOP_RANGE (XINT (bar->height));
+
+ win_y -= VERTICAL_SCROLL_BAR_TOP_BORDER;
+
+ if (! NILP (bar->dragging))
+ win_y -= XINT (bar->dragging);
+
+ if (win_y < 0)
+ win_y = 0;
+ if (win_y > top_range)
+ win_y = top_range;
+
+ *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
+ *bar_window = bar->window;
+
+ if (! NILP (bar->dragging))
+ *part = scroll_bar_handle;
+ else if (win_y < XINT (bar->start))
+ *part = scroll_bar_above_handle;
+ else if (win_y < XINT (bar->end) + VERTICAL_SCROLL_BAR_MIN_HANDLE)
+ *part = scroll_bar_handle;
+ else
+ *part = scroll_bar_below_handle;
- if (! NILP (bar->dragging))
- *part = scrollbar_handle;
- else if (win_y < XINT (bar->start))
- *part = scrollbar_above_handle;
- else if (win_y < XINT (bar->end) + VERTICAL_SCROLLBAR_MIN_HANDLE)
- *part = scrollbar_handle;
- else
- *part = scrollbar_below_handle;
+ XSET (*x, Lisp_Int, win_y);
+ XSET (*y, Lisp_Int, top_range);
- XSET (*x, Lisp_Int, win_y);
- XSET (*y, Lisp_Int, top_range);
- *time = last_mouse_movement_time;
- }
+ mouse_moved = 0;
+ last_mouse_scroll_bar = Qnil;
+ }
- mouse_moved = 0;
- last_mouse_scrollbar = Qnil;
+ *time = last_mouse_movement_time;
- done:
UNBLOCK_INPUT;
}
/* The screen has been cleared so we may have changed foreground or
- background colors, and the scrollbars may need to be redrawn.
- Clear out the scrollbars, and ask for expose events, so we can
+ background colors, and the scroll bars may need to be redrawn.
+ Clear out the scroll bars, and ask for expose events, so we can
redraw them. */
-x_scrollbar_clear (f)
+x_scroll_bar_clear (f)
FRAME_PTR f;
{
Lisp_Object bar;
- for (bar = FRAME_SCROLLBARS (f);
+ for (bar = FRAME_SCROLL_BARS (f);
XTYPE (bar) == Lisp_Vector;
- bar = XSCROLLBAR (bar)->next)
- XClearArea (x_current_display, SCROLLBAR_X_WINDOW (XSCROLLBAR (bar)),
+ bar = XSCROLL_BAR (bar)->next)
+ XClearArea (x_current_display, SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar)),
0, 0, 0, 0, True);
}
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;
+
+/* Record the last 100 characters stored
+ to help debug the loss-of-chars-during-GC problem. */
+int temp_index;
+short temp_buffer[100];
+
/* 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 items_pending; /* How many items are in the X queue. */
XEvent event;
struct frame *f;
- int event_found;
+ int event_found = 0;
int prefix;
Lisp_Object part;
- if (x_input_blocked)
+ if (interrupt_input_blocked)
{
- x_pending_input = 1;
+ interrupt_input_pending = 1;
return -1;
}
- x_pending_input = 0;
+ interrupt_input_pending = 0;
BLOCK_INPUT;
if (numchars <= 0)
f = x_window_to_frame (event.xclient.window);
if (f)
x_focus_on_frame (f);
- /* Not certain about handling scrollbars here */
+ /* Not certain about handling scroll bars here */
}
else if (event.xclient.data.l[0] == Xatom_wm_save_yourself)
{
}
break;
+#ifdef NEW_SELECTIONS
+ case SelectionNotify:
+ x_handle_selection_notify (&event);
+ break;
+#endif
+
case SelectionClear: /* Someone has grabbed ownership. */
+#ifdef NEW_SELECTIONS
+ {
+ XSelectionClearEvent *eventp = (XSelectionClearEvent *) &event;
+
+ 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++;
+
+ count += 1;
+ numchars -= 1;
+ }
+#else
x_disown_selection (event.xselectionclear.window,
event.xselectionclear.selection,
event.xselectionclear.time);
+#endif
break;
case SelectionRequest: /* Someone wants our selection. */
+#ifdef NEW_SELECTIONS
+ {
+ 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;
+ }
+#else
x_answer_selection_request (event);
+#endif
break;
case PropertyNotify:
-
+#ifdef NEW_SELECTIONS
+ x_handle_property_notify (&event);
+#else
/* If we're being told about a root window property, then it's
a cut buffer change. */
if (event.xproperty.window == ROOT_WINDOW)
about re-selecting. */
x_send_incremental (event);
}
+#endif
+ break;
+
+ case ReparentNotify:
+ f = x_window_to_frame (event.xreparent.window);
+ if (f)
+ f->display.x->parent_desc = event.xreparent.parent;
break;
case Expose:
}
else
{
- struct scrollbar *bar
- = x_window_to_scrollbar (event.xexpose.window);
+ struct scroll_bar *bar
+ = x_window_to_scroll_bar (event.xexpose.window);
if (bar)
- x_scrollbar_expose (bar, &event);
+ x_scroll_bar_expose (bar, &event);
}
break;
disabled; you don't want to spend time updating a
display that won't ever be seen. */
f->async_visible = 0;
+ /* The window manager never makes a window invisible
+ ("withdrawn"); all it does is switch between visible
+ and iconified. Frames get into the invisible state
+ only through x_make_frame_invisible. */
+ if (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f))
+ f->async_iconified = 1;
}
break;
if (f != 0)
{
- KeySym keysym;
- char copy_buffer[80];
+ KeySym keysym, orig_keysym;
+ unsigned char copy_buffer[80];
int modifiers;
- event.xkey.state |= extra_keyboard_modifiers;
+ event.xkey.state
+ |= x_emacs_to_x_modifiers (extra_keyboard_modifiers);
modifiers = event.xkey.state;
- /* Some keyboards generate different characters
- depending on the state of the meta key, in an attempt
- to support non-English typists. It would be nice to
- keep this functionality somehow, but for now, we will
- just clear the meta-key flag to get the 'pure' character. */
- event.xkey.state &= ~Mod1Mask;
-
/* 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);
/* Strip off the vendor-specific keysym bit, and take a shot
at recognizing the codes. HP servers have extra keysyms
that fit into the MiscFunctionKey category. */
+ orig_keysym = keysym;
keysym &= ~(1<<28);
if (numchars > 1)
{
- if (IsCursorKey (keysym) /* 0xff50 <= x < 0xff60 */
- || IsMiscFunctionKey (keysym) /* 0xff60 <= x < 0xff80 */
- || IsKeypadKey (keysym) /* 0xff80 <= x < 0xffbe */
- || IsFunctionKey (keysym)) /* 0xffbe <= x < 0xffe1 */
+ 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)
+#endif
+ || IsKeypadKey (keysym) /* 0xff80 <= x < 0xffbe */
+ || IsFunctionKey (keysym) /* 0xffbe <= x < 0xffe1 */
+ || x_is_vendor_fkey (orig_keysym))
+ && ! (IsModifierKey (orig_keysym)
+#ifndef HAVE_X11R5
+#ifdef XK_Mode_switch
+ || ((unsigned)(orig_keysym) == XK_Mode_switch)
+#endif
+#ifdef 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;
- XSET (bufp->code, Lisp_Int, (unsigned) keysym - 0xff50);
+ XSET (bufp->code, Lisp_Int, (unsigned) keysym - 0xff00);
XSET (bufp->frame_or_window, Lisp_Frame, f);
- bufp->modifiers = x_convert_modifiers (modifiers);
+ bufp->modifiers = x_x_to_emacs_modifiers (modifiers);
bufp->timestamp = event.xkey.time;
bufp++;
count++;
{
register int i;
- if (nbytes == 1)
+ for (i = 0; i < nbytes; i++)
{
- if (modifiers & x_meta_mod_mask)
- *copy_buffer |= METABIT;
+ if (temp_index == sizeof temp_buffer / sizeof (short))
+ temp_index = 0;
+ temp_buffer[temp_index++] = copy_buffer[i];
bufp->kind = ascii_keystroke;
- XSET (bufp->code, Lisp_Int, *copy_buffer);
+ XSET (bufp->code, Lisp_Int, copy_buffer[i]);
XSET (bufp->frame_or_window, Lisp_Frame, f);
+ bufp->modifiers = x_x_to_emacs_modifiers (modifiers);
bufp->timestamp = event.xkey.time;
bufp++;
}
- else
- for (i = nbytes - 1; i > 1; i--)
- {
- bufp->kind = ascii_keystroke;
- XSET (bufp->code, Lisp_Int, copy_buffer[i]);
- XSET (bufp->frame_or_window, Lisp_Frame, f);
- bufp->timestamp = event.xkey.time;
- bufp++;
- }
count += nbytes;
numchars -= nbytes;
}
+ else
+ abort ();
}
+ else
+ abort ();
}
break;
#else /* ! defined (HAVE_X11) */
note_mouse_movement (f, &event.xmotion);
else
{
- struct scrollbar *bar =
- x_window_to_scrollbar (event.xmotion.window);
+ struct scroll_bar *bar =
+ x_window_to_scroll_bar (event.xmotion.window);
if (bar)
- x_scrollbar_note_movement (bar, &event);
+ x_scroll_bar_note_movement (bar, &event);
}
}
break;
SET_FRAME_GARBAGED (f);
}
+ 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 (x_current_display,
+
+ /* From-window, to-window. */
+ f->display.x->window_desc,
+ 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;
}
else
{
- struct scrollbar *bar =
- x_window_to_scrollbar (event.xbutton.window);
+ struct scroll_bar *bar =
+ x_window_to_scroll_bar (event.xbutton.window);
if (bar)
- x_scrollbar_handle_click (bar, &event, &emacs_event);
+ x_scroll_bar_handle_click (bar, &event, &emacs_event);
}
if (numchars >= 1 && emacs_event.kind != no_event)
}
}
-#if 0
#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);
- int mask = 1 << fd;
+ SELECT_TYPE mask;
+ EMACS_TIME timeout;
- if (0 != select (fd + 1, &mask, (long *) 0, (long *) 0,
- (EMACS_TIME) 0)
+ FD_SET(fd, &mask);
+ EMACS_SET_SECS_USECS (timeout, 0, 0);
+ if (0 != select (fd + 1, &mask, (long *) 0, (long *) 0, &timeout)
&& !XStuffPending ())
kill (getpid (), SIGHUP);
}
#endif /* ! defined (HAVE_SELECT) */
-#endif /* ! 0 */
#ifndef HAVE_X11
if (updating_frame == 0)
dumpglyphs (f,
CHAR_TO_PIXEL_COL (f, column),
CHAR_TO_PIXEL_ROW (f, row),
- &glyph, 1, highlight, f->display.x->font);
+ &glyph, 1, highlight);
}
static void
{
struct frame_glyphs *current_glyphs = FRAME_CURRENT_GLYPHS (f);
- if (! FRAME_VISIBLE_P (f))
+ /* This is pointless on invisible frames, and dangerous on garbaged
+ frames; in the latter case, the frame may be in the midst of
+ changing its size, and curs_x and curs_y may be off the frame. */
+ if (! FRAME_VISIBLE_P (f) || FRAME_GARBAGED_P (f))
return;
if (! on && f->phys_cursor_x < 0)
{
struct frame_glyphs *current_glyphs = FRAME_CURRENT_GLYPHS (f);
- if (! FRAME_VISIBLE_P (f))
+ /* This is pointless on invisible frames, and dangerous on garbaged
+ frames; in the latter case, the frame may be in the midst of
+ changing its size, and curs_x and curs_y may be off the frame. */
+ if (! FRAME_VISIBLE_P (f) || FRAME_GARBAGED_P (f))
return;
/* If cursor is off and we want it off, return quickly. */
return 1;
#ifdef HAVE_X11
- if (icon_bitmap)
- XFreePixmap (x_current_display, icon_bitmap);
-
- icon_bitmap =
- XCreateBitmapFromData (x_current_display, FRAME_X_WINDOW (f),
- gnu_bits, gnu_width, gnu_height);
+ if (! icon_bitmap)
+ icon_bitmap =
+ XCreateBitmapFromData (x_current_display, FRAME_X_WINDOW (f),
+ gnu_bits, gnu_width, gnu_height);
x_wm_set_icon_pixmap (f, icon_bitmap);
f->display.x->icon_bitmap_flag = 1;
#else /* ! defined (HAVE_X11) */
if (! f->display.x->icon_label)
f->display.x->icon_label = " *emacs* ";
+#if 0
XSetIconName (x_current_display, FRAME_X_WINDOW (f),
(char *) f->display.x->icon_label);
+#endif
f->display.x->icon_bitmap_flag = 0;
x_wm_set_icon_pixmap (f, 0);
if (icon_font_info == 0)
icon_font_info
= XGetFont (XGetDefault (XDISPLAY
- (char *) XSTRING (invocation_name)->data,
+ (char *) XSTRING (Vinvocation_name)->data,
"BodyFont"));
if (f->display.x->icon_desc)
if (_Xdebug)
abort ();
- shut_down_emacs (0);
+ shut_down_emacs (0, 1, Qnil);
exit (70);
}
fprintf (stderr, "X protocol error: %s on protocol request %d\n",
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 ();
}
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
x_connection_closed ();
}
/* A buffer for storing X error messages. */
-static char (*x_caught_error_message)[200];
+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
XErrorEvent *error;
{
XGetErrorText (display, error->error_code,
- *x_caught_error_message, sizeof (*x_caught_error_message));
+ x_caught_error_message, X_CAUGHT_ERROR_MESSAGE_SIZE);
}
XSync (x_current_display, False);
/* Set up the error buffer. */
- x_caught_error_message =
- (char (*)[]) xmalloc (sizeof (*x_caught_error_message));
- (*x_caught_error_message)[0] = '\0';
+ x_caught_error_message
+ = (char*) xmalloc (X_CAUGHT_ERROR_MESSAGE_SIZE);
+ x_caught_error_message[0] = '\0';
/* Install our little error handler. */
XHandleError (x_error_catcher);
/* Make sure to catch any errors incurred so far. */
XSync (x_current_display, False);
- if ((*x_caught_error_message)[0])
+ if (x_caught_error_message[0])
{
- char buf[256];
-
- sprintf (buf, format, *x_caught_error_message);
- free (x_caught_error_message);
+ char buf[X_CAUGHT_ERROR_MESSAGE_SIZE + 56];
+ sprintf (buf, format, x_caught_error_message);
x_uncatch_errors ();
error (buf);
}
void
x_uncatch_errors ()
{
- free (x_caught_error_message);
+ xfree (x_caught_error_message);
+ x_caught_error_message = 0;
XHandleError (x_error_quitter);
}
#ifdef HAVE_X11
+struct font_info
+{
+ XFontStruct *font;
+ char *name;
+};
+
/* A table of all the fonts we have already loaded. */
-static XFontStruct **x_font_table;
+static struct font_info *x_font_table;
/* The current capacity of x_font_table. */
static int x_font_table_size;
0 <= n_fonts <= x_font_table_size. */
static int n_fonts;
+Lisp_Object
x_new_font (f, fontname)
struct frame *f;
register char *fontname;
{
- XFontStruct *temp;
int already_loaded;
int n_matching_fonts;
XFontStruct *font_info;
/* 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 **) XListFontsWithInfo (x_current_display, fontname,
- 1024, &n_matching_fonts,
- &font_info);
- /* If the server couldn't find any fonts whose named matched fontname,
- return an error code. */
- if (n_matching_fonts == 0)
- return 1;
+ font_names = (char **) XListFonts (x_current_display, 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. */
+ if (! font_names)
+ n_matching_fonts = 0;
+
+ /* Don't just give up if n_matching_fonts is 0.
+ Apparently there's a bug on Suns: XListFontsWithInfo can
+ fail to find a font, but XLoadQueryFont may still find it. */
/* See if we've already loaded a matching font. */
- {
- int i, j;
+ already_loaded = -1;
+ if (n_matching_fonts != 0)
+ {
+ int i, j;
- already_loaded = 0;
- for (i = 0; i < n_fonts; i++)
- for (j = 0; j < n_matching_fonts; j++)
- if (x_font_table[i]->fid == font_info[j].fid)
- {
- already_loaded = i;
- goto found_font;
- }
- }
+ for (i = 0; i < n_fonts; i++)
+ for (j = 0; j < n_matching_fonts; j++)
+ if (!strcmp (x_font_table[i].name, font_names[j]))
+ {
+ already_loaded = i;
+ fontname = font_names[j];
+ goto found_font;
+ }
+ }
found_font:
/* If we have, just return it from the table. */
- if (already_loaded)
- f->display.x->font = x_font_table[already_loaded];
+ if (already_loaded >= 0)
+ f->display.x->font = x_font_table[already_loaded].font;
/* Otherwise, load the font and add it to the table. */
else
{
+ int i;
XFontStruct *font;
+ /* Try to find a character-cell font in the list. */
+#if 0
+ /* A laudable goal, but this isn't how to do it. */
+ for (i = 0; i < n_matching_fonts; i++)
+ if (! font_info[i].per_char)
+ break;
+#else
+ i = 0;
+#endif
+
+ /* See comment above. */
+ if (n_matching_fonts != 0)
+ fontname = font_names[i];
+
font = (XFontStruct *) XLoadQueryFont (x_current_display, fontname);
if (! font)
- return 1;
+ {
+ /* Free the information from XListFonts. */
+ if (n_matching_fonts)
+ XFreeFontNames (font_names);
+ return Qnil;
+ }
/* Do we need to create the table? */
if (x_font_table_size == 0)
{
x_font_table_size = 16;
x_font_table
- = (XFontStruct **) xmalloc (x_font_table_size
- * sizeof (x_font_table[0]));
+ = (struct font_info *) xmalloc (x_font_table_size
+ * sizeof (x_font_table[0]));
}
/* Do we need to grow the table? */
else if (n_fonts >= x_font_table_size)
{
x_font_table_size *= 2;
x_font_table
- = (XFontStruct **) xrealloc (x_font_table,
- (x_font_table_size
- * sizeof (x_font_table[0])));
+ = (struct font_info *) xrealloc (x_font_table,
+ (x_font_table_size
+ * sizeof (x_font_table[0])));
}
- f->display.x->font = x_font_table[n_fonts++] = font;
+ x_font_table[n_fonts].name = (char *) xmalloc (strlen (fontname));
+ bcopy (fontname, x_font_table[n_fonts].name, strlen (fontname) + 1);
+ f->display.x->font = x_font_table[n_fonts++].font = font;
}
-
- /* Free the information from XListFontsWithInfo. The data
- we actually retain comes from XLoadQueryFont. */
- XFreeFontInfo (font_names, font_info, n_matching_fonts);
/* Now make the frame display the given font. */
if (FRAME_X_WINDOW (f) != 0)
x_set_window_size (f, f->width, f->height);
}
- return 0;
+ {
+ Lisp_Object lispy_name = build_string (fontname);
+
+
+ /* Free the information from XListFonts. The data
+ we actually retain comes from XLoadQueryFont. */
+ XFreeFontNames (font_names);
+
+ return lispy_name;
+ }
}
#else /* ! defined (HAVE_X11) */
x_new_font (f, newname)
struct frame *f;
{
#ifdef HAVE_X11
+ Window win, child;
+ int win_x = 0, win_y = 0;
+
+ /* 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)
+ {
+ BLOCK_INPUT;
+ XTranslateCoordinates (x_current_display,
+
+ /* From-window, to-window. */
+ f->display.x->window_desc,
+ f->display.x->parent_desc,
+
+ /* From-position, to-position. */
+ 0, 0, &win_x, &win_y,
+
+ /* Child of win. */
+ &child);
+ UNBLOCK_INPUT;
+ }
+
+ /* Treat negative positions as relative to the leftmost bottommost
+ position that fits on the screen. */
if (f->display.x->left_pos < 0)
- f->display.x->left_pos
- = x_screen_width - PIXEL_WIDTH (f) + f->display.x->left_pos;
+ f->display.x->left_pos = (x_screen_width
+ - f->display.x->border_width - win_x
+ - PIXEL_WIDTH (f)
+ + f->display.x->left_pos);
if (f->display.x->top_pos < 0)
- f->display.x->top_pos
- = x_screen_height - PIXEL_HEIGHT (f) + f->display.x->top_pos;
+ f->display.x->top_pos = (x_screen_height
+ - f->display.x->border_width - win_y
+ - PIXEL_HEIGHT (f)
+ + f->display.x->top_pos);
+
#else /* ! defined (HAVE_X11) */
WINDOWINFO_TYPE parentinfo;
XMoveWindow (XDISPLAY FRAME_X_WINDOW (f),
f->display.x->left_pos, f->display.x->top_pos);
#ifdef HAVE_X11
- x_wm_set_size_hint (f, 0);
+ x_wm_set_size_hint (f, 0, xoff, yoff);
#endif /* ! defined (HAVE_X11) */
UNBLOCK_INPUT;
}
BLOCK_INPUT;
check_frame_size (f, &rows, &cols);
- f->display.x->vertical_scrollbar_extra =
- (FRAME_HAS_VERTICAL_SCROLLBARS (f)
- ? VERTICAL_SCROLLBAR_PIXEL_WIDTH (f)
- : 0);
+ f->display.x->vertical_scroll_bar_extra
+ = (FRAME_HAS_VERTICAL_SCROLL_BARS (f)
+ ? VERTICAL_SCROLL_BAR_PIXEL_WIDTH (f)
+ : 0);
pixelwidth = CHAR_TO_PIXEL_WIDTH (f, cols);
pixelheight = CHAR_TO_PIXEL_HEIGHT (f, rows);
#ifdef HAVE_X11
- x_wm_set_size_hint (f, 0);
+ x_wm_set_size_hint (f, 0, 0, 0);
#endif /* ! defined (HAVE_X11) */
XChangeWindowSize (FRAME_X_WINDOW (f), pixelwidth, pixelheight);
x_wm_set_window_state (f, NormalState);
XMapWindow (XDISPLAY FRAME_X_WINDOW (f));
- if (FRAME_HAS_VERTICAL_SCROLLBARS (f))
+ if (FRAME_HAS_VERTICAL_SCROLL_BARS (f))
XMapSubwindows (x_current_display, FRAME_X_WINDOW (f));
#else /* ! defined (HAVE_X11) */
XMapWindow (XDISPLAY FRAME_X_WINDOW (f));
{
int mask;
- if (! f->async_visible)
+ /* Don't keep the highlight on an invisible frame. */
+ if (x_highlight_frame == f)
+ x_highlight_frame = 0;
+
+ if (! f->async_visible && ! f->async_iconified)
return;
BLOCK_INPUT;
DefaultScreen (x_current_display)))
{
UNBLOCK_INPUT_RESIGNAL;
- error ("can't notify window manager of window withdrawl");
+ error ("can't notify window manager of window withdrawal");
}
#else /* ! defined (HAVE_X11R4) */
UNBLOCK_INPUT;
}
-/* Window manager communication. Created in Fx_open_connection. */
-extern Atom Xatom_wm_change_state;
-
/* Change window state from mapped to iconified. */
x_iconify_frame (f)
{
int mask;
+ /* Don't keep the highlight on an invisible frame. */
+ if (x_highlight_frame == f)
+ x_highlight_frame = 0;
+
if (f->async_iconified)
return;
IconicState. */
x_wm_set_window_state (f, IconicState);
+ if (!FRAME_VISIBLE_P (f))
+ {
+ /* If the frame was withdrawn, before, we must map it. */
+ XMapWindow (XDISPLAY FRAME_X_WINDOW (f));
+ if (FRAME_HAS_VERTICAL_SCROLL_BARS (f))
+ XMapSubwindows (x_current_display, FRAME_X_WINDOW (f));
+ }
+
f->async_iconified = 1;
#else /* ! defined (HAVE_X11) */
XUnmapWindow (XDISPLAY FRAME_X_WINDOW (f));
if (f->display.x->icon_desc != 0)
XDestroyWindow (XDISPLAY f->display.x->icon_desc);
XDestroyWindow (XDISPLAY f->display.x->window_desc);
+ free_frame_faces (f);
XFlushQueue ();
- free (f->display.x);
+ xfree (f->display.x);
f->display.x = 0;
if (f == x_focus_frame)
x_focus_frame = 0;
#ifdef HAVE_X11
-x_wm_set_size_hint (f, prompting)
+/* SPEC_X and SPEC_Y are the specified positions.
+ We look only at their sign, to decide the gravity. */
+
+x_wm_set_size_hint (f, prompting, spec_x, spec_y)
struct frame *f;
long prompting;
+ int spec_x, spec_y;
{
XSizeHints size_hints;
Window window = FRAME_X_WINDOW (f);
- size_hints.flags = PResizeInc | PMinSize | PMaxSize;
+ size_hints.flags = PResizeInc | PMinSize /* | PMaxSize */;
flexlines = f->height;
size_hints.width = PIXEL_WIDTH (f);
size_hints.width_inc = FONT_WIDTH (f->display.x->font);
size_hints.height_inc = FONT_HEIGHT (f->display.x->font);
+#if 0
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);
-
+#endif
{
int base_width, base_height;
{
XSizeHints hints; /* Sometimes I hate X Windows... */
- XGetNormalHints (x_current_display, window, &hints);
+ if (XGetNormalHints (x_current_display, window, &hints) == 0)
+ hints.flags = 0;
if (hints.flags & PSize)
size_hints.flags |= PSize;
if (hints.flags & PPosition)
size_hints.flags |= USSize;
}
+ switch (((spec_x < 0) << 1) + (spec_y < 0))
+ {
+ case 0:
+ size_hints.win_gravity = NorthWestGravity;
+ break;
+ case 1:
+ size_hints.win_gravity = SouthWestGravity;
+ break;
+ case 2:
+ size_hints.win_gravity = NorthEastGravity;
+ break;
+ case 3:
+ size_hints.win_gravity = SouthEastGravity;
+ break;
+ }
+ size_hints.flags |= PWinGravity;
+
#ifdef HAVE_X11R4
XSetWMNormalHints (x_current_display, window, &size_hints);
#else
{
Lisp_Object frame;
char *defaultvalue;
+#ifndef F_SETOWN_BUG
#ifdef F_SETOWN
extern int old_fcntl_owner;
#endif /* ! defined (F_SETOWN) */
+#endif /* F_SETOWN_BUG */
x_focus_frame = x_highlight_frame = 0;
x_current_display = XOpenDisplay (display_name);
if (x_current_display == 0)
- fatal ("X server %s not responding; check the DISPLAY environment variable or use \"-d\"\n",
+ fatal ("X server %s not responding.\n\
+Check the DISPLAY environment variable or use \"-d\"\n",
display_name);
#ifdef HAVE_X11
XSetAfterFunction (x_current_display, x_trace_wire);
#endif /* ! 0 */
- invocation_name = Ffile_name_nondirectory (Fcar (Vcommand_line_args));
-
/* Try to get the host name; if the buffer is too short, try
again. Apparently, the only indication gethostname gives of
whether the buffer was large enough is the presence or absence
hostname_size <<= 1;
hostname = (char *) xrealloc (hostname, hostname_size);
}
- x_id_name = (char *) xmalloc (XSTRING (invocation_name)->size
+ x_id_name = (char *) xmalloc (XSTRING (Vinvocation_name)->size
+ strlen (hostname)
+ 2);
- sprintf (x_id_name, "%s@%s", XSTRING (invocation_name)->data, hostname);
+ sprintf (x_id_name, "%s@%s", XSTRING (Vinvocation_name)->data, hostname);
}
/* Figure out which modifier bits mean what. */
x_find_modifier_meanings ();
- /* Get the scrollbar cursor. */
- x_vertical_scrollbar_cursor =
- XCreateFontCursor (x_current_display, XC_sb_v_double_arrow);
+ /* Get the scroll bar cursor. */
+ x_vertical_scroll_bar_cursor
+ = XCreateFontCursor (x_current_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 ();
+#endif
- dup2 (ConnectionNumber (x_current_display), 0);
+ if (ConnectionNumber (x_current_display) != 0)
+ {
+ dup2 (ConnectionNumber (x_current_display), 0);
#ifndef SYSV_STREAMS
- /* Streams somehow keeps track of which descriptor number
- is being used to talk to X. So it is not safe to substitute
- descriptor 0. But it is safe to make descriptor 0 a copy of it. */
- close (ConnectionNumber (x_current_display));
- ConnectionNumber (x_current_display) = 0; /* Looks a little strange?
+ /* Streams somehow keeps track of which descriptor number
+ is being used to talk to X. So it is not safe to substitute
+ descriptor 0. But it is safe to make descriptor 0 a copy of it. */
+ close (ConnectionNumber (x_current_display));
+ ConnectionNumber (x_current_display) = 0; /* Looks a little strange?
* check the def of the macro;
* it is a genuine lvalue */
#endif /* SYSV_STREAMS */
+ }
#endif /* ! defined (HAVE_X11) */
+#ifndef F_SETOWN_BUG
#ifdef F_SETOWN
old_fcntl_owner = fcntl (0, F_GETOWN, 0);
#ifdef F_SETOWN_SOCK_NEG
fcntl (0, F_SETOWN, getpid ());
#endif /* ! defined (F_SETOWN_SOCK_NEG) */
#endif /* ! defined (F_SETOWN) */
+#endif /* F_SETOWN_BUG */
#ifdef SIGIO
init_sigio ();
#endif /* ! defined (SIGIO) */
- /* Must use interrupt input because we cannot otherwise
- arrange for C-g to be noticed immediately.
- We cannot connect it to SIGINT. */
- Fset_input_mode (Qt, Qnil, Qt, Qnil);
-
expose_all_windows = 0;
clear_frame_hook = XTclear_frame;
mouse_position_hook = XTmouse_position;
frame_rehighlight_hook = XTframe_rehighlight;
frame_raise_lower_hook = XTframe_raise_lower;
- set_vertical_scrollbar_hook = XTset_vertical_scrollbar;
- condemn_scrollbars_hook = XTcondemn_scrollbars;
- redeem_scrollbar_hook = XTredeem_scrollbar;
- judge_scrollbars_hook = XTjudge_scrollbars;
+ set_vertical_scroll_bar_hook = XTset_vertical_scroll_bar;
+ condemn_scroll_bars_hook = XTcondemn_scroll_bars;
+ redeem_scroll_bar_hook = XTredeem_scroll_bar;
+ judge_scroll_bars_hook = XTjudge_scroll_bars;
scroll_region_ok = 1; /* we'll scroll partial frames */
char_ins_del_ok = 0; /* just as fast to write the line */
off the bottom */
baud_rate = 19200;
+ /* Try to use interrupt input; if we can't, then start polling. */
+ Fset_input_mode (Qt, Qnil, Qt, Qnil);
+
/* Note that there is no real way portable across R3/R4 to get the
original error handler. */
XHandleError (x_error_quitter);
void
syms_of_xterm ()
{
- staticpro (&invocation_name);
- invocation_name = Qnil;
-
- staticpro (&last_mouse_scrollbar);
+ staticpro (&last_mouse_scroll_bar);
}
#endif /* ! defined (HAVE_X11) */
#endif /* ! defined (HAVE_X_WINDOWS) */