callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdk: Add new _gdk_set_window_state

Browse Source 
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.
This commit is contained in:
Jasper St. Pierre 2014-04-11 17:04:25 -07:00
parent 807f0aa747
commit c1efc4ad7b
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gdk/gdkevents.c
View File

@ -2092,35 +2092,32 @@ _gdk_event_button_generate (GdkDisplay *display,
} }
void void
gdk_synthesize_window_state (GdkWindow *window, _gdk_set_window_state (GdkWindow *window,
GdkWindowState unset_flags, GdkWindowState new_state)
GdkWindowState set_flags)
{ {
GdkEvent temp_event; GdkEvent temp_event;
GdkWindowState old; GdkWindowState old;
g_return_if_fail (window != NULL); g_return_if_fail (window != NULL);
temp_event.window_state.window = window; temp_event.window_state.window = window;
temp_event.window_state.type = GDK_WINDOW_STATE; temp_event.window_state.type = GDK_WINDOW_STATE;
temp_event.window_state.send_event = FALSE; temp_event.window_state.send_event = FALSE;
temp_event.window_state.new_window_state = new_state;
old = temp_event.window_state.window->state;
old = 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;
if (temp_event.window_state.new_window_state == old) if (temp_event.window_state.new_window_state == old)
return; /* No actual work to do, nothing changed. */ 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 /* 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 * place to do it, but seems like the safest since it ensures we expose no
* inconsistent state to the user. * 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) if (temp_event.window_state.changed_mask & GDK_WINDOW_STATE_WITHDRAWN)
_gdk_window_update_viewable (window); _gdk_window_update_viewable (window);
@ -2136,7 +2133,6 @@ gdk_synthesize_window_state (GdkWindow *window,
case GDK_WINDOW_TEMP: /* ? */ case GDK_WINDOW_TEMP: /* ? */
gdk_display_put_event (gdk_window_get_display (window), &temp_event); gdk_display_put_event (gdk_window_get_display (window), &temp_event);
break; break;
case GDK_WINDOW_FOREIGN: case GDK_WINDOW_FOREIGN:
case GDK_WINDOW_ROOT: case GDK_WINDOW_ROOT:
case GDK_WINDOW_CHILD: 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: * gdk_display_set_double_click_time:
* @display: a #GdkDisplay * @display: a #GdkDisplay

3
gdk/gdkinternals.h
View File

@ -321,6 +321,9 @@ void _gdk_windowing_event_data_copy (const GdkEvent *src,
GdkEvent *dst); GdkEvent *dst);
void _gdk_windowing_event_data_free (GdkEvent *event); 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, gboolean _gdk_cairo_surface_extents (cairo_surface_t *surface,
GdkRectangle *extents); GdkRectangle *extents);