X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gui;h=42975647e6900bb67c900c8108cc9925e4022739;hb=HEAD;hp=2e8b40feb35b10aaba383375aedabea844443d89;hpb=a83461ac7e653a1caece11dba3f16c6db6fe8509;p=gsu.git

diff --git a/gui b/gui
index 2e8b40f..fbcbb01 100644
--- a/gui
+++ b/gui
@@ -4,7 +4,7 @@
 
 if [[ "$(type -t _gsu_setup)" != "function" ]]; then
 	gsu_dir=${gsu_dir:-${BASH_SOURCE[0]%/*}}
-	. $gsu_dir/common || exit 1
+	. "$gsu_dir/common" || exit 1
 	_gsu_setup
 fi
 
@@ -20,7 +20,7 @@ _get_geometry()
 	fi
 	x="${result#* }"
 	y="${result%% *}"
-	(($x > 190)) && x=190
+	((x > 190)) && x=190
 	result="$y $x"
 }
 
@@ -30,7 +30,7 @@ _set_dialog_ret()
 
 	case "$ec" in
 	0) ret=$GSU_SUCCESS;;
-	1) ret=1;; # cancelled
+	1|255) ret=1;; # cancelled
 	*)
 		result="dialog exit code $ec"
 		ret=-$E_GSU_DIALOG
@@ -85,7 +85,7 @@ gsu_msgbox()
 	# Some versions of dialog segfault if the text is too long. Hence we
 	# always use a temporary file.
 	gsu_make_tempfile 'gsu_msgbox.XXXXXXXXXX'
-	(($ret < 0)) && return
+	((ret < 0)) && return
 	tmp="$result"
 	trap "rm -f $tmp" EXIT
 	echo "$1" > "$tmp"
@@ -95,17 +95,15 @@ gsu_msgbox()
 
 _gsu_menu()
 {
-	local header="${1:-root}"
-	local items="$2"
-	local i opts num=0
+	local header=${1:-root} dflt_item=$2 items=$3
+	local geom
 
 	_get_geometry
-	opts="$result 16"
-	for i in $items; do
-		let num++
-		opts+=" $i $num"
-	done
-	result="$(dialog --menu "$gsu_banner_txt ($header)" $opts 3>&1 1>&2 2>&3 3>&-)"
+	geom=$result
+	result="$(dialog --no-lines --no-items \
+		--default-item "$dflt_item" \
+		--menu "$gsu_banner_txt ($header)"  \
+		$geom 16 $items 3>&1 1>&2 2>&3 3>&-)"
 	_set_dialog_ret $?
 }
 
@@ -132,7 +130,7 @@ _get_subtree()
 	#echo "line: $line_num, root: $root, indent level: $level"
 	result="$(sed -e "1,${line_num}d;" <<< "$tree" \
 		| sed -e "/^$TAB\{1,$level\}$_gsu_node_name_pattern/,\$d" \
-		| sed -e "/^$TAB\{$(($level + 2))\}/d")"
+		| sed -e "/^$TAB\{$((level + 2))\}/d")"
 	if (($? != 0)); then
 		ret=-$E_GSU_MENU_TREE
 		result="sed command for subtree $root failed"
@@ -156,20 +154,22 @@ _get_root_nodes()
 
 _browse()
 {
-	local header="$1" old_header
-	local tree="$2" subtree="$3"
+	local header=$1 tree=$2
+	local -a subtree=($3)
+	local old_header dflt_item=${subtree[0]}
 
 	while :; do
-		_gsu_menu "$header" "$subtree"
-		(($ret < 0)) && return
+		_gsu_menu "$header" "$dflt_item" "${subtree[*]}"
+		((ret < 0)) && return
+		dflt_item=$result
 		[[ -z "$result" ]] && return # menu was cancelled
 		if [[ "${result%/}" != "$result" ]]; then
 			old_header="$header"
 			header="$result"
 			_get_subtree "$tree" "$header"
-			(($ret < 0)) && return
+			((ret < 0)) && return
 			_browse "$header" "$tree" "$result"
-			(($ret < 0)) && return
+			((ret < 0)) && return
 			header="$old_header"
 			continue
 		fi