public/gpu-screen-recorder-ui
1
0
Fork 0
mirror of https://repo.dec05eba.com/gpu-screen-recorder-ui synced 2026-04-08 20:34:52 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: public:1.1.3
Branches Tags
public:master
public:1.10.9 public:1.10.8 public:1.10.7 public:1.10.6 public:1.10.5 public:1.10.4 public:1.10.3 public:1.10.2 public:1.10.1 public:1.10.0 public:1.9.3 public:1.9.2 public:1.9.1 public:1.9.0 public:1.8.3 public:1.8.2 public:1.8.1 public:1.8.0 public:1.7.9 public:1.7.8 public:1.7.7 public:1.7.6 public:1.7.5 public:1.7.4 public:1.7.3 public:1.7.2 public:1.7.1 public:1.7.0 public:1.6.10 public:1.6.9 public:1.6.8 public:1.6.7 public:1.6.6 public:1.6.5 public:1.6.4 public:1.6.3 public:1.6.2 public:1.6.1 public:1.6.0 public:1.5.1 public:1.5.0 public:1.4.0 public:1.3.4 public:1.3.3 public:1.3.2 public:1.3.1 public:1.3.0 public:1.2.2 public:1.2.1 public:1.2.0 public:1.1.7 public:1.1.6 public:1.1.5 public:1.1.4 public:1.1.3 public:1.1.2 public:1.1.0 public:1.0.8 public:1.0.7 public:1.0.6 public:1.0.5 public:1.0.4 public:1.0.3 public:1.0.2 public:1.0.1 public:1.0.0
..
compare: public:1.1.4
Branches Tags
public:master
public:1.10.9 public:1.10.8 public:1.10.7 public:1.10.6 public:1.10.5 public:1.10.4 public:1.10.3 public:1.10.2 public:1.10.1 public:1.10.0 public:1.9.3 public:1.9.2 public:1.9.1 public:1.9.0 public:1.8.3 public:1.8.2 public:1.8.1 public:1.8.0 public:1.7.9 public:1.7.8 public:1.7.7 public:1.7.6 public:1.7.5 public:1.7.4 public:1.7.3 public:1.7.2 public:1.7.1 public:1.7.0 public:1.6.10 public:1.6.9 public:1.6.8 public:1.6.7 public:1.6.6 public:1.6.5 public:1.6.4 public:1.6.3 public:1.6.2 public:1.6.1 public:1.6.0 public:1.5.1 public:1.5.0 public:1.4.0 public:1.3.4 public:1.3.3 public:1.3.2 public:1.3.1 public:1.3.0 public:1.2.2 public:1.2.1 public:1.2.0 public:1.1.7 public:1.1.6 public:1.1.5 public:1.1.4 public:1.1.3 public:1.1.2 public:1.1.0 public:1.0.8 public:1.0.7 public:1.0.6 public:1.0.5 public:1.0.4 public:1.0.3 public:1.0.2 public:1.0.1 public:1.0.0

2 Commits
1.1.3 ... 1.1.4

Author SHA1 Message Date
dec05eba
3cb156aecb Delegate keyboard grab until a button has been pressed if the device says its a mouse 2025-01-26 17:43:38 +01:00
dec05eba
dea4393588 Revert global hotkeys change, ignore mice again 2025-01-26 14:12:03 +01:00
3 changed files with 27 additions and 14 deletions
Expand all files Collapse all files

2
meson.build
View File

@@ -1,4 +1,4 @@
project('gsr-ui', ['c', 'cpp'], version : '1.1.3', default_options : ['warning_level=2', 'cpp_std=c++17'], subproject_dir : 'depends')
project('gsr-ui', ['c', 'cpp'], version : '1.1.4', default_options : ['warning_level=2', 'cpp_std=c++17'], subproject_dir : 'depends')
if get_option('buildtype') == 'debug'
add_project_arguments('-g3', language : ['c', 'cpp'])

2
project.conf
View File

@@ -1,7 +1,7 @@
[package]
name = "gsr-ui"
type = "executable"
version = "1.1.3"
version = "1.1.4"
platforms = ["posix"]
[lang.cpp]

37
tools/gsr-global-hotkeys/keyboard_event.c
View File

@@ -81,19 +81,19 @@ static void keyboard_event_fetch_update_key_states(keyboard_event *self, event_e
}
}
static void keyboard_event_process_key_state_change(keyboard_event *self, struct input_event event, event_extra_data *extra_data, int fd) {
if(event.type != EV_KEY)
static void keyboard_event_process_key_state_change(keyboard_event *self, const struct input_event *event, event_extra_data *extra_data, int fd) {
if(event->type != EV_KEY)
return;
if(!extra_data->key_states || event.code >= KEY_STATES_SIZE * 8)
if(!extra_data->key_states || event->code >= KEY_STATES_SIZE * 8)
return;
const unsigned int byte_index = event.code / 8;
const unsigned char bit_index = event.code % 8;
const unsigned int byte_index = event->code / 8;
const unsigned char bit_index = event->code % 8;
unsigned char key_byte_state = extra_data->key_states[byte_index];
const bool prev_key_pressed = (key_byte_state & (1 << bit_index)) != KEY_RELEASE;
if(event.value == KEY_RELEASE) {
if(event->value == KEY_RELEASE) {
key_byte_state &= ~(1 << bit_index);
if(prev_key_pressed)
--extra_data->num_keys_pressed;
@@ -154,6 +154,12 @@ static uint32_t keycode_to_modifier_bit(uint32_t keycode) {
return 0;
}
static bool key_is_mouse_button(uint32_t keycode) {
return (keycode >= BTN_MISC && keycode <= BTN_GEAR_UP)
|| (keycode >= BTN_TRIGGER_HAPPY && keycode <= BTN_TRIGGER_HAPPY40)
|| (keycode >= BTN_DPAD_UP && keycode <= BTN_DPAD_RIGHT);
}
static void keyboard_event_process_input_event_data(keyboard_event *self, event_extra_data *extra_data, int fd) {
struct input_event event;
if(read(fd, &event, sizeof(event)) != sizeof(event)) {
@@ -171,8 +177,8 @@ static void keyboard_event_process_input_event_data(keyboard_event *self, event_
//fprintf(stderr, "fd: %d, type: %d, pressed %d, value: %d\n", fd, event.type, event.code, event.value);
//}
if(event.type == EV_KEY) {
keyboard_event_process_key_state_change(self, event, extra_data, fd);
if(event.type == EV_KEY && !key_is_mouse_button(event.code)) {
keyboard_event_process_key_state_change(self, &event, extra_data, fd);
const uint32_t modifier_bit = keycode_to_modifier_bit(event.code);
if(modifier_bit == 0) {
if(keyboard_event_on_key_pressed(self, &event, self->modifier_button_states))
@@ -293,7 +299,7 @@ static bool keyboard_event_try_add_device_if_keyboard(keyboard_event *self, cons
ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(key_bits)), &key_bits);
const bool supports_key_events = key_bits[KEY_A/8] & (1 << (KEY_A % 8));
//const bool supports_mouse_events = key_bits[BTN_MOUSE/8] & (1 << (BTN_MOUSE % 8));
const bool supports_mouse_events = key_bits[BTN_MOUSE/8] & (1 << (BTN_MOUSE % 8));
//const bool supports_touch_events = key_bits[BTN_TOUCH/8] & (1 << (BTN_TOUCH % 8));
const bool supports_joystick_events = key_bits[BTN_JOYSTICK/8] & (1 << (BTN_JOYSTICK % 8));
const bool supports_wheel_events = key_bits[BTN_WHEEL/8] & (1 << (BTN_WHEEL % 8));
@@ -314,9 +320,16 @@ static bool keyboard_event_try_add_device_if_keyboard(keyboard_event *self, cons
.num_keys_pressed = 0
};
keyboard_event_fetch_update_key_states(self, &self->event_extra_data[self->num_event_polls], fd);
if(self->event_extra_data[self->num_event_polls].num_keys_pressed > 0)
fprintf(stderr, "Info: device not grabbed yet because some keys are still being pressed: /dev/input/event%d\n", dev_input_id);
if(supports_mouse_events) {
fprintf(stderr, "Info: device not grabbed yet because it might be a mouse: /dev/input/event%d\n", dev_input_id);
fsync(fd);
if(ioctl(fd, EVIOCGKEY(KEY_STATES_SIZE), self->event_extra_data[self->num_event_polls].key_states) == -1)
fprintf(stderr, "Warning: failed to fetch key states for device: /dev/input/event%d\n", dev_input_id);
} else {
keyboard_event_fetch_update_key_states(self, &self->event_extra_data[self->num_event_polls], fd);
if(self->event_extra_data[self->num_event_polls].num_keys_pressed > 0)
fprintf(stderr, "Info: device not grabbed yet because some keys are still being pressed: /dev/input/event%d\n", dev_input_id);
}
++self->num_event_polls;
return true;