[oe-commits] Martin Jansa : xorg: typo in XSERVER value, workaround for segfault when redrawing cursor

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: 4d33871387fd93005250bafb848a1e25072a3144
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4d33871387fd93005250bafb848a1e25072a3144

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Thu Sep 24 15:50:30 2009 +0000

xorg: typo in XSERVER value, workaround for segfault when redrawing cursor

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 .../xserver-kdrive-common/Xserver                  |    2 +-
 .../xserver-kdrive-common/shr/Xserver              |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver
index f14e193..3a78443 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver
@@ -50,7 +50,7 @@ fi
 
 # use usb mouse if present
 # Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically
-if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then
+if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "/usr/bin/Xorg" ]; then
   ARGS="$ARGS -mouse /dev/input/mice"
 fi
 
diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/Xserver b/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/Xserver
index 98912e3..ba939a6 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/Xserver
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/Xserver
@@ -55,8 +55,11 @@ fi
 
 # use usb mouse if present
 # Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically
-if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then
+if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "/usr/bin/Xorg" ]; then
   ARGS="$ARGS -mouse /dev/input/mice"
+  #/dev/input/mice exists on neo even without usb mouse connected
+  #create better test for usb mouse and uncomment following line
+  #USB_MOUSE="1"
 fi
 
 # start off server in conventional location.
@@ -120,6 +123,9 @@ case `module_id` in
 				DPI=140
 			fi 
 			ARGS="$ARGS -dpi ${DPI} vt1" 
+			if [ -z "$USB_MOUSE}" ]; then
+				ARGS="$ARGS -nocursor"
+			fi
 		else
 			if [ `screen_width` -gt 330 ] ; then
 				DPI=285