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

Add default values for DISPLAY and WAYLAND_DISPLAY. Some users dont have properly setup environments

Browse Source
This commit is contained in:
dec05eba
2025-04-28 01:26:28 +02:00
parent 5a32c469d3
commit ac1d57e8ba
3 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extra/gpu-screen-recorder-ui.service
View File

@@ -2,7 +2,7 @@
Description=GPU Screen Recorder UI Service Description=GPU Screen Recorder UI Service
[Service] [Service]
ExecStart=gsr-ui ExecStart=gsr-ui launch-daemon
KillSignal=SIGINT KillSignal=SIGINT
Restart=on-failure Restart=on-failure
RestartSec=5s RestartSec=5s

2
flatpak/gpu-screen-recorder-ui.service
View File

@@ -2,7 +2,7 @@
Description=GPU Screen Recorder UI Service Description=GPU Screen Recorder UI Service
[Service] [Service]
ExecStart=flatpak run com.dec05eba.gpu_screen_recorder gsr-ui ExecStart=flatpak run com.dec05eba.gpu_screen_recorder gsr-ui launch-daemon
KillSignal=SIGINT KillSignal=SIGINT
Restart=on-failure Restart=on-failure
RestartSec=5s RestartSec=5s

36
src/main.cpp
View File

@@ -162,15 +162,17 @@ static bool is_flatpak() {
static void usage() { static void usage() {
printf("usage: gsr-ui [action]\n"); printf("usage: gsr-ui [action]\n");
printf("OPTIONS:\n"); printf("OPTIONS:\n");
printf(" action The launch action. Should be either \"launch-show\" or \"launch-hide\". Optional, defaults to \"launch-hide\".\n"); printf(" action The launch action. Should be either \"launch-show\", \"launch-hide\" or \"launch-daemon\". Optional, defaults to \"launch-hide\".\n");
printf(" If \"launch-show\" is used then the program starts and the UI is immediately opened and can be shown/hidden with Alt+Z.\n"); printf(" If \"launch-show\" is used then the program starts and the UI is immediately opened and can be shown/hidden with Alt+Z.\n");
printf(" If \"launch-hide\" is used then the program starts but the UI is not opened until Alt+Z is pressed.\n"); printf(" If \"launch-hide\" is used then the program starts but the UI is not opened until Alt+Z is pressed. The UI will be opened if the program is already running in another process.\n");
printf(" If \"launch-daemon\" is used then the program starts but the UI is not opened until Alt+Z is pressed. The UI will not be opened if the program is already running in another process.\n");
exit(1); exit(1);
} }
enum class LaunchAction { enum class LaunchAction {
LAUNCH_SHOW, LAUNCH_SHOW,
LAUNCH_HIDE LAUNCH_HIDE,
LAUNCH_DAEMON
}; };
int main(int argc, char **argv) { int main(int argc, char **argv) {
@@ -191,18 +193,28 @@ int main(int argc, char **argv) {
launch_action = LaunchAction::LAUNCH_SHOW; launch_action = LaunchAction::LAUNCH_SHOW;
} else if(strcmp(launch_action_opt, "launch-hide") == 0) { } else if(strcmp(launch_action_opt, "launch-hide") == 0) {
launch_action = LaunchAction::LAUNCH_HIDE; launch_action = LaunchAction::LAUNCH_HIDE;
} else if(strcmp(launch_action_opt, "launch-daemon") == 0) {
launch_action = LaunchAction::LAUNCH_DAEMON;
} else { } else {
printf("error: invalid action \"%s\", expected \"launch-show\" or \"launch-hide\".\n", launch_action_opt); printf("error: invalid action \"%s\", expected \"launch-show\", \"launch-hide\" or \"launch-daemon\".\n", launch_action_opt);
usage(); usage();
} }
} else { } else {
usage(); usage();
} }
if(is_flatpak()) // Some users dont have properly setup environments (no display manager that does systemctl --user import-environment DISPLAY WAYLAND_DISPLAY)
install_flatpak_systemd_service(); const char *display = getenv("DISPLAY");
else if(!display) {
remove_flatpak_systemd_service(); display = ":0";
setenv("DISPLAY", display, true);
}
const char *wayland_display = getenv("WAYLAND_DISPLAY");
if(!wayland_display) {
wayland_display = "wayland-1";
setenv("WAYLAND_DISPLAY", wayland_display, true);
}
// TODO: This is a shitty method to detect if multiple instances of gsr-ui is running but this will work properly even in flatpak // TODO: This is a shitty method to detect if multiple instances of gsr-ui is running but this will work properly even in flatpak
// that uses pid sandboxing. Replace this with a better method once we no longer rely on linux global hotkeys on some platform. // that uses pid sandboxing. Replace this with a better method once we no longer rely on linux global hotkeys on some platform.
@@ -210,6 +222,9 @@ int main(int argc, char **argv) {
// What do? creating a pid file doesn't work in flatpak either. // What do? creating a pid file doesn't work in flatpak either.
// TODO: This doesn't work in flatpak when disabling hotkeys. // TODO: This doesn't work in flatpak when disabling hotkeys.
if(is_gsr_ui_virtual_keyboard_running() || gsr::pidof("gsr-ui", getpid()) != -1) { if(is_gsr_ui_virtual_keyboard_running() || gsr::pidof("gsr-ui", getpid()) != -1) {
if(launch_action == LaunchAction::LAUNCH_DAEMON)
return 1;
gsr::Rpc rpc; gsr::Rpc rpc;
if(rpc.open("gsr-ui") && rpc.write("show_ui\n", 8)) { if(rpc.open("gsr-ui") && rpc.write("show_ui\n", 8)) {
fprintf(stderr, "Error: another instance of gsr-ui is already running, opening that one instead\n"); fprintf(stderr, "Error: another instance of gsr-ui is already running, opening that one instead\n");
@@ -221,6 +236,11 @@ int main(int argc, char **argv) {
return 1; return 1;
} }
if(is_flatpak())
install_flatpak_systemd_service();
else
remove_flatpak_systemd_service();
// Stop nvidia driver from buffering frames // Stop nvidia driver from buffering frames
setenv("__GL_MaxFramesAllowed", "1", true); setenv("__GL_MaxFramesAllowed", "1", true);
// If this is set to 1 then cuGraphicsGLRegisterImage will fail for egl context with error: invalid OpenGL or DirectX context, // If this is set to 1 then cuGraphicsGLRegisterImage will fail for egl context with error: invalid OpenGL or DirectX context,