--- sourceforge.net/trunk/rdesktop/xclip.c	2003/09/15 07:59:36	468
+++ sourceforge.net/trunk/rdesktop/xclip.c	2005/08/02 09:27:46	942
@@ -36,6 +36,54 @@
 static int have_primary = 0;
 static int rdesktop_is_selection_owner = 0;
 
+static int g_waiting_for_INCR = 0;
+static uint8 *g_clip_buffer = 0;
+static uint32 g_clip_buflen = 0;
+
+/* Replace CR-LF to LF (well, rather removing all CR:s) This is done
+   in-place. The length is updated. Handles embedded nulls */
+static void
+crlf2lf(uint8 * data, uint32 * length)
+{
+	uint8 *dst, *src;
+	src = dst = data;
+	while (src < data + *length)
+	{
+		if (*src != '\x0d')
+			*dst++ = *src;
+		src++;
+	}
+	*length = dst - data;
+}
+
+/* Translate LF to CR-LF. To do this, we must allocate more memory.  
+   The length is updated. */
+static uint8 *
+lf2crlf(uint8 * data, uint32 * length)
+{
+	uint8 *result, *p, *o;
+
+	/* Worst case: Every char is LF */
+	result = xmalloc(*length * 2);
+
+	p = data;
+	o = result;
+
+	while (p < data + *length)
+	{
+		if (*p == '\x0a')
+			*o++ = '\x0d';
+		*o++ = *p++;
+	}
+	*length = o - result;
+
+	/* Convenience */
+	*o++ = '\0';
+
+	return result;
+}
+
+
 static void
 xclip_provide_selection(XSelectionRequestEvent * req, Atom type, unsigned int format, uint8 * data,
 			uint32 length)
@@ -56,10 +104,12 @@
 	XSendEvent(g_display, req->requestor, False, NoEventMask, &xev);
 }
 
+#ifndef MAKE_PROTO
 void
 xclip_handle_SelectionNotify(XSelectionEvent * event)
 {
 	unsigned long nitems, bytes_left;
+	XWindowAttributes wa;
 	Atom type, best_target, text_target;
 	Atom *supported_targets;
 	int res, i, format;
@@ -86,6 +136,7 @@
 		goto fail;
 	}
 
+	/* Negotiate target format */
 	if (event->target == targets_atom)
 	{
 		/* FIXME: We should choose format here based on what the server wanted */
@@ -102,6 +153,7 @@
 				{
 					DEBUG_CLIPBOARD(("Other party supports TEXT, choosing that as best_target\n"));
 					best_target = text_target;
+					break;
 				}
 			}
 			XFree(data);
@@ -114,11 +166,57 @@
 
 	if (type == incr_atom)
 	{
-		warning("We don't support INCR transfers at this time. Try cutting less data.\n");
-		goto fail;
+		DEBUG_CLIPBOARD(("Received INCR.\n"));
+
+		XGetWindowAttributes(g_display, g_wnd, &wa);
+		if ((wa.your_event_mask | PropertyChangeMask) != wa.your_event_mask)
+		{
+			XSelectInput(g_display, g_wnd, (wa.your_event_mask | PropertyChangeMask));
+		}
+		XDeleteProperty(g_display, g_wnd, type);
+		XFree(data);
+		g_waiting_for_INCR = 1;
+
+		if ((XGetWindowProperty(g_display, g_wnd, rdesktop_clipboard_target_atom, 0,
+					4096L, True, AnyPropertyType,
+					&type, &format, &nitems, &bytes_left, &data) != Success))
+		{
+			DEBUG_CLIPBOARD(("XGetWindowProperty failed.\n"));
+			goto fail;
+		}
+		else
+		{
+			uint8 *translated_data;
+			uint32 length = nitems;
+
+			translated_data = lf2crlf(data, &length);
+
+			g_clip_buffer = (uint8 *) xmalloc(length);
+			strncpy((char *) g_clip_buffer, (char *) translated_data, length);
+			xfree(translated_data);
+			g_clip_buflen = length;
+
+			XFree(data);
+			return;
+		}
 	}
 
-	cliprdr_send_data(data, nitems + 1);
+	/* Translate linebreaks, but only if not getting data from
+	   other rdesktop instance */
+	if (event->target != rdesktop_clipboard_formats_atom)
+	{
+		uint8 *translated_data;
+		uint32 length = nitems;
+
+		DEBUG_CLIPBOARD(("Translating linebreaks before sending data\n"));
+		translated_data = lf2crlf(data, &length);
+		cliprdr_send_data(translated_data, length + 1);
+		xfree(translated_data);	/* Not the same thing as XFree! */
+	}
+	else
+	{
+		cliprdr_send_data(data, nitems + 1);
+	}
 	XFree(data);
 
 	if (!rdesktop_is_selection_owner)
@@ -186,9 +284,64 @@
 {
 	unsigned long nitems, bytes_left;
 	int format, res;
+	XWindowAttributes wa;
 	uint8 *data;
 	Atom type;
 
+	if (event->state == PropertyNewValue && g_waiting_for_INCR)
+	{
+		DEBUG_CLIPBOARD(("x_clip_handle_PropertyNotify: g_waiting_for_INCR != 0\n"));
+		if ((XGetWindowProperty(g_display, g_wnd, rdesktop_clipboard_target_atom, 0,
+					4096L, True, AnyPropertyType,
+					&type, &format, &nitems, &bytes_left, &data) != Success))
+		{
+			XFree(data);
+			return;
+		}
+
+		if (nitems == 0)
+		{
+			XGetWindowAttributes(g_display, g_wnd, &wa);
+			XSelectInput(g_display, g_wnd, (wa.your_event_mask ^ PropertyChangeMask));
+			XFree(data);
+			g_waiting_for_INCR = 0;
+
+			if (g_clip_buflen > 0)
+			{
+				cliprdr_send_data(g_clip_buffer, g_clip_buflen + 1);
+
+				if (!rdesktop_is_selection_owner)
+					cliprdr_send_text_format_announce();
+
+				xfree(g_clip_buffer);
+				g_clip_buffer = 0;
+				g_clip_buflen = 0;
+			}
+		}
+		else
+		{
+			uint8 *translated_data;
+			uint32 length = nitems;
+			uint8 *tmp;
+
+			DEBUG_CLIPBOARD(("Translating linebreaks before sending data\n"));
+			translated_data = lf2crlf(data, &length);
+
+			tmp = xmalloc(length + g_clip_buflen);
+			strncpy((char *) tmp, (char *) g_clip_buffer, g_clip_buflen);
+			xfree(g_clip_buffer);
+
+			strncpy((char *) (tmp + g_clip_buflen), (char *) translated_data, length);
+			xfree(translated_data);
+
+			g_clip_buffer = tmp;
+			g_clip_buflen += length;
+
+			XFree(data);
+			return;
+		}
+	}
+
 	if (event->atom != rdesktop_clipboard_formats_atom)
 		return;
 
@@ -214,10 +367,11 @@
 	cliprdr_send_text_format_announce();
 	rdesktop_is_selection_owner = 0;
 }
+#endif
 
 
 void
-ui_clip_format_announce(char *data, uint32 length)
+ui_clip_format_announce(uint8 * data, uint32 length)
 {
 	XSetSelectionOwner(g_display, primary_atom, g_wnd, g_last_gesturetime);
 	if (XGetSelectionOwner(g_display, primary_atom) != g_wnd)
@@ -238,8 +392,23 @@
 
 
 void
-ui_clip_handle_data(char *data, uint32 length)
+ui_clip_handle_data(uint8 * data, uint32 length)
 {
+	if (selection_request.target != rdesktop_clipboard_formats_atom)
+	{
+		uint8 *firstnull;
+
+		/* translate linebreaks */
+		crlf2lf(data, &length);
+
+		/* Only send data up to null byte, if any */
+		firstnull = (uint8 *) strchr((char *) data, '\0');
+		if (firstnull)
+		{
+			length = firstnull - data + 1;
+		}
+	}
+
 	xclip_provide_selection(&selection_request, XA_STRING, 8, data, length - 1);
 }
 
@@ -303,7 +472,7 @@
 	incr_atom = XInternAtom(g_display, "INCR", False);
 	targets[0] = targets_atom;
 	targets[1] = XInternAtom(g_display, "TEXT", False);
-	targets[2] = XInternAtom(g_display, "UTF8_STRING", False);
+	targets[2] = XInternAtom(g_display, "STRING", False);
 	targets[3] = XInternAtom(g_display, "text/unicode", False);
 	targets[4] = XInternAtom(g_display, "TIMESTAMP", False);
 	targets[5] = XA_STRING;