SF.net SVN: geany: [2301] branches/plugin-keybindings
ntrel at users.sourceforge.net
ntrel at xxxxx
Mon Mar 3 17:28:15 UTC 2008
Revision: 2301
http://geany.svn.sourceforge.net/geany/?rev=2301&view=rev
Author: ntrel
Date: 2008-03-03 09:28:15 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
Re-enable focus commands in the VTE.
Modified Paths:
--------------
branches/plugin-keybindings/ChangeLog
branches/plugin-keybindings/src/keybindings.c
Modified: branches/plugin-keybindings/ChangeLog
===================================================================
--- branches/plugin-keybindings/ChangeLog 2008-03-03 17:05:00 UTC (rev 2300)
+++ branches/plugin-keybindings/ChangeLog 2008-03-03 17:28:15 UTC (rev 2301)
@@ -3,6 +3,8 @@
* src/prefs.c:
Fix segfault when setting custom keybindings in Prefs dialog.
Fix clearing a shortcut when overriding it in Prefs dialog.
+ * src/keybindings.c:
+ Re-enable focus commands in the VTE.
2008-02-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: branches/plugin-keybindings/src/keybindings.c
===================================================================
--- branches/plugin-keybindings/src/keybindings.c 2008-03-03 17:05:00 UTC (rev 2300)
+++ branches/plugin-keybindings/src/keybindings.c 2008-03-03 17:28:15 UTC (rev 2301)
@@ -798,7 +798,7 @@
static gboolean check_vte(GdkModifierType state, guint keyval)
{
- /*guint i;*/
+ guint i;
GtkWidget *widget;
if (! vc->enable_bash_keys)
@@ -811,14 +811,14 @@
if (state == 0 && (keyval < GDK_F1 || keyval > GDK_F35)) /* e.g. backspace */
return FALSE;
-#if 0 /* tmp */
/* make focus commands override any bash commands */
- for (i = GEANY_KEYS_GROUP_FOCUS; i < GEANY_KEYS_GROUP_TABS; i++)
+ for (i = 0; i < GEANY_KEYS_FOCUS_COUNT; i++)
{
- if (state == keys[i]->mods && keyval == keys[i]->key)
+ KeyBinding *kb = keybindings_lookup_item(GEANY_KEYGROUP_FOCUS, i);
+
+ if (state == kb->mods && keyval == kb->key)
return FALSE;
}
-#endif
/* Temporarily disable the menus to prevent conflicting menu accelerators
* from overriding the VTE bash shortcuts.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list