diff options
author | jonas <jonas@8f53b18a-e215-0410-8885-9f593d34873e> | 2006-06-10 18:18:37 +0000 |
---|---|---|
committer | jonas <jonas@8f53b18a-e215-0410-8885-9f593d34873e> | 2006-06-10 18:18:37 +0000 |
commit | b6d85b04286d30498a11aaac36e75032b1e72801 (patch) | |
tree | 2fc597a2ae2cf69a5cc6b3e7162f02f89613b08d /addons/x11phonehome | |
parent | 369cb1e5a343ec9e7c6f05de64f0eb102488d77f (diff) |
Added all work so far...
git-svn-id: svn+ssh://xayide/home/jonas/private_svn/fleshybrid/trunk@2 8f53b18a-e215-0410-8885-9f593d34873e
Diffstat (limited to 'addons/x11phonehome')
-rw-r--r-- | addons/x11phonehome/etc/X11/xorg.conf | 115 | ||||
-rw-r--r-- | addons/x11phonehome/etc/X11/xorg.conf-Intel | 115 | ||||
-rw-r--r-- | addons/x11phonehome/etc/X11/xorg.conf-Trident | 115 | ||||
-rw-r--r-- | addons/x11phonehome/etc/X11/xorg.conf-Trident.orig | 0 | ||||
-rw-r--r-- | addons/x11phonehome/etc/X11/xorg.conf.orig | 129 | ||||
-rwxr-xr-x | addons/x11phonehome/etc/init.d/local-phonehome | 102 | ||||
l--------- | addons/x11phonehome/etc/rc2.d/S99local-phonehome | 1 | ||||
-rwxr-xr-x | addons/x11phonehome/usr/local/bin/launch-unclutter | 16 | ||||
-rwxr-xr-x | addons/x11phonehome/usr/local/bin/launch-x11 | 16 | ||||
-rwxr-xr-x | addons/x11phonehome/usr/local/bin/pickxconfig | 13 | ||||
-rwxr-xr-x | addons/x11phonehome/usr/local/bin/xset | bin | 0 -> 26352 bytes |
11 files changed, 622 insertions, 0 deletions
diff --git a/addons/x11phonehome/etc/X11/xorg.conf b/addons/x11phonehome/etc/X11/xorg.conf new file mode 100644 index 0000000..3c5aed2 --- /dev/null +++ b/addons/x11phonehome/etc/X11/xorg.conf @@ -0,0 +1,115 @@ +# 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 "bitmap" + Load "dbe" + Load "ddc" + Load "dri" + Load "extmod" + Load "freetype" + Load "glx" + Load "int10" + Load "record" + Load "type1" + Load "vbe" +EndSection + +Section "InputDevice" + Identifier "Generic Keyboard" + Driver "keyboard" + Option "CoreKeyboard" + Option "XkbRules" "xorg" + 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/x11phonehome/etc/X11/xorg.conf-Intel b/addons/x11phonehome/etc/X11/xorg.conf-Intel new file mode 100644 index 0000000..ae0023a --- /dev/null +++ b/addons/x11phonehome/etc/X11/xorg.conf-Intel @@ -0,0 +1,115 @@ +# 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 "bitmap" + Load "dbe" + Load "ddc" + Load "dri" + Load "extmod" + Load "freetype" + Load "glx" + Load "int10" + Load "record" + Load "type1" + Load "vbe" +EndSection + +Section "InputDevice" + Identifier "Generic Keyboard" + Driver "keyboard" + Option "CoreKeyboard" + Option "XkbRules" "xorg" + 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 "i810" +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/x11phonehome/etc/X11/xorg.conf-Trident b/addons/x11phonehome/etc/X11/xorg.conf-Trident new file mode 100644 index 0000000..99266d1 --- /dev/null +++ b/addons/x11phonehome/etc/X11/xorg.conf-Trident @@ -0,0 +1,115 @@ +# 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 "bitmap" + Load "dbe" + Load "ddc" + Load "dri" + Load "extmod" + Load "freetype" + Load "glx" + Load "int10" + Load "record" + Load "type1" + Load "vbe" +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/x11phonehome/etc/X11/xorg.conf-Trident.orig b/addons/x11phonehome/etc/X11/xorg.conf-Trident.orig new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/addons/x11phonehome/etc/X11/xorg.conf-Trident.orig diff --git a/addons/x11phonehome/etc/X11/xorg.conf.orig b/addons/x11phonehome/etc/X11/xorg.conf.orig new file mode 100644 index 0000000..33bbb23 --- /dev/null +++ b/addons/x11phonehome/etc/X11/xorg.conf.orig @@ -0,0 +1,129 @@ +# 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 "bitmap" + Load "dbe" + Load "ddc" + Load "dri" + Load "extmod" + Load "freetype" + Load "glx" + Load "int10" + Load "record" + Load "type1" + Load "vbe" +EndSection + +Section "InputDevice" + Identifier "Generic Keyboard" + Driver "keyboard" + Option "CoreKeyboard" + Option "XkbRules" "xorg" + 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 diff --git a/addons/x11phonehome/etc/init.d/local-phonehome b/addons/x11phonehome/etc/init.d/local-phonehome new file mode 100755 index 0000000..4b8ebfa --- /dev/null +++ b/addons/x11phonehome/etc/init.d/local-phonehome @@ -0,0 +1,102 @@ +#! /bin/sh +# +# local-phonehome +# +# Author: Jonas Smedegaard <dr@jones.dk> +# + +set -e + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="PhoneHome daemons" +NAME=phonehome +DAEMON=/usr/sbin/$NAME +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME + +# Gracefully exit if the package has been removed. +#test -x $DAEMON || exit 0 + +# Read config file if it is present. +#if [ -r /etc/default/$NAME ] +#then +# . /etc/default/$NAME +#fi + +# +# Function that starts the daemon/service. +# +d_start() { +# start-stop-daemon --start --quiet --pidfile $PIDFILE \ +# --exec $DAEMON + killall Xorg -wq || /bin/true + /usr/local/bin/launch-x11 + sleep 5 + /usr/local/bin/launch-unclutter + /usr/bin/motion +} + +# +# Function that stops the daemon/service. +# +d_stop() { +# start-stop-daemon --stop --quiet --pidfile $PIDFILE \ +# --name $NAME + /usr/bin/killall TERM motion || /bin/true + /usr/local/bin/launch-unclutter -k || /bin/true + /usr/local/bin/launch-x11 -k || /bin/true + killall Xorg -wq || /bin/true +} + +# +# Function that sends a SIGHUP to the daemon/service. +# +#d_reload() { +# start-stop-daemon --stop --quiet --pidfile $PIDFILE \ +# --name $NAME --signal 1 +#} + +case "$1" in + start) + echo -n "Starting $DESC: $NAME" + d_start + echo "." + ;; + stop) + echo -n "Stopping $DESC: $NAME" + d_stop + echo "." + ;; + #reload) + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + # If the daemon responds to changes in its config file + # directly anyway, make this an "exit 0". + # + # echo -n "Reloading $DESC configuration..." + # d_reload + # echo "done." + #;; + restart|force-reload) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart". + # + echo -n "Restarting $DESC: $NAME" + d_stop + sleep 1 + d_start + echo "." + ;; + *) + # echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/addons/x11phonehome/etc/rc2.d/S99local-phonehome b/addons/x11phonehome/etc/rc2.d/S99local-phonehome new file mode 120000 index 0000000..3914b9e --- /dev/null +++ b/addons/x11phonehome/etc/rc2.d/S99local-phonehome @@ -0,0 +1 @@ +../init.d/local-phonehome
\ No newline at end of file diff --git a/addons/x11phonehome/usr/local/bin/launch-unclutter b/addons/x11phonehome/usr/local/bin/launch-unclutter new file mode 100755 index 0000000..1995126 --- /dev/null +++ b/addons/x11phonehome/usr/local/bin/launch-unclutter @@ -0,0 +1,16 @@ +#!/usr/bin/launchtool -C + +tag = unclutter +command = unclutter -idle 1 -root -display ':0' +daemon = yes +stats = yes +#user = myserver +#root dir = /tmp +#process count limit = 5 +#open files limit = 10 +wait times = 1,1,1,3,3,3,10,10,10 +infinite runs = yes +launchtool output = syslog:unclutter,LOG_DAEMON,LOG_INFO +launchtool errors = syslog:unclutter,LOG_DAEMON,LOG_ERR +command output = syslog:unclutter,LOG_DAEMON,LOG_INFO +command errors = syslog:unclutter,LOG_DAEMON,LOG_ERR diff --git a/addons/x11phonehome/usr/local/bin/launch-x11 b/addons/x11phonehome/usr/local/bin/launch-x11 new file mode 100755 index 0000000..67c0d95 --- /dev/null +++ b/addons/x11phonehome/usr/local/bin/launch-x11 @@ -0,0 +1,16 @@ +#!/usr/bin/launchtool -C + +tag = x11 +command = /usr/bin/Xorg -allowMouseOpenFail -br -dpms -config `/usr/local/bin/pickxconfig` +daemon = yes +stats = yes +#user = myserver +#root dir = /tmp +#process count limit = 5 +#open files limit = 10 +wait times = 1,1,1,3,3,3,10,10,10 +infinite runs = yes +launchtool output = syslog:x11,LOG_DAEMON,LOG_INFO +launchtool errors = syslog:x11,LOG_DAEMON,LOG_ERR +command output = syslog:x11,LOG_DAEMON,LOG_INFO +command errors = syslog:x11,LOG_DAEMON,LOG_ERR diff --git a/addons/x11phonehome/usr/local/bin/pickxconfig b/addons/x11phonehome/usr/local/bin/pickxconfig new file mode 100755 index 0000000..51b8f41 --- /dev/null +++ b/addons/x11phonehome/usr/local/bin/pickxconfig @@ -0,0 +1,13 @@ +#!/bin/sh + +# FIXME: Why won't this work? +#cfgmaybe=`lspci | perl -n -e 's¡^.* VGA .*:\W(\w*).*¡/etc/X11/XF86Config-4-$1¡i && print if -f'` + +cfgbase="/etc/X11/xorg.conf" + +cfgmaybe="$cfgbase-`lspci | perl -n -e 's¡^.* VGA .*:\W(\w*).*¡$1¡i && print'`" +if [ -r "$cfgmaybe" ]; then + echo "$cfgmaybe" +else + echo "$cfgbase" +fi diff --git a/addons/x11phonehome/usr/local/bin/xset b/addons/x11phonehome/usr/local/bin/xset Binary files differnew file mode 100755 index 0000000..6ffc56f --- /dev/null +++ b/addons/x11phonehome/usr/local/bin/xset |