Support keyboard led indicator on wayland as well

This commit is contained in:
dec05eba
2025-11-08 03:28:18 +01:00
parent 0995e86e89
commit d1f8db3760
12 changed files with 282 additions and 47 deletions

View File

@@ -1,15 +1,21 @@
#include "../include/LedIndicator.hpp"
#include <X11/XKBlib.h>
#include <unistd.h>
#include <sys/wait.h>
#include <stdio.h>
#include <stdlib.h>
namespace gsr {
LedIndicator::LedIndicator(Display *dpy) : dpy(dpy) {
scroll_lock_atom = XInternAtom(dpy, "Scroll Lock", False);
XkbSetNamedIndicator(dpy, scroll_lock_atom, True, False, False, NULL);
LedIndicator::LedIndicator() {
run_gsr_global_hotkeys_set_leds(false);
}
LedIndicator::~LedIndicator() {
XkbSetNamedIndicator(dpy, scroll_lock_atom, True, False, False, NULL);
run_gsr_global_hotkeys_set_leds(false);
if(gsr_global_hotkeys_pid > 0) {
int status;
waitpid(gsr_global_hotkeys_pid, &status, 0);
}
}
void LedIndicator::set_led(bool enabled) {
@@ -22,12 +28,48 @@ namespace gsr {
blink_timer.restart();
}
bool LedIndicator::run_gsr_global_hotkeys_set_leds(bool enabled) {
if(gsr_global_hotkeys_pid > 0) {
int status;
if(waitpid(gsr_global_hotkeys_pid, &status, WNOHANG) == 0) {
// Still running
return false;
}
gsr_global_hotkeys_pid = -1;
}
const bool inside_flatpak = getenv("FLATPAK_ID") != NULL;
const char *user_homepath = getenv("HOME");
if(!user_homepath)
user_homepath = "/tmp";
gsr_global_hotkeys_pid = vfork();
if(gsr_global_hotkeys_pid == -1) {
fprintf(stderr, "Error: LedIndicator::run_gsr_global_hotkeys_set_leds: failed to fork\n");
return false;
} else if(gsr_global_hotkeys_pid == 0) { // Child
if(inside_flatpak) {
const char *args[] = { "flatpak-spawn", "--host", "/var/lib/flatpak/app/com.dec05eba.gpu_screen_recorder/current/active/files/bin/kms-server-proxy", "launch-gsr-global-hotkeys", user_homepath, "--set-led", "Scroll Lock", enabled ? "on" : "off", nullptr };
execvp(args[0], (char* const*)args);
} else {
const char *args[] = { "gsr-global-hotkeys", "--set-led", "Scroll Lock", enabled ? "on" : "off", nullptr };
execvp(args[0], (char* const*)args);
}
perror("gsr-global-hotkeys");
_exit(127);
return true;
} else { // Parent
return true;
}
}
void LedIndicator::update_led(bool new_state) {
if(new_state == led_indicator_on)
return;
led_indicator_on = new_state;
XkbSetNamedIndicator(dpy, scroll_lock_atom, True, new_state, False, NULL);
if(run_gsr_global_hotkeys_set_leds(new_state))
led_indicator_on = new_state;
}
void LedIndicator::update() {