isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

display: Remove extraneous checks for grab_window

Browse Source 
We assert a few lines down anyway, so just move the asserts up
and kill the if statement.
This commit is contained in:
Jasper St. Pierre 2014-04-28 17:12:39 -04:00
parent bc0f7def47
commit 1ef6a5542a
1 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/core/display.c
View File

@ -1767,6 +1767,9 @@ meta_display_begin_grab_op (MetaDisplay *display,
if (grab_window == NULL) if (grab_window == NULL)
grab_window = window; grab_window = window;
g_assert (grab_window != NULL);
g_assert (op != META_GRAB_OP_NONE);
display->grab_have_pointer = FALSE; display->grab_have_pointer = FALSE;
if (pointer_already_grabbed) if (pointer_already_grabbed)
@ -1792,12 +1795,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
/* Grab keys for keyboard ops and mouse move/resizes; see #126497 */ /* Grab keys for keyboard ops and mouse move/resizes; see #126497 */
if (meta_grab_op_is_moving_or_resizing (op)) if (meta_grab_op_is_moving_or_resizing (op))
{ {
if (grab_window) display->grab_have_keyboard = meta_window_grab_all_keys (grab_window, timestamp);
display->grab_have_keyboard =
meta_window_grab_all_keys (grab_window, timestamp);
else
display->grab_have_keyboard =
meta_screen_grab_all_keys (screen, timestamp);
if (!display->grab_have_keyboard) if (!display->grab_have_keyboard)
{ {
@ -1812,16 +1810,8 @@ meta_display_begin_grab_op (MetaDisplay *display,
display->grab_op = op; display->grab_op = op;
display->grab_window = grab_window; display->grab_window = grab_window;
display->grab_button = button; display->grab_button = button;
if (window)
{
display->grab_tile_mode = window->tile_mode; display->grab_tile_mode = window->tile_mode;
display->grab_tile_monitor_number = window->tile_monitor_number; display->grab_tile_monitor_number = window->tile_monitor_number;
}
else
{
display->grab_tile_mode = META_TILE_NONE;
display->grab_tile_monitor_number = -1;
}
display->grab_anchor_root_x = root_x; display->grab_anchor_root_x = root_x;
display->grab_anchor_root_y = root_y; display->grab_anchor_root_y = root_y;
display->grab_latest_motion_x = root_x; display->grab_latest_motion_x = root_x;
@ -1839,8 +1829,10 @@ meta_display_begin_grab_op (MetaDisplay *display,
display->grab_resize_timeout_id = 0; display->grab_resize_timeout_id = 0;
} }
if (display->grab_window) meta_topic (META_DEBUG_WINDOW_OPS,
{ "Grab op %u on window %s successful\n",
display->grab_op, window ? window->desc : "(null)");
meta_window_get_client_root_coords (display->grab_window, meta_window_get_client_root_coords (display->grab_window,
&display->grab_initial_window_pos); &display->grab_initial_window_pos);
display->grab_anchor_window_pos = display->grab_initial_window_pos; display->grab_anchor_window_pos = display->grab_initial_window_pos;
@ -1848,16 +1840,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
if (meta_grab_op_is_resizing (display->grab_op) && if (meta_grab_op_is_resizing (display->grab_op) &&
display->grab_window->sync_request_counter != None) display->grab_window->sync_request_counter != None)
meta_window_create_sync_request_alarm (display->grab_window); meta_window_create_sync_request_alarm (display->grab_window);
}
meta_topic (META_DEBUG_WINDOW_OPS,
"Grab op %u on window %s successful\n",
display->grab_op, window ? window->desc : "(null)");
g_assert (display->grab_window != NULL);
g_assert (display->grab_op != META_GRAB_OP_NONE);
if (display->grab_window)
meta_window_refresh_resize_popup (display->grab_window); meta_window_refresh_resize_popup (display->grab_window);
if (meta_is_wayland_compositor ()) if (meta_is_wayland_compositor ())