mirror of
https://repo.dec05eba.com/gpu-screen-recorder-ui
synced 2026-04-05 11:16:28 +09:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dacf6126bf | ||
|
|
9bbec944de | ||
|
|
6a55338b12 |
2
TODO
2
TODO
@@ -171,8 +171,6 @@ Add a bug report page that automatically includes system info (make this clear t
|
||||
|
||||
Make it possible to change controller hotkeys. Also read from /dev/input/eventN instead of /dev/input/jsN. This is readable for controllers.
|
||||
|
||||
Add option to copy screenshot to clipboard. Does it work properly on Wayland compositors? Maybe need to wait until the application becomes Wayland native instead of XWayland.
|
||||
|
||||
Show message that replay/streaming has to be restarted if recording settings are changed while replay/streaming is ongoing.
|
||||
|
||||
Support vector graphics. Maybe support svg, rendering it to a texture for better performance.
|
||||
|
||||
Submodule depends/mglpp updated: b247af888c...8489234dcb
60
include/ClipboardFile.hpp
Normal file
60
include/ClipboardFile.hpp
Normal file
@@ -0,0 +1,60 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <thread>
|
||||
#include <mutex>
|
||||
#include <vector>
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
namespace gsr {
|
||||
struct ClipboardCopy {
|
||||
Window requestor = None;
|
||||
uint64_t file_offset = 0;
|
||||
Atom property = None;
|
||||
Atom requestor_target = None;
|
||||
};
|
||||
|
||||
class ClipboardFile {
|
||||
public:
|
||||
enum class FileType {
|
||||
JPG,
|
||||
PNG
|
||||
};
|
||||
|
||||
ClipboardFile();
|
||||
~ClipboardFile();
|
||||
ClipboardFile(const ClipboardFile&) = delete;
|
||||
ClipboardFile& operator=(const ClipboardFile&) = delete;
|
||||
|
||||
// Set this to an empty string to unset clipboard
|
||||
void set_current_file(const std::string &filepath, FileType file_type);
|
||||
private:
|
||||
bool file_type_matches_request_atom(FileType file_type, Atom request_atom);
|
||||
const char* file_type_clipboard_get_name(Atom request_atom);
|
||||
const char* file_type_get_name(FileType file_type);
|
||||
void send_clipboard_start(XSelectionRequestEvent *xselectionrequest);
|
||||
void transfer_clipboard_data(XSelectionRequestEvent *xselectionrequest, ClipboardCopy *clipboard_copy);
|
||||
ClipboardCopy* get_clipboard_copy_by_requestor(Window requestor);
|
||||
void remove_clipboard_copy(Window requestor);
|
||||
private:
|
||||
Display *dpy = nullptr;
|
||||
Window clipboard_window = None;
|
||||
int file_fd = -1;
|
||||
uint64_t file_size = 0;
|
||||
FileType file_type = FileType::JPG;
|
||||
|
||||
Atom incr_atom = None;
|
||||
Atom targets_atom = None;
|
||||
Atom clipboard_atom = None;
|
||||
Atom image_jpg_atom = None;
|
||||
Atom image_jpeg_atom = None;
|
||||
Atom image_png_atom = None;
|
||||
|
||||
std::thread event_thread;
|
||||
std::mutex mutex;
|
||||
bool running = true;
|
||||
|
||||
std::vector<ClipboardCopy> clipboard_copies;
|
||||
bool should_clear_selection = false;
|
||||
};
|
||||
}
|
||||
@@ -68,6 +68,7 @@ namespace gsr {
|
||||
std::string hotkeys_enable_option = "enable_hotkeys";
|
||||
std::string joystick_hotkeys_enable_option = "disable_hotkeys";
|
||||
std::string tint_color;
|
||||
std::string notification_speed = "normal";
|
||||
ConfigHotkey show_hide_hotkey;
|
||||
};
|
||||
|
||||
@@ -142,6 +143,7 @@ namespace gsr {
|
||||
bool restore_portal_session = true;
|
||||
|
||||
bool save_screenshot_in_game_folder = false;
|
||||
bool save_screenshot_to_clipboard = false;
|
||||
bool show_screenshot_saved_notifications = true;
|
||||
std::string save_directory;
|
||||
ConfigHotkey take_screenshot_hotkey;
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
#include "AudioPlayer.hpp"
|
||||
#include "RegionSelector.hpp"
|
||||
#include "WindowSelector.hpp"
|
||||
#include "ClipboardFile.hpp"
|
||||
#include "CursorTracker/CursorTracker.hpp"
|
||||
|
||||
#include <mglpp/window/Window.hpp>
|
||||
@@ -47,6 +48,11 @@ namespace gsr {
|
||||
WINDOW
|
||||
};
|
||||
|
||||
enum class NotificationSpeed {
|
||||
NORMAL,
|
||||
FAST
|
||||
};
|
||||
|
||||
class Overlay {
|
||||
public:
|
||||
Overlay(std::string resources_path, GsrInfo gsr_info, SupportedCaptureOptions capture_options, egl_functions egl_funcs);
|
||||
@@ -81,6 +87,8 @@ namespace gsr {
|
||||
|
||||
void unbind_all_keyboard_hotkeys();
|
||||
void rebind_all_keyboard_hotkeys();
|
||||
|
||||
void set_notification_speed(NotificationSpeed notification_speed);
|
||||
private:
|
||||
void handle_keyboard_mapping_event();
|
||||
void on_event(mgl::Event &event);
|
||||
@@ -245,5 +253,7 @@ namespace gsr {
|
||||
mgl::Clock cursor_tracker_update_clock;
|
||||
|
||||
bool hide_ui = false;
|
||||
double notification_duration_multiplier = 1.0;
|
||||
ClipboardFile clipboard_file;
|
||||
};
|
||||
}
|
||||
@@ -70,6 +70,7 @@ namespace gsr {
|
||||
std::unique_ptr<Subsection> create_controller_hotkey_subsection(ScrollablePage *parent_page);
|
||||
std::unique_ptr<Button> create_exit_program_button();
|
||||
std::unique_ptr<Button> create_go_back_to_old_ui_button();
|
||||
std::unique_ptr<List> create_notification_speed();
|
||||
std::unique_ptr<Subsection> create_application_options_subsection(ScrollablePage *parent_page);
|
||||
std::unique_ptr<Subsection> create_application_info_subsection(ScrollablePage *parent_page);
|
||||
void add_widgets();
|
||||
@@ -103,6 +104,7 @@ namespace gsr {
|
||||
Button *take_screenshot_region_button_ptr = nullptr;
|
||||
Button *take_screenshot_window_button_ptr = nullptr;
|
||||
Button *show_hide_button_ptr = nullptr;
|
||||
RadioButton *notification_speed_button_ptr = nullptr;
|
||||
|
||||
ConfigHotkey configure_config_hotkey;
|
||||
ConfigureHotkeyType configure_hotkey_type = ConfigureHotkeyType::NONE;
|
||||
|
||||
@@ -42,6 +42,7 @@ namespace gsr {
|
||||
std::unique_ptr<List> create_image_format_section();
|
||||
std::unique_ptr<Widget> create_file_info_section();
|
||||
std::unique_ptr<CheckBox> create_save_screenshot_in_game_folder();
|
||||
std::unique_ptr<CheckBox> create_save_screenshot_to_clipboard();
|
||||
std::unique_ptr<Widget> create_general_section();
|
||||
std::unique_ptr<Widget> create_notifications_section();
|
||||
std::unique_ptr<Widget> create_settings();
|
||||
@@ -69,6 +70,7 @@ namespace gsr {
|
||||
ComboBox *image_format_box_ptr = nullptr;
|
||||
Button *save_directory_button_ptr = nullptr;
|
||||
CheckBox *save_screenshot_in_game_folder_checkbox_ptr = nullptr;
|
||||
CheckBox *save_screenshot_to_clipboard_checkbox_ptr = nullptr;
|
||||
CheckBox *show_screenshot_saved_notification_checkbox_ptr = nullptr;
|
||||
|
||||
PageStack *page_stack = nullptr;
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
project('gsr-ui', ['c', 'cpp'], version : '1.7.3', default_options : ['warning_level=2', 'cpp_std=c++17'], subproject_dir : 'depends')
|
||||
project('gsr-ui', ['c', 'cpp'], version : '1.7.4', default_options : ['warning_level=2', 'cpp_std=c++17'], subproject_dir : 'depends')
|
||||
|
||||
add_project_arguments('-D_FILE_OFFSET_BITS=64', language : ['c', 'cpp'])
|
||||
|
||||
if get_option('buildtype') == 'debug'
|
||||
add_project_arguments('-g3', language : ['c', 'cpp'])
|
||||
@@ -47,6 +49,7 @@ src = [
|
||||
'src/Overlay.cpp',
|
||||
'src/AudioPlayer.cpp',
|
||||
'src/Hotplug.cpp',
|
||||
'src/ClipboardFile.cpp',
|
||||
'src/Rpc.cpp',
|
||||
'src/main.cpp',
|
||||
]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "gsr-ui"
|
||||
type = "executable"
|
||||
version = "1.7.3"
|
||||
version = "1.7.4"
|
||||
platforms = ["posix"]
|
||||
|
||||
[lang.cpp]
|
||||
@@ -10,6 +10,9 @@ version = "c++17"
|
||||
[config]
|
||||
ignore_dirs = ["build", "tools"]
|
||||
|
||||
[define]
|
||||
_FILE_OFFSET_BITS = "64"
|
||||
|
||||
[dependencies]
|
||||
xcomposite = ">=0"
|
||||
xfixes = ">=0"
|
||||
|
||||
294
src/ClipboardFile.cpp
Normal file
294
src/ClipboardFile.cpp
Normal file
@@ -0,0 +1,294 @@
|
||||
#include "../include/ClipboardFile.hpp"
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <inttypes.h>
|
||||
#include <poll.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <X11/Xatom.h>
|
||||
|
||||
#define FORMAT_I64 "%" PRIi64
|
||||
#define FORMAT_U64 "%" PRIu64
|
||||
|
||||
namespace gsr {
|
||||
ClipboardFile::ClipboardFile() {
|
||||
dpy = XOpenDisplay(nullptr);
|
||||
if(!dpy) {
|
||||
fprintf(stderr, "gsr ui: error: ClipboardFile: failed to connect to the X11 server\n");
|
||||
return;
|
||||
}
|
||||
|
||||
clipboard_window = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 0, 0, 8, 8, 0, 0, 0);
|
||||
if(!clipboard_window) {
|
||||
fprintf(stderr, "gsr ui: error: ClipboardFile: failed to create clipboard window\n");
|
||||
XCloseDisplay(dpy);
|
||||
dpy = nullptr;
|
||||
return;
|
||||
}
|
||||
|
||||
incr_atom = XInternAtom(dpy, "INCR", False);
|
||||
targets_atom = XInternAtom(dpy, "TARGETS", False);
|
||||
clipboard_atom = XInternAtom(dpy, "CLIPBOARD", False);
|
||||
image_jpg_atom = XInternAtom(dpy, "image/jpg", False);
|
||||
image_jpeg_atom = XInternAtom(dpy, "image/jpeg", False);
|
||||
image_png_atom = XInternAtom(dpy, "image/png", False);
|
||||
|
||||
event_thread = std::thread([&]() {
|
||||
pollfd poll_fds[1];
|
||||
poll_fds[0].fd = ConnectionNumber(dpy);
|
||||
poll_fds[0].events = POLLIN;
|
||||
poll_fds[0].revents = 0;
|
||||
|
||||
XEvent xev;
|
||||
while(running) {
|
||||
poll(poll_fds, 1, 100);
|
||||
while(XPending(dpy)) {
|
||||
XNextEvent(dpy, &xev);
|
||||
switch(xev.type) {
|
||||
case SelectionClear: {
|
||||
should_clear_selection = true;
|
||||
if(clipboard_copies.empty()) {
|
||||
should_clear_selection = false;
|
||||
set_current_file("", file_type);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case SelectionRequest:
|
||||
send_clipboard_start(&xev.xselectionrequest);
|
||||
break;
|
||||
case PropertyNotify: {
|
||||
if(xev.xproperty.state == PropertyDelete) {
|
||||
std::lock_guard<std::mutex> lock(mutex);
|
||||
ClipboardCopy *clipboard_copy = get_clipboard_copy_by_requestor(xev.xproperty.window);
|
||||
if(!clipboard_copy || xev.xproperty.atom != clipboard_copy->property)
|
||||
return;
|
||||
|
||||
XSelectionRequestEvent xselectionrequest;
|
||||
xselectionrequest.display = xev.xproperty.display;;
|
||||
xselectionrequest.requestor = xev.xproperty.window;
|
||||
xselectionrequest.selection = clipboard_atom;
|
||||
xselectionrequest.target = clipboard_copy->requestor_target;
|
||||
xselectionrequest.property = clipboard_copy->property;
|
||||
xselectionrequest.time = xev.xproperty.time;
|
||||
transfer_clipboard_data(&xselectionrequest, clipboard_copy);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
ClipboardFile::~ClipboardFile() {
|
||||
running = false;
|
||||
if(event_thread.joinable())
|
||||
event_thread.join();
|
||||
|
||||
if(file_fd > 0)
|
||||
close(file_fd);
|
||||
|
||||
if(dpy) {
|
||||
XDestroyWindow(dpy, clipboard_window);
|
||||
XCloseDisplay(dpy);
|
||||
}
|
||||
}
|
||||
|
||||
bool ClipboardFile::file_type_matches_request_atom(FileType file_type, Atom request_atom) {
|
||||
switch(file_type) {
|
||||
case FileType::JPG:
|
||||
return request_atom == image_jpg_atom || request_atom == image_jpeg_atom;
|
||||
case FileType::PNG:
|
||||
return request_atom == image_png_atom;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
const char* ClipboardFile::file_type_clipboard_get_name(Atom request_atom) {
|
||||
if(request_atom == image_jpg_atom)
|
||||
return "image/jpg";
|
||||
else if(request_atom == image_jpeg_atom)
|
||||
return "image/jpeg";
|
||||
else if(request_atom == image_png_atom)
|
||||
return "image/png";
|
||||
return "Unknown";
|
||||
}
|
||||
|
||||
const char* ClipboardFile::file_type_get_name(FileType file_type) {
|
||||
switch(file_type) {
|
||||
case FileType::JPG:
|
||||
return "image/jpeg";
|
||||
case FileType::PNG:
|
||||
return "image/png";
|
||||
}
|
||||
return "Unknown";
|
||||
}
|
||||
|
||||
void ClipboardFile::send_clipboard_start(XSelectionRequestEvent *xselectionrequest) {
|
||||
std::lock_guard<std::mutex> lock(mutex);
|
||||
if(file_fd <= 0) {
|
||||
fprintf(stderr, "gsr ui: warning: ClipboardFile::send_clipboard: requestor window " FORMAT_I64 " tried to get clipboard from us but we don't have any clipboard file open\n", (int64_t)xselectionrequest->requestor);
|
||||
return;
|
||||
}
|
||||
|
||||
if(xselectionrequest->selection != clipboard_atom) {
|
||||
fprintf(stderr, "gsr ui: warning: ClipboardFile::send_clipboard: requestor window " FORMAT_I64 " tried to non-clipboard selection from us\n", (int64_t)xselectionrequest->requestor);
|
||||
return;
|
||||
}
|
||||
|
||||
XSelectionEvent selection_event;
|
||||
selection_event.type = SelectionNotify;
|
||||
selection_event.display = xselectionrequest->display;
|
||||
selection_event.requestor = xselectionrequest->requestor;
|
||||
selection_event.selection = xselectionrequest->selection;
|
||||
selection_event.property = xselectionrequest->property;
|
||||
selection_event.time = xselectionrequest->time;
|
||||
selection_event.target = xselectionrequest->target;
|
||||
|
||||
if(xselectionrequest->target == targets_atom) {
|
||||
int num_targets = 1;
|
||||
Atom targets[3];
|
||||
targets[0] = targets_atom;
|
||||
|
||||
switch(file_type) {
|
||||
case FileType::JPG:
|
||||
num_targets = 3;
|
||||
targets[1] = image_jpg_atom;
|
||||
targets[2] = image_jpeg_atom;
|
||||
break;
|
||||
case FileType::PNG:
|
||||
num_targets = 2;
|
||||
targets[1] = image_png_atom;
|
||||
break;
|
||||
}
|
||||
|
||||
XChangeProperty(dpy, selection_event.requestor, selection_event.property, XA_ATOM, 32, PropModeReplace, (unsigned char*)targets, num_targets);
|
||||
} else if(xselectionrequest->target == image_jpg_atom || xselectionrequest->target == image_jpeg_atom || xselectionrequest->target == image_png_atom) {
|
||||
if(!file_type_matches_request_atom(file_type, xselectionrequest->target)) {
|
||||
fprintf(stderr, "gsr ui: warning: ClipboardFile::send_clipboard: requestor window " FORMAT_I64 " tried to request clipboard of type %s, but %s was expected\n", (int64_t)xselectionrequest->requestor, file_type_clipboard_get_name(xselectionrequest->target), file_type_get_name(file_type));
|
||||
return;
|
||||
}
|
||||
|
||||
ClipboardCopy *clipboard_copy = get_clipboard_copy_by_requestor(xselectionrequest->requestor);
|
||||
if(!clipboard_copy) {
|
||||
clipboard_copies.push_back({ xselectionrequest->requestor, 0 });
|
||||
clipboard_copy = &clipboard_copies.back();
|
||||
}
|
||||
|
||||
*clipboard_copy = { xselectionrequest->requestor, 0 };
|
||||
clipboard_copy->property = selection_event.property;
|
||||
clipboard_copy->requestor_target = selection_event.target;
|
||||
XSelectInput(dpy, selection_event.requestor, PropertyChangeMask);
|
||||
|
||||
const long lower_bound = std::min((uint64_t)1<<16, file_size);
|
||||
XChangeProperty(dpy, selection_event.requestor, selection_event.property, incr_atom, 32, PropModeReplace, (const unsigned char*)&lower_bound, 1);
|
||||
} else {
|
||||
char *target_clipboard_name = XGetAtomName(dpy, xselectionrequest->target);
|
||||
fprintf(stderr, "gsr ui: warning: ClipboardFile::send_clipboard: requestor window " FORMAT_I64 " tried to request clipboard of type %s, expected TARGETS, image/jpg, image/jpeg or image/png\n", (int64_t)xselectionrequest->requestor, target_clipboard_name ? target_clipboard_name : "Unknown");
|
||||
if(target_clipboard_name)
|
||||
XFree(target_clipboard_name);
|
||||
selection_event.property = None;
|
||||
}
|
||||
|
||||
XSendEvent(dpy, selection_event.requestor, False, NoEventMask, (XEvent*)&selection_event);
|
||||
XFlush(dpy);
|
||||
}
|
||||
|
||||
void ClipboardFile::transfer_clipboard_data(XSelectionRequestEvent *xselectionrequest, ClipboardCopy *clipboard_copy) {
|
||||
uint8_t file_buffer[1<<16];
|
||||
ssize_t file_bytes_read = 0;
|
||||
|
||||
if(lseek(file_fd, clipboard_copy->file_offset, SEEK_SET) == -1) {
|
||||
fprintf(stderr, "gsr ui: error: ClipboardFile::send_clipboard: failed to seek in clipboard file to offset " FORMAT_U64 " for requestor window " FORMAT_I64 ", error: %s\n", (uint64_t)clipboard_copy->file_offset, (int64_t)xselectionrequest->requestor, strerror(errno));
|
||||
clipboard_copy->file_offset = 0;
|
||||
// TODO: Cancel transfer
|
||||
return;
|
||||
}
|
||||
|
||||
file_bytes_read = read(file_fd, file_buffer, sizeof(file_buffer));
|
||||
if(file_bytes_read < 0) {
|
||||
fprintf(stderr, "gsr ui: error: ClipbaordFile::send_clipboard: failed to read data from offset " FORMAT_U64 " for requestor window " FORMAT_I64 ", error: %s\n", (uint64_t)clipboard_copy->file_offset, (int64_t)xselectionrequest->requestor, strerror(errno));
|
||||
clipboard_copy->file_offset = 0;
|
||||
// TODO: Cancel transfer
|
||||
return;
|
||||
}
|
||||
|
||||
XChangeProperty(dpy, xselectionrequest->requestor, xselectionrequest->property, xselectionrequest->target, 8, PropModeReplace, (const unsigned char*)file_buffer, file_bytes_read);
|
||||
XSendEvent(dpy, xselectionrequest->requestor, False, NoEventMask, (XEvent*)xselectionrequest);
|
||||
XFlush(dpy);
|
||||
|
||||
clipboard_copy->file_offset += file_bytes_read;
|
||||
if(file_bytes_read == 0)
|
||||
remove_clipboard_copy(clipboard_copy->requestor);
|
||||
}
|
||||
|
||||
ClipboardCopy* ClipboardFile::get_clipboard_copy_by_requestor(Window requestor) {
|
||||
for(ClipboardCopy &clipboard_copy : clipboard_copies) {
|
||||
if(clipboard_copy.requestor == requestor)
|
||||
return &clipboard_copy;
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void ClipboardFile::remove_clipboard_copy(Window requestor) {
|
||||
for(auto it = clipboard_copies.begin(), end = clipboard_copies.end(); it != end; ++it) {
|
||||
if(it->requestor == requestor) {
|
||||
clipboard_copies.erase(it);
|
||||
XSelectInput(dpy, requestor, 0);
|
||||
|
||||
if(clipboard_copies.empty() && should_clear_selection) {
|
||||
should_clear_selection = false;
|
||||
set_current_file("", file_type);
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ClipboardFile::set_current_file(const std::string &filepath, FileType file_type) {
|
||||
if(!dpy)
|
||||
return;
|
||||
|
||||
std::lock_guard<std::mutex> lock(mutex);
|
||||
for(ClipboardCopy &clipboard_copy : clipboard_copies) {
|
||||
XSelectInput(dpy, clipboard_copy.requestor, 0);
|
||||
}
|
||||
clipboard_copies.clear();
|
||||
|
||||
if(filepath.empty()) {
|
||||
if(file_fd > 0) {
|
||||
close(file_fd);
|
||||
file_fd = -1;
|
||||
}
|
||||
file_size = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
if(file_fd > 0) {
|
||||
close(file_fd);
|
||||
file_fd = -1;
|
||||
file_size = 0;
|
||||
}
|
||||
|
||||
file_fd = open(filepath.c_str(), O_RDONLY);
|
||||
if(file_fd <= 0) {
|
||||
fprintf(stderr, "gsr ui: error: ClipboardFile::set_current_file: failed to open file %s, error: %s\n", filepath.c_str(), strerror(errno));
|
||||
return;
|
||||
}
|
||||
|
||||
struct stat64 stat;
|
||||
if(fstat64(file_fd, &stat) == -1) {
|
||||
fprintf(stderr, "gsr ui: error: ClipboardFile::set_current_file: failed to get file size for file %s, error: %s\n", filepath.c_str(), strerror(errno));
|
||||
close(file_fd);
|
||||
file_fd = -1;
|
||||
return;
|
||||
}
|
||||
file_size = stat.st_size;
|
||||
this->file_type = file_type;
|
||||
|
||||
XSetSelectionOwner(dpy, clipboard_atom, clipboard_window, CurrentTime);
|
||||
XFlush(dpy);
|
||||
}
|
||||
}
|
||||
@@ -174,6 +174,7 @@ namespace gsr {
|
||||
{"main.hotkeys_enable_option", &config.main_config.hotkeys_enable_option},
|
||||
{"main.joystick_hotkeys_enable_option", &config.main_config.joystick_hotkeys_enable_option},
|
||||
{"main.tint_color", &config.main_config.tint_color},
|
||||
{"main.notification_speed", &config.main_config.notification_speed},
|
||||
{"main.show_hide_hotkey", &config.main_config.show_hide_hotkey},
|
||||
|
||||
{"streaming.record_options.record_area_option", &config.streaming_config.record_options.record_area_option},
|
||||
@@ -283,6 +284,7 @@ namespace gsr {
|
||||
{"screenshot.record_cursor", &config.screenshot_config.record_cursor},
|
||||
{"screenshot.restore_portal_session", &config.screenshot_config.restore_portal_session},
|
||||
{"screenshot.save_screenshot_in_game_folder", &config.screenshot_config.save_screenshot_in_game_folder},
|
||||
{"screenshot.save_screenshot_to_clipboard", &config.screenshot_config.save_screenshot_to_clipboard},
|
||||
{"screenshot.show_screenshot_saved_notifications", &config.screenshot_config.show_screenshot_saved_notifications},
|
||||
{"screenshot.save_directory", &config.screenshot_config.save_directory},
|
||||
{"screenshot.take_screenshot_hotkey", &config.screenshot_config.take_screenshot_hotkey},
|
||||
|
||||
@@ -50,6 +50,7 @@ namespace gsr {
|
||||
static const double force_window_on_top_timeout_seconds = 1.0;
|
||||
static const double replay_status_update_check_timeout_seconds = 1.5;
|
||||
static const double replay_saving_notification_timeout_seconds = 0.5;
|
||||
static const double short_notification_timeout_seconds = 2.0;
|
||||
static const double notification_timeout_seconds = 3.0;
|
||||
static const double notification_error_timeout_seconds = 5.0;
|
||||
static const double cursor_tracker_update_timeout_sec = 0.1;
|
||||
@@ -446,6 +447,17 @@ namespace gsr {
|
||||
return global_hotkeys_js;
|
||||
}
|
||||
|
||||
static NotificationSpeed to_notification_speed(const std::string ¬ification_speed_str) {
|
||||
if(notification_speed_str == "normal")
|
||||
return NotificationSpeed::NORMAL;
|
||||
else if(notification_speed_str == "fast")
|
||||
return NotificationSpeed::FAST;
|
||||
else {
|
||||
assert(false);
|
||||
return NotificationSpeed::NORMAL;
|
||||
}
|
||||
}
|
||||
|
||||
Overlay::Overlay(std::string resources_path, GsrInfo gsr_info, SupportedCaptureOptions capture_options, egl_functions egl_funcs) :
|
||||
resources_path(std::move(resources_path)),
|
||||
gsr_info(std::move(gsr_info)),
|
||||
@@ -474,6 +486,7 @@ namespace gsr {
|
||||
|
||||
power_supply_online_filepath = get_power_supply_online_filepath();
|
||||
replay_startup_mode = replay_startup_string_to_type(config.replay_config.turn_on_replay_automatically_mode.c_str());
|
||||
set_notification_speed(to_notification_speed(config.main_config.notification_speed));
|
||||
|
||||
if(config.main_config.hotkeys_enable_option == "enable_hotkeys")
|
||||
global_hotkeys = register_linux_hotkeys(this, GlobalHotkeysLinux::GrabType::ALL);
|
||||
@@ -1645,6 +1658,8 @@ namespace gsr {
|
||||
}
|
||||
|
||||
void Overlay::show_notification(const char *str, double timeout_seconds, mgl::Color icon_color, mgl::Color bg_color, NotificationType notification_type, const char *capture_target) {
|
||||
timeout_seconds *= notification_duration_multiplier;
|
||||
|
||||
char timeout_seconds_str[32];
|
||||
snprintf(timeout_seconds_str, sizeof(timeout_seconds_str), "%f", timeout_seconds);
|
||||
|
||||
@@ -1737,6 +1752,17 @@ namespace gsr {
|
||||
bind_linux_hotkeys(static_cast<GlobalHotkeysLinux*>(global_hotkeys.get()), this);
|
||||
}
|
||||
|
||||
void Overlay::set_notification_speed(NotificationSpeed notification_speed) {
|
||||
switch(notification_speed) {
|
||||
case NotificationSpeed::NORMAL:
|
||||
notification_duration_multiplier = 1.0;
|
||||
break;
|
||||
case NotificationSpeed::FAST:
|
||||
notification_duration_multiplier = 0.3;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void Overlay::update_notification_process_status() {
|
||||
if(notification_process <= 0)
|
||||
return;
|
||||
@@ -1816,6 +1842,15 @@ namespace gsr {
|
||||
return replay_duration_sec;
|
||||
}
|
||||
|
||||
static ClipboardFile::FileType filename_to_clipboard_file_type(const std::string &filename) {
|
||||
if(ends_with(filename, ".jpg") || ends_with(filename, ".jpeg"))
|
||||
return ClipboardFile::FileType::JPG;
|
||||
else if(ends_with(filename, ".png"))
|
||||
return ClipboardFile::FileType::PNG;
|
||||
assert(false);
|
||||
return ClipboardFile::FileType::PNG;
|
||||
}
|
||||
|
||||
void Overlay::save_video_in_current_game_directory(const char *video_filepath, NotificationType notification_type) {
|
||||
mgl_context *context = mgl_get_context();
|
||||
Display *display = (Display*)context->connection;
|
||||
@@ -1870,6 +1905,9 @@ namespace gsr {
|
||||
snprintf(msg, sizeof(msg), "Saved a screenshot of %s\nto \"%s\"",
|
||||
capture_target_get_notification_name(screenshot_capture_target.c_str(), true).c_str(), focused_window_name.c_str());
|
||||
capture_target = screenshot_capture_target.c_str();
|
||||
|
||||
if(config.screenshot_config.save_screenshot_to_clipboard)
|
||||
clipboard_file.set_current_file(new_video_filepath, filename_to_clipboard_file_type(new_video_filepath));
|
||||
break;
|
||||
}
|
||||
case NotificationType::NONE:
|
||||
@@ -1966,7 +2004,9 @@ namespace gsr {
|
||||
const char *prefix = "";
|
||||
switch(notification_type) {
|
||||
case NotificationType::NONE:
|
||||
break;
|
||||
case NotificationType::SCREENSHOT:
|
||||
prefix = "Failed to take a screenshot";
|
||||
break;
|
||||
case NotificationType::RECORD:
|
||||
prefix = "Failed to start/save recording";
|
||||
@@ -2009,7 +2049,7 @@ namespace gsr {
|
||||
update_ui_replay_stopped();
|
||||
if(exit_code == 0) {
|
||||
if(config.replay_config.show_replay_stopped_notifications)
|
||||
show_notification("Replay stopped", notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY);
|
||||
show_notification("Replay stopped", short_notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY);
|
||||
} else {
|
||||
on_gsr_process_error(exit_code, NotificationType::REPLAY);
|
||||
}
|
||||
@@ -2024,7 +2064,7 @@ namespace gsr {
|
||||
update_ui_streaming_stopped();
|
||||
if(exit_code == 0) {
|
||||
if(config.streaming_config.show_streaming_stopped_notifications)
|
||||
show_notification("Streaming has stopped", notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::STREAM);
|
||||
show_notification("Streaming has stopped", short_notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::STREAM);
|
||||
} else {
|
||||
on_gsr_process_error(exit_code, NotificationType::STREAM);
|
||||
}
|
||||
@@ -2058,6 +2098,9 @@ namespace gsr {
|
||||
snprintf(msg, sizeof(msg), "Saved a screenshot of %s",
|
||||
capture_target_get_notification_name(screenshot_capture_target.c_str(), true).c_str());
|
||||
show_notification(msg, notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::SCREENSHOT, screenshot_capture_target.c_str());
|
||||
|
||||
if(config.screenshot_config.save_screenshot_to_clipboard)
|
||||
clipboard_file.set_current_file(screenshot_filepath, filename_to_clipboard_file_type(screenshot_filepath));
|
||||
}
|
||||
} else {
|
||||
fprintf(stderr, "Warning: gpu-screen-recorder (%d) exited with exit status %d\n", (int)gpu_screen_recorder_screenshot_process, exit_code);
|
||||
@@ -2665,7 +2708,7 @@ namespace gsr {
|
||||
if(!disable_notification && config.replay_config.show_replay_started_notifications) {
|
||||
char msg[256];
|
||||
snprintf(msg, sizeof(msg), "Started replaying %s", capture_target_get_notification_name(recording_capture_target.c_str(), false).c_str());
|
||||
show_notification(msg, notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::REPLAY, recording_capture_target.c_str());
|
||||
show_notification(msg, short_notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::REPLAY, recording_capture_target.c_str());
|
||||
}
|
||||
|
||||
if(config.replay_config.record_options.record_area_option == "portal")
|
||||
@@ -2693,7 +2736,7 @@ namespace gsr {
|
||||
if(gsr_info.system_info.gsr_version >= GsrVersion{5, 4, 0}) {
|
||||
if(!replay_recording) {
|
||||
if(config.record_config.show_recording_started_notifications)
|
||||
show_notification("Started recording in the replay session", notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::RECORD);
|
||||
show_notification("Started recording in the replay session", short_notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::RECORD);
|
||||
update_ui_recording_started();
|
||||
|
||||
// TODO: This will be incorrect if the user uses portal capture, as capture wont start until the user has
|
||||
@@ -2714,7 +2757,7 @@ namespace gsr {
|
||||
if(gsr_info.system_info.gsr_version >= GsrVersion{5, 4, 0}) {
|
||||
if(!replay_recording) {
|
||||
if(config.record_config.show_recording_started_notifications)
|
||||
show_notification("Started recording in the streaming session", notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::RECORD);
|
||||
show_notification("Started recording in the streaming session", short_notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::RECORD);
|
||||
update_ui_recording_started();
|
||||
|
||||
// TODO: This will be incorrect if the user uses portal capture, as capture wont start until the user has
|
||||
@@ -2840,7 +2883,7 @@ namespace gsr {
|
||||
if(config.record_config.show_recording_started_notifications) {
|
||||
char msg[256];
|
||||
snprintf(msg, sizeof(msg), "Started recording %s", capture_target_get_notification_name(recording_capture_target.c_str(), false).c_str());
|
||||
show_notification(msg, notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::RECORD, recording_capture_target.c_str());
|
||||
show_notification(msg, short_notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::RECORD, recording_capture_target.c_str());
|
||||
}
|
||||
|
||||
if(config.record_config.record_options.record_area_option == "portal")
|
||||
@@ -3026,7 +3069,7 @@ namespace gsr {
|
||||
if(config.streaming_config.show_streaming_started_notifications) {
|
||||
char msg[256];
|
||||
snprintf(msg, sizeof(msg), "Started streaming %s", capture_target_get_notification_name(recording_capture_target.c_str(), false).c_str());
|
||||
show_notification(msg, notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::STREAM, recording_capture_target.c_str());
|
||||
show_notification(msg, short_notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::STREAM, recording_capture_target.c_str());
|
||||
}
|
||||
|
||||
if(config.streaming_config.record_options.record_area_option == "portal")
|
||||
|
||||
@@ -350,6 +350,7 @@ namespace gsr {
|
||||
|
||||
mgl::Text32 &active_text = masked ? masked_text : text;
|
||||
caret.offset_x = active_text.find_character_pos(caret.index).x - active_text.get_position().x;
|
||||
selection_start_caret.offset_x = active_text.find_character_pos(selection_start_caret.index).x - active_text.get_position().x;
|
||||
}
|
||||
|
||||
bool Entry::is_masked() const {
|
||||
|
||||
@@ -467,13 +467,42 @@ namespace gsr {
|
||||
return exit_program_button;
|
||||
}
|
||||
|
||||
std::unique_ptr<List> GlobalSettingsPage::create_notification_speed() {
|
||||
auto list = std::make_unique<List>(List::Orientation::VERTICAL);
|
||||
list->add_widget(std::make_unique<Label>(&get_theme().body_font, "Notification speed", get_color_theme().text_color));
|
||||
|
||||
auto radio_button = std::make_unique<RadioButton>(&get_theme().body_font, RadioButton::Orientation::HORIZONTAL);
|
||||
notification_speed_button_ptr = radio_button.get();
|
||||
radio_button->add_item("Normal", "normal");
|
||||
radio_button->add_item("Fast", "fast");
|
||||
radio_button->on_selection_changed = [this](const std::string&, const std::string &id) {
|
||||
if(id == "normal")
|
||||
overlay->set_notification_speed(NotificationSpeed::NORMAL);
|
||||
else if(id == "fast")
|
||||
overlay->set_notification_speed(NotificationSpeed::FAST);
|
||||
return true;
|
||||
};
|
||||
list->add_widget(std::move(radio_button));
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
std::unique_ptr<Subsection> GlobalSettingsPage::create_application_options_subsection(ScrollablePage *parent_page) {
|
||||
auto list = std::make_unique<List>(List::Orientation::VERTICAL);
|
||||
List *list_ptr = list.get();
|
||||
auto subsection = std::make_unique<Subsection>("Application options", std::move(list), mgl::vec2f(parent_page->get_inner_size().x, 0.0f));
|
||||
|
||||
list_ptr->add_widget(create_notification_speed());
|
||||
list_ptr->add_widget(std::make_unique<LineSeparator>(LineSeparator::Orientation::HORIZONTAL, subsection->get_inner_size().x));
|
||||
|
||||
const bool inside_flatpak = getenv("FLATPAK_ID") != NULL;
|
||||
auto list = std::make_unique<List>(List::Orientation::HORIZONTAL);
|
||||
list->add_widget(create_exit_program_button());
|
||||
auto navigate_list = std::make_unique<List>(List::Orientation::HORIZONTAL);
|
||||
navigate_list->add_widget(create_exit_program_button());
|
||||
if(inside_flatpak)
|
||||
list->add_widget(create_go_back_to_old_ui_button());
|
||||
return std::make_unique<Subsection>("Application options", std::move(list), mgl::vec2f(parent_page->get_inner_size().x, 0.0f));
|
||||
navigate_list->add_widget(create_go_back_to_old_ui_button());
|
||||
list_ptr->add_widget(std::move(navigate_list));
|
||||
|
||||
return subsection;
|
||||
}
|
||||
|
||||
std::unique_ptr<Subsection> GlobalSettingsPage::create_application_info_subsection(ScrollablePage *parent_page) {
|
||||
@@ -535,6 +564,8 @@ namespace gsr {
|
||||
enable_keyboard_hotkeys_radio_button_ptr->set_selected_item(config.main_config.hotkeys_enable_option, false, false);
|
||||
enable_joystick_hotkeys_radio_button_ptr->set_selected_item(config.main_config.joystick_hotkeys_enable_option, false, false);
|
||||
|
||||
notification_speed_button_ptr->set_selected_item(config.main_config.notification_speed);
|
||||
|
||||
load_hotkeys();
|
||||
}
|
||||
|
||||
@@ -561,6 +592,7 @@ namespace gsr {
|
||||
config.main_config.tint_color = tint_color_radio_button_ptr->get_selected_id();
|
||||
config.main_config.hotkeys_enable_option = enable_keyboard_hotkeys_radio_button_ptr->get_selected_id();
|
||||
config.main_config.joystick_hotkeys_enable_option = enable_joystick_hotkeys_radio_button_ptr->get_selected_id();
|
||||
config.main_config.notification_speed = notification_speed_button_ptr->get_selected_id();
|
||||
save_config(config);
|
||||
}
|
||||
|
||||
|
||||
@@ -215,8 +215,17 @@ namespace gsr {
|
||||
return checkbox;
|
||||
}
|
||||
|
||||
std::unique_ptr<CheckBox> ScreenshotSettingsPage::create_save_screenshot_to_clipboard() {
|
||||
auto checkbox = std::make_unique<CheckBox>(&get_theme().body_font, "Save screenshot to clipboard");
|
||||
save_screenshot_to_clipboard_checkbox_ptr = checkbox.get();
|
||||
return checkbox;
|
||||
}
|
||||
|
||||
std::unique_ptr<Widget> ScreenshotSettingsPage::create_general_section() {
|
||||
return std::make_unique<Subsection>("General", create_save_screenshot_in_game_folder(), mgl::vec2f(settings_scrollable_page_ptr->get_inner_size().x, 0.0f));
|
||||
auto list = std::make_unique<List>(List::Orientation::VERTICAL);
|
||||
list->add_widget(create_save_screenshot_in_game_folder());
|
||||
list->add_widget(create_save_screenshot_to_clipboard());
|
||||
return std::make_unique<Subsection>("General", std::move(list), mgl::vec2f(settings_scrollable_page_ptr->get_inner_size().x, 0.0f));
|
||||
}
|
||||
|
||||
std::unique_ptr<Widget> ScreenshotSettingsPage::create_notifications_section() {
|
||||
@@ -281,6 +290,7 @@ namespace gsr {
|
||||
restore_portal_session_checkbox_ptr->set_checked(config.screenshot_config.restore_portal_session);
|
||||
save_directory_button_ptr->set_text(config.screenshot_config.save_directory);
|
||||
save_screenshot_in_game_folder_checkbox_ptr->set_checked(config.screenshot_config.save_screenshot_in_game_folder);
|
||||
save_screenshot_to_clipboard_checkbox_ptr->set_checked(config.screenshot_config.save_screenshot_to_clipboard);
|
||||
show_screenshot_saved_notification_checkbox_ptr->set_checked(config.screenshot_config.show_screenshot_saved_notifications);
|
||||
|
||||
if(config.screenshot_config.image_width == 0)
|
||||
@@ -309,6 +319,7 @@ namespace gsr {
|
||||
config.screenshot_config.restore_portal_session = restore_portal_session_checkbox_ptr->is_checked();
|
||||
config.screenshot_config.save_directory = save_directory_button_ptr->get_text();
|
||||
config.screenshot_config.save_screenshot_in_game_folder = save_screenshot_in_game_folder_checkbox_ptr->is_checked();
|
||||
config.screenshot_config.save_screenshot_to_clipboard = save_screenshot_to_clipboard_checkbox_ptr->is_checked();
|
||||
config.screenshot_config.show_screenshot_saved_notifications = show_screenshot_saved_notification_checkbox_ptr->is_checked();
|
||||
|
||||
if(config.screenshot_config.image_width == 0)
|
||||
|
||||
Reference in New Issue
Block a user