From daa3bfdbad351c26b5423637e9d0c3a85fe12960 Mon Sep 17 00:00:00 2001
From: Mike Lowis <mike.lowis@gentex.com>
Date: Thu, 23 Feb 2023 16:31:38 -0500
Subject: [PATCH] added libexec folders

---
 bin/fedit                    |   3 +
 bin/term                     |   3 +
 bin/view-telem               |  19 +++
 libexec/editor/E-S           |   2 +
 libexec/editor/S-E           |   2 +
 libexec/editor/c+            |   6 +
 libexec/editor/c-            |   6 +
 libexec/editor/fcomplete     |  17 ++
 libexec/editor/no-c++        |   2 +
 libexec/editor/pickfile      |  16 ++
 libexec/editor/picktag       |  54 ++++++
 libexec/editor/tofn          |   2 +
 libexec/editor/w+            |   2 +
 libexec/editor/x+            |   2 +
 libexec/winmgr/pickexec      |   6 +
 libexec/winmgr/start-session |   6 +
 libexec/winmgr/wprot         |   6 +
 rules.mk                     | 312 +++++++++++++++++------------------
 18 files changed, 310 insertions(+), 156 deletions(-)
 create mode 100755 bin/fedit
 create mode 100755 bin/term
 create mode 100755 bin/view-telem
 create mode 100755 libexec/editor/E-S
 create mode 100755 libexec/editor/S-E
 create mode 100755 libexec/editor/c+
 create mode 100755 libexec/editor/c-
 create mode 100755 libexec/editor/fcomplete
 create mode 100755 libexec/editor/no-c++
 create mode 100755 libexec/editor/pickfile
 create mode 100755 libexec/editor/picktag
 create mode 100755 libexec/editor/tofn
 create mode 100755 libexec/editor/w+
 create mode 100755 libexec/editor/x+
 create mode 100755 libexec/winmgr/pickexec
 create mode 100755 libexec/winmgr/start-session
 create mode 100755 libexec/winmgr/wprot

diff --git a/bin/fedit b/bin/fedit
new file mode 100755
index 0000000..1911716
--- /dev/null
+++ b/bin/fedit
@@ -0,0 +1,3 @@
+#!/bin/sh
+pattern="*$(printf "%s" "$1" | sed 's/./&*/g')"
+find . -type f -iname "$pattern" | pick | xargs -r edit
diff --git a/bin/term b/bin/term
new file mode 100755
index 0000000..6cebdcc
--- /dev/null
+++ b/bin/term
@@ -0,0 +1,3 @@
+#!/bin/sh
+export TERM=dumb
+tide -c "$SHELL -l"
\ No newline at end of file
diff --git a/bin/view-telem b/bin/view-telem
new file mode 100755
index 0000000..8e10c32
--- /dev/null
+++ b/bin/view-telem
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+FIFO="$HOME/tide-telem"
+
+quit(){
+    rm -f "$FIFO"
+    exit 0
+}
+
+# cleanup the fifo when the user says we're done
+trap quit INT
+
+# create the fifo if it doesnt exist
+[ ! -e "$FIFO" ] && mkfifo "$FIFO"
+
+# continually read contents from fifo
+while true; do
+    cat "$FIFO"
+done
diff --git a/libexec/editor/E-S b/libexec/editor/E-S
new file mode 100755
index 0000000..872235f
--- /dev/null
+++ b/libexec/editor/E-S
@@ -0,0 +1,2 @@
+#!/bin/sh
+sed 's/GNTX_EXTERN\|extern/static/g'
diff --git a/libexec/editor/S-E b/libexec/editor/S-E
new file mode 100755
index 0000000..94e333f
--- /dev/null
+++ b/libexec/editor/S-E
@@ -0,0 +1,2 @@
+#!/bin/sh
+sed 's/GNTX_STATIC\|static/extern/g'
diff --git a/libexec/editor/c+ b/libexec/editor/c+
new file mode 100755
index 0000000..aa10f58
--- /dev/null
+++ b/libexec/editor/c+
@@ -0,0 +1,6 @@
+#!/bin/sh
+case "$(lang "${file:-none}")" in
+    C|JavaScript)
+        sed 's/^/\/\//g' "$@" ;;
+    *) sed 's/^/#/g' "$@" ;;
+esac
diff --git a/libexec/editor/c- b/libexec/editor/c-
new file mode 100755
index 0000000..1353fc0
--- /dev/null
+++ b/libexec/editor/c-
@@ -0,0 +1,6 @@
+#!/bin/sh
+case "$(lang "${file:-none}")" in
+    C|JavaScript)
+        sed 's/^\/\///g' "$@" ;;
+    *) sed 's/^#//g' "$@" ;;
+esac
diff --git a/libexec/editor/fcomplete b/libexec/editor/fcomplete
new file mode 100755
index 0000000..2eb94e2
--- /dev/null
+++ b/libexec/editor/fcomplete
@@ -0,0 +1,17 @@
+#!/bin/sh
+orig="$1"
+path="${orig%/*}"
+file="${orig##*/}"
+[ "$path" = "$file" ] && path="."
+
+# pick the path
+pickpath="$(find "$path" -maxdepth 1 -path "$path/*$file*" | pick "$path/$file")"
+
+# Print the result
+if [ -z "$pickpath" ]; then
+    printf "%s" "$orig"
+elif [ -d "$pickpath" ]; then
+    printf "%s" "$pickpath/"
+else
+    printf "%s" "$pickpath"
+fi
diff --git a/libexec/editor/no-c++ b/libexec/editor/no-c++
new file mode 100755
index 0000000..b62db57
--- /dev/null
+++ b/libexec/editor/no-c++
@@ -0,0 +1,2 @@
+#!/bin/sh
+sed "s_//\(.*\)\$_/*\1 */_"
diff --git a/libexec/editor/pickfile b/libexec/editor/pickfile
new file mode 100755
index 0000000..f3017b6
--- /dev/null
+++ b/libexec/editor/pickfile
@@ -0,0 +1,16 @@
+#!/bin/sh
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 <dir>"
+    exit 1
+fi
+
+export PICKTITLE="Pick File ($PWD)"
+file="$(filelist "$1" \! \( \
+    -name '*.pdf' -o \
+    -name '*.png' -o \
+    -name '*.bin' -o \
+    -name '*.dbo' -o \
+    -name '*.cmdset' -o \
+    -name '*.o' \
+\) -not -path '*/\.*' | sed 's|^\./||' | pick)"
+[ "" != "$file" ] && edit "$file"
diff --git a/libexec/editor/picktag b/libexec/editor/picktag
new file mode 100755
index 0000000..378d65a
--- /dev/null
+++ b/libexec/editor/picktag
@@ -0,0 +1,54 @@
+#!/bin/sh
+ACTION="$1"
+TAGFILE="$2"
+TAG="$3"
+
+usage(){
+    echo "Usage: $0 ACTION TAGFILE [TAG]"
+    echo ""
+    echo "Actions:"
+    echo "    fetch - Print the filename and line number of the selcted tag"
+    echo "    print - Print the selected tag"
+    exit 1
+}
+
+if [ "" = "$TAGFILE" ] || [ "" = "$ACTION" ]; then
+    usage
+fi
+
+printtags(){
+    grep -v '^!' < "$TAGFILE" | cut -f1 | uniq
+}
+
+print(){
+    tag="$(printtags | pick "$TAG")"
+    [ "" = "$tag" ] && tag="$TAG"
+    printf "%s" "$tag"
+}
+
+fetch(){
+    if [ "" = "$TAG" ]; then
+        TAG=$(printtags | pick)
+        [ "" = "$TAG" ] && exit
+    fi
+    file=$(awk -v TAG="$TAG" '
+        BEGIN { FS = "[\t]+" }
+        ($1 == TAG) {
+            matchstr = $3
+            sub(/^\//, "\"", matchstr)
+            sub(/\$?\/;"$/, "\"", matchstr)
+            gsub(/\*/, "\\*", matchstr)
+            gsub(/\[/, "\\[", matchstr)
+            gsub(/\]/, "\\]", matchstr)
+           print "grep -Hn", matchstr, $2, "| cut -d: -f1,2"
+        }
+    ' "$TAGFILE" | /bin/sh | pick)
+    [ "" != "$file" ] && edit "$file"
+}
+
+export PICKTITLE="Pick CTag ($PWD)"
+case "$ACTION" in
+    "print") print ;;
+    "fetch") fetch ;;
+    *) usage ;;
+esac
diff --git a/libexec/editor/tofn b/libexec/editor/tofn
new file mode 100755
index 0000000..2eacda5
--- /dev/null
+++ b/libexec/editor/tofn
@@ -0,0 +1,2 @@
+#!/bin/sh
+sed 's/;\r\?$/\n{\n}\n/g'
diff --git a/libexec/editor/w+ b/libexec/editor/w+
new file mode 100755
index 0000000..2054a28
--- /dev/null
+++ b/libexec/editor/w+
@@ -0,0 +1,2 @@
+#!/bin/sh
+chmod +w "${file:?}"
\ No newline at end of file
diff --git a/libexec/editor/x+ b/libexec/editor/x+
new file mode 100755
index 0000000..d679c70
--- /dev/null
+++ b/libexec/editor/x+
@@ -0,0 +1,2 @@
+#!/bin/sh
+chmod +x "${file:?}"
\ No newline at end of file
diff --git a/libexec/winmgr/pickexec b/libexec/winmgr/pickexec
new file mode 100755
index 0000000..2bebba7
--- /dev/null
+++ b/libexec/winmgr/pickexec
@@ -0,0 +1,6 @@
+#!/bin/sh
+IFS=:
+bin="$(for p in $PATH; do
+  printf "%s\n" "$p"/*
+done | pick)"
+[ "" != "$bin" ] && "$bin"
diff --git a/libexec/winmgr/start-session b/libexec/winmgr/start-session
new file mode 100755
index 0000000..b9812c6
--- /dev/null
+++ b/libexec/winmgr/start-session
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ -f "$HOME/lib/anvilrc" ]; then
+    . "$HOME/lib/anvilrc"
+fi
+
+exec anvil
diff --git a/libexec/winmgr/wprot b/libexec/winmgr/wprot
new file mode 100755
index 0000000..deaa7fd
--- /dev/null
+++ b/libexec/winmgr/wprot
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+while [ 1 ]; do
+    feh -z --bg-fill ~/wallpapers/*
+    sleep 60
+done
diff --git a/rules.mk b/rules.mk
index db6ed8e..5b72a05 100644
--- a/rules.mk
+++ b/rules.mk
@@ -5,46 +5,6 @@ $(OUTDIR)/lib/libMBus.c.a: $(OUTDIR)/obj/lib/MBus.o
 $(OUTDIR)/lib/libMBus.c.a:
 	$(ARCHIVE)
 libs: $(OUTDIR)/lib/libMBus.c.a
-$(OUTDIR)/obj/lib/a/Options.o: lib/a/Options.c config.mk
-	$(OBJECT)
-$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/Options.o
--include $(OUTDIR)/obj/lib/a/Options.d
-$(OUTDIR)/obj/lib/a/UTF8.o: lib/a/UTF8.c config.mk
-	$(OBJECT)
-$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/UTF8.o
--include $(OUTDIR)/obj/lib/a/UTF8.d
-$(OUTDIR)/obj/lib/a/defaults/options.o: lib/a/defaults/options.c config.mk
-	$(OBJECT)
-$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/defaults/options.o
--include $(OUTDIR)/obj/lib/a/defaults/options.d
-$(OUTDIR)/obj/lib/a/defaults/usage.o: lib/a/defaults/usage.c config.mk
-	$(OBJECT)
-$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/defaults/usage.o
--include $(OUTDIR)/obj/lib/a/defaults/usage.d
-$(OUTDIR)/obj/lib/a/defaults/set_option.o: lib/a/defaults/set_option.c config.mk
-	$(OBJECT)
-$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/defaults/set_option.o
--include $(OUTDIR)/obj/lib/a/defaults/set_option.d
-$(OUTDIR)/obj/lib/a/defaults/argv0.o: lib/a/defaults/argv0.c config.mk
-	$(OBJECT)
-$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/defaults/argv0.o
--include $(OUTDIR)/obj/lib/a/defaults/argv0.d
-$(OUTDIR)/obj/lib/a/Mutex.o: lib/a/Mutex.c config.mk
-	$(OBJECT)
-$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/Mutex.o
--include $(OUTDIR)/obj/lib/a/Mutex.d
-$(OUTDIR)/obj/lib/a/Thread.o: lib/a/Thread.c config.mk
-	$(OBJECT)
-$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/Thread.o
--include $(OUTDIR)/obj/lib/a/Thread.d
-$(OUTDIR)/obj/lib/a/Net.o: lib/a/Net.c config.mk
-	$(OBJECT)
-$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/Net.o
--include $(OUTDIR)/obj/lib/a/Net.d
-$(OUTDIR)/obj/lib/a/stdlib/esignal.o: lib/a/stdlib/esignal.c config.mk
-	$(OBJECT)
-$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/esignal.o
--include $(OUTDIR)/obj/lib/a/stdlib/esignal.d
 $(OUTDIR)/obj/lib/a/stdlib/emalloc.o: lib/a/stdlib/emalloc.c config.mk
 	$(OBJECT)
 $(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/emalloc.o
@@ -53,34 +13,22 @@ $(OUTDIR)/obj/lib/a/stdlib/warn.o: lib/a/stdlib/warn.c config.mk
 	$(OBJECT)
 $(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/warn.o
 -include $(OUTDIR)/obj/lib/a/stdlib/warn.d
-$(OUTDIR)/obj/lib/a/stdlib/estrdup.o: lib/a/stdlib/estrdup.c config.mk
-	$(OBJECT)
-$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/estrdup.o
--include $(OUTDIR)/obj/lib/a/stdlib/estrdup.d
-$(OUTDIR)/obj/lib/a/stdlib/forkexec.o: lib/a/stdlib/forkexec.c config.mk
-	$(OBJECT)
-$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/forkexec.o
--include $(OUTDIR)/obj/lib/a/stdlib/forkexec.d
-$(OUTDIR)/obj/lib/a/stdlib/efreadline.o: lib/a/stdlib/efreadline.c config.mk
+$(OUTDIR)/obj/lib/a/stdlib/esignal.o: lib/a/stdlib/esignal.c config.mk
 	$(OBJECT)
-$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/efreadline.o
--include $(OUTDIR)/obj/lib/a/stdlib/efreadline.d
+$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/esignal.o
+-include $(OUTDIR)/obj/lib/a/stdlib/esignal.d
 $(OUTDIR)/obj/lib/a/stdlib/eraise.o: lib/a/stdlib/eraise.c config.mk
 	$(OBJECT)
 $(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/eraise.o
 -include $(OUTDIR)/obj/lib/a/stdlib/eraise.d
-$(OUTDIR)/obj/lib/a/stdlib/strmcat.o: lib/a/stdlib/strmcat.c config.mk
-	$(OBJECT)
-$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/strmcat.o
--include $(OUTDIR)/obj/lib/a/stdlib/strmcat.d
-$(OUTDIR)/obj/lib/a/stdlib/erealloc.o: lib/a/stdlib/erealloc.c config.mk
+$(OUTDIR)/obj/lib/a/stdlib/forkexec.o: lib/a/stdlib/forkexec.c config.mk
 	$(OBJECT)
-$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/erealloc.o
--include $(OUTDIR)/obj/lib/a/stdlib/erealloc.d
-$(OUTDIR)/obj/lib/a/stdlib/fatal.o: lib/a/stdlib/fatal.c config.mk
+$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/forkexec.o
+-include $(OUTDIR)/obj/lib/a/stdlib/forkexec.d
+$(OUTDIR)/obj/lib/a/stdlib/estrdup.o: lib/a/stdlib/estrdup.c config.mk
 	$(OBJECT)
-$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/fatal.o
--include $(OUTDIR)/obj/lib/a/stdlib/fatal.d
+$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/estrdup.o
+-include $(OUTDIR)/obj/lib/a/stdlib/estrdup.d
 $(OUTDIR)/obj/lib/a/stdlib/smprintf.o: lib/a/stdlib/smprintf.c config.mk
 	$(OBJECT)
 $(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/smprintf.o
@@ -93,17 +41,73 @@ $(OUTDIR)/obj/lib/a/stdlib/ecalloc.o: lib/a/stdlib/ecalloc.c config.mk
 	$(OBJECT)
 $(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/ecalloc.o
 -include $(OUTDIR)/obj/lib/a/stdlib/ecalloc.d
+$(OUTDIR)/obj/lib/a/stdlib/erealloc.o: lib/a/stdlib/erealloc.c config.mk
+	$(OBJECT)
+$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/erealloc.o
+-include $(OUTDIR)/obj/lib/a/stdlib/erealloc.d
+$(OUTDIR)/obj/lib/a/stdlib/efreadline.o: lib/a/stdlib/efreadline.c config.mk
+	$(OBJECT)
+$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/efreadline.o
+-include $(OUTDIR)/obj/lib/a/stdlib/efreadline.d
+$(OUTDIR)/obj/lib/a/stdlib/fatal.o: lib/a/stdlib/fatal.c config.mk
+	$(OBJECT)
+$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/fatal.o
+-include $(OUTDIR)/obj/lib/a/stdlib/fatal.d
+$(OUTDIR)/obj/lib/a/stdlib/strmcat.o: lib/a/stdlib/strmcat.c config.mk
+	$(OBJECT)
+$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/stdlib/strmcat.o
+-include $(OUTDIR)/obj/lib/a/stdlib/strmcat.d
+$(OUTDIR)/obj/lib/a/Options.o: lib/a/Options.c config.mk
+	$(OBJECT)
+$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/Options.o
+-include $(OUTDIR)/obj/lib/a/Options.d
+$(OUTDIR)/obj/lib/a/Thread.o: lib/a/Thread.c config.mk
+	$(OBJECT)
+$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/Thread.o
+-include $(OUTDIR)/obj/lib/a/Thread.d
+$(OUTDIR)/obj/lib/a/defaults/set_option.o: lib/a/defaults/set_option.c config.mk
+	$(OBJECT)
+$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/defaults/set_option.o
+-include $(OUTDIR)/obj/lib/a/defaults/set_option.d
+$(OUTDIR)/obj/lib/a/defaults/usage.o: lib/a/defaults/usage.c config.mk
+	$(OBJECT)
+$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/defaults/usage.o
+-include $(OUTDIR)/obj/lib/a/defaults/usage.d
+$(OUTDIR)/obj/lib/a/defaults/options.o: lib/a/defaults/options.c config.mk
+	$(OBJECT)
+$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/defaults/options.o
+-include $(OUTDIR)/obj/lib/a/defaults/options.d
+$(OUTDIR)/obj/lib/a/defaults/argv0.o: lib/a/defaults/argv0.c config.mk
+	$(OBJECT)
+$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/defaults/argv0.o
+-include $(OUTDIR)/obj/lib/a/defaults/argv0.d
+$(OUTDIR)/obj/lib/a/Mutex.o: lib/a/Mutex.c config.mk
+	$(OBJECT)
+$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/Mutex.o
+-include $(OUTDIR)/obj/lib/a/Mutex.d
 $(OUTDIR)/obj/lib/a/GC.o: lib/a/GC.c config.mk
 	$(OBJECT)
 $(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/GC.o
 -include $(OUTDIR)/obj/lib/a/GC.d
+$(OUTDIR)/obj/lib/a/UTF8.o: lib/a/UTF8.c config.mk
+	$(OBJECT)
+$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/UTF8.o
+-include $(OUTDIR)/obj/lib/a/UTF8.d
+$(OUTDIR)/obj/lib/a/Net.o: lib/a/Net.c config.mk
+	$(OBJECT)
+$(OUTDIR)/lib/liba.a: $(OUTDIR)/obj/lib/a/Net.o
+-include $(OUTDIR)/obj/lib/a/Net.d
 $(OUTDIR)/lib/liba.a:
 	$(ARCHIVE)
 libs: $(OUTDIR)/lib/liba.a
-$(OUTDIR)/obj/lib/ui/window_create.o: lib/ui/window_create.c config.mk
+$(OUTDIR)/obj/lib/ui/window_delete.o: lib/ui/window_delete.c config.mk
 	$(OBJECT)
-$(OUTDIR)/lib/libui.a: $(OUTDIR)/obj/lib/ui/window_create.o
--include $(OUTDIR)/obj/lib/ui/window_create.d
+$(OUTDIR)/lib/libui.a: $(OUTDIR)/obj/lib/ui/window_delete.o
+-include $(OUTDIR)/obj/lib/ui/window_delete.d
+$(OUTDIR)/obj/lib/ui/ui_end.o: lib/ui/ui_end.c config.mk
+	$(OBJECT)
+$(OUTDIR)/lib/libui.a: $(OUTDIR)/obj/lib/ui/ui_end.o
+-include $(OUTDIR)/obj/lib/ui/ui_end.d
 $(OUTDIR)/obj/lib/ui/ui_begin.o: lib/ui/ui_begin.c config.mk
 	$(OBJECT)
 $(OUTDIR)/lib/libui.a: $(OUTDIR)/obj/lib/ui/ui_begin.o
@@ -112,26 +116,22 @@ $(OUTDIR)/obj/lib/ui/font_close.o: lib/ui/font_close.c config.mk
 	$(OBJECT)
 $(OUTDIR)/lib/libui.a: $(OUTDIR)/obj/lib/ui/font_close.o
 -include $(OUTDIR)/obj/lib/ui/font_close.d
-$(OUTDIR)/obj/lib/ui/window_hide.o: lib/ui/window_hide.c config.mk
+$(OUTDIR)/obj/lib/ui/window_create.o: lib/ui/window_create.c config.mk
 	$(OBJECT)
-$(OUTDIR)/lib/libui.a: $(OUTDIR)/obj/lib/ui/window_hide.o
--include $(OUTDIR)/obj/lib/ui/window_hide.d
+$(OUTDIR)/lib/libui.a: $(OUTDIR)/obj/lib/ui/window_create.o
+-include $(OUTDIR)/obj/lib/ui/window_create.d
 $(OUTDIR)/obj/lib/ui/font_load.o: lib/ui/font_load.c config.mk
 	$(OBJECT)
 $(OUTDIR)/lib/libui.a: $(OUTDIR)/obj/lib/ui/font_load.o
 -include $(OUTDIR)/obj/lib/ui/font_load.d
-$(OUTDIR)/obj/lib/ui/window_delete.o: lib/ui/window_delete.c config.mk
+$(OUTDIR)/obj/lib/ui/window_hide.o: lib/ui/window_hide.c config.mk
 	$(OBJECT)
-$(OUTDIR)/lib/libui.a: $(OUTDIR)/obj/lib/ui/window_delete.o
--include $(OUTDIR)/obj/lib/ui/window_delete.d
+$(OUTDIR)/lib/libui.a: $(OUTDIR)/obj/lib/ui/window_hide.o
+-include $(OUTDIR)/obj/lib/ui/window_hide.d
 $(OUTDIR)/obj/lib/ui/window_show.o: lib/ui/window_show.c config.mk
 	$(OBJECT)
 $(OUTDIR)/lib/libui.a: $(OUTDIR)/obj/lib/ui/window_show.o
 -include $(OUTDIR)/obj/lib/ui/window_show.d
-$(OUTDIR)/obj/lib/ui/ui_end.o: lib/ui/ui_end.c config.mk
-	$(OBJECT)
-$(OUTDIR)/lib/libui.a: $(OUTDIR)/obj/lib/ui/ui_end.o
--include $(OUTDIR)/obj/lib/ui/ui_end.d
 $(OUTDIR)/lib/libui.a:
 	$(ARCHIVE)
 libs: $(OUTDIR)/lib/libui.a
@@ -170,132 +170,132 @@ $(OUTDIR)/obj/bin/editor/dbc.o: bin/editor/dbc.c config.mk
 	$(OBJECT)
 $(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/dbc.o
 -include $(OUTDIR)/obj/bin/editor/dbc.d
-$(OUTDIR)/obj/bin/editor/range.o: bin/editor/range.c config.mk
-	$(OBJECT)
-$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/range.o
--include $(OUTDIR)/obj/bin/editor/range.d
-$(OUTDIR)/obj/bin/editor/x11_gc.o: bin/editor/x11_gc.c config.mk
-	$(OBJECT)
-$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/x11_gc.o
--include $(OUTDIR)/obj/bin/editor/x11_gc.d
-$(OUTDIR)/obj/bin/editor/job.o: bin/editor/job.c config.mk
-	$(OBJECT)
-$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/job.o
--include $(OUTDIR)/obj/bin/editor/job.d
 $(OUTDIR)/obj/bin/editor/buf.o: bin/editor/buf.c config.mk
 	$(OBJECT)
 $(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/buf.o
 -include $(OUTDIR)/obj/bin/editor/buf.d
-$(OUTDIR)/obj/bin/editor/telem.o: bin/editor/telem.c config.mk
+$(OUTDIR)/obj/bin/editor/view.o: bin/editor/view.c config.mk
 	$(OBJECT)
-$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/telem.o
--include $(OUTDIR)/obj/bin/editor/telem.d
+$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/view.o
+-include $(OUTDIR)/obj/bin/editor/view.d
 $(OUTDIR)/obj/bin/editor/readfd.o: bin/editor/readfd.c config.mk
 	$(OBJECT)
 $(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/readfd.o
 -include $(OUTDIR)/obj/bin/editor/readfd.d
-$(OUTDIR)/obj/bin/editor/mouse.o: bin/editor/mouse.c config.mk
-	$(OBJECT)
-$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/mouse.o
--include $(OUTDIR)/obj/bin/editor/mouse.d
 $(OUTDIR)/obj/bin/editor/exec.o: bin/editor/exec.c config.mk
 	$(OBJECT)
 $(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/exec.o
 -include $(OUTDIR)/obj/bin/editor/exec.d
-$(OUTDIR)/obj/bin/editor/editlog.o: bin/editor/editlog.c config.mk
+$(OUTDIR)/obj/bin/editor/xpty.o: bin/editor/xpty.c config.mk
 	$(OBJECT)
-$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/editlog.o
--include $(OUTDIR)/obj/bin/editor/editlog.d
-$(OUTDIR)/obj/bin/editor/gapbuf.o: bin/editor/gapbuf.c config.mk
+$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/xpty.o
+-include $(OUTDIR)/obj/bin/editor/xpty.d
+$(OUTDIR)/obj/bin/editor/draw.o: bin/editor/draw.c config.mk
 	$(OBJECT)
-$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/gapbuf.o
--include $(OUTDIR)/obj/bin/editor/gapbuf.d
+$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/draw.o
+-include $(OUTDIR)/obj/bin/editor/draw.d
 $(OUTDIR)/obj/bin/editor/x11.o: bin/editor/x11.c config.mk
 	$(OBJECT)
 $(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/x11.o
 -include $(OUTDIR)/obj/bin/editor/x11.d
-$(OUTDIR)/obj/bin/editor/view.o: bin/editor/view.c config.mk
+$(OUTDIR)/obj/bin/editor/range.o: bin/editor/range.c config.mk
 	$(OBJECT)
-$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/view.o
--include $(OUTDIR)/obj/bin/editor/view.d
-$(OUTDIR)/obj/bin/editor/writefd.o: bin/editor/writefd.c config.mk
+$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/range.o
+-include $(OUTDIR)/obj/bin/editor/range.d
+$(OUTDIR)/obj/bin/editor/mouse.o: bin/editor/mouse.c config.mk
 	$(OBJECT)
-$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/writefd.o
--include $(OUTDIR)/obj/bin/editor/writefd.d
-$(OUTDIR)/obj/bin/editor/xpty.o: bin/editor/xpty.c config.mk
+$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/mouse.o
+-include $(OUTDIR)/obj/bin/editor/mouse.d
+$(OUTDIR)/obj/bin/editor/gapbuf.o: bin/editor/gapbuf.c config.mk
 	$(OBJECT)
-$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/xpty.o
--include $(OUTDIR)/obj/bin/editor/xpty.d
+$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/gapbuf.o
+-include $(OUTDIR)/obj/bin/editor/gapbuf.d
+$(OUTDIR)/obj/bin/editor/telem.o: bin/editor/telem.c config.mk
+	$(OBJECT)
+$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/telem.o
+-include $(OUTDIR)/obj/bin/editor/telem.d
+$(OUTDIR)/obj/bin/editor/job.o: bin/editor/job.c config.mk
+	$(OBJECT)
+$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/job.o
+-include $(OUTDIR)/obj/bin/editor/job.d
+$(OUTDIR)/obj/bin/editor/x11_sel.o: bin/editor/x11_sel.c config.mk
+	$(OBJECT)
+$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/x11_sel.o
+-include $(OUTDIR)/obj/bin/editor/x11_sel.d
 $(OUTDIR)/obj/bin/editor/shortcuts.o: bin/editor/shortcuts.c config.mk
 	$(OBJECT)
 $(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/shortcuts.o
 -include $(OUTDIR)/obj/bin/editor/shortcuts.d
-$(OUTDIR)/obj/bin/editor/readfile.o: bin/editor/readfile.c config.mk
+$(OUTDIR)/obj/bin/editor/abspath.o: bin/editor/abspath.c config.mk
 	$(OBJECT)
-$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/readfile.o
--include $(OUTDIR)/obj/bin/editor/readfile.d
-$(OUTDIR)/obj/bin/editor/draw.o: bin/editor/draw.c config.mk
+$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/abspath.o
+-include $(OUTDIR)/obj/bin/editor/abspath.d
+$(OUTDIR)/obj/bin/editor/editlog.o: bin/editor/editlog.c config.mk
 	$(OBJECT)
-$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/draw.o
--include $(OUTDIR)/obj/bin/editor/draw.d
+$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/editlog.o
+-include $(OUTDIR)/obj/bin/editor/editlog.d
 $(OUTDIR)/obj/bin/editor/utf8.o: bin/editor/utf8.c config.mk
 	$(OBJECT)
 $(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/utf8.o
 -include $(OUTDIR)/obj/bin/editor/utf8.d
-$(OUTDIR)/obj/bin/editor/abspath.o: bin/editor/abspath.c config.mk
-	$(OBJECT)
-$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/abspath.o
--include $(OUTDIR)/obj/bin/editor/abspath.d
 $(OUTDIR)/obj/bin/editor/main.o: bin/editor/main.c config.mk
 	$(OBJECT)
 $(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/main.o
 -include $(OUTDIR)/obj/bin/editor/main.d
-$(OUTDIR)/obj/bin/editor/x11_sel.o: bin/editor/x11_sel.c config.mk
+$(OUTDIR)/obj/bin/editor/x11_gc.o: bin/editor/x11_gc.c config.mk
 	$(OBJECT)
-$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/x11_sel.o
--include $(OUTDIR)/obj/bin/editor/x11_sel.d
+$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/x11_gc.o
+-include $(OUTDIR)/obj/bin/editor/x11_gc.d
+$(OUTDIR)/obj/bin/editor/writefd.o: bin/editor/writefd.c config.mk
+	$(OBJECT)
+$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/writefd.o
+-include $(OUTDIR)/obj/bin/editor/writefd.d
+$(OUTDIR)/obj/bin/editor/readfile.o: bin/editor/readfile.c config.mk
+	$(OBJECT)
+$(OUTDIR)/bin/editor: $(OUTDIR)/obj/bin/editor/readfile.o
+-include $(OUTDIR)/obj/bin/editor/readfile.d
 $(OUTDIR)/bin/editor: | $(libs)
 	$(BINARY)
 bins: $(OUTDIR)/bin/editor
-$(OUTDIR)/obj/bin/pick/x11_gc.o: bin/pick/x11_gc.c config.mk
-	$(OBJECT)
-$(OUTDIR)/bin/pick: $(OUTDIR)/obj/bin/pick/x11_gc.o
--include $(OUTDIR)/obj/bin/pick/x11_gc.d
-$(OUTDIR)/obj/bin/pick/telem.o: bin/pick/telem.c config.mk
-	$(OBJECT)
-$(OUTDIR)/bin/pick: $(OUTDIR)/obj/bin/pick/telem.o
--include $(OUTDIR)/obj/bin/pick/telem.d
 $(OUTDIR)/obj/bin/pick/x11.o: bin/pick/x11.c config.mk
 	$(OBJECT)
 $(OUTDIR)/bin/pick: $(OUTDIR)/obj/bin/pick/x11.o
 -include $(OUTDIR)/obj/bin/pick/x11.d
-$(OUTDIR)/obj/bin/pick/writefd.o: bin/pick/writefd.c config.mk
-	$(OBJECT)
-$(OUTDIR)/bin/pick: $(OUTDIR)/obj/bin/pick/writefd.o
--include $(OUTDIR)/obj/bin/pick/writefd.d
 $(OUTDIR)/obj/bin/pick/pick.o: bin/pick/pick.c config.mk
 	$(OBJECT)
 $(OUTDIR)/bin/pick: $(OUTDIR)/obj/bin/pick/pick.o
 -include $(OUTDIR)/obj/bin/pick/pick.d
-$(OUTDIR)/obj/bin/pick/utf8.o: bin/pick/utf8.c config.mk
+$(OUTDIR)/obj/bin/pick/telem.o: bin/pick/telem.c config.mk
 	$(OBJECT)
-$(OUTDIR)/bin/pick: $(OUTDIR)/obj/bin/pick/utf8.o
--include $(OUTDIR)/obj/bin/pick/utf8.d
+$(OUTDIR)/bin/pick: $(OUTDIR)/obj/bin/pick/telem.o
+-include $(OUTDIR)/obj/bin/pick/telem.d
 $(OUTDIR)/obj/bin/pick/x11_sel.o: bin/pick/x11_sel.c config.mk
 	$(OBJECT)
 $(OUTDIR)/bin/pick: $(OUTDIR)/obj/bin/pick/x11_sel.o
 -include $(OUTDIR)/obj/bin/pick/x11_sel.d
+$(OUTDIR)/obj/bin/pick/utf8.o: bin/pick/utf8.c config.mk
+	$(OBJECT)
+$(OUTDIR)/bin/pick: $(OUTDIR)/obj/bin/pick/utf8.o
+-include $(OUTDIR)/obj/bin/pick/utf8.d
+$(OUTDIR)/obj/bin/pick/x11_gc.o: bin/pick/x11_gc.c config.mk
+	$(OBJECT)
+$(OUTDIR)/bin/pick: $(OUTDIR)/obj/bin/pick/x11_gc.o
+-include $(OUTDIR)/obj/bin/pick/x11_gc.d
+$(OUTDIR)/obj/bin/pick/writefd.o: bin/pick/writefd.c config.mk
+	$(OBJECT)
+$(OUTDIR)/bin/pick: $(OUTDIR)/obj/bin/pick/writefd.o
+-include $(OUTDIR)/obj/bin/pick/writefd.d
 $(OUTDIR)/bin/pick: | $(libs)
 	$(BINARY)
 bins: $(OUTDIR)/bin/pick
-$(OUTDIR)/obj/bin/screenlock/slock.o: bin/screenlock/slock.c config.mk
-	$(OBJECT)
-$(OUTDIR)/bin/screenlock: $(OUTDIR)/obj/bin/screenlock/slock.o
--include $(OUTDIR)/obj/bin/screenlock/slock.d
 $(OUTDIR)/obj/bin/screenlock/explicit_bzero.o: bin/screenlock/explicit_bzero.c config.mk
 	$(OBJECT)
 $(OUTDIR)/bin/screenlock: $(OUTDIR)/obj/bin/screenlock/explicit_bzero.o
 -include $(OUTDIR)/obj/bin/screenlock/explicit_bzero.d
+$(OUTDIR)/obj/bin/screenlock/slock.o: bin/screenlock/slock.c config.mk
+	$(OBJECT)
+$(OUTDIR)/bin/screenlock: $(OUTDIR)/obj/bin/screenlock/slock.o
+-include $(OUTDIR)/obj/bin/screenlock/slock.d
 $(OUTDIR)/bin/screenlock: | $(libs)
 	$(BINARY)
 bins: $(OUTDIR)/bin/screenlock
@@ -306,30 +306,26 @@ $(OUTDIR)/bin/terminal: $(OUTDIR)/obj/bin/terminal/st.o
 $(OUTDIR)/bin/terminal: | $(libs)
 	$(BINARY)
 bins: $(OUTDIR)/bin/terminal
-$(OUTDIR)/obj/bin/winmgr/error.o: bin/winmgr/error.c config.mk
-	$(OBJECT)
-$(OUTDIR)/bin/winmgr: $(OUTDIR)/obj/bin/winmgr/error.o
--include $(OUTDIR)/obj/bin/winmgr/error.d
-$(OUTDIR)/obj/bin/winmgr/mons.o: bin/winmgr/mons.c config.mk
+$(OUTDIR)/obj/bin/winmgr/client.o: bin/winmgr/client.c config.mk
 	$(OBJECT)
-$(OUTDIR)/bin/winmgr: $(OUTDIR)/obj/bin/winmgr/mons.o
--include $(OUTDIR)/obj/bin/winmgr/mons.d
+$(OUTDIR)/bin/winmgr: $(OUTDIR)/obj/bin/winmgr/client.o
+-include $(OUTDIR)/obj/bin/winmgr/client.d
 $(OUTDIR)/obj/bin/winmgr/keys.o: bin/winmgr/keys.c config.mk
 	$(OBJECT)
 $(OUTDIR)/bin/winmgr: $(OUTDIR)/obj/bin/winmgr/keys.o
 -include $(OUTDIR)/obj/bin/winmgr/keys.d
-$(OUTDIR)/obj/bin/winmgr/mouse.o: bin/winmgr/mouse.c config.mk
+$(OUTDIR)/obj/bin/winmgr/error.o: bin/winmgr/error.c config.mk
 	$(OBJECT)
-$(OUTDIR)/bin/winmgr: $(OUTDIR)/obj/bin/winmgr/mouse.o
--include $(OUTDIR)/obj/bin/winmgr/mouse.d
+$(OUTDIR)/bin/winmgr: $(OUTDIR)/obj/bin/winmgr/error.o
+-include $(OUTDIR)/obj/bin/winmgr/error.d
 $(OUTDIR)/obj/bin/winmgr/list.o: bin/winmgr/list.c config.mk
 	$(OBJECT)
 $(OUTDIR)/bin/winmgr: $(OUTDIR)/obj/bin/winmgr/list.o
 -include $(OUTDIR)/obj/bin/winmgr/list.d
-$(OUTDIR)/obj/bin/winmgr/winmgr.o: bin/winmgr/winmgr.c config.mk
+$(OUTDIR)/obj/bin/winmgr/mouse.o: bin/winmgr/mouse.c config.mk
 	$(OBJECT)
-$(OUTDIR)/bin/winmgr: $(OUTDIR)/obj/bin/winmgr/winmgr.o
--include $(OUTDIR)/obj/bin/winmgr/winmgr.d
+$(OUTDIR)/bin/winmgr: $(OUTDIR)/obj/bin/winmgr/mouse.o
+-include $(OUTDIR)/obj/bin/winmgr/mouse.d
 $(OUTDIR)/obj/bin/winmgr/tile.o: bin/winmgr/tile.c config.mk
 	$(OBJECT)
 $(OUTDIR)/bin/winmgr: $(OUTDIR)/obj/bin/winmgr/tile.o
@@ -338,10 +334,14 @@ $(OUTDIR)/obj/bin/winmgr/util.o: bin/winmgr/util.c config.mk
 	$(OBJECT)
 $(OUTDIR)/bin/winmgr: $(OUTDIR)/obj/bin/winmgr/util.o
 -include $(OUTDIR)/obj/bin/winmgr/util.d
-$(OUTDIR)/obj/bin/winmgr/client.o: bin/winmgr/client.c config.mk
+$(OUTDIR)/obj/bin/winmgr/winmgr.o: bin/winmgr/winmgr.c config.mk
 	$(OBJECT)
-$(OUTDIR)/bin/winmgr: $(OUTDIR)/obj/bin/winmgr/client.o
--include $(OUTDIR)/obj/bin/winmgr/client.d
+$(OUTDIR)/bin/winmgr: $(OUTDIR)/obj/bin/winmgr/winmgr.o
+-include $(OUTDIR)/obj/bin/winmgr/winmgr.d
+$(OUTDIR)/obj/bin/winmgr/mons.o: bin/winmgr/mons.c config.mk
+	$(OBJECT)
+$(OUTDIR)/bin/winmgr: $(OUTDIR)/obj/bin/winmgr/mons.o
+-include $(OUTDIR)/obj/bin/winmgr/mons.d
 $(OUTDIR)/bin/winmgr: | $(libs)
 	$(BINARY)
 bins: $(OUTDIR)/bin/winmgr
-- 
2.54.0