if (current_rows != *rows || current_cols != *cols)
{
struct frame *f = SELECTED_FRAME();
- struct tty_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
- Lisp_Object window = dpyinfo->mouse_face_window;
+ Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
+ Lisp_Object window = hlinfo->mouse_face_window;
if (! NILP (window) && XFRAME (XWINDOW (window)->frame) == f)
{
- 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;
+ hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1;
+ hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1;
+ hlinfo->mouse_face_window = Qnil;
}
}
}
/* Draw TEXT_AREA glyphs between START and END of glyph row ROW on
- window W, starting at x-position X. X is relative to TEXT_AREA
- in W. HL is a face override for drawing the glyphs. */
+ window W. X is relative to TEXT_AREA in W. HL is a face override
+ for drawing the glyphs. */
void
-draw_row_with_mouse_face (struct window *w, int x, struct glyph_row *row,
- int start_hpos, int end_hpos,
- enum draw_glyphs_face hl)
+tty_draw_row_with_mouse_face (struct window *w, struct glyph_row *row,
+ int start_hpos, int end_hpos,
+ enum draw_glyphs_face hl)
{
struct frame *f = XFRAME (WINDOW_FRAME (w));
struct tty_display_info *tty = FRAME_TTY (f);
+ Mouse_HLInfo *hlinfo = &tty->mouse_highlight;
if (hl == DRAW_MOUSE_FACE)
{
kstart, kstart + nglyphs - 1, vpos);
mouse_off ();
- IT_set_face (tty->mouse_face_face_id);
+ IT_set_face (hlinfo->mouse_face_face_id);
/* Since we are going to change only the _colors_ of already
displayed text, there's no need to go through all the pain of
generating and encoding the text from the glyphs. Instead,
IT_update_begin (struct frame *f)
{
struct tty_display_info *display_info = FRAME_X_DISPLAY_INFO (f);
- struct frame *mouse_face_frame = display_info->mouse_face_mouse_frame;
+ Mouse_HLInfo *hlinfo = &display_info->mouse_highlight;
+ struct frame *mouse_face_frame = hlinfo->mouse_face_mouse_frame;
if (display_info->termscript)
fprintf (display_info->termscript, "\n\n<UPDATE_BEGIN");
if (f && f == mouse_face_frame)
{
/* Don't do highlighting for mouse motion during the update. */
- display_info->mouse_face_defer = 1;
+ hlinfo->mouse_face_defer = 1;
/* If F needs to be redrawn, simply forget about any prior mouse
highlighting. */
if (FRAME_GARBAGED_P (f))
- display_info->mouse_face_window = Qnil;
+ hlinfo->mouse_face_window = Qnil;
/* Can we tell that this update does not affect the window
where the mouse highlight is? If so, no need to turn off.
Likewise, don't do anything if none of the enabled rows
contains glyphs highlighted in mouse face. */
- if (!NILP (display_info->mouse_face_window)
- && WINDOWP (display_info->mouse_face_window))
+ if (!NILP (hlinfo->mouse_face_window)
+ && WINDOWP (hlinfo->mouse_face_window))
{
- struct window *w = XWINDOW (display_info->mouse_face_window);
+ struct window *w = XWINDOW (hlinfo->mouse_face_window);
int i;
/* If the mouse highlight is in the window that was deleted
(e.g., if it was popped by completion), clear highlight
unconditionally. */
if (NILP (w->buffer))
- display_info->mouse_face_window = Qnil;
+ hlinfo->mouse_face_window = Qnil;
else
{
for (i = 0; i < w->desired_matrix->nrows; ++i)
}
if (NILP (w->buffer) || i < w->desired_matrix->nrows)
- clear_mouse_face (display_info);
+ clear_mouse_face (hlinfo);
}
}
else if (mouse_face_frame && !FRAME_LIVE_P (mouse_face_frame))
{
/* If the frame with mouse highlight was deleted, invalidate the
highlight info. */
- display_info->mouse_face_beg_row = display_info->mouse_face_beg_col = -1;
- display_info->mouse_face_end_row = display_info->mouse_face_end_col = -1;
- display_info->mouse_face_window = Qnil;
- display_info->mouse_face_deferred_gc = 0;
- display_info->mouse_face_mouse_frame = NULL;
+ hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1;
+ hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1;
+ hlinfo->mouse_face_window = Qnil;
+ hlinfo->mouse_face_deferred_gc = 0;
+ hlinfo->mouse_face_mouse_frame = NULL;
}
UNBLOCK_INPUT;
if (dpyinfo->termscript)
fprintf (dpyinfo->termscript, "\n<UPDATE_END\n");
- dpyinfo->mouse_face_defer = 0;
+ dpyinfo->mouse_highlight.mouse_face_defer = 0;
}
static void
IT_frame_up_to_date (struct frame *f)
{
- struct tty_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
+ Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
Lisp_Object new_cursor, frame_desired_cursor;
struct window *sw;
- if (dpyinfo->mouse_face_deferred_gc
- || (f && f == dpyinfo->mouse_face_mouse_frame))
+ if (hlinfo->mouse_face_deferred_gc
+ || (f && f == hlinfo->mouse_face_mouse_frame))
{
BLOCK_INPUT;
- if (dpyinfo->mouse_face_mouse_frame)
- note_mouse_highlight (dpyinfo->mouse_face_mouse_frame,
- dpyinfo->mouse_face_mouse_x,
- dpyinfo->mouse_face_mouse_y);
- dpyinfo->mouse_face_deferred_gc = 0;
+ if (hlinfo->mouse_face_mouse_frame)
+ note_mouse_highlight (hlinfo->mouse_face_mouse_frame,
+ hlinfo->mouse_face_mouse_x,
+ hlinfo->mouse_face_mouse_y);
+ hlinfo->mouse_face_deferred_gc = 0;
UNBLOCK_INPUT;
}
if (colors[1] >= 0 && colors[1] < 16)
FRAME_BACKGROUND_PIXEL (SELECTED_FRAME ()) = colors[1];
}
- the_only_display_info.mouse_face_mouse_frame = NULL;
- the_only_display_info.mouse_face_deferred_gc = 0;
- the_only_display_info.mouse_face_beg_row =
- the_only_display_info.mouse_face_beg_col = -1;
- the_only_display_info.mouse_face_end_row =
- the_only_display_info.mouse_face_end_col = -1;
- the_only_display_info.mouse_face_face_id = DEFAULT_FACE_ID;
- the_only_display_info.mouse_face_window = Qnil;
- the_only_display_info.mouse_face_mouse_x =
- the_only_display_info.mouse_face_mouse_y = 0;
- the_only_display_info.mouse_face_defer = 0;
- the_only_display_info.mouse_face_hidden = 0;
+ the_only_display_info.mouse_highlight.mouse_face_mouse_frame = NULL;
+ the_only_display_info.mouse_highlight.mouse_face_deferred_gc = 0;
+ the_only_display_info.mouse_highlight.mouse_face_beg_row =
+ the_only_display_info.mouse_highlight.mouse_face_beg_col = -1;
+ the_only_display_info.mouse_highlight.mouse_face_end_row =
+ the_only_display_info.mouse_highlight.mouse_face_end_col = -1;
+ the_only_display_info.mouse_highlight.mouse_face_face_id = DEFAULT_FACE_ID;
+ the_only_display_info.mouse_highlight.mouse_face_window = Qnil;
+ the_only_display_info.mouse_highlight.mouse_face_mouse_x =
+ the_only_display_info.mouse_highlight.mouse_face_mouse_y = 0;
+ the_only_display_info.mouse_highlight.mouse_face_defer = 0;
+ the_only_display_info.mouse_highlight.mouse_face_hidden = 0;
if (have_mouse) /* detected in dos_ttraw, which see */
{
{
struct input_event event;
union REGS regs;
- struct tty_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (SELECTED_FRAME());
+ Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (SELECTED_FRAME());
EVENT_INIT (event);
#ifndef HAVE_X_WINDOWS
if (code == 0)
continue;
- if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
+ if (!hlinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
{
- clear_mouse_face (dpyinfo);
- dpyinfo->mouse_face_hidden = 1;
+ clear_mouse_face (hlinfo);
+ hlinfo->mouse_face_hidden = 1;
}
if (code >= 0x100)
might need to update mouse highlight. */
if (mouse_last_x != mouse_prev_x || mouse_last_y != mouse_prev_y)
{
- if (dpyinfo->mouse_face_hidden)
+ if (hlinfo->mouse_face_hidden)
{
- dpyinfo->mouse_face_hidden = 0;
- clear_mouse_face (dpyinfo);
+ hlinfo->mouse_face_hidden = 0;
+ clear_mouse_face (hlinfo);
}
/* Generate SELECT_WINDOW_EVENTs when needed. */
mouse_window = window_from_coordinates (SELECTED_FRAME(),
mouse_last_x,
mouse_last_y,
- 0, 0, 0, 0);
+ 0, 0);
/* A window will be selected only when it is not
selected now, and the last mouse movement event was
not in it. A minibuffer window will be selected iff
/* If the contents of the global variable help_echo has
changed, generate a HELP_EVENT. */
if (!NILP (help_echo_string) || !NILP (previous_help_echo_string))
- {
- event.kind = HELP_EVENT;
- event.frame_or_window = selected_frame;
- event.arg = help_echo_object;
- event.x = WINDOWP (help_echo_window)
- ? help_echo_window : selected_frame;
- event.y = help_echo_string;
- event.timestamp = event_timestamp ();
- event.code = help_echo_pos;
- kbd_buffer_store_event (&event);
- }
+ gen_help_event (help_echo_string, selected_frame, help_echo_window,
+ help_echo_object, help_echo_pos);
}
for (but = 0; but < NUM_MOUSE_BUTTONS; but++)
HCoop / bpt / emacs.git / blobdiff