/[emacs]/emacs/src/keyboard.c
ViewVC logotype

Diff of /emacs/src/keyboard.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.822 by kfstorm, Mon May 2 10:32:40 2005 UTC revision 1.823 by mituharu, Fri May 13 08:44:49 2005 UTC
# Line 3531  readable_events (flags) Line 3531  readable_events (flags)
3531       READABLE_EVENTS_FILTER_EVENTS is set, report it as empty.  */       READABLE_EVENTS_FILTER_EVENTS is set, report it as empty.  */
3532    if (kbd_fetch_ptr != kbd_store_ptr)    if (kbd_fetch_ptr != kbd_store_ptr)
3533      {      {
3534        int have_live_event = 1;        if (flags & (READABLE_EVENTS_FILTER_EVENTS
3535    #ifdef USE_TOOLKIT_SCROLL_BARS
3536        if (flags & READABLE_EVENTS_FILTER_EVENTS)                     | READABLE_EVENTS_IGNORE_SQUEEZABLES
3537    #endif
3538                       ))
3539          {          {
3540            struct input_event *event;            struct input_event *event;
3541    
# Line 3541  readable_events (flags) Line 3543  readable_events (flags)
3543                     ? kbd_fetch_ptr                     ? kbd_fetch_ptr
3544                     : kbd_buffer);                     : kbd_buffer);
3545    
3546            while (have_live_event && event->kind == FOCUS_IN_EVENT)            do
3547              {              {
3548                event++;                if (!(
3549    #ifdef USE_TOOLKIT_SCROLL_BARS
3550                        (flags & READABLE_EVENTS_FILTER_EVENTS) &&
3551    #endif
3552                        event->kind == FOCUS_IN_EVENT)
3553    #ifdef USE_TOOLKIT_SCROLL_BARS
3554                      && !((flags & READABLE_EVENTS_IGNORE_SQUEEZABLES)
3555                           && event->kind == SCROLL_BAR_CLICK_EVENT
3556                           && event->part == scroll_bar_handle
3557                           && event->modifiers == 0)
3558    #endif
3559                      )
3560                    return 1;
3561                  event++;
3562                if (event == kbd_buffer + KBD_BUFFER_SIZE)                if (event == kbd_buffer + KBD_BUFFER_SIZE)
3563                  event = kbd_buffer;                  event = kbd_buffer;
3564                if (event == kbd_store_ptr)              }
3565                  have_live_event = 0;            while (event != kbd_store_ptr);
             }  
3566          }          }
3567        if (have_live_event) return 1;        else
3568            return 1;
3569      }      }
3570    
3571  #ifdef HAVE_MOUSE  #ifdef HAVE_MOUSE
# Line 6545  lucid_event_type_list_p (object) Line 6560  lucid_event_type_list_p (object)
6560     If READABLE_EVENTS_FILTER_EVENTS is set in FLAGS, ignore internal     If READABLE_EVENTS_FILTER_EVENTS is set in FLAGS, ignore internal
6561     events (FOCUS_IN_EVENT).     events (FOCUS_IN_EVENT).
6562     If READABLE_EVENTS_IGNORE_SQUEEZABLES is set in FLAGS, ignore mouse     If READABLE_EVENTS_IGNORE_SQUEEZABLES is set in FLAGS, ignore mouse
6563     movements. */     movements and toolkit scroll bar thumb drags. */
6564    
6565  static void  static void
6566  get_input_pending (addr, flags)  get_input_pending (addr, flags)

Legend:
Removed from v.1.822  
changed lines
  Added in v.1.823

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26