[gtk+] Resume events when disconnecting from a frame clock
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Resume events when disconnecting from a frame clock
- Date: Fri, 30 Jan 2015 22:33:04 +0000 (UTC)
commit ff256956b2072cd422ccec5f33949854b0db0ef8
Author: Tom Hughes <tom compton nu>
Date: Mon Jan 26 21:52:00 2015 +0000
Resume events when disconnecting from a frame clock
If we are disconnecting from a frame clock that has paused event
processing and hasn't issued a resume yet make sure we resume the
events or they will stay blocked forever.
https://bugzilla.gnome.org/show_bug.cgi?id=742636
gdk/gdkinternals.h | 1 +
gdk/gdkwindow.c | 9 +++++++++
2 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index cbb87e4..d1d1e4d 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -333,6 +333,7 @@ struct _GdkWindow
guint in_update : 1;
guint geometry_dirty : 1;
guint event_compression : 1;
+ guint frame_clock_events_paused : 1;
/* The GdkWindow that has the impl, ref:ed if another window.
* This ref is required to keep the wrapper of the impl window alive
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 778fd5f..a12a43e 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -10913,6 +10913,8 @@ gdk_window_flush_events (GdkFrameClock *clock,
_gdk_display_pause_events (display);
gdk_frame_clock_request_phase (clock, GDK_FRAME_CLOCK_PHASE_RESUME_EVENTS);
+
+ window->frame_clock_events_paused = TRUE;
}
static void
@@ -10939,6 +10941,8 @@ gdk_window_resume_events (GdkFrameClock *clock,
display = gdk_window_get_display (window);
_gdk_display_unpause_events (display);
+
+ window->frame_clock_events_paused = TRUE;
}
static void
@@ -10971,6 +10975,11 @@ gdk_window_set_frame_clock (GdkWindow *window,
if (window->frame_clock)
{
+ if (window->frame_clock_events_paused)
+ {
+ gdk_window_resume_events (window->frame_clock, G_OBJECT (window));
+ }
+
g_signal_handlers_disconnect_by_func (G_OBJECT (window->frame_clock),
G_CALLBACK (gdk_window_flush_events),
window);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]