diff --git a/.github/workflows/linux_x64.yml b/.github/workflows/linux_x64.yml index 8efff9aab..3a88bd26f 100644 --- a/.github/workflows/linux_x64.yml +++ b/.github/workflows/linux_x64.yml @@ -80,7 +80,7 @@ jobs: printf "复制文件...\n" cp -r ../build/linux/x64/release/bundle/* opt/PiliPlus cp -r ../assets/linux/DEBIAN . - cp ../assets/linux/piliplus.desktop usr/share/applications + cp ../assets/linux/com.example.piliplus.desktop usr/share/applications cp ../assets/images/logo/logo.png usr/share/icons/hicolor/512x512/apps/piliplus.png printf "修改控制文件...\n" @@ -122,7 +122,7 @@ jobs: SRC_DIR="$PWD/piliplus-${{ env.version }}" mkdir -p "$SRC_DIR/bundle" "$SRC_DIR/assets" cp -r build/linux/x64/release/bundle/* "$SRC_DIR/bundle/" - cp assets/linux/piliplus.desktop "$SRC_DIR/assets/piliplus.desktop" + cp assets/linux/com.example.piliplus.desktop "$SRC_DIR/assets/com.example.piliplus.desktop" cp assets/images/logo/logo.png "$SRC_DIR/assets/piliplus.png" tar -zcvf "$RPM_BUILD_ROOT/SOURCES/piliplus-${{ env.version }}.tar.gz" -C "$PWD" "piliplus-${{ env.version }}" @@ -155,7 +155,7 @@ jobs: # 桌面集成 mkdir -p %{buildroot}/usr/share/applications - install -m 644 assets/piliplus.desktop %{buildroot}/usr/share/applications/piliplus.desktop + install -m 644 assets/com.example.piliplus.desktop %{buildroot}/usr/share/applications/com.example.piliplus.desktop mkdir -p %{buildroot}/usr/share/icons/hicolor/512x512/apps install -m 644 assets/piliplus.png %{buildroot}/usr/share/icons/hicolor/512x512/apps/piliplus.png @@ -171,7 +171,7 @@ jobs: %files /opt/PiliPlus /usr/bin/piliplus - /usr/share/applications/piliplus.desktop + /usr/share/applications/com.example.piliplus.desktop /usr/share/icons/hicolor/512x512/apps/piliplus.png %changelog @@ -207,8 +207,8 @@ jobs: cp -r build/linux/x64/release/bundle/* "$APPDIR/usr/bin/" printf "复制桌面文件和图标...\n" - cp assets/linux/piliplus.desktop "$APPDIR/piliplus.desktop" - cp assets/linux/piliplus.desktop "$APPDIR/usr/share/applications/piliplus.desktop" + cp assets/linux/com.example.piliplus.desktop "$APPDIR/com.example.piliplus.desktop" + cp assets/linux/com.example.piliplus.desktop "$APPDIR/usr/share/applications/com.example.piliplus.desktop" cp assets/images/logo/logo.png "$APPDIR/piliplus.png" cp assets/images/logo/logo.png "$APPDIR/usr/share/icons/hicolor/512x512/apps/piliplus.png" @@ -224,8 +224,8 @@ jobs: chmod +x "$APPDIR/AppRun" printf "修改桌面文件中的 Exec 路径...\n" - sed -i 's|Exec=piliplus|Exec=piliplus|g' "$APPDIR/piliplus.desktop" - sed -i 's|Icon=piliplus|Icon=piliplus|g' "$APPDIR/piliplus.desktop" + sed -i 's|Exec=piliplus|Exec=piliplus|g' "$APPDIR/com.example.piliplus.desktop" + sed -i 's|Icon=piliplus|Icon=piliplus|g' "$APPDIR/com.example.piliplus.desktop" printf "打包 AppImage...\n" ARCH=x86_64 ./appimagetool-x86_64.AppImage "$APPDIR" "PiliPlus_linux_${{ env.version }}_amd64.AppImage" diff --git a/assets/linux/piliplus.desktop b/assets/linux/com.example.piliplus.desktop similarity index 100% rename from assets/linux/piliplus.desktop rename to assets/linux/com.example.piliplus.desktop diff --git a/lib/pages/setting/models/style_settings.dart b/lib/pages/setting/models/style_settings.dart index c8c6decee..9c5bbe943 100644 --- a/lib/pages/setting/models/style_settings.dart +++ b/lib/pages/setting/models/style_settings.dart @@ -56,6 +56,16 @@ List get styleSettings => [ needReboot: true, ), ], + if (Platform.isLinux) + const SwitchModel( + title: '使用SSD（Server-Side Decoration）', + subtitle: '（Linux）强制使用Server-Side Decoration', + leading: Icon(Icons.web_asset), + setKey: SettingBoxKey.useSSD, + defaultVal: false, + needReboot: true, + onChanged: GStorage.syncToDisk, + ), SwitchModel( title: '横屏适配', subtitle: '启用横屏布局与逻辑，平板、折叠屏等可开启；建议全屏方向设为【不改变当前方向】', diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index dc0b77cc3..3392f4a0e 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -1,4 +1,5 @@ import 'dart:convert'; +import 'dart:io'; import 'package:PiliPlus/models/model_owner.dart'; import 'package:PiliPlus/models/user/danmaku_rule_adapter.dart'; @@ -61,6 +62,11 @@ abstract final class GStorage { ]); } + static Future syncToDisk([_]) { + final jsonPath = path.join(appSupportDirPath, 'settings.json'); + return File(jsonPath).writeAsString(exportAllSettings()); + } + static String exportAllSettings() { return Utils.jsonEncoder.convert({ setting.name: setting.toMap(), diff --git a/lib/utils/storage_key.dart b/lib/utils/storage_key.dart index 915cc6713..b8a6955ee 100644 --- a/lib/utils/storage_key.dart +++ b/lib/utils/storage_key.dart @@ -157,7 +157,8 @@ abstract final class SettingBoxKey { showWindowTitleBar = 'showWindowTitleBar', desktopVolume = 'desktopVolume', showTrayIcon = 'showTrayIcon', - uiScale = 'uiScale'; + uiScale = 'uiScale', + useSSD = 'useSSD'; static const String subtitlePreferenceV2 = 'subtitlePreferenceV2', enableDragSubtitle = 'enableDragSubtitle', diff --git a/lib/utils/storage_pref.dart b/lib/utils/storage_pref.dart index b881dc547..cb815b7ec 100644 --- a/lib/utils/storage_pref.dart +++ b/lib/utils/storage_pref.dart @@ -914,6 +914,9 @@ abstract final class Pref { static bool get showWindowTitleBar => _setting.get(SettingBoxKey.showWindowTitleBar, defaultValue: true); + static bool get useSSD => + _setting.get(SettingBoxKey.useSSD, defaultValue: false); + static double get desktopVolume => _setting.get(SettingBoxKey.desktopVolume, defaultValue: 1.0); diff --git a/linux/runner/my_application.cc b/linux/runner/my_application.cc index ecdd386fe..753a7d9ed 100644 --- a/linux/runner/my_application.cc +++ b/linux/runner/my_application.cc @@ -5,18 +5,21 @@ #include #endif +#include +#include +#include + #include "flutter/generated_plugin_registrant.h" struct _MyApplication { GtkApplication parent_instance; - char** dart_entrypoint_arguments; + char **dart_entrypoint_arguments; }; G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) // Called when first Flutter frame received. -static void first_frame_cb(MyApplication* self, FlView *view) -{ +static void first_frame_cb(MyApplication *self, FlView *view) { gtk_widget_show(gtk_widget_get_toplevel(GTK_WIDGET(view))); } @@ -33,9 +36,9 @@ static gboolean window_delete_event_cb(GtkWidget *widget, GdkEvent *event, } // Implements GApplication::activate. -static void my_application_activate(GApplication* application) { - MyApplication* self = MY_APPLICATION(application); - GtkWindow* window = +static void my_application_activate(GApplication *application) { + MyApplication *self = MY_APPLICATION(application); + GtkWindow *window = GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); // Use a header bar when running in GNOME as this is the common style used @@ -45,18 +48,40 @@ static void my_application_activate(GApplication* application) { // in case the window manager does more exotic layout, e.g. tiling. // If running on Wayland assume the header bar will work (may need changing // if future cases occur). - gboolean use_header_bar = TRUE; + + const gboolean use_header_bar = [window]() -> gboolean { + auto UseSSD = []() -> bool { + const gchar *config_root = g_get_user_data_dir(); + gchar *full_path_c = g_build_filename(config_root, "com.example.piliplus", + "settings.json", NULL); + std::string config_path(full_path_c); + g_free(full_path_c); + std::ifstream f(config_path); + if (!f.is_open()) { + return false; + } + + std::string content{std::istreambuf_iterator(f), {}}; + return (content.find("\"useSSD\": true,") != std::string::npos); + // user choose to use SSD + }; + if (UseSSD()) + return FALSE; + #ifdef GDK_WINDOWING_X11 - GdkScreen* screen = gtk_window_get_screen(window); - if (GDK_IS_X11_SCREEN(screen)) { - const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); - if (g_strcmp0(wm_name, "GNOME Shell") != 0) { - use_header_bar = FALSE; + GdkScreen *screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar *wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + return FALSE; + } } - } #endif + return TRUE; + }(); + if (use_header_bar) { - GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + GtkHeaderBar *header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); gtk_widget_show(GTK_WIDGET(header_bar)); gtk_header_bar_set_title(header_bar, "piliplus"); gtk_header_bar_set_show_close_button(header_bar, TRUE); @@ -68,11 +93,13 @@ static void my_application_activate(GApplication* application) { gtk_window_set_default_size(window, 1280, 720); g_autoptr(FlDartProject) project = fl_dart_project_new(); - fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); + fl_dart_project_set_dart_entrypoint_arguments( + project, self->dart_entrypoint_arguments); - FlView* view = fl_view_new(project); + FlView *view = fl_view_new(project); GdkRGBA background_color; - // Background defaults to black, override it here if necessary, e.g. #00000000 for transparent. + // Background defaults to black, override it here if necessary, e.g. #00000000 + // for transparent. gdk_rgba_parse(&background_color, "#000000"); fl_view_set_background_color(view, &background_color); gtk_widget_show(GTK_WIDGET(view)); @@ -80,11 +107,13 @@ static void my_application_activate(GApplication* application) { // Show the window when Flutter renders. // Requires the view to be realized so we can start rendering. - g_signal_connect_swapped(view, "first-frame", G_CALLBACK(first_frame_cb), self); + g_signal_connect_swapped(view, "first-frame", G_CALLBACK(first_frame_cb), + self); gtk_widget_realize(GTK_WIDGET(view)); // Connect the delete-event signal to handle window close. - g_signal_connect(window, "delete-event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(window, "delete-event", G_CALLBACK(window_delete_event_cb), + NULL); fl_register_plugins(FL_PLUGIN_REGISTRY(view)); @@ -92,16 +121,18 @@ static void my_application_activate(GApplication* application) { } // Implements GApplication::local_command_line. -static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { - MyApplication* self = MY_APPLICATION(application); +static gboolean my_application_local_command_line(GApplication *application, + gchar ***arguments, + int *exit_status) { + MyApplication *self = MY_APPLICATION(application); // Strip out the first argument as it is the binary name. self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); g_autoptr(GError) error = nullptr; if (!g_application_register(application, nullptr, &error)) { - g_warning("Failed to register: %s", error->message); - *exit_status = 1; - return TRUE; + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; } g_application_activate(application); @@ -111,8 +142,8 @@ static gboolean my_application_local_command_line(GApplication* application, gch } // Implements GApplication::startup. -static void my_application_startup(GApplication* application) { - //MyApplication* self = MY_APPLICATION(object); +static void my_application_startup(GApplication *application) { + // MyApplication* self = MY_APPLICATION(object); // Perform any actions required at application startup. @@ -120,8 +151,8 @@ static void my_application_startup(GApplication* application) { } // Implements GApplication::shutdown. -static void my_application_shutdown(GApplication* application) { - //MyApplication* self = MY_APPLICATION(object); +static void my_application_shutdown(GApplication *application) { + // MyApplication* self = MY_APPLICATION(object); // Perform any actions required at application shutdown. @@ -129,30 +160,30 @@ static void my_application_shutdown(GApplication* application) { } // Implements GObject::dispose. -static void my_application_dispose(GObject* object) { - MyApplication* self = MY_APPLICATION(object); +static void my_application_dispose(GObject *object) { + MyApplication *self = MY_APPLICATION(object); g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); G_OBJECT_CLASS(my_application_parent_class)->dispose(object); } -static void my_application_class_init(MyApplicationClass* klass) { +static void my_application_class_init(MyApplicationClass *klass) { G_APPLICATION_CLASS(klass)->activate = my_application_activate; - G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; + G_APPLICATION_CLASS(klass)->local_command_line = + my_application_local_command_line; G_APPLICATION_CLASS(klass)->startup = my_application_startup; G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown; G_OBJECT_CLASS(klass)->dispose = my_application_dispose; } -static void my_application_init(MyApplication* self) {} +static void my_application_init(MyApplication *self) {} -MyApplication* my_application_new() { +MyApplication *my_application_new() { // Set the program name to the application ID, which helps various systems // like GTK and desktop environments map this running application to its // corresponding .desktop file. This ensures better integration by allowing // the application to be recognized beyond its binary name. g_set_prgname(APPLICATION_ID); - return MY_APPLICATION(g_object_new(my_application_get_type(), - "application-id", APPLICATION_ID, - nullptr)); + return MY_APPLICATION(g_object_new( + my_application_get_type(), "application-id", APPLICATION_ID, nullptr)); }