diff options
| -rw-r--r-- | README.md | 8 | ||||
| m--------- | depends/mglpp | 0 | ||||
| -rw-r--r-- | fonts/NotoSans-Bold.ttf | bin | 0 -> 616112 bytes | |||
| -rw-r--r-- | meson.build | 3 | ||||
| -rw-r--r-- | src/main.cpp | 18 |
5 files changed, 6 insertions, 23 deletions
@@ -10,10 +10,8 @@ These are the dependencies needed to build GPU Screen Recorder Notification: * x11 (libx11, libxrandr, libxrender, libxfixes) * libglvnd (which provides libgl, libglx and libegl) -## Runtime dependencies -There are also additional dependencies needed at runtime: - -* Noto fonts - # Installation Run `sudo ./install.sh`. This will install gsr-notify to `/usr/bin/gsr-notify`. You can run meson commands manually to install gsr-notify to another directory. + +# License +This software is licensed under GPL3.0-only. `fonts/NotoSans-Bold.ttf` is licensed under the `SIL Open Font License` license.
\ No newline at end of file diff --git a/depends/mglpp b/depends/mglpp -Subproject 8f6c5d220d3e4c250db4bf3022f99c38811b63f +Subproject e16c6ed3dad61ad9b25344d5133c2223da422f6 diff --git a/fonts/NotoSans-Bold.ttf b/fonts/NotoSans-Bold.ttf Binary files differnew file mode 100644 index 0000000..785ef8a --- /dev/null +++ b/fonts/NotoSans-Bold.ttf diff --git a/meson.build b/meson.build index 8f6f56b..f1176b3 100644 --- a/meson.build +++ b/meson.build @@ -30,4 +30,5 @@ executable( cpp_args : '-DGSR_NOTIFY_RESOURCES_PATH="' + gsr_notify_resources_path + '"', ) -install_subdir('images', install_dir : gsr_notify_resources_path)
\ No newline at end of file +install_subdir('images', install_dir : gsr_notify_resources_path) +install_subdir('fonts', install_dir : gsr_notify_resources_path)
\ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index a3503c9..2b3d89f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -156,17 +156,6 @@ static const mgl_monitor* find_monitor_by_cursor_position(mgl::Window &window) { return &win->monitors[0]; } -static std::string find_noto_font_filepath(const char *filename) { - const char *directories[] = { "/usr/share/fonts/noto", "/usr/share/fonts/truetype/noto" }; - char filepath[PATH_MAX]; - for(const char *directory : directories) { - snprintf(filepath, sizeof(filepath), "%s/%s", directory, filename); - if(access(filepath, F_OK) == 0) - return filepath; - } - return ""; -} - int main(int argc, char **argv) { std::string resources_path; if(access("images/stream.png", F_OK) == 0) { @@ -233,12 +222,6 @@ int main(int argc, char **argv) { const mgl::Color icon_color = parse_hex_color(icon_color_str ? icon_color_str : "FFFFFF", resources_path); const mgl::Color bg_color = parse_hex_color(bg_color_str ? bg_color_str : "76b900", resources_path); - const std::string noto_sans_bold_filepath = find_noto_font_filepath("NotoSans-Bold.ttf"); - if(noto_sans_bold_filepath.empty()) { - fprintf(stderr, "error: failed to find NotoSans-Bold.ttf. Make sure noto fonts are installed on your system\n"); - exit(2); - } - mgl::Init init; mgl::Window::CreateParams window_create_params; @@ -263,6 +246,7 @@ int main(int argc, char **argv) { const mgl_monitor *focused_monitor = find_monitor_by_cursor_position(window); + const std::string noto_sans_bold_filepath = resources_path + "fonts/NotoSans-Bold.ttf"; mgl::MemoryMappedFile font_file; if(!font_file.load(noto_sans_bold_filepath.c_str(), mgl::MemoryMappedFile::LoadOptions{true, false})) return 1; |