mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-09 13:29:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix list sorting

Browse source
This commit is contained in:
taiyu 2015-11-24 00:30:02 -08:00
parent cb11364552
commit 9d50f88cef
3 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
sway/config.c
View file

@ -387,18 +387,20 @@ int workspace_output_cmp_workspace(const void *a, const void *b) {
int sway_binding_cmp_keys(const void *a, const void *b) {
const struct sway_binding *binda = a, *bindb = b;
if (binda->modifiers > bindb->modifiers) {
return 1;
} else if (binda->modifiers < bindb->modifiers) {
return -1;
}
if (binda->keys->length > bindb->keys->length) {
return 1;
} else if (binda->keys->length < bindb->keys->length) {
return -1;
// Count keys pressed for this binding. important so we check long before
// short ones. for example mod+a+b before mod+a
unsigned int moda = 0, modb = 0, i;
// Count how any modifiers are pressed
for (i = 0; i < 8 * sizeof(binda->modifiers); ++i) {
moda += (binda->modifiers & 1 << i) != 0;
modb += (bindb->modifiers & 1 << i) != 0;
}
if (bindb->keys->length + modb != binda->keys->length + moda) {
return (bindb->keys->length + modb) - (binda->keys->length + moda);
}
// Otherwise compare keys
for (int i = 0; i < binda->keys->length; i++) {
xkb_keysym_t *ka = binda->keys->items[i],
*kb = bindb->keys->items[i];