Revision: 2039 http://geany.svn.sourceforge.net/geany/?rev=2039&view=rev Author: ntrel Date: 2007-11-08 08:58:20 -0800 (Thu, 08 Nov 2007)
Log Message: ----------- Allow VTE to interpret F-keys (except if they're focus commands).
Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-11-08 16:39:34 UTC (rev 2038) +++ trunk/ChangeLog 2007-11-08 16:58:20 UTC (rev 2039) @@ -13,6 +13,8 @@ Set Ctrl-Alt-P as default Prefs KB. Change Decrease Indent default KB to Ctrl-U (very common action, and Ctrl-U was unused). + * src/keybindings.c: + Allow VTE to interpret F-keys (except if they're focus commands).
2007-11-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2007-11-08 16:39:34 UTC (rev 2038) +++ trunk/src/keybindings.c 2007-11-08 16:58:20 UTC (rev 2039) @@ -680,7 +680,7 @@
#ifdef HAVE_VTE -static gboolean check_vte(GdkEventKey *event, guint keyval) +static gboolean check_vte(GdkModifierType state, guint keyval) { guint i; GtkWidget *widget; @@ -689,13 +689,13 @@ return FALSE; if (gtk_window_get_focus(GTK_WINDOW(app->window)) != vc->vte) return FALSE; - if (event->state == 0) + if (state == 0 && (keyval < GDK_F1 || keyval > GDK_F35)) return FALSE; // just to prevent menubar flickering
// make focus commands override any bash commands for (i = GEANY_KEYS_GROUP_FOCUS; i < GEANY_KEYS_GROUP_TABS; i++) { - if (event->state == keys[i]->mods && keyval == keys[i]->key) + if (state == keys[i]->mods && keyval == keys[i]->key) return FALSE; }
@@ -735,7 +735,7 @@
// special cases #ifdef HAVE_VTE - if (vte_info.have_vte && check_vte(event, keyval)) + if (vte_info.have_vte && check_vte(event->state, keyval)) return FALSE; #endif if (check_construct_completion(event))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.