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

Moved struct, etc. into own header.

Browse Source
This commit is contained in:
Michael Jumper 2011-03-27 20:56:14 -07:00
parent e79d34f974
commit a636a073f0
3 changed files with 63 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
protocols/rdp/src/rdp_client.c
View File

@ -50,8 +50,7 @@
#include <guacamole/client.h>
#include "rdp_handlers.h"
#define RDP_DEFAULT_PORT 3389
#include "rdp_client.h"
/* Client plugin arguments */
const char* GUAC_CLIENT_ARGS[] = {
@ -60,14 +59,6 @@ const char* GUAC_CLIENT_ARGS[] = {
NULL
};
typedef struct rdp_guac_client_data {
rdpInst* rdp_inst;
rdpChanMan* chanman;
rdpSet* settings;
} rdp_guac_client_data;
int rdp_guac_client_free_handler(guac_client* client) {
rdp_guac_client_data* guac_client_data = (rdp_guac_client_data*) client->data;

61
protocols/rdp/src/rdp_client.h Normal file
View File

@ -0,0 +1,61 @@
/* ***** 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-rdp.
*
* 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 _GUAC_CLIENT_RDP_CLIENT
#define _GUAC_CLIENT_RDP_CLIENT
#include <freerdp/freerdp.h>
#include <freerdp/chanman.h>
#include <guacamole/client.h>
#define RDP_DEFAULT_PORT 3389
typedef struct rdp_guac_client_data {
rdpInst* rdp_inst;
rdpChanMan* chanman;
rdpSet* settings;
} rdp_guac_client_data;
int rdp_guac_client_free_handler(guac_client* client);
int rdp_guac_client_handle_messages(guac_client* client);
#endif

2
protocols/rdp/src/rdp_handlers.c
View File

@ -218,7 +218,7 @@ RD_HBITMAP guac_rdp_ui_create_surface(rdpInst* inst, int width, int height, RD_H
}
void guac_rdp_ui_set_surface(rdpInst* inst, RD_HBITMAP surface) {
fprintf(stderr, "guac_rdp_ui_set_surface: STUB\n");
fprintf(stderr, "guac_rdp_ui_set_surface: STUB (surface=%p)\n", surface);
}
void guac_rdp_ui_destroy_surface(rdpInst* inst, RD_HBITMAP surface) {