spring panel restoration

bin/bin/music

@@ -39,7 +39,6 @@ shuffle() {
 
 append() {
   echo append "$*"
-  echo "custom" > "$musicdir/playlist/current"
   mpc listall | grep -i "$*" | mpc add
 }
 

templates/juicer

@@ -11,7 +11,6 @@ fonts = "{{p_font_main}}"
         "font-linux-10"
 class = "{{p_window_class}}"
 offset = {{p_offset}}
-delimiter= "{{p_delimiter}}"
 
 ; guesstimate 3 clickables per section
-clickables = {{`echo "3 * $(echo $lemons | wc -w)" | bc`}}
+clickables = {{`echo "3 * $(echo $lemons | wc -w)" | bc`}}

wm/.wm/panel/tools/lemonade

@@ -180,14 +180,15 @@ juicedLemons="$(sed 's/:/ /g;s/|/ /g;' <<< $bar_format)"
         [bg]="${bar_bg}"
         [overline]=false
         [underline]=false
+	[delimiter]=""
         [line]=\#ff999999
         [activeline]=\#ffffffff
         [reload]=5)
     for name in $juicedLemons; do
         for section in "${!choices[@]}"; do
             if [[ $(get_conf \#${name}_${section}) -eq 0 ]]; then
                 #echo "No value for '${name}-$section' -> using ${choices[${section}]}"
-                eval "${name}_${section}=${choices[${section}]}"
+                eval "${name}_${section}=\"${choices[${section}]}\""
             fi
         done
     done
@@ -205,10 +206,10 @@ if [ ! -z "$pos_start" ]; then
     # todo: make this a bar property
     pos_start="%{${pos_start}U#ffffffff}"
     pos_end="%{-o}%{-uU-}"
-    bar_delimiter="${pos_start}${bar_delimiter}${pos_end}"
+    bar_delimiter="${pos_start}${pos_end}"
     position="%{l}$(echo $bar_format | sed "s/|/${pos_start}%{c}${pos_end}/; s/|/${pos_start}%{r}${pos_end}/; s/:/$bar_delimiter/g;")"
 else
-    position="%{l}$(echo $bar_format | sed "s/|/%{c}/;s/|/%{r}/;s/:/$bar_delimiter/g;")"
+    position="%{l}$(echo $bar_format | sed "s/|/%{c}/;s/|/%{r}/;s/://g;")"
 fi
 
 # build the panel switch
@@ -286,7 +287,11 @@ process_line() {
                                     "$(get_conf area[${name}_s])" \
                                   "%{F-}%{B-}" \
                                   "%{-o}%{-uU-}")"
-        fi
+
+	    if $hold; then
+		bar_message="${bar_message}$(printf "%s" "$(get_conf ${name}_delimiter)")"
+	    fi
+	fi
     fi
 
     if ! $hold; then
@@ -343,8 +348,7 @@ get_geometry() {
     gapped=$(iif "[ ! $(bspc config window_gap) -le 0 ]")
     p_gap=$(iif $gapped $p_gap 0)
     top=$(iif "[ "$p_position" = "top" ]")
-
-	  echo "$(( $(dim width)-(p_gap*2) ))x$p_height+$(( $(dim x)+p_gap ))+$(iif $top $p_gap $(($(dim height)-(p_gap+p_height))) )"
+    echo "$(( $(dim width)-(p_gap*2) ))x$p_height+$(( $(dim x)+p_gap ))+$(iif $top $p_gap $(($(dim height)-(p_gap+p_height))) )"
 }
 
 # Start lemonade

wm/.wm/scripts/theming/defaults

@@ -48,7 +48,6 @@ p_desktop_show_free=true          # option to show nothing for free desktops.
 p_desktop_mode_toggle=false       # monocle/tiling toggle.
 p_desktop_only_active=false       # only show the active desktop name
 p_title_show_mode=monocle         # used by title.
-p_delimiter=""                    # delimiter between lemons
 
 # Panel colors
 p_bg_normal="#ff$background"

wm/.wm/scripts/theming/ripen

@@ -133,5 +133,7 @@ default_function activefg '
 default_function bg 'vanilla bg'
 default_function activebg 'vanilla activebg'
 default_function stepSetup 'separateStep'
+default_function suffix 'vanilla suffix'
+default_function prefix 'vanilla prefix'
 
 stepSetup

wm/.wm/themes/spring

@@ -14,7 +14,7 @@ b_window_gap=16
 p_height=24
 p_gap=0
 p_line="5"
-p_padding=2
+p_padding=8
 p_font_main="Droid Sans-10:style=Bold"
 p_window_class="noshadow"
 p_delimiter="   "
@@ -35,6 +35,8 @@ GTK_FONT="Droid Sans 10"
 
 # Make the workspaces be in the middle.
 p_format="dropdown:title|desktop|mpd:clock"
+c_frame_opacity="0.4"
+p_icon_handler="env printf \"\$icon_result  \""
 
 p_desktop_theme=$(cat<<EOF
 bg="#00000000"
@@ -43,5 +45,6 @@ overline=true
 activeoverline=true
 line=$p_bg_inactive
 activeline=$p_bg_active
+delimiter="   "
 EOF
 )