From f84ca2b6906d8c0c0f9d785efa9075f4f2400a44 Mon Sep 17 00:00:00 2001
From: DanyLE <xsang.le@gmail.com>
Date: Thu, 27 Jul 2023 20:41:44 +0200
Subject: [PATCH] add and use wtype

---
 .../images/core-image-minimal.bbappend        |  4 +-
 recipes-support/sfwbar/files/sfwbar.config    | 17 +++--
 recipes-support/wtype/wtype_git.bb            | 17 +++++
 recipes-wlroots/labwc/files/menu.xml          | 63 ++++++++++---------
 recipes-wlroots/labwc/files/rc.xml            | 13 ++++
 5 files changed, 76 insertions(+), 38 deletions(-)
 create mode 100644 recipes-support/wtype/wtype_git.bb

diff --git a/recipes-core/images/core-image-minimal.bbappend b/recipes-core/images/core-image-minimal.bbappend
index 6e0c996..1054292 100644
--- a/recipes-core/images/core-image-minimal.bbappend
+++ b/recipes-core/images/core-image-minimal.bbappend
@@ -33,7 +33,7 @@ IMAGE_INSTALL:append = "libcurl \
                         glew \
                         freetype \
                         fontconfig \
-                        librsvg librsvg-gtk rsvg \
+                        librsvg librsvg-gtk \
                         gdk-pixbuf \
                         gtk-layer-shell \
                         mesa \
@@ -51,7 +51,7 @@ IMAGE_INSTALL:append = "libcurl \
                         rsync \
                         coreutils \
                         wayland wayland-protocols \
-                        labwc foot swaybg swayidle swaylock wlr-randr wlopm sfwbar tofi \
+                        labwc foot swaybg swayidle swaylock wlr-randr wlopm sfwbar tofi wtype \
                         gdbserver \
                         " 
 
diff --git a/recipes-support/sfwbar/files/sfwbar.config b/recipes-support/sfwbar/files/sfwbar.config
index 6f6976d..c55051d 100644
--- a/recipes-support/sfwbar/files/sfwbar.config
+++ b/recipes-support/sfwbar/files/sfwbar.config
@@ -10,7 +10,7 @@ switcher {
 
 function("SfwbarInit") {
   SetBarId "bar-0"
-  SetLayer "top"
+  SetLayer "bottom"
 }
 
 function("ToggleMinimize") {
@@ -72,10 +72,10 @@ function("ShowDesktop") {
 }
 
 menu("winops") {
-  item("focus", Focus );
-  item("close", Close );
-  item("(un)minimize", Function "ToggleMinimize" );
-  item("(un)maximize", Function "ToggleMaximize" );
+  item("Focus", Focus );
+  item("Close", Close );
+  item("Toggle minimize", Function "ToggleMinimize" );
+  item("Toggle maximize", Function "ToggleMaximize" );
 }
 
 # Panel layout
@@ -84,7 +84,12 @@ layout {
   button {
     style = "launcher"
     value = "/usr/share/icons/Adwaita/scalable/actions/view-app-grid-symbolic.svg"
-    tooltip = "Quick menu"
+    action = Exec "wtype -M alt ' ' -m alt"
+  }
+  button {
+    style = "launcher"
+    value = "/usr/share/icons/Adwaita/scalable/actions/system-run-symbolic.svg"
+    tooltip = "Quick run"
     action = Exec "bash -c \"`tofi-drun`\""
   }
   button {
diff --git a/recipes-support/wtype/wtype_git.bb b/recipes-support/wtype/wtype_git.bb
new file mode 100644
index 0000000..ef5d28b
--- /dev/null
+++ b/recipes-support/wtype/wtype_git.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "virtual key event for wayland"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+
+DEPENDS = "wayland wayland-native wayland-protocols-native wayland-protocols libxkbcommon"
+
+SRCREV = "${AUTOREV}"
+
+SRC_URI = "git://github.com/atx/wtype.git;protocol=https;branch=master"
+
+S="${WORKDIR}/git"
+
+inherit meson pkgconfig
+
+EXTRA_OEMESON += "--buildtype release"
\ No newline at end of file
diff --git a/recipes-wlroots/labwc/files/menu.xml b/recipes-wlroots/labwc/files/menu.xml
index 68410ab..3daf1a8 100644
--- a/recipes-wlroots/labwc/files/menu.xml
+++ b/recipes-wlroots/labwc/files/menu.xml
@@ -3,44 +3,47 @@
 <openbox_menu>
 
     <menu id="client-menu">
-    <item label="Minimize">
-        <action name="Iconify" />
-    </item>
-    <item label="Maximize">
-        <action name="ToggleMaximize" />
-    </item>
-    <item label="Fullscreen">
-        <action name="ToggleFullscreen" />
-    </item>
-    <item label="AlwaysOnTop">
-        <action name="ToggleAlwaysOnTop" />
-    </item>
-    <item label="Close">
-        <action name="Close"/>
-    </item>
+        <item label="Minimize">
+            <action name="Iconify" />
+        </item>
+        <item label="Maximize">
+            <action name="ToggleMaximize" />
+        </item>
+        <item label="Fullscreen">
+            <action name="ToggleFullscreen" />
+        </item>
+        <item label="Always on top">
+            <action name="ToggleAlwaysOnTop" />
+        </item>
+        <item label="Close">
+            <action name="Close"/>
+        </item>
     </menu>
     <menu id="root-menu">
         <item label="Terminal">
             <action name="Execute" command="foot -t xterm-256color" />
         </item>
-    <item label="Reconfigure">
-        <action name="Reconfigure" />
-    </item>
-    <item label="Exit">
-        <action name="Exit" />
-    </item>
-    <item label="Poweroff">
-        <action name="Execute" command="sudo /sbin/halt" />
-    </item>
+        <item label="Reconfigure">
+            <action name="Reconfigure" />
+        </item>
+        <item label="Exit">
+            <action name="Exit" />
+        </item>
+        <item label="Reboot">
+            <action name="Execute" command="sudo /sbin/reboot" />
+        </item>
+        <item label="Power off">
+            <action name="Execute" command="sudo /sbin/halt" />
+        </item>
     </menu>
 
     <menu id="some-custom-menu">
-    <item label="Reconfigure">
-        <action name="Reconfigure" />
-    </item>
-    <item label="Exit">
-        <action name="Exit" />
-    </item>
+        <item label="Reconfigure">
+            <action name="Reconfigure" />
+        </item>
+        <item label="Exit">
+            <action name="Exit" />
+        </item>
     </menu>
 
 </openbox_menu>
diff --git a/recipes-wlroots/labwc/files/rc.xml b/recipes-wlroots/labwc/files/rc.xml
index 6b1802c..ac8774d 100644
--- a/recipes-wlroots/labwc/files/rc.xml
+++ b/recipes-wlroots/labwc/files/rc.xml
@@ -19,6 +19,14 @@
 
   <keyboard>
     <default />
+    <keybind key="A-Tab">
+      <action name="NextWindow" />
+    </keybind>
+    <keybind key="A-Space">
+      <action name="ShowMenu">
+        <menu>root-menu</menu>
+      </action>
+    </keybind>
     <!-- Use a different terminal emulator -->
     <keybind key="W-Return">
       <action name="Execute" command="foot" />
@@ -42,4 +50,9 @@
     </context>
   </mouse>
 
+  <windowRules>
+    <windowRule identifier="*">
+      <action name="Maximize"/>
+    </windowRule>
+  </windowRules>
 </labwc_config>