projects
/
libguac-client-rdp.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'unstable' into clipboard
[libguac-client-rdp.git]
/
src
/
client.c
diff --git
a/src/client.c
b/src/client.c
index
8a87d05
..
87823ad
100644
(file)
--- a/
src/client.c
+++ b/
src/client.c
@@
-91,6
+91,10
@@
enum ARGS_IDX {
IDX_COLOR_DEPTH
};
IDX_COLOR_DEPTH
};
+int __guac_receive_channel_data(freerdp* rdp_inst, int channelId, uint8* data, int size, int flags, int total_size) {
+ return freerdp_channels_data(rdp_inst, channelId, data, size, flags, total_size);
+}
+
boolean rdp_freerdp_pre_connect(freerdp* instance) {
rdpContext* context = instance->context;
boolean rdp_freerdp_pre_connect(freerdp* instance) {
rdpContext* context = instance->context;
@@
-102,6
+106,9
@@
boolean rdp_freerdp_pre_connect(freerdp* instance) {
rdpPrimaryUpdate* primary;
CLRCONV* clrconv;
rdpPrimaryUpdate* primary;
CLRCONV* clrconv;
+ /* Load clipboard plugin */
+ freerdp_channels_load_plugin(channels, instance->settings, "cliprdr", NULL);
+
/* Init color conversion structure */
clrconv = xnew(CLRCONV);
clrconv->alpha = 1;
/* Init color conversion structure */
clrconv = xnew(CLRCONV);
clrconv->alpha = 1;
@@
-271,6
+278,7
@@
int guac_client_init(guac_client* client, int argc, char** argv) {
rdp_inst = freerdp_new();
rdp_inst->PreConnect = rdp_freerdp_pre_connect;
rdp_inst->PostConnect = rdp_freerdp_post_connect;
rdp_inst = freerdp_new();
rdp_inst->PreConnect = rdp_freerdp_pre_connect;
rdp_inst->PostConnect = rdp_freerdp_post_connect;
+ rdp_inst->ReceiveChannelData = __guac_receive_channel_data;
/* Allocate FreeRDP context */
rdp_inst->context_size = sizeof(rdp_freerdp_context);
/* Allocate FreeRDP context */
rdp_inst->context_size = sizeof(rdp_freerdp_context);