Skip to content

Commit

Permalink
decode (ble-bind): support combined option arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
@akinomyoga
akinomyoga committed May 22, 2024
1 parent cbf87fd commit 1b16d39
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 48 deletions.
1 change: 1 addition & 0 deletions docs/ChangeLog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
- main: export `BLE_SESSION_ID` `#D2188` 5871fea2
- menu-complete: adjust cursor position with `insert-selection` disabled (reported by gvlassis) `#D2206` xxxxxxxx
- decode (`ble-bind`): do not convert registered C0 (motivated by gvlassis) `#D2210` xxxxxxxx
- decode (`ble-bind`): support combined option arguments of the forms `--long=OPTARG` and `-kOPTARG` `#D2211` xxxxxxxx

## Fixes

Expand Down
5 changes: 5 additions & 0 deletions note.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7388,6 +7388,11 @@ bash_tips

2024-05-22

* decode(ble-bind): combined options 対応 [#D2211]

#D2210 の対応中に気になったが #D2210 の中に含めるには大きいので分ける事にし
た。実際 #D2210 の変更とは overlap が全くない。簡単にテストした。

* decode (ble-bind): ble-bind -k TAB TAB で TAB をそのまま透過する様にできたら良い気がする (motivated by gvlassis) [#D2210]
https://github.com/akinomyoga/ble.sh/issues/445

Expand Down
122 changes: 74 additions & 48 deletions src/decode.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3178,16 +3178,35 @@ CURSOR_CODE
EOF
}

function ble-bind/check-argument {
if (($3<$2)); then
## @fn ble-bind/get-optarg label count [has_optarg optarg | optarg]
## @param[in] has_optarg optarg
## When the third argument is non-empty, ${4-$3} is used as the first
## optional argument.
## @arr[out] optarg
function ble-bind/get-optarg {
optarg=()
local label=$1 req=$2
((req>=1)) || return 0

if [[ $3 ]]; then
((req--))
ble/array#push optarg "${4-$3}"
fi
((req>=1)) || return 0

if ((${#args[@]}-iarg<req)); then
flags=E$flags
if (($2==1)); then
ble/util/print "ble-bind: the option \`$1' requires an argument." >&2
if ((req==1)); then
ble/util/print "ble-bind: the option \`$label' requires an argument." >&2
else
ble/util/print "ble-bind: the option \`$1' requires $2 arguments." >&2
ble/util/print "ble-bind: the option \`$label' requires $req arguments." >&2
fi
return 2
fi

ble/array#push optarg "${args[@]:iarg:req}"
((iarg+=req))
return 0
}

function ble-bind/option:csi {
Expand Down Expand Up @@ -3317,31 +3336,43 @@ function ble-bind {
local -a keymaps; keymaps=()
ble/decode/initialize

local arg c
while (($#)); do
local arg=$1; shift
local -a args
args=("$@")
local iarg=0 arg c optarg
while ((iarg<$#)); do
local arg=${args[iarg++]}
if [[ $arg == --?* ]]; then
case ${arg:2} in
(color|color=always)
flags=c${flags//[cn]} ;;
(color=never)
flags=n${flags//[cn]} ;;
(color=auto)
flags=${flags//[cn]} ;;
local name=${arg:2} has_optarg= optarg=
if [[ $name == *=* ]]; then
has_optarg=set
optarg=${name#*=}
name=${name%%=*}
fi

case $name in
(color)
if [[ ! $has_optarg || $optarg == always ]]; then
flags=c${flags//[cn]}
elif [[ $optarg == never ]]; then
flags=n${flags//[cn]}
elif [[ $optarg == auto ]]; then
flags=${flags//[cn]}
else
flags=E$flags
ble/util/print "ble-bind: unrecognized color '--color=$optarg'." >&2
fi ;;
(help)
ble-bind/option:help
flags=D$flags ;;
(csi)
flags=D$flags
ble-bind/check-argument --csi 2 "$#" || break
ble-bind/option:csi "$1" "$2"
shift 2 ;;
ble-bind/get-optarg --csi 2 "$has_optarg" "$optarg" || break
ble-bind/option:csi "${optarg[0]}" "${optarg[1]}" ;;
(cursor)
flags=D$flags
ble-bind/check-argument --cursor 1 "$#" || break
ble-bind/get-optarg --cursor 1 "$has_optarg" "$optarg" || break
ble-bind/.initialize-kmap &&
ble/decode/keymap#set-cursor "$kmap" "$1"
shift 1 ;;
ble/decode/keymap#set-cursor "$kmap" "${optarg[0]}" ;;
(list-widgets|list-functions)
flags=D$flags
ble-bind/option:list-widgets ;;
Expand All @@ -3362,31 +3393,26 @@ function ble-bind {
case $c in
(k)
flags=D$flags
if (($#<2)); then
ble/util/print "ble-bind: the option \`-k' requires two arguments." >&2
flags=E$flags
break
fi
ble-bind/get-optarg -k 2 "$arg" || break 2
arg=

ble-decode-kbd "$1"; local cseq=$ret
if [[ $2 && $2 != - ]]; then
ble-decode-kbd "$2"; local kc=$ret
ble-decode-kbd "${optarg[0]}"; local cseq=$ret
if [[ ${optarg[1]} && ${optarg[1]} != - ]]; then
ble-decode-kbd "${optarg[1]}"; local kc=$ret
ble-decode-char/bind "$cseq" "$kc"
else
ble-decode-char/unbind "$cseq"
fi
shift 2 ;;
fi ;;
(m)
ble-bind/check-argument -m 1 "$#" || break
if ! ble/decode/is-keymap "$1"; then
ble/util/print "ble-bind: the keymap '$1' is unknown." >&2
ble-bind/get-optarg -m 1 "$arg" || break 2
arg=
if ! ble/decode/is-keymap "$optarg"; then
ble/util/print "ble-bind: the keymap '$optarg' is unknown." >&2
flags=E$flags
shift
continue
fi
kmap=$1
ble/array#push keymaps "$1"
shift ;;
kmap=$optarg
ble/array#push keymaps "$optarg" ;;
(D)
flags=D$flags
ble-bind/option:dump "${keymaps[@]}" ;;
Expand All @@ -3398,11 +3424,12 @@ function ble-bind {

# 旧形式の指定 -xf や -cf に対応する処理
[[ $c != f && $arg == f* ]] && arg=${arg:1}
ble-bind/check-argument "-$c" 2 "$#" || break
ble-bind/get-optarg "-$c" 2 "$arg" || break 2
arg=

ble-decode-kbd "$1"; local kbd=$ret
if [[ $2 && $2 != - ]]; then
local command=$2
ble-decode-kbd "${optarg[0]}"; local kbd=$ret
if [[ ${optarg[1]} && ${optarg[1]} != - ]]; then
local command=${optarg[1]}

# コマンドの種類
case $c in
Expand All @@ -3421,15 +3448,14 @@ function ble-bind {
else
ble-bind/.initialize-kmap &&
ble-decode-key/unbind "$kmap" "$kbd"
fi
shift 2 ;;
fi ;;
(T)
flags=D$flags
ble-decode-kbd "$1"; local kbd=$ret
ble-bind/check-argument -T 2 "$#" || break
ble-bind/get-optarg -T 2 "$arg" || break 2
arg=
ble-decode-kbd "${optarg[0]}"; local kbd=$ret
ble-bind/.initialize-kmap &&
ble-decode-key/set-timeout "$kmap" "$kbd" "$2"
shift 2 ;;
ble-decode-key/set-timeout "$kmap" "$kbd" "${optarg[1]}" ;;
(L)
flags=D$flags
ble-bind/option:list-widgets ;;
Expand Down

0 comments on commit 1b16d39

Please sign in to comment.