Merge pull request #26 from budlabs/dev

small fixes

i3flip/i3flip

@@ -7,6 +7,7 @@ __contact='[email protected]'
 __created="2018-01-03"
 __updated="2018-09-01"
 
+
 main(){
 
   eval set -- "$(getopt --name "$__name" \
@@ -62,6 +63,7 @@ main(){
   i3-msg -q "[con_id=$__orgtrg]" focus, focus child
 }
 
+
 gettarget(){
   local trg
 
@@ -79,6 +81,7 @@ gettarget(){
   echo "${aord[$((trg-1))]}"
 }
 
+
 getcurrent(){
   i3-msg -t get_tree \
   | awk -v RS=',' -F':' -v crit='"focused"' -v srch="true" '
@@ -120,7 +123,6 @@ getcurrent(){
 }
 
 
-
 printinfo(){
   local about bouthead boutfoot
 
@@ -188,8 +190,6 @@ SEE ALSO
 i3(1)
 "
 
-
-
   case "$1" in
     # print version info to stdout
     version )

i3fyra/i3fyra

@@ -133,7 +133,7 @@ containershow(){
   # show target ($1/trg) container (A|B|C|D)
   # if it already is visible, do nothing.
   # if it doesn't exist, create it 
-  local trg sts tfam sib tdest sdir tmrk tspl tdim
+  local trg sts tfam sib tdest famshow tmrk tspl tdim
 
   # trg = target container
   # sts = status (none|visible|hidden)
@@ -153,13 +153,11 @@ containershow(){
     hidden  )
 
       # sib = sibling, tfam = family
-      case $trg in
-        A ) sib=C tfam=AC ;;
-        B ) sib=D tfam=BD ;;
-        C ) sib=A tfam=AC ;;
-        D ) sib=B tfam=BD ;;
-      esac
+      [[ $trg =~ [AC] ]] \
+        && tfam=AC \
+        || tfam=BD
 
+      sib=${tfam/$trg/}
       # if sibling is visible, tdest (destination)
       # otherwise XAB, main container
       [[ ${sib} =~ [${i3list[LVI]}] ]] \
@@ -173,6 +171,7 @@ containershow(){
         # if tdest is XAB, trg is first in family
         if [[ $tdest = i34XAB ]]; then
           familycreate "$trg"
+          famshow=1
         else
           # WSA = active workspace
           i3-msg -q "[con_mark=i34${trg}]" \
@@ -214,6 +213,9 @@ containershow(){
       i3list[LVI]+=$trg
       i3list[LHI]=${i3list[LHI]/$trg/}
 
+      # bring the whole family
+      [[ $famshow = 1 ]] && [[ $sib =~ [${i3list[LHI]}] ]] \
+        && containershow "$sib"
     ;;
   esac
 }

i3get/i3get

@@ -20,7 +20,7 @@ getwindow(){
       }
       $1 ~ crit && $2 ~ srch  {hit=1;fid=cid}
       $2 ~ crit && $3 ~ srch {hit=1;fid=cid}
-      sret ~ t && $1=="\"title\"" {r["t"]=$2}
+      sret ~ t && $1=="\"title\"" {sub($1":","");r["t"]=$0}
       sret ~ c && $2 ~ "\"class\"" {r["c"]=$3}
       sret ~ i && $1=="\"instance\"" {r["i"]=$2}
       sret ~ d && $1=="\"window\"" {r["d"]=$2}