Make hotkeys reconfigurable, faster hotkey startup time, fix some keyboard locale issues

This commit is contained in:
dec05eba
2025-01-23 21:23:19 +01:00
parent 47ada4d798
commit 1d9d4d6398
20 changed files with 1187 additions and 567 deletions

View File

@@ -5,6 +5,12 @@
#include <limits.h>
#include <string.h>
extern "C" {
#include <mgl/mgl.h>
}
#include <X11/Xlib.h>
#include <linux/input-event-codes.h>
#define PIPE_READ 0
#define PIPE_WRITE 1
@@ -17,16 +23,55 @@ namespace gsr {
return "--all";
}
static inline uint8_t x11_keycode_to_linux_keycode(uint8_t code) {
return code - 8;
}
static std::vector<uint8_t> modifiers_to_linux_keys(uint32_t modifiers) {
std::vector<uint8_t> result;
if(modifiers & HOTKEY_MOD_LSHIFT)
result.push_back(KEY_LEFTSHIFT);
if(modifiers & HOTKEY_MOD_RSHIFT)
result.push_back(KEY_RIGHTSHIFT);
if(modifiers & HOTKEY_MOD_LCTRL)
result.push_back(KEY_LEFTCTRL);
if(modifiers & HOTKEY_MOD_RCTRL)
result.push_back(KEY_RIGHTCTRL);
if(modifiers & HOTKEY_MOD_LALT)
result.push_back(KEY_LEFTALT);
if(modifiers & HOTKEY_MOD_RALT)
result.push_back(KEY_RIGHTALT);
if(modifiers & HOTKEY_MOD_LSUPER)
result.push_back(KEY_LEFTMETA);
if(modifiers & HOTKEY_MOD_RSUPER)
result.push_back(KEY_RIGHTMETA);
return result;
}
static std::string linux_keys_to_command_string(const uint8_t *keys, size_t size) {
std::string result;
for(size_t i = 0; i < size; ++i) {
if(!result.empty())
result += "+";
result += std::to_string(keys[i]);
}
return result;
}
GlobalHotkeysLinux::GlobalHotkeysLinux(GrabType grab_type) : grab_type(grab_type) {
for(int i = 0; i < 2; ++i) {
pipes[i] = -1;
read_pipes[i] = -1;
write_pipes[i] = -1;
}
}
GlobalHotkeysLinux::~GlobalHotkeysLinux() {
for(int i = 0; i < 2; ++i) {
if(pipes[i] > 0)
close(pipes[i]);
if(read_pipes[i] > 0)
close(read_pipes[i]);
if(write_pipes[i] > 0)
close(write_pipes[i]);
}
if(read_file)
@@ -58,21 +103,36 @@ namespace gsr {
if(process_id > 0)
return false;
if(pipe(pipes) == -1)
if(pipe(read_pipes) == -1)
return false;
if(pipe(write_pipes) == -1) {
for(int i = 0; i < 2; ++i) {
close(read_pipes[i]);
read_pipes[i] = -1;
}
return false;
}
const pid_t pid = vfork();
if(pid == -1) {
perror("Failed to vfork");
for(int i = 0; i < 2; ++i) {
close(pipes[i]);
pipes[i] = -1;
close(read_pipes[i]);
close(write_pipes[i]);
read_pipes[i] = -1;
write_pipes[i] = -1;
}
return false;
} else if(pid == 0) { /* child */
dup2(pipes[PIPE_WRITE], STDOUT_FILENO);
dup2(read_pipes[PIPE_WRITE], STDOUT_FILENO);
for(int i = 0; i < 2; ++i) {
close(pipes[i]);
close(read_pipes[i]);
}
dup2(write_pipes[PIPE_READ], STDIN_FILENO);
for(int i = 0; i < 2; ++i) {
close(write_pipes[i]);
}
if(inside_flatpak) {
@@ -87,24 +147,70 @@ namespace gsr {
_exit(127);
} else { /* parent */
process_id = pid;
close(pipes[PIPE_WRITE]);
pipes[PIPE_WRITE] = -1;
const int fdl = fcntl(pipes[PIPE_READ], F_GETFL);
fcntl(pipes[PIPE_READ], F_SETFL, fdl | O_NONBLOCK);
close(read_pipes[PIPE_WRITE]);
read_pipes[PIPE_WRITE] = -1;
read_file = fdopen(pipes[PIPE_READ], "r");
close(write_pipes[PIPE_READ]);
write_pipes[PIPE_READ] = -1;
fcntl(read_pipes[PIPE_READ], F_SETFL, fcntl(read_pipes[PIPE_READ], F_GETFL) | O_NONBLOCK);
read_file = fdopen(read_pipes[PIPE_READ], "r");
if(read_file)
pipes[PIPE_READ] = -1;
read_pipes[PIPE_READ] = -1;
else
fprintf(stderr, "fdopen failed, error: %s\n", strerror(errno));
fprintf(stderr, "fdopen failed for read, error: %s\n", strerror(errno));
}
return true;
}
bool GlobalHotkeysLinux::bind_action(const std::string &id, GlobalHotkeyCallback callback) {
return bound_actions_by_id.insert(std::make_pair(id, std::move(callback))).second;
bool GlobalHotkeysLinux::bind_key_press(Hotkey hotkey, const std::string &id, GlobalHotkeyCallback callback) {
if(bound_actions_by_id.find(id) != bound_actions_by_id.end())
return false;
if(id.find(' ') != std::string::npos || id.find('\n') != std::string::npos) {
fprintf(stderr, "Error: GlobalHotkeysLinux::bind_key_press: id \"%s\" contains either space or newline\n", id.c_str());
return false;
}
if(hotkey.key == 0) {
//fprintf(stderr, "Error: GlobalHotkeysLinux::bind_key_press: hotkey requires a key\n");
return false;
}
if(hotkey.modifiers == 0) {
//fprintf(stderr, "Error: GlobalHotkeysLinux::bind_key_press: hotkey requires a modifier\n");
return false;
}
mgl_context *context = mgl_get_context();
Display *display = (Display*)context->connection;
const uint8_t keycode = x11_keycode_to_linux_keycode(XKeysymToKeycode(display, hotkey.key));
const std::vector<uint8_t> modifiers = modifiers_to_linux_keys(hotkey.modifiers);
const std::string modifiers_command = linux_keys_to_command_string(modifiers.data(), modifiers.size());
char command[256];
const int command_size = snprintf(command, sizeof(command), "bind %s %d+%s\n", id.c_str(), (int)keycode, modifiers_command.c_str());
if(write(write_pipes[PIPE_WRITE], command, command_size) != command_size) {
fprintf(stderr, "Error: GlobalHotkeysLinux::bind_key_press: failed to write command to gsr-global-hotkeys, error: %s\n", strerror(errno));
return false;
}
bound_actions_by_id[id] = std::move(callback);
return true;
}
void GlobalHotkeysLinux::unbind_all_keys() {
if(bound_actions_by_id.empty())
return;
char command[32];
const int command_size = snprintf(command, sizeof(command), "unbind_all\n");
if(write(write_pipes[PIPE_WRITE], command, command_size) != command_size) {
fprintf(stderr, "Error: GlobalHotkeysLinux::unbind_all_keys: failed to write command to gsr-global-hotkeys, error: %s\n", strerror(errno));
}
bound_actions_by_id.clear();
}
void GlobalHotkeysLinux::poll_events() {