* keyboard.c (tty_read_avail_input): Don't treat a -1 return from

Gpm_GetEvent as an error that justifies closing the filedescriptor.
* term.c (close_gpm): Get the filedescriptor as a (new) parameter.
(Fgpm_mouse_stop): Pass that new parameter.
* termhooks.h (close_gpm): Adjust prototype.

1 files changed, 9 insertions, 3 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 1bdf9a37b50..527a82b55ff 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7184,17 +7184,23 @@ tty_read_avail_input (struct terminal *terminal,
   {
       Gpm_Event event;
       struct input_event hold_quit;
-      int gpm;
+      int gpm, fd = gpm_fd;
 
       EVENT_INIT (hold_quit);
       hold_quit.kind = NO_EVENT;
 
+      /* gpm==1 if event received.
+         gpm==0 if the GPM daemon has closed the connection, in which case
+                Gpm_GetEvent closes gpm_fd and clears it to -1, which is why
+                we save it in `fd' so close_gpm can remove it from the
+                select masks.
+         gpm==-1 if a protocol error or EWOULDBLOCK; the latter is normal. */
       while (gpm = Gpm_GetEvent (&event), gpm == 1) {
           nread += handle_one_term_event (tty, &event, &hold_quit);
       }
-      if (gpm < 0)
+      if (gpm == 0)
         /* Presumably the GPM daemon has closed the connection.  */
-        close_gpm ();
+        close_gpm (fd);
       if (hold_quit.kind != NO_EVENT)
           kbd_buffer_store_event (&hold_quit);
       if (nread)