Merge pull request #1216 from profanity-im/feature/issue-156-clipboard

Paste command

Makefile.am

@@ -41,6 +41,7 @@ core_sources = \
 	src/tools/http_upload.h \
 	src/tools/autocomplete.c src/tools/autocomplete.h \
 	src/tools/tinyurl.c src/tools/tinyurl.h \
+	src/tools/clipboard.c src/tools/clipboard.h \
 	src/config/files.c src/config/files.h \
 	src/config/conflists.c src/config/conflists.h \
 	src/config/accounts.c src/config/accounts.h \
@@ -81,6 +82,7 @@ unittest_sources = \
 	src/tools/parser.h \
 	src/tools/autocomplete.c src/tools/autocomplete.h \
 	src/tools/tinyurl.c src/tools/tinyurl.h \
+	src/tools/clipboard.c src/tools/clipboard.h \
 	src/config/accounts.h \
 	src/config/account.c src/config/account.h \
 	src/config/files.c src/config/files.h \

configure.ac

@@ -66,8 +66,8 @@ AC_ARG_WITH([xscreensaver],
     [AS_HELP_STRING([--with-xscreensaver], [use libXScrnSaver to determine idle time])])
 AC_ARG_WITH([themes],
     [AS_HELP_STRING([--with-themes[[=PATH]]], [install themes (default yes)])])
-AC_ARG_ENABLE([icons],
-    [AS_HELP_STRING([--enable-icons], [enable GTK tray icons])])
+AC_ARG_ENABLE([icons-and-clipboard],
+    [AS_HELP_STRING([--enable-icons-and-clipboard], [enable GTK tray icons and clipboard paste support])])
 
 ### plugins
 
@@ -172,12 +172,12 @@ PKG_CHECK_MODULES([curl], [libcurl], [],
     [AC_CHECK_LIB([curl], [main], [],
         [AC_MSG_ERROR([libcurl is required for profanity])])])
 
-AS_IF([test "x$enable_icons" != xno],
+AS_IF([test "x$enable_icons_and_clipboard" != xno],
     [PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.24.10],
         [AC_DEFINE([HAVE_GTK], [1], [libgtk module])],
-        [AS_IF([test "x$enable_icons" = xyes],
+        [AS_IF([test "x$enable_icons_and_clipboard" = xyes],
             [AC_MSG_ERROR([gtk+-2.0 or higher is required for icons])],
-            [AC_MSG_NOTICE([gtk+-2.0 not found, icons not enabled])])])])
+            [AC_MSG_NOTICE([gtk+-2.0 not found, icons and clipboard not enabled])])])])
 
 AS_IF([test "x$PLATFORM" = xosx],
     [AC_CHECK_FILE([/usr/local/opt/readline/lib],

src/command/cmd_defs.c

@@ -2415,6 +2415,19 @@ static struct cmd_t command_defs[] =
         CMD_NOARGS
         CMD_NOEXAMPLES
     },
+
+    { "/paste",
+        parse_args, 0, 0, NULL,
+        CMD_NOSUBFUNCS
+        CMD_MAINFUNC(cmd_paste)
+        CMD_NOTAGS
+        CMD_SYN(
+            "/paste")
+        CMD_DESC(
+            "Paste clipboard.")
+        CMD_NOARGS
+        CMD_NOEXAMPLES
+    },
 };
 
 static GHashTable *search_index;

src/command/cmd_funcs.c

@@ -93,6 +93,7 @@
 
 #ifdef HAVE_GTK
 #include "ui/tray.h"
+#include "tools/clipboard.h"
 #endif
 
 #ifdef HAVE_PYTHON
@@ -8575,3 +8576,48 @@ cmd_reload(ProfWin *window, const char *const command, gchar **args)
     prefs_reload();
     return TRUE;
 }
+
+gboolean
+cmd_paste(ProfWin *window, const char *const command, gchar **args)
+{
+#ifdef HAVE_GTK
+    char *clipboard_buffer = clipboard_get();
+
+    if (clipboard_buffer) {
+        switch (window->type) {
+             case WIN_MUC:
+                {
+                    ProfMucWin *mucwin = (ProfMucWin*)window;
+                    assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
+                    cl_ev_send_muc_msg(mucwin, clipboard_buffer, NULL);
+                    break;
+                }
+            case WIN_CHAT:
+                {
+                    ProfChatWin *chatwin = (ProfChatWin*)window;
+                    assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
+                    cl_ev_send_msg(chatwin, clipboard_buffer, NULL);
+                    break;
+                }
+            case WIN_PRIVATE:
+                {
+                    ProfPrivateWin *privatewin = (ProfPrivateWin*)window;
+                    assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK);
+                    cl_ev_send_priv_msg(privatewin, clipboard_buffer, NULL);
+                    break;
+                }
+            case WIN_CONSOLE:
+            case WIN_XML:
+            default:
+                    cons_bad_cmd_usage(command);
+                    break;
+        }
+
+        free(clipboard_buffer);
+    }
+#else
+    cons_show("This version of Profanity has not been built with GTK support enabled. It is needed for the clipboard feature to work.");
+#endif
+
+    return TRUE;
+}

src/command/cmd_funcs.h

@@ -228,4 +228,6 @@ gboolean cmd_omemo_clear_device_list(ProfWin *window, const char *const command,
 
 gboolean cmd_save(ProfWin *window, const char *const command, gchar **args);
 gboolean cmd_reload(ProfWin *window, const char *const command, gchar **args);
+
+gboolean cmd_paste(ProfWin *window, const char *const command, gchar **args);
 #endif

src/tools/clipboard.c

@@ -0,0 +1,69 @@
+/*
+ * clipboard.c
+ *
+ * Copyright (C) 2019 Michael Vetter <jubalh@iodoru.org>
+ *
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link the code of portions of this program with the OpenSSL library under
+ * certain conditions as described in each individual source file, and
+ * distribute linked combinations including the two.
+ *
+ * You must obey the GNU General Public License in all respects for all of the
+ * code used other than OpenSSL. If you modify file(s) with this exception, you
+ * may extend this exception to your version of the file(s), but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version. If you delete this exception statement from all
+ * source files in the program, then also delete it here.
+ *
+ */
+
+#include "config.h"
+
+#ifdef HAVE_GTK
+#include <gtk/gtk.h>
+#include <glib.h>
+#include <stdlib.h>
+
+#include "log.h"
+
+/*
+For now we rely on tray_init(void)
+
+void clipboard_init(int argc, char **argv) {
+    gtk_init(&argc, &argv);
+}
+*/
+
+char *clipboard_get(void) {
+    gchar *clip;
+
+    GtkClipboard *cl = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+    gtk_clipboard_clear(cl);
+
+    if(cl==NULL) {
+        log_error("Could not get clipboard");
+        return NULL;
+    }
+
+    //while(!gtk_clipboard_wait_is_text_available(cld)) {}
+
+    clip = gtk_clipboard_wait_for_text(cl);
+    return clip;
+}
+
+#endif

src/tools/clipboard.h

@@ -0,0 +1,42 @@
+/*
+ * clipboard.h
+ *
+ * Copyright (C) 2019 Michael Vetter <jubalh@iodoru.org>
+ *
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link the code of portions of this program with the OpenSSL library under
+ * certain conditions as described in each individual source file, and
+ * distribute linked combinations including the two.
+ *
+ * You must obey the GNU General Public License in all respects for all of the
+ * code used other than OpenSSL. If you modify file(s) with this exception, you
+ * may extend this exception to your version of the file(s), but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version. If you delete this exception statement from all
+ * source files in the program, then also delete it here.
+ *
+ */
+
+#ifndef UI_CLIPBOARD_H
+#define UI_CLIPBOARD_H
+
+#ifdef HAVE_GTK
+char *clipboard_get(void);
+#endif
+
+#endif