Skip to content

Commit 463f206

Browse files
committed
feat: Support multitouch in Waydroid (Thanks Aru!)
1 parent 1b89f6d commit 463f206

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

Containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,8 @@ RUN rpm-ostree install \
464464
rocm-opencl \
465465
rocm-clinfo \
466466
waydroid \
467-
weston && \
467+
cage \
468+
wlr-randr && \
468469
sed -i~ -E 's/=.\$\(command -v (nft|ip6?tables-legacy).*/=/g' /usr/lib/waydroid/data/scripts/waydroid-net.sh
469470

470471
# Cleanup & Finalize
@@ -544,7 +545,6 @@ RUN /tmp/image-info.sh && \
544545
; fi && \
545546
systemctl disable waydroid-container.service && \
546547
sed -i 's@Exec=waydroid first-launch@Exec=/usr/bin/waydroid-launcher first-launch\nX-Steam-Library-Capsule=/usr/share/applications/Waydroid/capsule.png\nX-Steam-Library-Hero=/usr/share/applications/Waydroid/hero.png\nX-Steam-Library-Logo=/usr/share/applications/Waydroid/logo.png\nX-Steam-Library-StoreCapsule=/usr/share/applications/Waydroid/store-logo.png\nX-Steam-Controller-Template=Desktop@g' /usr/share/applications/Waydroid.desktop && \
547-
rm /usr/share/wayland-sessions/weston.desktop && \
548548
wget https://raw.githubusercontent.com/KyleGospo/waydroid-scripts/main/waydroid-choose-gpu.sh -O /usr/bin/waydroid-choose-gpu && \
549549
chmod +x /usr/bin/waydroid-choose-gpu && \
550550
mkdir -p /usr/etc/default && \

system_files/desktop/shared/usr/bin/waydroid-launcher

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,10 @@ fi
1616
# Launch Weston
1717
killall -9 weston
1818
pkexec /usr/libexec/waydroid-container-start
19-
if [ -z "$(pgrep weston)" ]; then
20-
/usr/bin/weston --socket=weston-waydroid --width=${STEAMOS_NESTED_DESKTOP_WIDTH:-1280} --height=${STEAMOS_NESTED_DESKTOP_HEIGHT:-800} &> /dev/null &
19+
if [ -z "$(pgrep wlr-randr)" ]; then
20+
cage -- bash -c "wlr-randr --output X11-1 --custom-mode ${STEAMOS_NESTED_DESKTOP_WIDTH:-1280}x${STEAMOS_NESTED_DESKTOP_HEIGHT:-800}; sleep 1; waydroid show-full-ui &> /dev/null &"
2121
fi
2222

23-
# Launch Waydroid
24-
sleep 2 &&
25-
export XDG_SESSION_TYPE='wayland'
26-
export WAYLAND_DISPLAY='weston-waydroid'
27-
LAUNCH_PARAM=$@
28-
/usr/bin/waydroid ${LAUNCH_PARAM:-first-launch} &
29-
3023
# Fix controllers, we know Waydroid has started because surfaceflinger is running
3124
while [ "" == "$(pgrep surfaceflinger)" ]; do
3225
sleep 1

0 commit comments

Comments
 (0)