alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

added multikey handling for handle_key\(...\)

Browse source
This commit is contained in:
Taiyu 2015-08-10 23:37:25 -07:00
parent 96d7ff1e19
commit 737a7421fd
1 changed files with 37 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
sway/handlers.c
View file

@ -3,6 +3,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <wlc/wlc.h> #include <wlc/wlc.h>
#include <ctype.h> #include <ctype.h>
#include <string.h>
#include "layout.h" #include "layout.h"
#include "log.h" #include "log.h"
#include "config.h" #include "config.h"
@ -57,41 +58,63 @@ void handle_view_geometry_request(wlc_handle view, const struct wlc_geometry* ge
bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifiers bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifiers
*modifiers, uint32_t key, uint32_t sym, enum wlc_key_state state) { *modifiers, uint32_t key, uint32_t sym, enum wlc_key_state state) {
// TODO: handle keybindings with more than 1 non-modifier key involved #define QSIZE 32
// Note: reminder to check conflicts with mod+q+a versus mod+q static uint8_t head = 1;
static uint32_t array[QSIZE];
bool cmd_success = true;
struct sway_mode *mode = config->current_mode; struct sway_mode *mode = config->current_mode;
// Lowercase if necessary // Lowercase if necessary
sym = tolower(sym); sym = tolower(sym);
//Add or remove key to array
if (state == WLC_KEY_STATE_PRESSED && head + 1 < QSIZE) {
array[head++] = sym;
} else if (state == WLC_KEY_STATE_RELEASED) {
uint8_t mid = 0;
while (mid != head && array[mid] != sym) {
++mid;
}
while (mid < head) {
array[mid] = array[mid+1];
++mid;
}
--head;
}
// TODO: reminder to check conflicts with mod+q+a versus mod+q
int i; int i;
for (i = 0; i < mode->bindings->length; ++i) { for (i = 0; i < mode->bindings->length; ++i) {
struct sway_binding *binding = mode->bindings->items[i]; struct sway_binding *binding = mode->bindings->items[i];
if ((modifiers->mods & binding->modifiers) == binding->modifiers) { if ((modifiers->mods & binding->modifiers) == binding->modifiers) {
bool match = true; bool match;
int j; int j;
for (j = 0; j < binding->keys->length; ++j) { for (j = 0; j < binding->keys->length; ++j) {
xkb_keysym_t *k = binding->keys->items[j]; match = false;
if (sym != *k) { xkb_keysym_t *key = binding->keys->items[j];
match = false; uint8_t k;
for (k = 0; k < head; ++k) {
if (array[k] == *key) {
match = true;
break;
}
}
if (match == false) {
break; break;
} }
} }
if (match) { if (match) {
// TODO: --released
if (state == WLC_KEY_STATE_PRESSED) { if (state == WLC_KEY_STATE_PRESSED) {
cmd_success = !handle_command(config, binding->command); handle_command(config, binding->command);
} else { } else if (state == WLC_KEY_STATE_RELEASED) {
cmd_success = true; // TODO: --released
} }
} }
} }
} }
return cmd_success; //repeating sent input is bad
return true;
#undef Q_SIZE
} }
bool pointer_test(swayc_t *view, void *_origin) { bool pointer_test(swayc_t *view, void *_origin) {