add wayland support, ingest new pixelflux, bump selkies

Author: thelamer

Dockerfile

@@ -16,7 +16,7 @@ RUN \
     https://github.com/selkies-project/selkies.git \
     /src && \
   cd /src && \
-  git checkout -f c3cf4cc2a3b6984104e494572b232730883c9aa6
+  git checkout -f 159656dfb3f045bf6e041042140bafaf1bbd9c61
 
 RUN \
   echo "**** build shared core library ****" && \
@@ -77,6 +77,7 @@ RUN \
     docker-compose \
     dunst \
     file \
+    foot \
     freetype2 \
     fuse-overlayfs \
     git \
@@ -85,7 +86,7 @@ RUN \
     inetutils \
     intel-media-driver \
     kbd \
-    libev \
+    labwc \
     libev \
     libfontenc \
     libgcrypt \
@@ -94,7 +95,6 @@ RUN \
     libtasn1 \
     libva-mesa-driver \
     libx11 \
-    libx11 \
     libxau \
     libxcb \
     libxcursor \
@@ -105,6 +105,7 @@ RUN \
     libxfixes \
     libxfont2 \
     libxinerama \
+    libxkbcommon \
     libxshmfence \
     libxtst \
     linux-headers \
@@ -132,6 +133,9 @@ RUN \
     vulkan-intel \
     vulkan-radeon \
     vulkan-tools \
+    wayland \
+    wl-clipboard \
+    wtype \
     x264 \
     xclip \
     xcursor-themes \
@@ -179,7 +183,7 @@ RUN \
   echo "**** install selkies ****" && \
   curl -o \
     /tmp/selkies.tar.gz -L \
-    "https://github.com/selkies-project/selkies/archive/c3cf4cc2a3b6984104e494572b232730883c9aa6.tar.gz" && \
+    "https://github.com/selkies-project/selkies/archive/159656dfb3f045bf6e041042140bafaf1bbd9c61.tar.gz" && \
   cd /tmp && \
   tar xf selkies.tar.gz && \
   cd selkies-* && \

Dockerfile.aarch64

@@ -16,7 +16,7 @@ RUN \
     https://github.com/selkies-project/selkies.git \
     /src && \
   cd /src && \
-  git checkout -f c3cf4cc2a3b6984104e494572b232730883c9aa6
+  git checkout -f 159656dfb3f045bf6e041042140bafaf1bbd9c61
 
 RUN \
   echo "**** build shared core library ****" && \
@@ -77,14 +77,15 @@ RUN \
     docker-compose \
     dunst \
     file \
+    foot \
     freetype2 \
     fuse-overlayfs \
     git \
     glibc \
     gnutls \
     inetutils \
     kbd \
-    libev \
+    labwc \
     libev \
     libfontenc \
     libgcrypt \
@@ -93,7 +94,6 @@ RUN \
     libtasn1 \
     libva-mesa-driver \
     libx11 \
-    libx11 \
     libxau \
     libxcb \
     libxcursor \
@@ -104,6 +104,7 @@ RUN \
     libxfixes \
     libxfont2 \
     libxinerama \
+    libxkbcommon \
     libxshmfence \
     libxtst \
     linux-headers \
@@ -131,6 +132,9 @@ RUN \
     vulkan-icd-loader \
     vulkan-radeon \
     vulkan-tools \
+    wayland \
+    wl-clipboard \
+    wtype \
     x264 \
     xclip \
     xcursor-themes \
@@ -176,7 +180,7 @@ RUN \
   echo "**** install selkies ****" && \
   curl -o \
     /tmp/selkies.tar.gz -L \
-    "https://github.com/selkies-project/selkies/archive/c3cf4cc2a3b6984104e494572b232730883c9aa6.tar.gz" && \
+    "https://github.com/selkies-project/selkies/archive/159656dfb3f045bf6e041042140bafaf1bbd9c61.tar.gz" && \
   cd /tmp && \
   tar xf selkies.tar.gz && \
   cd selkies-* && \

root/defaults/autostart_wayland

@@ -0,0 +1 @@
+foot

root/defaults/labwc.xml

@@ -0,0 +1,42 @@
+<labwc_config>
+
+  <core>
+    <decoration>server</decoration>
+    <gap>0</gap>
+  </core>
+
+  <theme>
+    <titlebar>
+      <layout>icon:iconify,max,close</layout>
+      <showTitle>yes</showTitle>
+    </titlebar>
+    <cornerRadius>8</cornerRadius>
+  </theme>
+
+  <keyboard>
+    <default />
+    <keybind key="A-F4"><action name="Close" /></keybind>
+    <keybind key="A-Escape"><action name="Close" /></keybind>
+    <keybind key="A-space"><action name="ShowMenu" menu="client-menu" /></keybind>
+    <keybind key="W-e"><action name="Execute" command="lab-sensible-terminal" /></keybind>
+  </keyboard>
+
+  <mouse>
+    <default />
+    <context name="Root">
+      <mousebind button="Left" action="Press" />
+      <mousebind button="Right" action="Press"><action name="ShowMenu" menu="root-menu" /></mousebind>
+      <mousebind button="Middle" action="Press"><action name="ShowMenu" menu="client-list-combined-menu" /></mousebind>
+    </context>
+    <context name="TitleBar">
+      <mousebind button="Right" action="Click"><action name="ShowMenu" menu="client-menu" /></mousebind>
+      <mousebind button="Middle" action="Click"><action name="ToggleMaximize" direction="vertical" /></mousebind>
+    </context>
+  </mouse>
+
+  <windowRules>
+    <windowRule identifier="*" serverDecoration="yes" />
+    <windowRule identifier="*"><action name="Maximize" /></windowRule>
+  </windowRules>
+
+</labwc_config>

root/defaults/menu_wayland.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openbox_menu xmlns="http://openbox.org/3.4/menu">
+<menu id="root-menu" label="MENU">
+<item label="foot" icon="/usr/share/pixmaps/xterm-color_48x48.xpm"><action name="Execute"><command>/usr/bin/foot</command></action></item>
+</menu>
+</openbox_menu>

root/defaults/startwm_wayland.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# Start DE
+export XCURSOR_THEME=whiteglass
+export XCURSOR_SIZE=24
+export XKB_DEFAULT_LAYOUT=us
+export XKB_DEFAULT_RULES=evdev
+export WAYLAND_DISPLAY=wayland-1 
+labwc #> /dev/null 2>&1