maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove SPICE - will move to branch off unstable.

Browse Source
This commit is contained in:
Michael Jumper 2013-06-06 10:24:21 -07:00
parent 27af176bbd
commit 760506da3d
8 changed files with 0 additions and 400 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -41,7 +41,6 @@ DIST_SUBDIRS = \
src/libguac \
src/guacd \
src/protocols/rdp \
src/protocols/spice \
src/protocols/ssh \
src/protocols/vnc \
tests
@ -55,10 +54,6 @@ if ENABLE_RDP
SUBDIRS += src/protocols/rdp
endif
if ENABLE_SPICE
SUBDIRS += src/protocols/spice
endif
if ENABLE_SSH
SUBDIRS += src/protocols/ssh
endif

11
configure.ac
View File

@ -129,21 +129,11 @@ PKG_CHECK_MODULES([PANGO], pango);
PKG_CHECK_MODULES([PANGOCAIRO], pangocairo);
AM_CONDITIONAL([ENABLE_SSH], [test "x${have_libssh}" = "xyes"])
#
# SPICE
#
have_spice=yes
PKG_CHECK_MODULES([SPICE_CLIENT_GLIB], [spice-client-glib-2.0],, [have_spice=no])
PKG_CHECK_MODULES([GLIB], [glib-2.0],, [have_spice=no])
AM_CONDITIONAL([ENABLE_SPICE], [test "x${have_spice}" = "xyes"])
AC_CONFIG_FILES([Makefile
tests/Makefile
src/libguac/Makefile
src/guacd/Makefile
src/protocols/rdp/Makefile
src/protocols/spice/Makefile
src/protocols/ssh/Makefile
src/protocols/vnc/Makefile])
AC_OUTPUT
@ -156,7 +146,6 @@ $PACKAGE_NAME version $PACKAGE_VERSION
Protocol support:
RDP ....... ${have_freerdp}
SPICE ..... ${have_spice}
SSH ....... ${have_libssh}
VNC ....... ${have_libvncserver}

36
src/protocols/spice/.gitignore vendored
View File

@ -1,36 +0,0 @@
# Object code
*.o
*.so
*.lo
*.la
# Backup files
*~
# Release files
*.tar.gz
# Files currently being edited by vim or vi
*.swp
# automake/autoconf
.deps/
.libs/
Makefile
Makefile.in
aclocal.m4
autom4te.cache/
m4/*
!README
config.guess
config.log
config.status
config.sub
configure
depcomp
install-sh
libtool
ltmain.sh
missing

55
src/protocols/spice/Makefile.am
View File

@ -1,55 +0,0 @@
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is libguac-client-spice.
#
# The Initial Developer of the Original Code is
# Michael Jumper.
# Portions created by the Initial Developer are Copyright (C) 2011
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
AM_LDFLAGS = $(SPICE_LIBS) $(PTHREAD_LIBS)
lib_LTLIBRARIES = libguac-client-spice.la
libguac_client_spice_la_SOURCES = \
client.c \
guac_handlers.c
noinst_HEADERS = \
client.h \
guac_handlers.h
libguac_client_spice_la_CFLAGS = -Werror -Wall -pedantic -Iinclude @SPICE_CLIENT_GLIB_CFLAGS@ @GLIB_CFLAGS@ $(LIBGUAC_INCLUDE)
libguac_client_spice_la_LIBADD = @SPICE_CLIENT_GLIB_LIBS@ @GLIB_LIBS@ $(LIBGUAC_LTLIB)
libguac_client_spice_la_LDFLAGS = -version-info 0:0:0

104
src/protocols/spice/client.c
View File

@ -1,104 +0,0 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is libguac-client-spice.
*
* The Initial Developer of the Original Code is
* Michael Jumper.
* Portions created by the Initial Developer are Copyright (C) 2011
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include <stdlib.h>
#include <stdbool.h>
#include <guacamole/client.h>
#include <spice-session.h>
#include "guac_handlers.h"
/* Client plugin arguments */
const char* GUAC_CLIENT_ARGS[] = {
"hostname",
"port",
NULL
};
enum __SPICE_ARGS_IDX {
SPICE_ARGS_HOSTNAME,
SPICE_ARGS_PORT,
SPICE_ARGS_COUNT
};
int guac_client_init(guac_client* client, int argc, char** argv) {
/* STUB */
GMainLoop* mainloop;
SpiceSession* session;
if (argc != SPICE_ARGS_COUNT) {
guac_client_log_error(client, "Wrong number of arguments");
return -1;
}
/* Init GLIB */
guac_client_log_info(client, "Init GLIB-2.0...");
g_type_init();
mainloop = g_main_loop_new(NULL, false);
/* Create session */
guac_client_log_info(client, "Creating SPICE session...");
session = spice_session_new();
/* Init session parameters */
guac_client_log_info(client, "Setting parameters...");
g_object_set(session, "host", argv[SPICE_ARGS_HOSTNAME], NULL);
g_object_set(session, "port", argv[SPICE_ARGS_PORT], NULL);
/* Connect */
guac_client_log_info(client, "Connecting...");
if (!spice_session_connect(session)) {
guac_client_log_error(client, "SPICE connection failed");
return 1;
}
/* Set handlers */
client->handle_messages = spice_guac_client_handle_messages;
client->clipboard_handler = spice_guac_client_clipboard_handler;
client->key_handler = spice_guac_client_key_handler;
client->mouse_handler = spice_guac_client_mouse_handler;
client->size_handler = spice_guac_client_size_handler;
client->free_handler = spice_guac_client_free_handler;
g_main_loop_run(mainloop);
return 0;
}

45
src/protocols/spice/client.h
View File

@ -1,45 +0,0 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is libguac-client-spice.
*
* The Initial Developer of the Original Code is
* Michael Jumper.
* Portions created by the Initial Developer are Copyright (C) 2011
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* James Muehlner <dagger10k@users.sourceforge.net>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef _SPICE_GUAC_CLIENT_H
#define _SPICE_GUAC_CLIENT_H
/* STUB */
#endif

70
src/protocols/spice/guac_handlers.c
View File

@ -1,70 +0,0 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is libguac-client-spice.
*
* The Initial Developer of the Original Code is
* Michael Jumper.
* Portions created by the Initial Developer are Copyright (C) 2011
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include <guacamole/client.h>
int spice_guac_client_handle_messages(guac_client* client) {
/* STUB */
return 0;
}
int spice_guac_client_key_handler(guac_client* client, int keysym, int pressed) {
/* STUB */
return 0;
}
int spice_guac_client_mouse_handler(guac_client* client, int x, int y, int mask) {
/* STUB */
return 0;
}
int spice_guac_client_clipboard_handler(guac_client* client, char* data) {
/* STUB */
return 0;
}
int spice_guac_client_size_handler(guac_client* client, int width, int height) {
/* STUB */
return 0;
}
int spice_guac_client_free_handler(guac_client* client) {
/* STUB */
return 0;
}

74
src/protocols/spice/guac_handlers.h
View File

@ -1,74 +0,0 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is libguac-client-spice.
*
* The Initial Developer of the Original Code is
* Michael Jumper.
* Portions created by the Initial Developer are Copyright (C) 2011
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef _SPICE_GUAC_HANDLERS_H
#define _SPICE_GUAC_HANDLERS_H
#include <guacamole/client.h>
/**
* Handler called when it's time to handle incoming Spice messages.
*/
int spice_guac_client_handle_messages(guac_client* client);
/**
* Guacamole key handler.
*/
int spice_guac_client_key_handler(guac_client* client, int keysym, int pressed);
/**
* Guacamole mouse handler.
*/
int spice_guac_client_mouse_handler(guac_client* client, int x, int y, int mask);
/**
* Guacamole clipboard data handler.
*/
int spice_guac_client_clipboard_handler(guac_client* client, char* data);
/**
* Guacamole screen resize handler.
*/
int spice_guac_client_size_handler(guac_client* client, int width, int height);
/**
* Handler for freeing client resources.
*/
int spice_guac_client_free_handler(guac_client* client);
#endif