comparison src/keyboard.c @ 3452:3393f6e53d25

(read_key_sequence) [!USE_TEXT_PROPERTIES]: Fix typo. (menu_bar_items) [!USE_TEXT_PROPERTIES]: Likewise. (kbd_buffer_get_event): Shorten the first MULTI_FRAME conditional. (lispy_function_keys): Add `remove' key. (read_key_sequence): Take out previous change. If we changed buffers during read_char, go to replay_sequence.

3451:93757a9629cc

             a window system.  */
	  abort ();
#endif
	}

#ifdef MULTI_FRAME
      /* If this event is on a different frame, return a switch-frame this
	 time, and leave the event in the queue for next time.  */
      else
	{
	  Lisp_Object frame = event->frame_or_window;
	  Lisp_Object focus;

	  if (XTYPE (frame) == Lisp_Window)
	    frame = WINDOW_FRAME (XWINDOW (frame));

	  if (! EQ (frame, internal_last_event_frame)
	      && XFRAME (frame) != selected_frame)
	    obj = make_lispy_switch_frame (frame);
	  internal_last_event_frame = frame;

	  /* If we didn't decide to make a switch-frame event, go ahead
	     and build a real event from the queue entry.  */

	  if (NILP (obj))

	       = Qnil);

	      kbd_fetch_ptr = event + 1;
	    }
	}
#endif
    }
  else if (do_mouse_tracking && mouse_moved)
    {
      FRAME_PTR f;
      Lisp_Object bar_window;

   indexed by X Windows keysym values.  */
static char *lispy_function_keys[] =
  {
    /* X Keysym value */

    0, 0, 0, 0, 0, 0, 0, 0,	/* 0xff00 */
    "backspace",
    "tab",
    "linefeed",
    "clear",
    0,

    maps = (Lisp_Object *) alloca (nmaps * sizeof (maps[0]));
    bcopy (tmaps, maps, (nmaps - 2) * sizeof (maps[0]));
#ifdef USE_TEXT_PROPERTIES
    maps[nmaps-2] = get_local_map (PT, current_buffer);
#else
    maps[nmaps-2] = current_buffer->local_map;
#endif
    maps[nmaps-1] = global_map;
  }

  /* Look up in each map the dummy prefix key `menu-bar'.  */

     we will need to restore them if we replay a key sequence.  */
  if (INTERACTIVE)
    echo_start = echo_length ();
  keys_start = this_command_key_count;

  /* Read the first char of the sequence specially, before setting
     up any keymaps, in case a filter runs and switches buffers on us.  */
  first_event = read_char (!prompt, 0, submaps, last_nonmenu_event,
			   &junk);

  /* We jump here when the key sequence has been thoroughly changed, and
     we need to rescan it starting from the beginning.  When we jump here,
     keybuf[0..mock_input] holds the sequence we should reread.  */
 replay_sequence:

      }
    bcopy (maps, submaps, (nmaps - 2) * sizeof (submaps[0]));
#ifdef USE_TEXT_PROPERTIES
    submaps[nmaps-2] = get_local_map (PT, current_buffer);
#else
    submaps[nmaps-2] = current_buffer->local_map;
#endif
    submaps[nmaps-1] = global_map;
  }

  /* Find an accurate initial value for first_binding.  */

	}

      /* If not, we should actually read a character.  */
      else
	{
	  last_real_key_start = t;

	  if (! NILP (first_event))
	    {
	      key = first_event;
	      first_event = Qnil;
	    }
	  else
	    key = read_char (!prompt, nmaps, submaps, last_nonmenu_event,
			     &used_mouse_menu);

	  /* read_char returns -1 at the end of a macro.
	     Emacs 18 handles this by returning immediately with a
	     zero, so that's what we'll do.  */
	  if (XTYPE (key) == Lisp_Int && XINT (key) == -1)

			error ("key sequence too long");
		      keybuf[t] = posn;
		      keybuf[t+1] = key;
		      mock_input = t + 2;

		      goto replay_key;
		    }
		}
	      else if (EQ (kind, Qswitch_frame))
		{

		      keybuf[t+1] = key;
		      mock_input = t + 2;
		      goto replay_sequence;
		    }
		}
	    }
	}

      /* We have finally decided that KEY is something we might want
	 to look up.  */

3452:3393f6e53d25

             a window system.  */
	  abort ();
#endif
	}

      /* If this event is on a different frame, return a switch-frame this
	 time, and leave the event in the queue for next time.  */
      else
	{
#ifdef MULTI_FRAME
	  Lisp_Object frame = event->frame_or_window;
	  Lisp_Object focus;

	  if (XTYPE (frame) == Lisp_Window)
	    frame = WINDOW_FRAME (XWINDOW (frame));

	  if (! EQ (frame, internal_last_event_frame)
	      && XFRAME (frame) != selected_frame)
	    obj = make_lispy_switch_frame (frame);
	  internal_last_event_frame = frame;
#endif /* MULTI_FRAME */

	  /* If we didn't decide to make a switch-frame event, go ahead
	     and build a real event from the queue entry.  */

	  if (NILP (obj))

	       = Qnil);

	      kbd_fetch_ptr = event + 1;
	    }
	}
    }
  else if (do_mouse_tracking && mouse_moved)
    {
      FRAME_PTR f;
      Lisp_Object bar_window;

   indexed by X Windows keysym values.  */
static char *lispy_function_keys[] =
  {
    /* X Keysym value */

    "remove", 0, 0, 0, 0, 0, 0, 0,	/* 0xff00 */
    "backspace",
    "tab",
    "linefeed",
    "clear",
    0,

    maps = (Lisp_Object *) alloca (nmaps * sizeof (maps[0]));
    bcopy (tmaps, maps, (nmaps - 2) * sizeof (maps[0]));
#ifdef USE_TEXT_PROPERTIES
    maps[nmaps-2] = get_local_map (PT, current_buffer);
#else
    maps[nmaps-2] = current_buffer->keymap;
#endif
    maps[nmaps-1] = global_map;
  }

  /* Look up in each map the dummy prefix key `menu-bar'.  */

     we will need to restore them if we replay a key sequence.  */
  if (INTERACTIVE)
    echo_start = echo_length ();
  keys_start = this_command_key_count;

#if 0 /* This doesn't quite work, because some of the things
	 that read_char does cannot safely be bypassed.
	 It seems too risky to try to make this work right.  */ 
  /* Read the first char of the sequence specially, before setting
     up any keymaps, in case a filter runs and switches buffers on us.  */
  first_event = read_char (!prompt, 0, submaps, last_nonmenu_event,
			   &junk);
#endif

  /* We jump here when the key sequence has been thoroughly changed, and
     we need to rescan it starting from the beginning.  When we jump here,
     keybuf[0..mock_input] holds the sequence we should reread.  */
 replay_sequence:

      }
    bcopy (maps, submaps, (nmaps - 2) * sizeof (submaps[0]));
#ifdef USE_TEXT_PROPERTIES
    submaps[nmaps-2] = get_local_map (PT, current_buffer);
#else
    submaps[nmaps-2] = current_buffer->keymap;
#endif
    submaps[nmaps-1] = global_map;
  }

  /* Find an accurate initial value for first_binding.  */

	}

      /* If not, we should actually read a character.  */
      else
	{
	  struct buffer *buf = current_buffer;

	  last_real_key_start = t;

	  key = read_char (!prompt, nmaps, submaps, last_nonmenu_event,
			   &used_mouse_menu);

	  /* read_char returns -1 at the end of a macro.
	     Emacs 18 handles this by returning immediately with a
	     zero, so that's what we'll do.  */
	  if (XTYPE (key) == Lisp_Int && XINT (key) == -1)

			error ("key sequence too long");
		      keybuf[t] = posn;
		      keybuf[t+1] = key;
		      mock_input = t + 2;

		      /* If we switched buffers while reading the first event,
			 replay in case we switched keymaps too.  */
		      if (buf != current_buffer && t == 0)
			goto replay_sequence;
		      goto replay_key;
		    }
		}
	      else if (EQ (kind, Qswitch_frame))
		{

		      keybuf[t+1] = key;
		      mock_input = t + 2;
		      goto replay_sequence;
		    }
		}
	    }

	  /* If we switched buffers while reading the first event,
	     replay in case we switched keymaps too.  */
	  if (buf != current_buffer && t == 0)
	    {
	      keybuf[t++] = key;
	      mock_input = t;
	      goto replay_sequence;
	    }
	}

      /* We have finally decided that KEY is something we might want
	 to look up.  */