From 3fd564903af6b1a2c788e611a27f75870f28cc77 Mon Sep 17 00:00:00 2001 From: mirko Date: Mon, 4 May 2009 13:04:57 +0000 Subject: [PATCH] clean up a bit and use plain xorg.conf-files as long as the uci x11 parser is not finished git-svn-id: svn://svn.openwrt.org/openwrt/packages@15584 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Xorg/xorg/xserver/xorg-server/Makefile | 15 ++++--- .../files/{config => config.uci}/generic | 0 .../xorg-server/files/{config => config.uci}/olpc | 0 .../files/{config => config.uci}/om_gta02 | 0 .../files/{tmp/xorg.conf => config.xorg/generic} | 45 ++++--------------- .../files/{tmp/xorg-olpc.conf => config.xorg/olpc} | 0 .../xserver/xorg-server/files/config.xorg/om_gta02 | 34 ++++++++++++++ .../xorg-server/files/tmp/xorg-om_gta02.conf | 0 Xorg/xorg/xserver/xorg-server/files/x.init | 52 +++++++++++----------- 9 files changed, 78 insertions(+), 68 deletions(-) rename Xorg/xorg/xserver/xorg-server/files/{config => config.uci}/generic (100%) rename Xorg/xorg/xserver/xorg-server/files/{config => config.uci}/olpc (100%) rename Xorg/xorg/xserver/xorg-server/files/{config => config.uci}/om_gta02 (100%) rename Xorg/xorg/xserver/xorg-server/files/{tmp/xorg.conf => config.xorg/generic} (56%) rename Xorg/xorg/xserver/xorg-server/files/{tmp/xorg-olpc.conf => config.xorg/olpc} (100%) create mode 100644 Xorg/xorg/xserver/xorg-server/files/config.xorg/om_gta02 delete mode 100644 Xorg/xorg/xserver/xorg-server/files/tmp/xorg-om_gta02.conf diff --git a/Xorg/xorg/xserver/xorg-server/Makefile b/Xorg/xorg/xserver/xorg-server/Makefile index f9b43bd2b..c90457477 100644 --- a/Xorg/xorg/xserver/xorg-server/Makefile +++ b/Xorg/xorg/xserver/xorg-server/Makefile @@ -111,15 +111,20 @@ define Build/Configure endef define Package/xserver-common/install - $(INSTALL_DIR) $(1)/etc/{init.d,config} + $(INSTALL_DIR) $(1)/etc/{init.d,config,X11} $(INSTALL_BIN) \ ./files/x.init \ $(1)/etc/init.d/x11 - $(if $(X_CONFIG), \ + $(INSTALL_DATA) ./files/tmp/x11.uci \ + $(1)/etc/config/x11 + test -f ./files/config.xorg/$(X_CONFIG) && \ $(INSTALL_DATA) \ - ./files/config/$(X_CONFIG) \ - $(1)/etc/config/x11 \ - ) + ./files/config.xorg/$(X_CONFIG) \ + $(1)/etc/X11/xorg.conf +# test -f ./files/config.uci/$(X_CONFIG) && \ +# $(INSTALL_DATA) \ +# ./files/config.uci/$(X_CONFIG) \ +# $(1)/etc/config/x11 endef define Package/xserver-xorg/install diff --git a/Xorg/xorg/xserver/xorg-server/files/config/generic b/Xorg/xorg/xserver/xorg-server/files/config.uci/generic similarity index 100% rename from Xorg/xorg/xserver/xorg-server/files/config/generic rename to Xorg/xorg/xserver/xorg-server/files/config.uci/generic diff --git a/Xorg/xorg/xserver/xorg-server/files/config/olpc b/Xorg/xorg/xserver/xorg-server/files/config.uci/olpc similarity index 100% rename from Xorg/xorg/xserver/xorg-server/files/config/olpc rename to Xorg/xorg/xserver/xorg-server/files/config.uci/olpc diff --git a/Xorg/xorg/xserver/xorg-server/files/config/om_gta02 b/Xorg/xorg/xserver/xorg-server/files/config.uci/om_gta02 similarity index 100% rename from Xorg/xorg/xserver/xorg-server/files/config/om_gta02 rename to Xorg/xorg/xserver/xorg-server/files/config.uci/om_gta02 diff --git a/Xorg/xorg/xserver/xorg-server/files/tmp/xorg.conf b/Xorg/xorg/xserver/xorg-server/files/config.xorg/generic similarity index 56% rename from Xorg/xorg/xserver/xorg-server/files/tmp/xorg.conf rename to Xorg/xorg/xserver/xorg-server/files/config.xorg/generic index ee0322853..d9db82f6f 100644 --- a/Xorg/xorg/xserver/xorg-server/files/tmp/xorg.conf +++ b/Xorg/xorg/xserver/xorg-server/files/config.xorg/generic @@ -4,13 +4,10 @@ Section "ServerLayout" Identifier "Default Layout" Screen 0 "Screen0" 0 0 InputDevice "Mouse0" "CorePointer" + InputDevice "Mouse1" "CorePointer" InputDevice "Keyboard0" "CoreKeyboard" EndSection -Section "Files" - FontPath "/usr/lib/X11/fonts/misc" -EndSection - Section "Module" Load "dbe" Load "extmod" @@ -24,19 +21,20 @@ EndSection Section "InputDevice" Identifier "Keyboard0" Driver "keyboard" - Option "XkbModel" "pc105" - Option "XkbLayout" "us" EndSection Section "InputDevice" Identifier "Mouse0" Driver "mouse" Option "Protocol" "PS/2" -# Option "Protocol" "IMPS/2" Option "Device" "/dev/psaux" -# Option "Device" "/dev/input/mice" - Option "ZAxisMapping" "4 5" - Option "Emulate3Buttons" "yes" +EndSection + +Section "InputDevice" + Identifier "Mouse1" + Driver "mouse" + Option "Protocol" "IMPS/2" + Option "Device" "/dev/input/mice" EndSection Section "Monitor" @@ -56,38 +54,11 @@ EndSection Section "Device" Identifier "FBDev" Driver "fbdev" - #Option "shadowfb" "off" - VideoRam 4096 EndSection Section "Screen" Identifier "Screen0" Device "Videocard0" Monitor "Monitor0" -# DefaultDepth 8 - DefaultDepth 16 -# DefaultDepth 24 - - SubSection "Display" - Depth 8 - Modes "1024x768" "800x600" "640x480" - EndSubsection - - SubSection "Display" - Depth 16 - Modes "1024x768" "800x600" "640x480" - EndSubsection - - SubSection "Display" - Depth 24 - FbBpp 32 - Modes "1024x768" "800x600" "640x480" - EndSubsection - -EndSection - -Section "DRI" - Group 0 - Mode 0666 EndSection diff --git a/Xorg/xorg/xserver/xorg-server/files/tmp/xorg-olpc.conf b/Xorg/xorg/xserver/xorg-server/files/config.xorg/olpc similarity index 100% rename from Xorg/xorg/xserver/xorg-server/files/tmp/xorg-olpc.conf rename to Xorg/xorg/xserver/xorg-server/files/config.xorg/olpc diff --git a/Xorg/xorg/xserver/xorg-server/files/config.xorg/om_gta02 b/Xorg/xorg/xserver/xorg-server/files/config.xorg/om_gta02 new file mode 100644 index 000000000..1e84135f7 --- /dev/null +++ b/Xorg/xorg/xserver/xorg-server/files/config.xorg/om_gta02 @@ -0,0 +1,34 @@ +# xorg configuration + +Section "ServerLayout" + Identifier "Default Layout" + Screen 0 "Screen0" 0 0 + InputDevice "Mouse0" "CorePointer" +EndSection + +Section "InputDevice" + Identifier "Mouse0" + Driver "tslib" + Option "Device" "/dev/event1" + Option "Width" "480" + Option "Height" "640" +EndSection + +Section "Monitor" + Identifier "Monitor0" + VendorName "Monitor Vendor" + ModelName "OWRT" + Option "dpms" +EndSection + +Section "Device" + Identifier "Videocard0" + Driver "glamo" +EndSection + +Section "Screen" + Identifier "Screen0" + Device "Videocard0" + Monitor "Monitor0" + DefaultDepth 16 +EndSection diff --git a/Xorg/xorg/xserver/xorg-server/files/tmp/xorg-om_gta02.conf b/Xorg/xorg/xserver/xorg-server/files/tmp/xorg-om_gta02.conf deleted file mode 100644 index e69de29bb..000000000 diff --git a/Xorg/xorg/xserver/xorg-server/files/x.init b/Xorg/xorg/xserver/xorg-server/files/x.init index 6571696e5..ac2e982d6 100755 --- a/Xorg/xorg/xserver/xorg-server/files/x.init +++ b/Xorg/xorg/xserver/xorg-server/files/x.init @@ -4,28 +4,28 @@ START=99 ARGS="" -screen() { - local cfg="$1" - config_get resolution $cfg resolution - config_get dpi $cfg dpi - [ -n "$resolution" ] && ARGS="$ARGS -screen $resolution" - [ -n "$dpi" ] && ARGS="$ARGS -dpi $dpi" -} - -graphic() { - local cfg="$1" - config_get device $cfg device - [ -n "$device" ] && ARGS="$ARGS -fb $device" -} - -input() { - local cfg="$1" - config_get device $cfg device - config_get driver $cfg driver - #[ -n "$device" ] || return 0 - [ -n "$driver" ] || return 0 - ARGS="$ARGS -$cfg $driver,,device=$device" -} +#screen() { +# local cfg="$1" +# config_get resolution $cfg resolution +# config_get dpi $cfg dpi +# [ -n "$resolution" ] && ARGS="$ARGS -screen $resolution" +# [ -n "$dpi" ] && ARGS="$ARGS -dpi $dpi" +#} +# +#graphic() { +# local cfg="$1" +# config_get device $cfg device +# [ -n "$device" ] && ARGS="$ARGS -fb $device" +#} +# +#input() { +# local cfg="$1" +# config_get device $cfg device +# config_get driver $cfg driver +# #[ -n "$device" ] || return 0 +# [ -n "$driver" ] || return 0 +# ARGS="$ARGS -$cfg $driver,,device=$device" +#} desktop() { local cfg="$1" @@ -38,14 +38,14 @@ desktop() { start() { export DISPLAY=":0" config_load x11 - config_foreach screen screen - config_foreach graphic graphic - config_foreach input input +# config_foreach screen screen +# config_foreach graphic graphic +# config_foreach input input Xorg $ARGS & sleep 1 # give the xserver some time get initialized config_foreach desktop desktop test -d /etc/xdg/autostart || exit - sleep 1 # give the first x11 application some time to get present - afterwars we'll start the x11 autostart applications + sleep 1 # give the first x11 application some time to get present - afterwards we'll start the x11 autostart applications for elem in `ls /etc/xdg/autostart/`; do if grep "^Hidden=true" "/etc/xdg/autostart/$elem" > /dev/null; then continue -- 2.11.0