Merge commit 'v1.2.1.22' into stripped

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/CMakeLists.txt
	src/Makefile.am
	src/guichan/gui.cpp

1 files changed, 14 insertions, 1 deletions

diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp
index 3e37afd9d..3e9e09a5c 100644
--- a/src/utils/copynpaste.cpp
+++ b/src/utils/copynpaste.cpp
@@ -407,8 +407,17 @@ bool retrieveBuffer(std::string& text, std::string::size_type& pos)
     return false;
 }
 
+bool runxsel(std::string& text, const char *p1, const char *p2 = nullptr);
+
 bool sendBuffer(std::string& text)
 {
+    runxsel(text, "-i");
+    runxsel(text, "-b", "-i");
+    return true;
+}
+
+bool runxsel(std::string& text, const char *p1, const char *p2)
+{
     pid_t pid;
     int fd[2];
 
@@ -432,7 +441,11 @@ bool sendBuffer(std::string& text)
             }
             close(fd[0]);
         }
-        execl("/usr/bin/xsel", "xsel", "-i", (char *)nullptr);
+        if (p2)
+            execl("/usr/bin/xsel", "xsel", p1, p2, (char *)nullptr);
+        else
+            execl("/usr/bin/xsel", "xsel", p1, (char *)nullptr);
+
         exit(1);
     }