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

x11: Ensure flush() Flushes all output stream data

Browse Source 
This seemed to work under the assumption that a flush() call can
only result in one INCR roundtrip. This is evidently not true, so
we should hold things off until all pending data is actually flushed.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1198

(cherry picked from commit 8a2b82897d)
This commit is contained in:
Carlos Garnacho 2020-04-11 16:59:17 +02:00 committed by Robert Mader
parent 83eeb3dbd2
commit 5f34a0f245
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/x11/meta-x11-selection-output-stream.c
View File

@ -292,11 +292,16 @@ meta_x11_selection_output_stream_invoke_flush (gpointer data)
{ {
MetaX11SelectionOutputStream *stream = MetaX11SelectionOutputStream *stream =
META_X11_SELECTION_OUTPUT_STREAM (data); META_X11_SELECTION_OUTPUT_STREAM (data);
MetaX11SelectionOutputStreamPrivate *priv =
meta_x11_selection_output_stream_get_instance_private (stream);
if (meta_x11_selection_output_stream_needs_flush (stream) && if (meta_x11_selection_output_stream_needs_flush (stream) &&
meta_x11_selection_output_stream_can_flush (stream)) meta_x11_selection_output_stream_can_flush (stream))
meta_x11_selection_output_stream_perform_flush (stream); meta_x11_selection_output_stream_perform_flush (stream);
if (priv->delete_pending || priv->data->len > 0)
return G_SOURCE_CONTINUE;
else
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
@ -477,10 +482,9 @@ meta_x11_selection_output_stream_flush_async (GOutputStream *output_stream
} }
} }
g_assert (priv->pending_task == NULL);
priv->pending_task = task;
meta_x11_selection_output_stream_perform_flush (stream); meta_x11_selection_output_stream_perform_flush (stream);
g_task_return_boolean (task, TRUE);
g_object_unref (task);
return;
} }
static gboolean static gboolean