Added all work so far...

git-svn-id: svn+ssh://xayide/home/jonas/private_svn/fleshybrid/trunk@2 8f53b18a-e215-0410-8885-9f593d34873e

5 files changed, 458 insertions, 0 deletions

diff --git a/addons/x11infoscreen/etc/X11/XF86Config-4 b/addons/x11infoscreen/etc/X11/XF86Config-4
new file mode 100644
index 0000000..059147c
--- /dev/null
+++ b/addons/x11infoscreen/etc/X11/XF86Config-4
@@ -0,0 +1,118 @@
+# XF86Config-4 (XFree86 X Window System server configuration file)
+#
+# This file was generated by dexconf, the Debian X Configuration tool, using
+# values from the debconf database.
+#
+# Edit this file with caution, and see the XF86Config-4 manual page.
+# (Type "man XF86Config-4" at the shell prompt.)
+#
+# This file is automatically updated on xserver-xfree86 package upgrades *only*
+# if it has not been modified since the last upgrade of the xserver-xfree86
+# package.
+#
+# If you have edited this file but would like it to be automatically updated
+# again, run the following commands as root:
+#
+#   cp /etc/X11/XF86Config-4 /etc/X11/XF86Config-4.custom
+#   md5sum /etc/X11/XF86Config-4 >/var/lib/xfree86/XF86Config-4.md5sum
+#   dpkg-reconfigure xserver-xfree86
+
+Section "Module"
+	Load	"GLcore"
+	Load	"bitmap"
+	Load	"dbe"
+	Load	"ddc"
+	Load	"dri"
+	Load	"extmod"
+	Load	"freetype"
+	Load	"glx"
+	Load	"int10"
+	Load	"record"
+	Load	"speedo"
+	Load	"type1"
+	Load	"vbe"
+	Load	"xtt"
+EndSection
+
+Section "InputDevice"
+	Identifier	"Generic Keyboard"
+	Driver		"keyboard"
+	Option		"CoreKeyboard"
+	Option		"XkbRules"	"xfree86"
+	Option		"XkbModel"	"pc105"
+	Option		"XkbLayout"	"dk"
+EndSection
+
+Section "InputDevice"
+	Identifier	"Configured Mouse"
+	Driver		"mouse"
+	Option		"CorePointer"
+	Option		"Device"		"/dev/psaux"
+	Option		"Protocol"		"PS/2"
+	Option		"Emulate3Buttons"	"true"
+	Option		"ZAxisMapping"		"4 5"
+EndSection
+Section "InputDevice"
+	Identifier	"Generic Mouse"
+	Driver		"mouse"
+	Option		"SendCoreEvents"	"true"
+	Option		"Device"		"/dev/input/mice"
+	Option		"Protocol"		"ImPS/2"
+	Option		"Emulate3Buttons"	"true"
+	Option		"ZAxisMapping"		"4 5"
+EndSection
+
+Section "Device"
+	Identifier	"Generic Video Card"
+	Driver		"vesa"
+EndSection
+
+Section "Monitor"
+	Identifier	"Generic Monitor"
+	HorizSync	30-75
+	VertRefresh	50-85
+	Option		"DPMS"
+EndSection
+
+Section "Screen"
+	Identifier	"Default Screen"
+	Device		"Generic Video Card"
+	Monitor		"Generic Monitor"
+	DefaultDepth	16
+	SubSection "Display"
+		Depth		1
+		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth		4
+		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth		8
+		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth		15
+		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth		16
+		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth		24
+		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+	EndSubSection
+EndSection
+
+Section "ServerLayout"
+	Identifier	"Default Layout"
+	Screen		"Default Screen"
+	InputDevice	"Generic Keyboard"
+	InputDevice	"Configured Mouse"
+	InputDevice	"Generic Mouse"
+EndSection
+
+Section "DRI"
+	Mode	0666
+EndSection
diff --git a/addons/x11infoscreen/etc/X11/XF86Config-4-Trident b/addons/x11infoscreen/etc/X11/XF86Config-4-Trident
new file mode 100644
index 0000000..b25dd59
--- /dev/null
+++ b/addons/x11infoscreen/etc/X11/XF86Config-4-Trident
@@ -0,0 +1,118 @@
+# XF86Config-4 (XFree86 X Window System server configuration file)
+#
+# This file was generated by dexconf, the Debian X Configuration tool, using
+# values from the debconf database.
+#
+# Edit this file with caution, and see the XF86Config-4 manual page.
+# (Type "man XF86Config-4" at the shell prompt.)
+#
+# This file is automatically updated on xserver-xfree86 package upgrades *only*
+# if it has not been modified since the last upgrade of the xserver-xfree86
+# package.
+#
+# If you have edited this file but would like it to be automatically updated
+# again, run the following commands as root:
+#
+#   cp /etc/X11/XF86Config-4 /etc/X11/XF86Config-4.custom
+#   md5sum /etc/X11/XF86Config-4 >/var/lib/xfree86/XF86Config-4.md5sum
+#   dpkg-reconfigure xserver-xfree86
+
+Section "Module"
+	Load	"GLcore"
+	Load	"bitmap"
+	Load	"dbe"
+	Load	"ddc"
+	Load	"dri"
+	Load	"extmod"
+	Load	"freetype"
+	Load	"glx"
+	Load	"int10"
+	Load	"record"
+	Load	"speedo"
+	Load	"type1"
+	Load	"vbe"
+	Load	"xtt"
+EndSection
+
+Section "InputDevice"
+	Identifier	"Generic Keyboard"
+	Driver		"keyboard"
+	Option		"CoreKeyboard"
+	Option		"XkbRules"	"xfree86"
+	Option		"XkbModel"	"pc105"
+	Option		"XkbLayout"	"dk"
+EndSection
+
+Section "InputDevice"
+	Identifier	"Configured Mouse"
+	Driver		"mouse"
+	Option		"CorePointer"
+	Option		"Device"		"/dev/psaux"
+	Option		"Protocol"		"PS/2"
+	Option		"Emulate3Buttons"	"true"
+	Option		"ZAxisMapping"		"4 5"
+EndSection
+Section "InputDevice"
+	Identifier	"Generic Mouse"
+	Driver		"mouse"
+	Option		"SendCoreEvents"	"true"
+	Option		"Device"		"/dev/input/mice"
+	Option		"Protocol"		"ImPS/2"
+	Option		"Emulate3Buttons"	"true"
+	Option		"ZAxisMapping"		"4 5"
+EndSection
+
+Section "Device"
+	Identifier	"Generic Video Card"
+	Driver		"trident"
+EndSection
+
+Section "Monitor"
+	Identifier	"Generic Monitor"
+	HorizSync	30-75
+	VertRefresh	50-85
+	Option		"DPMS"
+EndSection
+
+Section "Screen"
+	Identifier	"Default Screen"
+	Device		"Generic Video Card"
+	Monitor		"Generic Monitor"
+	DefaultDepth	16
+	SubSection "Display"
+		Depth		1
+		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth		4
+		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth		8
+		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth		15
+		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth		16
+		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth		24
+		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+	EndSubSection
+EndSection
+
+Section "ServerLayout"
+	Identifier	"Default Layout"
+	Screen		"Default Screen"
+	InputDevice	"Generic Keyboard"
+	InputDevice	"Configured Mouse"
+	InputDevice	"Generic Mouse"
+EndSection
+
+Section "DRI"
+	Mode	0666
+EndSection
diff --git a/addons/x11infoscreen/etc/X11/XF86Config-4-Trident.orig b/addons/x11infoscreen/etc/X11/XF86Config-4-Trident.orig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/addons/x11infoscreen/etc/X11/XF86Config-4-Trident.orig
diff --git a/addons/x11infoscreen/etc/X11/XF86Config-4.diff b/addons/x11infoscreen/etc/X11/XF86Config-4.diff
new file mode 100644
index 0000000..87d5a65
--- /dev/null
+++ b/addons/x11infoscreen/etc/X11/XF86Config-4.diff
@@ -0,0 +1,91 @@
+--- XF86Config-4.orig	2005-01-20 03:41:43.000000000 +0100
++++ XF86Config-4	2004-11-17 03:25:12.000000000 +0100
+@@ -17,20 +17,6 @@
+ #   md5sum /etc/X11/XF86Config-4 >/var/lib/xfree86/XF86Config-4.md5sum
+ #   dpkg-reconfigure xserver-xfree86
+ 
+-Section "Files"
+-	FontPath	"unix/:7100"			# local font server
+-	# if the local font server has problems, we can fall back on these
+-	FontPath	"/usr/lib/X11/fonts/misc"
+-	FontPath	"/usr/lib/X11/fonts/cyrillic"
+-	FontPath	"/usr/lib/X11/fonts/100dpi/:unscaled"
+-	FontPath	"/usr/lib/X11/fonts/75dpi/:unscaled"
+-	FontPath	"/usr/lib/X11/fonts/Type1"
+-	FontPath	"/usr/lib/X11/fonts/CID"
+-	FontPath	"/usr/lib/X11/fonts/Speedo"
+-	FontPath	"/usr/lib/X11/fonts/100dpi"
+-	FontPath	"/usr/lib/X11/fonts/75dpi"
+-EndSection
+-
+ Section "Module"
+ 	Load	"GLcore"
+ 	Load	"bitmap"
+@@ -45,6 +31,7 @@
+ 	Load	"speedo"
+ 	Load	"type1"
+ 	Load	"vbe"
++	Load	"xtt"
+ EndSection
+ 
+ Section "InputDevice"
+@@ -52,8 +39,8 @@
+ 	Driver		"keyboard"
+ 	Option		"CoreKeyboard"
+ 	Option		"XkbRules"	"xfree86"
+-	Option		"XkbModel"	"pc104"
+-	Option		"XkbLayout"	"us"
++	Option		"XkbModel"	"pc105"
++	Option		"XkbLayout"	"dk"
+ EndSection
+ 
+ Section "InputDevice"
+@@ -82,8 +69,8 @@
+ 
+ Section "Monitor"
+ 	Identifier	"Generic Monitor"
+-	HorizSync	28-50
+-	VertRefresh	43-75
++	HorizSync	30-75
++	VertRefresh	50-85
+ 	Option		"DPMS"
+ EndSection
+ 
+@@ -91,30 +78,30 @@
+ 	Identifier	"Default Screen"
+ 	Device		"Generic Video Card"
+ 	Monitor		"Generic Monitor"
+-	DefaultDepth	24
++	DefaultDepth	16
+ 	SubSection "Display"
+ 		Depth		1
+-		Modes		"800x600" "640x480"
++		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+ 	EndSubSection
+ 	SubSection "Display"
+ 		Depth		4
+-		Modes		"800x600" "640x480"
++		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+ 	EndSubSection
+ 	SubSection "Display"
+ 		Depth		8
+-		Modes		"800x600" "640x480"
++		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+ 	EndSubSection
+ 	SubSection "Display"
+ 		Depth		15
+-		Modes		"800x600" "640x480"
++		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+ 	EndSubSection
+ 	SubSection "Display"
+ 		Depth		16
+-		Modes		"800x600" "640x480"
++		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+ 	EndSubSection
+ 	SubSection "Display"
+ 		Depth		24
+-		Modes		"800x600" "640x480"
++		Modes		"1600x1200" "1280x1024" "1280x960" "1152x864" "1024x768" "800x600" "640x480"
+ 	EndSubSection
+ EndSection
+ 
diff --git a/addons/x11infoscreen/etc/X11/XF86Config-4.orig b/addons/x11infoscreen/etc/X11/XF86Config-4.orig
new file mode 100644
index 0000000..c6c901e
--- /dev/null
+++ b/addons/x11infoscreen/etc/X11/XF86Config-4.orig
@@ -0,0 +1,131 @@
+# XF86Config-4 (XFree86 X Window System server configuration file)
+#
+# This file was generated by dexconf, the Debian X Configuration tool, using
+# values from the debconf database.
+#
+# Edit this file with caution, and see the XF86Config-4 manual page.
+# (Type "man XF86Config-4" at the shell prompt.)
+#
+# This file is automatically updated on xserver-xfree86 package upgrades *only*
+# if it has not been modified since the last upgrade of the xserver-xfree86
+# package.
+#
+# If you have edited this file but would like it to be automatically updated
+# again, run the following commands as root:
+#
+#   cp /etc/X11/XF86Config-4 /etc/X11/XF86Config-4.custom
+#   md5sum /etc/X11/XF86Config-4 >/var/lib/xfree86/XF86Config-4.md5sum
+#   dpkg-reconfigure xserver-xfree86
+
+Section "Files"
+	FontPath	"unix/:7100"			# local font server
+	# if the local font server has problems, we can fall back on these
+	FontPath	"/usr/lib/X11/fonts/misc"
+	FontPath	"/usr/lib/X11/fonts/cyrillic"
+	FontPath	"/usr/lib/X11/fonts/100dpi/:unscaled"
+	FontPath	"/usr/lib/X11/fonts/75dpi/:unscaled"
+	FontPath	"/usr/lib/X11/fonts/Type1"
+	FontPath	"/usr/lib/X11/fonts/CID"
+	FontPath	"/usr/lib/X11/fonts/Speedo"
+	FontPath	"/usr/lib/X11/fonts/100dpi"
+	FontPath	"/usr/lib/X11/fonts/75dpi"
+EndSection
+
+Section "Module"
+	Load	"GLcore"
+	Load	"bitmap"
+	Load	"dbe"
+	Load	"ddc"
+	Load	"dri"
+	Load	"extmod"
+	Load	"freetype"
+	Load	"glx"
+	Load	"int10"
+	Load	"record"
+	Load	"speedo"
+	Load	"type1"
+	Load	"vbe"
+EndSection
+
+Section "InputDevice"
+	Identifier	"Generic Keyboard"
+	Driver		"keyboard"
+	Option		"CoreKeyboard"
+	Option		"XkbRules"	"xfree86"
+	Option		"XkbModel"	"pc104"
+	Option		"XkbLayout"	"us"
+EndSection
+
+Section "InputDevice"
+	Identifier	"Configured Mouse"
+	Driver		"mouse"
+	Option		"CorePointer"
+	Option		"Device"		"/dev/psaux"
+	Option		"Protocol"		"PS/2"
+	Option		"Emulate3Buttons"	"true"
+	Option		"ZAxisMapping"		"4 5"
+EndSection
+Section "InputDevice"
+	Identifier	"Generic Mouse"
+	Driver		"mouse"
+	Option		"SendCoreEvents"	"true"
+	Option		"Device"		"/dev/input/mice"
+	Option		"Protocol"		"ImPS/2"
+	Option		"Emulate3Buttons"	"true"
+	Option		"ZAxisMapping"		"4 5"
+EndSection
+
+Section "Device"
+	Identifier	"Generic Video Card"
+	Driver		"vesa"
+EndSection
+
+Section "Monitor"
+	Identifier	"Generic Monitor"
+	HorizSync	28-50
+	VertRefresh	43-75
+	Option		"DPMS"
+EndSection
+
+Section "Screen"
+	Identifier	"Default Screen"
+	Device		"Generic Video Card"
+	Monitor		"Generic Monitor"
+	DefaultDepth	24
+	SubSection "Display"
+		Depth		1
+		Modes		"800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth		4
+		Modes		"800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth		8
+		Modes		"800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth		15
+		Modes		"800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth		16
+		Modes		"800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth		24
+		Modes		"800x600" "640x480"
+	EndSubSection
+EndSection
+
+Section "ServerLayout"
+	Identifier	"Default Layout"
+	Screen		"Default Screen"
+	InputDevice	"Generic Keyboard"
+	InputDevice	"Configured Mouse"
+	InputDevice	"Generic Mouse"
+EndSection
+
+Section "DRI"
+	Mode	0666
+EndSection