This commit was generated by cvs2svn to compensate for changes in r1705,

[chise/xemacs-chise.git.1] / src / frame-tty.c

diff --git a/src/frame-tty.c b/src/frame-tty.c
index 24438e7..d96d844 100644 (file)
--- a/src/frame-tty.c
+++ b/src/frame-tty.c
@@ -33,10 +33,6 @@ Boston, MA 02111-1307, USA.  */
 
 #include "events.h"
 
-#ifdef HAVE_GPM
-#include <gpm.h>
-#endif
-
 \f
 /* Default properties to use when creating frames.  */
 Lisp_Object Vdefault_tty_frame_plist;
@@ -86,33 +82,6 @@ tty_after_init_frame (struct frame *f, int first_on_device,
     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)
@@ -155,13 +124,10 @@ tty_frame_visible_p (struct frame *f)
 static void
 tty_raise_frame_no_select (struct frame *f)
 {
-  struct frame *o;
-  Lisp_Object tail;
-
-  LIST_LOOP (tail, DEVICE_FRAME_LIST (XDEVICE (FRAME_DEVICE (f))))
+  LIST_LOOP_2 (frame, DEVICE_FRAME_LIST (XDEVICE (FRAME_DEVICE (f))))
     {
-      o = XFRAME (XCAR (tail));
-      if (o != f && FRAME_REPAINT_P(o))
+      struct frame *o = XFRAME (frame);
+      if (o != f && FRAME_REPAINT_P (o))
        {
           tty_make_frame_hidden (o);
           break;
@@ -216,7 +182,7 @@ tty_delete_frame (struct frame *f)
 }
 \f
 /************************************************************************/
-/*                            initialization                            */
+/*                           initialization                            */
 /************************************************************************/
 
 void
@@ -225,10 +191,6 @@ console_type_create_frame_tty (void)
   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);