Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ignore keypad key presses when Mouse Keys is enabled. #143

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ignore keypad key presses when Mouse Keys is enabled. #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 43 additions & 10 deletions src/keyboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,43 @@ bool slop::Keyboard::anyKeyDown() {
return keyDown;
}

void slop::Keyboard::zeroKey( char keys[32], KeySym key ) {
KeyCode keycode = XKeysymToKeycode( x11->display, key );
keys[ keycode / 8 ] = keys[ keycode / 8 ] & ~( 1 << ( keycode % 8 ) );
}

void slop::Keyboard::update() {
char keys[32];
XQueryKeymap( x11->display, keys );
// We first delete the arrow key buttons from the mapping.
// This allows the user to press the arrow keys without triggering anyKeyDown
KeyCode keycode = XKeysymToKeycode( x11->display, XK_Left );
keys[ keycode / 8 ] = keys[ keycode / 8 ] & ~( 1 << ( keycode % 8 ) );
keycode = XKeysymToKeycode( x11->display, XK_Right );
keys[ keycode / 8 ] = keys[ keycode / 8 ] & ~( 1 << ( keycode % 8 ) );
keycode = XKeysymToKeycode( x11->display, XK_Up );
keys[ keycode / 8 ] = keys[ keycode / 8 ] & ~( 1 << ( keycode % 8 ) );
keycode = XKeysymToKeycode( x11->display, XK_Down );
keys[ keycode / 8 ] = keys[ keycode / 8 ] & ~( 1 << ( keycode % 8 ) );
zeroKey(keys, XK_Left);
zeroKey(keys, XK_Right);
zeroKey(keys, XK_Up);
zeroKey(keys, XK_Down);
// Also deleting Space for move operation
keycode = XKeysymToKeycode( x11->display, XK_space );
keys[ keycode / 8 ] = keys[ keycode / 8 ] & ~( 1 << ( keycode % 8 ) );
zeroKey(keys, XK_space);

if ( mouseKeys ) {
zeroKey(keys, XK_KP_0);
zeroKey(keys, XK_KP_1);
zeroKey(keys, XK_KP_2);
zeroKey(keys, XK_KP_3);
zeroKey(keys, XK_KP_4);
zeroKey(keys, XK_KP_5);
zeroKey(keys, XK_KP_6);
zeroKey(keys, XK_KP_7);
zeroKey(keys, XK_KP_8);
zeroKey(keys, XK_KP_9);
zeroKey(keys, XK_KP_Add);
zeroKey(keys, XK_KP_Subtract);
zeroKey(keys, XK_KP_Multiply);
zeroKey(keys, XK_KP_Divide);
zeroKey(keys, XK_KP_Insert);
zeroKey(keys, XK_KP_Delete);
zeroKey(keys, XK_KP_Decimal);
}

keyDown = false;
for ( int i=0;i<32;i++ ) {
if ( deltaState[i] == keys[i] ) {
Expand Down Expand Up @@ -69,6 +90,18 @@ slop::Keyboard::Keyboard( X11* x11 ) {
if ( err != GrabSuccess ) {
//throw std::runtime_error( "Couldn't grab the keyboard after 10 tries." );
}

// Ignore any failures while checking for Mouse Keys
XkbDescPtr xkb = XkbGetKeyboard( x11->display, XkbControlsMask, XkbUseCoreKbd );
if ( xkb != 0 ) {
Status status = XkbGetControls( x11->display, XkbAllControlsMask, xkb );
if ( status == Success ) {
mouseKeys = xkb->ctrls->enabled_ctrls & XkbMouseKeysMask;
XkbFreeControls( xkb, XkbAllControlsMask, true );
}
XkbFreeKeyboard( xkb, XkbControlsMask, true );
}

XQueryKeymap( x11->display, deltaState );
keyDown = false;
}
Expand Down
3 changes: 3 additions & 0 deletions src/keyboard.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#define XK_MISCELLANY
#define XK_LATIN1 // for XK_space
#include <X11/keysymdef.h>
#include <X11/XKBlib.h>

#include "x.hpp"

Expand All @@ -34,6 +35,8 @@ class Keyboard {
char deltaState[32];
X11* x11;
bool keyDown;
bool mouseKeys;
void zeroKey( char keys[32], KeySym key );
public:
Keyboard( X11* x11 );
~Keyboard();
Expand Down