mirror of
https://repo.dec05eba.com/gpu-screen-recorder-ui
synced 2026-05-06 15:00:44 +09:00
Use X11 global hotkeys on X11 when possible to prevent clashing with keys used by other applications
This commit is contained in:
@@ -4,6 +4,10 @@
|
||||
#include <functional>
|
||||
#include <string>
|
||||
|
||||
namespace mgl {
|
||||
class Event;
|
||||
}
|
||||
|
||||
namespace gsr {
|
||||
struct Hotkey {
|
||||
uint64_t key = 0;
|
||||
@@ -24,5 +28,7 @@ namespace gsr {
|
||||
virtual void unbind_all_keys() {}
|
||||
virtual bool bind_action(const std::string &id, GlobalHotkeyCallback callback) { (void)id; (void)callback; return false; };
|
||||
virtual void poll_events() = 0;
|
||||
// Returns true if the event wasn't consumed (if the event didn't match a key that has been bound)
|
||||
virtual bool on_event(mgl::Event &event) { (void)event; return true; }
|
||||
};
|
||||
}
|
||||
@@ -12,12 +12,15 @@ namespace gsr {
|
||||
GlobalHotkeysX11& operator=(const GlobalHotkeysX11&) = delete;
|
||||
~GlobalHotkeysX11() override;
|
||||
|
||||
// Hotkey key is a KeySym (XK_z for example) and modifiers is a bitmask of X11 modifier masks (for example ShiftMask | Mod1Mask)
|
||||
bool bind_key_press(Hotkey hotkey, const std::string &id, GlobalHotkeyCallback callback) override;
|
||||
void unbind_key_press(const std::string &id) override;
|
||||
void unbind_all_keys() override;
|
||||
void poll_events() override;
|
||||
bool on_event(mgl::Event &event) override;
|
||||
private:
|
||||
void call_hotkey_callback(Hotkey hotkey) const;
|
||||
// Returns true if a key bind has been registered for the hotkey
|
||||
bool call_hotkey_callback(Hotkey hotkey) const;
|
||||
private:
|
||||
struct HotkeyData {
|
||||
Hotkey hotkey;
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
|
||||
namespace gsr {
|
||||
class DropdownButton;
|
||||
class GlobalHotkeys;
|
||||
|
||||
enum class RecordingStatus {
|
||||
NONE,
|
||||
@@ -40,7 +41,7 @@ namespace gsr {
|
||||
Overlay& operator=(const Overlay&) = delete;
|
||||
~Overlay();
|
||||
|
||||
void handle_events();
|
||||
void handle_events(gsr::GlobalHotkeys *global_hotkeys);
|
||||
void on_event(mgl::Event &event);
|
||||
// Returns false if not visible
|
||||
bool draw();
|
||||
|
||||
Reference in New Issue
Block a user