Revision: 5722 http://geany.svn.sourceforge.net/geany/?rev=5722&view=rev Author: ntrel Date: 2011-04-13 15:04:37 +0000 (Wed, 13 Apr 2011)

Log Message: ----------- Fix Ctrl-Shift-[CV] keybindings to work outside the VTE.

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

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-13 12:59:20 UTC (rev 5721) +++ trunk/ChangeLog 2011-04-13 15:04:37 UTC (rev 5722) @@ -8,6 +8,8 @@ * src/templates.c, src/utils.c, src/toolbar.c, src/utils.h, src/keyfile.c, src/filetypes.c, src/editor.c, src/symbols.c: Make utils_build_path() return a copy for safety. + * src/keybindings.c: + Fix Ctrl-Shift-[CV] keybindings to work outside the VTE.

2011-04-12 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2011-04-13 12:59:20 UTC (rev 5721) +++ trunk/src/keybindings.c 2011-04-13 15:04:37 UTC (rev 5722) @@ -1076,13 +1076,13 @@ GeanyKeyGroup *group; GtkWidget *widget;

+ if (gtk_window_get_focus(GTK_WINDOW(main_widgets.window)) != vc->vte) + 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; if (! vc->enable_bash_keys) return FALSE; - if (gtk_window_get_focus(GTK_WINDOW(main_widgets.window)) != vc->vte) - return FALSE; /* prevent menubar flickering: */ if (state == GDK_SHIFT_MASK && (keyval >= GDK_a && keyval <= GDK_z)) return FALSE;

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