mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-29 11:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve key buffer handling

Browse source
This commit is contained in:
Drew DeVault 2015-08-19 20:12:05 -04:00
parent 2dabca03f4
commit 84a778b688
1 changed files with 28 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
sway/handlers.c
View file

@ -14,9 +14,8 @@
#include "container.h" #include "container.h"
#include "focus.h" #include "focus.h"
uint32_t keys_pressed[32]; #define KEY_CACHE_SIZE 32
int keys_pressed_length = 0; uint32_t keys_pressed[KEY_CACHE_SIZE];
static struct wlc_origin mouse_origin; static struct wlc_origin mouse_origin;
@ -284,12 +283,11 @@ static void handle_view_geometry_request(wlc_handle handle, const struct wlc_geo
} }
static void handle_view_state_request(wlc_handle view, enum wlc_view_state_bit state, bool toggle) { static void handle_view_state_request(wlc_handle view, enum wlc_view_state_bit state, bool toggle) {
swayc_t *c = NULL; swayc_t *c = get_swayc_for_handle(view, &root_container);
switch (state) { switch (state) {
case WLC_BIT_FULLSCREEN: case WLC_BIT_FULLSCREEN:
// i3 just lets it become fullscreen // i3 just lets it become fullscreen
wlc_view_set_state(view, state, toggle); wlc_view_set_state(view, state, toggle);
c = get_swayc_for_handle(view, &root_container);
if (c) { if (c) {
sway_log(L_DEBUG, "setting view %ld %s, fullscreen %d", view, c->name, toggle); sway_log(L_DEBUG, "setting view %ld %s, fullscreen %d", view, c->name, toggle);
arrange_windows(c->parent, -1, -1); arrange_windows(c->parent, -1, -1);
@ -307,7 +305,9 @@ static void handle_view_state_request(wlc_handle view, enum wlc_view_state_bit s
case WLC_BIT_MAXIMIZED: case WLC_BIT_MAXIMIZED:
case WLC_BIT_RESIZING: case WLC_BIT_RESIZING:
case WLC_BIT_MOVING: case WLC_BIT_MOVING:
break;
case WLC_BIT_ACTIVATED: case WLC_BIT_ACTIVATED:
sway_log(L_DEBUG, "View %p requested to be activated", c);
break; break;
} }
return; return;
@ -316,7 +316,6 @@ static void handle_view_state_request(wlc_handle view, enum wlc_view_state_bit s
static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifiers *modifiers, static 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) { uint32_t key, uint32_t sym, enum wlc_key_state state) {
enum { QSIZE = 32 };
if (locked_view_focus && state == WLC_KEY_STATE_PRESSED) { if (locked_view_focus && state == WLC_KEY_STATE_PRESSED) {
return false; return false;
} }
@ -331,20 +330,23 @@ static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifier
// Lowercase if necessary // Lowercase if necessary
sym = tolower(sym); sym = tolower(sym);
// Find key, if it has been pressed
int mid = 0;
while (mid < keys_pressed_length && keys_pressed[mid] != sym) {
++mid;
}
//Add or remove key depending on state
if (state == WLC_KEY_STATE_PRESSED && mid == keys_pressed_length && keys_pressed_length + 1 < QSIZE) {
keys_pressed[keys_pressed_length++] = sym;
} else if (state == WLC_KEY_STATE_RELEASED && mid < keys_pressed_length) {
memmove(keys_pressed + mid, keys_pressed + mid + 1, sizeof*keys_pressed * (--keys_pressed_length - mid));
keys_pressed[keys_pressed_length] = 0;
}
// TODO: reminder to check conflicts with mod+q+a versus mod+q
int i; int i;
for (i = 0; i < KEY_CACHE_SIZE; ++i) {
if (state == WLC_KEY_STATE_PRESSED && keys_pressed[i] == 0) {
keys_pressed[i] = sym;
break;
} else if (state == WLC_KEY_STATE_RELEASED && keys_pressed[i] == sym) {
keys_pressed[i] = 0;
break;
}
}
if (i == KEY_CACHE_SIZE) {
sway_log(L_DEBUG, "Key buffer full!");
return false;
}
// TODO: reminder to check conflicts with mod+q+a versus mod+q
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];
@ -354,8 +356,8 @@ static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifier
for (j = 0; j < binding->keys->length; ++j) { for (j = 0; j < binding->keys->length; ++j) {
match = false; match = false;
xkb_keysym_t *key = binding->keys->items[j]; xkb_keysym_t *key = binding->keys->items[j];
uint8_t k; int k;
for (k = 0; k < keys_pressed_length; ++k) { for (k = 0; k < KEY_CACHE_SIZE; ++k) {
if (keys_pressed[k] == *key) { if (keys_pressed[k] == *key) {
match = true; match = true;
break; break;
@ -368,15 +370,6 @@ static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifier
if (match) { if (match) {
// Remove matched keys from keys_pressed // Remove matched keys from keys_pressed
int j;
for (j = 0; j < binding->keys->length; ++j) {
uint8_t k;
for (k = 0; k < keys_pressed_length; ++k) {
memmove(keys_pressed + k, keys_pressed + k + 1, sizeof*keys_pressed * (--keys_pressed_length - k));
keys_pressed[keys_pressed_length] = 0;
break;
}
}
if (state == WLC_KEY_STATE_PRESSED) { if (state == WLC_KEY_STATE_PRESSED) {
cmd_success = handle_command(config, binding->command); cmd_success = handle_command(config, binding->command);
} else if (state == WLC_KEY_STATE_RELEASED) { } else if (state == WLC_KEY_STATE_RELEASED) {
@ -574,6 +567,10 @@ static void handle_wlc_ready(void) {
} }
free_flat_list(config->cmd_queue); free_flat_list(config->cmd_queue);
config->active = true; config->active = true;
for (i = 0; i < KEY_CACHE_SIZE; ++i) {
keys_pressed[i] = 0;
}
} }