aboutsummaryrefslogtreecommitdiffstats
path: root/.config/herbstluftwm
diff options
context:
space:
mode:
authorkatherine <shmibs@shmibbles.me>2016-03-19 22:17:28 -0700
committerkatherine <shmibs@shmibbles.me>2016-03-19 22:17:28 -0700
commite92af1f7088cc5b6b40a5ceba275a197c305de62 (patch)
tree5d92832f1ecdaff44ca61a15f3c3d11b49fb2d79 /.config/herbstluftwm
parentb351865a2b3678708d70c6e088c70ae8f7fd923f (diff)
downloaddotfiles-e92af1f7088cc5b6b40a5ceba275a197c305de62.tar.gz
snapshot
lots of random things changed; forgot to update for a while again. moving things to .config/init/funcs is one important thing; means being able to use those shell scripts anywhere, like ranger or whatever
Diffstat (limited to '.config/herbstluftwm')
-rwxr-xr-x.config/herbstluftwm/autostart6
-rwxr-xr-x.config/herbstluftwm/panel.sh29
2 files changed, 13 insertions, 22 deletions
diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart
index 890f9c4..021df77 100755
--- a/.config/herbstluftwm/autostart
+++ b/.config/herbstluftwm/autostart
@@ -2,10 +2,6 @@
source ~/.config/init/vars
-hc() {
- herbstclient "$@"
-}
-
# always start frames max (pt. 1)
hc set default_frame_layout 2
hc set_layout max
@@ -215,5 +211,5 @@ pkill dunst
dunst -lb $bg_normal -nb $bg_normal -cb $bg_focus \
-lf $fg_normal -nf $fg_normal -cf $fg_focus \
-frame_color $bg_focus -geom "0x3-4+$(($bheight + 4))" \
- -fn "$ttfont $ttfont_size,$jfont $jfont_size"
+ -fn "$mfont $mfont_size,$jfont $jfont_size"
diff --git a/.config/herbstluftwm/panel.sh b/.config/herbstluftwm/panel.sh
index 4b7c1a0..78f7d7b 100755
--- a/.config/herbstluftwm/panel.sh
+++ b/.config/herbstluftwm/panel.sh
@@ -4,7 +4,6 @@
# SETUP #
###########
-hc() { "${herbstclient_command[@]:-herbstclient}" "$@" ;}
monitor=${1:-0}
geometry=( $(herbstclient monitor_rect "$monitor") )
if [ -z "$geometry" ] ;then
@@ -67,9 +66,10 @@ update_taglist() {
-e '$d' \
-e 's/\(.*\)/\1 /' \
-e 's/:/ /' \
- -e "s/[#+\-%]\(.*\)/%{B${bg_focus} F${fg_focus}} \1%{B${bg_normal} F${fg_normal}}/" \
- -e "s/!\(.*\)/%{B${bg_urgent} F${fg_urgent}} \1%{B${bg_normal} F${fg_normal}}/" \
- -e "s/\.\(.*\)/%{B${bg_normal} F${light_black}} \1%{B${bg_normal} F${fg_normal}}/" \
+ -e "s/^[-%]\(.*\)/%{B${light_black} F${fg_normal}} \1%{B${bg_normal} F${fg_normal}}/" \
+ -e "s/^[#+]\(.*\)/%{B${bg_focus} F${fg_focus}} \1%{B${bg_normal} F${fg_normal}}/" \
+ -e "s/^!\(.*\)/%{B${bg_urgent} F${fg_urgent}} \1%{B${bg_normal} F${fg_normal}}/" \
+ -e "s/^\.\(.*\)/%{B${bg_normal} F${light_black}} \1%{B${bg_normal} F${fg_normal}}/" \
| tr -d '\n'
echo "$sep"
}
@@ -96,7 +96,13 @@ update_winlist() {
else
echo -n "%{B${bg_normal} F${fg_normal}} "
fi
- echo -n "${line[@]:3}" | sed -r 's/(.{40}).*/\1\.\.\./'
+ {
+ if [[ -z "${line[@]:3}" ]]; then
+ echo -n "(has no name)"
+ else
+ echo -n "${line[@]:3}"
+ fi
+ } | sed -r 's/(.{40})...*/\1\.\.\./'
echo -n " "
done
echo -n "%{B${bg_normal} F${fg_normal}}"
@@ -198,13 +204,9 @@ event_when() {
{
event_tick &
- echo -e "child\t$!"
event_stats &
- echo -e "child\t$!"
event_when &
- echo -e "child\t$!"
event_mpd &
- echo -e "child\t$!"
hc --idle
} 2> /dev/null | {
@@ -280,15 +282,8 @@ event_when() {
fields[2]=$(update_winlist)
;;
- # append children to kill list
- child)
- child[((${#child[@]}+1))]=event[1]
- ;;
-
quit_panel|reload)
- for id in ${child[@]}; do
- kill $id
- done
+ kill -- -$$
exit
;;