comparison src/keyboard.c @ 38195:7255d1f70b82

(read_char) <non_reread>: Record the previous idle start time before calling timer_stop_idle. (read_char) <reread_first>: After processing a help-echo event, restore the previous idle start time.

38194:a23820c19d03

Lisp_Object Vdisable_point_adjustment;

/* If non-nil, always disable point adjustment.  */

Lisp_Object Vglobal_disable_point_adjustment;


/* Global variable declarations.  */

/* Function for init_keyboard to call with no args (if nonzero).  */

  Lisp_Object tem, save;
  volatile Lisp_Object previous_echo_area_message;
  volatile Lisp_Object also_record;
  volatile int reread;
  struct gcpro gcpro1, gcpro2;

  also_record = Qnil;

  before_command_key_count = this_command_key_count;
  before_command_echo_length = echo_length ();

      XSETINT (c, XINT (c) | (extra_keyboard_modifiers & ~0xff7f & ~CHAR_CTL));
    }

 non_reread:

  timer_stop_idle ();
  start_polling ();

  if (NILP (c))
    {

      help = Fnth (make_number (2), c);
      window = Fnth (make_number (3), c);
      object = Fnth (make_number (4), c);
      position = Fnth (make_number (5), c);
      show_help_echo (help, window, object, position, 0);
      goto retry;
    }
  
  if (this_command_key_count == 0 || ! reread)
    {

  if (timers_run != old_timers_run && do_display)
    redisplay_preserve_echo_area (7);
}

static EMACS_TIME timer_idleness_start_time;

/* Record the start of when Emacs is idle,
   for the sake of running idle-time timers.  */

void
timer_start_idle ()

38195:7255d1f70b82

Lisp_Object Vdisable_point_adjustment;

/* If non-nil, always disable point adjustment.  */

Lisp_Object Vglobal_disable_point_adjustment;

/* The time when Emacs started being idle.  */

static EMACS_TIME timer_idleness_start_time;


/* Global variable declarations.  */

/* Function for init_keyboard to call with no args (if nonzero).  */

  Lisp_Object tem, save;
  volatile Lisp_Object previous_echo_area_message;
  volatile Lisp_Object also_record;
  volatile int reread;
  struct gcpro gcpro1, gcpro2;
  EMACS_TIME last_idle_start;

  also_record = Qnil;

  before_command_key_count = this_command_key_count;
  before_command_echo_length = echo_length ();

      XSETINT (c, XINT (c) | (extra_keyboard_modifiers & ~0xff7f & ~CHAR_CTL));
    }

 non_reread:

  /* Record the last idle start time so that we can reset it
     should the next event read be a help-echo.  */
  last_idle_start = timer_idleness_start_time;
  timer_stop_idle ();
  start_polling ();

  if (NILP (c))
    {

      help = Fnth (make_number (2), c);
      window = Fnth (make_number (3), c);
      object = Fnth (make_number (4), c);
      position = Fnth (make_number (5), c);
      show_help_echo (help, window, object, position, 0);

      /* We stopped being idle for this event; undo that.  */
      timer_idleness_start_time = last_idle_start;
      goto retry;
    }
  
  if (this_command_key_count == 0 || ! reread)
    {

  if (timers_run != old_timers_run && do_display)
    redisplay_preserve_echo_area (7);
}

/* Record the start of when Emacs is idle,
   for the sake of running idle-time timers.  */

void
timer_start_idle ()