From bde343b655a56412efbcb459982f4b876a369dd9 Mon Sep 17 00:00:00 2001
From: arrow_zhang <arrowworld@gmail.com>
Date: Wed, 24 Dec 2008 22:23:16 +0800
Subject: [PATCH] [FIX] x200 X work under new xorg, and my red-track can
 scroll.

---
 archlinux_conf/etc/X11/xorg.conf              | 59 ++++++++++++++++++++-------
 archlinux_conf/etc/hal/policy/mouse-wheel.fdi | 10 +++++
 2 files changed, 54 insertions(+), 15 deletions(-)
 create mode 100644 archlinux_conf/etc/hal/policy/mouse-wheel.fdi

diff --git a/archlinux_conf/etc/X11/xorg.conf b/archlinux_conf/etc/X11/xorg.conf
index a279569..1adf8e2 100644
--- a/archlinux_conf/etc/X11/xorg.conf
+++ b/archlinux_conf/etc/X11/xorg.conf
@@ -6,7 +6,6 @@ Section "ServerLayout"
 EndSection
 
 Section "Files"
-	RgbPath      "/usr/share/X11/rgb"
 	ModulePath   "/usr/lib/xorg/modules"
 	FontPath     "/work/.opt/xfonts/win_fonts/"
 	FontPath     "/usr/share/fonts/misc"
@@ -14,14 +13,13 @@ Section "Files"
 	FontPath     "/usr/share/fonts/75dpi:unscaled"
 	FontPath     "/usr/share/fonts/TTF"
 	FontPath     "/usr/share/fonts/Type1"
+	FontPath     "/usr/share/fonts/local/"
 EndSection
 
 Section "Module"
 	Load  "glx"
 	Load  "extmod"
 	Load  "xtrap"
-	Load  "record"
-	Load  "GLcore"
 	Load  "dbe"
 	Load  "dri"
 	Load  "freetype"
@@ -30,30 +28,48 @@ EndSection
 Section "InputDevice"
 	Identifier  "Keyboard0"
 	Driver      "kbd"
+	Option	    "XkbRules" "xorg"
+	Option	    "XkbModel" "ibm_spacesaver"
+	Option	    "XkbLayout" "cn"
 EndSection
 
 Section "InputDevice"
 	Identifier  "Mouse0"
 	Driver      "mouse"
-	Option	    "Protocol" "auto"
 	Option	    "Device" "/dev/input/mice"
-	#Option	    "ZAxisMapping" "4 5 6 7"
-	Option      "Emulate3Buttons"     "on"
-	Option      "Emulate3TimeOut"     "50"
-	Option      "EmulateWheel"        "on"
-	Option      "EmulateWheelTimeOut" "200"
-	Option      "EmulateWheelButton"  "2"
-	Option      "YAxisMapping"        "4 5"
-	Option      "XAxisMapping"        "6 7"
-	Option      "ZAxisMapping"        "4 5"
+	# NOW: xorg use "hal" to config it
+	#Option	    "Protocol" "auto"
+	#Option      "CorePointer"
+	#Option      "Protocol" "ImPS/2"
+	#Option      "ZAxisMapping" "4 5"
+	#Option      "Emulate3Buttons" "true"
+	#Option      "EmulateWheel"  "on"
+	#Option      "EmulateWheelButton"    "2"
 EndSection
 
 Section "Monitor"
 	#DisplaySize	  260   160	# mm
+	#DisplaySize	  271	169
+	# use: gtf 1280 800 60 -x
+	# 1280x800 @ 60.00 Hz (GTF) hsync: 49.68 kHz; pclk: 83.46 MHz
+	#Modeline "1280x800_60.00"  83.46  1280 1344 1480 1680  800 801 804 828  -HSync +Vsync
+	#ModeLine     "1280x800_60.00" 83.5 1280 1344 1480 1680 800 801 804 828 -hsync +vsync
 	Identifier   "Monitor0"
 	VendorName   "LEN"
 	ModelName    "4010"
 	Option	    "DPMS"
+	#Option	    "OffTime" "10"
+EndSection
+
+Section "Monitor"
+	# for thinkpad x200
+	Identifier    "HDMI-1"
+	Option        "Ignore" "True"
+EndSection
+
+Section "Monitor"
+	Identifier    "HDMI-2"
+	Option        "Ignore" "True"
 EndSection
 
 Section "Device"
@@ -74,8 +90,10 @@ Section "Device"
 	Identifier  "Card0"
 	Driver      "intel"
 	VendorName  "Intel Corporation"
-	BoardName   "Mobile Integrated Graphics Controller"
+	BoardName   "Mobile 4 Series Chipset Integrated Graphics Controller"
 	BusID       "PCI:0:2:0"
+	Option      "monitor-HDMI-1" "HDMI-1"
+	Option      "monitor-HDMI-2" "HDMI-2"
 EndSection
 
 Section "Screen"
@@ -83,31 +101,42 @@ Section "Screen"
 	Device     "Card0"
 	Monitor    "Monitor0"
 	SubSection "Display"
+		#Modes     "1280x800"
 		Viewport   0 0
 		Depth     1
 	EndSubSection
 	SubSection "Display"
+		#Modes     "1280x800"
 		Viewport   0 0
 		Depth     4
 	EndSubSection
 	SubSection "Display"
+		#Modes     "1280x800"
 		Viewport   0 0
 		Depth     8
 	EndSubSection
 	SubSection "Display"
+		#Modes     "1280x800"
 		Viewport   0 0
 		Depth     15
 	EndSubSection
 	SubSection "Display"
+		#Modes     "1280x800"
 		Viewport   0 0
 		Depth     16
 	EndSubSection
 	SubSection "Display"
+		Modes     "1280x800" "1024x768"
 		Viewport   0 0
 		Depth     24
+		#Virtual   2432 864
 	EndSubSection
 EndSection
 
 Section "DRI"
-	Mode 0666
+	Mode         0666
+EndSection
+
+Section "ServerFlags"
+	#Option "AllowEmptyInput" "false"
 EndSection
diff --git a/archlinux_conf/etc/hal/policy/mouse-wheel.fdi b/archlinux_conf/etc/hal/policy/mouse-wheel.fdi
new file mode 100644
index 0000000..bbe0507
--- /dev/null
+++ b/archlinux_conf/etc/hal/policy/mouse-wheel.fdi
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<match key="info.product" string="TPPS/2 IBM TrackPoint">
+<merge key="input.x11_options.EmulateWheel" type="string">true</merge>
+<merge key="input.x11_options.EmulateWheelButton" type="string">2</merge>
+<merge key="input.x11_options.ZAxsisMapping" type="string">4 5</merge>
+<merge key="input.x11_options.YAxsisMapping" type="string">4 5</merge>
+<merge key="input.x11_options.XAxsisMapping" type="string">6 7</merge>
+<merge key="input.x11_options.Emulate3Buttons" type="string">true</merge>
+</match>
-- 
2.11.4.GIT