From b46dbcc3633cd28411e3a301d7082098699e85ca Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 29 Oct 2019 14:30:25 +0100 Subject: [PATCH 1/4] Add clipboard feature Use GTK to take the text from the clipboard. Add `/paste` command which pastes this text now to console window. --- src/command/cmd_defs.c | 13 +++++++++ src/command/cmd_funcs.c | 14 +++++++++ src/command/cmd_funcs.h | 2 ++ src/tools/clipboard.c | 65 +++++++++++++++++++++++++++++++++++++++++ src/tools/clipboard.h | 43 +++++++++++++++++++++++++++ 5 files changed, 137 insertions(+) create mode 100644 src/tools/clipboard.c create mode 100644 src/tools/clipboard.h diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c index a29576bd..3f231799 100644 --- a/src/command/cmd_defs.c +++ b/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; diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index ad9a2fb8..dee1b9b5 100644 --- a/src/command/cmd_funcs.c +++ b/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,16 @@ 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 *buf = clipboard_get(); + cons_show(buf); +#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; +} diff --git a/src/command/cmd_funcs.h b/src/command/cmd_funcs.h index 9102e1e1..48d94b27 100644 --- a/src/command/cmd_funcs.h +++ b/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 diff --git a/src/tools/clipboard.c b/src/tools/clipboard.c new file mode 100644 index 00000000..8904e3f8 --- /dev/null +++ b/src/tools/clipboard.c @@ -0,0 +1,65 @@ +/* + * clipboard.c + * + * Copyright (C) 2019 Michael Vetter + * + * 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 . + * + * 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 +#include +#include + +#include "log.h" + +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 diff --git a/src/tools/clipboard.h b/src/tools/clipboard.h new file mode 100644 index 00000000..cb3d517b --- /dev/null +++ b/src/tools/clipboard.h @@ -0,0 +1,43 @@ +/* + * clipboard.h + * + * Copyright (C) 2019 Michael Vetter + * + * 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 . + * + * 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 +void clipboard_init(int argc, char **argv); +char *clipboard_get(void); +#endif + +#endif From 900a0451a7b7cab6af3826134b623560c0452fe6 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 29 Oct 2019 14:31:17 +0100 Subject: [PATCH 2/4] Adjust tray configure switch to also include clipboard General GTK. --- Makefile.am | 2 ++ configure.ac | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index bafe4dfc..c49b6ba6 100644 --- a/Makefile.am +++ b/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 \ diff --git a/configure.ac b/configure.ac index 52a19dc1..63eae494 100644 --- a/configure.ac +++ b/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], From 291f9de1e998f3deb1fb34cb221dca9bfdbde7f1 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 29 Oct 2019 14:57:03 +0100 Subject: [PATCH 3/4] Send clipboard via /paste New command `/paste` that sends the clipboard in MUC, Chat etc windows. Fix https://github.com/profanity-im/profanity/issues/156 --- src/command/cmd_funcs.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index dee1b9b5..cc26bba2 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -8581,8 +8581,40 @@ gboolean cmd_paste(ProfWin *window, const char *const command, gchar **args) { #ifdef HAVE_GTK - char *buf = clipboard_get(); - cons_show(buf); + 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 From 5d6cb3c74112d79ce964dcb834ca7e27e66014a3 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 29 Oct 2019 15:01:07 +0100 Subject: [PATCH 4/4] Dont use clipboard_init yet For now we initialize gtk in tray_init(). Should maybe use a general function and check in tray_init and clipboard_init whether gtk was already initialized. --- src/tools/clipboard.c | 4 ++++ src/tools/clipboard.h | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tools/clipboard.c b/src/tools/clipboard.c index 8904e3f8..67abd8d2 100644 --- a/src/tools/clipboard.c +++ b/src/tools/clipboard.c @@ -41,9 +41,13 @@ #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; diff --git a/src/tools/clipboard.h b/src/tools/clipboard.h index cb3d517b..258b5a31 100644 --- a/src/tools/clipboard.h +++ b/src/tools/clipboard.h @@ -36,7 +36,6 @@ #define UI_CLIPBOARD_H #ifdef HAVE_GTK -void clipboard_init(int argc, char **argv); char *clipboard_get(void); #endif