comparison src/keyboard.c @ 83179:3864ee1088e9

Merged in changes from CVS trunk. Patches applied: * [e-mail]--2004/emacs--hacks--0--patch-2 Prevent special events from appending dashes to the echo string. * [e-mail]--2004/emacs--hacks--0--patch-4 Added ChangeLog entry. * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-454 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-455 Bash the dashes * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-456 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-457 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-458 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-459 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-460 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-219

83178:a79c4db19c4f

  /* Do nothing if we just printed a prompt.  */
  if (current_kboard->echo_after_prompt
      == SCHARS (current_kboard->echo_string))
    return;

  /* Put a dash at the end of the buffer temporarily,
     but make it go away when the next character is added.  */
  current_kboard->echo_string = concat2 (current_kboard->echo_string,
					 build_string ("-"));
  echo_now ();

void
single_kboard_state ()
{
#ifdef MULTI_KBOARD
  single_kboard = 1;
#endif
}

/* Maintain a stack of kboards, so other parts of Emacs
   can switch temporarily to the kboard of a given frame

void
stuff_buffered_input (stuffstring)
     Lisp_Object stuffstring;
{
/* stuff_char works only in BSD, versions 4.2 and up.  */
#ifdef BSD_SYSTEM
#ifndef BSD4_1
  register unsigned char *p;

  if (STRINGP (stuffstring))
    {
      register int count;

      stuff_char ('\n');
    }

  /* Anything we have read ahead, put back for the shell to read.  */
  /* ?? What should this do when we have multiple keyboards??
     Should we ignore anything that was typed in at the "wrong" kboard?  */
  for (; kbd_fetch_ptr != kbd_store_ptr; kbd_fetch_ptr++)
    {

      if (kbd_fetch_ptr == kbd_buffer + KBD_BUFFER_SIZE)
	kbd_fetch_ptr = kbd_buffer;

      clear_event (kbd_fetch_ptr);
    }

  input_pending = 0;
#endif
#endif /* BSD_SYSTEM and not BSD4_1 */
}

void
set_waiting_for_input (time_to_clear)
     EMACS_TIME *time_to_clear;

83179:3864ee1088e9

  /* Do nothing if we just printed a prompt.  */
  if (current_kboard->echo_after_prompt
      == SCHARS (current_kboard->echo_string))
    return;

  /* Do nothing if we have already put a dash at the end.  */
  if (SCHARS (current_kboard->echo_string) > 1)
    {
	  Lisp_Object last_char, prev_char, idx;

	  idx = make_number (SCHARS (current_kboard->echo_string) - 2);
	  prev_char = Faref (current_kboard->echo_string, idx);

	  idx = make_number (SCHARS (current_kboard->echo_string) - 1);
	  last_char = Faref (current_kboard->echo_string, idx);

	  if (XINT (last_char) == '-' && XINT (prev_char) != ' ')
	    return;
    }

  /* Put a dash at the end of the buffer temporarily,
     but make it go away when the next character is added.  */
  current_kboard->echo_string = concat2 (current_kboard->echo_string,
					 build_string ("-"));
  echo_now ();

void
single_kboard_state ()
{
#ifdef MULTI_KBOARD
  single_kboard = 1;
#endif
}

/* If we're in single_kboard state for kboard KBOARD,
   get out of it.  */

void
not_single_kboard_state (kboard)
     KBOARD *kboard;
{
#ifdef MULTI_KBOARD
  if (kboard == current_kboard)
    single_kboard = 0;
#endif
}

/* Maintain a stack of kboards, so other parts of Emacs
   can switch temporarily to the kboard of a given frame

void
stuff_buffered_input (stuffstring)
     Lisp_Object stuffstring;
{
#ifdef SIGTSTP  /* stuff_char is defined if SIGTSTP.  */
  register unsigned char *p;

  if (STRINGP (stuffstring))
    {
      register int count;

      stuff_char ('\n');
    }

  /* Anything we have read ahead, put back for the shell to read.  */
  /* ?? What should this do when we have multiple keyboards??
     Should we ignore anything that was typed in at the "wrong" kboard?

     rms: we should stuff everything back into the kboard
     it came from.  */
  for (; kbd_fetch_ptr != kbd_store_ptr; kbd_fetch_ptr++)
    {

      if (kbd_fetch_ptr == kbd_buffer + KBD_BUFFER_SIZE)
	kbd_fetch_ptr = kbd_buffer;

      clear_event (kbd_fetch_ptr);
    }

  input_pending = 0;
#endif /* SIGTSTP */
}

void
set_waiting_for_input (time_to_clear)
     EMACS_TIME *time_to_clear;