comparison src/keyboard.c @ 1239:52afa4976154

* keyboard.c (read_char): If we're returning an event from a macro, set Vlast_event_frame to Qmacro, instead of leaving it set to the frame of the previous real event. (read_key_sequence): If Vlast_event_frame isn't a frame, don't bother switching buffers. (syms_of_keyboard): Doc fix for Vlast_event_frame. (Vlast_event_frame): Doc fix. * keyboard.c (format_modifiers, reorder_modifiers): Handle the new modifier bits.

1238:407100cee78a

   Commands may set this, and the value set will be copied into last_command
   instead of the actual command.  */
Lisp_Object this_command;

#ifdef MULTI_FRAME
/* The frame in which the last input event occurred.
   command_loop_1 will select this frame before running the
   command bound to an event sequence, and read_key_sequence will
   toss the existing prefix if the user starts typing at a
   new frame.  */
Lisp_Object Vlast_event_frame;

	goto reread;
    }

  if (!NILP (Vexecuting_macro))
    {
      if (executing_macro_index >= Flength (Vexecuting_macro))
	{
	  XSET (c, Lisp_Int, -1);
	  return c;
	}

     int modifiers;
     char *buf;
{
  char *p = buf;

  if (modifiers & ctrl_modifier) { *p++ = 'C'; *p++ = '-'; }
  if (modifiers & meta_modifier) { *p++ = 'M'; *p++ = '-'; }
  if (modifiers & shift_modifier) { *p++ = 'S'; *p++ = '-'; }
  if (modifiers & up_modifier) { *p++ = 'U'; *p++ = '-'; }
  *p = '\0';

  return p - buf;
}


/* Given a symbol whose name begins with modifiers ("C-", "M-", etc),
   return a symbol with the modifiers placed in the canonical order.

   Fdefine_key calls this to make sure that (for example) C-M-foo
   and M-C-foo end up being equivalent in the keymap.  */

Lisp_Object

  /* Special case for things with only one modifier, which is
     (hopefully) the vast majority of cases.  */
  if (! (name->size >= 4 && name->data[1] == '-' && name->data[3] == '-'))
    return symbol;

  for (i = 0; i + 1 < name->size && name->data[i + 1] == '-'; i += 2)
    switch (name->data[i])
      {
      case 'M':
	not_canonical |= (modifiers & (meta_modifier|ctrl_modifier
				      |shift_modifier|up_modifier));
	modifiers |= meta_modifier;
	break;

      case 'C':
	not_canonical |= (modifiers &
			 (ctrl_modifier|shift_modifier|up_modifier));
	modifiers |= ctrl_modifier;
	break;

      case 'S':
	not_canonical |= (modifiers & (shift_modifier|up_modifier));
	modifiers |= shift_modifier;
	break;

      case 'U':
	not_canonical |= (modifiers & (up_modifier));
	modifiers |= up_modifier;
	break;

      default:
	goto no_more_modifiers;
      }

  /* The modifiers were out of order, so find a new symbol with the
     mods in order.  Since the symbol name could contain nulls, we can't
     use intern here; we have to use Fintern, which expects a genuine
     Lisp_String, and keeps a reference to it.  */
  {
    char *new_mods = (char *) alloca (sizeof ("C-M-S-U-"));
    int len = format_modifiers (modifiers, new_mods);
    Lisp_Object new_name = make_uninit_string (len + name->size - i);

    bcopy (new_mods, XSTRING (new_name)->data, len);
    bcopy (name->data + i, XSTRING (new_name)->data + len, name->size - i);

	  /* What buffer was this event typed/moused at?  */
	  if (used_mouse_menu)
	    /* Never change last_event_buffer for using a menu.  */
	    buf = last_event_buffer;
	  else if (XTYPE (key) == Lisp_Int || XTYPE (key) == Lisp_Symbol)
	    buf = (XBUFFER
		   (XWINDOW
		    (FRAME_SELECTED_WINDOW
		     (XFRAME (Vlast_event_frame)))->buffer));
	  else if (EVENT_HAS_PARAMETERS (key))
	    {
	      Lisp_Object window = EVENT_WINDOW (key);

	      if (NILP (window))

    "*Number of complete keys read from the keyboard so far.");
  num_input_keys = 0;

#ifdef MULTI_FRAME
  DEFVAR_LISP ("last-event-frame", &Vlast_event_frame,
    "*The frame in which the most recently read event occurred.");
  Vlast_event_frame = Qnil;
#endif

  DEFVAR_LISP ("help-char", &help_char,
    "Character to recognize as meaning Help.\n\

1239:52afa4976154

   Commands may set this, and the value set will be copied into last_command
   instead of the actual command.  */
Lisp_Object this_command;

#ifdef MULTI_FRAME
/* The frame in which the last input event occurred, or Qmacro if the
   last event came from a macro.
   command_loop_1 will select this frame before running the
   command bound to an event sequence, and read_key_sequence will
   toss the existing prefix if the user starts typing at a
   new frame.  */
Lisp_Object Vlast_event_frame;

	goto reread;
    }

  if (!NILP (Vexecuting_macro))
    {
      /* We set this to Qmacro; since that's not a frame, nobody will
	 try to switch frames on us, and the selected window will
	 remain unchanged.

         Since this event came from a macro, it would be misleading to
	 leave Vlast_event_frame set to whereever the last real event
	 came from.  Normally, command_loop_1 selects
	 Vlast_event_frame after each command is read, but events read
	 from a macro should never cause a new frame to be selected.  */
      Vlast_event_frame = Qmacro;

      if (executing_macro_index >= Flength (Vexecuting_macro))
	{
	  XSET (c, Lisp_Int, -1);
	  return c;
	}

     int modifiers;
     char *buf;
{
  char *p = buf;

  /* Events with the `up' modifier should always be turned into 
     click or drag events.  */
  if (modifiers & up_modifier)
    abort ();

  if (modifiers & alt_modifier)   { *p++ = 'A'; *p++ = '-'; }
  if (modifiers & ctrl_modifier)  { *p++ = 'C'; *p++ = '-'; }
  if (modifiers & hyper_modifier) { *p++ = 'H'; *p++ = '-'; }
  if (modifiers & meta_modifier)  { *p++ = 'M'; *p++ = '-'; }
  if (modifiers & shift_modifier) { *p++ = 'S'; *p++ = '-'; }
  if (modifiers & super_modifier) { strcpy (p, "super-"); p += 6; }
  if (modifiers & down_modifier)  { strcpy (p, "down-");  p += 5; }
  if (modifiers & drag_modifier)  { strcpy (p, "drag-");  p += 5; }
  *p = '\0';

  return p - buf;
}


/* Given a symbol whose name begins with modifiers ("C-", "M-", etc),
   return a symbol with the modifiers placed in the canonical order.
   Canonical order is alphabetical, except for down and drag, which
   always come last.

   Fdefine_key calls this to make sure that (for example) C-M-foo
   and M-C-foo end up being equivalent in the keymap.  */

Lisp_Object

  /* Special case for things with only one modifier, which is
     (hopefully) the vast majority of cases.  */
  if (! (name->size >= 4 && name->data[1] == '-' && name->data[3] == '-'))
    return symbol;

  for (i = 0; i+1 < name->data[i]; )
    switch (name->data[i])
      {
      case 'A':
	if (name->data[i] != '-') goto no_more_modifiers;
	not_canonical |= (modifiers & ~(alt_modifier - 1));
	modifiers |= alt_modifier;
	i += 2;
	break;

      case 'C':
	if (name->data[i] != '-') goto no_more_modifiers;
	not_canonical |= (modifiers & ~(ctrl_modifier - 1));
	modifiers |= ctrl_modifier;
	i += 2;
	break;

      case 'H':
	if (name->data[i] != '-') goto no_more_modifiers;
	not_canonical |= (modifiers & ~(hyper_modifier - 1));
	modifiers |= hyper_modifier;
	i += 2;
	break;

      case 'M':
	if (name->data[i] != '-') goto no_more_modifiers;
	not_canonical |= (modifiers & ~(meta_modifier - 1));
	modifiers |= meta_modifier;
	i += 2;
	break;

      case 'S':
	if (name->data[i] != '-') goto no_more_modifiers;
	not_canonical |= (modifiers & ~(shift_modifier - 1));
	modifiers |= shift_modifier;
	i += 2;
	break;

      case 's':
	if (i + 6 > name->size
	    || strncmp (name->data + i, "super-", 6))
	  goto no_more_modifiers;
	not_canonical |= (modifiers & ~(super_modifier - 1));
	modifiers |= super_modifier;
	i += 6;
	break;

      case 'd':
	if (i + 5 > name->size)
	  goto no_more_modifiers;
	if (! strncmp (name->data + i, "drag-", 5))
	  {
	    not_canonical |= (modifiers & ~(drag_modifier - 1));
	    modifiers |= drag_modifier;
	    i += 5;
	  }
	else if (! strncmp (name->data + i, "down-", 5))
	  {
	    not_canonical |= (modifiers & ~(down_modifier - 1));
	    modifiers |= down_modifier;
	    i += 5;
	  }
	else
	  goto no_more_modifiers;
	break;

      default:
	goto no_more_modifiers;
      }

  /* The modifiers were out of order, so find a new symbol with the
     mods in order.  Since the symbol name could contain nulls, we can't
     use intern here; we have to use Fintern, which expects a genuine
     Lisp_String, and keeps a reference to it.  */
  {
    char *new_mods = (char *) alloca (sizeof ("A-C-H-M-S-super-U-down-drag-"));
    int len = format_modifiers (modifiers, new_mods);
    Lisp_Object new_name = make_uninit_string (len + name->size - i);

    bcopy (new_mods, XSTRING (new_name)->data, len);
    bcopy (name->data + i, XSTRING (new_name)->data + len, name->size - i);

	  /* What buffer was this event typed/moused at?  */
	  if (used_mouse_menu)
	    /* Never change last_event_buffer for using a menu.  */
	    buf = last_event_buffer;
	  else if (XTYPE (key) == Lisp_Int || XTYPE (key) == Lisp_Symbol)
	    {
	      buf = ((XTYPE (Vlast_event_frame) == Lisp_Frame)
		     ? (XBUFFER
			(XWINDOW
			 (FRAME_SELECTED_WINDOW
			  (XFRAME (Vlast_event_frame)))->buffer))
		     : last_event_buffer);
	    }
	  else if (EVENT_HAS_PARAMETERS (key))
	    {
	      Lisp_Object window = EVENT_WINDOW (key);

	      if (NILP (window))

    "*Number of complete keys read from the keyboard so far.");
  num_input_keys = 0;

#ifdef MULTI_FRAME
  DEFVAR_LISP ("last-event-frame", &Vlast_event_frame,
    "*The frame in which the most recently read event occurred.\n\
If the last event came from a keyboard macro, this is set to `macro'.");
  Vlast_event_frame = Qnil;
#endif

  DEFVAR_LISP ("help-char", &help_char,
    "Character to recognize as meaning Help.\n\