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

fixed bug

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

20
sway/handlers.c
View file

@ -56,10 +56,11 @@ void handle_view_geometry_request(wlc_handle view, const struct wlc_geometry* ge
// deny that shit // deny that shit
} }
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) {
#define QSIZE 32 #define QSIZE 32
static uint8_t head = 1; static uint8_t head = 0;
static uint32_t array[QSIZE]; static uint32_t array[QSIZE];
struct sway_mode *mode = config->current_mode; struct sway_mode *mode = config->current_mode;
@ -74,11 +75,9 @@ bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifiers
while (mid != head && array[mid] != sym) { while (mid != head && array[mid] != sym) {
++mid; ++mid;
} }
while (mid < head) { if (mid < head) {
array[mid] = array[mid+1]; memmove(array + mid, array + mid + 1, sizeof*array * (--head - mid));
++mid; } /* else { key is not found as its been removed } */
}
--head;
} }
// TODO: reminder to check conflicts with mod+q+a versus mod+q // TODO: reminder to check conflicts with mod+q+a versus mod+q
int i; int i;
@ -104,6 +103,15 @@ bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifiers
} }
if (match) { if (match) {
//Remove matched keys from array
int j;
for (j = 0; j < binding->keys->length; ++j) {
uint8_t k;
for (k = 0; k < head; ++k) {
memmove(array + k, array + k + 1, sizeof*array * (--head - k));
break;
}
}
if (state == WLC_KEY_STATE_PRESSED) { if (state == WLC_KEY_STATE_PRESSED) {
handle_command(config, binding->command); handle_command(config, binding->command);
} else if (state == WLC_KEY_STATE_RELEASED) { } else if (state == WLC_KEY_STATE_RELEASED) {