brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do xwayland/wayland window association in a later, not an idle

Browse Source 
g_idle_add() makes no guarantee about when it will be run - if Mutter
is busy drawing and blocking glXSwapBuffers() it could happen only
minutes later.  Use meta_later_add (META_LATER_BEFORE_REDRAW) instead -
this will deterministically be run after the Wayland socket is read
from but before the next frame is painted.

https://bugzilla.gnome.org/show_bug.cgi?id=736694
This commit is contained in:
Owen W. Taylor 2014-09-15 15:15:27 -04:00
parent e53456d87c
commit 9c465a2d5a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wayland/meta-xwayland.c
View File

@ -76,7 +76,7 @@ typedef struct {
MetaXWaylandManager *manager; MetaXWaylandManager *manager;
MetaWindow *window; MetaWindow *window;
guint32 surface_id; guint32 surface_id;
guint idle_id; guint later_id;
} AssociateWindowWithSurfaceOp; } AssociateWindowWithSurfaceOp;
static void static void
@ -84,12 +84,12 @@ associate_window_with_surface_window_destroyed (gpointer user_data,
GObject *obj) GObject *obj)
{ {
AssociateWindowWithSurfaceOp *op = user_data; AssociateWindowWithSurfaceOp *op = user_data;
g_source_remove (op->idle_id); meta_later_remove (op->later_id);
g_free (op); g_free (op);
} }
static gboolean static gboolean
associate_window_with_surface_idle (gpointer user_data) associate_window_with_surface_later (gpointer user_data)
{ {
AssociateWindowWithSurfaceOp *op = user_data; AssociateWindowWithSurfaceOp *op = user_data;
if (!associate_window_with_surface_id (op->manager, op->window, op->surface_id)) if (!associate_window_with_surface_id (op->manager, op->window, op->surface_id))
@ -113,15 +113,17 @@ meta_xwayland_handle_wl_surface_id (MetaWindow *window,
if (!associate_window_with_surface_id (manager, window, surface_id)) if (!associate_window_with_surface_id (manager, window, surface_id))
{ {
/* No surface ID yet... it should arrive after the next /* No surface ID yet... it should arrive after the next
* iteration through the loop, so queue an idle and see * iteration through the loop, so queue a later and see
* what happens. * what happens.
*/ */
AssociateWindowWithSurfaceOp *op = g_new0 (AssociateWindowWithSurfaceOp, 1); AssociateWindowWithSurfaceOp *op = g_new0 (AssociateWindowWithSurfaceOp, 1);
op->manager = manager; op->manager = manager;
op->window = window; op->window = window;
op->surface_id = surface_id; op->surface_id = surface_id;
op->idle_id = g_idle_add (associate_window_with_surface_idle, op); op->later_id = meta_later_add (META_LATER_BEFORE_REDRAW,
g_source_set_name_by_id (op->idle_id, "[mutter] associate_window_with_surface_idle"); associate_window_with_surface_later,
op,
NULL);
g_object_weak_ref (G_OBJECT (op->window), associate_window_with_surface_window_destroyed, op); g_object_weak_ref (G_OBJECT (op->window), associate_window_with_surface_window_destroyed, op);
} }