From 4661ea84afbb72072962fa433043c9e09a47ce34 Mon Sep 17 00:00:00 2001
From: noctuid <noct@openmailbox.org>
Date: Thu, 22 Sep 2016 22:23:58 -0400
Subject: [PATCH] Drop support for prior versions of bspwm

---
 README.md |  2 +-
 tdrop     | 25 ++++++-------------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index ac08e4c..fa73582 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ Usually, it is a simple matter to add new ones to this list. If your dropdown mo
 
 #### Tiling with Floating Support
 These window managers currently will work with '-a' for a floating (instead of tiled) dropdown.
-- bspwm
+- bspwm (support for versions prior to 0.9.1 was dropped on 2016/09/22)
 - i3
 - awesome
 
diff --git a/tdrop b/tdrop
index e163490..7b94ae5 100755
--- a/tdrop
+++ b/tdrop
@@ -214,12 +214,8 @@ update_geometry_settings_for_monitor() {
 	local wm current_monitor
 	wm=$(get_window_manager)
 	if [[ $wm == bspwm ]]; then
-		current_monitor=$(bspc query -m -M)
-		# newest bspwm version retuns an id instead of the name
-		if [[ $current_monitor =~ ^0x ]]; then
-			current_monitor=$(bspc query -T -m | grep -Po '^{"name":.*?",' | \
-				awk -F ":" '{gsub("[\",]", ""); print $2}')
-		fi
+		current_monitor=$(bspc query -T -m | grep -Po '^{"name":.*?",' | \
+			awk -F ":" '{gsub("[\",]", ""); print $2}')
 	elif [[ $wm == i3 ]]; then
 		# I'd rather not make jq a dependency
 		current_monitor=$(i3-msg -t get_workspaces | sed 's/{"num"/\n/g' | \
@@ -307,16 +303,10 @@ wm_autoset_for_all() {
 				class=google-chrome
 			fi
 			# newest (using "instance" names)
-			if [[ $(bspwm -v) =~ ^0.9.1 ]]; then
-				if [[ $class =~ [A-Z] ]]; then
-					bspc rule -a "$class" -o state=floating
-				else
-					bspc rule -a \*:"$class" -o state=floating
-				fi
-			else
-				# compatability with older syntaxes
+			if [[ $class =~ [A-Z] ]]; then
 				bspc rule -a "$class" -o state=floating
-				bspc rule -a "$class" -o floating=on
+			else
+				bspc rule -a \*:"$class" -o state=floating
 			fi
 		}
 	elif [[ $wm == awesome ]]; then
@@ -352,10 +342,7 @@ wm_autoset_for_hide_show() {
 	if [[ $wm == bspwm ]]; then
 		subtract_when_same=false
 		is_floating() {
-			# checking if the window id (converted from decimal to hex) is floating; empty if not floating
-			bspc query -T | grep -i "$(printf 0x%x "$1").*f-" || \
-				bspc query -T -w | grep '"state": "floating"' || \
-				bspc query -T -n | grep '"state":"floating"'
+			bspc query -T -n | grep '"state":"floating"'
 		}
 	elif [[ $wm == i3 ]]; then
 		subtract_when_same=false