mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 21:06:09 +00:00
Desktop: clear last session's single-instance state, run under a session bus, stage the launcher from the app
The desktop came up with a wallpaper and nothing on it the second time. The runtime directory outlives a session, and lxqt-panel and pcmanfm-qt are single-instance programs that leave a lock and a socket there; finding last session's, they decided they were already running and exited without a word. The launcher now clears everything but the compositor's own socket, runs labwc under dbus-run-session so the panel's menus and the file manager have the bus they expect, and logs what the panel and the file manager say. The launcher and labwc's defaults are staged by the app over the desktop package's copies, so a fix here no longer costs a 426 MB re-download.
This commit is contained in:
1 parent
3ea82f6447
commit
07dadb13f3
5 files changed
+73
-2
No files matched your search
@@ -0,0 +1,6 @@
|
||||
# What the desktop is made of, started once labwc is up. Everything logs into the session log.
|
||||
swaybg -m fill -i /usr/share/backgrounds/steamdeck.png &
|
||||
# Desktop icons (pcmanfm-qt manages the desktop surface) and the panel with the app menu.
|
||||
pcmanfm-qt --desktop --profile lxqt 2>&1 | sed 's/^/[pcmanfm-qt] /' &
|
||||
lxqt-panel 2>&1 | sed 's/^/[lxqt-panel] /' &
|
||||
/usr/lib/xdg-desktop-portal-wlr >/dev/null 2>&1 &
|
||||
@@ -0,0 +1,21 @@
|
||||
<?xml version="1.0"?>
|
||||
<!-- labwc for a handheld: a plain theme, large enough to hit with a finger, and the keybinds a
|
||||
desktop expects. Refreshed from here every session. -->
|
||||
<labwc_config>
|
||||
<core><gap>0</gap><reuseOutputMode>yes</reuseOutputMode></core>
|
||||
<theme>
|
||||
<name>Clearlooks</name>
|
||||
<cornerRadius>6</cornerRadius>
|
||||
<font place="ActiveWindow"><name>DejaVu Sans</name><size>11</size></font>
|
||||
</theme>
|
||||
<placement><policy>center</policy></placement>
|
||||
<windowSwitcher><osd show="yes" preview="yes"/></windowSwitcher>
|
||||
<keyboard>
|
||||
<keybind key="A-Tab"><action name="NextWindow"/></keybind>
|
||||
<keybind key="A-F4"><action name="Close"/></keybind>
|
||||
<keybind key="W-Return"><action name="Execute"><command>qterminal</command></action></keybind>
|
||||
<keybind key="W-e"><action name="Execute"><command>pcmanfm-qt</command></action></keybind>
|
||||
<keybind key="W-d"><action name="ToggleMaximize"/></keybind>
|
||||
</keyboard>
|
||||
<mouse><doubleClickTime>500</doubleClickTime></mouse>
|
||||
</labwc_config>
|
||||
@@ -0,0 +1,32 @@
|
||||
#!/bin/bash
|
||||
# The desktop session: labwc nested as a client of the app's compositor, with LXQt's panel and
|
||||
# file manager started from its autostart, and Xwayland for the X11 programs (the Steam client,
|
||||
# most emulators). Run by bannerlator-session in place of gamescope for mode "lxqt".
|
||||
# Staged by the app over the desktop package's copy on every launch, so a fix here reaches an
|
||||
# installed desktop without re-downloading the package.
|
||||
set -u
|
||||
export XDG_SESSION_TYPE=wayland XDG_CURRENT_DESKTOP=LXQt XDG_SESSION_DESKTOP=lxqt
|
||||
export QT_QPA_PLATFORM=wayland GDK_BACKEND=wayland,x11 SDL_VIDEODRIVER=wayland,x11
|
||||
export QT_QPA_PLATFORMTHEME=lxqt
|
||||
# wlroots allocates through gbm on a real DRM node, which the KGSL stand-in is not: pixman
|
||||
# (software, shm) is what boots here. BL_WLR_RENDERER=vulkan/gles2 tries acceleration.
|
||||
export WLR_RENDERER=${BL_WLR_RENDERER:-pixman}
|
||||
export WLR_BACKENDS=wayland
|
||||
mkdir -p "$HOME/.config/labwc" "$HOME/.config/lxqt"
|
||||
# Our defaults for labwc and the panel, refreshed every session. What a user changes in the
|
||||
# panel's own settings lands in panel.conf and is kept; only rc.xml and autostart are ours.
|
||||
cp -f /etc/xdg/labwc/rc.xml "$HOME/.config/labwc/rc.xml"
|
||||
cp -f /etc/xdg/labwc/autostart "$HOME/.config/labwc/autostart"
|
||||
[ -f "$HOME/.config/lxqt/panel.conf" ] || cp /etc/xdg/lxqt/panel.conf "$HOME/.config/lxqt/panel.conf"
|
||||
[ -f "$HOME/.config/lxqt/lxqt.conf" ] || cp /etc/xdg/lxqt/lxqt.conf "$HOME/.config/lxqt/lxqt.conf"
|
||||
# The runtime directory outlives a session. lxqt-panel and pcmanfm-qt are single-instance
|
||||
# programs that leave a lock and a socket there; finding last session's, they decide they are
|
||||
# already running and exit without a word - a desktop with a wallpaper and nothing on it.
|
||||
# Only the app's own compositor socket (wayland-0) is kept.
|
||||
find "$XDG_RUNTIME_DIR" -mindepth 1 -maxdepth 1 ! -name 'wayland-0*' ! -name 'keymap.xkb' -exec rm -rf {} + 2>/dev/null
|
||||
echo "== steamdeck-desktop: labwc ($WLR_RENDERER) on $WAYLAND_DISPLAY"
|
||||
# A session bus: the panel's menus, the file manager and the portal all expect one.
|
||||
if command -v dbus-run-session >/dev/null 2>&1; then
|
||||
exec dbus-run-session -- labwc -C "$HOME/.config/labwc"
|
||||
fi
|
||||
exec labwc -C "$HOME/.config/labwc"
|
||||
Reference in new issue
Block a user