summaryrefslogtreecommitdiff
path: root/Src/Zle
diff options
context:
space:
mode:
Diffstat (limited to 'Src/Zle')
-rw-r--r--Src/Zle/complist.c182
-rw-r--r--Src/Zle/compresult.c12
-rw-r--r--Src/Zle/zle.h28
-rw-r--r--Src/Zle/zle_keymap.c10
-rw-r--r--Src/Zle/zle_main.c8
-rw-r--r--Src/Zle/zle_thingy.c8
-rw-r--r--Src/Zle/zle_tricky.c8
-rw-r--r--Src/Zle/zle_utils.c65
8 files changed, 241 insertions, 80 deletions
diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c
index 3c94ae11b..0b6601cea 100644
--- a/Src/Zle/complist.c
+++ b/Src/Zle/complist.c
@@ -548,22 +548,136 @@ clprintfmt(Listcols c, char *p, int ml)
return 0;
}
-/* Local version of nicezputs() with in-string colouring. */
+/*
+ * Local version of nicezputs() with in-string colouring
+ * and scrolling.
+ */
static int
-clnicezputs(Listcols c, char *s, int ml)
+clnicezputs(Listcols colors, char *s, int ml)
{
- int cc, i = 0, col = 0, ask, oml = ml;
+ int i = 0, col = 0, ask, oml = ml;
char *t;
+ ZLE_CHAR_T cc;
+#ifdef ZLE_UNICODE_SUPPORT
+ /*
+ * ums is the untokenized, unmetafied string (length umlen)
+ * uptr is a pointer into it
+ * sptr is the start of the nice character representation
+ * wptr is the point at which the wide character itself starts
+ * (but may be the end of the string if the character was fully
+ * prettified).
+ * ret is the return status from the conversion to a wide character
+ * umleft is the remaining length of the unmetafied string to output
+ * umlen is the full length of the unmetafied string
+ * width is the full printing width of a prettified character,
+ * including both ASCII prettification and the wide character itself.
+ * ps is the shift state of the conversion to wide characters.
+ */
+ char *ums, *uptr, *sptr, *wptr;
+ int ret, umleft, umlen, width;
+ mbstate_t ps;
- initiscol(c);
+ memset(&ps, 0, sizeof(ps));
+ ums = ztrdup(s);
+ untokenize(ums);
+ uptr = unmetafy(ums, &umlen);
+ umleft = umlen;
- while ((cc = *s++)) {
- doiscol(c, i++);
+ if (colors)
+ initiscol(colors);
+
+ while (umleft > 0) {
+ ret = mbrtowc(&cc, uptr, umleft, &ps);
+
+ if (ret <= 0)
+ {
+ /*
+ * Eek! Now we're stuffed. I'm just going to
+ * make this up... Note that this may also handle
+ * an input NULL, which we want to be a real character
+ * rather than terminator.
+ */
+ sptr = nicechar(*s);
+ /* everything here is ASCII... */
+ width = strlen(sptr);
+ wptr = sptr + width;
+ ret = 1;
+ }
+ else
+ {
+ sptr = wcs_nicechar(cc, &width, &wptr);
+ }
+
+ umleft -= ret;
+ uptr += ret;
+ if (colors) {
+ /*
+ * The code for the colo[u]ri[s/z]ation is obscure (surprised?)
+ * but if we do it for every input character, as we do in
+ * the simple case, we shouldn't go too far wrong.
+ */
+ while (ret--)
+ doiscol(colors, i++);
+ }
+
+ /*
+ * Loop over characters in the output of the nice
+ * representation. This will often correspond to one input
+ * (possibly multibyte) character.
+ */
+ for (t = sptr; *t; t++) {
+ /* Input is metafied... */
+ int nc = (*t == Meta) ? STOUC(*++t ^ 32) : STOUC(*t);
+ /* Is the screen full? */
+ if (ml == mlend - 1 && col == columns - 1) {
+ mlprinted = ml - oml;
+ return 0;
+ }
+ if (t < wptr) {
+ /* outputting ASCII, so single-width */
+ putc(nc, shout);
+ col++;
+ width--;
+ } else {
+ /* outputting a single wide character, do the lot */
+ putc(nc, shout);
+ /* don't check column until finished */
+ if (t[1])
+ continue;
+ /* now we've done the entire rest of the representation */
+ col += width;
+ }
+ /*
+ * There might be problems with characters of printing width
+ * greater than one here.
+ */
+ if (col >= columns) {
+ ml++;
+ if (mscroll && !--mrestlines && (ask = asklistscroll(ml))) {
+ mlprinted = ml - oml;
+ return ask;
+ }
+ col -= columns;
+ if (colors)
+ fputs(" \010", shout);
+ }
+ }
+ }
+
+ free(ums);
+#else
+
+ if (colors)
+ initiscol(colors);
+
+ while ((cc = *s)) {
+ if (colors)
+ doiscol(colors, i++);
if (itok(cc)) {
if (cc <= Comma)
cc = ztokens[cc - Pound];
- else
+ else
continue;
}
if (cc == Meta)
@@ -583,10 +697,12 @@ clnicezputs(Listcols c, char *s, int ml)
return ask;
}
col = 0;
- fputs(" \010", shout);
+ if (colors)
+ fputs(" \010", shout);
}
}
}
+#endif
mlprinted = ml - oml;
return 0;
}
@@ -959,46 +1075,6 @@ compzputs(char const *s, int ml)
return 0;
}
-/* This is like nicezputs(), but allows scrolling. */
-
-/**/
-static int
-compnicezputs(char *s, int ml)
-{
- int c, col = 0, ask, oml = ml;
- char *t;
-
- while ((c = *s++)) {
- if (itok(c)) {
- if (c <= Comma)
- c = ztokens[c - Pound];
- else
- continue;
- }
- if (c == Meta)
- c = *s++ ^ 32;
-
- for (t = nicechar(c); *t; t++) {
- int nc = (*t == Meta) ? STOUC(*++t ^ 32) : STOUC(*t);
- if (ml == mlend - 1 && col == columns - 1) {
- mlprinted = ml - oml;
- return 0;
- }
- putc(nc, shout);
- if (++col == columns) {
- ml++;
- if (mscroll && !--mrestlines && (ask = asklistscroll(ml))) {
- mlprinted = ml - oml;
- return ask;
- }
- col = 0;
- }
- }
- }
- mlprinted = ml - oml;
- return 0;
-}
-
/**/
static int
compprintlist(int showall)
@@ -1458,7 +1534,7 @@ clprintm(Cmgroup g, Cmatch *mp, int mc, int ml, int lastc, int width)
}
}
if (!dolist(ml)) {
- mlprinted = niceztrlen(m->disp ? m->disp : m->str) / columns;
+ mlprinted = ZMB_nicewidth(m->disp ? m->disp : m->str) / columns;
return 0;
}
if (m->gnum == mselect) {
@@ -1479,15 +1555,13 @@ clprintm(Cmgroup g, Cmatch *mp, int mc, int ml, int lastc, int width)
else
subcols = putmatchcol(&mcolors, g->name, (m->disp ? m->disp : m->str));
- if (subcols)
- ret = clnicezputs(&mcolors, (m->disp ? m->disp : m->str), ml);
- else
- ret = compnicezputs((m->disp ? m->disp : m->str), ml);
+ ret = clnicezputs(subcols ? &mcolors : NULL,
+ (m->disp ? m->disp : m->str), ml);
if (ret) {
zcoff();
return 1;
}
- len = niceztrlen(m->disp ? m->disp : m->str);
+ len = ZMB_nicewidth(m->disp ? m->disp : m->str);
mlprinted = len / columns;
if ((g->flags & CGF_FILES) && m->modec) {
diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c
index d80a60ac1..ad8c8ea62 100644
--- a/Src/Zle/compresult.c
+++ b/Src/Zle/compresult.c
@@ -1509,7 +1509,7 @@ calclist(int showall)
nlines += 1 + printfmt(m->disp, 0, 0, 0);
g->flags |= CGF_HASDL;
} else {
- l = niceztrlen(m->disp);
+ l = ZMB_nicewidth(m->disp);
ndisp++;
if (l > glong)
glong = l;
@@ -1524,7 +1524,7 @@ calclist(int showall)
if (!(m->flags & CMF_ROWS))
g->flags &= ~CGF_ROWS;
} else {
- l = niceztrlen(m->str) + !!m->modec;
+ l = ZMB_nicewidth(m->str) + !!m->modec;
ndisp++;
if (l > glong)
glong = l;
@@ -2146,11 +2146,19 @@ iprintm(Cmgroup g, Cmatch *mp, UNUSED(int mc), UNUSED(int ml), int lastc, int wi
printfmt(m->disp, 0, 1, 0);
return;
}
+#ifdef ZLE_UNICODE_SUPPORT
+ len = mb_niceformat(m->disp, shout, NULL);
+#else
nicezputs(m->disp, shout);
len = niceztrlen(m->disp);
+#endif
} else {
+#ifdef ZLE_UNICODE_SUPPORT
+ len = mb_niceformat(m->str, shout, NULL);
+#else
nicezputs(m->str, shout);
len = niceztrlen(m->str);
+#endif
if ((g->flags & CGF_FILES) && m->modec) {
putc(m->modec, shout);
diff --git a/Src/Zle/zle.h b/Src/Zle/zle.h
index fbfc02265..26a27fe09 100644
--- a/Src/Zle/zle.h
+++ b/Src/Zle/zle.h
@@ -50,6 +50,7 @@ typedef wint_t ZLE_INT_T;
#define ZLEEOF WEOF
+/* Functions that operate on a ZLE_STRING_T. */
#define ZS_memcpy wmemcpy
#define ZS_memmove wmemmove
#define ZS_memset wmemset
@@ -61,9 +62,16 @@ typedef wint_t ZLE_INT_T;
#define ZS_zarrdup wcs_zarrdup
#define ZS_width wcslen
#define ZS_strchr wcschr
-#define ZS_zputs wcs_zputs
-#define ZS_nicewidth wcs_niceztrlen
+/*
+ * Functions that operate on a metafied string.
+ * These versions handle multibyte characters.
+ */
+#define ZMB_nicewidth(s) mb_niceformat(s, NULL, NULL)
+#define ZMB_niceputs(s, stream) (void)mb_niceformat(s, stream, NULL)
+#define ZMB_niceztrdup(s) mb_niceztrdup(s)
+
+/* Functions that operate on ZLE_CHAR_T. */
#define ZC_iblank iswspace
#define ZC_icntrl iswcntrl
#define ZC_iident wcsiident
@@ -72,6 +80,8 @@ typedef wint_t ZLE_INT_T;
#define ZC_toupper towupper
#define ZC_iword wcsiword
+#define ZC_nicechar(c) wcs_nicechar(c, NULL, NULL)
+
#define LASTFULLCHAR lastchar_wide
#else /* Not ZLE_UNICODE_SUPPORT: old single-byte code */
@@ -87,6 +97,7 @@ typedef int ZLE_INT_T;
#define ZLEEOF EOF
+/* Functions that operate on a ZLE_STRING_T. */
#define ZS_memcpy memcpy
#define ZS_memmove memmove
#define ZS_memset memset
@@ -94,8 +105,16 @@ typedef int ZLE_INT_T;
#define ZS_zarrdup zarrdup
#define ZS_width ztrlen
#define ZS_strchr strchr
-#define ZS_zputs zputs
-#define ZS_nicewidth niceztrlen
+
+/*
+ * Functions that operate on a metafied string.
+ * These versions don't handle multibyte characters.
+ */
+#define ZMB_nicewidth niceztrlen
+#define ZMB_niceputs nicezputs
+#define ZMB_niceztrdup(s) nicedup(s, 0)
+
+#define ZC_nicechar nicechar
#ifdef __GNUC__
static inline size_t ZS_strlen(ZLE_STRING_T s)
@@ -113,6 +132,7 @@ static inline int ZS_strncmp(ZLE_STRING_T s1, ZLE_STRING_T s2, size_t l)
#define ZS_strncmp(s1,s2,l) strncmp((char*)(s1),(char*)(s2),(l))
#endif
+/* Functions that operate on ZLE_CHAR_T. */
#define ZC_iblank iblank
#define ZC_icntrl icntrl
#define ZC_iident iident
diff --git a/Src/Zle/zle_keymap.c b/Src/Zle/zle_keymap.c
index 3045eddd8..442efec9b 100644
--- a/Src/Zle/zle_keymap.c
+++ b/Src/Zle/zle_keymap.c
@@ -389,7 +389,7 @@ selectkeymap(char *name, int fb)
Keymap km = openkeymap(name);
if(!km) {
- char *nm = niceztrdup(name);
+ char *nm = ZMB_niceztrdup(name);
char *msg = tricat("No such keymap `", nm, "'");
zsfree(nm);
@@ -725,7 +725,7 @@ scanlistmaps(HashNode hn, int list)
fputs("-- ", stdout);
quotedzputs(n->nam, stdout);
} else
- nicezputs(n->nam, stdout);
+ ZMB_niceputs(n->nam, stdout);
putchar('\n');
}
@@ -1048,8 +1048,10 @@ bindlistout(struct bindstate *bs)
}
putchar(' ');
if(bs->bind) {
- ((bs->flags & BS_LIST) ? quotedzputs : nicezputs)
- (bs->bind->nam, stdout);
+ if (bs->flags & BS_LIST)
+ quotedzputs(bs->bind->nam, stdout);
+ else
+ ZMB_niceputs(bs->bind->nam, stdout);
} else
printbind(bs->str, stdout);
putchar('\n');
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c
index 923145710..683771701 100644
--- a/Src/Zle/zle_main.c
+++ b/Src/Zle/zle_main.c
@@ -1049,7 +1049,7 @@ execzlefunc(Thingy func, char **args)
if(func->flags & DISABLED) {
/* this thingy is not the name of a widget */
- char *nm = niceztrdup(func->nam);
+ char *nm = ZMB_niceztrdup(func->nam);
char *msg = tricat("No such widget `", nm, "'");
zsfree(nm);
@@ -1105,7 +1105,7 @@ execzlefunc(Thingy func, char **args)
if(prog == &dummy_eprog) {
/* the shell function doesn't exist */
- char *nm = niceztrdup(w->u.fnnam);
+ char *nm = ZMB_niceztrdup(w->u.fnnam);
char *msg = tricat("No such shell function `", nm, "'");
zsfree(nm);
@@ -1423,7 +1423,7 @@ describekeybriefly(UNUSED(char **args))
if (!func)
is = bindztrdup(str);
else
- is = niceztrdup(func->nam);
+ is = ZMB_niceztrdup(func->nam);
msg = appstr(msg, is);
zsfree(is);
showmsg(msg);
@@ -1467,7 +1467,7 @@ whereis(UNUSED(char **args))
if (!(ff.func = executenamedcommand("Where is: ")))
return 1;
ff.found = 0;
- ff.msg = niceztrdup(ff.func->nam);
+ ff.msg = ZMB_niceztrdup(ff.func->nam);
scankeymap(curkeymap, 1, scanfindfunc, &ff);
if (!ff.found)
ff.msg = appstr(ff.msg, " is not bound to any key");
diff --git a/Src/Zle/zle_thingy.c b/Src/Zle/zle_thingy.c
index d756b94e6..56e0c51cb 100644
--- a/Src/Zle/zle_thingy.c
+++ b/Src/Zle/zle_thingy.c
@@ -519,15 +519,15 @@ scanlistwidgets(HashNode hn, int list)
quotedzputs(w->u.fnnam, stdout);
}
} else {
- nicezputs(t->nam, stdout);
+ ZMB_niceputs(t->nam, stdout);
if (w->flags & WIDGET_NCOMP) {
fputs(" -C ", stdout);
- nicezputs(w->u.comp.wid, stdout);
+ ZMB_niceputs(w->u.comp.wid, stdout);
fputc(' ', stdout);
- nicezputs(w->u.comp.func, stdout);
+ ZMB_niceputs(w->u.comp.func, stdout);
} else if(strcmp(t->nam, w->u.fnnam)) {
fputs(" (", stdout);
- nicezputs(w->u.fnnam, stdout);
+ ZMB_niceputs(w->u.fnnam, stdout);
fputc(')', stdout);
}
}
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
index ee448d3bd..1b9986fb2 100644
--- a/Src/Zle/zle_tricky.c
+++ b/Src/Zle/zle_tricky.c
@@ -2120,7 +2120,7 @@ listlist(LinkList l)
(int (*) _((const void *, const void *))) strbpcmp);
for (p = data, lenp = lens; *p; p++, lenp++) {
- len = *lenp = niceztrlen(*p) + 2;
+ len = *lenp = ZMB_nicewidth(*p) + 2;
if (len > longest)
longest = len;
if (len < shortest)
@@ -2244,7 +2244,7 @@ listlist(LinkList l)
if (isset(LISTROWSFIRST)) {
for (col = 1, p = data, lenp = lens; *p;
p++, lenp++, col++) {
- nicezputs(*p, shout);
+ ZMB_niceputs(*p, shout);
if (col == ncols) {
col = 0;
if (p[1])
@@ -2262,7 +2262,7 @@ listlist(LinkList l)
for (f = data, fl = lens, line = 0; line < nlines;
f++, fl++, line++) {
for (col = 1, p = f, lenp = fl; *p; col++) {
- nicezputs(*p, shout);
+ ZMB_niceputs(*p, shout);
if (col == ncols)
break;
if ((i = (pack ? widths[col - 1] : longest) - *lenp + 2) > 0)
@@ -2276,7 +2276,7 @@ listlist(LinkList l)
}
} else {
for (p = data; *p; p++) {
- nicezputs(*p, shout);
+ ZMB_niceputs(*p, shout);
putc('\n', shout);
}
}
diff --git a/Src/Zle/zle_utils.c b/Src/Zle/zle_utils.c
index 2e358f489..cfc77de27 100644
--- a/Src/Zle/zle_utils.c
+++ b/Src/Zle/zle_utils.c
@@ -769,19 +769,75 @@ printbind(char *str, FILE *stream)
return ret;
}
-/* Display a message where the completion list normally goes. *
- * The message must be metafied. */
+/*
+ * Display a message where the completion list normally goes.
+ * The message must be metafied.
+ *
+ * TODO: there's some advantage in using a ZLE_STRING_T array here,
+ * together with improvements in other places, but messages don't
+ * need to be particularly efficient.
+ */
/**/
mod_export void
showmsg(char const *msg)
{
char const *p;
- int up = 0, cc = 0, c;
+ int up = 0, cc = 0;
+ ZLE_CHAR_T c;
+#ifdef ZLE_UNICODE_SUPPORT
+ char *umsg;
+ int ulen, ret, width;
+ mbstate_t ps;
+#endif
trashzle();
clearflag = isset(USEZLE) && !termflags && isset(ALWAYSLASTPROMPT);
+#ifdef ZLE_UNICODE_SUPPORT
+ umsg = ztrdup(msg);
+ p = unmetafy(umsg, &ulen);
+ memset(&ps, 0, sizeof(ps));
+
+ while (ulen > 0) {
+ char const *n;
+ if (*p == '\n') {
+ ulen--;
+ p++;
+
+ putc('\n', shout);
+ up += 1 + cc / columns;
+ cc = 0;
+ } else {
+ /*
+ * Extract the next wide character from the multibyte string.
+ */
+ ret = mbrtowc(&c, p, ulen, &ps);
+
+ if (ret <= 0) {
+ /*
+ * This really shouldn't be happening here, but...
+ * Treat it as a single byte character; it may get
+ * prettified.
+ */
+ n = nicechar(*p);
+ ret = 1;
+ width = strlen(n);
+ }
+ else
+ {
+ n = wcs_nicechar(c, &width, NULL);
+ }
+ ulen -= ret;
+ p += ret;
+
+ zputs(n, shout);
+ cc += width;
+ }
+ }
+
+ free(umsg);
+#else
for(p = msg; (c = *p); p++) {
if(c == Meta)
c = *++p ^ 32;
@@ -791,10 +847,11 @@ showmsg(char const *msg)
cc = 0;
} else {
char const *n = nicechar(c);
- fputs(n, shout);
+ zputs(n, shout);
cc += strlen(n);
}
}
+#endif
up += cc / columns;
if (clearflag) {
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-03 07:58:09 +0000