summaryrefslogtreecommitdiffstats
path: root/os-plugins
diff options
context:
space:
mode:
authorDirk von Suchodoletz2009-01-11 19:28:36 +0100
committerDirk von Suchodoletz2009-01-11 19:28:36 +0100
commit07319c551adc6e6329294fe0832968587eccb060 (patch)
tree20b00ac177e45fbe490c50535b7578b577a0d862 /os-plugins
parentBetter configuration of touchpads ... (diff)
downloadcore-07319c551adc6e6329294fe0832968587eccb060.tar.gz
core-07319c551adc6e6329294fe0832968587eccb060.tar.xz
core-07319c551adc6e6329294fe0832968587eccb060.zip
Fixes to xserver plugin ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2464 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
-rw-r--r--os-plugins/plugins/xserver/XX_xserver.sh12
1 files changed, 10 insertions, 2 deletions
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh
index 3b5496be..b7024282 100644
--- a/os-plugins/plugins/xserver/XX_xserver.sh
+++ b/os-plugins/plugins/xserver/XX_xserver.sh
@@ -176,7 +176,7 @@ Section "ServerLayout"
EndSection
Section "DRI"
Mode 0666
-EndSection' >> $xfc
+EndSection' >> $xfc
# if no module was detected, stick to vesa module
if [ -n "$xmodule" ] ; then
sed "s/vesa/$xmodule/;s/\"us\"/\"${XKEYBOARD}\"/" -i $xfc
@@ -255,6 +255,13 @@ a\ \ InputDevice\ \ "Synaptics TP"\ \ \ \ \ \ "SendCoreEvents"
EndSection
Section "InputDevice"
Driver "wacom"
+ Identifier "Pad"
+ Option "Device" "/dev/input/wacom"
+ Option "Type" "pad"
+ Option "ForceDevice" "ISDV4" # Tablet PC ONLY
+EndSection
+Section "InputDevice"
+ Driver "wacom"
Identifier "Eraser"
Option "Device" "/dev/input/wacom"
Option "Type" "eraser"
@@ -267,8 +274,9 @@ Section "InputDevice"
Option "Type" "cursor"
Option "ForceDevice" "ISDV4" # Tablet PC ONLY
EndSection' >> ${xfc}
- sed -e "s,/dev/in.*,/dev/${wacomdev}," \
+ sed -e "s,/dev/input/wacom,/dev/${wacomdev}," \
-e '/e \"Generic Mouse\"/a\\ \ InputDevice "Stylus" "SendCoreEvents"' \
+ -e '/e \"Generic Mouse\"/a\\ \ InputDevice "Pad" "SendCoreEvents"' \
-e '/e \"Generic Mouse\"/a\\ \ InputDevice "Cursor" "SendCoreEvents"' \
-e '/e \"Generic Mouse\"/a\\ \ InputDevice "Eraser" "SendCoreEvents"' \
-i ${xfc}