Another GPM patch...

This supercedes the last one. I didn't have time this morning to reorganize the C code and write a lisp-level interface for gpm-minor-mode to make it more flexible, but you can now paste from other linux consoles into XEmacs. It's kind of a hack, since the paste code in the linux kernel writes directly to the console. If anyone can think of a better way to do it, please let me know. This is what I do right now: 1) Hook up a filedesc_input_stream to DEVICE_INFD() of the device. 2) Make the filedescriptor non-blocking. I really hate doing this, but there was no other way (that I could find) to make Lstream_read() correctly bail out after reading all the ioctl-inspired data. 3) call { char c = 3; ioctl(fd, TIOCLINUX, &c); } - this actually copies the pasted data into the virtual console's input buffer. 4) Read from the lstream until we stop getting data (<= 0 bytes read), and write the data to a resizing_buffer_stream. 5) flush the buffer stream and make a string out of it 6) kill the streams The reason I dislike #2 so much is that there is no set_descriptor_blocking() function call, but in my testing under linux, it has not proved fatal to leave the descriptor in non-blocking mode. There was also a patch needed to mouse.el - it would just call (yank) if you were not on a window system. I don't know how many other areas like this there are lying around. Unfortunately, I can't see an easy way to make the 'own_selection' method work with the ioctl's that linux provides right now. The ioctl requires the starting and ending positions on screen that you want to copy to the cut buffer, which is nothing like the current XEmacs selection model. With this latest patch, I can cut & paste from a virtual console to XEmacs, and can also select & paste from within emacs. The selection is a little weird, since you don't see the highlighting while the mouse is dragging, but the old GPM code behaved in the same way. The mouse-cursur flickering is still there as well. Anybody have a clue on how to make this better? I could provide a lisp-function to call GPM_DRAWPOINTER and push a magic eval even somewhere, but that seems kind of icky, and I don't think there are any ways to do this type of event mucking outside of event-Xt.c or event-unixoid.c - everything in there is static. I'm not sending this to xemacs-patches until a few more people can try it out. I'd love to get the flicker problem fixed sometime tonight, so if anybody has any ideas, lemme know. -Bill P. Index: lisp/mouse.el =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/lisp/mouse.el,v retrieving revision 1.19.2.6 diff -u -r1.19.2.6 mouse.el --- mouse.el 1999/09/02 08:47:55 1.19.2.6 +++ mouse.el 1999/11/05 15:03:12 ＠＠ -88,7 +88,9 ＠＠ the X cutbuffer. A mark is pushed, so that the inserted text lies between point and mark." (interactive) - (if (not (console-on-window-system-p)) + (if (and (not (console-on-window-system-p)) + (and (featurep 'gpm) + (not gpm-minor-mode))) (yank) (push-mark) (if (region-active-p) Index: src/console-tty.c =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/src/console-tty.c,v retrieving revision 1.18.2.5 diff -u -r1.18.2.5 console-tty.c --- console-tty.c 1999/10/24 03:48:31 1.18.2.5 +++ console-tty.c 1999/11/05 15:03:15 ＠＠ -38,9 +38,6 ＠＠ #ifdef FILE_CODING #include "file-coding.h" #endif -#ifdef HAVE_GPM -#include "gpmevent.h" -#endif DEFINE_CONSOLE_TYPE (tty); DECLARE_IMAGE_INSTANTIATOR_FORMAT (nothing); ＠＠ -129,10 +126,6 ＠＠ #endif /* MULE */ tty_con->terminal_type = terminal_type; tty_con->controlling_process = controlling_process; - -#ifdef HAVE_GPM - connect_to_gpm (con); -#endif if (NILP (CONSOLE_NAME (con))) CONSOLE_NAME (con) = Ffile_name_nondirectory (tty); Index: src/console-tty.h =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/src/console-tty.h,v retrieving revision 1.8.2.2 diff -u -r1.8.2.2 console-tty.h --- console-tty.h 1999/02/17 20:03:57 1.8.2.2 +++ console-tty.h 1999/11/05 15:03:15 ＠＠ -41,9 +41,6 ＠＠ struct tty_console { int infd, outfd; -#ifdef HAVE_GPM - int mouse_fd; -#endif Lisp_Object instream, outstream; Lisp_Object terminal_type; Lisp_Object controlling_process; ＠＠ -203,9 +200,6 ＠＠ unsigned int is_stdio :1; }; -#ifdef HAVE_GPM -#define CONSOLE_TTY_MOUSE_FD(c) (CONSOLE_TTY_DATA (c)->mouse_fd) -#endif #define CONSOLE_TTY_DATA(c) CONSOLE_TYPE_DATA (c, tty) #define CONSOLE_TTY_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->cursor_x) #define CONSOLE_TTY_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->cursor_y) Index: src/device-tty.c =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/src/device-tty.c,v retrieving revision 1.9 diff -u -r1.9 device-tty.c --- device-tty.c 1998/05/27 20:42:00 1.9 +++ device-tty.c 1999/11/05 15:03:15 ＠＠ -38,10 +38,6 ＠＠ #include "syssignal.h" /* for SIGWINCH */ -#ifdef HAVE_GPM -#include <gpm.h> -#endif - #include <errno.h> Lisp_Object Qinit_pre_tty_win, Qinit_post_tty_win; ＠＠ -155,15 +151,6 ＠＠ CONSOLE_TTY_DATA (con)->width = width; CONSOLE_TTY_DATA (con)->height = height; -#ifdef HAVE_GPM - /* We need to tell GPM how big our screen is now - ** I am pretty sure the GPM library will get incredibly confused - ** if you try to connect to more than one mouse-capable device, - ** so I don't think it will cause any more damage in that case. - */ - gpm_mx = width; - gpm_my = height; -#endif for (tail = DEVICE_FRAME_LIST (d); !NILP (tail); tail = XCDR (tail)) Index: src/emacs.c =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/src/emacs.c,v retrieving revision 1.82.2.32 diff -u -r1.82.2.32 emacs.c --- emacs.c 1999/11/02 02:41:45 1.82.2.32 +++ emacs.c 1999/11/05 15:03:23 ＠＠ -1088,6 +1088,10 ＠＠ syms_of_eldap (); #endif +#ifdef HAVE_GPM + syms_of_gpmevent (); +#endif + /* Now create the subtypes for the types that have them. We do this before the vars_*() because more symbols may get initialized here. */ ＠＠ -1481,6 +1485,10 ＠＠ #ifdef HAVE_LDAP vars_of_eldap (); +#endif + +#ifdef HAVE_GPM + vars_of_gpmevent (); #endif /* Now initialize any specifier variables. We do this later Index: src/event-Xt.c =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/src/event-Xt.c,v retrieving revision 1.41.2.14 diff -u -r1.41.2.14 event-Xt.c --- event-Xt.c 1999/10/10 11:45:15 1.41.2.14 +++ event-Xt.c 1999/11/05 15:03:30 ＠＠ -2034,9 +2034,6 ＠＠ { Lisp_Object console; int infd; -#ifdef HAVE_GPM - int mousefd; -#endif if (CONSOLE_X_P (con)) return; /* X consoles are automatically selected for when we ＠＠ -2044,22 +2041,6 ＠＠ infd = event_stream_unixoid_select_console (con); XSETCONSOLE (console, con); select_filedesc (infd, console); -#ifdef HAVE_GPM - /* On a stream device (ie: noninteractive), bad things can happen. */ - if (EQ (CONSOLE_TYPE (con), Qtty)) { - mousefd = CONSOLE_TTY_MOUSE_FD (con); - /* We check filedesc_to_what_closure[fd] here because if you run - ** XEmacs from a TTY, it will fire up GPM, select the mouse fd, then - ** if you run gnuattach to connect to another TTY, it will fire up - ** GPM again, and try to reselect the mouse fd. GPM uses the same - ** fd for every connection apparently, and select_filedesc will - ** fail its assertion if we try to select it twice. - */ - if ((mousefd >= 0) && !filedesc_to_what_closure[mousefd]) { - select_filedesc (mousefd, console); - } - } -#endif } static void ＠＠ -2067,9 +2048,6 ＠＠ { Lisp_Object console; int infd; -#ifdef HAVE_GPM - int mousefd; -#endif if (CONSOLE_X_P (con)) return; /* X consoles are automatically selected for when we ＠＠ -2077,15 +2055,6 ＠＠ infd = event_stream_unixoid_unselect_console (con); XSETCONSOLE (console, con); unselect_filedesc (infd); -#ifdef HAVE_GPM - /* On a stream device (ie: noninteractive), bad things can happen. */ - if (EQ (CONSOLE_TYPE (con), Qtty)) { - mousefd = CONSOLE_TTY_MOUSE_FD (con); - if (mousefd >= 0) { - unselect_filedesc (mousefd); - } - } -#endif } /* read an event from a tty, if one is available. Returns non-zero Index: src/event-unixoid.c =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/src/event-unixoid.c,v retrieving revision 1.9.2.1 diff -u -r1.9.2.1 event-unixoid.c --- event-unixoid.c 1999/03/07 15:25:17 1.9.2.1 +++ event-unixoid.c 1999/11/05 15:03:30 ＠＠ -41,10 +41,6 ＠＠ #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: ＠＠ -83,12 +79,6 ＠＠ Lisp_Object console; 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) Index: src/frame-tty.c =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/src/frame-tty.c,v retrieving revision 1.8.2.1 diff -u -r1.8.2.1 frame-tty.c --- frame-tty.c 1998/12/05 16:55:48 1.8.2.1 +++ frame-tty.c 1999/11/05 15:03:31 ＠＠ -33,10 +33,6 ＠＠ #include "events.h" -#ifdef HAVE_GPM -#include <gpm.h> -#endif -  /* Default properties to use when creating frames. */ Lisp_Object Vdefault_tty_frame_plist; ＠＠ -86,33 +82,6 ＠＠ call1 (Qinit_post_tty_win, FRAME_CONSOLE (f)); } -#ifdef HAVE_GPM -static int -tty_get_mouse_position (struct device *d, Lisp_Object *frame, int *x, int *y) -{ - Gpm_Event ev; - int num_buttons; - - num_buttons = Gpm_GetSnapshot(&ev); - *x = ev.x; - *y = ev.y; - *frame = DEVICE_SELECTED_FRAME (d); - return (1); -} - -static void -tty_set_mouse_position (struct window *w, int x, int y) -{ - /* XXX - I couldn't find any GPM functions that set the mouse position. - Mr. Perry had left this function empty; that must be why. - karlheg - */ -} - -#endif - - /* Change from withdrawn state to mapped state. */ static void tty_make_frame_visible (struct frame *f) ＠＠ -223,10 +192,6 ＠＠ CONSOLE_HAS_METHOD (tty, init_frame_1); CONSOLE_HAS_METHOD (tty, init_frame_3); CONSOLE_HAS_METHOD (tty, after_init_frame); -#ifdef HAVE_GPM - CONSOLE_HAS_METHOD (tty, get_mouse_position); - CONSOLE_HAS_METHOD (tty, set_mouse_position); -#endif CONSOLE_HAS_METHOD (tty, make_frame_visible); CONSOLE_HAS_METHOD (tty, make_frame_invisible); CONSOLE_HAS_METHOD (tty, frame_visible_p); Index: src/gpmevent.c =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/src/gpmevent.c,v retrieving revision 1.5 diff -u -r1.5 gpmevent.c --- gpmevent.c 1998/03/31 20:11:47 1.5 +++ gpmevent.c 1999/11/05 15:03:31 ＠＠ -1,5 +1,28 ＠＠ -/* William Perry 1997 */ +/* GPM functions + Copyright (C) 1997 William M. Perry <wmperry(a)gnu.org&gt; + Copyright (C) 1999 Free Software Foundation, Inc. + +This file is part of XEmacs. + +XEmacs is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2, or (at your option) any +later version. + +XEmacs is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with XEmacs; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ +/* Synched up with: Not in FSF. */ + +/* Authors: William Perry */ + #include <config.h> #include "lisp.h" #include "console.h" ＠＠ -8,11 +31,17 ＠＠ #include "events.h" #include "events-mod.h" #include "sysdep.h" +#include "commands.h" +#include "lstream.h" #ifdef HAVE_GPM #include "gpmevent.h" #include <gpm.h> +/* This is commented out in commands.h, I'm not sure why */ +extern Lisp_Object Vunread_command_events; +extern Lisp_Object Vunread_command_event; + #if (!defined(__linux__)) /* possible under xterm */ #define KG_SHIFT 0 #define KG_CTRL 2 ＠＠ -21,94 +50,383 ＠＠ #include <linux/keyboard.h> #endif -int -handle_gpm_read (struct Lisp_Event *event, struct console *con, int fd) +Lisp_Object Vgpm_minor_mode; + +DEFUN ("receive-gpm-event", Freceive_gpm_event, 0, 2, 0, /* +Run GPM_GetEvent(). +This function is the process handler for the GPM connection. +*/ + (ignore1, ignore2)) { - Gpm_Event ev; - int modifiers = 0; - int type = -1; - int button = 1; - - if (!Gpm_GetEvent(&ev)) - return 0; - - event->timestamp = 0; - event->channel = CONSOLE_SELECTED_FRAME (con); - - /* Whow, wouldn't named defines be NICE!?!?! */ - modifiers = 0; - - if (ev.modifiers & 1) modifiers |= MOD_SHIFT; - if (ev.modifiers & 2) modifiers |= MOD_META; - if (ev.modifiers & 4) modifiers |= MOD_CONTROL; - if (ev.modifiers & 8) modifiers |= MOD_META; - - if (ev.type & GPM_DOWN) - type = GPM_DOWN; - else if (ev.type & GPM_UP) - type = GPM_UP; - else if (ev.type & GPM_MOVE) { - type = GPM_MOVE; - GPM_DRAWPOINTER(&ev); - } + Gpm_Event ev; + int modifiers = 0; + int type = -1; + int button = 1; + Lisp_Object fake_event; + struct Lisp_Event *event = NULL; + struct gcpro gcpro1; + static int num_events; + + if (!Gpm_GetEvent(&ev)) + { + warn_when_safe (Qnil, Qcritical, "Gpm_GetEvent failed"); + return(Qzero); + } + + GCPRO1(fake_event); + + num_events++; + + fake_event = Fmake_event (Qnil, Qnil); + event = XEVENT(fake_event); + + event->timestamp = 0; + event->channel = Fselected_frame (Qnil); /* CONSOLE_SELECTED_FRAME (con); */ + + /* Whow, wouldn't named defines be NICE!?!?! */ + modifiers = 0; + + if (ev.modifiers & 1) modifiers |= MOD_SHIFT; + if (ev.modifiers & 2) modifiers |= MOD_META; + if (ev.modifiers & 4) modifiers |= MOD_CONTROL; + if (ev.modifiers & 8) modifiers |= MOD_META; + + if (ev.type & GPM_DOWN) + { + type = GPM_DOWN; + } + else if (ev.type & GPM_UP) + { + type = GPM_UP; + } + else if (ev.type & GPM_MOVE) + { + type = GPM_MOVE; + } + + if (ev.buttons & GPM_B_LEFT) + { + button = 1; + } + else if (ev.buttons & GPM_B_MIDDLE) + { + button = 2; + } + else if (ev.buttons & GPM_B_RIGHT) + { + button = 3; + } + + switch (type) { + case GPM_DOWN: + case GPM_UP: + event->event_type = + type == GPM_DOWN ? button_press_event : button_release_event; + event->event.button.x = ev.x; + event->event.button.y = ev.y; + event->event.button.button = button; + event->event.button.modifiers = modifiers; + break; + case GPM_MOVE: + event->event_type = pointer_motion_event; + event->event.motion.x = ev.x; + event->event.motion.y = ev.y; + event->event.motion.modifiers = modifiers; + default: + /* This will never happen */ + break; + } + + /* Handle the event */ + /* Let's try sticking it on the unread events queue */ + if (!command_event_p (fake_event)) + { + /* unread_command_events does not like motion events */ + Fdispatch_event (fake_event); + } + else if (NILP (Vunread_command_events)) + { + Vunread_command_events = Fcons (fake_event, Qnil); + } + else + { + Lisp_Object arg[2]; + arg[0] = Vunread_command_events; + arg[1] = fake_event; - if (ev.buttons & GPM_B_LEFT) - button = 1; - else if (ev.buttons & GPM_B_MIDDLE) - button = 2; - else if (ev.buttons & GPM_B_RIGHT) - button = 3; - - switch (type) { - case GPM_DOWN: - case GPM_UP: - event->event_type = - type == GPM_DOWN ? button_press_event : button_release_event; - event->event.button.x = ev.x; - event->event.button.y = ev.y; - event->event.button.button = button; - event->event.button.modifiers = modifiers; - break; - case GPM_MOVE: - event->event_type = pointer_motion_event; - event->event.motion.x = ev.x; - event->event.motion.y = ev.y; - event->event.motion.modifiers = modifiers; - default: - return 0; - } - return 1; + Vunread_command_events = Fappend (2,arg); + } + + GPM_DRAWPOINTER(&ev); + + UNGCPRO; + + return (Qzero); } -void -connect_to_gpm (struct console *con) +static void turn_off_gpm (void) { - /* Only do this if we are running after dumping and really interactive */ - if (!noninteractive && initialized) { - /* We really only want to do this on a TTY */ - CONSOLE_TTY_MOUSE_FD (con) = -1; - if (EQ (CONSOLE_TYPE (con), Qtty)) { - Gpm_Connect conn; - int rval; - - conn.eventMask = GPM_DOWN|GPM_UP|GPM_MOVE; - conn.defaultMask = GPM_MOVE; - conn.minMod = 0; - conn.maxMod = ((1<<KG_SHIFT)|(1<<KG_ALT)|(1<<KG_CTRL)); - - rval = Gpm_Open (&conn, 0); - switch (rval) { - case -1: /* General failure */ - break; - case -2: /* We are running under an XTerm */ + Fdelete_process (build_string ("gpm")); Gpm_Close(); - break; - default: - set_descriptor_non_blocking (gpm_fd); - CONSOLE_TTY_MOUSE_FD (con) = gpm_fd; - } - } + Vgpm_minor_mode = Qnil; + + /* Remove the TTY mouse methods */ + /* This is breaking abstraction a bit, but... */ + tty_console_methods->get_mouse_position_method = NULL; + tty_console_methods->set_mouse_position_method = NULL; + tty_console_methods->own_selection_method = NULL; + tty_console_methods->get_foreign_selection_method = NULL; +} + +#ifdef TIOCLINUX +static Lisp_Object +tty_get_foreign_selection (Lisp_Object selection_symbol, Lisp_Object target_type) +{ + /* This function can GC */ + struct device *d = decode_device (Qnil); + int fd = DEVICE_INFD (d); + char c = 3; + Lisp_Object output_stream; + Lisp_Object terminal_stream; + Lisp_Object output_string; + struct gcpro gcpro1,gcpro2,gcpro3; + + GCPRO3(output_stream,terminal_stream,output_string); + + /* The ioctl() to paste actually puts things in the input queue of + ** the virtual console, so we need to trap that data, since we are + ** supposed to return the actual string selection from this + ** function. + */ + + /* I really hate doing this, but it doesn't seem to cause any + ** problems, and it makes the Lstream_read stuff further down + ** error out correctly instead of trying to indefinitely read from + ** the console. + ** + ** There is no set_descriptor_blocking() function call, but in my + ** testing under linux, it has not proved fatal to leave the + ** descriptor in non-blocking mode. + ** + ** William Perry Nov 5, 1999 + */ + set_descriptor_non_blocking (fd); + + /* We need two streams, one for reading from the selected device, + ** and one to write the data into. There is no writable version + ** of the lisp-string lstream, so we make do with a resizing + ** buffer stream, and make a string out of it after we are + ** done. + */ + output_stream = make_resizing_buffer_output_stream (); + terminal_stream = make_filedesc_input_stream (fd, 0, -1, LSTR_BLOCKED_OK); + output_string = Qnil; + + /* We should arguably use a specbind() and an unwind routine here, + ** but I don't care that much right now. + ** ### FIXME? + */ + if (NILP (output_stream) || NILP (terminal_stream)) + { + /* Should we signal an error here? */ + goto out; + } + + if (ioctl (fd, TIOCLINUX, &c) < 0) + { + /* Could not get the selection - eek */ + UNGCPRO; + return (Qnil); + } + + while (1) + { + Bufbyte tempbuf[1024]; /* some random amount */ + int size_in_bytes = Lstream_read (XLSTREAM (terminal_stream), + tempbuf, sizeof (tempbuf)); + + if (size_in_bytes <= 0) + { + /* end of the stream */ + break; + } + + Lstream_write (XLSTREAM (output_stream), tempbuf, size_in_bytes); + } + + Lstream_flush (XLSTREAM (output_stream)); + + output_string = make_string (resizing_buffer_stream_ptr (XLSTREAM (output_stream)), + Lstream_byte_count (XLSTREAM (output_stream))); + + Lstream_delete (XLSTREAM (output_stream)); + Lstream_delete (XLSTREAM (terminal_stream)); + + out: + UNGCPRO; + return (output_string); +} + +static Lisp_Object +tty_selection_exists_p (Lisp_Object selection) +{ + return (Qt); +} +#endif /* TIOCLINUX */ + +#if 0 +static Lisp_Object +tty_own_selection (Lisp_Object selection_name, Lisp_Object selection_value) +{ + /* There is no way to do this cleanly - the GPM selection + ** 'protocol' (actually the TIOCLINUX ioctl) requires a start and + ** end position on the _screen_, not a string to stick in there. + ** Lame. + ** + ** William Perry Nov 4, 1999 */ +} +#endif + +/* This function appears to work once in a blue moon. I'm not sure +** exactly why either. *sigh* +** William Perry Nov 4, 1999 +*/ +static int +tty_get_mouse_position (struct device *d, Lisp_Object *frame, int *x, int *y) +{ + Gpm_Event ev; + int num_buttons; + + memset(&ev,'\0',sizeof(ev)); + num_buttons = Gpm_GetSnapshot(&ev); + + if (!num_buttons) + { + /* This means there are events pending... */ + return(-1); } + *x = ev.x; + *y = ev.y; + *frame = DEVICE_SELECTED_FRAME (d); + return (1); } +static void +tty_set_mouse_position (struct window *w, int x, int y) +{ + /* XXX + I couldn't find any GPM functions that set the mouse position. + Mr. Perry had left this function empty; that must be why. + karlheg + */ +} + +DEFUN ("gpm-minor-mode", Fgpm_minor_mode, 0, 1, 0, /* +Start accepting GPM mouse events iff ARG is positive. +*/ + (arg)) +{ + Gpm_Connect conn; + int rval; + Lisp_Object gpm_process; + Lisp_Object gpm_filter; + + if (NILP (arg)) + { + /* Toggle current GPM mode */ + if (!NILP (Vgpm_minor_mode)) + { + /* Need to turn it off */ + turn_off_gpm (); + return (Qnil); + } + } + else + { + int i; + + CHECK_INT (arg); + + i = XINT (arg); + + if (i < 0) + { + turn_off_gpm (); + return (Qnil); + } + } + + if (!NILP (Vgpm_minor_mode)) + { + error ("Already connected to GPM"); + } + + if (noninteractive) + { + error ("Can't connect to GPM in batch mode."); + } + + /* Install the mouse position methods for the TTY console type */ + CONSOLE_HAS_METHOD (tty, get_mouse_position); + CONSOLE_HAS_METHOD (tty, set_mouse_position); + +#ifdef TIOCLINUX + CONSOLE_HAS_METHOD (tty, get_foreign_selection); + CONSOLE_HAS_METHOD (tty, selection_exists_p); +#if 0 + CONSOLE_HAS_METHOD (tty, own_selection); #endif +#endif /* TIOCLINUX */ + + conn.eventMask = GPM_DOWN|GPM_UP|GPM_MOVE; + conn.defaultMask = GPM_MOVE; + conn.minMod = 0; + conn.maxMod = ((1<<KG_SHIFT)|(1<<KG_ALT)|(1<<KG_CTRL)); + + rval = Gpm_Open (&conn, 0); + + switch (rval) { + case -1: /* General failure */ + break; + case -2: /* We are running under an XTerm */ + Gpm_Close(); + break; + default: + set_descriptor_non_blocking (gpm_fd); + Vgpm_minor_mode = Qt; + gpm_process = connect_to_file_descriptor (build_string ("gpm"), Qnil, + make_int (gpm_fd), + make_int (gpm_fd)); + + if (!NILP (gpm_process)) + { + Fprocess_kill_without_query (gpm_process, Qnil); + XSETSUBR (gpm_filter, &SFreceive_gpm_event); + set_process_filter (gpm_process, gpm_filter, 1); + } + else + { + Gpm_Close(); + Vgpm_minor_mode = Qnil; + } + } + return(Vgpm_minor_mode); +} + +void vars_of_gpmevent (void) +{ + Fprovide (intern ("gpm")); + + DEFVAR_LISP ("gpm-minor-mode", &Vgpm_minor_mode /* +Non-nil when gpm-minor-mode is active. Call `gpm-mode' to toggle. +*/ ); + Vgpm_minor_mode = Qnil; +} + +void syms_of_gpmevent (void) +{ + DEFSUBR (Freceive_gpm_event); + DEFSUBR (Fgpm_minor_mode); +} + +#endif /* HAVE_GPM */ Index: src/gpmevent.h =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/src/gpmevent.h,v retrieving revision 1.3 diff -u -r1.3 gpmevent.h --- gpmevent.h 1998/03/31 20:11:47 1.3 +++ gpmevent.h 1999/11/05 15:03:31 ＠＠ -1,7 +0,0 ＠＠ -#ifndef _HAVE_GPM -#define _HAVE_GPM - -int handle_gpm_read (struct Lisp_Event *event, struct console *con, int fd); -void connect_to_gpm (struct console *con); - -#endif Index: src/symsinit.h =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/src/symsinit.h,v retrieving revision 1.31.2.13 diff -u -r1.31.2.13 symsinit.h --- symsinit.h 1999/10/30 03:00:51 1.31.2.13 +++ symsinit.h 1999/11/05 15:03:32 ＠＠ -148,6 +148,7 ＠＠ void syms_of_window (void); void syms_of_xselect (void); void syms_of_eldap (void); +void syms_of_gpmevent (void); /* Initialize the console types (dump-time but for reinit_). */ ＠＠ -368,6 +369,7 ＠＠ void vars_of_xselect (void); void reinit_vars_of_xselect (void); void vars_of_eldap (void); +void vars_of_gpmevent (void); /* Initialize specifier variables (dump-time only). */