comparison src/keyboard.c @ 10945:dbf1aab47502

(unlock_display): If adding to kbd_queue, set kbd_queue_has_data. (read_char): Set and clear kbd_queue_has_data appropriately, but leave it unset when we push back an incomplete sequence. (read_char): Take the longjmp even if current_perdisplay was null. (readable_events): Check kbd_queue_has_data instead of kbd_queue. (init_perdisplay): Initialize kbd_queue_has_data.

10944:ade108508c1e

#ifdef MULTI_PERDISPLAY
static void
unlock_display ()
{
  if (CONSP (Vunread_command_events))
    current_perdisplay->kbd_queue
      = nconc2 (Vunread_command_events, current_perdisplay->kbd_queue);
  Vunread_command_events = Qnil;
  current_perdisplay = 0;
  display_locked = 0;
}
#endif

    {
      PERDISPLAY *perd;
      /* Check for something on one of the side queues.  Give priority to
	 the current display, but if we're not locked, then check the other
	 displays as well.  */
      if (current_perdisplay && CONSP (current_perdisplay->kbd_queue))
	perd = current_perdisplay;
      else if (!display_locked)
	{
	  for (perd = all_perdisplays; perd; perd = perd->next_perdisplay)
	    if (CONSP (perd->kbd_queue))
	      break;
	}
      else
	perd = 0;

	 Otherwise, read from the main queue, and if that gives us
	 something we can't use yet, put it on the side queue and
	 try again.  */
      if (perd)
	{
	  c = XCONS (perd->kbd_queue)->car;
	  perd->kbd_queue = XCONS (perd->kbd_queue)->cdr;
	  input_pending = readable_events ();
#ifdef MULTI_FRAME
	  if (EVENT_HAS_PARAMETERS (c)
	      && EQ (EVENT_HEAD_KIND (EVENT_HEAD (c)), Qswitch_frame))
	    internal_last_event_frame = XCONS (XCONS (c)->cdr)->car;

	      while (CONSP (*tailp))
		tailp = &XCONS (*tailp)->cdr;
	      if (!NILP (*tailp))
		abort ();
	      *tailp = Fcons (c, Qnil);
	      goto wrong_display;
	    }
	}
#ifdef MULTI_PERDISPLAY
      if (!current_perdisplay)
	current_perdisplay = perd;
      if (perd != current_perdisplay)
	{
	  /* We shouldn't get here if we were locked onto one display!  */
	  if (display_locked)
	    abort ();
	  perd->kbd_queue = Fcons (c, perd->kbd_queue);
	  current_perdisplay = perd;
	  longjmp (wrong_display_jmpbuf, 1);
	}
#endif
    }

  if (FRAMEP (do_mouse_tracking) && mouse_moved)
    return 1;
#endif
  if (display_locked)
    {
      if (CONSP (current_perdisplay->kbd_queue))
	return 1;
    }
  else
    {
      PERDISPLAY *perd;
      for (perd = all_perdisplays; perd; perd = perd->next_perdisplay)
	if (CONSP (perd->kbd_queue))
	  return 1;
    }
  return 0;
}

  perd->prefix_factor = Qnil;
  perd->prefix_value = Qnil;
  perd->prefix_sign = 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;

10945:dbf1aab47502

#ifdef MULTI_PERDISPLAY
static void
unlock_display ()
{
  if (CONSP (Vunread_command_events))
    {
      current_perdisplay->kbd_queue
	= nconc2 (Vunread_command_events, current_perdisplay->kbd_queue);
      current_perdisplay->kbd_queue_has_data = 1;
    }
  Vunread_command_events = Qnil;
  current_perdisplay = 0;
  display_locked = 0;
}
#endif

    {
      PERDISPLAY *perd;
      /* Check for something on one of the side queues.  Give priority to
	 the current display, but if we're not locked, then check the other
	 displays as well.  */
      if (current_perdisplay && current_perdisplay->kbd_queue_has_data)
	perd = current_perdisplay;
      else if (!display_locked)
	{
	  for (perd = all_perdisplays; perd; perd = perd->next_perdisplay)
	    if (perd->kbd_queue_has_data)
	      break;
	}
      else
	perd = 0;

	 Otherwise, read from the main queue, and if that gives us
	 something we can't use yet, put it on the side queue and
	 try again.  */
      if (perd)
	{
	  if (!CONSP (perd->kbd_queue))
	    abort ();
	  c = XCONS (perd->kbd_queue)->car;
	  perd->kbd_queue = XCONS (perd->kbd_queue)->cdr;
	  if (NILP (perd->kbd_queue))
	    perd->kbd_queue_has_data = 0;
	  input_pending = readable_events ();
#ifdef MULTI_FRAME
	  if (EVENT_HAS_PARAMETERS (c)
	      && EQ (EVENT_HEAD_KIND (EVENT_HEAD (c)), Qswitch_frame))
	    internal_last_event_frame = XCONS (XCONS (c)->cdr)->car;

	      while (CONSP (*tailp))
		tailp = &XCONS (*tailp)->cdr;
	      if (!NILP (*tailp))
		abort ();
	      *tailp = Fcons (c, Qnil);
	      perd->kbd_queue_has_data = 1;
	      goto wrong_display;
	    }
	}
#ifdef MULTI_PERDISPLAY
      if (perd != current_perdisplay)
	{
	  /* We shouldn't get here if we were locked onto one display!  */
	  if (display_locked)
	    abort ();
	  perd->kbd_queue = Fcons (c, perd->kbd_queue);
	  perd->kbd_queue_has_data = 1;
	  current_perdisplay = perd;
	  longjmp (wrong_display_jmpbuf, 1);
	}
#endif
    }

  if (FRAMEP (do_mouse_tracking) && mouse_moved)
    return 1;
#endif
  if (display_locked)
    {
      if (current_perdisplay->kbd_queue_has_data)
	return 1;
    }
  else
    {
      PERDISPLAY *perd;
      for (perd = all_perdisplays; perd; perd = perd->next_perdisplay)
	if (perd->kbd_queue_has_data)
	  return 1;
    }
  return 0;
}

  perd->prefix_factor = Qnil;
  perd->prefix_value = Qnil;
  perd->prefix_sign = 1;
  perd->prefix_partial = 0;
  perd->kbd_queue = Qnil;
  perd->kbd_queue_has_data = 0;
  perd->immediate_echo = 0;
  perd->echoptr = perd->echobuf;
  perd->echo_after_prompt = -1;
  perd->kbd_macro_buffer = 0;
  perd->kbd_macro_bufsize = 0;