From 78e40a9401736cba69bf2e426a6325f0b80b4f48 Mon Sep 17 00:00:00 2001
From: Michael Housh <michael@mhoush.com>
Date: Mon, 6 Oct 2025 17:01:07 -0400
Subject: [PATCH] feat: Begins moving some scripts into a utils folder and
 using them as subcommands.

---
 env/.local/scripts/hypr/close-windows         |   3 +-
 .../scripts/hypr/utils/windows/close-windows  | 139 ++++++++++++++++++
 env/.local/scripts/hypr/windowctl             |  10 +-
 gen                                           |   5 +-
 4 files changed, 152 insertions(+), 5 deletions(-)
 create mode 100755 env/.local/scripts/hypr/utils/windows/close-windows

diff --git a/env/.local/scripts/hypr/close-windows b/env/.local/scripts/hypr/close-windows
index add7e29..060ca80 100755
--- a/env/.local/scripts/hypr/close-windows
+++ b/env/.local/scripts/hypr/close-windows
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
 THIS_FILE=${BASH_SOURCE[0]}
-THIS=$(basename "$THIS_FILE")
+# Allows script name to be set when called from a parent script or defaults to filename.
+THIS=${THIS:-$(basename "$THIS_FILE")}
 
 usage() {
   cat <<EOF
diff --git a/env/.local/scripts/hypr/utils/windows/close-windows b/env/.local/scripts/hypr/utils/windows/close-windows
new file mode 100755
index 0000000..2e0aed1
--- /dev/null
+++ b/env/.local/scripts/hypr/utils/windows/close-windows
@@ -0,0 +1,139 @@
+#!/usr/bin/env bash
+
+THIS_FILE=${BASH_SOURCE[0]}
+LOG_LABEL=$(basename "$THIS_FILE")
+# Allows script name to be set when called from a parent script or defaults to filename.
+THIS=${THIS:-$LOG_LABEL}
+
+usage() {
+  cat <<EOF
+
+Close window(s) by address or pattern mode.
+
+USAGE:
+  $ $THIS [OPTIONS] [MODE] [ARG...]
+
+MODE:
+  --all:                      Close all windows in all workspaces, any arguments are ignored.
+
+  -a | --active-workspace:    Close all windows in the active workspace, any arguments are ignored.
+
+  -c | --class:               Close all windows whose class contains one of the passed arguments.
+
+  -s | --special:             Close all windows in special workspaces whose name matches on of the
+                              passed in arguments, or if no arguments are supplied then it will close
+                              all windows in all special workspaces.
+OPTIONS:
+--dry-run
+-h | --help:      Show this help page.
+
+NOTES:
+
+If a mode is selected all arguments are treated for that mode, meaning only one mode
+runs. It does not work to mix modes / arguments.
+
+If no modes are supplied then arguments are assumed to be window addresses and we will
+close all supplied window addresses.
+
+
+EOF
+}
+
+active_workspace_flag="0"
+all_flag="0"
+class_flag="0"
+dry_run_flag="0"
+special_flag="0"
+args=()
+addresses=()
+SCRIPTS="${SCRIPTS:-$HOME/.local/scripts}"
+
+while [[ $# -gt 0 ]]; do
+  if [[ $1 =~ ^-a ]] || [[ $1 =~ ^--active-workspace ]]; then
+    active_workspace_flag="1"
+  elif [[ $1 =~ ^--all ]]; then
+    all_flag="1"
+  elif [[ $1 =~ ^-c ]] || [[ $1 =~ ^--class ]]; then
+    class_flag="1"
+  elif [[ $1 =~ ^--dry-run ]]; then
+    dry_run_flag="1"
+  elif [[ $1 =~ ^-h ]] || [[ $1 =~ ^--help ]]; then
+    usage && exit 0
+  elif [[ $1 =~ ^-s ]] || [[ $1 =~ ^--special ]]; then
+    special_flag="1"
+  else
+    args+=($1)
+  fi
+  shift
+done
+
+log() {
+  logging log --source "$THIS_FILE" "$@"
+}
+
+_select_addresses() {
+  local property=$1
+  local pattern=$2
+  addresses+=("$(hyprctl clients -j | jq -r ".[] | select($property | contains(\"$pattern\")) | .address")")
+}
+
+get_special_addresses() {
+
+  # If no arguments, then we add the "special" to the pattern args, which will
+  # match all windows in any special workspace.
+  if [[ ${#args} == 0 ]]; then
+    args+=("special")
+  fi
+
+  for name in ${args[@]}; do
+    log "Fetching addresses for special: $name"
+    _select_addresses .workspace.name $name
+  done
+}
+
+close() {
+  log "Closing window address: $1"
+  if [[ $dry_run_flag == "0" ]]; then
+    hyprctl dispatch closewindow "address:$1" >/dev/null 2>&1
+  fi
+}
+
+# Setup logging file and label
+source "$SCRIPTS/hypr/logging"
+setup-logging "$LOG_LABEL"
+export LOG_ENABLE_DRY_RUN="$dry_run_flag"
+
+if [[ $active_workspace_flag == "1" ]]; then
+  # Set addresses to active workspace windows.
+  id=$(hyprctl activeworkspace -j | jq -r '.id')
+  log "Fetching addresses for active workspace: $id"
+  addresses+=("$(hyprctl clients -j | jq -r ".[] | select(.workspace.id == $id) | .address")")
+
+elif [[ $all_flag == "1" ]]; then
+  # Set addresses to all window addresses.
+  addresses+=("$(hyprctl clients -j | jq -r ".[] | .address")")
+
+elif [[ $class_flag == "1" ]]; then
+  # Set addresses to all windows containing the passed in classes.
+  for c in ${args[@]}; do
+    _select_addresses .class $c
+  done
+
+elif [[ $special_flag == "1" ]]; then
+  # Set addresses to all windows in the passed in special workspaces.
+  get_special_addresses
+
+else
+  # If no modes selected, then assume there were addresses passed in
+  # as args.
+  addresses=("$args")
+fi
+
+if [[ ${#addresses} == 0 ]]; then
+  log --warning "No windows found."
+  exit 0
+fi
+
+for address in ${addresses[@]}; do
+  close $address
+done
diff --git a/env/.local/scripts/hypr/windowctl b/env/.local/scripts/hypr/windowctl
index 7e212f5..577ca28 100755
--- a/env/.local/scripts/hypr/windowctl
+++ b/env/.local/scripts/hypr/windowctl
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
+
 THIS_FILE=${BASH_SOURCE[0]}
 THIS=$(basename $THIS_FILE)
+SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 
 usage() {
   cat <<EOF
@@ -35,6 +37,12 @@ launched terminal, allowing you to launch with a specific mode turned on, any fl
 EOF
 }
 
+if [[ "$1" == "close" ]]; then
+  shift
+  THIS="$THIS close" "$SCRIPTS/hypr/utils/windows/close-windows" "$@"
+  exit $?
+fi
+
 window_class="com.ghostty.$THIS"
 window_padding_x="10"
 
@@ -52,8 +60,6 @@ should_quit="0"
 launch_args=()
 selected_value=""
 
-SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
-
 while [[ $# -gt 0 ]]; do
   if [[ $launch_flag == "1" ]]; then
     launch_args+=("$1")
diff --git a/gen b/gen
index 5ef1ce3..68c903b 100755
--- a/gen
+++ b/gen
@@ -76,7 +76,8 @@ generate_script() {
 
 SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
-THIS=$(basename $THIS_FILE)
+LOG_LABEL=$(basename "$THIS_FILE")
+THIS=${THIS:-$LOG_LABEL}
 
 # Logging utility function, use in place of echo.
 log() {
@@ -89,7 +90,7 @@ log() {
 
 # Setup logging file and label.
 source "$SCRIPTS/hypr/logging"
-setup-logging "$THIS"
+setup-logging "$LOG_LABEL"
 
 log "Starting $THIS..."