emacs: src/keyboard.c comparison

comparison src/keyboard.c @ 80980:51a9e0fd18ae

(Qmouse_fixup_help_message) (make_lispy_movement, tracking_off, Ftrack_mouse, some_mouse_moved) (show_help_echo, readable_events, kbd_buffer_get_event, init_keyboard): Extend HAVE_MOUSE ifdefs to HAVE_GPM_H. (make_lispy_event): Add case GPM_CLICK_EVENT. (read_avail_input): Handle mouse input.

author	Nick Roberts <nickrob@snap.net.nz>
date	Sun, 20 May 2007 02:29:50 +0000
parents	da21c991a6d5
children	677a47b3c116

comparison

equal deleted inserted replaced

-:3d81d0b44577
+:51a9e0fd18ae
 Lisp_Object Qiconify_frame;
 Lisp_Object Qmake_frame_visible;
 Lisp_Object Qselect_window;
 Lisp_Object Qhelp_echo;
-#ifdef HAVE_MOUSE
+#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
 Lisp_Object Qmouse_fixup_help_message;
 #endif
 /* Symbols to denote kinds of events.  */
 Lisp_Object Qfunction_key;
 						Lisp_Object, int *));
 static Lisp_Object read_char_x_menu_prompt ();
 static Lisp_Object read_char_minibuf_menu_prompt P_ ((int, int,
 						      Lisp_Object *));
 static Lisp_Object make_lispy_event P_ ((struct input_event *));
-#ifdef HAVE_MOUSE
+#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
 static Lisp_Object make_lispy_movement P_ ((struct frame *, Lisp_Object,
 					    enum scroll_bar_part,
 					    Lisp_Object, Lisp_Object,
 					    unsigned long));
 #endif
 error ("No recursive edit is in progress");
 return Qnil;
 }
-#ifdef HAVE_MOUSE
+#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
 /* Restore mouse tracking enablement.  See Ftrack_mouse for the only use
 of this function.  */
 static Lisp_Object
 }
 return 0;
 }
-#endif	/* HAVE_MOUSE */
+#endif	/* HAVE_MOUSE || HAVE_GPM */
 /* This is the actual command reading loop,
 sans error-handling encapsulation.  */
 static int read_key_sequence P_ ((Lisp_Object *, int, Lisp_Object,
 if (!STRINGP (help))
 	return;
 }
-#ifdef HAVE_MOUSE
+#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
 if (!noninteractive && STRINGP (help))
 {
 /* The mouse-fixup-help-message Lisp function can call
 	 mouse_position_hook, which resets the mouse_moved flags.
 	 This causes trouble if we are trying to read a mouse motion
 }
 else
 	return 1;
 }
-#ifdef HAVE_MOUSE
+#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
 if (!(flags & READABLE_EVENTS_IGNORE_SQUEEZABLES)
 && !NILP (do_mouse_tracking) && some_mouse_moved ())
 return 1;
 #endif
 if (single_kboard)
 /* Wait until there is input available.  */
 for (;;)
 {
 if (kbd_fetch_ptr != kbd_store_ptr)
 	break;
-#ifdef HAVE_MOUSE
+#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
 if (!NILP (do_mouse_tracking) && some_mouse_moved ())
 	break;
 #endif
 /* If the quit flag is set, then read_char will return
 #ifdef SIGIO
 gobble_input (0);
 #endif /* SIGIO */
 if (kbd_fetch_ptr != kbd_store_ptr)
 	break;
-#ifdef HAVE_MOUSE
+#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
 if (!NILP (do_mouse_tracking) && some_mouse_moved ())
 	break;
 #endif
 if (end_time)
 	{
 	      clear_event (event);
 	      kbd_fetch_ptr = event + 1;
 	    }
 	}
 }
-#ifdef HAVE_MOUSE
+#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
 /* Try generating a mouse motion event.  */
 else if (!NILP (do_mouse_tracking) && some_mouse_moved ())
 {
 FRAME_PTR f = some_mouse_moved ();
 Lisp_Object bar_window;
 /* If we didn't decide to make a switch-frame event, go ahead and
 	 return a mouse-motion event.  */
 if (!NILP (x) && NILP (obj))
 	obj = make_lispy_movement (f, bar_window, part, x, y, time);
 }
-#endif	/* HAVE_MOUSE */
+#endif	/* HAVE_MOUSE || HAVE GPM */
 else
 /* We were promised by the above while loop that there was
 something for us to read!  */
 abort ();
 		      Fcons (Fvector (2, spec),
 			     Fcons (event->arg, Qnil)));
 }
 #endif
+case GPM_CLICK_EVENT:
+{
+	FRAME_PTR f = XFRAME (event->frame_or_window);
+	Lisp_Object head, position;
+	Lisp_Object *start_pos_ptr;
+	Lisp_Object start_pos;
+	int button = event->code;
+	if (button >= ASIZE (button_down_location))
+	  {
+	    button_down_location = larger_vector (button_down_location,
+						  button + 1, Qnil);
+	    mouse_syms = larger_vector (mouse_syms, button + 1, Qnil);
+	  }
+	start_pos_ptr = &AREF (button_down_location, button);
+	start_pos = *start_pos_ptr;
+	position = make_lispy_position (f, &event->x, &event->y,
+					    event->timestamp);
+	if (event->modifiers & down_modifier)
+	  *start_pos_ptr = Fcopy_alist (position);
+	else if (event->modifiers & (up_modifier | drag_modifier))
+	  {
+	    if (!CONSP (start_pos))
+	      return Qnil;
+	    event->modifiers &= ~up_modifier;
+	  }
+	head = modify_event_symbol (button,
+				    event->modifiers,
+				    Qmouse_click, Vlispy_mouse_stem,
+				    NULL,
+				    &mouse_syms,
+				    XVECTOR (mouse_syms)->size);
+	if (event->modifiers & drag_modifier)
+	  return Fcons (head,
+			Fcons (start_pos,
+			       Fcons (position,
+				      Qnil)));
+	else if (event->modifiers & double_modifier)
+	  return Fcons (head,
+			Fcons (position,
+			       Fcons (make_number (2),
+				      Qnil)));
+	else if (event->modifiers & triple_modifier)
+	  return Fcons (head,
+			Fcons (position,
+			       Fcons (make_number (3),
+				      Qnil)));
+	else
+	  return Fcons (head,
+			Fcons (position,
+			       Qnil));
+}
 /* The 'kind' field of the event is something we don't recognize.  */
 default:
 abort ();
 }
 }
 #ifdef MSDOS
 n_to_read = dos_keysns ();
 if (n_to_read == 0)
 	return 0;
 #else /* not MSDOS */
+#ifdef HAVE_GPM_H
+if (term_gpm)
+	{
+	  Gpm_Event event;
+	  struct input_event hold_quit;
+	  int gpm;
+	  EVENT_INIT (hold_quit);
+	  hold_quit.kind = NO_EVENT;
+	  while (gpm = Gpm_GetEvent (&event), gpm == 1) {
+	    nread += handle_one_term_event (&event, &hold_quit);
+	  }
+	  if (hold_quit.kind != NO_EVENT)
+	    kbd_buffer_store_event (&hold_quit);
+	  if (nread)
+	    return nread;
+	}
+#endif /* HAVE_GPM_H */
 #ifdef FIONREAD
-/* Find out how much input is available.  */
+/* Find out how much input is available.  */
 if (ioctl (input_fd, FIONREAD, &n_to_read) < 0)
 	/* Formerly simply reported no input, but that sometimes led to
 	   a failure of Emacs to terminate.
 	   SIGHUP seems appropriate if we can't reach the terminal.  */
 	/* ??? Is it really right to send the signal just to this process
 EMACS_SET_SECS_USECS (timer_idleness_start_time, -1, -1);
 total_keys = 0;
 recent_keys_index = 0;
 kbd_fetch_ptr = kbd_buffer;
 kbd_store_ptr = kbd_buffer;
-#ifdef HAVE_MOUSE
+#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
 do_mouse_tracking = Qnil;
 #endif
 input_pending = 0;
 interrupt_input_blocked = 0;
 interrupt_input_pending = 0;
 Qvertical_scroll_bar = intern ("vertical-scroll-bar");
 staticpro (&Qvertical_scroll_bar);
 Qmenu_bar = intern ("menu-bar");
 staticpro (&Qmenu_bar);
-#ifdef HAVE_MOUSE
+#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
 Qmouse_fixup_help_message = intern ("mouse-fixup-help-message");
 staticpro (&Qmouse_fixup_help_message);
 #endif
 Qabove_handle = intern ("above-handle");
 defsubr (&Scurrent_idle_time);
 defsubr (&Sevent_convert_list);
 defsubr (&Sread_key_sequence);
 defsubr (&Sread_key_sequence_vector);
 defsubr (&Srecursive_edit);
-#ifdef HAVE_MOUSE
+#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
 defsubr (&Strack_mouse);
 #endif
 defsubr (&Sinput_pending_p);
 defsubr (&Scommand_execute);
 defsubr (&Srecent_keys);

Mercurial > emacs

comparison src/keyboard.c @ 80980:51a9e0fd18ae