summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2011-03-03 11:42:03 +0200
committerAlon Levy <alevy@redhat.com>2011-03-03 11:42:03 +0200
commita3b37c6a02ef9415350a796a5956ff229df3818b (patch)
tree4ac86276cb709bd6bec6d979cc9ed75dfa6c0615
parent7300282977953ec91558be867935b74d8671058a (diff)
parent6eabd3f5fb2e93a9d3659be0b2ea0cf7527cc830 (diff)
downloadspice-protocol-a3b37c6a02ef9415350a796a5956ff229df3818b.tar.gz
spice-protocol-a3b37c6a02ef9415350a796a5956ff229df3818b.tar.xz
spice-protocol-a3b37c6a02ef9415350a796a5956ff229df3818b.zip
Merge branch 'master' of git://git.freedesktop.org/git/spice/spice-protocol
-rw-r--r--spice/vd_agent.h26
1 files changed, 26 insertions, 0 deletions
diff --git a/spice/vd_agent.h b/spice/vd_agent.h
index 43d0e7c..ec2ef27 100644
--- a/spice/vd_agent.h
+++ b/spice/vd_agent.h
@@ -125,6 +125,10 @@ enum {
};
typedef struct SPICE_ATTR_PACKED VDAgentClipboard {
+#if 0 /* VD_AGENT_CAP_CLIPBOARD_SELECTION */
+ uint8_t selection;
+ uint8_t __reserved[sizeof(uint32_t) - 1 * sizeof(uint8_t)];
+#endif
uint32_t type;
uint8_t data[0];
} VDAgentClipboard;
@@ -139,13 +143,28 @@ enum {
};
typedef struct SPICE_ATTR_PACKED VDAgentClipboardGrab {
+#if 0 /* VD_AGENT_CAP_CLIPBOARD_SELECTION */
+ uint8_t selection;
+ uint8_t __reserved[sizeof(uint32_t) - 1 * sizeof(uint8_t)];
+#endif
uint32_t types[0];
} VDAgentClipboardGrab;
typedef struct SPICE_ATTR_PACKED VDAgentClipboardRequest {
+#if 0 /* VD_AGENT_CAP_CLIPBOARD_SELECTION */
+ uint8_t selection;
+ uint8_t __reserved[sizeof(uint32_t) - 1 * sizeof(uint8_t)];
+#endif
uint32_t type;
} VDAgentClipboardRequest;
+typedef struct SPICE_ATTR_PACKED VDAgentClipboardRelease {
+#if 0 /* VD_AGENT_CAP_CLIPBOARD_SELECTION */
+ uint8_t selection;
+ uint8_t __reserved[sizeof(uint32_t) - 1 * sizeof(uint8_t)];
+#endif
+} VDAgentClipboardRelease;
+
enum {
VD_AGENT_CAP_MOUSE_STATE = 0,
VD_AGENT_CAP_MONITORS_CONFIG,
@@ -153,9 +172,16 @@ enum {
VD_AGENT_CAP_CLIPBOARD,
VD_AGENT_CAP_DISPLAY_CONFIG,
VD_AGENT_CAP_CLIPBOARD_BY_DEMAND,
+ VD_AGENT_CAP_CLIPBOARD_SELECTION,
VD_AGENT_END_CAP,
};
+enum {
+ VD_AGENT_CLIPBOARD_SELECTION_CLIPBOARD = 0,
+ VD_AGENT_CLIPBOARD_SELECTION_PRIMARY,
+ VD_AGENT_CLIPBOARD_SELECTION_SECONDARY,
+};
+
typedef struct SPICE_ATTR_PACKED VDAgentAnnounceCapabilities {
uint32_t request;
uint32_t caps[0];