Mercurial > emacs
changeset 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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 27 Mar 2009 16:14:23 +0000 |
| parents | 043083354750 |
| children | 364aae6e6402 |
| files | src/ChangeLog src/keyboard.c src/term.c src/termhooks.h |
| diffstat | 4 files changed, 22 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Mar 27 15:58:16 2009 +0000 +++ b/src/ChangeLog Fri Mar 27 16:14:23 2009 +0000 @@ -1,3 +1,11 @@ +2009-03-27 Kevin Ryde <user42@zip.com.au> + + * 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. + 2009-03-26 Stefan Monnier <monnier@iro.umontreal.ca> * lisp.h (Fx_focus_frame): Declare.
--- a/src/keyboard.c Fri Mar 27 15:58:16 2009 +0000 +++ b/src/keyboard.c Fri Mar 27 16:14:23 2009 +0000 @@ -7184,17 +7184,23 @@ { 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)
--- a/src/term.c Fri Mar 27 15:58:16 2009 +0000 +++ b/src/term.c Fri Mar 27 16:14:23 2009 +0000 @@ -3150,10 +3150,10 @@ } void -close_gpm () +close_gpm (int fd) { - if (gpm_fd >= 0) - delete_gpm_wait_descriptor (gpm_fd); + if (fd >= 0) + delete_gpm_wait_descriptor (fd); while (Gpm_Close()); /* close all the stack */ gpm_tty = NULL; } @@ -3171,7 +3171,7 @@ if (!tty || gpm_tty != tty) return Qnil; /* Not activated on this terminal, nothing to do. */ - close_gpm (); + close_gpm (gpm_fd); return Qnil; } #endif /* HAVE_GPM */
--- a/src/termhooks.h Fri Mar 27 15:58:16 2009 +0000 +++ b/src/termhooks.h Fri Mar 27 16:14:23 2009 +0000 @@ -653,7 +653,7 @@ extern struct terminal *initial_terminal; #ifdef HAVE_GPM -extern void close_gpm (void); +extern void close_gpm (int gpm_fd); #endif /* arch-tag: 33a00ecc-52b5-4186-a410-8801ac9f087d