[Spice-devel] [PATCH] Add support for Composite command to spice-gtk

[Søren Sandmann Pedersen]

From: Søren Sandmann Pedersen <ssp at redhat.com>

All the real work is done in spice-common, so this is a pretty simple
change.
---
 gtk/channel-display.c | 9 +++++++++
 spice-common          | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/gtk/channel-display.c b/gtk/channel-display.c
index 4ed3bbb..99fe9c9 100644
--- a/gtk/channel-display.c
+++ b/gtk/channel-display.c
@@ -681,6 +681,7 @@ static void spice_display_channel_reset_capabilities(SpiceChannel *channel)
 {
     spice_channel_set_capability(SPICE_CHANNEL(channel), SPICE_DISPLAY_CAP_SIZED_STREAM);
     spice_channel_set_capability(SPICE_CHANNEL(channel), SPICE_DISPLAY_CAP_MONITORS_CONFIG);
+    spice_channel_set_capability(SPICE_CHANNEL(channel), SPICE_DISPLAY_CAP_COMPOSITE);
 }
 
 static void spice_display_channel_init(SpiceDisplayChannel *channel)
@@ -1428,6 +1429,13 @@ static void display_handle_draw_alpha_blend(SpiceChannel *channel, SpiceMsgIn *i
 }
 
 /* coroutine context */
+static void display_handle_draw_composite(SpiceChannel *channel, SpiceMsgIn *in)
+{
+    SpiceMsgDisplayDrawComposite *op = spice_msg_in_parsed(in);
+    DRAW(composite);
+}
+
+/* coroutine context */
 static void display_handle_surface_create(SpiceChannel *channel, SpiceMsgIn *in)
 {
     SpiceDisplayChannelPrivate *c = SPICE_DISPLAY_CHANNEL(channel)->priv;
@@ -1569,6 +1577,7 @@ static const spice_msg_handler display_handlers[] = {
     [ SPICE_MSG_DISPLAY_DRAW_TEXT ]          = display_handle_draw_text,
     [ SPICE_MSG_DISPLAY_DRAW_TRANSPARENT ]   = display_handle_draw_transparent,
     [ SPICE_MSG_DISPLAY_DRAW_ALPHA_BLEND ]   = display_handle_draw_alpha_blend,
+    [ SPICE_MSG_DISPLAY_DRAW_COMPOSITE ]     = display_handle_draw_composite,
 
     [ SPICE_MSG_DISPLAY_SURFACE_CREATE ]     = display_handle_surface_create,
     [ SPICE_MSG_DISPLAY_SURFACE_DESTROY ]    = display_handle_surface_destroy,
diff --git a/spice-common b/spice-common
index c2adbb0..3d339f4 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit c2adbb00dc0b29de0fe297f241fb0efeb4a81510
+Subproject commit 3d339f457ce1ae2a8a01efba0bcbe3cc92ca0b97
-- 
1.7.11.4