Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
[PATCH] make TERMINFO_DIRS variable special
- X-seq: zsh-workers 39878
- From: Guillaume Maudoux <layus.on@xxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: [PATCH] make TERMINFO_DIRS variable special
- Date: Tue, 8 Nov 2016 21:26:51 +0100
- Cc: Guillaume Maudoux <layus.on@xxxxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=vJH7dRCMxgFh+rb1mbXtQf5VjE5yFmzTDyRnLihyDKw=; b=ipkfr57QNU6HQsHDkZ1P/Tarndu3nm/oYKleL80aYICrEnAuKIiEU+N3wbyhD3Hru+ Pchdhy/AS5eAl1CCLfDp+gvFh//o2NCdd9nCudfZbtScdb/5aI1aSW/iaYSRfGBQwplJ 2TuzxZEndjVls28W0NreRkeduyULEa80Us+dtn1eLLJAiK5sKHrNysmEEH5Hx7IaKmnJ cOzGe/cxGmiclGPyXMF9MFNyecMOLMqT3y4muv9tr4F54OMgGyQeq2Pc03aQVbGxowHi CPD10ec/e3i5Op9vXB9aOXxjyqA8RJPC6YO5SojTGiFNWaelmGGomA21ZpCu5G118OMJ IveQ==
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
---
Doc/Zsh/params.yo | 15 +++++++++++----
Src/params.c | 31 +++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo
index c7d84b9..728fc21 100644
--- a/Doc/Zsh/params.yo
+++ b/Doc/Zsh/params.yo
@@ -1485,10 +1485,17 @@ take effect.
)
vindex(TERMINFO)
item(tt(TERMINFO) <S>)(
-A reference to a compiled description of the terminal, used by the
-`terminfo' library when the system has it; see manref(terminfo)(5).
-If set, this causes the shell to reinitialise the terminal, making
-the workaround `tt(TERM=$TERM)' unnecessary.
+A reference to a directory containing the compiled description of
+terminals, used by the `terminfo' library when the system has it; see
+manref(terminfo)(5). If set, this causes the shell to reinitialise the
+terminal, making the workaround `tt(TERM=$TERM)' unnecessary.
+)
+vindex(TERMINFO_DIRS)
+item(tt(TERMINFO_DIRS) <S>)(
+An array (colon-separated list) of paths to be searched for a compiled
+description of the terminal, used by the `terminfo' library when the system has
+it; see manref(terminfo)(5). If set, this causes the shell to reinitialise the
+terminal, making the workaround `tt(TERM=$TERM)' unnecessary.
)
vindex(TIMEFMT)
item(tt(TIMEFMT))(
diff --git a/Src/params.c b/Src/params.c
index 19a8c29..92b8ac1 100644
--- a/Src/params.c
+++ b/Src/params.c
@@ -87,6 +87,7 @@ char *ifs, /* $IFS */
*postedit, /* $POSTEDIT */
*term, /* $TERM */
*zsh_terminfo, /* $TERMINFO */
+ *zsh_terminfodirs, /* $TERMINFO_DIRS */
*ttystrname, /* $TTY */
*pwd; /* $PWD */
@@ -208,6 +209,8 @@ static const struct gsu_scalar term_gsu =
{ termgetfn, termsetfn, stdunsetfn };
static const struct gsu_scalar terminfo_gsu =
{ terminfogetfn, terminfosetfn, stdunsetfn };
+static const struct gsu_scalar terminfodirs_gsu =
+{ terminfodirsgetfn, terminfodirssetfn, stdunsetfn };
static const struct gsu_scalar wordchars_gsu =
{ wordcharsgetfn, wordcharssetfn, stdunsetfn };
static const struct gsu_scalar ifs_gsu =
@@ -283,6 +286,7 @@ IPDEF2("histchars", histchars_gsu, PM_DONTIMPORT),
IPDEF2("HOME", home_gsu, PM_UNSET),
IPDEF2("TERM", term_gsu, PM_UNSET),
IPDEF2("TERMINFO", terminfo_gsu, PM_UNSET),
+IPDEF2("TERMINFO_DIRS", terminfodirs_gsu, PM_UNSET),
IPDEF2("WORDCHARS", wordchars_gsu, 0),
IPDEF2("IFS", ifs_gsu, PM_DONTIMPORT | PM_RESTRICTED),
IPDEF2("_", underscore_gsu, PM_DONTIMPORT),
@@ -4511,6 +4515,33 @@ terminfosetfn(Param pm, char *x)
term_reinit_from_pm();
}
+/* Function to get value of special parameter `TERMINFO_DIRS' */
+
+/**/
+char *
+terminfodirsgetfn(UNUSED(Param pm))
+{
+ return zsh_terminfodirs ? zsh_terminfodirs : dupstring("");
+}
+
+/* Function to set value of special parameter `TERMINFO_DIRS' */
+
+/**/
+void
+terminfodirssetfn(Param pm, char *x)
+{
+ zsfree(zsh_terminfodirs);
+ zsh_terminfodirs = x;
+
+ /*
+ * terminfo relies on the value being exported before
+ * we reinitialise the terminal. This is a bit inefficient.
+ */
+ if ((pm->node.flags & PM_EXPORTED) && x)
+ addenv(pm, x);
+
+ term_reinit_from_pm();
+}
/* Function to get value for special parameter `pipestatus' */
/**/
--
2.10.1
Messages sorted by:
Reverse Date,
Date,
Thread,
Author