comparison src/keyboard.c @ 102744:d69c45eb83b1

* 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.

102743:043083354750

#ifdef HAVE_GPM
  if (gpm_tty == tty)
  {
      Gpm_Event event;
      struct input_event hold_quit;
      int gpm;

      EVENT_INIT (hold_quit);
      hold_quit.kind = NO_EVENT;

      while (gpm = Gpm_GetEvent (&event), gpm == 1) {
	  nread += handle_one_term_event (tty, &event, &hold_quit);
      }
      if (gpm < 0)
	/* Presumably the GPM daemon has closed the connection.  */
	close_gpm ();
      if (hold_quit.kind != NO_EVENT)
	  kbd_buffer_store_event (&hold_quit);
      if (nread)
	  return nread;
  }

102744:d69c45eb83b1

#ifdef HAVE_GPM
  if (gpm_tty == tty)
  {
      Gpm_Event event;
      struct input_event hold_quit;
      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)
	/* Presumably the GPM daemon has closed the connection.  */
	close_gpm (fd);
      if (hold_quit.kind != NO_EVENT)
	  kbd_buffer_store_event (&hold_quit);
      if (nread)
	  return nread;
  }