[Spice-commits] 2 commits - spice/controller_prot.h spice/foreign_menu_prot.h spice/Makefile.am
Arnon Gilboa
agilboa at kemper.freedesktop.org
Mon Oct 18 01:30:05 PDT 2010
spice/Makefile.am | 2
spice/controller_prot.h | 115 ++++++++++++++++++++++++++++++++++++++++++++++
spice/foreign_menu_prot.h | 107 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 224 insertions(+)
New commits:
commit 6e499cf69e020ae84bf0ca08754908116e23ce58
Author: Arnon Gilboa <agilboa at redhat.com>
Date: Mon Oct 18 10:08:45 2010 +0200
Add controller protocol
diff --git a/spice/Makefile.am b/spice/Makefile.am
index 60ddb58..87d0bc9 100644
--- a/spice/Makefile.am
+++ b/spice/Makefile.am
@@ -4,6 +4,7 @@ spice_protocol_includedir=$(includedir)/spice-1/spice
spice_protocol_include_HEADERS= \
barrier.h \
+ controller_prot.h \
end-packed.h \
enums.h \
error_codes.h \
diff --git a/spice/controller_prot.h b/spice/controller_prot.h
new file mode 100644
index 0000000..6cf4ca0
--- /dev/null
+++ b/spice/controller_prot.h
@@ -0,0 +1,115 @@
+/*
+ Copyright (C) 2009 Red Hat, Inc.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _H_CONTROLLER_PROT
+#define _H_CONTROLLER_PROT
+
+#define CONTROLLER_MAGIC (*(uint32_t*)"CTRL")
+#define CONTROLLER_VERSION 1
+
+#ifdef __GNUC__
+#define ATTR_PACKED __attribute__ ((__packed__))
+#else
+#define ATTR_PACKED __declspec(align(1))
+#endif
+
+typedef struct ATTR_PACKED ControllerInitHeader {
+ uint32_t magic;
+ uint32_t version;
+ uint32_t size;
+} ControllerInitHeader;
+
+typedef struct ATTR_PACKED ControllerInit {
+ ControllerInitHeader base;
+ uint64_t credentials;
+ uint32_t flags;
+} ControllerInit;
+
+enum {
+ CONTROLLER_FLAG_EXCLUSIVE = 1 << 0,
+};
+
+typedef struct ATTR_PACKED ControllerMsg {
+ uint32_t id;
+ uint32_t size;
+} ControllerMsg;
+
+enum {
+ //extrenal app -> spice client
+ CONTROLLER_HOST = 1,
+ CONTROLLER_PORT,
+ CONTROLLER_SPORT,
+ CONTROLLER_PASSWORD,
+
+ CONTROLLER_SECURE_CHANNELS,
+ CONTROLLER_DISABLE_CHANNELS,
+
+ CONTROLLER_TLS_CIPHERS,
+ CONTROLLER_CA_FILE,
+ CONTROLLER_HOST_SUBJECT,
+
+ CONTROLLER_FULL_SCREEN,
+ CONTROLLER_SET_TITLE,
+
+ CONTROLLER_CREATE_MENU,
+ CONTROLLER_DELETE_MENU,
+
+ CONTROLLER_HOTKEYS,
+ CONTROLLER_SEND_CAD,
+
+ CONTROLLER_CONNECT,
+ CONTROLLER_SHOW,
+ CONTROLLER_HIDE,
+
+ //spice client -> extrenal app
+ CONTROLLER_MENU_ITEM_CLICK = 1001,
+};
+
+#define CONTROLLER_TRUE (1 << 0)
+
+enum {
+ CONTROLLER_SET_FULL_SCREEN = CONTROLLER_TRUE,
+ CONTROLLER_AUTO_DISPLAY_RES = 1 << 1,
+};
+
+typedef struct ATTR_PACKED ControllerValue {
+ ControllerMsg base;
+ uint32_t value;
+} ControllerValue;
+
+typedef struct ATTR_PACKED ControllerData {
+ ControllerMsg base;
+ uint8_t data[0];
+} ControllerData;
+
+#define CONTROLLER_MENU_ITEM_DELIMITER L"\n"
+#define CONTROLLER_MENU_PARAM_DELIMITER L"\r"
+
+enum {
+ CONTROLLER_MENU_FLAGS_SEPARATOR = 1 << 0,
+ CONTROLLER_MENU_FLAGS_DISABLED = 1 << 1,
+ CONTROLLER_MENU_FLAGS_POPUP = 1 << 2,
+ CONTROLLER_MENU_FLAGS_CHECKED = 1 << 3,
+ CONTROLLER_MENU_FLAGS_GRAYED = 1 << 4,
+};
+
+#define SPICE_MENU_INTERNAL_ID_BASE 0x1300
+#define SPICE_MENU_INTERNAL_ID_SHIFT 8
+
+#undef ATTR_PACKED
+
+#endif
commit 8e1e17755eeecc92f25c5a983d5c5297c242d57c
Author: Arnon Gilboa <agilboa at redhat.com>
Date: Mon Oct 18 10:02:11 2010 +0200
Add foreign menu protocol
diff --git a/spice/Makefile.am b/spice/Makefile.am
index e552cf4..60ddb58 100644
--- a/spice/Makefile.am
+++ b/spice/Makefile.am
@@ -7,6 +7,7 @@ spice_protocol_include_HEADERS= \
end-packed.h \
enums.h \
error_codes.h \
+ foreign_menu_prot.h \
ipc_ring.h \
protocol.h \
macros.h \
diff --git a/spice/foreign_menu_prot.h b/spice/foreign_menu_prot.h
new file mode 100644
index 0000000..8c22461
--- /dev/null
+++ b/spice/foreign_menu_prot.h
@@ -0,0 +1,107 @@
+/*
+ Copyright (C) 2009 Red Hat, Inc.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _H_FOREIGN_MENU_PROT
+#define _H_FOREIGN_MENU_PROT
+
+#define FOREIGN_MENU_MAGIC (*(uint32_t*)"FRGM")
+#define FOREIGN_MENU_VERSION 1
+
+#ifdef __GNUC__
+#define ATTR_PACKED __attribute__ ((__packed__))
+#else
+#define ATTR_PACKED __declspec(align(1))
+#endif
+
+typedef struct ATTR_PACKED FrgMenuInitHeader {
+ uint32_t magic;
+ uint32_t version;
+ uint32_t size;
+} FrgMenuInitHeader;
+
+typedef struct ATTR_PACKED FrgMenuInit {
+ FrgMenuInitHeader base;
+ uint64_t credentials;
+ uint8_t title[0]; //UTF8
+} FrgMenuInit;
+
+typedef struct ATTR_PACKED FrgMenuMsg {
+ uint32_t id;
+ uint32_t size;
+} FrgMenuMsg;
+
+enum {
+ //extrenal app -> spice client
+ FOREIGN_MENU_SET_TITLE = 1,
+ FOREIGN_MENU_ADD_ITEM,
+ FOREIGN_MENU_MODIFY_ITEM,
+ FOREIGN_MENU_REMOVE_ITEM,
+ FOREIGN_MENU_CLEAR,
+
+ //spice client -> external app
+ FOREIGN_MENU_ITEM_EVENT = 1001,
+ FOREIGN_MENU_APP_ACTIVATED,
+ FOREIGN_MENU_APP_DEACTIVATED,
+};
+
+typedef struct ATTR_PACKED FrgMenuSetTitle {
+ FrgMenuMsg base;
+ uint8_t string[0]; //UTF8
+} FrgMenuSetTitle;
+
+enum {
+ FOREIGN_MENU_ITEM_TYPE_CHECKED = 1 << 0,
+ FOREIGN_MENU_ITEM_TYPE_DIM = 1 << 1,
+ FOREIGN_MENU_ITEM_TYPE_SEPARATOR = 1 << 2
+};
+
+#define FOREIGN_MENU_INVALID_ID 0
+
+typedef struct ATTR_PACKED FrgMenuAddItem {
+ FrgMenuMsg base;
+ uint32_t id;
+ uint32_t type;
+ uint32_t position;
+ uint8_t string[0]; //UTF8
+} FrgMenuAddItem, FrgMenuModItem;
+
+typedef struct ATTR_PACKED FrgMenuRmItem {
+ FrgMenuMsg base;
+ uint32_t id;
+} FrgMenuRmItem;
+
+typedef struct FrgMenuMsg FrgMenuRmItems;
+typedef struct FrgMenuMsg FrgMenuDelete;
+
+enum {
+ FOREIGN_MENU_EVENT_CLICK,
+ FOREIGN_MENU_EVENT_CHECKED,
+ FOREIGN_MENU_EVENT_UNCHECKED
+};
+
+typedef struct ATTR_PACKED FrgMenuEvent {
+ FrgMenuMsg base;
+ uint32_t id;
+ uint32_t action; //FOREIGN_MENU_EVENT_?
+} FrgMenuEvent;
+
+typedef struct FrgMenuMsg FrgMenuActivate;
+typedef struct FrgMenuMsg FrgMenuDeactivate;
+
+#undef ATTR_PACKED
+
+#endif
More information about the Spice-commits
mailing list