public/gpu-screen-recorder-ui
1
0
Fork 0
mirror of https://repo.dec05eba.com/gpu-screen-recorder-ui synced 2026-05-06 15:00:44 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add static hotkey text to show that ESC goes back to the previous page/closes the ui

Browse Source
This commit is contained in:
dec05eba
2026-04-12 17:09:58 +02:00
parent d545de687c
commit aec687bf22
10 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Overlay.cpp
View File

@@ -518,10 +518,13 @@ namespace gsr {
global_hotkeys_js = register_joystick_hotkeys(this);
x11_dpy = XOpenDisplay(nullptr);
if(x11_dpy)
if(x11_dpy) {
net_active_window_atom = XInternAtom(x11_dpy, "_NET_ACTIVE_WINDOW", False);
XSelectInput(x11_dpy, DefaultRootWindow(x11_dpy), PropertyChangeMask);
XKeysymToKeycode(x11_dpy, XK_F1); // If we dont call we will never get a MappingNotify
else
} else {
fprintf(stderr, "Warning: XOpenDisplay failed to mapping notify\n");
}
if(this->gsr_info.system_info.display_server == DisplayServer::X11) {
cursor_tracker = std::make_unique<CursorTrackerX11>((Display*)mgl_get_context()->connection);
@@ -732,15 +735,28 @@ namespace gsr {
bool mapping_updated = false;
while(XPending(x11_dpy)) {
XNextEvent(x11_dpy, &x11_mapping_xev);
if(x11_mapping_xev.type == MappingNotify) {
XRefreshKeyboardMapping(&x11_mapping_xev.xmapping);
mapping_updated = true;
XNextEvent(x11_dpy, &x11_xev);
switch(x11_xev.type) {
case MappingNotify: {
XRefreshKeyboardMapping(&x11_xev.xmapping);
mapping_updated = true;
break;
}
case PropertyNotify: {
if(x11_xev.xproperty.state == PropertyNewValue && x11_xev.xproperty.atom == net_active_window_atom) {
update_focused_window = true;
}
break;
}
}
}
if(mapping_updated)
rebind_all_keyboard_hotkeys();
if(update_focused_window) {
update_focused_window = false;
}
}
void Overlay::handle_events() {

1
src/gui/GlobalSettingsPage.cpp
View File

@@ -459,6 +459,7 @@ namespace gsr {
list_ptr->add_widget(create_screenshot_hotkey_options());
list_ptr->add_widget(create_screenshot_region_hotkey_options());
list_ptr->add_widget(create_screenshot_window_hotkey_options());
list_ptr->add_widget(std::make_unique<Label>(&get_theme().body_font, TR("Press ESC to go back to the previous page/close the UI."), get_color_theme().text_color));
list_ptr->add_widget(create_hotkey_control_buttons());
return subsection;
}