1.1.6

README.md

@@ -31,7 +31,7 @@ These are the dependencies needed to build GPU Screen Recorder UI:
 ## Runtime dependencies
 There are also additional dependencies needed at runtime:
 
-* [GPU Screen Recorder](https://git.dec05eba.com/gpu-screen-recorder/) (version 5.0.0 or greater)
+* [GPU Screen Recorder](https://git.dec05eba.com/gpu-screen-recorder/) (version 5.0.0 or later)
 * [GPU Screen Recorder Notification](https://git.dec05eba.com/gpu-screen-recorder-notification/)
 
 ## Program behavior notes
@@ -39,14 +39,14 @@ This program has to grab all keyboards and create a virtual keyboard (`gsr-ui vi
 This might cause issues for you if you use input remapping software. To workaround this you can go into settings and select "Only grab virtual devices"
 
 # License
-This software is licensed under GPL3.0-only. Files under `fonts/` directory belong to the Noto Sans Google fonts project and they are licensed under `SIL Open Font License`.
+This software is licensed under GPL3.0-only. Files under `fonts/` directory belong to the Noto Sans Google fonts project and they are licensed under `SIL Open Font License`. `images/default.cur` it part of the [Adwaita icon theme](https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/tree/master) which is licensed under `Creative Commons Attribution-Share Alike 3.0`.
 
 # Demo
 [![Click here to watch a demo video on youtube](https://img.youtube.com/vi/SOqXusCTXXA/0.jpg)](https://www.youtube.com/watch?v=SOqXusCTXXA)
 
 # Screenshots
-![](https://dec05eba.com/images/gsr-overlay-screenshot-front.webp)
+![](https://dec05eba.com/images/front_page.jpg)
-![](https://dec05eba.com/images/gsr-overlay-screenshot-settings.webp)
+![](https://dec05eba.com/images/settings_page.jpg)
 
 # Donations
 If you want to donate you can donate via bitcoin or monero.

TODO

@@ -107,4 +107,11 @@ When adding window capture only add it to recording and streaming and do the win
 
 Show an error that prime run will be disabled when using desktop portal capture option. This can cause issues as the user may have selected a video codec option that isn't available on their iGPU but is available on the prime-run dGPU.
 
-Is it possible to configure hotkey and the new hotkey to get triggered immediately?
+Is it possible to configure hotkey and the new hotkey to get triggered immediately?
+
+For keyboards that report supporting mice the keyboard grab will be delayed until any key has been pressed (and then released), see: https://github.com/dec05eba/gpu-screen-recorder-issues/issues/97
+    See if there is any way around this.
+
+Instead of installing gsr-global-hotkeys in flatpak use kms-server-proxy to launch gsr-global-hotkeys inside the flatpak with root, just like gsr-kms-server. This removes the need to update gsr-global-hotkeys everytime there is an update.
+
+Check if "modprobe uinput" is needed on some systems (old fedora?).

meson.build

@@ -1,4 +1,4 @@
-project('gsr-ui', ['c', 'cpp'], version : '1.1.2', default_options : ['warning_level=2', 'cpp_std=c++17'], subproject_dir : 'depends')
+project('gsr-ui', ['c', 'cpp'], version : '1.1.6', default_options : ['warning_level=2', 'cpp_std=c++17'], subproject_dir : 'depends')
 
 if get_option('buildtype') == 'debug'
     add_project_arguments('-g3', language : ['c', 'cpp'])
@@ -52,7 +52,7 @@ datadir = get_option('datadir')
 gsr_ui_resources_path = join_paths(prefix, datadir, 'gsr-ui')
 
 add_project_arguments('-DGSR_UI_VERSION="' + meson.project_version() + '"', language: ['c', 'cpp'])
-add_project_arguments('-DGSR_FLATPAK_VERSION="5.1.0"', language: ['c', 'cpp'])
+add_project_arguments('-DGSR_FLATPAK_VERSION="5.1.3"', language: ['c', 'cpp'])
 
 executable(
     meson.project_name(),
@@ -74,6 +74,7 @@ executable(
     [
         'tools/gsr-global-hotkeys/hotplug.c',
         'tools/gsr-global-hotkeys/keyboard_event.c',
+        'tools/gsr-global-hotkeys/keys.c',
         'tools/gsr-global-hotkeys/main.c'
     ],
     c_args : '-fstack-protector-all',

project.conf

@@ -1,7 +1,7 @@
 [package]
 name = "gsr-ui"
 type = "executable"
-version = "1.1.2"
+version = "1.1.6"
 platforms = ["posix"]
 
 [lang.cpp]

src/Config.cpp

@@ -6,7 +6,6 @@
 #include <limits.h>
 #include <inttypes.h>
 #include <libgen.h>
-#include <iostream>
 #include <mglpp/window/Keyboard.hpp>
 
 #define FORMAT_I32 "%" PRIi32

src/Overlay.cpp

@@ -772,9 +772,32 @@ namespace gsr {
         if(cursor_size <= 1)
             cursor_size = 24;
 
-        XcursorImage *cursor_image = XcursorShapeLoadImage(XC_left_ptr, cursor_theme, cursor_size);
+        XcursorImage *cursor_image = nullptr;
+        for(int cursor_size_test : {cursor_size, 24}) {
+            for(const char *cursor_theme_test : {cursor_theme, "default", "Adwaita"}) {
+                for(unsigned int shape : {XC_left_ptr, XC_arrow}) {
+                    cursor_image = XcursorShapeLoadImage(shape, cursor_theme_test, cursor_size_test);
+                    if(cursor_image)
+                        goto done;
+                }
+            }
+        }
+
+        done:
+        if(!cursor_image) {
+            fprintf(stderr, "Error: failed to get cursor, loading bundled default cursor instead\n");
+            const std::string default_cursor_path = resources_path + "images/default.cur";
+            for(int cursor_size_test : {cursor_size, 24}) {
+                cursor_image = XcursorFilenameLoadImage(default_cursor_path.c_str(), cursor_size_test);
+                if(cursor_image)
+                    break;
+            }
+        }
+
         if(!cursor_image) {
             fprintf(stderr, "Error: failed to get cursor\n");
+            XFixesShowCursor(xi_display, DefaultRootWindow(xi_display));
+            XFlush(xi_display);
             return;
         }
 

src/gui/DropdownButton.cpp

@@ -20,7 +20,7 @@ namespace gsr {
     {
         if(icon_texture && icon_texture->is_valid()) {
             icon_sprite.set_texture(icon_texture);
-            icon_sprite.set_height((int)(size.y * 0.5f));
+            icon_sprite.set_height((int)(size.y * 0.45f));
         }
         this->description.set_color(mgl::Color(150, 150, 150));
     }
@@ -242,4 +242,4 @@ namespace gsr {
         update_if_dirty();
         return size;
     }
-}
+}

src/gui/GlobalSettingsPage.cpp

@@ -153,11 +153,14 @@ namespace gsr {
             title_text.set_position(mgl::vec2f(bg_rect.get_position() + mgl::vec2f(bg_rect.get_size().x*0.5f - title_text.get_bounds().size.x*0.5f, padding_vertical)).floor());
             window.draw(title_text);
 
-            //const float description_bottom = description_text.get_position().y + description_text.get_bounds().size.y;
-            //const float remaining_height = (bg_rect.get_position().y + bg_rect.get_size().y) - description_bottom;
             hotkey_text.set_position(mgl::vec2f(bg_rect.get_position() + bg_rect.get_size()*0.5f - hotkey_text.get_bounds().size*0.5f).floor());
             window.draw(hotkey_text);
 
+            const float caret_padding_x = int(0.001f * get_theme().window_height);
+            const mgl::vec2f caret_size = mgl::vec2f(std::max(2.0f, 0.002f * get_theme().window_height), hotkey_text.get_bounds().size.y).floor();
+            mgl::Rectangle caret_rect(hotkey_text.get_position() + mgl::vec2f(hotkey_text.get_bounds().size.x + caret_padding_x, hotkey_text.get_bounds().size.y*0.5f - caret_size.y*0.5f).floor(), caret_size);
+            window.draw(caret_rect);
+
             description_text.set_position(mgl::vec2f(bg_rect.get_position() + mgl::vec2f(bg_rect.get_size().x*0.5f - description_text.get_bounds().size.x*0.5f, bg_rect.get_size().y - description_text.get_bounds().size.y - padding_vertical)).floor());
             window.draw(description_text);
         };
@@ -580,6 +583,7 @@ namespace gsr {
         content_page_ptr->set_visible(false);
         hotkey_overlay_ptr->set_visible(true);
         overlay->unbind_all_keyboard_hotkeys();
+        configure_hotkey_get_button_by_active_type()->set_text("");
 
         switch(hotkey_type) {
             case ConfigureHotkeyType::NONE:
@@ -646,4 +650,4 @@ namespace gsr {
         hotkey_overlay_ptr->set_visible(false);
         overlay->rebind_all_keyboard_hotkeys();
     }
-}
+}

tools/gsr-global-hotkeys/keyboard_event.c

@@ -1,4 +1,5 @@
 #include "keyboard_event.h"
+#include "keys.h"
 
 /* C stdlib */
 #include <stdio.h>
@@ -81,19 +82,19 @@ static void keyboard_event_fetch_update_key_states(keyboard_event *self, event_e
     }
 }
 
-static void keyboard_event_process_key_state_change(keyboard_event *self, struct input_event event, event_extra_data *extra_data, int fd) {
+static void keyboard_event_process_key_state_change(keyboard_event *self, const struct input_event *event, event_extra_data *extra_data, int fd) {
-    if(event.type != EV_KEY)
+    if(event->type != EV_KEY)
         return;
 
-    if(!extra_data->key_states || event.code >= KEY_STATES_SIZE * 8)
+    if(!extra_data->key_states || event->code >= KEY_STATES_SIZE * 8)
         return;
 
-    const unsigned int byte_index = event.code / 8;
+    const unsigned int byte_index = event->code / 8;
-    const unsigned char bit_index = event.code % 8;
+    const unsigned char bit_index = event->code % 8;
     unsigned char key_byte_state = extra_data->key_states[byte_index];
     const bool prev_key_pressed = (key_byte_state & (1 << bit_index)) != KEY_RELEASE;
 
-    if(event.value == KEY_RELEASE) {
+    if(event->value == KEY_RELEASE) {
         key_byte_state &= ~(1 << bit_index);
         if(prev_key_pressed)
             --extra_data->num_keys_pressed;
@@ -171,8 +172,8 @@ static void keyboard_event_process_input_event_data(keyboard_event *self, event_
         //fprintf(stderr, "fd: %d, type: %d, pressed %d, value: %d\n", fd, event.type, event.code, event.value);
     //}
 
-    if(event.type == EV_KEY) {
+    if(event.type == EV_KEY && !is_mouse_button(event.code)) {
-        keyboard_event_process_key_state_change(self, event, extra_data, fd);
+        keyboard_event_process_key_state_change(self, &event, extra_data, fd);
         const uint32_t modifier_bit = keycode_to_modifier_bit(event.code);
         if(modifier_bit == 0) {
             if(keyboard_event_on_key_pressed(self, &event, self->modifier_button_states))
@@ -286,7 +287,7 @@ static bool keyboard_event_try_add_device_if_keyboard(keyboard_event *self, cons
 
     unsigned long evbit = 0;
     ioctl(fd, EVIOCGBIT(0, sizeof(evbit)), &evbit);
-    const bool is_keyboard = evbit & (1 << EV_KEY);
+    const bool is_keyboard = (evbit & (1 << EV_SYN)) && (evbit & (1 << EV_KEY)) && (evbit & (1 << EV_MSC)) && (evbit & (1 << EV_REP));
 
     if(is_keyboard && strcmp(device_name, GSR_UI_VIRTUAL_KEYBOARD_NAME) != 0) {
         unsigned char key_bits[KEY_MAX/8 + 1] = {0};
@@ -297,7 +298,7 @@ static bool keyboard_event_try_add_device_if_keyboard(keyboard_event *self, cons
         //const bool supports_touch_events    = key_bits[BTN_TOUCH/8]    & (1 << (BTN_TOUCH % 8));
         const bool supports_joystick_events = key_bits[BTN_JOYSTICK/8] & (1 << (BTN_JOYSTICK % 8));
         const bool supports_wheel_events    = key_bits[BTN_WHEEL/8]    & (1 << (BTN_WHEEL % 8));
-        if(supports_key_events && !supports_mouse_events && !supports_joystick_events && !supports_wheel_events) {
+        if(supports_key_events && !supports_joystick_events && !supports_wheel_events) {
             unsigned char *key_states = calloc(1, KEY_STATES_SIZE);
             if(key_states && self->num_event_polls < MAX_EVENT_POLLS) {
                 //fprintf(stderr, "%s (%s) supports key inputs\n", dev_input_filepath, device_name);
@@ -314,9 +315,16 @@ static bool keyboard_event_try_add_device_if_keyboard(keyboard_event *self, cons
                     .num_keys_pressed = 0
                 };
 
-                keyboard_event_fetch_update_key_states(self, &self->event_extra_data[self->num_event_polls], fd);
+                if(supports_mouse_events) {
-                if(self->event_extra_data[self->num_event_polls].num_keys_pressed > 0)
+                    fprintf(stderr, "Info: device not grabbed yet because it might be a mouse: /dev/input/event%d\n", dev_input_id);
-                    fprintf(stderr, "Info: device not grabbed yet because some keys are still being pressed: /dev/input/event%d\n", dev_input_id);
+                    fsync(fd);
+                    if(ioctl(fd, EVIOCGKEY(KEY_STATES_SIZE), self->event_extra_data[self->num_event_polls].key_states) == -1)
+                        fprintf(stderr, "Warning: failed to fetch key states for device: /dev/input/event%d\n", dev_input_id);
+                } else {
+                    keyboard_event_fetch_update_key_states(self, &self->event_extra_data[self->num_event_polls], fd);
+                    if(self->event_extra_data[self->num_event_polls].num_keys_pressed > 0)
+                        fprintf(stderr, "Info: device not grabbed yet because some keys are still being pressed: /dev/input/event%d\n", dev_input_id);
+                }
 
                 ++self->num_event_polls;
                 return true;
@@ -389,14 +397,21 @@ static int setup_virtual_keyboard_input(const char *name) {
     success &= (ioctl(fd, UI_SET_EVBIT, EV_SYN) != -1);
     success &= (ioctl(fd, UI_SET_EVBIT, EV_MSC) != -1);
     success &= (ioctl(fd, UI_SET_EVBIT, EV_KEY) != -1);
-    for(int i = 1; i < KEY_MAX; ++i) {
+    success &= (ioctl(fd, UI_SET_EVBIT, EV_REP) != -1);
-        success &= (ioctl(fd, UI_SET_KEYBIT, i) != -1);
-    }
-
     success &= (ioctl(fd, UI_SET_EVBIT, EV_REL) != -1);
-    success &= (ioctl(fd, UI_SET_RELBIT, REL_X) != -1);
+    success &= (ioctl(fd, UI_SET_EVBIT, EV_LED) != -1);
-    success &= (ioctl(fd, UI_SET_RELBIT, REL_Y) != -1);
+
-    success &= (ioctl(fd, UI_SET_RELBIT, REL_Z) != -1);
+    success &= (ioctl(fd, UI_SET_MSCBIT, MSC_SCAN) != -1);
+    for(int i = 1; i < KEY_MAX; ++i) {
+        if(is_key_or_mouse_button(i))
+            success &= (ioctl(fd, UI_SET_KEYBIT, i) != -1);
+    }
+    for(int i = 0; i < REL_MAX; ++i) {
+        success &= (ioctl(fd, UI_SET_RELBIT, i) != -1);
+    }
+    for(int i = 0; i < LED_MAX; ++i) {
+        success &= (ioctl(fd, UI_SET_LEDBIT, i) != -1);
+    }
 
     // success &= (ioctl(fd, UI_SET_EVBIT, EV_ABS) != -1);
     // success &= (ioctl(fd, UI_SET_ABSBIT, ABS_X) != -1);

tools/gsr-global-hotkeys/keys.c

@@ -0,0 +1,25 @@
+#include "keys.h"
+#include <linux/input-event-codes.h>
+
+bool is_key_or_mouse_button(uint32_t keycode) {
+    return (keycode >= KEY_ESC && keycode <= KEY_KPDOT)
+        || (keycode >= KEY_ZENKAKUHANKAKU && keycode <= KEY_F24)
+        || (keycode >= KEY_PLAYCD && keycode <= KEY_MICMUTE)
+        || (keycode >= BTN_MISC && keycode <= BTN_TASK)
+        || (keycode >= BTN_JOYSTICK && keycode <= BTN_THUMBR)
+        || (keycode >= BTN_DIGI && keycode <= BTN_GEAR_UP)
+        || (keycode >= KEY_OK && keycode <= KEY_IMAGES)
+        || (keycode >= KEY_DEL_EOL && keycode <= KEY_DEL_LINE)
+        || (keycode >= KEY_FN && keycode <= KEY_FN_B)
+        || (keycode >= KEY_BRL_DOT1 && keycode <= KEY_BRL_DOT10)
+        || (keycode >= KEY_NUMERIC_0 && keycode <= KEY_LIGHTS_TOGGLE)
+        || (keycode >= BTN_DPAD_UP && keycode <= BTN_DPAD_RIGHT)
+        || (keycode == KEY_ALS_TOGGLE)
+        || (keycode >= KEY_BUTTONCONFIG && keycode <= KEY_VOICECOMMAND)
+        || (keycode >= KEY_BRIGHTNESS_MIN && keycode <= KEY_BRIGHTNESS_MAX)
+        || (keycode >= KEY_KBDINPUTASSIST_PREV && keycode <= KEY_ONSCREEN_KEYBOARD);
+}
+
+bool is_mouse_button(uint32_t keycode) {
+    return (keycode >= BTN_MOUSE && keycode <= BTN_TASK);
+}

tools/gsr-global-hotkeys/keys.h

@@ -0,0 +1,10 @@
+#ifndef KEYS_H
+#define KEYS_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+bool is_key_or_mouse_button(uint32_t keycode);
+bool is_mouse_button(uint32_t keycode);
+
+#endif /* KEYS_H */