From c7aafce36c9667b2ae1174a9f8e0302acc2f8851 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 23 Apr 2008 10:30:05 +0000 Subject: xserver-kdrive-common: merged KDrive 1.4 support from OE - KDrive 1.4 require "-mouse tslib" to use touchscreen - KDrive 1.4 does not provide internal keymap so we need to load it git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4319 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../xserver-kdrive-common/etc/X11/Xserver | 5 + .../etc/X11/Xsession.d/12keymap | 4 + .../xserver-kdrive-common/etc/X11/default.xmodmap | 260 +++++++++++++++++++++ .../xserver-kdrive-common_0.1.bb | 2 +- 4 files changed, 270 insertions(+), 1 deletion(-) create mode 100644 meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap create mode 100644 meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/default.xmodmap (limited to 'meta/packages') diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver index 8efb8661f..742f4ee5f 100644 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver +++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver @@ -43,6 +43,11 @@ if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ARGS="$ARGS -mouse /dev/input/mice" fi +# kdrive 1.4 onwards needs -mouse args +if [ -n "$TSLIB_TSDEVICE" ]; then + ARGS="$ARGS -mouse tslib" +fi + # start off server in conventional location. case `module_id` in "Generic OMAP1510/1610/1710") diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap new file mode 100644 index 000000000..7a22f4327 --- /dev/null +++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap @@ -0,0 +1,4 @@ +#!/bin/sh + +# since kdrive 1.4 there is no default keymap in server +xmodmap -