aboutsummaryrefslogtreecommitdiff
path: root/sway/handlers.c
diff options
context:
space:
mode:
authorTaiyu <taiyu.len@gmail.com>2015-08-11 01:09:08 -0700
committerTaiyu <taiyu.len@gmail.com>2015-08-11 01:09:08 -0700
commita22ba1762194e6592a4d7d5e97ba1b3cb3b1e582 (patch)
tree8531788e7a188a620f53e5633f2280ae332fd0d4 /sway/handlers.c
parent5d5a20bf2580c33beb6abc20d2c46afc8505fb09 (diff)
added command repeat on keydown
Diffstat (limited to 'sway/handlers.c')
-rw-r--r--sway/handlers.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/sway/handlers.c b/sway/handlers.c
index ebe3e349..979eb3c8 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -61,22 +61,23 @@ bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifiers
enum { QSIZE = 32 };
static uint8_t head = 0;
static uint32_t array[QSIZE];
+ bool cmd_success = true;
struct sway_mode *mode = config->current_mode;
// Lowercase if necessary
sym = tolower(sym);
- //Add or remove key to array
- if (state == WLC_KEY_STATE_PRESSED && head + 1 < QSIZE) {
+
+ //Find key, if it has been pressed
+ int mid = 0;
+ while (mid < head && array[mid] != sym) {
+ ++mid;
+ }
+ if (state == WLC_KEY_STATE_PRESSED && mid == head && head + 1 < QSIZE) {
array[head++] = sym;
- } else if (state == WLC_KEY_STATE_RELEASED) {
- uint8_t mid = 0;
- while (mid != head && array[mid] != sym) {
- ++mid;
- }
- if (mid < head) {
- memmove(array + mid, array + mid + 1, sizeof*array * (--head - mid));
- } /* else { key is not found as its been removed } */
+ } else if (state == WLC_KEY_STATE_RELEASED && mid < head) {
+ memmove(array + mid, array + mid + 1, sizeof*array * (--head - mid));
}
+ sway_log(L_INFO,"%d", head);
// TODO: reminder to check conflicts with mod+q+a versus mod+q
int i;
for (i = 0; i < mode->bindings->length; ++i) {
@@ -111,14 +112,14 @@ bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifiers
}
}
if (state == WLC_KEY_STATE_PRESSED) {
- handle_command(config, binding->command);
+ cmd_success = !handle_command(config, binding->command);
} else if (state == WLC_KEY_STATE_RELEASED) {
// TODO: --released
}
}
}
}
- return true;
+ return cmd_success;
}
bool pointer_test(swayc_t *view, void *_origin) {