SF.net SVN: geany: [1420] trunk

[ntrel at users.sourceforge.net]

Revision: 1420
          http://svn.sourceforge.net/geany/?rev=1420&view=rev
Author:   ntrel
Date:     2007-03-24 09:10:20 -0700 (Sat, 24 Mar 2007)

Log Message:
-----------
Ignore Caps Lock in keybindings_got_event() (could cause problems
with e.g. Shift-F9).

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-03-24 12:50:19 UTC (rev 1419)
+++ trunk/ChangeLog	2007-03-24 16:10:20 UTC (rev 1420)
@@ -8,6 +8,9 @@
    Move dialogs_show_includes_arguments_*() to build.c.
    Move on_includes_arguments_*dialog_response() to build.c.
    Make several build functions static.
+ * src/keybindings.c:
+   Ignore Caps Lock in keybindings_got_event() (could cause problems
+   with e.g. Shift-F9).
 
 
 2007-03-23  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c	2007-03-24 12:50:19 UTC (rev 1419)
+++ trunk/src/keybindings.c	2007-03-24 16:10:20 UTC (rev 1420)
@@ -524,6 +524,11 @@
 {
 	guint i, k;
 
+	if (event->state & GDK_LOCK_MASK)
+		event->state -= GDK_LOCK_MASK;	// ignore caps-lock
+	// ignore numlock key, not necessary but nice
+	if (event->state & GDK_MOD2_MASK) event->state -= GDK_MOD2_MASK;
+
 	if (check_fixed_kb(event)) return TRUE;
 
 	for (i = 0; i < GEANY_MAX_KEYS; i++)
@@ -538,9 +543,6 @@
 			if (keys[i]->key >= GDK_a && keys[i]->key <= GDK_z) k = keys[i]->key - 32;
 		}
 
-		// ignore numlock key, not necessary but nice
-		if (event->state & GDK_MOD2_MASK) event->state -= GDK_MOD2_MASK;
-
 		if (event->keyval == k && event->state == keys[i]->mods)
 		{
 			// call the corresponding callback function for this shortcut


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