#include "gnu.h"
#include "screen.h"
#include "disptab.h"
-#include "window.h"
#include "buffer.h"
-#include "xfns.h"
#ifdef HAVE_X11
#define XMapWindow XMapRaised /* Raise them when mapping. */
static struct screen *updating_screen;
/* The screen (if any) which has the X window that has keyboard focus.
- Zero if none. This is examined by Ffocus_screen in screen.c */
-
+ Zero if none. This is examined by Ffocus_screen in screen.c. */
struct screen *x_focus_screen;
+/* The screen which currently has the visual highlight, and should get
+ keyboard input (other sorts of input have the screen encoded in the
+ event). It points to the X focus screen's selected window's
+ screen. It differs from x_focus_screen when we're using a global
+ minibuffer. */
+static struct screen *x_highlight_screen;
+
/* From .Xdefaults, the value of "emacs.WarpMouse". If non-zero,
mouse is moved to inside of screen when screen is de-iconified. */
flexlines = s->height;
highlight = 0;
-#if 0
- if (mouse_track_width != 0)
- {
- x_rectangle (s, s->display.x->reverse_gc,
- mouse_track_top, mouse_track_left, mouse_track_width, 1);
- mouse_track_width = 0;
- }
-#endif
BLOCK_INPUT;
#ifndef HAVE_X11
dumpqueue ();
#endif
+ x_display_cursor (s, 0);
UNBLOCK_INPUT;
}
: (hl ? s->display.x->reverse_gc
: s->display.x->normal_gc));
- XDrawImageString16 (x_current_display, window, drawing_gc,
- left, top + FONT_BASE (font), (XChar2b *) gp, n);
+ 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 0
if (cursor_cleared)
x_display_cursor (s, 1);
- XFlushQueue ();
}
#ifndef HAVE_X11
}
#endif /* X10 */
+static void XTscreen_rehighlight ();
+
/* The focus has changed. Update the screens as necessary to reflect
the new situation. Note that we can't change the selected screen
here, because the lisp code we are interrupting might become confused.
- For that, we enqueue a screen_selected event.
+ Each event gets marked with the screen in which it occured, so the
+ lisp code can tell when the switch took place by examining the events. */
- Return the number of events stored at bufp. */
-static int
-x_new_focus_screen (screen, bufp, buf_free)
+static void
+x_new_focus_screen (screen)
struct screen *screen;
- struct input_event *bufp;
- int buf_free;
{
struct screen *old_focus = x_focus_screen;
int events_enqueued = 0;
- if (screen == x_focus_screen)
- return 0;
-
- /* Set this before calling screen_{un,}highlight, so that they see
- the correct value of x_focus_screen. */
- x_focus_screen = screen;
-
- if (old_focus)
+ if (screen != x_focus_screen)
{
- if (old_focus->auto_lower)
+ /* Set this before calling other routines, so that they see
+ the correct value of x_focus_screen. */
+ x_focus_screen = screen;
+
+ if (old_focus && old_focus->auto_lower)
x_lower_screen (old_focus);
- screen_unhighlight (old_focus);
- }
#if 0
- selected_screen = screen;
- XSET (XWINDOW (selected_screen->selected_window)->screen,
- Lisp_Screen, selected_screen);
- Fselect_window (selected_screen->selected_window);
- choose_minibuf_screen ();
+ selected_screen = screen;
+ XSET (XWINDOW (selected_screen->selected_window)->screen,
+ Lisp_Screen, selected_screen);
+ Fselect_window (selected_screen->selected_window);
+ choose_minibuf_screen ();
#endif
- if (x_focus_screen)
- {
- if (x_focus_screen->auto_raise)
+ if (x_focus_screen && x_focus_screen->auto_raise)
x_raise_screen (x_focus_screen);
- screen_highlight (x_focus_screen);
+ }
- /* Enqueue an event. It's kind of important not to drop these
- events, but the event queue's fixed size is a real pain in the butt
- anyway. */
- if (buf_free > 0)
- {
- bufp->kind = screen_selected;
- bufp->screen = screen;
- events_enqueued++;
- }
+ XTscreen_rehighlight ();
+}
+
+
+/* The focus has changed, or we have make a screen's selected window
+ point to a window on a different screen (this happens with global
+ minibuffer screens). Shift the highlight as appropriate. */
+static void
+XTscreen_rehighlight ()
+{
+ struct screen *old_highlight = x_highlight_screen;
+
+ if (x_focus_screen)
+ {
+ x_highlight_screen = XSCREEN (SCREEN_FOCUS_SCREEN (x_focus_screen));
+ if (x_highlight_screen->display.nothing == 0)
+ XSET (SCREEN_FOCUS_SCREEN (x_focus_screen), Lisp_Screen,
+ (x_highlight_screen = x_focus_screen));
}
+ else
+ x_highlight_screen = 0;
- return events_enqueued;
+ if (x_highlight_screen != old_highlight)
+ {
+ if (old_highlight)
+ screen_unhighlight (old_highlight);
+ if (x_highlight_screen)
+ screen_highlight (x_highlight_screen);
+ }
}
\f
enum window_type
{
bufp->kind = non_ascii_keystroke;
bufp->code = (unsigned) keysym - 0xff50;
+ bufp->screen = XSCREEN (SCREEN_FOCUS_SCREEN (s));
bufp->modifiers = x_convert_modifiers (event.xkey.state);
bufp++;
count++;
if (event.xkey.state & Mod1Mask)
*copy_buffer |= METABIT;
bufp->kind = ascii_keystroke;
+ bufp->screen = XSCREEN (SCREEN_FOCUS_SCREEN (s));
XSET (bufp->code, Lisp_Int, *copy_buffer);
bufp++;
}
{
bufp->kind = ascii_keystroke;
XSET (bufp->code, Lisp_Int, copy_buffer[i]);
+ bufp->screen = XSCREEN (SCREEN_FOCUS_SCREEN (s));
bufp++;
}
{
bufp->kind = ascii_keystroke;
XSET (bufp->code, Lisp_Int, where_mapping[i]);
+ bufp->screen = XSCREEN (SCREEN_FOCUS_SCREEN (s));
bufp++;
}
count += nbytes;
#ifdef HAVE_X11
case EnterNotify:
+ s = x_window_to_screen (event.xcrossing.window);
+
if (event.xcrossing.detail == NotifyInferior) /* Left Scrollbar */
;
else if (event.xcrossing.focus) /* Entered Window */
struct input_event emacs_event;
emacs_event.kind = no_event;
- s = x_window_to_screen (event.xcrossing.window);
-
/* Avoid nasty pop/raise loops. */
if (s && (!(s->auto_raise)
|| !(s->auto_lower)
|| (event.xcrossing.time - enter_timestamp) > 500))
{
- int n = x_new_focus_screen (s, bufp, numchars);
- bufp += n;
- numchars -= n;
+ x_new_focus_screen (s);
enter_timestamp = event.xcrossing.time;
}
#if 0
}
#endif
}
+ else if (s == x_focus_screen)
+ x_new_focus_screen (0);
#if 0
else if (s = x_window_to_screen (event.xcrossing.window))
x_mouse_screen = s;
case FocusIn:
s = x_window_to_screen (event.xfocus.window);
if (s)
- {
- int n = x_new_focus_screen (s, bufp, numchars);
- bufp += n;
- numchars -= n;
- }
+ x_new_focus_screen (s);
break;
case LeaveNotify:
&& event.xcrossing.subwindow == None
&& event.xcrossing.mode == NotifyNormal)
{
- if (event.xcrossing.focus
- && (x_focus_screen
- == x_window_to_screen (event.xcrossing.window)))
- {
- int n = x_new_focus_screen (0, bufp, numchars);
- bufp += n;
- numchars -= n;
- }
+ s = x_window_to_screen (event.xcrossing.window);
+ if (event.xcrossing.focus)
+ x_new_focus_screen (s);
+ else if (s == x_focus_screen)
+ x_new_focus_screen (0);
}
break;
case FocusOut:
s = x_window_to_screen (event.xfocus.window);
if (s && s == x_focus_screen)
- {
- int n = x_new_focus_screen (0, bufp, numchars);
- bufp += n;
- numchars -= n;
- }
+ x_new_focus_screen (0);
break;
#else /* not HAVE_X11 */
x_mouse_screen = s;
if (waiting_for_input && x_focus_screen == 0)
- x_new_selected_screen (s);
+ x_new_focus_screen (s);
}
break;
{
bufp->kind = ascii_keystroke;
bufp->code = (char) 'X' & 037; /* C-x */
+ bufp->screen = XSCREEN (SCREEN_FOCUS_SCREEN (s));
bufp++;
bufp->kind = ascii_keystroke;
bufp->code = (char) 0; /* C-@ */
+ bufp->screen = XSCREEN (SCREEN_FOCUS_SCREEN (s));
bufp++;
count += 2;
s->phys_cursor_x = phys_x = -1;
}
- if (on && s == x_focus_screen)
+ if (on && s == x_highlight_screen)
{
x1 = s->cursor_x * FONT_WIDTH (s->display.x->font)
+ s->display.x->internal_border_width;
|| s->phys_cursor_x != s->cursor_x
|| s->phys_cursor_y != s->cursor_y
|| (s->display.x->text_cursor_kind != hollow_box_cursor
- && (s != x_focus_screen))))
+ && (s != x_highlight_screen))))
{
/* Erase the cursor by redrawing the character underneath it. */
x_draw_single_glyph (s, s->phys_cursor_y, s->phys_cursor_x,
if (on
&& (s->phys_cursor_x < 0
|| (s->display.x->text_cursor_kind != filled_box_cursor
- && s == x_focus_screen)))
+ && s == x_highlight_screen)))
{
- if (s != x_focus_screen)
+ if (s != x_highlight_screen)
{
x_draw_box (s);
s->display.x->text_cursor_kind = hollow_box_cursor;
XFlushQueue ();
}
-#if 0
-This code has been rewritten to use x_draw_single_glyph and draw
-box cursors successfully. Once that code is working, this can go away.
-
-/* Turn the displayed cursor of screen S on or off according to ON.
- If ON is nonzero, where to put the cursor is specified
- by S->cursor_x and S->cursor_y. */
-
-static void
-x_display_box_cursor (s, on)
- struct screen *s;
- int on;
-{
- register struct screen_glyphs *current_screen = SCREEN_CURRENT_GLYPHS (s);
-
- if (! s->visible)
- return;
-
- /* If cursor is off and we want it off, return quickly. */
-
- if (!on && s->phys_cursor_x < 0)
- return;
-
- /* If cursor is currently being shown and we don't want it to be
- or it is in the wrong place, erase it. */
-
- if (s->phys_cursor_x >= 0
- && (!on || s->phys_cursor_x != s->cursor_x
- || s->phys_cursor_y != s->cursor_y))
- {
- /* If there is supposed to be a character there, redraw it
- in that line's normal video. */
- if (current_screen->enable[s->phys_cursor_y]
- && s->phys_cursor_x < current_screen->used[s->phys_cursor_y])
- dumpglyphs (s,
- (s->phys_cursor_x * FONT_WIDTH (s->display.x->font)
- + s->display.x->internal_border_width),
- (s->phys_cursor_y * FONT_HEIGHT (s->display.x->font)
- + s->display.x->internal_border_width),
- ¤t_screen->glyphs[s->phys_cursor_y][s->phys_cursor_x],
- 1, current_screen->highlight[s->phys_cursor_y],
- s->display.x->font);
- /* Otherwise just erase the space. */
- else
-#ifdef HAVE_X11
- XClearArea (x_current_display, s->display.x->window_desc,
- s->phys_cursor_x * FONT_WIDTH (s->display.x->font)
- + s->display.x->internal_border_width,
- s->phys_cursor_y * FONT_HEIGHT (s->display.x->font)
- + s->display.x->internal_border_width,
- FONT_WIDTH (s->display.x->font),
- FONT_HEIGHT (s->display.x->font), False);
-#else
- XPixSet (s->display.x->window_desc,
- s->phys_cursor_x * FONT_WIDTH (s->display.x->font)
- + s->display.x->internal_border_width,
- s->phys_cursor_y * FONT_HEIGHT (s->display.x->font)
- + s->display.x->internal_border_width,
- FONT_WIDTH (s->display.x->font),
- FONT_HEIGHT (s->display.x->font),
- s->display.x->background_pixel);
-#endif /* HAVE_X11 */
-
- s->phys_cursor_x = -1;
- }
-
- /* If we want to show a cursor, write it in the right place. */
-
- if (on && s->phys_cursor_x < 0)
- {
- if (s != selected_screen || s != x_input_screen)
- x_draw_box (s);
- else if (current_screen->enable[s->cursor_y]
- && s->cursor_x < current_screen->used[s->cursor_y])
- /* There is a character there: draw the character with
- cursor coloration. */
- dumpglyphs (s,
- (s->cursor_x * FONT_WIDTH (s->display.x->font)
- + s->display.x->internal_border_width),
- (s->cursor_y * FONT_HEIGHT (s->display.x->font)
- + s->display.x->internal_border_width),
- ¤t_screen->glyphs[s->cursor_y][s->cursor_x],
- 1, 2, s->display.x->font);
- else
-#ifdef HAVE_X11
- {
- GLYPH space = SPACEGLYPH;
- dumpglyphs (s,
- (s->cursor_x * FONT_WIDTH (s->display.x->font)
- + s->display.x->internal_border_width),
- (s->cursor_y * FONT_HEIGHT (s->display.x->font)
- + s->display.x->internal_border_width),
- &space, 1,
- 2, s->display.x->font);
- }
-#if 0
- /* This kills the HP-BSD X11R3 server... */
- XFillRectangle (x_current_display, s->display.x->window_desc,
- s->display.x->cursor_gc,
- s->cursor_x * FONT_WIDTH (s->display.x->font)
- + s->display.x->internal_border_width,
- s->cursor_y * FONT_HEIGHT (s->display.x->font)
- + s->display.x->internal_border_width,
- FONT_WIDTH (s->display.x->font), FONT_HEIGHT (s->display.x->font));
-#endif
-#else
- XPixSet (s->display.x->window_desc,
- s->cursor_x * FONT_WIDTH (s->display.x->font)+s->display.x->internal_border_width,
- s->cursor_y * FONT_HEIGHT (s->display.x->font)+s->display.x->internal_border_width,
- FONT_WIDTH (s->display.x->font), FONT_HEIGHT (s->display.x->font), s->display.x->cursor_pixel);
-#endif /* HAVE_X11 */
-
- s->phys_cursor_x = s->cursor_x;
- s->phys_cursor_y = s->cursor_y;
- }
-
- if (updating_screen != s)
- XFlushQueue ();
-}
-#endif
-
extern Lisp_Object Vbar_cursor;
x_display_cursor (s, on)
struct screen *s;
{
x_raise_screen (s);
+#if 0
+ /* 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_screen too. */
XSetInputFocus (x_current_display, s->display.x->window_desc,
RevertToPointerRoot, CurrentTime);
+#endif
}
x_unfocus_screen (s)
struct screen *s;
{
+#if 0
+ /* Look at the remarks in x_focus_on_screen. */
if (x_focus_screen == s)
XSetInputFocus (x_current_display, PointerRoot,
RevertToPointerRoot, CurrentTime);
+#endif
}
#endif
free (displ.x);
if (s == x_focus_screen)
x_focus_screen = 0;
+ if (s == x_highlight_screen)
+ x_highlight_screen = 0;
}
\f
#ifndef HAVE_X11
#ifdef F_SETOWN
extern int old_fcntl_owner;
#endif
+
+ x_focus_screen = x_highlight_screen = 0;
x_current_display = XOpenDisplay (display_name);
if (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;
+ ConnectionNumber (x_current_display) = 0; /* Looks a little strange?
+ * check the def of the macro;
+ * it is a genuine lvalue */
+#endif /* not SYSV_STREAMS */
+
#endif /* HAVE_X11 */
#ifdef F_SETOWN
read_socket_hook = XTread_socket;
cursor_to_hook = XTcursor_to;
reassert_line_highlight_hook = XTreassert_line_highlight;
+ screen_rehighlight_hook = XTscreen_rehighlight;
mouse_tracking_enable_hook = XTmouse_tracking_enable;
scroll_region_ok = 1; /* we'll scroll partial screens */