[matchbox-wm][PATCH 1/2] wm: disregard Caps/Num/Scroll-lock when handling keypresses

[matchbox-wm][PATCH 1/2] wm: disregard Caps/Num/Scroll-lock when handling keypresses

[Jussi Kukkonen]

<alt>-Tab and other keybindings should work even when the various
locks are on.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 src/wm.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/wm.c b/src/wm.c
index 2d05ff0..00d88c5 100644
--- a/src/wm.c
+++ b/src/wm.c
@@ -1074,6 +1074,7 @@ wm_handle_keypress(Wm *w, XKeyEvent *e)
 #ifndef NO_KBD
   MBConfigKbdEntry *entry =  w->config->kb->entrys;
   Client *p = NULL;
+  int state = e->state;
 
 #ifdef USE_LIBSN
   Bool found = False;
@@ -1094,11 +1095,14 @@ wm_handle_keypress(Wm *w, XKeyEvent *e)
 	   return;
 	 }
        }
-   
+
+   /* Don't care about Caps/Num/Scroll lock here */
+   state &= ~w->config->kb->lock_mask;
+
    while (entry != NULL)
      {
        if (XKeycodeToKeysym(w->dpy, e->keycode, entry->index) == entry->key
-	   && e->state == entry->ModifierMask )
+	   && state == entry->ModifierMask )
 	{
 	  switch (entry->action) 
 	    {
-- 
2.8.0.rc3

[matchbox-wm][PATCH 2/2] keys: Grab all modifier combos

[Jussi Kukkonen]

Handle even the last combo, the one with all modifiers applied at the
same time.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 src/keys.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/keys.c b/src/keys.c
index 68c27dd..bc83bd4 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -495,7 +495,7 @@ keys_grab(Wm *w, Bool ungrab)
       int ignored_mask = 0;
 
       /* Needed to grab all ignored combo's too */
-      while (ignored_mask < (int) w->config->kb->lock_mask)
+      while (ignored_mask <= (int) w->config->kb->lock_mask)
 	{                                       
 	  if (ignored_mask & ~(w->config->kb->lock_mask))
 	    {
-- 
2.8.0.rc3

Re: [matchbox-wm][PATCH 2/2] keys: Grab all modifier combos

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 230 bytes --]

On 12 April 2016 at 12:43, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:

> Handle even the last combo, the one with all modifiers applied at the
> same time.
>

This and 1/2 both pushed to master, thanks Jussi!

Ross

[-- Attachment #2: Type: text/html, Size: 643 bytes --]