r4093 - developers/werner/bin

[werner at sita.openmoko.org]

Author: werner
Date: 2008-02-21 07:08:00 +0100 (Thu, 21 Feb 2008)
New Revision: 4093

Added:
   developers/werner/bin/layout4
Modified:
   developers/werner/bin/kern4
   developers/werner/bin/uboot4
Log:
Rearranged scripts to handle different screen sizes.



Modified: developers/werner/bin/kern4
===================================================================
--- developers/werner/bin/kern4	2008-02-21 05:54:23 UTC (rev 4092)
+++ developers/werner/bin/kern4	2008-02-21 06:08:00 UTC (rev 4093)
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 DIR=/home/moko/2624/linux-2.6.24
-FONT=6x10
 
 if [ "${PWD#/home/moko}" = "$PWD" ]; then
     cd $DIR
@@ -9,13 +8,15 @@
 
 sleep 2
 
-xterm -fn $FONT -geometry 80x40+23+165 -e bash-init \
+. layout4
+
+xterm -fn $FONT -geometry $X1 -e bash-init \
   'cat /home/moko/svn.openmoko.org/branches/src/target/kernel/2.6.24.x/scripts/build' &
-xterm -fn $FONT -geometry 80x40+23-20 &
-xterm -fn $FONT -geometry 80x48+551+3 &
-xterm -fn $FONT -geometry 80x50+552-4 &
-xterm -fn $FONT -geometry 80x40-93+114 -e bash-init \
+xterm -fn $FONT -geometry $X2 &
+xterm -fn $FONT -geometry $X3 &
+xterm -fn $FONT -geometry $X4 &
+xterm -fn $FONT -geometry $X5 -e bash-init \
   'cd /home/moko/svn.openmoko.org/branches/src/target/kernel/2.6.24.x/scripts' \
   'vi LOG' &
-xterm -fn $FONT -geometry 80x40-86-38 -e bash-init \
+xterm -fn $FONT -geometry $X6 -e bash-init \
   'cd /home/moko/svn.openmoko.org/branches/src/target/kernel/2.6.24.x/patches' &

Added: developers/werner/bin/layout4
===================================================================
--- developers/werner/bin/layout4	2008-02-21 05:54:23 UTC (rev 4092)
+++ developers/werner/bin/layout4	2008-02-21 06:08:00 UTC (rev 4093)
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# source this with
+# . layout4
+
+FONT=6x10
+
+RES="`xdpyinfo | awk '/dimensions:/{print $2}' | sed 1q`"
+case $RES in
+    1680x1050)
+	X1=80x40+23+165
+	X2=80x40+23-20
+	X3=80x48+551+3
+	X4=80x50+552-4 
+	X5=80x40-93+114
+	X6=80x40-86-38
+	;;
+    1600x1200)
+	X1=80x43+21+280
+	X2=80x41+23-10
+	X3=80x54+551+3
+	X4=80x58+552-4
+	X5=80x54-17+4
+	X6=80x58-17-5
+	;;
+    *)	;;
+esac


Property changes on: developers/werner/bin/layout4
___________________________________________________________________
Name: svn:executable
   + *

Modified: developers/werner/bin/uboot4
===================================================================
--- developers/werner/bin/uboot4	2008-02-21 05:54:23 UTC (rev 4092)
+++ developers/werner/bin/uboot4	2008-02-21 06:08:00 UTC (rev 4093)
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-DIR=/home/moko/fr/u-boot
-FONT=6x10
+DIR=/home/moko/2624/u-boot
 
 if [ "${PWD#/home/moko}" = "$PWD" ]; then
     cd $DIR
@@ -9,15 +8,17 @@
 
 sleep 2
 
-xterm -fn $FONT -geometry 80x40+23+165 -e bash-init \
+. layout4
+
+xterm -fn $FONT -geometry $X1 -e bash-init \
   'cat /home/moko/svn.openmoko.org/trunk/src/target/u-boot/scripts/build' &
-xterm -fn $FONT -geometry 80x40+23-20 -e bash-init \
+xterm -fn $FONT -geometry $X2 -e bash-init \
   '# make gta01bv4_config' \
   '# make gta02v3_config' &
-xterm -fn $FONT -geometry 80x48+551+3 &
-xterm -fn $FONT -geometry 80x50+552-4 &
-xterm -fn $FONT -geometry 80x40-93+114 -e bash-init \
+xterm -fn $FONT -geometry $X3 &
+xterm -fn $FONT -geometry $X4  &
+xterm -fn $FONT -geometry $X5 -e bash-init \
   'cd /home/moko/svn.openmoko.org/trunk/src/target/u-boot/scripts' \
   'vi LOG' &
-xterm -fn $FONT -geometry 80x40-86-38 -e bash-init \
+xterm -fn $FONT -geometry $X6 -e bash-init \
   'cd /home/moko/svn.openmoko.org/trunk/src/target/u-boot/patches' &