SF.net SVN: geany:[5624] trunk

[ntrel at users.sourceforge.net]

Revision: 5624
          http://geany.svn.sourceforge.net/geany/?rev=5624&view=rev
Author:   ntrel
Date:     2011-03-24 17:59:05 +0000 (Thu, 24 Mar 2011)

Log Message:
-----------
Make VTE copy/paste shortcuts work if 'Override Geany
keybindings' is not set.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/keybindings.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-03-24 17:33:47 UTC (rev 5623)
+++ trunk/ChangeLog	2011-03-24 17:59:05 UTC (rev 5624)
@@ -5,6 +5,9 @@
  * src/keybindings.c, src/vte.c:
    Add fixed shortcuts for VTE copy (Ctrl-Shift-C) and paste
    (Ctrl-Shift-V).
+ * src/keybindings.c:
+   Make VTE copy/paste shortcuts work if 'Override Geany
+   keybindings' is not set.
 
 
 2011-03-24  Colomban Wendling  <colomban(at)geany(dot)org>

Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c	2011-03-24 17:33:47 UTC (rev 5623)
+++ trunk/src/keybindings.c	2011-03-24 17:59:05 UTC (rev 5624)
@@ -1074,6 +1074,9 @@
 	GeanyKeyGroup *group;
 	GtkWidget *widget;
 
+	/* let VTE copy/paste override any user keybinding */
+	if (state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK) && (keyval == GDK_c || keyval == GDK_v))
+		return TRUE;
 	if (! vc->enable_bash_keys)
 		return FALSE;
 	if (gtk_window_get_focus(GTK_WINDOW(main_widgets.window)) != vc->vte)
@@ -1083,9 +1086,6 @@
 		return FALSE;
 	if (state == 0 && (keyval < GDK_F1 || keyval > GDK_F35))	/* e.g. backspace */
 		return FALSE;
-	/* let VTE copy/paste override any user keybinding */
-	if (state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK) && (keyval == GDK_c || keyval == GDK_v))
-		return TRUE;
 
 	/* make focus commands override any bash commands */
 	group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_FOCUS);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.