From b0891e4c7972366465f57753cafcf4c987d27a58 Mon Sep 17 00:00:00 2001 From: Victor Toso Date: Tue, 10 Mar 2020 12:48:29 +0100 Subject: Remove foreign-menu and controller interfaces Both were formally deprecated and announced for 0.14.1 release and can be removed from the codebase. 4816ae5 "foreign-menu: mark as deprecated" in 2020-03-06 2981f21 "controller: mark as deprecated" in 2020-03-06 Signed-off-by: Victor Toso Acked-by: Frediano Ziglio --- spice-protocol.spec | 3 +- spice/controller_prot.h | 129 ---------------------------------------------- spice/foreign_menu_prot.h | 109 --------------------------------------- spice/meson.build | 2 - 4 files changed, 1 insertion(+), 242 deletions(-) delete mode 100644 spice/controller_prot.h delete mode 100644 spice/foreign_menu_prot.h diff --git a/spice-protocol.spec b/spice-protocol.spec index dfd1345..79ceaaa 100644 --- a/spice-protocol.spec +++ b/spice-protocol.spec @@ -3,8 +3,7 @@ Version: 0.14.2 Release: 1%{?dist} Summary: Spice protocol header files Group: Development/Libraries -# Main headers are BSD, controller / foreign menu are LGPL -License: BSD and LGPLv2+ +License: BSD URL: https://www.spice-space.org Source0: https://www.spice-space.org/download/releases/%{name}-%{version}.tar.xz BuildArch: noarch diff --git a/spice/controller_prot.h b/spice/controller_prot.h deleted file mode 100644 index 9216e38..0000000 --- a/spice/controller_prot.h +++ /dev/null @@ -1,129 +0,0 @@ -/* - 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 . -*/ - -#ifndef _H_CONTROLLER_PROT -#define _H_CONTROLLER_PROT - -#include -#include -#include - -#ifndef SPICE_DISABLE_DEPRECATED -#error "This SPICE interface is deprecated" -#endif - -#define CONTROLLER_MAGIC SPICE_MAGIC_CONST("CTRL") -#define CONTROLLER_VERSION 1 - - -typedef struct SPICE_ATTR_PACKED ControllerInitHeader { - uint32_t magic; - uint32_t version; - uint32_t size; -} ControllerInitHeader; - -typedef struct SPICE_ATTR_PACKED ControllerInit { - ControllerInitHeader base; - uint64_t credentials; - uint32_t flags; -} ControllerInit; - -enum { - CONTROLLER_FLAG_EXCLUSIVE = 1 << 0, -}; - -typedef struct SPICE_ATTR_PACKED ControllerMsg { - uint32_t id; - uint32_t size; -} ControllerMsg; - -enum { - //external 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, - - CONTROLLER_ENABLE_SMARTCARD, - - CONTROLLER_COLOR_DEPTH, - CONTROLLER_DISABLE_EFFECTS, - - CONTROLLER_ENABLE_USB, - CONTROLLER_ENABLE_USB_AUTOSHARE, - CONTROLLER_USB_FILTER, - - CONTROLLER_PROXY, - - //spice client -> external 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 SPICE_ATTR_PACKED ControllerValue { - ControllerMsg base; - uint32_t value; -} ControllerValue; - -typedef struct SPICE_ATTR_PACKED ControllerData { - ControllerMsg base; - uint8_t data[0]; -} ControllerData; - -#define CONTROLLER_MENU_ITEM_DELIMITER "\n" -#define CONTROLLER_MENU_PARAM_DELIMITER "\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 - -#include - -#endif diff --git a/spice/foreign_menu_prot.h b/spice/foreign_menu_prot.h deleted file mode 100644 index 65b0fd1..0000000 --- a/spice/foreign_menu_prot.h +++ /dev/null @@ -1,109 +0,0 @@ -/* - 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 . -*/ - -#ifndef _H_FOREIGN_MENU_PROT -#define _H_FOREIGN_MENU_PROT - -#include -#include -#include - -#ifndef SPICE_DISABLE_DEPRECATED -#error "This SPICE interface is deprecated" -#endif - -#define FOREIGN_MENU_MAGIC SPICE_MAGIC_CONST("FRGM") -#define FOREIGN_MENU_VERSION 1 - -typedef struct SPICE_ATTR_PACKED FrgMenuInitHeader { - uint32_t magic; - uint32_t version; - uint32_t size; -} FrgMenuInitHeader; - -typedef struct SPICE_ATTR_PACKED FrgMenuInit { - FrgMenuInitHeader base; - uint64_t credentials; - uint8_t title[0]; //UTF8 -} FrgMenuInit; - -typedef struct SPICE_ATTR_PACKED FrgMenuMsg { - uint32_t id; - uint32_t size; -} FrgMenuMsg; - -enum { - //external 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 SPICE_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 SPICE_ATTR_PACKED FrgMenuAddItem { - FrgMenuMsg base; - uint32_t id; - uint32_t type; - uint32_t position; - uint8_t string[0]; //UTF8 -} FrgMenuAddItem, FrgMenuModItem; - -typedef struct SPICE_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 SPICE_ATTR_PACKED FrgMenuEvent { - FrgMenuMsg base; - uint32_t id; - uint32_t action; //FOREIGN_MENU_EVENT_? -} FrgMenuEvent; - -typedef struct FrgMenuMsg FrgMenuActivate; -typedef struct FrgMenuMsg FrgMenuDeactivate; - -#include - -#endif diff --git a/spice/meson.build b/spice/meson.build index b89185a..37268df 100644 --- a/spice/meson.build +++ b/spice/meson.build @@ -1,9 +1,7 @@ spice_protocol_headers = [ 'barrier.h', - 'controller_prot.h', 'end-packed.h', 'enums.h', - 'foreign_menu_prot.h', 'ipc_ring.h', 'macros.h', 'protocol.h', -- cgit v1.2.3