===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/input.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- src/usr.bin/tmux/input.c	2017/01/07 15:28:13	1.107
+++ src/usr.bin/tmux/input.c	2017/01/22 19:00:01	1.108
@@ -1,4 +1,4 @@
-/* $OpenBSD: input.c,v 1.107 2017/01/07 15:28:13 nicm Exp $ */
+/* $OpenBSD: input.c,v 1.108 2017/01/22 19:00:01 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -18,6 +18,9 @@
 
 #include <sys/types.h>
 
+#include <netinet/in.h>
+
+#include <resolv.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -106,6 +109,7 @@
 static void	input_reset_cell(struct input_ctx *);
 
 static void	input_osc_4(struct window_pane *, const char *);
+static void	input_osc_52(struct window_pane *, const char *);
 static void	input_osc_104(struct window_pane *, const char *);
 
 /* Transition entry/exit handlers. */
@@ -1862,6 +1866,9 @@
 	case 4:
 		input_osc_4(ictx->wp, p);
 		break;
+	case 52:
+		input_osc_52(ictx->wp, p);
+		break;
 	case 12:
 		if (*p != '?') /* ? is colour request */
 			screen_set_cursor_colour(ictx->ctx.s, p);
@@ -2009,6 +2016,40 @@
 bad:
 	log_debug("bad OSC 4: %s", p);
 	free(copy);
+}
+
+/* Handle the OSC 52 sequence for setting the clipboard. */
+static void
+input_osc_52(struct window_pane *wp, const char *p)
+{
+	char			*end;
+	size_t			 len;
+	u_char			*out;
+	int			 outlen;
+	struct screen_write_ctx	 ctx;
+
+	if ((end = strchr(p, ';')) == NULL)
+		return;
+	end++;
+	if (*end == '\0')
+		return;
+
+	len = (strlen(end) / 4) * 3;
+	if (len == 0)
+		return;
+
+	out = xmalloc(len);
+	if ((outlen = b64_pton(end, out, len)) == -1) {
+		free(out);
+		return;
+	}
+
+	if (options_get_number(global_options, "set-clipboard")) {
+		screen_write_start(&ctx, wp, NULL);
+		screen_write_setselection(&ctx, out, outlen);
+		screen_write_stop(&ctx);
+	}
+	paste_add(out, outlen);
 }
 
 /* Handle the OSC 104 sequence for unsetting (multiple) palette entries. */