X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-x;h=cb4c1fc474eca6b17b653a2a60a2c6ec74bb938a;hb=4e55cf7818d565fcb832e5a61dc035cc84944c7e;hp=c6f57613f5e1626b59722bdac57514b27570f003;hpb=35bde6fd5891715a7ad8e0b0db5109ce92271191;p=grml-x.git

diff --git a/grml-x b/grml-x
index c6f5761..cb4c1fc 100755
--- a/grml-x
+++ b/grml-x
@@ -294,7 +294,7 @@ mouse()
    if grep -q 'Device:.*Synaptics' "$MOUSEINFO" ; then
     if [[ "$SYNAPTICS" == "yes" ]] ; then # check for '-nosynaptics'-option
      MOUSEDRIVER='synaptics'
-     SYNMOUSE='InputDevice    "Synaptics"  "AlwaysCore"'
+     SYNMOUSE='InputDevice    "Synaptics" # "AlwaysCore"'
      SYNMOUSEDETAIL="
 Section \"InputDevice\"
   Driver        \"synaptics\"
@@ -329,7 +329,7 @@ EndSection
     if grep -q 'Device:.*ALPS' "$MOUSEINFO" ; then
      if [[ "$SYNAPTICS" == "yes" ]] ; then # check for '-nosynaptics'-option
       MOUSEDRIVER='synaptics'
-      SYNMOUSE='InputDevice    "Synaptics"  "AlwaysCore"'
+      SYNMOUSE='InputDevice    "Synaptics" # "AlwaysCore"'
       SYNMOUSEDETAIL="
 Section \"InputDevice\"
   Driver        \"synaptics\"
@@ -352,7 +352,7 @@ Section \"InputDevice\"
   Option        \"MaxSpeed\"      \"2.00\"
   Option        \"AccelFactor\" \"0.030\"
   Option        \"UpDownScrolling\" \"1\"
-  Option        \"EmulateMiddleButtonTime\" \"75\"
+  Option        \"EmulateMidButtonTime\" \"75\"
   Option        \"CircularScrolling\" \"1\"
   Option        \"CircScrollDelta\" \"0.1\"
   Option        \"CircScrollTrigger\" \"8\"
@@ -730,6 +730,7 @@ Section "Module"
         Load  "extmod"    # some commonly used server extensions (e.g. shape extension)
         Load  "record"    # recording extension
         Load  "evdev"     # generic input handling driver on Linux
+        Load  "xtrap"     # X Trap extension
         # Load  "vbe"       # Vesa BIOS Extension
         # Load  "i2c"       # I2C bus
         # Load  "int10"     # initialize graphics cards via int10 call to the BIOS