comparison src/keyboard.c @ 10907:1e9ffdb9980c

(read_char_minibuf_menu_prompt): orig_defn_macro is now Lisp_Object, not int. (init_perdisplay): Initialize some of the new members. (wipe_perdisplay): Free kbd_macro_buffer.

10906:7601ae23cf92

      if (NILP (this_command))
	{
	  /* nil means key is undefined.  */
	  bitch_at_user ();
	  defining_kbd_macro = 0;
	  update_mode_lines = 1;
	  clear_prefix_arg ();
	}
      else
	{

	}

    finalize:
      /* Install chars successfully executed in kbd macro.  */

      if (defining_kbd_macro && NILP (Vprefix_arg))
	finalize_kbd_macro_chars ();

#ifdef MULTI_PERDISPLAY
      if (!was_locked)
	unlock_display ();

    {
      int notfirst = 0;
      int i = nlength;
      Lisp_Object obj;
      int ch;
      int orig_defn_macro ;

      /* Loop over elements of map.  */
      while (i < width)
	{
	  Lisp_Object s, elt;

      /* Make believe its not a keyboard macro in case the help char 
	 is pressed.  Help characters are not recorded because menu prompting
	 is not used on replay.
	 */
      orig_defn_macro = defining_kbd_macro ;
      defining_kbd_macro = 0 ;
      do
	obj = read_char (commandflag, 0, 0, Qnil, 0);
      while (BUFFERP (obj));
      defining_kbd_macro = orig_defn_macro ;

      if (!INTEGERP (obj))
	return obj;
      else
	ch = XINT (obj);

      if (! EQ (obj, menu_prompt_more_char)
	  && (!INTEGERP (menu_prompt_more_char)
	      || ! EQ (obj, make_number (Ctl (XINT (menu_prompt_more_char))))))
	{
	  if ( defining_kbd_macro )
	    store_kbd_macro_char(obj) ;
	  return obj;
	}
      /* Help char - go round again */
    }
}

DEFUN ("discard-input", Fdiscard_input, Sdiscard_input, 0, 0, 0,
  "Discard the contents of the terminal input buffer.\n\
Also cancel any kbd macro being defined.")
  ()
{
  defining_kbd_macro = 0;
  update_mode_lines++;

  Vunread_command_events = Qnil;
  unread_command_char = -1;

  perd->prefix_partial = 0;
  perd->kbd_queue = Qnil;
  perd->immediate_echo = 0;
  perd->echoptr = perd->echobuf;
  perd->echo_after_prompt = -1;
}

/*
 * Destroy the contents of a perdisplay object, but not the object itself.
 * We use this just before deleteing it, or if we're going to initialize

 */
void
wipe_perdisplay (perd)
     PERDISPLAY *perd;
{
  /* Free anything that was malloc'd in init_perdisplay.  */
  /* Placeholder -- currently no action required.  */
}

init_keyboard ()
{
  /* This is correct before outermost invocation of the editor loop */

10907:1e9ffdb9980c

      if (NILP (this_command))
	{
	  /* nil means key is undefined.  */
	  bitch_at_user ();
	  current_perdisplay->defining_kbd_macro = Qnil;
	  update_mode_lines = 1;
	  clear_prefix_arg ();
	}
      else
	{

	}

    finalize:
      /* Install chars successfully executed in kbd macro.  */

      if (!NILP (current_perdisplay->defining_kbd_macro) && NILP (Vprefix_arg))
	finalize_kbd_macro_chars ();

#ifdef MULTI_PERDISPLAY
      if (!was_locked)
	unlock_display ();

    {
      int notfirst = 0;
      int i = nlength;
      Lisp_Object obj;
      int ch;
      Lisp_Object orig_defn_macro;

      /* Loop over elements of map.  */
      while (i < width)
	{
	  Lisp_Object s, elt;

      /* Make believe its not a keyboard macro in case the help char 
	 is pressed.  Help characters are not recorded because menu prompting
	 is not used on replay.
	 */
      orig_defn_macro = current_perdisplay->defining_kbd_macro;
      current_perdisplay->defining_kbd_macro = Qnil;
      do
	obj = read_char (commandflag, 0, 0, Qnil, 0);
      while (BUFFERP (obj));
      current_perdisplay->defining_kbd_macro = orig_defn_macro;

      if (!INTEGERP (obj))
	return obj;
      else
	ch = XINT (obj);

      if (! EQ (obj, menu_prompt_more_char)
	  && (!INTEGERP (menu_prompt_more_char)
	      || ! EQ (obj, make_number (Ctl (XINT (menu_prompt_more_char))))))
	{
	  if (!NILP (current_perdisplay->defining_kbd_macro))
	    store_kbd_macro_char (obj);
	  return obj;
	}
      /* Help char - go round again */
    }
}

DEFUN ("discard-input", Fdiscard_input, Sdiscard_input, 0, 0, 0,
  "Discard the contents of the terminal input buffer.\n\
Also cancel any kbd macro being defined.")
  ()
{
  current_perdisplay->defining_kbd_macro = Qnil;
  update_mode_lines++;

  Vunread_command_events = Qnil;
  unread_command_char = -1;

  perd->prefix_partial = 0;
  perd->kbd_queue = Qnil;
  perd->immediate_echo = 0;
  perd->echoptr = perd->echobuf;
  perd->echo_after_prompt = -1;
  perd->kbd_macro_buffer = 0;
  perd->kbd_macro_bufsize = 0;
  perd->defining_kbd_macro = Qnil;
}

/*
 * Destroy the contents of a perdisplay object, but not the object itself.
 * We use this just before deleteing it, or if we're going to initialize

 */
void
wipe_perdisplay (perd)
     PERDISPLAY *perd;
{
  if (perd->kbd_macro_buffer)
    xfree (perd->kbd_macro_buffer);
}

init_keyboard ()
{
  /* This is correct before outermost invocation of the editor loop */