--- sourceforge.net/trunk/rdesktop/cliprdr.c 2003/06/06 09:26:11 388 +++ sourceforge.net/trunk/rdesktop/cliprdr.c 2003/06/11 09:00:38 420 @@ -20,29 +20,37 @@ #include #include +#include +#include +#include #include "rdesktop.h" extern BOOL encryption; extern Display *display; extern Window wnd; extern Time last_gesturetime; +extern Atom ipc_atom; // static Time selection_timestamp; static Atom clipboard_atom, primary_atom, targets_atom, timestamp_atom; -static Atom rdesktop_clipboard_target_atom; +static Atom rdesktop_clipboard_target_atom, incr_atom; static cliprdr_dataformat *server_formats = NULL; static uint16 num_server_formats = 0; static XSelectionEvent selection_event; +static uint16 clipboard_channelno; +static Atom targets[NUM_TARGETS]; +static int have_primary = 0; +static int rdesktop_is_selection_owner = 0; static void -cliprdr_print_server_formats(void) +cliprdr_print_server_formats(void) { #ifdef WITH_DEBUG_CLIPBOARD cliprdr_dataformat *this; uint16 i = 0; this = server_formats; DEBUG_CLIPBOARD(("There should be %d server formats.\n", num_server_formats)); - while (NULL != this) + while (NULL != this) { DEBUG_CLIPBOARD(("Format code %d\n", this->identifier)); i++; @@ -51,6 +59,7 @@ DEBUG_CLIPBOARD(("There were %d server formats.\n", i)); #endif } + /* static void cliprdr_set_selection_timestamp(void) @@ -68,43 +77,63 @@ fflush(stdout); selection_timestamp = xev.xproperty.time; } -*/ +*/ static void -cliprdr_send_format_announce(void) +cliprdr_send_format_announce(void) { - DEBUG_CLIPBOARD(("Sending format announce\n")); - STREAM s; int number_of_formats = 1; - s = sec_init(encryption ? SEC_ENCRYPT : 0, number_of_formats*36+12+4+4); - out_uint32_le(s, number_of_formats*36+12); + DEBUG_CLIPBOARD(("Sending (empty) format announce\n")); + s = sec_init(encryption ? SEC_ENCRYPT : 0, number_of_formats * 36 + 12 + 4 + 4); + out_uint32_le(s, number_of_formats * 36 + 12); out_uint32_le(s, 0x13); out_uint16_le(s, 2); out_uint16_le(s, 0); - out_uint32_le(s, number_of_formats*36); - - // out_uint32_le(s, 0xd); // FIXME: This is a rather bogus unicode text description.. - // rdp_out_unistr(s, "", 16); - // out_uint8s(s, 32); + out_uint32_le(s, number_of_formats * 36); + + // out_uint32_le(s, 0xd); // FIXME: This is a rather bogus unicode text description.. + // rdp_out_unistr(s, "", 16); + // out_uint8s(s, 32); - out_uint32_le(s, 1); // FIXME: This is a rather bogus text description.. + out_uint32_le(s, 1); // FIXME: This is a rather bogus text description.. out_uint8s(s, 32); - out_uint32_le(s, 0); + out_uint32_le(s, 0); + + s_mark_end(s); + sec_send_to_channel(s, encryption ? SEC_ENCRYPT : 0, clipboard_channelno); +} + +void +cliprdr_ipc_format_announce(unsigned char *data, uint16 length) +{ + STREAM s; + rdesktop_is_selection_owner = 1; + DEBUG_CLIPBOARD(("cliprdr_ipc_format_announce called, length is %d, data is %s, sending native format announce\n", length, data)); + s = sec_init(encryption ? SEC_ENCRYPT : 0, length + 12 + 4 + 4); + out_uint32_le(s, length + 12); + out_uint32_le(s, 0x13); + out_uint16_le(s, 2); + out_uint16_le(s, 0); + out_uint32_le(s, length); + out_uint8p(s, data, length); + out_uint32_le(s, 0); // Pad s_mark_end(s); - sec_send_to_channel(s, encryption ? SEC_ENCRYPT : 0, 1005); // FIXME: Don't hardcode channel! + + sec_send_to_channel(s, encryption ? SEC_ENCRYPT : 0, clipboard_channelno); } + + static void cliprdr_send_empty_datapacket(void) { STREAM out; - out = sec_init(encryption ? SEC_ENCRYPT : 0, - 20); + out = sec_init(encryption ? SEC_ENCRYPT : 0, 20); out_uint32_le(out, 12); out_uint32_le(out, 0x13); out_uint16_le(out, 5); @@ -113,121 +142,197 @@ /* Insert null string here? */ out_uint32_le(out, 0); s_mark_end(out); - - sec_send_to_channel(out, encryption ? SEC_ENCRYPT : 0, 1005); // FIXME: Don't hardcode channel! + + sec_send_to_channel(out, encryption ? SEC_ENCRYPT : 0, clipboard_channelno); } -void -cliprdr_handle_SelectionNotify(XSelectionEvent *event) +void +cliprdr_handle_SelectionNotify(XSelectionEvent * event) { - unsigned char *data; - unsigned long nitems, bytes_left; - int res; + unsigned char *data, *datap; + unsigned long nitems, bytes_left; + + unsigned long bytes_left_to_transfer; + int res, i; int format; Atom type_return; Atom best_target; + Atom *supported_targets; STREAM out; - + DEBUG_CLIPBOARD(("cliprdr_handle_SelectionNotify\n")); - if (None == event->property) { + if (None == event->property) + { cliprdr_send_empty_datapacket(); - return; /* Selection failed */ - } + return; /* Selection failed */ + } DEBUG_CLIPBOARD(("selection: %s, target: %s, property: %s\n", XGetAtomName(display, event->selection), XGetAtomName(display, event->target), XGetAtomName(display, event->property))); - if (targets_atom == event->target) { + if (targets_atom == event->target) + { /* Response to TARGETS request. Let's find the target we want and request that */ - res = XGetWindowProperty(display, wnd, + res = XGetWindowProperty(display, wnd, rdesktop_clipboard_target_atom, - 0L, 4096L, False, AnyPropertyType, - &type_return, - &format, &nitems, &bytes_left, &data); + 0L, 4096L, False, AnyPropertyType, + &type_return, &format, &nitems, &bytes_left, &data); - if (Success != res) + if (Success != res) { DEBUG_CLIPBOARD(("XGetWindowProperty failed!\n")); cliprdr_send_empty_datapacket(); return; } - if (None == type_return) + if (None == type_return) /* The owner might no support TARGETS. Just try STRING */ best_target = XA_STRING; - else + else { /* FIXME: We should choose format here based on what the server wanted */ + supported_targets = (Atom *) data; + for (i = 0; i < nitems; i++) + { + DEBUG_CLIPBOARD(("Target %d: %s\n", + i, XGetAtomName(display, supported_targets[i]))); + } best_target = XInternAtom(display, "TEXT", False); - - + + } - XConvertSelection(display, primary_atom, - best_target, - rdesktop_clipboard_target_atom, - wnd, event->time); + XConvertSelection(display, primary_atom, + best_target, rdesktop_clipboard_target_atom, wnd, event->time); - } - else /* Other clipboard data */ + } + + else /* Other clipboard data */ { - - res = XGetWindowProperty(display, wnd, + + res = XGetWindowProperty(display, wnd, rdesktop_clipboard_target_atom, - 0L, 4096L, False, AnyPropertyType, - &type_return, - &format, &nitems, &bytes_left, &data); + 0L, 0x1FFFFFF, + True, AnyPropertyType, + &type_return, &format, &nitems, &bytes_left, &data); + + + /* FIXME: We need to handle INCR as well, + this is a temporary solution. */ - if (Success != res) + if (incr_atom == type_return) + { + warning("We don't support INCR transfers at this time. Try cutting less data\n"); + cliprdr_send_empty_datapacket(); + } + + + if (Success != res) { DEBUG_CLIPBOARD(("XGetWindowProperty failed!\n")); cliprdr_send_empty_datapacket(); return; } - /* We need to handle INCR as well */ + datap = data; - out = sec_init(encryption ? SEC_ENCRYPT : 0, - 20+nitems); - out_uint32_le(out, 12+nitems); - out_uint32_le(out, 0x13); - out_uint16_le(out, 5); - out_uint16_le(out, 1); - out_uint32_le(out, nitems); - out_uint8p(out, data, nitems); - /* Insert null string here? */ - out_uint32_le(out, 0); - s_mark_end(out); - - sec_send_to_channel(out, encryption ? SEC_ENCRYPT : 0, 1005); // FIXME: Don't hardcode channel! + if (nitems + 1 <= MAX_CLIPRDR_STANDALONE_DATASIZE) + { + out = sec_init(encryption ? SEC_ENCRYPT : 0, 20 + nitems + 1); + out_uint32_le(out, 12 + nitems + 1); + out_uint32_le(out, 0x13); + out_uint16_le(out, 5); + out_uint16_le(out, 1); + out_uint32_le(out, nitems + 1); + out_uint8p(out, datap, nitems + 1); + out_uint32_le(out, 0); + s_mark_end(out); + + sec_send_to_channel(out, encryption ? SEC_ENCRYPT : 0, clipboard_channelno); + + } + else + { + DEBUG_CLIPBOARD(("Sending %d bytes of data\n", + 16 + MAX_CLIPRDR_STANDALONE_DATASIZE)); + out = sec_init(encryption ? SEC_ENCRYPT : 0, + 16 + MAX_CLIPRDR_STANDALONE_DATASIZE); + out_uint32_le(out, nitems + 12); + out_uint32_le(out, 0x11); + out_uint16_le(out, 5); + out_uint16_le(out, 1); + out_uint32_le(out, nitems); + out_uint8p(out, datap, MAX_CLIPRDR_STANDALONE_DATASIZE); + s_mark_end(out); + + sec_send_to_channel(out, encryption ? SEC_ENCRYPT : 0, clipboard_channelno); + + bytes_left_to_transfer = nitems - MAX_CLIPRDR_STANDALONE_DATASIZE; + datap += MAX_CLIPRDR_STANDALONE_DATASIZE; + + while (bytes_left_to_transfer > MAX_CLIPRDR_STANDALONE_DATASIZE) + { + DEBUG_CLIPBOARD(("Sending %d bytes of data\n", + 16 + MAX_CLIPRDR_CONTINUATION_DATASIZE)); + out = sec_init(encryption ? SEC_ENCRYPT : 0, + 8 + MAX_CLIPRDR_CONTINUATION_DATASIZE); + out_uint32_le(out, nitems); + out_uint32_le(out, 0x10); + out_uint8p(out, datap, MAX_CLIPRDR_CONTINUATION_DATASIZE); + s_mark_end(out); + + sec_send_to_channel(out, + encryption ? SEC_ENCRYPT : 0, + clipboard_channelno); + bytes_left_to_transfer -= MAX_CLIPRDR_CONTINUATION_DATASIZE; + datap += MAX_CLIPRDR_CONTINUATION_DATASIZE; + + } + DEBUG_CLIPBOARD(("Sending %u bytes of data\n", + 12 + bytes_left_to_transfer)); + out = sec_init(encryption ? SEC_ENCRYPT : 0, 12 + bytes_left_to_transfer); + out_uint32_le(out, nitems); + out_uint32_le(out, 0x12); + out_uint8p(out, datap, bytes_left_to_transfer); + out_uint32_le(out, 0x0); + s_mark_end(out); + + sec_send_to_channel(out, encryption ? SEC_ENCRYPT : 0, clipboard_channelno); + + } + + + XFree(data); + if (!rdesktop_is_selection_owner) + cliprdr_send_format_announce(); - cliprdr_send_format_announce(); - } - - + + } void cliprdr_handle_SelectionClear(void) { DEBUG_CLIPBOARD(("cliprdr_handle_SelectionClear\n")); + have_primary = 0; + ipc_send_message(RDESKTOP_IPC_CLIPRDR_PRIMARY_LOST, "", 0); cliprdr_send_format_announce(); } static void -cliprdr_request_clipboard_data(uint32 formatcode) +cliprdr_request_clipboard_data(uint32 formatcode) { STREAM s; s = sec_init(encryption ? SEC_ENCRYPT : 0, 24); @@ -235,38 +340,40 @@ out_uint32_le(s, 0x13); out_uint16_le(s, 4); out_uint16_le(s, 0); - out_uint32_le(s, 4); // Remaining length + out_uint32_le(s, 4); // Remaining length out_uint32_le(s, formatcode); - out_uint32_le(s, 0); // Unknown. Garbage pad? + out_uint32_le(s, 0); // Unknown. Garbage pad? s_mark_end(s); - sec_send_to_channel(s, encryption ? SEC_ENCRYPT : 0, 1005); // FIXME: Don't hardcode channel! + sec_send_to_channel(s, encryption ? SEC_ENCRYPT : 0, clipboard_channelno); } void -cliprdr_handle_SelectionRequest(XSelectionRequestEvent *xevent) +cliprdr_handle_SelectionRequest(XSelectionRequestEvent * xevent) { - Atom *targets; - int res; - XSelectionEvent xev; + unsigned long nitems, bytes_left; + Atom type_return; + uint32 *wanted_formatcode; + int format; + DEBUG_CLIPBOARD(("cliprdr_handle_SelectionRequest\n")); - DEBUG_CLIPBOARD(("Requestor window id 0x%x ", - (unsigned)xevent->requestor)); - if (clipboard_atom == xevent->selection) { + DEBUG_CLIPBOARD(("Requestor window id 0x%x ", (unsigned) xevent->requestor)); + if (clipboard_atom == xevent->selection) + { DEBUG_CLIPBOARD(("wants CLIPBOARD\n")); - } - if (primary_atom == xevent->selection) { + } + if (primary_atom == xevent->selection) + { DEBUG_CLIPBOARD(("wants PRIMARY\n")); - } - DEBUG_CLIPBOARD(("Target is %s (0x%x), property is %s (0x%x)\n", - XGetAtomName(display, xevent->target), - (unsigned)xevent->target, - XGetAtomName(display, xevent->property), - (unsigned)xevent->property)); + } + DEBUG_CLIPBOARD(("Target is %s (0x%x), property is %s (0x%x)\n", + XGetAtomName(display, xevent->target), + (unsigned) xevent->target, + XGetAtomName(display, xevent->property), (unsigned) xevent->property)); xev.type = SelectionNotify; xev.serial = 0; @@ -277,58 +384,57 @@ xev.property = xevent->property; xev.time = xevent->time; - if (targets_atom == xevent->target) + memcpy(&selection_event, &xev, sizeof(xev)); + + if (ipc_atom == xevent->target) + { + DEBUG_CLIPBOARD(("Target atom is ipc_atom, getting INTEGER from requestor\n")); + XGetWindowProperty(display, xevent->requestor, + rdesktop_clipboard_target_atom, + 0, + 1, + True, XA_INTEGER, + &type_return, + &format, + &nitems, &bytes_left, (unsigned char **) &wanted_formatcode); + DEBUG_CLIPBOARD(("Got wanted formatcode %d, format is %d\n", *wanted_formatcode, + format)); + cliprdr_request_clipboard_data(*wanted_formatcode); + } + + else if (targets_atom == xevent->target) { DEBUG_CLIPBOARD(("TARGETS requested, sending list..\n")); - targets = xmalloc(4*sizeof(Atom)); - targets[0] = xevent->target; - targets[1] = XInternAtom(display, "TEXT", True); - targets[2] = XInternAtom(display, "UTF8_STRING", True); - targets[3] = XInternAtom(display, "TIMESTAMP", True); - res = XChangeProperty(display, - xevent->requestor, - xevent->property, - XA_ATOM, - 32, - PropModeAppend, - (unsigned char *)targets, - 3); - - res = XSendEvent(display, - xevent->requestor, - False, - NoEventMask, - (XEvent *)&xev); + XChangeProperty(display, + xevent->requestor, + xevent->property, + XA_ATOM, + 32, PropModeAppend, (unsigned char *) &targets, NUM_TARGETS); + + XSendEvent(display, xevent->requestor, False, NoEventMask, (XEvent *) & xev); return; - } else if (timestamp_atom == xevent->target) + } + else if (timestamp_atom == xevent->target) { - DEBUG_CLIPBOARD(("TIMESTAMP requested... sending 0x%x\n", - (unsigned)last_gesturetime)); - res = XChangeProperty(display, - xevent->requestor, - xevent->property, - XA_INTEGER, - 32, - PropModeAppend, - (unsigned char *)&last_gesturetime, - 1); - res = XSendEvent(display, - xevent->requestor, - False, - NoEventMask, - (XEvent *)&xev); - } else /* Some other target */ + DEBUG_CLIPBOARD(("Sending TIMESTAMP\n")); + XChangeProperty(display, + xevent->requestor, + xevent->property, + XA_INTEGER, + 32, PropModeAppend, (unsigned char *) &last_gesturetime, 1); + XSendEvent(display, xevent->requestor, False, NoEventMask, (XEvent *) & xev); + } + else /* Some other target */ { cliprdr_request_clipboard_data(CF_TEXT); - memcpy(&selection_event, &xev, sizeof(xev)); /* Return and wait for data, handled by cliprdr_handle_server_data */ } } -static void -cliprdr_ack_format_list(void) +static void +cliprdr_ack_format_list(void) { STREAM s; s = sec_init(encryption ? SEC_ENCRYPT : 0, 20); @@ -341,111 +447,153 @@ s_mark_end(s); - sec_send_to_channel(s, encryption ? SEC_ENCRYPT : 0, 1005); // FIXME: Don't hardcode channel! + sec_send_to_channel(s, encryption ? SEC_ENCRYPT : 0, clipboard_channelno); } - + static void -cliprdr_register_server_formats(STREAM s) +cliprdr_register_server_formats(STREAM s) { uint32 remaining_length, pad; uint16 num_formats; cliprdr_dataformat *this, *next; - DEBUG_CLIPBOARD(("cliprdr_register_server_formats\n")); in_uint32_le(s, remaining_length); + DEBUG_CLIPBOARD(("cliprdr_register_server_formats, remaining_length is %d\n", + remaining_length)); + num_formats = remaining_length / 36; - if (NULL != server_formats) { + + ipc_send_message(RDESKTOP_IPC_CLIPRDR_FORMAT_ANNOUNCE, s->p, remaining_length); + if (NULL != server_formats) + { this = server_formats; next = this->next; - while (NULL != next) { + while (NULL != next) + { xfree(this); this = NULL; this = next; next = this->next; } - } + } this = xmalloc(sizeof(cliprdr_dataformat)); this->next = NULL; server_formats = this; num_server_formats = num_formats; - while (1 < num_formats) { + while (1 < num_formats) + { in_uint32_le(s, this->identifier); in_uint8a(s, this->textual_description, 32); - DEBUG_CLIPBOARD(("Stored format description with numeric id %d\n", + DEBUG_CLIPBOARD(("Stored format description with numeric id %d\n", this->identifier)); - this-> next = xmalloc(sizeof(cliprdr_dataformat)); + this->next = xmalloc(sizeof(cliprdr_dataformat)); this = this->next; num_formats--; } in_uint32_le(s, this->identifier); DEBUG_CLIPBOARD(("Stored format description with numeric id %d\n", this->identifier)); in_uint8a(s, this->textual_description, 32); - this -> next = NULL; + this->next = NULL; in_uint32_le(s, pad); cliprdr_print_server_formats(); } static void -cliprdr_select_X_clipboards(void) +cliprdr_select_X_clipboards(void) { XSetSelectionOwner(display, primary_atom, wnd, last_gesturetime); if (wnd != XGetSelectionOwner(display, primary_atom)) { warning("Failed to aquire ownership of PRIMARY clipboard\n"); } + else + { + have_primary = 1; + } XSetSelectionOwner(display, clipboard_atom, wnd, last_gesturetime); - if (wnd != XGetSelectionOwner(display, clipboard_atom)) + if (wnd != XGetSelectionOwner(display, clipboard_atom)) { warning("Failed to aquire ownership of CLIPBOARD clipboard\n"); - } - -} + } - +} -static void +static void cliprdr_handle_first_handshake(STREAM s) { uint32 remaining_length, pad; in_uint32_le(s, remaining_length); in_uint32_le(s, pad); - DEBUG_CLIPBOARD(("Remaining length in first handshake frm server is %d, pad is %d\n", + DEBUG_CLIPBOARD(("Remaining length in first handshake frm server is %d, pad is %d\n", remaining_length, pad)); cliprdr_send_format_announce(); } -void cliprdr_handle_server_data(uint32 length, STREAM s) +void +cliprdr_handle_server_data(uint32 length, uint32 flags, STREAM s) { - uint32 remaining_length; - char *data; - in_uint32_le(s, remaining_length); - data = s->p; - XChangeProperty(display, + static uint32 remaining_length; + static char *data, *datap; + static uint32 bytes_left_to_read; + DEBUG_CLIPBOARD(("In cliprdr_handle_server_data, flags is %d\n", flags)); + if (3 == flags) /* One-op write, no packets follows */ + { + in_uint32_le(s, remaining_length); + data = s->p; + } + else if (1 == flags) /* First of several packets */ + { + in_uint32_le(s, remaining_length); + DEBUG_CLIPBOARD(("Remaining length is %d\n", remaining_length)); + data = xmalloc(remaining_length); + datap = data; + DEBUG_CLIPBOARD(("Copying first %d bytes\n", MAX_CLIPRDR_STANDALONE_DATASIZE)); + memcpy(datap, s->p, MAX_CLIPRDR_STANDALONE_DATASIZE); + + datap += MAX_CLIPRDR_STANDALONE_DATASIZE; + bytes_left_to_read = remaining_length - MAX_CLIPRDR_STANDALONE_DATASIZE; + return; + } + else if (0 == flags) + { + DEBUG_CLIPBOARD(("Copying %d middle bytes", MAX_CLIPRDR_CONTINUATION_DATASIZE)); + memcpy(datap, s->p, MAX_CLIPRDR_CONTINUATION_DATASIZE); + + datap += MAX_CLIPRDR_CONTINUATION_DATASIZE; + bytes_left_to_read -= MAX_CLIPRDR_CONTINUATION_DATASIZE; + return; + } + else if (2 == flags) + { + DEBUG_CLIPBOARD(("Copying last %d bytes\n", bytes_left_to_read)); + memcpy(datap, s->p, bytes_left_to_read); + } + DEBUG_CLIPBOARD(("Setting target atom (%s) on %d\n", + XGetAtomName(display, selection_event.property), + selection_event.requestor)); + XChangeProperty(display, selection_event.requestor, selection_event.property, XInternAtom(display, "STRING", False), - 8, - PropModeAppend, - data, - remaining_length); + 8, PropModeAppend, data, remaining_length - 1); + + XSendEvent(display, + selection_event.requestor, False, NoEventMask, (XEvent *) & selection_event); - XSendEvent(display, - selection_event.requestor, - False, - NoEventMask, - (XEvent *)&selection_event); - + if (2 == flags) + xfree(data); } -void cliprdr_handle_server_data_request(STREAM s) +void +cliprdr_handle_server_data_request(STREAM s) { Window selectionowner; uint32 remaining_length; @@ -457,88 +605,173 @@ /* FIXME: Check that we support this formatcode */ - DEBUG_CLIPBOARD(("Request from server for format %d\n", - wanted_formatcode)); + DEBUG_CLIPBOARD(("Request from server for format %d\n", wanted_formatcode)); selectionowner = XGetSelectionOwner(display, primary_atom); - if (None != selectionowner) + if (rdesktop_is_selection_owner) + { + DEBUG_CLIPBOARD(("XChangeProperty, rdesktop_is_selection_owner\n")); + XChangeProperty(display, wnd, rdesktop_clipboard_target_atom, + XA_INTEGER, 32, PropModeReplace, + (unsigned char *) &wanted_formatcode, 1); + + XConvertSelection(display, primary_atom, + ipc_atom, rdesktop_clipboard_target_atom, wnd, CurrentTime); + return; + } + + + if (None != selectionowner) { - + /* FIXME: Perhaps we should check if we are the owner? */ - XConvertSelection(display, primary_atom, - targets_atom, - rdesktop_clipboard_target_atom, - wnd, CurrentTime); + XConvertSelection(display, primary_atom, + targets_atom, rdesktop_clipboard_target_atom, wnd, CurrentTime); /* The rest of the transfer is handled in cliprdr_handle_SelectionNotify */ - } else + } + else { - DEBUG_CLIPBOARD(("There were no owner for PRIMARY, sending empty string\n")); // FIXME: Should we always send an empty string? - cliprdr_send_empty_datapacket(); + selectionowner = XGetSelectionOwner(display, clipboard_atom); + if (None != selectionowner) + { + XConvertSelection(display, clipboard_atom, + targets_atom, + rdesktop_clipboard_target_atom, wnd, CurrentTime); + + /* The rest of the transfer is handled in + cliprdr_handle_SelectionNotify */ + + } + else + { + + DEBUG_CLIPBOARD(("There were no owner for PRIMARY nor CLIPBOARD, sending empty string\n")); // FIXME: Should we always send an empty string? + + cliprdr_send_empty_datapacket(); + } } } - -void cliprdr_callback(STREAM s) + +void +cliprdr_callback(STREAM s, uint16 channelno) { + static int failed_clipboard_acks = 0; + struct timeval timeval; uint32 length, flags; uint16 ptype0, ptype1; - DEBUG_CLIPBOARD(("cliprdr_callback called, clipboard data:\n")); + clipboard_channelno = channelno; + DEBUG_CLIPBOARD(("cliprdr_callback called with channelno %d, clipboard data:\n", + channelno)); #ifdef WITH_DEBUG_CLIPBOARD - hexdump(s->p, s->end - s->p); + // hexdump(s->p, s->end - s->p); #endif in_uint32_le(s, length); in_uint32_le(s, flags); DEBUG_CLIPBOARD(("length is %d, flags are %d\n", length, flags)); - if (flags & 0x03 || flags & 0x01) /* Single-write op or first-packet-of-several op */ + if (3 == flags || 1 == flags) /* Single-write op or first-packet-of-several op */ { in_uint16_le(s, ptype0); in_uint16_le(s, ptype1); DEBUG_CLIPBOARD(("ptype0 is %d, ptype1 is %d\n", ptype0, ptype1)); - if (1 == ptype0 && 0 == ptype1) { + if (1 == ptype0 && 0 == ptype1) + { cliprdr_handle_first_handshake(s); return; - } else if (3 == ptype0 && 1 == ptype1) + } + else if (3 == ptype0 && 1 == ptype1) { // Acknowledgment on our format announce. Do we care? Not right now. // There is a strange pad in this packet that we might need some time, // but probably not. DEBUG_CLIPBOARD(("Received format announce ACK\n")); + failed_clipboard_acks = 0; return; - } else if (2 == ptype0 && 0 == ptype1) + } + else if (3 == ptype0 && 2 == ptype1) + { + DEBUG_CLIPBOARD(("Received failed clipboard format announce ACK, retrying\n")); + + /* This is a fairly portable way to sleep 1/10 of + a second.. */ + timeval.tv_sec = 0; + timeval.tv_usec = 100; + select(0, NULL, NULL, NULL, &timeval); + if (failed_clipboard_acks < 3) + { + + cliprdr_send_format_announce(); + /* Make sure we don't get stuck in this loop */ + failed_clipboard_acks++; + } + else + { + warning("Reached maximum number of clipboard format announce attempts. Pasting in Windows probably won't work well now.\n"); + } + } + else if (2 == ptype0 && 0 == ptype1) { cliprdr_register_server_formats(s); cliprdr_select_X_clipboards(); cliprdr_ack_format_list(); return; - } else if (5 == ptype0 && 1 == ptype1) + } + else if (5 == ptype0 && 1 == ptype1) { - cliprdr_handle_server_data(length, s); - } else if (4 == ptype0 && 0 == ptype1) + cliprdr_handle_server_data(length, flags, s); + } + else if (4 == ptype0 && 0 == ptype1) { cliprdr_handle_server_data_request(s); } - + + } + else + { + DEBUG_CLIPBOARD(("Handling middle or last packet\n")); + cliprdr_handle_server_data(length, flags, s); } } +void +cliprdr_ipc_primary_lost(unsigned char *data, uint16 length) +{ + DEBUG_CLIPBOARD(("cliprdr_ipc_primary_lost called\n")); + if (!have_primary) + cliprdr_send_format_announce(); + rdesktop_is_selection_owner = 0; +} -void cliprdr_init(void) + +void +cliprdr_init(void) { primary_atom = XInternAtom(display, "PRIMARY", False); clipboard_atom = XInternAtom(display, "CLIPBOARD", False); targets_atom = XInternAtom(display, "TARGETS", False); timestamp_atom = XInternAtom(display, "TIMESTAMP", False); rdesktop_clipboard_target_atom = XInternAtom(display, "_RDESKTOP_CLIPBOARD_TARGET", False); + incr_atom = XInternAtom(display, "INCR", False); + targets[0] = targets_atom; + targets[1] = XInternAtom(display, "TEXT", False); + targets[2] = XInternAtom(display, "UTF8_STRING", False); + targets[3] = XInternAtom(display, "text/unicode", False); + targets[4] = XInternAtom(display, "TIMESTAMP", False); + targets[5] = XInternAtom(display, "STRING", False); + ipc_register_ipcnotify(RDESKTOP_IPC_CLIPRDR_FORMAT_ANNOUNCE, cliprdr_ipc_format_announce); + ipc_register_ipcnotify(RDESKTOP_IPC_CLIPRDR_FORMAT_ANNOUNCE, cliprdr_ipc_primary_lost); + + }