summaryrefslogtreecommitdiff
path: root/src/term.c
diff options
context:
space:
mode:
authorJared Finder <jared@finder.org>2020-12-02 00:05:59 -0800
committerEli Zaretskii <eliz@gnu.org>2021-01-16 15:02:10 +0200
commitba29d13f41b777969a324894ba82646d36e1ff5c (patch)
tree6ee4776e3d6a8c18a48d42594ab66e45e3cf9961 /src/term.c
parent0732fc31932c75c682c8b65b4dcb4376ca63e8fd (diff)
downloademacs-ba29d13f41b777969a324894ba82646d36e1ff5c.tar.gz
Make mouse-related calls be more consistent on all frame types
* src/frame.c (Fset_mouse_position, Fset_mouse_pixel_position): Call Fselect_frame and appropriate mouse_moveto function on all non-GUI frame types, independent of #ifdef's. * src/term.c (init_tty): Initialize mouse_face_window for all non-GUI frame types. (term_mouse_moveto) [HAVE_GPM]: Make available even if HAVE_WINDOW_SYSTEM is defined. * src/xdisp.c (try_window_id): Call gui_clear_window_mouse_face in all cases.
Diffstat (limited to 'src/term.c')
-rw-r--r--src/term.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/term.c b/src/term.c
index a87f9c745ce..2e2ab2bf438 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2382,7 +2382,6 @@ frame's terminal). */)
#ifdef HAVE_GPM
-#ifndef HAVE_WINDOW_SYSTEM
void
term_mouse_moveto (int x, int y)
{
@@ -2396,7 +2395,6 @@ term_mouse_moveto (int x, int y)
last_mouse_x = x;
last_mouse_y = y; */
}
-#endif /* HAVE_WINDOW_SYSTEM */
/* Implementation of draw_row_with_mouse_face for TTY/GPM. */
void
@@ -4246,8 +4244,8 @@ use the Bourne shell command 'TERM=...; export TERM' (C-shell:\n\
#ifdef HAVE_GPM
terminal->mouse_position_hook = term_mouse_position;
- tty->mouse_highlight.mouse_face_window = Qnil;
#endif
+ tty->mouse_highlight.mouse_face_window = Qnil;
terminal->kboard = allocate_kboard (Qnil);
terminal->kboard->reference_count++;