summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorBerke Viktor <bviktor@hexchat.org>2012-10-31 05:18:20 +0100
committerBerke Viktor <bviktor@hexchat.org>2012-10-31 05:18:20 +0100
commit78b5f5625d130d53e74bf89492e20e75583e5ce9 (patch)
treec5476d448f3643ea7b0c561e2690966a677eee4f
parentea0d3059f44c1edc3fd762c5b921e43e535db290 (diff)
Make rawlog text copy behaviour consistent with the main text box
And make it close upon pressing Escape
-rw-r--r--src/fe-gtk/rawlog.c28
1 files changed, 27 insertions, 1 deletions
diff --git a/src/fe-gtk/rawlog.c b/src/fe-gtk/rawlog.c
index 051dd54c..c2c18fe2 100644
--- a/src/fe-gtk/rawlog.c
+++ b/src/fe-gtk/rawlog.c
@@ -34,6 +34,7 @@
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkvscrollbar.h>
 #include <gtk/gtkstock.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "../common/hexchat.h"
 #include "../common/hexchatc.h"
@@ -44,7 +45,7 @@
 #include "maingui.h"
 #include "rawlog.h"
 #include "xtext.h"
-
+#include "fkeys.h"
 
 static void
 close_rawlog (GtkWidget *wid, server *serv)
@@ -85,6 +86,28 @@ rawlog_savebutton (GtkWidget * wid, server *serv)
 	return FALSE;
 }
 
+static void
+rawlog_key_cb (GtkWidget * wid, GdkEventKey * key, gpointer userdata)
+{
+	/* Copy rawlog selection to clipboard when Ctrl+Shift+C is pressed,
+	 * but make sure not to copy twice, i.e. when auto-copy is enabled.
+	 */
+	if (!prefs.hex_text_autocopy_text &&
+		(key->keyval == GDK_c || key->keyval == GDK_C) &&
+		key->state & STATE_SHIFT &&
+		key->state & STATE_CTRL)
+	{
+		gtk_xtext_copy_selection (userdata);
+	}
+	/* close_rawlog is given to mg_create_generic_tab as
+	 * close_callback, it should take care of the rest.
+	 */
+	else if (key->keyval == GDK_Escape)
+	{
+		gtk_widget_destroy (wid);
+	}
+}
+
 void
 open_rawlog (struct server *serv)
 {
@@ -132,6 +155,9 @@ open_rawlog (struct server *serv)
 	gtkutil_button (hbox, GTK_STOCK_SAVE_AS, NULL, rawlog_savebutton,
 						 serv, _("Save As..."));
 
+	/* Copy selection to clipboard when Ctrl+Shift+C is pressed AND text auto-copy is disabled */
+	g_signal_connect (G_OBJECT (serv->gui->rawlog_window), "key_press_event", G_CALLBACK (rawlog_key_cb), serv->gui->rawlog_textlist);
+
 	gtk_widget_show (serv->gui->rawlog_window);
 }