From b0f61eba2582f8e18ac5a71d28a3331effd15bfb Mon Sep 17 00:00:00 2001 From: Arnon Gilboa Date: Wed, 21 Jul 2010 17:41:13 +0300 Subject: [PATCH 1/6] client/agent: add clipboard max size limit for sending to/from the guest agent define default & env variable for overriding it --- spice/vd_agent.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spice/vd_agent.h b/spice/vd_agent.h index 4e6fcf7..f24479d 100644 --- a/spice/vd_agent.h +++ b/spice/vd_agent.h @@ -45,6 +45,8 @@ typedef struct SPICE_ATTR_PACKED VDAgentMessage { #define VD_AGENT_PROTOCOL 1 #define VD_AGENT_MAX_DATA_SIZE 2048 +#define VD_AGENT_CLIPBOARD_MAX_SIZE_DEFAULT 1024 +#define VD_AGENT_CLIPBOARD_MAX_SIZE_ENV "SPICE_CLIPBOARD_MAX_SIZE" enum { VD_AGENT_MOUSE_STATE = 1, From 3f63e048819f6ede08ed01bc31ae2a33adb550e8 Mon Sep 17 00:00:00 2001 From: Yonit Halperin Date: Wed, 23 Jun 2010 13:31:11 +0300 Subject: [PATCH 2/6] vdagent protocol: add display setting --- spice/vd_agent.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/spice/vd_agent.h b/spice/vd_agent.h index f24479d..8e1e6ca 100644 --- a/spice/vd_agent.h +++ b/spice/vd_agent.h @@ -53,6 +53,7 @@ enum { VD_AGENT_MONITORS_CONFIG, VD_AGENT_REPLY, VD_AGENT_CLIPBOARD, + VD_AGENT_DISPLAY_CONFIG, }; typedef struct SPICE_ATTR_PACKED VDAgentMonConfig { @@ -73,6 +74,18 @@ typedef struct SPICE_ATTR_PACKED VDAgentMonitorsConfig { VDAgentMonConfig monitors[0]; } VDAgentMonitorsConfig; +enum { + VD_AGENT_DISPLAY_CONFIG_FLAG_DISABLE_WALLPAPER = (1 << 0), + VD_AGENT_DISPLAY_CONFIG_FLAG_DISABLE_FONT_SMOOTH = (1 << 1), + VD_AGENT_DISPLAY_CONFIG_FLAG_DISABLE_ANIMATION = (1 << 2), + VD_AGENT_DISPLAY_CONFIG_FLAG_SET_COLOR_DEPTH = (1 << 3), +}; + +typedef struct SPICE_ATTR_PACKED VDAgentDisplayConfig { + uint32_t flags; + uint32_t depth; +} VDAgentDisplayConfig; + #define VD_AGENT_LBUTTON_MASK (1 << 1) #define VD_AGENT_MBUTTON_MASK (1 << 2) #define VD_AGENT_RBUTTON_MASK (1 << 3) From ca700d1fa756d446ebf6fd276c24ac21146da6bb Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 20 Jul 2010 15:52:05 +0200 Subject: [PATCH 3/6] Change major to 2 to declare network protocol stable --- spice/protocol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spice/protocol.h b/spice/protocol.h index bac2610..d6a2041 100644 --- a/spice/protocol.h +++ b/spice/protocol.h @@ -36,7 +36,7 @@ #include #define SPICE_MAGIC (*(uint32_t*)"REDQ") -#define SPICE_VERSION_MAJOR (~(uint32_t)0 - 1) +#define SPICE_VERSION_MAJOR 2 #define SPICE_VERSION_MINOR 0 // Encryption & Ticketing Parameters From 5200cb0cd195a760f38b44cb1208f5a8c4dacf83 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 20 Jul 2010 18:03:35 +0200 Subject: [PATCH 4/6] Update version to 0.5.3 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c071dee..0b1e9bc 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.57]) m4_define([SPICE_MAJOR], 0) m4_define([SPICE_MINOR], 5) -m4_define([SPICE_MICRO], 2) +m4_define([SPICE_MICRO], 3) AC_INIT(spice-protocol, [SPICE_MAJOR.SPICE_MINOR.SPICE_MICRO], [], spice-protocol) From ae739ac541f6213b8f17ffccd60c9927812cac24 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 20 Jul 2010 18:05:15 +0200 Subject: [PATCH 5/6] Update NEWS for release --- NEWS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/NEWS b/NEWS index e3ec5f9..6a2d96b 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ +Major changes in 0.5.3: +======================= + +Network major number changed to 2 to reflect that the network +protocol is now stable and backwards compatible from this point. + +Some vdagent messages for display settings and clipboard sharing +were added. + Major changes in 0.5.2: ======================= From e27cb334cf70409c7e32be6f061921b4b317be17 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Mon, 30 Aug 2010 13:25:30 +0300 Subject: [PATCH 6/6] move pipe header defines from reds.c to spice-protocol --- spice/vd_agent.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spice/vd_agent.h b/spice/vd_agent.h index 8e1e6ca..1fcda88 100644 --- a/spice/vd_agent.h +++ b/spice/vd_agent.h @@ -35,6 +35,16 @@ #include +enum { + VDP_CLIENT_PORT = 1, + VDP_SERVER_PORT, +}; + +typedef struct SPICE_ATTR_PACKED VDIChunkHeader { + uint32_t port; + uint32_t size; +} VDIChunkHeader; + typedef struct SPICE_ATTR_PACKED VDAgentMessage { uint32_t protocol; uint32_t type;