X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=i3-split-maybe;h=dcb268a6bf13034315acf4d2fe6e0a3b1e1100d3;hb=e6cd2e555df3af0cf23da016b833529a34ffc84c;hp=3cedb5cc742253c63e0a2d26b2194917586bcbd8;hpb=d67edcdca8795a4bca116aa532d02dda246a6f53;p=distro-setup

diff --git a/i3-split-maybe b/i3-split-maybe
index 3cedb5c..dcb268a 100755
--- a/i3-split-maybe
+++ b/i3-split-maybe
@@ -1,4 +1,25 @@
 #!/bin/bash
+# I, Ian Kelling, follow the GNU license recommendations at
+# https://www.gnu.org/licenses/license-recommendations.en.html. They
+# recommend that small programs, < 300 lines, be licensed under the
+# Apache License 2.0. This file contains or is part of one or more small
+# programs. If a small program grows beyond 300 lines, I plan to switch
+# its license to GPL.
+
+# Copyright 2024 Ian Kelling
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 
 set -e; . /usr/local/lib/bash-bear; set +e
 
@@ -6,13 +27,43 @@ set -e; . /usr/local/lib/bash-bear; set +e
 # /a/opt/i3-alternating-layout/alternating_layouts.py to anticipate when
 # we want to split/tab windows. There are 2 options of when to do it:
 # just after a window is created, or just before a window is
-# created. Doing it after a window is created allows you to move a
-# window into the split that only has 1 window, whereas the other way
-# doesn't. For my use cases, I think I don't really want to move it into
-# the split if it is a tabbed split.
+# created.
+#
+# * Doing it after a window is created allows you to move a window into
+# the split that only has 1 window, whereas the other way doesn't. For
+# my use cases, I think I don't really want to move it into the split if
+# it is a tabbed split. upon further reflection, I've determined that
+# single window containers are inherently confusing because they tend to
+# exist and get nested at unexpected times and then it is unclear how to
+# get rid of them and what is going on and the benefit is generally not
+# worth it.  This command helps identify single window containers during
+# testing: /a/opt/i3ipc-python/examples/i3-debug-console.py
+#
+# * Doing it just before a windows is created, you need to call this
+# script, which means wrapping launch of a program, which I have no way
+# to do for all cases, I just do it for the common programs I have bound
+# to keys in i3.
+#
+# * Doing it after a window is created also leaves that split behind if
+#   the window is closed. I partially deal with that below.
 #
 # I have a keybind which disables both, it runs /b/ds/i3-auto-layout-toggle
 
+
+dry_run=false
+m() { "$@"; }
+d() {
+  if $dry_run; then
+    printf "%s\n" "$*"
+  fi
+}
+case $1 in
+  -n)
+    dry_run=true
+    m() { printf "%s\n" "$*"; }
+    ;;
+esac
+
 if [[ -e /tmp/iank-i3-no-auto ]]; then
   exit 0
 fi
@@ -20,26 +71,33 @@ fi
 
 tmp=$(mktemp)
 
-i3-msg -t get_workspaces | jq ".[]| select(.focused==true) | .rect | .width" >$tmp
+i3-msg -t get_workspaces | jq ".[]| select(.focused==true) | .rect | .width, .height" >$tmp
 
 { read -r screen_width; read -r screen_height; } <$tmp
 
 i3-msg -t get_tree | jq -r ".. | select(.focused? == true).rect | .width, .height" >$tmp
 
-half_w=$(( screen_width / 2 + 100 ))
-half_h=$(( screen_height / 2 + 100 ))
+half_w=$(( screen_width / 2  ))
+half_h=$(( screen_height / 2  ))
 
 
 { read -r w; read -r h; } <$tmp
 
+d w=$w , h=$h , half_w=$half_w , half_h=$half_h
 
 if (( screen_width < 1920 )); then
   # haven't considered this case yet
   exit 0
 fi
 
-if (( w < half_w && h < half_h )); then
-  i3-msg "split vertical, layout tabbed"
+
+if (( w <= half_w && h <= half_h )); then
+  m i3-msg "split vertical, layout tabbed"
+elif (( w == screen_width )); then
+  # if we had 2 windows on screen, made them vertical splits, then
+  # closed one, it stays vertical split, but we want it horizontal at
+  # that point. So, make it horizontal here.
+  m i3-msg "split horizontal"
 fi
 
 rm -f $tmp