From 4c18f5b4e93dadb1fd122b49c663963b396eb460 Mon Sep 17 00:00:00 2001
From: ATATC <futerry@outlook.com>
Date: Fri, 10 May 2024 21:04:54 -0400
Subject: [PATCH 1/2] Integrated XWS configuring into the service script.
 (#156)

---
 leads_vec/__main__.py                      |  7 -------
 leads_vec/_bootloader/__init__.py          |  1 -
 leads_vec/_bootloader/leads_vec.service.sh |  3 ++-
 leads_vec/_bootloader/systemd.py           |  1 +
 leads_vec/_bootloader/xws.py               | 10 ----------
 5 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 leads_vec/_bootloader/xws.py

diff --git a/leads_vec/__main__.py b/leads_vec/__main__.py
index b336233c..aa2296ce 100644
--- a/leads_vec/__main__.py
+++ b/leads_vec/__main__.py
@@ -34,7 +34,6 @@
     parser.add_argument("--emu", action=_BooleanOptionalAction, default=False, help="use emulator")
     parser.add_argument("--auto-mfs", action=_BooleanOptionalAction, default=False,
                         help="automatically magnify font sizes to match the original proportion")
-    parser.add_argument("--xws", action=_BooleanOptionalAction, default=False, help="use X Window System")
     parser.add_argument("--ignore-import-error", action=_BooleanOptionalAction, default=False,
                         help="ignore `ImportError`")
     args = parser.parse_args()
@@ -85,12 +84,6 @@
     if args.auto_mfs:
         config.auto_magnify_font_sizes()
     _register_config(config)
-    if args.xws:
-        from ._bootloader import configure_xws as _configure_xws
-
-        _configure_xws()
-        _L.info("X Window System configured")
-
     from leads_vec.cli import main
 
     if args.action == "replay":
diff --git a/leads_vec/_bootloader/__init__.py b/leads_vec/_bootloader/__init__.py
index 46cea2c4..752916d7 100644
--- a/leads_vec/_bootloader/__init__.py
+++ b/leads_vec/_bootloader/__init__.py
@@ -1,3 +1,2 @@
 from leads_vec._bootloader.frp import *
 from leads_vec._bootloader.systemd import *
-from leads_vec._bootloader.xws import *
diff --git a/leads_vec/_bootloader/leads_vec.service.sh b/leads_vec/_bootloader/leads_vec.service.sh
index 088fdd61..f7c1c2cc 100644
--- a/leads_vec/_bootloader/leads_vec.service.sh
+++ b/leads_vec/_bootloader/leads_vec.service.sh
@@ -8,6 +8,7 @@ fi
 while ! xhost >& /dev/null
 do sleep 1
 done
+# configure xws
+/usr/bin/xhost +SI:localuser:"$USERNAME"
 # change the interpreter or adjust the arguments according to your needs
-# do not use `--xws`
 python-leads -m leads_vec -c /usr/local/leads/config.json run
\ No newline at end of file
diff --git a/leads_vec/_bootloader/systemd.py b/leads_vec/_bootloader/systemd.py
index c703583e..11609e32 100644
--- a/leads_vec/_bootloader/systemd.py
+++ b/leads_vec/_bootloader/systemd.py
@@ -26,6 +26,7 @@ def create_service() -> None:
             "[Service]\n"
             "Type=simple\n"
             f"User={(user := _get_login())}\n"
+            f"Environment=\"USERNAME={user}\"\n"
             "Environment=\"DISPLAY=:0\"\n"
             f"Environment=\"XAUTHORITY=/home/{user}/.Xauthority\"\n"
             f"ExecStart=/bin/bash {script}\n"
diff --git a/leads_vec/_bootloader/xws.py b/leads_vec/_bootloader/xws.py
deleted file mode 100644
index 1c663511..00000000
--- a/leads_vec/_bootloader/xws.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from os import getlogin as _get_login
-from subprocess import run as _run
-
-from leads_gui.system import get_system_kernel as _get_system_kernel
-
-
-def configure_xws() -> None:
-    if _get_system_kernel() != "linux":
-        raise SystemError("Unsupported operating system")
-    _run(("/usr/bin/xhost", f"+SI:localuser:{_get_login()}"))

From b953fac87a4149b68c1ea9753e89f8fd8395a3de Mon Sep 17 00:00:00 2001
From: ATATC <futerry@outlook.com>
Date: Fri, 10 May 2024 21:08:31 -0400
Subject: [PATCH 2/2] Merged submodules.

---
 readthedocs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readthedocs b/readthedocs
index 7445b1e9..6f3c08a7 160000
--- a/readthedocs
+++ b/readthedocs
@@ -1 +1 @@
-Subproject commit 7445b1e9b1c1eef50bf7e117569a2679d456b3f8
+Subproject commit 6f3c08a744a8b61f43c7606b10a77ee685eb72e8