[gtk+] gdk: Add new _gdk_set_window_state
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gdk: Add new _gdk_set_window_state
- Date: Tue, 13 May 2014 06:40:05 +0000 (UTC)
commit c1efc4ad7b4472a9a2f8eb0426638c502e470116
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri Apr 11 17:04:25 2014 -0700
gdk: Add new _gdk_set_window_state
Wayland's mechanism tells us all of our new states, rather than
telling us which ones were added and removed. Add a new private
interface so that we can simply specify the new states as a
bitfield directly rather than having to compute which ones were
added and removed.
gdk/gdkevents.c | 36 +++++++++++++++++++++---------------
gdk/gdkinternals.h | 3 +++
2 files changed, 24 insertions(+), 15 deletions(-)
---
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 54ac136..fb785cf 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -2092,35 +2092,32 @@ _gdk_event_button_generate (GdkDisplay *display,
}
void
-gdk_synthesize_window_state (GdkWindow *window,
- GdkWindowState unset_flags,
- GdkWindowState set_flags)
+_gdk_set_window_state (GdkWindow *window,
+ GdkWindowState new_state)
{
GdkEvent temp_event;
GdkWindowState old;
-
+
g_return_if_fail (window != NULL);
-
+
temp_event.window_state.window = window;
temp_event.window_state.type = GDK_WINDOW_STATE;
temp_event.window_state.send_event = FALSE;
-
- old = temp_event.window_state.window->state;
-
- temp_event.window_state.new_window_state = old;
- temp_event.window_state.new_window_state |= set_flags;
- temp_event.window_state.new_window_state &= ~unset_flags;
- temp_event.window_state.changed_mask = temp_event.window_state.new_window_state ^ old;
+ temp_event.window_state.new_window_state = new_state;
+
+ old = window->state;
if (temp_event.window_state.new_window_state == old)
return; /* No actual work to do, nothing changed. */
+ temp_event.window_state.changed_mask = new_state ^ old;
+
/* Actually update the field in GdkWindow, this is sort of an odd
* place to do it, but seems like the safest since it ensures we expose no
* inconsistent state to the user.
*/
-
- window->state = temp_event.window_state.new_window_state;
+
+ window->state = new_state;
if (temp_event.window_state.changed_mask & GDK_WINDOW_STATE_WITHDRAWN)
_gdk_window_update_viewable (window);
@@ -2136,7 +2133,6 @@ gdk_synthesize_window_state (GdkWindow *window,
case GDK_WINDOW_TEMP: /* ? */
gdk_display_put_event (gdk_window_get_display (window), &temp_event);
break;
-
case GDK_WINDOW_FOREIGN:
case GDK_WINDOW_ROOT:
case GDK_WINDOW_CHILD:
@@ -2144,6 +2140,16 @@ gdk_synthesize_window_state (GdkWindow *window,
}
}
+void
+gdk_synthesize_window_state (GdkWindow *window,
+ GdkWindowState unset_flags,
+ GdkWindowState set_flags)
+{
+ g_return_if_fail (window != NULL);
+
+ _gdk_set_window_state (window, (window->state | set_flags) & ~unset_flags);
+}
+
/**
* gdk_display_set_double_click_time:
* @display: a #GdkDisplay
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 6010396..3cc26cc 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -321,6 +321,9 @@ void _gdk_windowing_event_data_copy (const GdkEvent *src,
GdkEvent *dst);
void _gdk_windowing_event_data_free (GdkEvent *event);
+void _gdk_set_window_state (GdkWindow *window,
+ GdkWindowState new_state);
+
gboolean _gdk_cairo_surface_extents (cairo_surface_t *surface,
GdkRectangle *extents);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]