* termhooks.h (term_gpm): Delete. Use gpm_tty's NULLness instead.

(gpm_tty): Change its type.
* term.c (term_gpm): Delete.  Use gpm_tty's NULLness instead.
(gpm_tty): Change its type and initialize it.
(Fterm_open_connection): Check the frame is indeed a tty.  Use the new gpm_tty.
(Fterm_close_connection): Use the new gpm_tty.
* keyboard.c (tty_read_avail_input): Use the new gpm_tty.
* sysdep.c (init_sys_modes): term_gpm -> gpm_tty.

1 files changed, 2 insertions, 5 deletions

diff --git a/src/termhooks.h b/src/termhooks.h
index c4b3839f972..8cb1194dc07 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -302,11 +302,8 @@ enum {
 extern int handle_one_term_event (struct tty_display_info *, Gpm_Event *, struct input_event *);
 extern void term_mouse_moveto (int, int);
 
-/* Nonzero means mouse is enabled on Linux console */
-extern int term_gpm;
-
-/* The id of the terminal device for which we have gpm support.  */
-extern int gpm_tty;
+/* The device for which we have enabled gpm support.  */
+extern struct tty_display_info *gpm_tty;
 #endif
 
 #endif /* CONSP */