Adding support for parameterized settings.

Author: Chad Juliano

src/biw-main.sh

@@ -14,6 +14,11 @@
 set -o nounset
 
 source ${BIW_HOME}/biw-util.sh
+source ${BIW_HOME}/biw-term-sgr.sh
+source ${BIW_HOME}/biw-term-csi.sh
+source ${BIW_HOME}/biw-theme-mgr.sh
+source ${BIW_HOME}/biw-term-utf8.sh
+source ${BIW_HOME}/biw-panel-hmenu.sh
 source ${BIW_HOME}/biw-panel-vmenu.sh
 source ${BIW_HOME}/biw-panel-credits.sh
 
@@ -52,8 +57,7 @@ function fn_biw_main()
 
     fn_hmenu_init _hmenu_values[@]
 
-    # init the theme
-    fn_theme_set_idx_active $theme_saved_idx
+    fn_theme_init
 
     # show the widgets
     fn_biw_show
@@ -66,6 +70,7 @@ function fn_biw_show()
 {
     local -r _history_cmd="fc -lnr -$BIW_LIST_MAX"
 
+
     fn_utl_panel_open
 
     while [ 1 ]

src/biw-theme-mgr.sh

@@ -45,8 +45,6 @@ declare -ri THEME_SET_DEF_ACTIVE=30
 declare -ri THEME_SET_SLI_INACTIVE=40
 declare -ri THEME_SET_SLI_ACTIVE=50
 
-# file for persisting theme
-declare -r BIW_SETTINGS_FILE=$HOME/.biw_settings
 
 # initialize the default theme
 declare -i theme_active_idx=-1
@@ -60,31 +58,39 @@ declare -i theme_saved_idx=-1
 # reference of theme names
 declare -a theme_name_list
 
+# settings param name
+declare -r theme_param_name='theme-name'
+
 fn_theme_init()
 {
     fn_theme_set_desc_list
 
     if [ ! -r $BIW_SETTINGS_FILE ]
     then
         # nothing to load so set default
-        fn_theme_set_idx_active -1
+        fn_theme_set_idx_active 0
         return
     fi
 
-    local _saved_name=$(cat $BIW_SETTINGS_FILE)
-
+    local _saved_name
+    fn_settings_get_param '_saved_name' $theme_param_name
     fn_theme_idx_from_name $_saved_name
     theme_saved_idx=$?
+
+    # init the theme
+    fn_theme_set_idx_active $theme_saved_idx
+}
+
+function fn_theme_save()
+{
+    theme_saved_idx=$theme_active_idx
+    local _saved_theme=${THEME_LIST[$theme_saved_idx]}
+    fn_settings_set_param $theme_param_name $_saved_theme
 }
 
 function fn_theme_set_idx_active()
 {
     local -i _selected_idx=$1
-    if ((_selected_idx == -1))
-    then
-        # use the default
-        _selected_idx=0
-    fi
 
     if((_selected_idx == theme_active_idx))
     then
@@ -178,13 +184,6 @@ function fn_theme_parse_color()
     printf -v $_result_ref '%d' $_color_result
 }
 
-fn_theme_save()
-{
-    theme_saved_idx=$theme_active_idx
-    local _saved_theme=${THEME_LIST[$theme_saved_idx]}
-    echo ${_saved_theme} > $BIW_SETTINGS_FILE
-}
-
 fn_theme_idx_from_name()
 {
     local -r _theme_name=$1
@@ -290,6 +289,3 @@ function fn_theme_set_color()
         fn_sgr_color16_set $_mode $_theme_color
     fi
 }
-
-# always init theme
-fn_theme_init

src/biw-util.sh

@@ -10,11 +10,6 @@
 # Description:  Controller functions for vmenu panels
 ##
 
-source ${BIW_HOME}/biw-term-sgr.sh
-source ${BIW_HOME}/biw-term-csi.sh
-source ${BIW_HOME}/biw-theme-mgr.sh
-source ${BIW_HOME}/biw-term-utf8.sh
-source ${BIW_HOME}/biw-panel-hmenu.sh
 
 # global widget params
 declare -ri BIW_MARGIN=10
@@ -32,6 +27,10 @@ declare UTL_DEBUG_MSG=''
 
 declare -r UTL_OC_ANIMATE_DELAY=0.01
 
+# file for persisting theme
+declare -r BIW_SETTINGS_FILE=$HOME/.biw_settings
+declare -A biw_settings_params
+
 function fn_utl_set_cursor_pos()
 {
     local -i _abs_row=$1
@@ -167,6 +166,65 @@ function fn_utl_panel_close()
     trap - EXIT
 }
 
+function fn_settings_get_param()
+{
+    local _param_ref=$1
+    local _param_name=$2
+
+    fn_settings_load
+    local _param_val=${biw_settings_params[$_param_name]:-}
+    printf -v $_param_ref '%s' "$_param_val"
+}
+
+function fn_settings_set_param()
+{
+    local _param_name=$1
+    local _param_val=$2
+
+    biw_settings_params[$_param_name]="$_param_val"
+    fn_settings_save
+}
+
+function fn_settings_load()
+{
+    biw_settings_params=()
+
+    if [ ! -r $BIW_SETTINGS_FILE ]
+    then
+        # nothing to do
+        return 0
+    fi
+
+    local _line
+    while read -r _line
+    do
+        _key="${_line%%=*}"
+        _value=${_line##*=}
+
+        if [ -z "$_key" ] || [ -z "$_value" ]
+        then
+            # skip this because we did not get a complete 
+            # key/val pair
+            continue
+        fi
+
+        biw_settings_params[$_key]="$_value"
+
+    done < $BIW_SETTINGS_FILE
+}
+
+function fn_settings_save()
+{
+    local _key
+    local _value
+
+    for _key in "${!biw_settings_params[@]}"
+    do
+        _value="${biw_settings_params[$_key]}"
+        printf '%s=%s\n' $_key "$_value"
+    done > $BIW_SETTINGS_FILE
+}
+
 function fn_utl_die()
 {
     local _err_msg=$1