[PATCH] Allowing another (more user-friendly) window manager than the default zhone-only user interface.

Steffen Moeller steffen_moeller at gmx.de
Thu Feb 12 23:27:58 UTC 2009


---
 install.sh |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 7d9e0fb..d6fceb5 100755
--- a/install.sh
+++ b/install.sh
@@ -47,6 +47,7 @@ FSO_DEVICE=${FSO_DEVICE:-gta02}
 QI=${QI:-false}
 QI_VERBOSE_BOOT=${QI_VERBOSE_BOOT:-false}
 SINGLE_PART=${SINGLE_PART:-$QI}
+WINDOW_MANAGER=${WINDOW_MANAGER:-zhone}
 
 ### sanity check until the GTA01 installer will be merged
 if [ "${FSO_DEVICE}" != gta02 ]; then
@@ -174,6 +175,9 @@ Variables:
                    do this only when QI=true (default to false)
   SINGLE_PART      set this to true if only one partition should be created
                    this is true by default for QI=true and false if SD_PART1_FS=vfat
+  WINDOW_MANAGER   the presentation of the phone to the user. The default is
+                   to just use the 'zhone' (phone) application. Alternatively,
+                   'fbpanel' is a tiny but usable window manager.
 
 
 Stages:
@@ -672,14 +676,37 @@ if [ -f "$WPA_SUPPLICANT_CONF" ]; then
 fi
 
 echo " * Installing /root/.xsession"
-cat > $INST_DIR/root/.xsession <<__END__
+case $WINDOW_MANAGER in
+fbpanel) 
+	# from http://wiki.openmoko.org/wiki/Debian#Matchbox_with_fbpanel
+	apt-get -yes install fbpanel
+	cat > $INST_DIR/root/.xsession <<__END__
+#!/bin/sh
+export GTK_MODULES=libgtkstylus.so
+zhone &
+xsetroot -solid black
+matchbox-keyboard-toggle &
+matchbox-window-manager -use_titlebar yes &
+# -use_titlebar yes to minimize & toggle between apps
+# fbpanel's taskbar does not work with matchbox-window-manager
+#~/bin/auxlaunch &
+while true;
+do
+fbpanel;
+sleep 1;
+done;
+__END__
+	
+*)
+	cat > $INST_DIR/root/.xsession <<__END__
 #!/bin/sh
 trayer --edge top &
 openmoko-panel-plugin &
 zhone &
 exec matchbox-window-manager -use_titlebar no -use_cursor no
 __END__
-
+	;;
+esac
 
 echo "I: System configured"
 ;;
-- 
1.5.6.5


--------------030702030608070701010707
Content-Type: text/x-diff;
 name="0004-Added-formatting-of-vfat-systems-prepared-swap-part.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename*0="0004-Added-formatting-of-vfat-systems-prepared-swap-part.pat";
 filename*1="ch"



More information about the pkg-fso-maint mailing list