mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

key-state.c: generalize set operations

Browse source
This commit is contained in:
tokyo4j 2024-10-07 09:15:34 +09:00 • committed by Johan Malm
parent c4aa3fe3e6
commit e0848da70d
4 changed files with 84 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

82
src/input/key-state.c
View file

@ -5,19 +5,13 @@
#include <stdlib.h>
#include <string.h>
#include <wlr/util/log.h>
#include "common/set.h"
#include "input/key-state.h"
#define MAX_PRESSED_KEYS (16)
struct key_array {
uint32_t keys[MAX_PRESSED_KEYS];
int nr_keys;
};
static struct key_array pressed, pressed_mods, bound, pressed_sent;
static struct lab_set pressed, pressed_mods, bound, pressed_sent;
static void
report(struct key_array *array, const char *msg)
report(struct lab_set *key_set, const char *msg)
{
static char *should_print;
static bool has_run;
@ -30,48 +24,12 @@ report(struct key_array *array, const char *msg)
return;
}
printf("%s", msg);
for (int i = 0; i < array->nr_keys; ++i) {
printf("%d,", array->keys[i]);
for (int i = 0; i < key_set->size; ++i) {
printf("%d,", key_set->values[i]);
}
printf("\n");
}
static bool
key_present(struct key_array *array, uint32_t keycode)
{
for (int i = 0; i < array->nr_keys; ++i) {
if (array->keys[i] == keycode) {
return true;
}
}
return false;
}
static void
remove_key(struct key_array *array, uint32_t keycode)
{
bool shifting = false;
for (int i = 0; i < MAX_PRESSED_KEYS; ++i) {
if (array->keys[i] == keycode) {
--array->nr_keys;
shifting = true;
}
if (shifting) {
array->keys[i] = i < MAX_PRESSED_KEYS - 1
? array->keys[i + 1] : 0;
}
}
}
static void
add_key(struct key_array *array, uint32_t keycode)
{
if (!key_present(array, keycode) && array->nr_keys < MAX_PRESSED_KEYS) {
array->keys[array->nr_keys++] = keycode;
}
}
uint32_t *
key_state_pressed_sent_keycodes(void)
{
@ -80,70 +38,70 @@ key_state_pressed_sent_keycodes(void)
/* pressed_sent = pressed - bound */
pressed_sent = pressed;
for (int i = 0; i < bound.nr_keys; ++i) {
remove_key(&pressed_sent, bound.keys[i]);
for (int i = 0; i < bound.size; ++i) {
lab_set_remove(&pressed_sent, bound.values[i]);
}
report(&pressed_sent, "after - pressed_sent:");
return pressed_sent.keys;
return pressed_sent.values;
}
int
key_state_nr_pressed_sent_keycodes(void)
{
return pressed_sent.nr_keys;
return pressed_sent.size;
}
void
key_state_set_pressed(uint32_t keycode, bool is_pressed, bool is_modifier)
{
if (is_pressed) {
add_key(&pressed, keycode);
lab_set_add(&pressed, keycode);
if (is_modifier) {
add_key(&pressed_mods, keycode);
lab_set_add(&pressed_mods, keycode);
}
} else {
remove_key(&pressed, keycode);
remove_key(&pressed_mods, keycode);
lab_set_remove(&pressed, keycode);
lab_set_remove(&pressed_mods, keycode);
}
}
void
key_state_store_pressed_key_as_bound(uint32_t keycode)
{
add_key(&bound, keycode);
lab_set_add(&bound, keycode);
/*
* Also store any pressed modifiers as bound. This prevents
* applications from seeing and handling the release event for
* a modifier key that was part of a keybinding (e.g. Firefox
* displays its menu bar for a lone Alt press + release).
*/
for (int i = 0; i < pressed_mods.nr_keys; ++i) {
add_key(&bound, pressed_mods.keys[i]);
for (int i = 0; i < pressed_mods.size; ++i) {
lab_set_add(&bound, pressed_mods.values[i]);
}
}
bool
key_state_corresponding_press_event_was_bound(uint32_t keycode)
{
return key_present(&bound, keycode);
return lab_set_contains(&bound, keycode);
}
void
key_state_bound_key_remove(uint32_t keycode)
{
remove_key(&bound, keycode);
lab_set_remove(&bound, keycode);
}
int
key_state_nr_bound_keys(void)
{
return bound.nr_keys;
return bound.size;
}
int
key_state_nr_pressed_keys(void)
{
return pressed.nr_keys;
return pressed.size;
}