Attachment 49584 Details for Bug 115189

sdiff of new and original xorg.conf

sdiff (text/plain), 13.77 KB, created by Martin Lasarsch on 2005-09-12 10:19:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Lasarsch

Created: 2005-09-12 10:19:15 UTC

Size: 13.77 KB

patch

obsolete

># /.../							      <
># SaX generated X11 config file				      <
># Created on: 2005-09-08T15:59:25+0100.			      <
>#							      <
># Version: 7.1						      <
># Contact: Marcus Schaefer <sax@suse.de>, 2002		      <
>#							      <
># Automatically generated by [ISaX] (7.1)		      <
># PLEASE DO NOT EDIT THIS FILE!				      <
>#							      <
>Section "Files"							Section "Files"
>  FontPath     "/usr/X11R6/lib/X11/fonts/misc:unscaled"		  FontPath     "/usr/X11R6/lib/X11/fonts/misc:unscaled"
>  FontPath     "/usr/X11R6/lib/X11/fonts/local"			  FontPath     "/usr/X11R6/lib/X11/fonts/local"
>  FontPath     "/usr/X11R6/lib/X11/fonts/75dpi:unscaled"	  FontPath     "/usr/X11R6/lib/X11/fonts/75dpi:unscaled"
>  FontPath     "/usr/X11R6/lib/X11/fonts/100dpi:unscaled"	  FontPath     "/usr/X11R6/lib/X11/fonts/100dpi:unscaled"
>  FontPath     "/usr/X11R6/lib/X11/fonts/Type1"			  FontPath     "/usr/X11R6/lib/X11/fonts/Type1"
>  FontPath     "/usr/X11R6/lib/X11/fonts/URW"			  FontPath     "/usr/X11R6/lib/X11/fonts/URW"
>  FontPath     "/usr/X11R6/lib/X11/fonts/Speedo"		  FontPath     "/usr/X11R6/lib/X11/fonts/Speedo"
>  FontPath     "/usr/X11R6/lib/X11/fonts/PEX"			  FontPath     "/usr/X11R6/lib/X11/fonts/PEX"
>  FontPath     "/usr/X11R6/lib/X11/fonts/cyrillic"		  FontPath     "/usr/X11R6/lib/X11/fonts/cyrillic"
>  FontPath     "/usr/X11R6/lib/X11/fonts/latin2/misc:unscaled	  FontPath     "/usr/X11R6/lib/X11/fonts/latin2/misc:unscaled
>  FontPath     "/usr/X11R6/lib/X11/fonts/latin2/75dpi:unscale	  FontPath     "/usr/X11R6/lib/X11/fonts/latin2/75dpi:unscale
>  FontPath     "/usr/X11R6/lib/X11/fonts/latin2/100dpi:unscal	  FontPath     "/usr/X11R6/lib/X11/fonts/latin2/100dpi:unscal
>  FontPath     "/usr/X11R6/lib/X11/fonts/latin2/Type1"		  FontPath     "/usr/X11R6/lib/X11/fonts/latin2/Type1"
>  FontPath     "/usr/X11R6/lib/X11/fonts/latin7/75dpi:unscale	  FontPath     "/usr/X11R6/lib/X11/fonts/latin7/75dpi:unscale
>  FontPath     "/usr/X11R6/lib/X11/fonts/baekmuk:unscaled"	  FontPath     "/usr/X11R6/lib/X11/fonts/baekmuk:unscaled"
>  FontPath     "/usr/X11R6/lib/X11/fonts/japanese:unscaled"	  FontPath     "/usr/X11R6/lib/X11/fonts/japanese:unscaled"
>  FontPath     "/usr/X11R6/lib/X11/fonts/kwintv"		  FontPath     "/usr/X11R6/lib/X11/fonts/kwintv"
>  FontPath     "/usr/X11R6/lib/X11/fonts/truetype"		  FontPath     "/usr/X11R6/lib/X11/fonts/truetype"
>  FontPath     "/usr/X11R6/lib/X11/fonts/uni:unscaled"		  FontPath     "/usr/X11R6/lib/X11/fonts/uni:unscaled"
>  FontPath     "/usr/X11R6/lib/X11/fonts/CID"			  FontPath     "/usr/X11R6/lib/X11/fonts/CID"
>  FontPath     "/usr/X11R6/lib/X11/fonts/ucs/misc:unscaled"	  FontPath     "/usr/X11R6/lib/X11/fonts/ucs/misc:unscaled"
>  FontPath     "/usr/X11R6/lib/X11/fonts/ucs/75dpi:unscaled"	  FontPath     "/usr/X11R6/lib/X11/fonts/ucs/75dpi:unscaled"
>  FontPath     "/usr/X11R6/lib/X11/fonts/ucs/100dpi:unscaled"	  FontPath     "/usr/X11R6/lib/X11/fonts/ucs/100dpi:unscaled"
>  FontPath     "/usr/X11R6/lib/X11/fonts/hellas/misc:unscaled	  FontPath     "/usr/X11R6/lib/X11/fonts/hellas/misc:unscaled
>  FontPath     "/usr/X11R6/lib/X11/fonts/hellas/75dpi:unscale	  FontPath     "/usr/X11R6/lib/X11/fonts/hellas/75dpi:unscale
>  FontPath     "/usr/X11R6/lib/X11/fonts/hellas/100dpi:unscal	  FontPath     "/usr/X11R6/lib/X11/fonts/hellas/100dpi:unscal
>  FontPath     "/usr/X11R6/lib/X11/fonts/hellas/Type1"		  FontPath     "/usr/X11R6/lib/X11/fonts/hellas/Type1"
>  FontPath     "/usr/X11R6/lib/X11/fonts/misc/sgi:unscaled"	  FontPath     "/usr/X11R6/lib/X11/fonts/misc/sgi:unscaled"
>  FontPath     "/usr/X11R6/lib/X11/fonts/xtest"			  FontPath     "/usr/X11R6/lib/X11/fonts/xtest"
>  FontPath     "/opt/kde3/share/fonts"				  FontPath     "/opt/kde3/share/fonts"
>  InputDevices "/dev/ttyS0"					  InputDevices "/dev/ttyS0"
>  InputDevices "/dev/ttyS1"					  InputDevices "/dev/ttyS1"
>  InputDevices "/dev/ttyS2"					  InputDevices "/dev/ttyS2"
>  InputDevices "/dev/ttyS3"					  InputDevices "/dev/ttyS3"
>  InputDevices "/dev/ttyS4"					  InputDevices "/dev/ttyS4"
>  InputDevices "/dev/ttyS5"					  InputDevices "/dev/ttyS5"
>  InputDevices "/dev/ttyS6"					  InputDevices "/dev/ttyS6"
>  InputDevices "/dev/ttyS7"					  InputDevices "/dev/ttyS7"
>  InputDevices "/dev/ttyS8"					  InputDevices "/dev/ttyS8"
>  InputDevices "/dev/psaux"					  InputDevices "/dev/psaux"
>  InputDevices "/dev/logibm"					  InputDevices "/dev/logibm"
>  InputDevices "/dev/sunmouse"					  InputDevices "/dev/sunmouse"
>  InputDevices "/dev/atibm"					  InputDevices "/dev/atibm"
>  InputDevices "/dev/amigamouse"				  InputDevices "/dev/amigamouse"
>  InputDevices "/dev/atarimouse"				  InputDevices "/dev/atarimouse"
>  InputDevices "/dev/inportbm"					  InputDevices "/dev/inportbm"
>  InputDevices "/dev/gpmdata"					  InputDevices "/dev/gpmdata"
>  InputDevices "/dev/mouse"					  InputDevices "/dev/mouse"
>  InputDevices "/dev/usbmouse"					  InputDevices "/dev/usbmouse"
>  InputDevices "/dev/adbmouse"					  InputDevices "/dev/adbmouse"
>  InputDevices "/dev/input/mice"				  InputDevices "/dev/input/mice"
>  InputDevices "/dev/input/event0"				  InputDevices "/dev/input/event0"
>  InputDevices "/dev/pointer0"					  InputDevices "/dev/pointer0"
>  InputDevices "/dev/pointer1"					  InputDevices "/dev/pointer1"
>  InputDevices "/dev/pointer2"					  InputDevices "/dev/pointer2"
>  InputDevices "/dev/pointer3"					  InputDevices "/dev/pointer3"
>EndSection							EndSection
>							      <
>Section "ServerFlags"						Section "ServerFlags"
>  Option       "AllowMouseOpenFail"				  Option       "AllowMouseOpenFail"
>EndSection							EndSection
>							      <
>Section "Module"						Section "Module"
>							      >	  Load         "vnc"
>  Load         "dbe"						  Load         "dbe"
>  Load         "type1"						  Load         "type1"
>  Load         "freetype"					  Load         "freetype"
>  Load         "extmod"						  Load         "extmod"
>  Load         "glx"						  Load         "glx"
>  Load         "v4l"						  Load         "v4l"
>							      >	  Load         "dri"
>EndSection							EndSection
>							      <
>Section "InputDevice"						Section "InputDevice"
>  Driver       "kbd"						  Driver       "kbd"
>  Identifier   "Keyboard[0]"					  Identifier   "Keyboard[0]"
>  Option       "Protocol" "Standard"				  Option       "Protocol" "Standard"
>  Option       "XkbLayout" "gb"					  Option       "XkbLayout" "gb"
>  Option       "XkbModel" "pc105"				  Option       "XkbModel" "pc105"
>  Option       "XkbRules" "xfree86"				  Option       "XkbRules" "xfree86"
>EndSection							EndSection
>							      <
>Section "InputDevice"						Section "InputDevice"
>  Driver       "mouse"						  Driver       "mouse"
>  Identifier   "Mouse[1]"					  Identifier   "Mouse[1]"
>  Option       "Device" "/dev/input/mice"			  Option       "Device" "/dev/input/mice"
>  Option       "Name" "PS/2 Mouse"				  Option       "Name" "PS/2 Mouse"
>  Option       "Protocol" "explorerps/2"			  Option       "Protocol" "explorerps/2"
>  Option       "Vendor" "Sysp"					  Option       "Vendor" "Sysp"
>EndSection							EndSection
>							      |	Section "InputDevice"
>							      >	  Driver       "rfbkeyb"
>							      >	  Identifier   "Keyboard[2]"
>							      >	  Option       "InputFashion" "VNC"
>							      >	EndSection
>Section "InputDevice"						Section "InputDevice"
>  Driver       "synaptics"					  Driver       "synaptics"
>  Identifier   "Mouse[3]"					  Identifier   "Mouse[3]"
>  Option       "AccelFactor" "0.1"			      |	  Option       "AccelFactor" "0.01"
>  Option       "BottomEdge" "650"				  Option       "BottomEdge" "650"
>  Option       "CircScrollDelta" "0.1"				  Option       "CircScrollDelta" "0.1"
>  Option       "CircScrollTrigger" "2"				  Option       "CircScrollTrigger" "2"
>  Option       "CircularScrolling" "1"				  Option       "CircularScrolling" "1"
>  Option       "Device" "/dev/input/mice"			  Option       "Device" "/dev/input/mice"
>  Option       "EdgeMotionMaxSpeed" "15"			  Option       "EdgeMotionMaxSpeed" "15"
>  Option       "EdgeMotionMinSpeed" "15"			  Option       "EdgeMotionMinSpeed" "15"
>  Option       "Emulate3Buttons" "on"				  Option       "Emulate3Buttons" "on"
>  Option       "EmulateMidButtonTime" "75"			  Option       "EmulateMidButtonTime" "75"
>  Option       "FingerHigh" "15"				  Option       "FingerHigh" "15"
>  Option       "FingerLow" "14"					  Option       "FingerLow" "14"
>  Option       "HorizScrollDelta" "20"				  Option       "HorizScrollDelta" "20"
>  Option       "InputFashion" "Mouse"			      <
>  Option       "LeftEdge" "120"					  Option       "LeftEdge" "120"
>  Option       "MaxSpeed" "1"				      |	  Option       "MaxSpeed" "0.5"
>  Option       "MaxTapMove" "110"				  Option       "MaxTapMove" "110"
>  Option       "MaxTapTime" "180"				  Option       "MaxTapTime" "180"
>  Option       "MinSpeed" "0.2"					  Option       "MinSpeed" "0.2"
>  Option       "Name" "ALPS;Touchpad"			      |	  Option       "Name" "Touchpad"
>  Option       "Protocol" "auto-dev"				  Option       "Protocol" "auto-dev"
>  Option       "RightEdge" "830"				  Option       "RightEdge" "830"
>  Option       "SHMConfig" "on"					  Option       "SHMConfig" "on"
>  Option       "TopEdge" "120"					  Option       "TopEdge" "120"
>  Option       "UpDownScrolling" "1"				  Option       "UpDownScrolling" "1"
>  Option       "Vendor" "Sysp"				      |	  Option       "Vendor" "ALPS"
>  Option       "VertScrollDelta" "20"				  Option       "VertScrollDelta" "20"
>  Option       "ZAxisMapping" "4 5"				  Option       "ZAxisMapping" "4 5"
>EndSection							EndSection
>							      |	Section "InputDevice"
>							      >	  Driver       "rfbmouse"
>							      >	  Identifier   "Mouse[5]"
>							      >	  Option       "InputFashion" "VNC"
>							      >	EndSection
>Section "Monitor"						Section "Monitor"
>  DisplaySize  300 230						  DisplaySize  300 230
>  HorizSync    30-50						  HorizSync    30-50
>  Identifier   "Monitor[0]"					  Identifier   "Monitor[0]"
>  ModelName    "1280X768@60HZ"					  ModelName    "1280X768@60HZ"
>  Option       "DPMS"						  Option       "DPMS"
>  VendorName   "--> LCD"					  VendorName   "--> LCD"
>  VertRefresh  50-65						  VertRefresh  50-65
>  UseModes     "Modes[0]"					  UseModes     "Modes[0]"
>EndSection							EndSection
>							      <
>Section "Modes"							Section "Modes"
>  Identifier   "Modes[0]"					  Identifier   "Modes[0]"
>  Modeline 	"1280x768" 84.35 1280 1344 1480 1680 768 769  |	  Modeline      "1280x768" 84.35 1280 1344 1480 1680 768 769 
>  Modeline 	"1024x768" 67.48 1024 1080 1184 1344 768 769  |	  Modeline      "1024x768" 67.48 1024 1080 1184 1344 768 769 
>  Modeline 	"800x600" 40.19 800 832 912 1024 600 601 604  |	  Modeline      "800x600" 40.19 800 832 912 1024 600 601 604 
>  Modeline 	"768x576" 37.37 768 800 880 992 576 577 580 5 |	  Modeline      "768x576" 37.37 768 800 880 992 576 577 580 5
>  Modeline 	"640x480" 25.10 640 656 720 800 480 481 484 4 |	  Modeline      "640x480" 25.10 640 656 720 800 480 481 484 4
>  Modeline 	"800x600" 40.00 800 840 968 1056 600 601 605  <
>EndSection							EndSection
>							      <
>Section "Screen"						Section "Screen"
>  DefaultDepth 16					      |	  DefaultDepth 24
>  SubSection "Display"						  SubSection "Display"
>    Depth      15						    Depth      15
>    Modes      "1280x768" "1024x768" "800x600" "768x576" "640 |	    Modes      "1280x768" "1024x768" "800x600" "768x576" "640
>  EndSubSection							  EndSubSection
>  SubSection "Display"						  SubSection "Display"
>    Depth      16						    Depth      16
>    Modes      "1280x768" "1024x768" "800x600" "768x576" "640 |	    Modes      "1280x768" "1024x768" "800x600" "768x576" "640
>  EndSubSection							  EndSubSection
>  SubSection "Display"						  SubSection "Display"
>    Depth      24						    Depth      24
>    Modes      "1280x768" "1024x768" "800x600" "768x576" "640 |	    Modes      "1280x768" "1024x768" "800x600" "768x576" "640
>  EndSubSection							  EndSubSection
>  SubSection "Display"						  SubSection "Display"
>    Depth      32						    Depth      32
>    Modes      "1280x768" "1024x768" "800x600" "768x576" "640 |	    Modes      "1280x768" "1024x768" "800x600" "768x576" "640
>  EndSubSection							  EndSubSection
>  SubSection "Display"						  SubSection "Display"
>    Depth      8						    Depth      8
>    Modes      "1280x768" "1024x768" "800x600" "768x576" "640 |	    Modes      "1280x768" "1024x768" "800x600" "768x576" "640
>  EndSubSection							  EndSubSection
>  Device       "Device[0]"					  Device       "Device[0]"
>  Identifier   "Screen[0]"					  Identifier   "Screen[0]"
>  Monitor      "Monitor[0]"					  Monitor      "Monitor[0]"
>EndSection							EndSection
>							      <
>Section "Device"						Section "Device"
>  BoardName    "855 GM"						  BoardName    "855 GM"
>  BusID        "0:2:0"						  BusID        "0:2:0"
>  Driver       "i810"						  Driver       "i810"
>  Identifier   "Device[0]"					  Identifier   "Device[0]"
>							      >	  Option       "NoDDC"
>							      >	  Option       "alwaysshared"
>							      >	  Option       "rfbauth" "/root/.vnc/passwd"
>							      >	  Option       "usevnc" "yes"
>							      >	  Screen       0
>  VendorName   "Intel"						  VendorName   "Intel"
>EndSection							EndSection
>							      <
>Section "ServerLayout"						Section "ServerLayout"
>  Identifier   "Layout[all]"					  Identifier   "Layout[all]"
>  InputDevice  "Keyboard[0]" "CoreKeyboard"		      |	  InputDevice  "Keyboard[2]" "CoreKeyboard"
>  InputDevice  "Mouse[1]" "CorePointer"				  InputDevice  "Mouse[1]" "CorePointer"
>  InputDevice  "Mouse[3]" "SendCoreEvents"			  InputDevice  "Mouse[3]" "SendCoreEvents"
>							      >	  InputDevice  "Mouse[5]" "SendCoreEvents"
>  Option       "Clone" "off"					  Option       "Clone" "off"
>  Option       "Xinerama" "off"					  Option       "Xinerama" "off"
>  Screen       "Screen[0]"					  Screen       "Screen[0]"
>EndSection							EndSection
>							      <
>Section "DRI"							Section "DRI"
>    Group      "video"						    Group      "video"
>    Mode       0660						    Mode       0660
>EndSection							EndSection
>							      <
>Section "Extensions"						Section "Extensions"
>EndSection							EndSection
>							      <

Actions: View

Attachments on bug 115189: 48792 | 49029 | 49030 | 49079 | 49148 | 49149 | 49440 | 49584 | 49595