Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: Menu-driven version of history-beginning-search-backward
- X-seq: zsh-workers 22573
- From: Peter Stephenson <pws@xxxxxxx>
- To: zsh-workers@xxxxxxxxxx (Zsh hackers list)
- Subject: Re: Menu-driven version of history-beginning-search-backward
- Date: Tue, 01 Aug 2006 18:30:31 +0100
- In-reply-to: <200607281008.k6SA8VJQ019635@xxxxxxxxxxxxxx>
- Mailing-list: contact zsh-workers-help@xxxxxxxxxx; run by ezmlm
- References: <200607261638.k6QGcE7E010498@xxxxxxxxxxxxxx> <dc507f4a0607270901r5a4c19f2n20a895b8a831ab3@xxxxxxxxxxxxxx> <060727212432.ZM4920@xxxxxxxxxxxxxxxxxxxxxx> <200607280910.k6S9AmW2018630@xxxxxxxxxxxxxx> <200607281008.k6SA8VJQ019635@xxxxxxxxxxxxxx>
Still tweaking.
Read the keys for the menu separately, so that it will abort on the
first non-digit instead of trying to read all digits first and finding
the first one isn't a digit.
Use HISTNO to get to the history line, consistent with other history
functions; this allows things like accept-line-and-down-history to work
properly. The obvious way to do this was to reverse match on the
history again to get the line number (if it had been possible to extract
a key and a value into separate arrays I'd have done that; everything I
thought of involved looping over the elements). This time I had to get
the quoting of the key exactly right; having done it I put a note in the
manual. I wish we didn't need all these explanatory notes for
subscripts.
Index: Doc/Zsh/params.yo
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Zsh/params.yo,v
retrieving revision 1.29
diff -u -r1.29 params.yo
--- Doc/Zsh/params.yo 12 May 2006 14:58:44 -0000 1.29
+++ Doc/Zsh/params.yo 1 Aug 2006 17:23:25 -0000
@@ -211,6 +211,18 @@
example([[ ${array[(i)pattern]} -le ${#array} ]])
If tt(KSH_ARRAYS) is in effect, the tt(-le) should be replaced by tt(-lt).
+
+Note that in subscripts with both `tt(r)' and `tt(R)' pattern characters
+are active even if they were substituted for a parameter (regardless
+of the setting of tt(GLOB_SUBST) which controls this feature in normal
+pattern matching). It is therefore necessary to quote pattern characters
+for an exact string match. Given a string in tt($key), and assuming
+the tt(EXTENDED_GLOB) option is set, the following is sufficient to
+match an element of an array tt($array) containing exactly the value of
+tt($key):
+
+example(key2=${key//(#m)[\][+LPAR()+RPAR()\\*?#<>]/\\$MATCH}
+print ${array[(R)$key2]})
)
item(tt(R))(
Like `tt(r)', but gives the last match. For associative arrays, gives
Index: Functions/Zle/history-beginning-search-menu
===================================================================
RCS file: /cvsroot/zsh/zsh/Functions/Zle/history-beginning-search-menu,v
retrieving revision 1.2
diff -u -r1.2 history-beginning-search-menu
--- Functions/Zle/history-beginning-search-menu 28 Jul 2006 10:21:07 -0000 1.2
+++ Functions/Zle/history-beginning-search-menu 1 Aug 2006 17:23:25 -0000
@@ -45,7 +45,7 @@
# since they are otherwise active in the reverse subscript.
# We need to avoid quoting other characters since they aren't
# and just stay quoted, rather annoyingly.
- search=${search//(#m)[*?#<>]/\\$MATCH/}
+ search=${search//(#m)[\][()\\*?#<>]/\\$MATCH/}
search=${search// /*}
fi
@@ -69,8 +69,19 @@
display=(${matches/(#m)*/${(l.$width..0.):-$((++i))} $MATCH})
zle -R "Enter digit${${width##1}:+s}:" $display
-local chars
-read -k$width chars
+integer i
+local char chars
+
+# Abort on first non-digit entry instead of requiring all
+# characters to be typed (as "read -k$width chars" would do).
+for (( i = 0; i < $width; i++ )); do
+ read -k char
+ if [[ $char != [[:digit:]] ]]; then
+ zle -R '' $display
+ return 1
+ fi
+ chars+=$char
+done
# Hmmm... this isn't great. The only way of clearing the display
# appears to be to overwrite it completely. I think that's because
@@ -78,25 +89,37 @@
# properly.
display=(${display//?/ })
-if [[ $chars != [[:digit:]]## || $chars -eq 0 || $chars -gt $n ]]; then
+if [[ $chars -eq 0 || $chars -gt $n ]]; then
zle -R '' $display
return 1
fi
-if [[ $WIDGET = *-end* ]]; then
- LBUFFER=${matches[$chars]} RBUFFER=
-else
- integer newcursor
+integer newcursor
+if [[ $WIDGET != *-end* ]]; then
if (( ${+NUMERIC} )); then
# Advance cursor so that it's still after the string typed
local -a match mbegin mend
if [[ $matches[$chars] = (#b)(*${LBUFFER})* ]]; then
- newcursor=${#match[1]}
+ newcursor=${#match[1]}
fi
+ else
+ # Maintain cursor
+ newcursor=$CURSOR
fi
+fi
- BUFFER=${matches[$chars]}
- (( newcursor )) && CURSOR=$newcursor
+# Find the history lines that contain the matched string and
+# go to the last one. This allows accept-line-and-down-history etc.
+# to work.
+local -a lines
+local matchq=${matches[$chars]//(#m)[\][()\\*?#<>]/\\$MATCH}
+lines=(${(kon)history[(R)$matchq]})
+HISTNO=$lines[-1]
+
+if (( newcursor )); then
+ CURSOR=$newcursor
+elif [[ $WIDGET = *-end* ]]; then
+ CURSOR=${#BUFFER}
fi
zle -R '' $display
--
Peter Stephenson <pws@xxxxxxx> Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK Tel: +44 (0)1223 692070
To access the latest news from CSR copy this link into a web browser: http://www.csr.com/email_sig.php
Messages sorted by:
Reverse Date,
Date,
Thread,
Author