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

Store clipboard data in client data.

Browse Source
This commit is contained in:
Michael Jumper 2012-04-29 23:12:58 -07:00
parent f57e4f05ab
commit 61ee76bf16
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protocols/rdp/include/client.h
View File

@ -82,6 +82,8 @@ typedef struct rdp_guac_client_data {
guac_rdp_keysym_state_map keysym_state; guac_rdp_keysym_state_map keysym_state;
const char* clipboard;
} rdp_guac_client_data; } rdp_guac_client_data;
typedef struct rdp_freerdp_context { typedef struct rdp_freerdp_context {

1
protocols/rdp/src/client.c
View File

@ -367,6 +367,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
guac_client_data->rdp_inst = rdp_inst; guac_client_data->rdp_inst = rdp_inst;
guac_client_data->mouse_button_mask = 0; guac_client_data->mouse_button_mask = 0;
guac_client_data->current_surface = GUAC_DEFAULT_LAYER; guac_client_data->current_surface = GUAC_DEFAULT_LAYER;
guac_client_data->clipboard = "";
/* Clear keysym state mapping and keymap */ /* Clear keysym state mapping and keymap */
memset(guac_client_data->keysym_state, 0, memset(guac_client_data->keysym_state, 0,

10
protocols/rdp/src/rdp_cliprdr.c
View File

@ -144,8 +144,16 @@ void guac_rdp_process_cb_data_response(guac_client* client,
RDP_CB_DATA_RESPONSE_EVENT* event) { RDP_CB_DATA_RESPONSE_EVENT* event) {
/* Received clipboard data */ /* Received clipboard data */
if (event->data[event->size - 1] == '\0') if (event->data[event->size - 1] == '\0') {
/* Store clipboard data */
((rdp_guac_client_data*) client->data)->clipboard =
strdup((char*) event->data);
/* Send clipboard data */
guac_protocol_send_clipboard(client->socket, (char*) event->data); guac_protocol_send_clipboard(client->socket, (char*) event->data);
}
else else
guac_client_log_error(client, guac_client_log_error(client,
"Clipboard data missing null terminator"); "Clipboard data missing null terminator");