comparison src/keyboard.c @ 40736:d6395595f8ac

(read_char): Use Fcar and Fcdr, not Fnth. (record_char): Likewise. (make_lispy_event): Don't insist a drag event must move to a different buffer position. Instead, check for moving at least double_click_fuzz.

40735:d3065bec433f

  /* Display help if not echoing.  */
  if (CONSP (c) && EQ (XCAR (c), Qhelp_echo))
    {
      /* (help-echo FRAME HELP WINDOW OBJECT POS).  */
      Lisp_Object help, object, position, window;
      help = Fnth (make_number (2), c);
      window = Fnth (make_number (3), c);
      object = Fnth (make_number (4), c);
      position = Fnth (make_number (5), c);
      show_help_echo (help, window, object, position, 0);

      /* We stopped being idle for this event; undo that.  */
      timer_idleness_start_time = last_idle_start;
      goto retry;

     event.  */
  if (CONSP (c) && EQ (XCAR (c), Qhelp_echo))
    {
      Lisp_Object help;

      help = Fnth (make_number (2), c);
      if (STRINGP (help))
	{
	  int last_idx;
	  Lisp_Object last_c, last_help;
	  

	    last_idx = NUM_RECENT_KEYS - 1;
	  last_c = AREF (recent_keys, last_idx);
	  
	  if (!CONSP (last_c)
	      || !EQ (XCAR (last_c), Qhelp_echo)
	      || (last_help = Fnth (make_number (2), last_c),
		  !EQ (last_help, help)))
	    {
	      total_keys++;
	      ASET (recent_keys, recent_keys_index, c);
	      if (++recent_keys_index >= NUM_RECENT_KEYS)

	    if (!CONSP (start_pos))
	      event->modifiers |= click_modifier;
	    else
#endif
	      {
		/* The third element of every position should be the (x,y)
		   pair.  */
		Lisp_Object down;

		down = Fnth (make_number (2), start_pos);
		if (EQ (event->x, XCAR (down)) && EQ (event->y, XCDR (down)))
		  /* Mouse hasn't moved.  */
		  event->modifiers |= click_modifier;
		else
		  {
		    Lisp_Object window1, window2, posn1, posn2;

		    /* Avoid generating a drag event if the mouse
		       hasn't actually moved off the buffer position.  */
		    window1 = Fnth (make_number (0), position);
		    posn1 = Fnth (make_number (1), position);
		    window2 = Fnth (make_number (0), start_pos);
		    posn2 = Fnth (make_number (1), start_pos);

		    if (EQ (window1, window2) && EQ (posn1, posn2))
		      event->modifiers |= click_modifier;
		    else
		      {
			button_down_time = 0;
			event->modifiers |= drag_modifier;
		      }
		  }
		
		/* Don't check is_double; treat this as multiple
		   if the down-event was multiple.  */
		if (double_click_count > 1)

40736:d6395595f8ac

  /* Display help if not echoing.  */
  if (CONSP (c) && EQ (XCAR (c), Qhelp_echo))
    {
      /* (help-echo FRAME HELP WINDOW OBJECT POS).  */
      Lisp_Object help, object, position, window, tem;

      tem = Fcdr (XCDR (c));
      help = Fcar (tem);
      tem = Fcdr (tem);
      window = Fcar (tem);
      tem = Fcdr (tem);
      object = Fcar (tem);
      tem = Fcdr (tem);
      position = Fcar (tem);

      show_help_echo (help, window, object, position, 0);

      /* We stopped being idle for this event; undo that.  */
      timer_idleness_start_time = last_idle_start;
      goto retry;

     event.  */
  if (CONSP (c) && EQ (XCAR (c), Qhelp_echo))
    {
      Lisp_Object help;

      help = Fcar (Fcdr (XCDR (c)));
      if (STRINGP (help))
	{
	  int last_idx;
	  Lisp_Object last_c, last_help;
	  

	    last_idx = NUM_RECENT_KEYS - 1;
	  last_c = AREF (recent_keys, last_idx);
	  
	  if (!CONSP (last_c)
	      || !EQ (XCAR (last_c), Qhelp_echo)
	      || (last_help = Fcar (Fcdr (XCDR (last_c))),
		  !EQ (last_help, help)))
	    {
	      total_keys++;
	      ASET (recent_keys, recent_keys_index, c);
	      if (++recent_keys_index >= NUM_RECENT_KEYS)

	    if (!CONSP (start_pos))
	      event->modifiers |= click_modifier;
	    else
#endif
	      {
		Lisp_Object down;
		EMACS_INT xdiff = double_click_fuzz, ydiff = double_click_fuzz;

		/* The third element of every position
		   should be the (x,y) pair.  */
		down = Fcar (Fcdr (Fcdr (start_pos)));
		if (CONSP (down))
		  {
		    xdiff = event->x - XCAR (down);
		    ydiff = event->y - XCDR (down);
		  }

		if (xdiff < double_click_fuzz && xdiff > - double_click_fuzz
		    && ydiff < double_click_fuzz
		    && ydiff > - double_click_fuzz)
		  /* Mouse hasn't moved (much).  */
		  event->modifiers |= click_modifier;
		else
		  {
		    button_down_time = 0;
		    event->modifiers |= drag_modifier;
		  }
		
		/* Don't check is_double; treat this as multiple
		   if the down-event was multiple.  */
		if (double_click_count > 1)