Changeset 705
- Timestamp:
- 07/15/08 19:22:17 (4 months ago)
- Location:
- mediastation/trunk
- Files:
-
- 2 modified
-
debian/changelog (modified) (2 diffs)
-
themes/xorg/xorg.conf.mediastation (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
mediastation/trunk/debian/changelog
r697 r705 1 mediastation (2.0.8. 1) 64studio; urgency=low1 mediastation (2.0.8.2) 64studio; urgency=low 2 2 3 3 * Run cdd-config limits … … 5 5 * Changed desktop-profiles path and priority 6 6 * Added userskel tree 7 * Custom xorg.conf 7 8 8 9 -- Free Ekanayaka <freee@debian.org> Sat, 05 Jul 2008 14:27:05 +0100 -
mediastation/trunk/themes/xorg/xorg.conf.mediastation
r319 r705 48 48 EndSection 49 49 50 ## Touchkit section begin ##51 #Section "InputDevice"52 # Identifier "TKPANEL"53 # Driver "touchkit"54 # Driver "microtouch"55 # Option "Device" "/dev/input/mice"56 # Option "DebugLevel" "3"57 #EndSection58 ## Touchkit section end ##59 60 Section "InputDevice"61 Identifier "panel"62 Driver "evtouch"63 # Option "Type" "cursor"64 # Option "Device" "/dev/input/event2"65 Option "Device" "/dev/egalax_touchkit"66 # Option "SendCoreEvents" "true"67 Option "CorePointer"68 69 # The Calibration program does not recognice these.70 # i have read of a method to seap axes in kernel.71 # for now:72 # click on the right cross, which is not the red one.73 74 Option "SwapY" "true"75 Option "SwapX" "true"76 77 # Option "Calibrate" "1"78 79 Option "MinX" "105"80 Option "MinY" "140"81 Option "MaxX" "1933"82 Option "MaxY" "1915"83 Option "x0" "2"84 Option "y0" "-2"85 Option "x1" "0"86 Option "y1" "2"87 Option "x2" "-3"88 Option "y2" "3"89 Option "x3" "2"90 Option "y3" "-8"91 Option "x4" "8"92 Option "y4" "7"93 Option "x5" "-5"94 Option "y5" "11"95 Option "x6" "3"96 Option "y6" "-3"97 Option "x7" "5"98 Option "y7" "-3"99 Option "x8" "-2"100 Option "y8" "-5"101 102 EndSection103 104 50 Section "InputDevice" 105 51 Identifier "Generic Keyboard" … … 109 55 Option "XkbModel" "pc104" 110 56 Option "XkbLayout" "us" 111 # Option "XkbModel" "pc102"112 # Option "XkbLayout" "de"113 # Option "XkbVariant" "nodeadkeys"114 57 EndSection 115 58 … … 117 60 Identifier "Configured Mouse" 118 61 Driver "mouse" 119 # Option "CorePointer"120 62 Option "SendCoreEvents" "true" 121 63 Option "Device" "/dev/input/mice" … … 124 66 EndSection 125 67 126 #Section "InputDevice"127 # Identifier "Generic Mouse"128 # Driver "mouse"129 # Option "SendCoreEvents" "true"130 # Option "Device" "/dev/input/mouse2"131 # Option "Protocol" "PS/2"132 # Option "ZAxisMapping" "4 5"133 #EndSection134 135 68 Section "Device" 136 69 Identifier "Generic Video Card" 137 70 Driver "siliconmotion" 71 BusID "PCI:2:10:0" 72 Option "AccelMethod" "EXA" 73 Option "MigrationHeuristic" "always" 138 74 EndSection 139 75 140 76 Section "Device" 141 77 Identifier "Video Card 2" 142 Driver "nv idia"78 Driver "nv" 143 79 VendorName "nVidia Corporation" 144 80 #BoardName "NV17 [GeForce4 MX 420]" 145 BusID "PCI: 1:0:0"81 BusID "PCI:5:0:0" 146 82 EndSection 147 83 … … 157 93 Section "Monitor" 158 94 Identifier "Generic Monitor" 159 HorizSync 28-38160 VertRefresh 43-72161 #Option "DPMS"162 95 EndSection 163 96 164 97 Section "Monitor" 165 #DisplaySize 410 300 # mm166 98 Identifier "Monitor 2" 167 99 VendorName "GSM" 168 100 ModelName "21U" 169 #Option "DPMS"170 101 EndSection 171 102 … … 183 114 Monitor "Generic Monitor" 184 115 DefaultDepth 24 185 SubSection "Display"186 Depth 1187 Modes "800x600"188 EndSubSection189 SubSection "Display"190 Depth 4191 Modes "800x600"192 EndSubSection193 SubSection "Display"194 Depth 8195 Modes "800x600"196 EndSubSection197 SubSection "Display"198 Depth 15199 Modes "800x600"200 EndSubSection201 SubSection "Display"202 Depth 16203 Modes "800x600"204 EndSubSection205 SubSection "Display"206 Depth 24207 Modes "800x600"208 EndSubSection209 116 EndSection 210 117 … … 213 120 Device "Video Card 2" 214 121 Monitor "Monitor 2" 215 DefaultDepth 16 216 SubSection "Display" 217 Depth 1 218 EndSubSection 219 SubSection "Display" 220 Depth 4 221 EndSubSection 222 SubSection "Display" 223 Depth 8 224 EndSubSection 225 SubSection "Display" 226 Depth 15 227 EndSubSection 228 SubSection "Display" 229 Depth 16 230 Modes "1680x1050" "1280x1024" 231 EndSubSection 232 SubSection "Display" 233 Depth 24 234 EndSubSection 122 DefaultDepth 24 235 123 EndSection 236 124 … … 254 142 Screen 1 "Screen 2" RightOf "Default Screen" 255 143 Screen 2 "Screen 3" RightOf "Screen 2" 256 InputDevice "TKPANEL" "SendCoreEvents"257 144 Option "AllowMouseOpenFail" "true" 258 145 259 146 InputDevice "Generic Keyboard" 260 # InputDevice "panel"261 InputDevice "Configured Mouse"147 InputDevice "touchscreen" 148 # InputDevice "Configured Mouse" 262 149 # InputDevice "Generic Mouse" 263 150 EndSection … … 267 154 Mode 0666 268 155 EndSection 269 ## TouchKit section begin (Please do NOT edit this section!!) ## 270 Section "InputDevice" 271 Identifier "TKPANEL" 272 Driver "touchkit" 273 Option "Device" "/dev/tkdat0" 274 Option "DebugLevel" "0" 275 Option "CorePointer" 276 Option "SendCoreEvents" "true" 277 278 EndSection 279 ## TouchKit section end ## 156 Section "InputDevice" 157 Identifier "touchscreen" 158 Driver "evtouch" 159 Option "Device" "/dev/input/touchscreen" 160 # Option "Type" "cursor" 161 # Option "CorePointer" 162 Option "SendCoreEvents" "On" 163 Option "ReportingMode" "Raw" 164 Option "Emulate3Buttons" "false" 165 # Option "Emulate3Timeout" "50" 166 # Option "SwapY" "true" 167 Option "SwapX" "true" 168 Option "Calibrate" "1" 169 # Option "MinX" "105" 170 # Option "MinY" "140" 171 # Option "MaxX" "1933" 172 # Option "MaxY" "1915" 173 # Option "x0" "2" 174 # Option "y0" "-2" 175 # Option "x1" "0" 176 # Option "y1" "2" 177 # Option "x2" "-3" 178 # Option "y2" "3" 179 # Option "x3" "2" 180 # Option "y3" "-8" 181 # Option "x4" "8" 182 # Option "y4" "7" 183 # Option "x5" "-5" 184 # Option "y5" "11" 185 # Option "x6" "3" 186 # Option "y6" "-3" 187 # Option "x7" "5" 188 # Option "y7" "-3" 189 # Option "x8" "-2" 190 # Option "y8" "-5" 191 # Option "y5" "11" 192 # Option "x6" "3" 193 # Option "y6" "-3" 194 # Option "x7" "5" 195 # Option "y7" "-3" 196 # Option "x8" "-2" 197 # Option "y8" "-5" 198 199 EndSection 200
