[Emacs-diffs] Changes to emacs/src/keyboard.c

[YAMAMOTO Mitsuharu]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.822 emacs/src/keyboard.c:1.823
*** emacs/src/keyboard.c:1.822  Mon May  2 10:32:40 2005
--- emacs/src/keyboard.c        Fri May 13 08:44:49 2005
***************
*** 3531,3539 ****
       READABLE_EVENTS_FILTER_EVENTS is set, report it as empty.  */
    if (kbd_fetch_ptr != kbd_store_ptr)
      {
!       int have_live_event = 1;
! 
!       if (flags & READABLE_EVENTS_FILTER_EVENTS)
          {
            struct input_event *event;
  
--- 3531,3541 ----
       READABLE_EVENTS_FILTER_EVENTS is set, report it as empty.  */
    if (kbd_fetch_ptr != kbd_store_ptr)
      {
!       if (flags & (READABLE_EVENTS_FILTER_EVENTS
! #ifdef USE_TOOLKIT_SCROLL_BARS
!                  | READABLE_EVENTS_IGNORE_SQUEEZABLES
! #endif
!                  ))
          {
            struct input_event *event;
  
***************
*** 3541,3556 ****
                     ? kbd_fetch_ptr
                     : kbd_buffer);
  
!           while (have_live_event && event->kind == FOCUS_IN_EVENT)
!             {
!               event++;
                if (event == kbd_buffer + KBD_BUFFER_SIZE)
                  event = kbd_buffer;
!               if (event == kbd_store_ptr)
!                 have_live_event = 0;
!             }
          }
!       if (have_live_event) return 1;
      }
  
  #ifdef HAVE_MOUSE
--- 3543,3571 ----
                     ? kbd_fetch_ptr
                     : kbd_buffer);
  
!         do
!           {
!             if (!(
! #ifdef USE_TOOLKIT_SCROLL_BARS
!                   (flags & READABLE_EVENTS_FILTER_EVENTS) &&
! #endif
!                   event->kind == FOCUS_IN_EVENT)
! #ifdef USE_TOOLKIT_SCROLL_BARS
!                 && !((flags & READABLE_EVENTS_IGNORE_SQUEEZABLES)
!                      && event->kind == SCROLL_BAR_CLICK_EVENT
!                      && event->part == scroll_bar_handle
!                      && event->modifiers == 0)
! #endif
!                 )
!               return 1;
!             event++;
                if (event == kbd_buffer + KBD_BUFFER_SIZE)
                  event = kbd_buffer;
!           }
!         while (event != kbd_store_ptr);
          }
!       else
!       return 1;
      }
  
  #ifdef HAVE_MOUSE
***************
*** 6545,6551 ****
     If READABLE_EVENTS_FILTER_EVENTS is set in FLAGS, ignore internal
     events (FOCUS_IN_EVENT).
     If READABLE_EVENTS_IGNORE_SQUEEZABLES is set in FLAGS, ignore mouse
!    movements. */
  
  static void
  get_input_pending (addr, flags)
--- 6560,6566 ----
     If READABLE_EVENTS_FILTER_EVENTS is set in FLAGS, ignore internal
     events (FOCUS_IN_EVENT).
     If READABLE_EVENTS_IGNORE_SQUEEZABLES is set in FLAGS, ignore mouse
!    movements and toolkit scroll bar thumb drags. */
  
  static void
  get_input_pending (addr, flags)