From 015c9b43024b3ce4c68ce0b4273c7686618c94f2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Paul=20H=C3=A4nsch?= <paul@plutz.net>
Date: Mon, 21 Sep 2020 17:47:21 +0200
Subject: [PATCH] switch from xvkbd to onboard as virtual keyboard

---
 modules/xfce.mk                                             | 2 +-
 modules/xfce/etc/xdg/autostart/onboard.desktop              | 3 +++
 .../xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml    | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 modules/xfce/etc/xdg/autostart/onboard.desktop

diff --git a/modules/xfce.mk b/modules/xfce.mk
index 4a66575..a2cc04f 100644
--- a/modules/xfce.mk
+++ b/modules/xfce.mk
@@ -1,4 +1,4 @@
-PACKAGES += xfce4 xauth x11-xserver-utils x2x xvkbd blueman xfce4-terminal xfce4-clipman-plugin xfce4-whiskermenu-plugin thunar gvfs gvfs-backends gvfs-fuse xscreensaver policykit-1
+PACKAGES += xfce4 xauth x11-xserver-utils x2x blueman xfce4-terminal xfce4-clipman-plugin xfce4-whiskermenu-plugin thunar gvfs gvfs-backends gvfs-fuse xscreensaver policykit-1 onboard
 
 .PHONY: _xfce
 _config: _xfce
diff --git a/modules/xfce/etc/xdg/autostart/onboard.desktop b/modules/xfce/etc/xdg/autostart/onboard.desktop
new file mode 100644
index 0000000..26ad013
--- /dev/null
+++ b/modules/xfce/etc/xdg/autostart/onboard.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Name=Virtual Keyboard
+Exec=onboard -l Small -t ModelM
diff --git a/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index 58b0e8f..4c3d00f 100644
--- a/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -22,7 +22,7 @@
         <value type="int" value="310"/>
         <value type="int" value="320"/>
         <value type="int" value="330"/>
-        <value type="int" value="340"/>
+        <!--value type="int" value="340"/-->
       </property>
     </property>
   </property>
@@ -61,8 +61,8 @@
       <property name="show-frame" type="bool" value="false"/>
     </property>
     <property name="plugin-330" type="string" value="clock"/>
-    <property name="plugin-340" type="string" value="launcher"><property name="items" type="array">
+    <!--property name="plugin-340" type="string" value="launcher"><property name="items" type="array">
       <value type="string" value="/etc/xdg/xfce4/panel/launcher-xvkbd/xvkbd.desktop"/>
-    </property></property>
+    </property></property-->
   </property>
 </channel>
-- 
2.39.2