X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fevent-unixoid.c;h=0dc49eaea2e15eda74ef6785faabc53e156baacf;hb=c84990d1037000e9487a437491a853975b356e5a;hp=072ac61a0779123e0bbf4eba018b9fd470abea39;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git.1

diff --git a/src/event-unixoid.c b/src/event-unixoid.c
index 072ac61..0dc49ea 100644
--- 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"
 
-#ifdef HAVE_GPM
-#include "gpmevent.h"
-#endif
-
 /* Mask of bits indicating the descriptors that we wait for input on.
    These work as follows:
 
@@ -75,7 +71,7 @@ int signal_event_pipe_initialized;
 int fake_event_occurred;
 
 int
-read_event_from_tty_or_stream_desc (struct Lisp_Event *event,
+read_event_from_tty_or_stream_desc (Lisp_Event *event,
 				    struct console *con, int fd)
 {
   unsigned char ch;
@@ -84,12 +80,6 @@ read_event_from_tty_or_stream_desc (struct Lisp_Event *event,
 
   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)
     {
@@ -147,7 +137,7 @@ event_stream_unixoid_select_console (struct console *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));
@@ -168,7 +158,7 @@ event_stream_unixoid_unselect_console (struct console *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));
@@ -184,7 +174,7 @@ event_stream_unixoid_unselect_console (struct console *con)
 }
 
 static int
-get_process_infd (struct Lisp_Process *p)
+get_process_infd (Lisp_Process *p)
 {
   Lisp_Object instr, outstr;
   get_process_streams (p, &instr, &outstr);
@@ -193,7 +183,7 @@ get_process_infd (struct Lisp_Process *p)
 }
 
 int
-event_stream_unixoid_select_process (struct Lisp_Process *proc)
+event_stream_unixoid_select_process (Lisp_Process *proc)
 {
   int infd = get_process_infd (proc);
 
@@ -204,7 +194,7 @@ event_stream_unixoid_select_process (struct Lisp_Process *proc)
 }
 
 int
-event_stream_unixoid_unselect_process (struct Lisp_Process *proc)
+event_stream_unixoid_unselect_process (Lisp_Process *proc)
 {
   int infd = get_process_infd (proc);
 
@@ -233,9 +223,9 @@ poll_fds_for_input (SELECT_TYPE mask)
 	return retval;
       if (errno != EINTR)
 	{
-	  /* Something went seriously wrong; don't abort since maybe
+	  /* Something went seriously wrong; don't ABORT since maybe
 	     the TTY just died at the wrong time. */
-	  fprintf (stderr, "xemacs: select failed: errno = %d\n", errno);
+	  stderr_out ("xemacs: select failed: errno = %d\n", errno);
 	  return 0;
 	}
       /* else, we got interrupted by a signal, so try again. */