From 9afe07491c0cc65c5173310e26ea1a1c80bc4529 Mon Sep 17 00:00:00 2001
From: litwak913 <litwak913@163.com>
Date: Mon, 16 Sep 2024 07:51:50 +0800
Subject: [PATCH 1/9] feat: add window system settings

---
 assets/ArkPetsConfigDefault.json               |  3 ++-
 core/src/cn/harryh/arkpets/ArkConfig.java      |  2 ++
 .../harryh/arkpets/platform/WindowSystem.java  | 18 ++++++++++++++++--
 .../cn/harryh/arkpets/EmbeddedLauncher.java    | 13 ++++++++++---
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/assets/ArkPetsConfigDefault.json b/assets/ArkPetsConfigDefault.json
index d9677978..c29566c1 100644
--- a/assets/ArkPetsConfigDefault.json
+++ b/assets/ArkPetsConfigDefault.json
@@ -33,5 +33,6 @@
     "transition_duration":0.3,
     "transition_type":"EASE_OUT_CUBIC",
     "window_style_toolwindow":true,
-    "window_style_topmost":true
+    "window_style_topmost":true,
+    "window_system":0
 }
\ No newline at end of file
diff --git a/core/src/cn/harryh/arkpets/ArkConfig.java b/core/src/cn/harryh/arkpets/ArkConfig.java
index aea4c781..504913f3 100644
--- a/core/src/cn/harryh/arkpets/ArkConfig.java
+++ b/core/src/cn/harryh/arkpets/ArkConfig.java
@@ -100,6 +100,8 @@ public class ArkConfig implements Serializable {
     public boolean      window_style_toolwindow;
     /** @since ArkPets 3.2 */ @JSONField(defaultValue = "true")
     public boolean      window_style_topmost;
+    /** @since ArkPets 3.3 */ @JSONField(defaultValue = "0")
+    public int          window_system;
 
     private ArkConfig() {
     }
diff --git a/core/src/cn/harryh/arkpets/platform/WindowSystem.java b/core/src/cn/harryh/arkpets/platform/WindowSystem.java
index abfa11c6..9ad0638c 100644
--- a/core/src/cn/harryh/arkpets/platform/WindowSystem.java
+++ b/core/src/cn/harryh/arkpets/platform/WindowSystem.java
@@ -41,10 +41,24 @@ public static WindowSystem detectWindowSystem() {
     }
 
     /** Initializes the platform window system.
+     * @param platform WindowSystem to initialize.
      */
-    public static void init() {
-        PLATFORM = detectWindowSystem();
+    public static void init(WindowSystem platform) {
+        PLATFORM = platform;
+        if (PLATFORM == WindowSystem.AUTO){
+            PLATFORM = detectWindowSystem();
+        }
         Logger.info("System", "Using " + PLATFORM.toString() + " Window System");
+        switch (PLATFORM) {
+            // TODO
+        }
+    }
+
+    /** Get current WindowSystem.
+     * @return The current WindowSystem.
+     */
+    public static WindowSystem getWindowSystem() {
+        return PLATFORM;
     }
 
     /** Finds a window.
diff --git a/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java b/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java
index 70776e5d..191f65f9 100644
--- a/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java
+++ b/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java
@@ -82,15 +82,22 @@ protected void process(String command, String addition) {
         Logger.info("System", "Entering the app of EmbeddedLauncher");
         Logger.info("System", "ArkPets version is " + appVersion);
         Logger.debug("System", "Default charset is " + Charset.defaultCharset());
-
+        ArkConfig appConfig = Objects.requireNonNull(ArkConfig.getConfig(), "ArkConfig returns a null instance, please check the config file.");
+        WindowSystem windowSystem;
+        try {
+            windowSystem = WindowSystem.values()[appConfig.window_system];
+        } catch (ArrayIndexOutOfBoundsException e) {
+            Logger.warn("System", "Invalid window system,using auto detect");
+            windowSystem = WindowSystem.AUTO;
+        }
         try {
-            WindowSystem.init();
+            WindowSystem.init(windowSystem);
             Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration();
             // Configure FPS
             config.setForegroundFPS(fpsDefault);
             config.setIdleFPS(fpsDefault);
             // Configure window layout
-            config.setDecorated(false);
+            config.setDecorated(WindowSystem.getWindowSystem() == WindowSystem.NULL);
             config.setResizable(false);
             config.setWindowedMode(coreWidthDefault, coreHeightDefault);
             config.setWindowPosition(0, 0);

From 49069e05d7bdb5d43e41e8d43e8bdfb79e9bd41a Mon Sep 17 00:00:00 2001
From: litwak913 <litwak913@163.com>
Date: Mon, 16 Sep 2024 08:12:29 +0800
Subject: [PATCH 2/9] feat(SettingsModule): window system settings ui

---
 assets/UI/SettingsModule.fxml                 |  5 ++
 .../arkpets/controllers/SettingsModule.java   | 62 +++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/assets/UI/SettingsModule.fxml b/assets/UI/SettingsModule.fxml
index 08992c70..6910c8a9 100644
--- a/assets/UI/SettingsModule.fxml
+++ b/assets/UI/SettingsModule.fxml
@@ -116,6 +116,11 @@
                     <JFXCheckBox fx:id="configWindowToolwindow" mnemonicParsing="false" text="桌宠作为后台程序启动"/>
                     <JFXButton fx:id="configWindowToolwindowHelp"/>
                 </HBox>
+                <HBox>
+                    <Label text="窗口系统"/>
+                    <JFXComboBox fx:id="configWindowSystem" prefWidth="100.0"/>
+                    <JFXButton fx:id="configWindowSystemHelp"/>
+                </HBox>
                 <Separator/>
                 <HBox>
                     <Label text="日志级别"/>
diff --git a/desktop/src/cn/harryh/arkpets/controllers/SettingsModule.java b/desktop/src/cn/harryh/arkpets/controllers/SettingsModule.java
index 19d1e61f..ac5252d7 100644
--- a/desktop/src/cn/harryh/arkpets/controllers/SettingsModule.java
+++ b/desktop/src/cn/harryh/arkpets/controllers/SettingsModule.java
@@ -13,6 +13,7 @@
 import cn.harryh.arkpets.utils.GuiComponents.*;
 import com.badlogic.gdx.graphics.Color;
 import com.jfoenix.controls.*;
+import com.sun.jna.Platform;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
@@ -25,6 +26,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -92,6 +94,10 @@ public final class SettingsModule implements Controller<ArkHomeFX> {
     @FXML
     private JFXButton configWindowToolwindowHelp;
 
+    @FXML
+    private JFXComboBox<NamedItem<Integer>> configWindowSystem;
+    @FXML
+    private JFXButton configWindowSystemHelp;
     @FXML
     private Label aboutQueryUpdate;
     @FXML
@@ -350,6 +356,62 @@ public String getContent() {
                 };
             }
         };
+
+        NamedItem<Integer>[] items = getWindowSystemItems().toArray(new NamedItem[0]);
+        new ComboBoxSetup<>(configWindowSystem).setItems(items)
+                .selectValue(app.config.window_system, "自动")
+                .setOnNonNullValueUpdated((observable, oldValue, newValue) -> {
+                    app.config.window_system = newValue.value();
+                    app.config.save();
+                });
+        new HandbookEntrance(app.body, configWindowSystemHelp) {
+            @Override
+            public Handbook getHandbook() {
+                return new ControlHandbook((Labeled) configWindowSystem.getParent().getChildrenUnmodifiable().get(0)) {
+                    @Override
+                    public String getContent() {
+                        return getWindowSystemInfo();
+                    }
+                };
+            }
+        };
+    }
+
+    private static ArrayList<NamedItem<Integer>> getWindowSystemItems() {
+        ArrayList<NamedItem<Integer>> windowSystemItems = new ArrayList<>();
+        windowSystemItems.add(new NamedItem<>("自动", 0));
+        if (Platform.isWindows()) {
+            windowSystemItems.add(new NamedItem<>("User32", 1));
+        }
+        if (Platform.isLinux()) {
+            windowSystemItems.add(new NamedItem<>("X11", 2));
+            windowSystemItems.add(new NamedItem<>("Mutter", 3));
+            windowSystemItems.add(new NamedItem<>("KWin", 4));
+        }
+        if (Platform.isMac()) {
+            windowSystemItems.add(new NamedItem<>("Quartz", 5));
+        }
+        windowSystemItems.add(new NamedItem<>("NULL", 6));
+        return windowSystemItems;
+    }
+
+    private static String getWindowSystemInfo() {
+        String content = "不同平台对于窗口查询、操作有不同的 API，除非你遇到了桌宠窗口的问题，否则通常不需要更改。以下是对 API 的简单介绍：\n";
+        if (Platform.isWindows()) {
+            content += "User32 —— Windows 窗口系统。\n";
+        }
+        if (Platform.isLinux()) {
+            content += """
+                    Mutter —— GNOME 环境，需要安装集成扩展。
+                    KWin —— KDE 环境，需要安装集成插件。
+                    X11 —— 通用 X11 环境支持，适用于 Xfce,Mate,LXDE 等环境。
+                    """;
+        }
+        if (Platform.isMac()) {
+            content += "Quartz —— MacOS Quartz 窗口系统。\n";
+        }
+        content += "NULL —— 空实现，桌宠不会有任何窗口交互。";
+        return content;
     }
 
     private void initAbout() {

From adce94e6ee281c9a04368ddba70a6b1f80b65923 Mon Sep 17 00:00:00 2001
From: litwak913 <litwak913@163.com>
Date: Mon, 16 Sep 2024 09:35:45 +0800
Subject: [PATCH 3/9] fix: resize and title bar

---
 .../cn/harryh/arkpets/concurrent/ProcessPool.java   |  3 +++
 .../cn/harryh/arkpets/platform/WindowSystem.java    | 13 +++++++++++++
 desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/core/src/cn/harryh/arkpets/concurrent/ProcessPool.java b/core/src/cn/harryh/arkpets/concurrent/ProcessPool.java
index f5018b42..7cced10b 100644
--- a/core/src/cn/harryh/arkpets/concurrent/ProcessPool.java
+++ b/core/src/cn/harryh/arkpets/concurrent/ProcessPool.java
@@ -6,6 +6,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.*;
 
 
@@ -67,6 +68,8 @@ public Future<ProcessResult> submit(Class<?> clazz, List<String> jvmArgs, List<S
                 command.addAll(args);
             // Process execution
             ProcessBuilder builder = new ProcessBuilder(command);
+            Map<String, String> env = builder.environment();
+            env.remove("GDK_BACKEND");
             Process process = builder.inheritIO().start();
             int exitValue = process.waitFor();
             return new ProcessResult(exitValue, process.pid());
diff --git a/core/src/cn/harryh/arkpets/platform/WindowSystem.java b/core/src/cn/harryh/arkpets/platform/WindowSystem.java
index 9ad0638c..eb947698 100644
--- a/core/src/cn/harryh/arkpets/platform/WindowSystem.java
+++ b/core/src/cn/harryh/arkpets/platform/WindowSystem.java
@@ -111,4 +111,17 @@ public static HWndCtrl getTopmostWindow() {
     public static void free() {
         // TODO
     }
+
+    /** Return current WindowSystem should enable resize.
+     */
+    public static boolean needResize() {
+        switch (PLATFORM) {
+            case X11, MUTTER, KWIN -> {
+                return true;
+            }
+            default -> {
+                return false;
+            }
+        }
+    }
 }
diff --git a/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java b/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java
index 191f65f9..12ecde2a 100644
--- a/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java
+++ b/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java
@@ -98,7 +98,7 @@ protected void process(String command, String addition) {
             config.setIdleFPS(fpsDefault);
             // Configure window layout
             config.setDecorated(WindowSystem.getWindowSystem() == WindowSystem.NULL);
-            config.setResizable(false);
+            config.setResizable(WindowSystem.needResize());
             config.setWindowedMode(coreWidthDefault, coreHeightDefault);
             config.setWindowPosition(0, 0);
             // Configure window title

From 2a1bd4b43eed430fe0905ab571b347cdd41b5c73 Mon Sep 17 00:00:00 2001
From: litwak913 <litwak913@163.com>
Date: Mon, 16 Sep 2024 09:36:24 +0800
Subject: [PATCH 4/9] fix: NullHWndCtrl crash

---
 .../harryh/arkpets/platform/NullHWndCtrl.java | 21 +++++++++++++++++++
 .../harryh/arkpets/platform/WindowSystem.java |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/core/src/cn/harryh/arkpets/platform/NullHWndCtrl.java b/core/src/cn/harryh/arkpets/platform/NullHWndCtrl.java
index b191f343..62a9ba82 100644
--- a/core/src/cn/harryh/arkpets/platform/NullHWndCtrl.java
+++ b/core/src/cn/harryh/arkpets/platform/NullHWndCtrl.java
@@ -4,11 +4,27 @@
 package cn.harryh.arkpets.platform;
 
 
+import com.badlogic.gdx.Gdx;
+
+
 public class NullHWndCtrl extends HWndCtrl {
+    private static boolean startupFind;
+    private int lastw, lasth;
+
     public NullHWndCtrl() {
         super("", new WindowRect());
     }
 
+    public static NullHWndCtrl find(String className, String windowName){
+        if(windowName.equals("ArkPets")){
+            if(!NullHWndCtrl.startupFind){
+                NullHWndCtrl.startupFind=true;
+                return null;
+            }
+        }
+        return new NullHWndCtrl();
+    }
+
     @Override
     public boolean isForeground() {
         return false;
@@ -35,6 +51,11 @@ public void setForeground() {
 
     @Override
     public void setWindowPosition(HWndCtrl insertAfter, int x, int y, int w, int h) {
+        if(lasth!=h||lastw!=w){
+            lasth=h;
+            lastw=w;
+            Gdx.graphics.setWindowedMode(w,h);
+        }
     }
 
     @Override
diff --git a/core/src/cn/harryh/arkpets/platform/WindowSystem.java b/core/src/cn/harryh/arkpets/platform/WindowSystem.java
index eb947698..a05aa0a4 100644
--- a/core/src/cn/harryh/arkpets/platform/WindowSystem.java
+++ b/core/src/cn/harryh/arkpets/platform/WindowSystem.java
@@ -72,7 +72,7 @@ public static HWndCtrl findWindow(String className, String windowText) {
                 return User32HWndCtrl.find(className, windowText);
             }
             default -> {
-                return new NullHWndCtrl();
+                return NullHWndCtrl.find(className, windowText);
             }
         }
     }

From 544a318d86b8b20dc243e77ea7a75e6d0ef8de65 Mon Sep 17 00:00:00 2001
From: litwak913 <litwak913@qq.com>
Date: Sun, 5 Jan 2025 11:22:40 +0800
Subject: [PATCH 5/9] fix: handbook

---
 desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java           | 3 +--
 desktop/src/cn/harryh/arkpets/controllers/SettingsModule.java | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java b/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java
index 12ecde2a..d9c1e57d 100644
--- a/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java
+++ b/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java
@@ -32,7 +32,7 @@ public static void main (String[] args) {
         ArgPending.argCache = args;
         // Logger
         Logger.initialize(LogConfig.logCorePath, LogConfig.logCoreMaxKeep);
-        ArkConfig appConfig = Objects.requireNonNull(ArkConfig.getConfig());
+        ArkConfig appConfig = Objects.requireNonNull(ArkConfig.getConfig(), "ArkConfig returns a null instance, please check the config file.");
         try {
             Logger.setLevel(appConfig.logging_level);
         } catch (Exception ignored) {
@@ -82,7 +82,6 @@ protected void process(String command, String addition) {
         Logger.info("System", "Entering the app of EmbeddedLauncher");
         Logger.info("System", "ArkPets version is " + appVersion);
         Logger.debug("System", "Default charset is " + Charset.defaultCharset());
-        ArkConfig appConfig = Objects.requireNonNull(ArkConfig.getConfig(), "ArkConfig returns a null instance, please check the config file.");
         WindowSystem windowSystem;
         try {
             windowSystem = WindowSystem.values()[appConfig.window_system];
diff --git a/desktop/src/cn/harryh/arkpets/controllers/SettingsModule.java b/desktop/src/cn/harryh/arkpets/controllers/SettingsModule.java
index ac5252d7..3fc5cdb1 100644
--- a/desktop/src/cn/harryh/arkpets/controllers/SettingsModule.java
+++ b/desktop/src/cn/harryh/arkpets/controllers/SettingsModule.java
@@ -364,10 +364,10 @@ public String getContent() {
                     app.config.window_system = newValue.value();
                     app.config.save();
                 });
-        new HandbookEntrance(app.body, configWindowSystemHelp) {
+        new HelpHandbookEntrance(app.body, configWindowSystemHelp) {
             @Override
             public Handbook getHandbook() {
-                return new ControlHandbook((Labeled) configWindowSystem.getParent().getChildrenUnmodifiable().get(0)) {
+                return new ControlHelpHandbook((Labeled) configWindowSystem.getParent().getChildrenUnmodifiable().get(0)) {
                     @Override
                     public String getContent() {
                         return getWindowSystemInfo();

From e0bb2b2bdf555085c955e4ce39f55942fef843f1 Mon Sep 17 00:00:00 2001
From: litwak913 <litwak913@163.com>
Date: Sun, 19 Jan 2025 21:54:18 +0800
Subject: [PATCH 6/9] chore: style

---
 .../cn/harryh/arkpets/platform/NullHWndCtrl.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/src/cn/harryh/arkpets/platform/NullHWndCtrl.java b/core/src/cn/harryh/arkpets/platform/NullHWndCtrl.java
index 62a9ba82..5226562d 100644
--- a/core/src/cn/harryh/arkpets/platform/NullHWndCtrl.java
+++ b/core/src/cn/harryh/arkpets/platform/NullHWndCtrl.java
@@ -15,10 +15,10 @@ public NullHWndCtrl() {
         super("", new WindowRect());
     }
 
-    public static NullHWndCtrl find(String className, String windowName){
-        if(windowName.equals("ArkPets")){
-            if(!NullHWndCtrl.startupFind){
-                NullHWndCtrl.startupFind=true;
+    public static NullHWndCtrl find(String className, String windowName) {
+        if (windowName.equals("ArkPets")) {
+            if (!NullHWndCtrl.startupFind) {
+                NullHWndCtrl.startupFind = true;
                 return null;
             }
         }
@@ -51,10 +51,10 @@ public void setForeground() {
 
     @Override
     public void setWindowPosition(HWndCtrl insertAfter, int x, int y, int w, int h) {
-        if(lasth!=h||lastw!=w){
-            lasth=h;
-            lastw=w;
-            Gdx.graphics.setWindowedMode(w,h);
+        if (lasth != h || lastw != w) {
+            lasth = h;
+            lastw = w;
+            Gdx.graphics.setWindowedMode(w, h);
         }
     }
 

From 21caf5f3350d8ab08365b4514ff0b359a9906990 Mon Sep 17 00:00:00 2001
From: litwak913 <litwak913@163.com>
Date: Sun, 19 Jan 2025 21:54:38 +0800
Subject: [PATCH 7/9] refactor: need decorated

---
 core/src/cn/harryh/arkpets/platform/WindowSystem.java | 6 ++++++
 desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/src/cn/harryh/arkpets/platform/WindowSystem.java b/core/src/cn/harryh/arkpets/platform/WindowSystem.java
index a05aa0a4..5966ad22 100644
--- a/core/src/cn/harryh/arkpets/platform/WindowSystem.java
+++ b/core/src/cn/harryh/arkpets/platform/WindowSystem.java
@@ -124,4 +124,10 @@ public static boolean needResize() {
             }
         }
     }
+
+    /** Return current WindowSystem should enable decoration.
+     */
+    public static boolean needDecorated() {
+        return PLATFORM == NULL;
+    }
 }
diff --git a/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java b/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java
index d9c1e57d..a912342a 100644
--- a/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java
+++ b/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java
@@ -96,7 +96,7 @@ protected void process(String command, String addition) {
             config.setForegroundFPS(fpsDefault);
             config.setIdleFPS(fpsDefault);
             // Configure window layout
-            config.setDecorated(WindowSystem.getWindowSystem() == WindowSystem.NULL);
+            config.setDecorated(WindowSystem.needDecorated());
             config.setResizable(WindowSystem.needResize());
             config.setWindowedMode(coreWidthDefault, coreHeightDefault);
             config.setWindowPosition(0, 0);

From b01d5939c490544bbceda7bc17342babee257312 Mon Sep 17 00:00:00 2001
From: litwak913 <litwak913@163.com>
Date: Sun, 19 Jan 2025 22:10:58 +0800
Subject: [PATCH 8/9] refactor: window system string config

---
 core/src/cn/harryh/arkpets/ArkConfig.java     | 16 ++++++++++--
 .../cn/harryh/arkpets/EmbeddedLauncher.java   |  8 +-----
 .../arkpets/controllers/SettingsModule.java   | 25 ++++++++++---------
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/core/src/cn/harryh/arkpets/ArkConfig.java b/core/src/cn/harryh/arkpets/ArkConfig.java
index 504913f3..0df5d7e5 100644
--- a/core/src/cn/harryh/arkpets/ArkConfig.java
+++ b/core/src/cn/harryh/arkpets/ArkConfig.java
@@ -3,6 +3,7 @@
  */
 package cn.harryh.arkpets;
 
+import cn.harryh.arkpets.platform.WindowSystem;
 import cn.harryh.arkpets.transitions.EasingFunction;
 import cn.harryh.arkpets.utils.IOUtils.FileUtil;
 import cn.harryh.arkpets.utils.Logger;
@@ -100,8 +101,8 @@ public class ArkConfig implements Serializable {
     public boolean      window_style_toolwindow;
     /** @since ArkPets 3.2 */ @JSONField(defaultValue = "true")
     public boolean      window_style_topmost;
-    /** @since ArkPets 3.3 */ @JSONField(defaultValue = "0")
-    public int          window_system;
+    /** @since ArkPets 4.0 */ @JSONField(defaultValue = "AUTO")
+    public String       window_system;
 
     private ArkConfig() {
     }
@@ -177,6 +178,17 @@ public static EasingFunction getEasingFunctionFrom(String string) {
         }
     }
 
+    /** @see WindowSystem
+     */
+    public static WindowSystem getWindowSystemFrom(String string) {
+        try {
+            return WindowSystem.valueOf(string);
+        } catch (IllegalArgumentException e) {
+            Logger.warn("Config", "Invalid window system, using auto detect");
+            return WindowSystem.AUTO;
+        }
+    }
+
     /** @see com.badlogic.gdx.graphics.Color
      */
     public static Color getGdxColorFrom(String string) {
diff --git a/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java b/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java
index a912342a..588eeea6 100644
--- a/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java
+++ b/desktop/src/cn/harryh/arkpets/EmbeddedLauncher.java
@@ -82,13 +82,7 @@ protected void process(String command, String addition) {
         Logger.info("System", "Entering the app of EmbeddedLauncher");
         Logger.info("System", "ArkPets version is " + appVersion);
         Logger.debug("System", "Default charset is " + Charset.defaultCharset());
-        WindowSystem windowSystem;
-        try {
-            windowSystem = WindowSystem.values()[appConfig.window_system];
-        } catch (ArrayIndexOutOfBoundsException e) {
-            Logger.warn("System", "Invalid window system,using auto detect");
-            windowSystem = WindowSystem.AUTO;
-        }
+        WindowSystem windowSystem = ArkConfig.getWindowSystemFrom(appConfig.window_system);
         try {
             WindowSystem.init(windowSystem);
             Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration();
diff --git a/desktop/src/cn/harryh/arkpets/controllers/SettingsModule.java b/desktop/src/cn/harryh/arkpets/controllers/SettingsModule.java
index 3fc5cdb1..24cdce29 100644
--- a/desktop/src/cn/harryh/arkpets/controllers/SettingsModule.java
+++ b/desktop/src/cn/harryh/arkpets/controllers/SettingsModule.java
@@ -9,6 +9,7 @@
 import cn.harryh.arkpets.guitasks.CheckAppUpdateTask;
 import cn.harryh.arkpets.guitasks.GuiTask;
 import cn.harryh.arkpets.platform.StartupConfig;
+import cn.harryh.arkpets.platform.WindowSystem;
 import cn.harryh.arkpets.utils.*;
 import cn.harryh.arkpets.utils.GuiComponents.*;
 import com.badlogic.gdx.graphics.Color;
@@ -95,7 +96,7 @@ public final class SettingsModule implements Controller<ArkHomeFX> {
     private JFXButton configWindowToolwindowHelp;
 
     @FXML
-    private JFXComboBox<NamedItem<Integer>> configWindowSystem;
+    private JFXComboBox<NamedItem<String>> configWindowSystem;
     @FXML
     private JFXButton configWindowSystemHelp;
     @FXML
@@ -357,9 +358,9 @@ public String getContent() {
             }
         };
 
-        NamedItem<Integer>[] items = getWindowSystemItems().toArray(new NamedItem[0]);
+        NamedItem<String>[] items = (NamedItem[]) getWindowSystemItems().toArray();
         new ComboBoxSetup<>(configWindowSystem).setItems(items)
-                .selectValue(app.config.window_system, "自动")
+                .selectValue(app.config.window_system, app.config.window_system)
                 .setOnNonNullValueUpdated((observable, oldValue, newValue) -> {
                     app.config.window_system = newValue.value();
                     app.config.save();
@@ -377,21 +378,21 @@ public String getContent() {
         };
     }
 
-    private static ArrayList<NamedItem<Integer>> getWindowSystemItems() {
-        ArrayList<NamedItem<Integer>> windowSystemItems = new ArrayList<>();
-        windowSystemItems.add(new NamedItem<>("自动", 0));
+    private static ArrayList<NamedItem<String>> getWindowSystemItems() {
+        ArrayList<NamedItem<String>> windowSystemItems = new ArrayList<>();
+        windowSystemItems.add(new NamedItem<>("自动", WindowSystem.AUTO.name()));
         if (Platform.isWindows()) {
-            windowSystemItems.add(new NamedItem<>("User32", 1));
+            windowSystemItems.add(new NamedItem<>("User32", WindowSystem.USER32.name()));
         }
         if (Platform.isLinux()) {
-            windowSystemItems.add(new NamedItem<>("X11", 2));
-            windowSystemItems.add(new NamedItem<>("Mutter", 3));
-            windowSystemItems.add(new NamedItem<>("KWin", 4));
+            windowSystemItems.add(new NamedItem<>("X11", WindowSystem.X11.name()));
+            windowSystemItems.add(new NamedItem<>("Mutter", WindowSystem.MUTTER.name()));
+            windowSystemItems.add(new NamedItem<>("KWin", WindowSystem.KWIN.name()));
         }
         if (Platform.isMac()) {
-            windowSystemItems.add(new NamedItem<>("Quartz", 5));
+            windowSystemItems.add(new NamedItem<>("Quartz", WindowSystem.QUARTZ.name()));
         }
-        windowSystemItems.add(new NamedItem<>("NULL", 6));
+        windowSystemItems.add(new NamedItem<>("NULL", WindowSystem.NULL.name()));
         return windowSystemItems;
     }
 

From 6f967ffd30c790eaee17109bb496cf66dbb4aa75 Mon Sep 17 00:00:00 2001
From: litwak913 <litwak913@163.com>
Date: Sun, 19 Jan 2025 22:12:21 +0800
Subject: [PATCH 9/9] fix: default json

---
 assets/ArkPetsConfigDefault.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/ArkPetsConfigDefault.json b/assets/ArkPetsConfigDefault.json
index c29566c1..2d6970f7 100644
--- a/assets/ArkPetsConfigDefault.json
+++ b/assets/ArkPetsConfigDefault.json
@@ -34,5 +34,5 @@
     "transition_type":"EASE_OUT_CUBIC",
     "window_style_toolwindow":true,
     "window_style_topmost":true,
-    "window_system":0
+    "window_system":"AUTO"
 }
\ No newline at end of file