isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-11 12:12:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "x11: Cut some slack to clients doing slow draws/resizes"

Browse Source 
As per https://bugzilla.gnome.org/show_bug.cgi?id=740424#c12

This reverts commit 94c3c8f412.
This commit is contained in:
Carlos Garnacho 2015-03-12 18:41:57 +01:00
parent 6bacbac656
commit 68ba45bcb2
1 changed files with 27 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/x11/window-x11.c
View File

@ -949,23 +949,6 @@ sync_request_timeout (gpointer data)
return FALSE; return FALSE;
} }
static void
reset_sync_request_timeout (MetaWindow *window)
{
if (window->sync_request_timeout_id != 0)
g_source_remove (window->sync_request_timeout_id);
/* We give the window 1 sec to respond to _NET_WM_SYNC_REQUEST;
* if this time expires, we consider the window unresponsive
* and resize it unsynchonized.
*/
window->sync_request_timeout_id = g_timeout_add (1000,
sync_request_timeout,
window);
g_source_set_name_by_id (window->sync_request_timeout_id,
"[mutter] sync_request_timeout");
}
static void static void
send_sync_request (MetaWindow *window) send_sync_request (MetaWindow *window)
{ {
@ -1004,7 +987,15 @@ send_sync_request (MetaWindow *window)
XSendEvent (window->display->xdisplay, XSendEvent (window->display->xdisplay,
window->xwindow, False, 0, (XEvent*) &ev); window->xwindow, False, 0, (XEvent*) &ev);
reset_sync_request_timeout (window); /* We give the window 1 sec to respond to _NET_WM_SYNC_REQUEST;
* if this time expires, we consider the window unresponsive
* and resize it unsynchonized.
*/
window->sync_request_timeout_id = g_timeout_add (1000,
sync_request_timeout,
window);
g_source_set_name_by_id (window->sync_request_timeout_id,
"[mutter] sync_request_timeout");
meta_compositor_sync_updates_frozen (window->display->compositor, window); meta_compositor_sync_updates_frozen (window->display->compositor, window);
} }
@ -3347,34 +3338,27 @@ meta_window_x11_update_sync_request_counter (MetaWindow *window,
window->sync_request_serial = new_counter_value; window->sync_request_serial = new_counter_value;
meta_compositor_sync_updates_frozen (window->display->compositor, window); meta_compositor_sync_updates_frozen (window->display->compositor, window);
if (window->sync_request_timeout_id) if (window == window->display->grab_window &&
meta_grab_op_is_resizing (window->display->grab_op) &&
new_counter_value >= window->sync_request_wait_serial &&
(!window->extended_sync_request_counter || new_counter_value % 2 == 0) &&
window->sync_request_timeout_id)
{ {
if (new_counter_value < window->sync_request_wait_serial) meta_topic (META_DEBUG_RESIZING,
{ "Alarm event received last motion x = %d y = %d\n",
reset_sync_request_timeout (window); window->display->grab_latest_motion_x,
} window->display->grab_latest_motion_y);
else if (!window->extended_sync_request_counter || new_counter_value % 2 == 0)
{
g_source_remove (window->sync_request_timeout_id);
window->sync_request_timeout_id = 0;
if (window == window->display->grab_window && g_source_remove (window->sync_request_timeout_id);
meta_grab_op_is_resizing (window->display->grab_op)) window->sync_request_timeout_id = 0;
{
meta_topic (META_DEBUG_RESIZING,
"Alarm event received last motion x = %d y = %d\n",
window->display->grab_latest_motion_x,
window->display->grab_latest_motion_y);
/* This means we are ready for another configure; /* This means we are ready for another configure;
* no pointer round trip here, to keep in sync */ * no pointer round trip here, to keep in sync */
meta_window_update_resize (window, meta_window_update_resize (window,
window->display->grab_last_user_action_was_snap, window->display->grab_last_user_action_was_snap,
window->display->grab_latest_motion_x, window->display->grab_latest_motion_x,
window->display->grab_latest_motion_y, window->display->grab_latest_motion_y,
TRUE); TRUE);
}
}
} }
/* If sync was previously disabled, turn it back on and hope /* If sync was previously disabled, turn it back on and hope