summaryrefslogtreecommitdiffstats
path: root/openembedded/packages/x11
diff options
context:
space:
mode:
authorMatthew Allum <mallum@openedhand.com>2005-08-31 21:08:40 +0000
committerMatthew Allum <mallum@openedhand.com>2005-08-31 21:08:40 +0000
commit7755d9d194b42ea859096f805f2e22ae5b6e6281 (patch)
treea4430bb7c0b4c298b6a9099fcfbdb7cfc045ae98 /openembedded/packages/x11
parent962491ebe2df3563ea8e9b6803949c98c387a134 (diff)
downloadpoky-7755d9d194b42ea859096f805f2e22ae5b6e6281.tar.gz
rename x11-common to xserver-kdrive-common
git-svn-id: https://svn.o-hand.com/repos/poky@12 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/x11')
-rw-r--r--openembedded/packages/x11/x11-common/etc/X11/Xdefaults3
-rw-r--r--openembedded/packages/x11/x11-common/etc/X11/Xinit16
-rw-r--r--openembedded/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr4
-rw-r--r--openembedded/packages/x11/x11-common/etc/X11/Xinit.d/11zaurus12
-rw-r--r--openembedded/packages/x11/x11-common/etc/X11/Xinit.d/12keymap23
-rw-r--r--openembedded/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate6
-rw-r--r--openembedded/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap5
-rw-r--r--openembedded/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver4
-rw-r--r--openembedded/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults3
-rw-r--r--openembedded/packages/x11/x11-common/etc/X11/Xserver73
-rw-r--r--openembedded/packages/x11/x11-common/etc/X11/Xsession47
-rw-r--r--openembedded/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults4
-rw-r--r--openembedded/packages/x11/x11-common/etc/X11/collie.xmodmap5
-rw-r--r--openembedded/packages/x11/x11-common/etc/X11/h2200.xmodmap5
-rw-r--r--openembedded/packages/x11/x11-common/etc/X11/shepherd.xmodmap49
-rw-r--r--openembedded/packages/x11/x11-common/etc/X11/simpad.xmodmap2
-rw-r--r--openembedded/packages/x11/x11-common_0.1.bb14
17 files changed, 0 insertions, 275 deletions
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xdefaults b/openembedded/packages/x11/x11-common/etc/X11/Xdefaults
deleted file mode 100644
index f5b69dd516..0000000000
--- a/openembedded/packages/x11/x11-common/etc/X11/Xdefaults
+++ /dev/null
@@ -1,3 +0,0 @@
1Rxvt*scrollBar_right: true
2Rxvt*font: xft:Mono:pixelsize=9
3
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xinit b/openembedded/packages/x11/x11-common/etc/X11/Xinit
deleted file mode 100644
index f566ffe5be..0000000000
--- a/openembedded/packages/x11/x11-common/etc/X11/Xinit
+++ /dev/null
@@ -1,16 +0,0 @@
1#!/bin/sh
2#
3
4export USER=root
5export HOME=/home/root
6if [ ! -d $HOME ] && [ -d /root ]; then
7 HOME=/root
8fi
9export XAPPLRESDIR=/usr/X11R6/lib/app-defaults
10export XFILESEARCHPATH=./%N%S%C.ad:/usr/X11R6/lib/X11/%L/%T/%N%S%C:/usr/X11R6/lib/X11/%l/%T/%N%S%C:/usr/X11R6/lib/X11/%T/%N%S%C:./%N%S.ad:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S:/usr/local/lib/X11/app-defaults/%N%S%C.ad
11
12export PATH=$PATH:/usr/X11R6/bin
13
14SYSSESSIONDIR=/etc/X11/Xinit.d
15
16exec run-parts $SYSSESSIONDIR
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr
deleted file mode 100644
index abde87d53c..0000000000
--- a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr
+++ /dev/null
@@ -1,4 +0,0 @@
1#!/bin/sh
2
3xrandr -o normal
4
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/11zaurus b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/11zaurus
deleted file mode 100644
index 61ca84b595..0000000000
--- a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/11zaurus
+++ /dev/null
@@ -1,12 +0,0 @@
1#!/bin/sh
2
3if [ -z "`which chkhinge`" ]; then
4 # probably not a clamshell zaurus
5 exit 0
6fi
7
8chkhinge -e
9if [ $? = 12 ]; then
10 xrandr -o right
11fi
12
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/12keymap b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/12keymap
deleted file mode 100644
index abc14f8661..0000000000
--- a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/12keymap
+++ /dev/null
@@ -1,23 +0,0 @@
1#!/bin/sh
2
3MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo`
4
5case $MACHINE in
6 "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
7 case `uname -r` in
8 2.4*)
9 xmodmap - < /etc/X11/shepherd.xmodmap
10 ;;
11 esac
12 ;;
13 "Sharp-Collie")
14 xmodmap - < /etc/X11/collie.xmodmap
15 ;;
16 "Simpad")
17 xmodmap - < /etc/X11/simpad.xmodmap
18 ;;
19 "HP iPAQ H2200")
20 xmodmap - < /etc/X11/h2200.xmodmap
21 ;;
22esac
23
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate
deleted file mode 100644
index de47b871a2..0000000000
--- a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate
+++ /dev/null
@@ -1,6 +0,0 @@
1#!/bin/sh
2
3if [ ! -f /etc/pointercal ]; then
4 /usr/bin/xtscal
5fi
6
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap
deleted file mode 100644
index 7ae3b58860..0000000000
--- a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap
+++ /dev/null
@@ -1,5 +0,0 @@
1#!/bin/sh
2
3if [ -f /proc/hal/model ]; then
4 xmodmap -e 'keycode 104 = Return'
5fi
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver
deleted file mode 100644
index 5f6d0dae5d..0000000000
--- a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver
+++ /dev/null
@@ -1,4 +0,0 @@
1#!/bin/sh
2
3xset s 30 180
4xset s off
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults b/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults
deleted file mode 100644
index 6b35e0357c..0000000000
--- a/openembedded/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults
+++ /dev/null
@@ -1,3 +0,0 @@
1#!/bin/sh
2
3xrdb -load -nocpp < /etc/X11/Xdefaults
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xserver b/openembedded/packages/x11/x11-common/etc/X11/Xserver
deleted file mode 100644
index 8492bfe214..0000000000
--- a/openembedded/packages/x11/x11-common/etc/X11/Xserver
+++ /dev/null
@@ -1,73 +0,0 @@
1#!/bin/sh
2#
3
4XSERVER=Xipaq
5if [ -f /usr/bin/Xfbdev ]; then
6 XSERVER=Xfbdev
7fi
8if [ -f /usr/bin/Xepson ]; then
9 XSERVER=Xepson
10fi
11if [ -f /usr/bin/Xorg ]; then
12 XSERVER=Xorg
13fi
14if [ -f /usr/bin/Xomap ]; then
15 XSERVER=Xomap
16fi
17
18. /etc/profile
19
20module_id() {
21 ## used to read from assets, but sometimes assets is corrupted
22 # grep "Module ID" /proc/hal/assets | sed "s/.*://"
23 ## used to read from /proc/hal/model, but that is removed in 2.6
24 # echo ' iPAQ' `cat /proc/hal/model`
25 awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
26}
27
28export USER=root
29
30ARGS="-dpi 100 -br -pn"
31
32# use ucb 1x00 touchscreen if present
33if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
34 ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
35fi
36
37# use usb mouse if present
38# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically
39if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then
40 ARGS="$ARGS -mouse /dev/input/mice"
41fi
42
43# start off server in conventional location.
44case `module_id` in
45 "HP iPAQ H3100" | "HP iPAQ H3800")
46 ARGS="$ARGS -screen 320x240@90 -rgba vrgb" ;;
47 "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
48 ARGS="$ARGS -screen 320x240@270 -rgba vbgr" ;;
49 "HP iPAQ H5400" | "HP iPAQ H2200")
50 ARGS="$ARGS -rgba rgb" ;;
51 "Ramses")
52 # What is this "vt2" in aid of?
53 ARGS="$ARGS -screen 320x240@90 -rgba vrgb vt2" ;;
54 # both 'Sharp-Collie' and just 'Collie' have been reported
55 *Poodle)
56 ARGS="$ARGS -screen 320x240@270 -rgba vrgb" ;;
57 *Collie)
58 ARGS="$ARGS -screen 320x240@270 -rgba vrgb"
59 # Horrible hack required to enable resuming after suspend
60 rm -f /dev/apm_bios
61 killall -9 apmd
62 ;;
63 "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
64 ARGS="$ARGS -rgba rgb" ;;
65 "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
66 ARGS="$ARGS -rgba rgb -screen 480x640@270" ;;
67 "Simpad")
68 ARGS="$ARGS -rgba rgb" ;;
69 "Generic OMAP1510/1610/1710")
70 ARGS="$ARGS -mouse /dev/input/event0" ;;
71esac
72
73exec $XSERVER $ARGS $*
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xsession b/openembedded/packages/x11/x11-common/etc/X11/Xsession
deleted file mode 100644
index cfa3a9a6e3..0000000000
--- a/openembedded/packages/x11/x11-common/etc/X11/Xsession
+++ /dev/null
@@ -1,47 +0,0 @@
1#!/bin/sh
2
3# this location MUST be consistent with /etc/X11/gpe-login.pre-session
4HOME_VOLATILE=/home/$USER/ramdisk
5export HOME_VOLATILE
6
7if [ -f /usr/bin/dbus-launch ]; then
8 ## test for an existing bus daemon, just to be safe
9 if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
10 ## if not found, launch a new one
11 eval `dbus-launch --auto-syntax --exit-with-session`
12 echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
13 fi
14fi
15
16. /etc/profile
17
18if [ -f $HOME/.profile ]; then
19 . $HOME/.profile
20fi
21
22SYSSESSIONDIR=/etc/X11/Xsession-gpe.d
23
24if [ ! -d $SYSSESSIONDIR ]; then
25 SYSSESSIONDIR=/etc/X11/Xsession.d
26fi
27
28# Use run-parts to source every file in the session directory; we source
29# instead of executing so that the variables and functions defined above
30# are available to the scripts, and so that they can pass variables to each
31# other.
32
33# Can't use run-parts like this, busybox doesn't support it. Use ls instead
34#SESSIONFILES=$(run-parts --list $SYSSESSIONDIR)
35
36SESSIONFILES=`ls -X $SYSSESSIONDIR`
37if [ -n "$SESSIONFILES" ]; then
38 for SESSIONFILE in $SESSIONFILES; do
39 # Test if script is executable first before sourcing it
40 if [ -x "$SYSSESSIONDIR/$SESSIONFILE" ]; then
41 . $SYSSESSIONDIR/$SESSIONFILE
42 fi
43 done
44fi
45
46exit 0
47
diff --git a/openembedded/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults b/openembedded/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults
deleted file mode 100644
index d3a284d8da..0000000000
--- a/openembedded/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults
+++ /dev/null
@@ -1,4 +0,0 @@
1#!/bin/sh
2if [ -e $HOME/.Xdefaults ]; then
3 xrdb -merge -nocpp < $HOME/.Xdefaults
4fi
diff --git a/openembedded/packages/x11/x11-common/etc/X11/collie.xmodmap b/openembedded/packages/x11/x11-common/etc/X11/collie.xmodmap
deleted file mode 100644
index 5c0b39dc88..0000000000
--- a/openembedded/packages/x11/x11-common/etc/X11/collie.xmodmap
+++ /dev/null
@@ -1,5 +0,0 @@
1keycode 96 = XF86Calendar
2keycode 97 = telephone
3keycode 48 = XF86Start
4keycode 98 = XF86Mail
5keycode 117 = XF86PowerDown
diff --git a/openembedded/packages/x11/x11-common/etc/X11/h2200.xmodmap b/openembedded/packages/x11/x11-common/etc/X11/h2200.xmodmap
deleted file mode 100644
index 736766efd7..0000000000
--- a/openembedded/packages/x11/x11-common/etc/X11/h2200.xmodmap
+++ /dev/null
@@ -1,5 +0,0 @@
1keycode 75 = XF86Calendar
2keycode 76 = telephone
3keycode 77 = XF86Mail
4keycode 78 = XF86Start
5keycode 124 = XF86PowerDown
diff --git a/openembedded/packages/x11/x11-common/etc/X11/shepherd.xmodmap b/openembedded/packages/x11/x11-common/etc/X11/shepherd.xmodmap
deleted file mode 100644
index 0a03b4f426..0000000000
--- a/openembedded/packages/x11/x11-common/etc/X11/shepherd.xmodmap
+++ /dev/null
@@ -1,49 +0,0 @@
1keycode 38 = Mode_switch
2keycode 31 = w W caret
3keycode 13 = e E equal
4keycode 26 = r R plus
5keycode 28 = t T bracketleft
6keycode 33 = y y bracketright
7keycode 29 = u U braceleft
8keycode 17 = i I braceright
9!keycode 73 = Tab Tab Caps_Lock
10keycode 12 = d D periodcentered
11keycode 14 = f F backslash
12keycode 15 = g G semicolon
13keycode 16 = h H colon
14keycode 18 = j J asterisk
15keycode 19 = k K currency
16keycode 20 = l L bar
17keycode 10 = b B underscore
18keycode 66 = minus minus at
19keycode 71 = comma slash less
20keycode 72 = period question greater
21
22! Side keys
23keycode 134 = Down
24keycode 133 = Up
25keycode 131 = Return
26keycode 132 = Escape
27
28!Special keys
29!keycode 96 = XF86Calendar
30!keycode 97 = telephone
31!keycode 98 = XF86Mail
32!keycode 48 = XF86HomePage
33!keycode 37 = XF86Start
34
35clear Shift
36clear Lock
37clear Control
38clear Mod1
39clear Mod2
40clear Mod3
41clear Mod4
42clear Mod5
43
44add Shift = Shift_L Shift_R
45!add Lock = Caps_Lock
46add Control = Control_L Control_R
47add Mod1 = Alt_L Alt_R
48add Mod2 = Mode_switch
49
diff --git a/openembedded/packages/x11/x11-common/etc/X11/simpad.xmodmap b/openembedded/packages/x11/x11-common/etc/X11/simpad.xmodmap
deleted file mode 100644
index d8b73b207f..0000000000
--- a/openembedded/packages/x11/x11-common/etc/X11/simpad.xmodmap
+++ /dev/null
@@ -1,2 +0,0 @@
1keycode 102 = XF86PowerDown
2
diff --git a/openembedded/packages/x11/x11-common_0.1.bb b/openembedded/packages/x11/x11-common_0.1.bb
deleted file mode 100644
index 707c766555..0000000000
--- a/openembedded/packages/x11/x11-common_0.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1DESCRIPTION = "Common X11 scripts"
2LICENSE = "GPL"
3SECTION = "x11"
4DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
5RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
6PR = "r0"
7
8SRC_URI = "file://etc"
9S = ${WORKDIR}
10
11do_install() {
12 cp -R ${S}/etc ${D}/etc
13 chmod -R 755 ${D}/etc
14} \ No newline at end of file