projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync with r21-2-26.
[chise/xemacs-chise.git-]
/
src
/
event-unixoid.c
diff --git
a/src/event-unixoid.c
b/src/event-unixoid.c
index
072ac61
..
9033ebf
100644
(file)
--- a/
src/event-unixoid.c
+++ b/
src/event-unixoid.c
@@
-41,10
+41,6
@@
Boston, MA 02111-1307, USA. */
#include "sysproc.h" /* select stuff */
#include "systime.h"
#include "sysproc.h" /* select stuff */
#include "systime.h"
-#ifdef HAVE_GPM
-#include "gpmevent.h"
-#endif
-
/* Mask of bits indicating the descriptors that we wait for input on.
These work as follows:
/* Mask of bits indicating the descriptors that we wait for input on.
These work as follows:
@@
-84,12
+80,6
@@
read_event_from_tty_or_stream_desc (struct Lisp_Event *event,
XSETCONSOLE (console, con);
XSETCONSOLE (console, con);
-#ifdef HAVE_GPM
- if (fd == CONSOLE_TTY_MOUSE_FD (con)) {
- return handle_gpm_read (event,con,fd);
- }
-#endif
-
nread = read (fd, &ch, 1);
if (nread <= 0)
{
nread = read (fd, &ch, 1);
if (nread <= 0)
{
@@
-147,7
+137,7
@@
event_stream_unixoid_select_console (struct console *con)
int infd;
if (CONSOLE_STREAM_P (con))
int infd;
if (CONSOLE_STREAM_P (con))
- infd = fileno (CONSOLE_STREAM_DATA (con)->infd);
+ infd = fileno (CONSOLE_STREAM_DATA (con)->in);
else
{
assert (CONSOLE_TTY_P (con));
else
{
assert (CONSOLE_TTY_P (con));
@@
-168,7
+158,7
@@
event_stream_unixoid_unselect_console (struct console *con)
int infd;
if (CONSOLE_STREAM_P (con))
int infd;
if (CONSOLE_STREAM_P (con))
- infd = fileno (CONSOLE_STREAM_DATA (con)->infd);
+ infd = fileno (CONSOLE_STREAM_DATA (con)->in);
else
{
assert (CONSOLE_TTY_P (con));
else
{
assert (CONSOLE_TTY_P (con));