mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00
Code Releases Activity

36650: Add zle-line-pre-redraw hook for highlighting

Browse source
This commit is contained in:
Mikael Magnusson 2015-12-16 06:51:54 +01:00
parent 1f2bdc2aa2
commit c3ea3ffa73
3 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2015-12-19 Mikael Magnusson <mikachu@gmail.com>
* 36650: Doc/Zsh/zle.yo, Src/Zle/zle_main.c: Add
zle-line-pre-redraw hook for highlighting
2015-12-19 Daniel Shahaf <d.s@daniel.shahaf.name>
* unposted (after users/20873): Functions/Zle/edit-command-line:

5
Doc/Zsh/zle.yo
View file

@ -1087,6 +1087,11 @@ widget:
example(zle-isearch-exit+LPAR()RPAR() { zle -M ""; }
zle -N zle-isearch-exit)
)
tindex(zle-line-pre-redraw)
item(tt(zle-line-pre-redraw))(
Executed whenever the input line is about to be redrawn, providing an
opportunity to update the region_highlight array.
)
tindex(zle-line-init)
item(tt(zle-line-init))(
Executed every time the line editor is started to read a new line

31
Src/Zle/zle_main.c
View file

@ -1025,6 +1025,31 @@ getrestchar(int inchar, char *outstr, int *outcount)
/**/
#endif
static void redrawhook()
{
Thingy initthingy;
if ((initthingy = rthingy_nocreate("zle-line-pre-redraw"))) {
int lastcmd_prev = lastcmd;
int old_incompfunc = incompfunc;
char *args[2];
Thingy lbindk_save = lbindk, bindk_save = bindk;
refthingy(lbindk_save);
refthingy(bindk_save);
args[0] = initthingy->nam;
args[1] = NULL;
incompfunc = 0;
execzlefunc(initthingy, args, 0);
incompfunc = old_incompfunc;
unrefthingy(initthingy);
unrefthingy(lbindk);
unrefthingy(bindk);
lbindk = lbindk_save;
bindk = bindk_save;
/* we can't set ZLE_NOTCOMMAND since it's not a legit widget, so
* restore lastcmd manually so that we don't mess up the global state */
lastcmd = lastcmd_prev;
}
}
/**/
void
@ -1084,6 +1109,8 @@ zlecore(void)
errflag |= ERRFLAG_ERROR;
break;
}
redrawhook();
#ifdef HAVE_POLL
if (baud && !(lastcmd & ZLE_MENUCMP)) {
struct pollfd pfd;
@ -1113,6 +1140,7 @@ zlecore(void)
zrefresh();
freeheap();
}
region_active = 0;
@ -1191,7 +1219,7 @@ zleread(char **lp, char **rp, int flags, int context, char *init, char *finish)
vistartchange = -1;
zleline = (ZLE_STRING_T)zalloc(((linesz = 256) + 2) * ZLE_CHAR_SIZE);
*zleline = ZWC('\0');
virangeflag = lastcmd = done = zlecs = zlell = mark = 0;
virangeflag = lastcmd = done = zlecs = zlell = mark = yankb = yanke = 0;
vichgflag = 0;
viinsbegin = 0;
statusline = NULL;
@ -1812,6 +1840,7 @@ recursiveedit(UNUSED(char **args))
{
int locerror;
redrawhook();
zrefresh();
zlecore();