hlfw.ca

hwwm

Download patch

ref: a341767bcde902f2d7200b08ffdf83c38a6b73e0
parent: 0d28fb5aa0457475e252f5f656ba5f8a43fb70e5
author: Halfwit <michaelmisch1985@gmail.com>
date: Wed Dec 5 19:07:58 PST 2018

Sweeping changes based on broken assumptions from Linuxland

Signed-off-by: Halfwit <michaelmisch1985@gmail.com>

--- a/fullscreen
+++ b/fullscreen
@@ -4,8 +4,9 @@
 # toggle the fullscreen state of a window
 # depends on: focus.sh
 
-
-if watom `lsw -r` FS | xargs -n 5 wtp; then
+FS=$(xprop -root | awk '/FS/{print $3, $4, $5, $6, $7}' | sed 's/\"//g')
+if test ${#FS} -gt 0; then
+	wtp "$FS"
 	xprop -root -remove FS
 	/usr/local/share/hwwm/wshuf
 else
--- a/gitbar
+++ b/gitbar
@@ -3,10 +3,9 @@
 GITBAR="$XDG_RUNTIME_DIR/statusbar/git"
 
 append() {
-	case "$1" in
-		0) 							   ;;
-		[0-9]*) printf '%s\n' "$1$2" ;;
-	esac
+	count="$(echo "$1" | tr -d "[[:space:]]")" 
+	test "$count" -eq 0 && return 
+	printf '%s\n' "$count$2"
 }
 
 stringify() {
--- a/hwwm
+++ b/hwwm
@@ -1,12 +1,12 @@
 #!/bin/sh
+
 DIR=/usr/local/share/hwwm
-BACKGROUND="$XDG_CONFIG_HOME"/x11/background.png
 
 # Update the database
 xrdb -merge "$XDG_CONFIG_HOME"/x11/Xresources
 
 # Set background image
-hsetroot -center "$BACKGROUND" -tint "$(xrdb -query | awk '/desktop/{print $NF}')"
+hsetroot -solid $(xrdb -query | awk '/desktop/{print $NF}')
 
 # Key watcher
 sxhkd -m -1 &
@@ -16,14 +16,15 @@
 inotifybar &
 
 # Colors
-highlight="$(xrdb -query | awk '/desktop/{print $NF}' | sed 's/#//')"
-normal="$(xrdb -query | awk '/color8/{print $NF}' | sed 's/#//')"
+highlight="$(xrdb -query | awk '/color12/{print $NF}' | sed 's/#//')"
 
+normal="$(xrdb -query | awk '/color4/{print $NF}' | sed 's/#//')"
+
 FOCUS_MASK=2097152
 wew -m $FOCUS_MASK | while read -r ev; do
 	wid=`echo "$ev" | sed 's/.*://'`
-	# Short circuit on lemonbar
-	test "$(wname $wid)" = "bar" && continue 
+	# Short circuit on statusbar, some other types
+	xprop -id $wid | grep -q -e TRANSIENT -e TYPE_MENU -e TYPE_DOCK -e drawterm && continue
 	fullscreen="$(watom `lsw -r` FS 2>/dev/null)"
 	case "$ev" in
 	# Focus in
--- a/inotifybar
+++ b/inotifybar
@@ -23,8 +23,8 @@
 
 
 	# This will fail unless you have something set for *desktop in your Xresources!
-	background="$(xrdb -query | awk '/background/{print $NF}')"
-	foreground="$(xrdb -query | awk '/desktop/{print $NF}')"
+	background="$(xrdb -query | awk '/desktop/{print $NF}')"
+	foreground="$(xrdb -query | awk '/foreground/{print $NF}')"
 	inotifywait -qme close_write --format %f "$statusdir" | while read -r file; do
 		if read -r -- "$file" < "$statusdir/$file"; then
 			printf -- ' %s %s %%{c} %s %%{r} %s%s%s \n' "$time" "$batt" "$groups" "$rss" "$git" "$media"