From 45cdd91a8c6e64f12501f212ed46899866532330 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 16 Dec 1998 21:58:54 +0000 Subject: [PATCH] Don't call XPending() if we have putback events. Wed Dec 16 16:57:55 1998 Owen Taylor * gdk/gdkevents.c (gdk_events_queue): Don't call XPending() if we have putback events. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/gdkevents.c | 2 +- gdk/x11/gdkevents-x11.c | 2 +- 9 files changed, 37 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b7525328b..3870762c6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 16 16:57:55 1998 Owen Taylor + + * gdk/gdkevents.c (gdk_events_queue): Don't + call XPending() if we have putback events. + Wed Dec 16 16:04:41 1998 Owen Taylor * gtk/gtklabel.c (gtk_label_expose): Do nothing diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3b7525328b..3870762c6e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Wed Dec 16 16:57:55 1998 Owen Taylor + + * gdk/gdkevents.c (gdk_events_queue): Don't + call XPending() if we have putback events. + Wed Dec 16 16:04:41 1998 Owen Taylor * gtk/gtklabel.c (gtk_label_expose): Do nothing diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3b7525328b..3870762c6e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Dec 16 16:57:55 1998 Owen Taylor + + * gdk/gdkevents.c (gdk_events_queue): Don't + call XPending() if we have putback events. + Wed Dec 16 16:04:41 1998 Owen Taylor * gtk/gtklabel.c (gtk_label_expose): Do nothing diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3b7525328b..3870762c6e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Wed Dec 16 16:57:55 1998 Owen Taylor + + * gdk/gdkevents.c (gdk_events_queue): Don't + call XPending() if we have putback events. + Wed Dec 16 16:04:41 1998 Owen Taylor * gtk/gtklabel.c (gtk_label_expose): Do nothing diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3b7525328b..3870762c6e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Dec 16 16:57:55 1998 Owen Taylor + + * gdk/gdkevents.c (gdk_events_queue): Don't + call XPending() if we have putback events. + Wed Dec 16 16:04:41 1998 Owen Taylor * gtk/gtklabel.c (gtk_label_expose): Do nothing diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3b7525328b..3870762c6e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Dec 16 16:57:55 1998 Owen Taylor + + * gdk/gdkevents.c (gdk_events_queue): Don't + call XPending() if we have putback events. + Wed Dec 16 16:04:41 1998 Owen Taylor * gtk/gtklabel.c (gtk_label_expose): Do nothing diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3b7525328b..3870762c6e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Dec 16 16:57:55 1998 Owen Taylor + + * gdk/gdkevents.c (gdk_events_queue): Don't + call XPending() if we have putback events. + Wed Dec 16 16:04:41 1998 Owen Taylor * gtk/gtklabel.c (gtk_label_expose): Do nothing diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index 1c1ebc0ad4..d3f7144b3c 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -1836,7 +1836,7 @@ gdk_events_queue (void) GdkEvent *event; XEvent xevent; - while (!queued_events && XPending (gdk_display)) + while (!(putback_events || queued_events) && XPending (gdk_display)) { #ifdef USE_XIM Window w = None; diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c index 1c1ebc0ad4..d3f7144b3c 100644 --- a/gdk/x11/gdkevents-x11.c +++ b/gdk/x11/gdkevents-x11.c @@ -1836,7 +1836,7 @@ gdk_events_queue (void) GdkEvent *event; XEvent xevent; - while (!queued_events && XPending (gdk_display)) + while (!(putback_events || queued_events) && XPending (gdk_display)) { #ifdef USE_XIM Window w = None;