From: Paul Hänsch <paul@plutz.net>
Date: Thu, 7 Mar 2019 16:07:44 +0000 (+0100)
Subject: on screen keyboard configuration
X-Git-Url: http://git.plutz.net/?p=rpi_small;a=commitdiff_plain;h=f98e135b355deaade003bde2b2bf5fcb0e517696

on screen keyboard configuration
---

diff --git a/files_xfce/etc/X11/Xresources/xvkbd b/files_xfce/etc/X11/Xresources/xvkbd
new file mode 100644
index 0000000..bfc16c2
--- /dev/null
+++ b/files_xfce/etc/X11/Xresources/xvkbd
@@ -0,0 +1,5 @@
+xvkbd.modalKeytop: true
+xvkbd.compact: true
+xvkbd.secure: true
+xvkbd.alwaysOnTop: true
+
diff --git a/files_xfce/etc/xdg/xfce4/panel/launcher-xvkbd/xvkbd.desktop b/files_xfce/etc/xdg/xfce4/panel/launcher-xvkbd/xvkbd.desktop
new file mode 100644
index 0000000..094cfcc
--- /dev/null
+++ b/files_xfce/etc/xdg/xfce4/panel/launcher-xvkbd/xvkbd.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Version=1.0
+Name=Keyboard
+Exec=/bin/sh -c "killall xvkbd || xvkbd"
+Icon=blueman-keyboard
diff --git a/files_xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/files_xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index 3cda6d4..19907e6 100644
--- a/files_xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/files_xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -48,12 +48,12 @@
     </property>
     <property name="plugin-9" type="string" value="launcher">
       <property name="items" type="array">
-        <value type="string" value="/usr/share/applications/firefox-esr.desktop"/>
+	<value type="string" value="/etc/xdg/xfce4/panel/launcher-xvkbd/xvkbd.desktop"/>
       </property>
     </property>
     <property name="plugin-10" type="string" value="launcher">
       <property name="items" type="array">
-        <value type="string" value="/usr/share/applications/libreoffice-startcenter.desktop"/>
+        <value type="string" value="/usr/share/applications/exo-terminal-emulator.desktop"/>
       </property>
     </property>
     <property name="plugin-11" type="string" value="separator">
diff --git a/xfce.mk b/xfce.mk
index 6be2aea..d334d3e 100644
--- a/xfce.mk
+++ b/xfce.mk
@@ -1,7 +1,7 @@
-PACKAGES := ${PACKAGES} xserver-xorg-video-fbturbo xserver-xorg xserver-xorg-input-evdev nodm xfce4 xauth x2x xvkbd blueman xfce4-terminal xinput xinput-calibrator xfce4-clipman-plugin xfce4-whiskermenu-plugin
+PACKAGES := ${PACKAGES} xserver-xorg-video-fbturbo xserver-xorg xserver-xorg-input-evdev nodm xfce4 xauth x11-xserver-utils x2x xvkbd blueman xfce4-terminal xinput xinput-calibrator xfce4-clipman-plugin xfce4-whiskermenu-plugin
 
 .PHONY: xfce
 ${IMGFILE}: xfce
 xfce: imgmount root_copy files_xfce/
 	cp -a files_xfce/. "$</"
-	-chroot "$<" useradd -m local
+	-chroot "$<" useradd -s /opt/busybox/ash -m local