Merge pull request #9 from phenax/feature/reverse

Reversed layouts

Author: phenax

README.md

@@ -35,6 +35,15 @@ _______________
 |________|____|
 ```
 
+* `rtall` - Master-stack with a reversed tall window.
+```
+_______________
+|____|        |
+|____|        |
+|____|        |
+|____|________|
+```
+
 * `wide` - Master-stack with a wide window.
 ```
 _______________
@@ -44,6 +53,15 @@ _______________
 |____|____|___|
 ```
 
+* `rwide` - Master-stack with a reversed wide window.
+```
+_______________
+|____|____|___|
+|             |
+|             |
+|_____________|
+```
+
 * `even` - Evenly balances all window areas
 ```
 _______________

src/layout.sh

@@ -21,9 +21,7 @@ Commands:
   help                                              - See this help menu
 
 Layout options:
-  Tall
-    --master-size 0.6         Set the master window size
-  Wide
+  tall,wide,rtall,rwide
     --master-size 0.6         Set the master window size
 ";
 

src/layouts/rtall.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+source "$ROOT/utils/common.sh";
+source "$ROOT/utils/layout.sh";
+source "$ROOT/utils/config.sh";
+
+master_size=$TALL_RATIO;
+
+node_filter="!hidden";
+
+execute_layout() {
+  while [[ ! "$#" == 0 ]]; do
+    case "$1" in
+      --master-size) master_size="$2"; shift; ;;
+      *) echo "$x" ;;
+    esac;
+    shift;
+  done;
+
+  # ensure the count of the master child is 1, or make it so
+  local nodes=$(bspc query -N '@/2' -n .descendant_of.window.$node_filter);
+  local win_count=$(echo "$nodes" | wc -l);
+
+  if [ $win_count -ne 1 ]; then
+    local new_node=$(bspc query -N '@/2' -n last.descendant_of.window.$node_filter | head -n 1);
+
+    if [ -z "$new_node" ]; then
+      new_node=$(bspc query -N '@/1' -n last.descendant_of.window.$node_filter | head -n 1);
+    fi
+
+    local root=$(echo "$nodes" | head -n 1);
+
+    # move everything into 2 that is not our new_node
+    for wid in $(bspc query -N '@/2' -n .descendant_of.window.$node_filter | grep -v $root); do
+      bspc node "$wid" -n '@/1';
+    done
+
+    bspc node "$root" -n '@/2';
+  fi
+
+  rotate '@/' vertical 90;
+  rotate '@/2' horizontal 90;
+
+  local stack_node=$(bspc query -N '@/1' -n);
+  for parent in $(bspc query -N '@/1' -n .descendant_of.!window.$node_filter | grep -v $stack_node); do
+    rotate $parent horizontal 90;
+  done
+
+  auto_balance '@/1';
+
+  local mon_width=$(jget width "$(bspc query -T -m)");
+
+  local want=$(echo "$master_size * $mon_width" | bc | sed 's/\..*//');
+  local have=$(jget width "$(bspc query -T -n '@/2')");
+
+  bspc node '@/2' --resize left $((have - want)) 0;
+}
+
+execute_layout "$@";

src/layouts/rwide.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+source "$ROOT/utils/common.sh";
+source "$ROOT/utils/layout.sh";
+source "$ROOT/utils/config.sh";
+
+master_size=$WIDE_RATIO;
+
+node_filter="!hidden";
+
+execute_layout() {
+  while [[ ! "$#" == 0 ]]; do
+    case "$1" in
+      --master-size) master_size="$2"; shift; ;;
+      *) echo "$x" ;;
+    esac;
+    shift;
+  done;
+
+  # ensure the count of the master child is 1, or make it so
+  local nodes=$(bspc query -N '@/2' -n .descendant_of.window.$node_filter);
+  local win_count=$(echo "$nodes" | wc -l);
+
+  if [ $win_count -ne 1 ]; then
+    local new_node=$(bspc query -N '@/2' -n last.descendant_of.window.$node_filter | head -n 1);
+
+    if [ -z "$new_node" ]; then
+      new_node=$(bspc query -N '@/1' -n last.descendant_of.window.$node_filter | head -n 1);
+    fi
+
+    local root=$(echo "$nodes" | head -n 1);
+
+    # move everything into 2 that is not our new_node
+    for wid in $(bspc query -N '@/2' -n .descendant_of.window.$node_filter | grep -v $root); do
+      bspc node "$wid" -n '@/1';
+    done
+
+    bspc node "$root" -n '@/2';
+  fi
+
+  rotate '@/' horizontal 90;
+  rotate '@/2' vertical 90;
+
+  local stack_node=$(bspc query -N '@/1' -n);
+  for parent in $(bspc query -N '@/1' -n .descendant_of.!window.$node_filter | grep -v $stack_node); do
+    rotate $parent vertical 90;
+  done
+
+  auto_balance '@/1';
+
+  local mon_height=$(jget height "$(bspc query -T -m)");
+
+  local want=$(echo "$master_size * $mon_height" | bc | sed 's/\..*//');
+  local have=$(jget height "$(bspc query -T -n '@/2')");
+
+  bspc node '@/2' --resize top 0 $((have - want));
+}
+
+execute_layout "$@";