Merge branch 'next'

Author: budRich

.gitignore

@@ -1,6 +1,7 @@
 src/*/func/_*
 src/*/.cache/
 src/*/_*
+docs/_*
 
 wiki/
 notes.md

GNUmakefile

@@ -0,0 +1,74 @@
+.PHONY:               \
+	all clean check     \
+	wiki readme manpage \
+	install uninstall   \
+	install-dev uninstall-dev
+
+default: all
+
+.ONESHELL:
+SHELL     := /bin/bash
+
+README_LAYOUT  =         \
+	docs/readme_header.md  \
+	docs/readme_install.md \
+	docs/readme_about.md   \
+	docs/_readme_table.md  \
+	docs/readme_issues.md  \
+	docs/readme_license.md \
+	docs/readme_links.md
+
+ass_dirs            := $(wildcard src/*)
+wiki_mds            := $(ass_dirs:src/%=wiki/doc/%.md)
+wiki_src            := $(ass_dirs:%=%/.cache/wiki.md)
+
+$(wiki_src):
+	@[[ $@ =~ ^(src/[^/]+) ]] && trg=$${BASH_REMATCH[1]}
+	$(MAKE) -C $$trg .cache/wiki.md
+
+wiki: $(wiki_mds)
+
+$(wiki_mds): wiki/doc/%.md : src/%/.cache/wiki.md
+	cat $< > $@	
+
+readme: README.md
+
+README.md: $(README_LAYOUT)
+	cat $^ > $@
+
+docs/_readme_table.md: $(addsuffix /config.mak,$(ass_dirs))
+	@{
+		echo
+		printf '%s\n' "script | description" "|:-|:-|"
+		gawk '
+			$$1 == "NAME" {name=$$3}
+			$$1 == "DESCRIPTION" {
+				printf ("[%s] | %s  \n", name , gensub(".+:= ","",1,$$0))
+			}' $^ 
+	} > $@
+
+ass_names           := $(ass_dirs:src/%=%)
+
+each_check          := $(ass_names:%=%-check)
+each_all            := $(ass_names:%=%-all)
+each_clean          := $(ass_names:%=%-clean)
+each_manpage        := $(ass_names:%=%-manpage)
+each_install        := $(ass_names:%=%-install)
+each_install-dev    := $(ass_names:%=%-install-dev)
+each_uninstall      := $(ass_names:%=%-uninstall)
+each_uninstall-dev  := $(ass_names:%=%-uninstall-dev)
+
+each_each := $(each_check) $(each_all) $(each_clean) $(each_manpage) $(each_install) $(each_install-dev) $(each_uninstall) $(each_uninstall-dev)
+
+check:         $(each_check)
+all:           $(each_all)
+clean:         $(each_clean)
+manpage:       $(each_manpage)
+install:       $(each_install)
+install-dev:   $(each_install-dev)
+uninstall:     $(each_uninstall)
+uninstall-dev: $(each_uninstall-dev)
+
+$(each_each):
+	@v=$@ action=$${v#*-} name=$${v%%-*}
+	$(MAKE) -C src/$$name $$action

Makefile

@@ -50,7 +50,7 @@ script | description
 [i3gw] | a ghost window wrapper for i3wm  
 [i3king] | window ruler  
 [i3Kornhe] | move and resize windows gracefully  
-[i3list] | list information about the current i3 session.  
+[i3list] | list information about the current i3 session  
 [i3menu] | Adds more features to rofi when used in i3wm  
 [i3run] | Run, Raise or hide windows in i3wm  
 [i3var] | get or get a i3 variable  

README.md

@@ -1,9 +1,23 @@
-### 2022.05.21
+#### i3ass
 
-#### bashbud
+Fixed an issue in `share/main.awk` . Titles containing
+a colon (`:`) character where not being captured by
+f.i. `i3get -r o`. #174 thanks @DominikMarcinowski
+
+#### i3run
+
+Added `--silent` option
+
+#### i3king
+
+fixed issue where commented lines ending with backslash
+concatenated the next line.  
+
+added support for `$ROLE and $TYPE` variables in config.
+
+#### i3get
+
+added `--timeout SECONDS` option. To adjust the timeout
+before `--synk` stops waiting for a window (default 60s)
 
-fixed issue reported in #170, that made all scripts 
-broken (tried to start main() passing `@$` instead of `$@`).
 
-Fixed issue that made all programs look like they 
-where updated on the installation data.

docs/readme_table.md

@@ -0,0 +1,9 @@
+### 2022.05.21
+
+#### bashbud
+
+fixed issue reported in #170, that made all scripts 
+broken (tried to start main() passing `@$` instead of `$@`).
+
+Fixed issue that made all programs look like they 
+where updated on the installation data.

docs/releasenotes/0next.md

@@ -0,0 +1,9 @@
+#### i3fyra
+
+Added "redo" functionality to `--layout`:  
+`i3fyra --layout redo`
+
+#### i3list
+
+New key: **RED**, contains the last layout applied
+with `i3fyra --layout`. Needed for `i3fyra --layout redo`.

docs/releasenotes/2022.05.21.md

@@ -1,4 +1,42 @@
-$(NF-1) ~ /"(class|current_border_width|floating|focus|focused|fullscreen_mode|id|instance|layout|marks|name|num|output|sticky|title_format|type|urgent|window|window_role|window_type|x)"$/ {
+# name|title_format field holds the title, it is the value that
+# is trickiest to capture since it can contain 
+# double quotes, commas (RS) and colon (FS).
+# therefor it is handled here separate from the other
+# keys, which always are at NF-1.
+$1 ~ /"(name|title_format)"/ {
+  key=gensub(/"/,"","g",$1)
+  
+  title=gensub(/^"(name|title_format)":/,"","1",$0)
+  title=gensub(/\\"/,"@@_DQ_@@","g",title)
+
+  # this makes sure to capture titles with escaped quotes
+  # and commas.
+  while (title ~ /[^"]$/ && title != "null") {
+    getline
+    title = title "," gensub(/\\"/,"@@_DQ_@@","g",$0)
+  }
+  title=gensub("@@_DQ_@@","\"","g",title)
+
+  ac[cid][key]=title
+
+  if ( key in arg_search && match(title, arg_search[key]) )
+    suspect_targets[cid]=1
+
+  # store output container id in separate array
+  if ( ac[cid]["type"] ~ /"output"/ && $NF !~ /__i3/)
+    outputs[$NF]=cid
+
+  else if (ac[cid]["type"] == "\"workspace\"") {
+
+    if ($NF == "\"" i3fyra_workspace_name "\"")
+      i3fyra_workspace_id = cid
+
+    else if ($NF == "\"__i3_scratch\"")
+      scratchpad_id = cid
+  }
+}
+
+$(NF-1) ~ /"(class|current_border_width|floating|focus|focused|fullscreen_mode|id|instance|layout|marks|num|output|sticky|type|urgent|window|window_role|window_type|x)"$/ {
 
   key=gensub(/.*"([^"]+)"$/,"\\1","g",$(NF-1))
 
@@ -16,42 +54,12 @@ $(NF-1) ~ /"(class|current_border_width|floating|focus|focused|fullscreen_mode|i
     case "window_role":
     case "class":
     case "instance":
-    case "title_format":
     case "type":
       ac[cid][key]=$NF
       if ( key in arg_search && $NF == "\""arg_search[key]"\"" )
         suspect_targets[cid]=1
     break
 
-    case "name":
-      # this makes sure to capture titles with escaped quotes
-      # and commas.
-      title=gensub(/\\"/,"@@_DQ_@@","g",$NF)
-      while (title ~ /[^"]$/ && title != "null") {
-        getline
-        title = title "," gensub(/\\"/,"@@_DQ_@@","g",$0)
-      }
-      title=gensub("@@_DQ_@@","\"","g",title)
-
-      ac[cid][key]=title
-
-      if ( key in arg_search && match(title, arg_search[key]) )
-        suspect_targets[cid]=1
-
-      # store output container id in separate array
-      if ( ac[cid]["type"] ~ /"output"/ && $NF !~ /__i3/)
-        outputs[$NF]=cid
-
-      else if (ac[cid]["type"] == "\"workspace\"") {
-
-        if ($NF == "\"" i3fyra_workspace_name "\"")
-          i3fyra_workspace_id = cid
-
-        else if ($NF == "\"__i3_scratch\"")
-          scratchpad_id = cid
-      }
-    break
-
     case "id":
       # when "nodes": (or "floating_nodes":) and "id":
       # is on the same record.

docs/releasenotes/2022.06.05.md

@@ -1,5 +1,5 @@
 NAME         := i3flip
-VERSION      := 0.101
+VERSION      := 0.105
 CREATED      := 2018-01-03
 UPDATED      := 2022-05-21
 AUTHOR       := budRich

share/main.awk

@@ -4,7 +4,7 @@ trap 'CLEANUP' EXIT INT HUP
 
 CLEANUP() {
 
-  [[ -f /tmp/i3flip_lock ]] && rm /tmp/i3flip_lock
+  [[ -f /tmp/i3flip_lock ]] && rm -f /tmp/i3flip_lock
 
   [[ -n $_msgstring ]] && {
     ((_o[verbose])) || qflag='-q'

src/i3Kornhe/Makefile src/i3Kornhe/GNUmakefile

@@ -1,7 +1,7 @@
 NAME         := i3fyra
-VERSION      := 1.25
+VERSION      := 1.35
 CREATED      := 2017-01-14
-UPDATED      := 2022-05-21
+UPDATED      := 2022-06-05
 AUTHOR       := budRich
 CONTACT      := https://github.com/budlabs/i3ass
 USAGE        := options

src/i3flip/Makefile src/i3flip/GNUmakefile

@@ -1,8 +1,13 @@
 update the size of the layout  
 
-AB is on X axis from the left side if INT is
-positive, from the right side if it is negative.
-AC and BD is on Y axis from the top if INT is
-positive, from the bottom if it is negative. The
-whole argument needs to be quoted. Example:   `$
-i3fyra --layout 'AB=-300 BD=420'
+AB is point on the X axis, calculated from the
+left side if INT is positive, from the right side
+if it is negative. AC and BD is on Y axis from
+the top if INT is positive, from the bottom if it
+is negative. The whole argument needs to be
+quoted. Example:  
+
+`i3fyra --layout 'AB=-300 BD=420'
+
+LAYOUT argument can also be the word 'redo', if it
+is, the last layout appended will be restored.

src/i3flip/config.mak

@@ -4,10 +4,18 @@ apply_splits(){
 
   ((_o[verbose])) && ERM "f ${FUNCNAME[0]}($*)"
 
-  local i tsn dir target sibling
-  declare -i tsv splitexist size 
+  local i tsn dir target sibling layout_string last_layout
+  declare -i tsv splitexist size
 
-  for i in ${1}; do
+  if [[ ${_o[layout]} = redo ]]
+    then layout_string=${i3list[RED]//:/ }
+    else layout_string=$1
+  fi
+
+  [[ $layout_string =~ = ]] \
+    || ERX "$layout_string is not a valid layout"
+
+  for i in ${layout_string}; do
     tsn=${i%=*} # target split name
     tsv=${i#*=} # target split value
 
@@ -36,6 +44,8 @@ apply_splits(){
 
     ((tsv<0)) && tsv=$((size-(tsv*-1)))
 
+    last_layout+="${tsn}=${i3list[S${tsn}]}:"
+
     ((splitexist)) && {
       # i3list[Sxx] = current/actual split xx
       i3list[S${tsn}]=${tsv}
@@ -47,4 +57,7 @@ apply_splits(){
     mark_vars["i34M${tsn}"]=$tsv
 
   done
+
+  # store last_layout for --layout redo
+  [[ ${_o[layout]} ]] && mark_vars["i34RED"]=$last_layout
 }