diff options
| -rw-r--r-- | src/Overlay.cpp | 3 | ||||
| -rw-r--r-- | src/main.cpp | 1 | ||||
| -rw-r--r-- | tools/gsr-global-hotkeys/keyboard_event.c | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/Overlay.cpp b/src/Overlay.cpp index aa14e3b..d71dd4e 100644 --- a/src/Overlay.cpp +++ b/src/Overlay.cpp @@ -782,9 +782,6 @@ namespace gsr { update_compositor_texture(focused_monitor); - top_bar_text = mgl::Text("GPU Screen Recorder", get_theme().top_bar_font); - logo_sprite = mgl::Sprite(&get_theme().logo_texture); - bg_screenshot_overlay = mgl::Rectangle(mgl::vec2f(get_theme().window_width, get_theme().window_height)); top_bar_background = mgl::Rectangle(mgl::vec2f(get_theme().window_width, get_theme().window_height*0.06f).floor()); top_bar_text = mgl::Text("GPU Screen Recorder", get_theme().top_bar_font); diff --git a/src/main.cpp b/src/main.cpp index 9c20a81..c81bc8c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -37,6 +37,7 @@ static void disable_prime_run() { unsetenv("__NV_PRIME_RENDER_OFFLOAD_PROVIDER"); unsetenv("__GLX_VENDOR_LIBRARY_NAME"); unsetenv("__VK_LAYER_NV_optimus"); + unsetenv("DRI_PRIME"); } static std::unique_ptr<gsr::GlobalHotkeysX11> register_x11_hotkeys(gsr::Overlay *overlay) { diff --git a/tools/gsr-global-hotkeys/keyboard_event.c b/tools/gsr-global-hotkeys/keyboard_event.c index bcfd616..74332ba 100644 --- a/tools/gsr-global-hotkeys/keyboard_event.c +++ b/tools/gsr-global-hotkeys/keyboard_event.c @@ -184,6 +184,7 @@ static void keyboard_event_process_input_event_data(keyboard_event *self, event_ if(event.type == EV_KEY) { keyboard_event_process_key_state_change(self, event, extra_data, fd); + /* We do this conversion from keycode to keysym back to keycode to support different keyboard layouts in the X server (which Wayland also uses to support Xwayland) */ uint32_t keycode = event.code; const uint32_t keysym = keycode_to_keysym(self, event.code); if(keysym) |