From f0145f5081a41aa0d638219e8f352e0d5663df37 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Wed, 14 Jan 2004 13:47:49 +0000 Subject: [PATCH] r3302: Grab all combos of lock keys. --- ROX-Filer/src/icon.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/ROX-Filer/src/icon.c b/ROX-Filer/src/icon.c index 68f2c9ac..c2df3222 100644 --- a/ROX-Filer/src/icon.c +++ b/ROX-Filer/src/icon.c @@ -1190,20 +1190,14 @@ static gboolean grabKey(MyKey *key) GRAB(key, 0); + /* Here we grab all combinations of well known modifiers */ GRAB(key, ScrollLockMask); GRAB(key, NumLockMask); GRAB(key, CapsLockMask); - - if (key->modifier != AnyModifier && key->modifier != 0) - { - /* Here we grab all combinations of well known - * modifiers. - */ - GRAB(key, ScrollLockMask | NumLockMask); - GRAB(key, ScrollLockMask | CapsLockMask); - GRAB(key, CapsLockMask | NumLockMask); - GRAB(key, ScrollLockMask | CapsLockMask | NumLockMask); - } + GRAB(key, ScrollLockMask | NumLockMask); + GRAB(key, ScrollLockMask | CapsLockMask); + GRAB(key, CapsLockMask | NumLockMask); + GRAB(key, ScrollLockMask | CapsLockMask | NumLockMask); gdk_flush(); return gdk_error_trap_pop() == Success; @@ -1221,14 +1215,10 @@ static gboolean ungrabKey(MyKey *key) UNGRAB(key, ScrollLockMask); UNGRAB(key, NumLockMask); UNGRAB(key, CapsLockMask); - - if (key->modifier != AnyModifier && key->modifier != 0) - { - UNGRAB(key, ScrollLockMask | NumLockMask); - UNGRAB(key, ScrollLockMask | CapsLockMask); - UNGRAB(key, CapsLockMask | NumLockMask); - UNGRAB(key, ScrollLockMask | CapsLockMask | NumLockMask); - } + UNGRAB(key, ScrollLockMask | NumLockMask); + UNGRAB(key, ScrollLockMask | CapsLockMask); + UNGRAB(key, CapsLockMask | NumLockMask); + UNGRAB(key, ScrollLockMask | CapsLockMask | NumLockMask); gdk_flush(); return gdk_error_trap_pop() == Success; -- 2.11.4.GIT