diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Src/Modules/termcap.c | 22 | ||||
| -rw-r--r-- | Src/Modules/terminfo.c | 385 |
3 files changed, 405 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index e72bf6882..759a36f37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-08-12 Peter Stephenson <pws@csr.com> + + * 17482 (Karl Tomlinson): Src/Modules/termcap.c, + Src/Modules/terminfo.c: resolve confusion over use of get/set + functions for special parameters. + 2002-08-10 Clint Adams <clint@zsh.org> * 17206 (Bruno Bonfils), 17207 (Oliver): diff --git a/Src/Modules/termcap.c b/Src/Modules/termcap.c index 8ec8919d9..fb3c6f324 100644 --- a/Src/Modules/termcap.c +++ b/Src/Modules/termcap.c @@ -236,10 +236,6 @@ gettermcap(HashTable ht, char *name) pm = (Param) zhalloc(sizeof(struct param)); pm->nam = dupstring(name); pm->flags = PM_READONLY; - pm->sets.cfn = NULL; - pm->gets.cfn = strgetfn; - pm->sets.ifn = NULL; - pm->gets.ifn = intgetfn; pm->unsetfn = NULL; pm->ct = 0; pm->env = NULL; @@ -251,10 +247,15 @@ gettermcap(HashTable ht, char *name) /* logic in the following cascade copied from echotc, above */ if ((num = tgetnum(name)) != -1) { + pm->sets.ifn = NULL; + pm->gets.ifn = intgetfn; pm->u.val = num; pm->flags |= PM_INTEGER; return (HashNode) pm; } + + pm->sets.cfn = NULL; + pm->gets.cfn = strgetfn; switch (ztgetflag(name)) { case -1: break; @@ -338,10 +339,6 @@ scantermcap(HashTable ht, ScanFunc func, int flags) #endif pm = (Param) zhalloc(sizeof(struct param)); - pm->sets.cfn = NULL; - pm->gets.cfn = strgetfn; - pm->sets.ifn = NULL; - pm->gets.ifn = intgetfn; pm->unsetfn = NULL; pm->ct = 0; pm->env = NULL; @@ -350,6 +347,9 @@ scantermcap(HashTable ht, ScanFunc func, int flags) u = buf; pm->flags = PM_READONLY | PM_SCALAR; + pm->sets.cfn = NULL; + pm->gets.cfn = strgetfn; + for (capcode = (char **)boolcodes; *capcode; capcode++) { if ((num = ztgetflag(*capcode)) != -1) { pm->u.str = num ? dupstring("yes") : dupstring("no"); @@ -359,6 +359,9 @@ scantermcap(HashTable ht, ScanFunc func, int flags) } pm->flags = PM_READONLY | PM_INTEGER; + pm->sets.ifn = NULL; + pm->gets.ifn = intgetfn; + for (capcode = (char **)numcodes; *capcode; capcode++) { if ((num = tgetnum(*capcode)) != -1) { pm->u.val = num; @@ -368,6 +371,9 @@ scantermcap(HashTable ht, ScanFunc func, int flags) } pm->flags = PM_READONLY | PM_SCALAR; + pm->sets.cfn = NULL; + pm->gets.cfn = strgetfn; + for (capcode = (char **)strcodes; *capcode; capcode++) { if ((tcstr = (char *)tgetstr(*capcode,&u)) != NULL && tcstr != (char *)-1) { diff --git a/Src/Modules/terminfo.c b/Src/Modules/terminfo.c new file mode 100644 index 000000000..bcc7dd54d --- /dev/null +++ b/Src/Modules/terminfo.c @@ -0,0 +1,385 @@ +/* + * terminfo.c - parameter interface to terminfo via curses + * + * This file is part of zsh, the Z shell. + * + * Copyright (c) 2000 Sven Wishnowsky, Clint Adams + * All rights reserved. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and to distribute modified versions of this software for any + * purpose, provided that the above copyright notice and the following + * two paragraphs appear in all copies of this software. + * + * In no event shall Sven Wishnowsky, Clint Adams or the Zsh Development Group + * be liable to any party for direct, indirect, special, incidental, or + * consequential damages arising out of the use of this software and its + * documentation, even if Sven Wishnowsky, Clint Adams and the Zsh + * Development Group have been advised of the possibility of such damage. + * + * Sven Wishnowsky, Clint Adams and the Zsh Development Group specifically + * disclaim any warranties, including, but not limited to, the implied + * warranties of merchantability and fitness for a particular purpose. + * The software provided hereunder is on an "as is" basis, and Sven + * Wishnowsky, Clint Adams and the Zsh Development Group have no obligation + * to provide maintenance, support, updates, enhancements, or modifications. + * + */ + +#define USES_TERM_H 1 +#include "terminfo.mdh" +#include "terminfo.pro" + +static char terminfo_nam[] = "terminfo"; + +/**/ +#ifdef HAVE_TIGETSTR + +/* The following two undefs are needed for Solaris 2.6 */ +# ifdef VINTR +# undef VINTR +# endif +# ifdef offsetof +# undef offsetof +# endif + +# ifdef HAVE_CURSES_H +# include <curses.h> +# endif +# ifdef HAVE_TERM_H +# include <term.h> +# endif + +static Param terminfo_pm; + +/* echoti: output a terminfo capability */ + +/**/ +static int +bin_echoti(char *name, char **argv, char *ops, int func) +{ + char *s, *t; + int num; + + s = *argv++; + /* This depends on the termcap stuff in init.c */ + if (termflags & TERM_BAD) + return 1; + if ((termflags & TERM_UNKNOWN) && (isset(INTERACTIVE) || !init_term())) + return 1; + /* if the specified capability has a numeric value, display it */ + if (((num = tigetnum(s)) != -1) && (num != -2)) { + printf("%d\n", num); + return 0; + } + + switch (tigetflag(s)) { + case -1: + break; + case 0: + puts("no"); + return 0; + default: + puts("yes"); + return 0; + } + +/* get a string-type capability */ + t = (char *)tigetstr(s); + if (!t || t == (char *)-1 || !*t) { + /* capability doesn't exist, or (if boolean) is off */ + zwarnnam(name, "no such terminfo capability: %s", s, 0); + return 1; + } + + tputs(t, 1, putchar); + return 0; +} + +/**/ +#else /* !HAVE_TIGETSTR */ + +#define bin_echoti bin_notavail + +/**/ +#endif /* !HAVE_TIGETSTR */ + +static struct builtin bintab[] = { + BUILTIN("echoti", 0, bin_echoti, 1, -1, 0, NULL, NULL), +}; + +/**/ +#ifdef HAVE_TIGETSTR + +/* Empty dummy function for special hash parameters. */ + +/**/ +static void +shempty(void) +{ +} + +/* Create a simple special hash parameter. */ + +/**/ +static Param +createtihash() +{ + Param pm; + HashTable ht; + + unsetparam(terminfo_nam); + + if (!(pm = createparam(terminfo_nam, PM_SPECIAL|PM_HIDE|PM_HIDEVAL| + PM_REMOVABLE|PM_HASHED))) + return NULL; + + pm->level = pm->old ? locallevel : 0; + pm->gets.hfn = hashgetfn; + pm->sets.hfn = hashsetfn; + pm->unsetfn = stdunsetfn; + pm->u.hash = ht = newhashtable(7, terminfo_nam, NULL); + + ht->hash = hasher; + ht->emptytable = (TableFunc) shempty; + ht->filltable = NULL; + ht->addnode = (AddNodeFunc) shempty; + ht->getnode = ht->getnode2 = getterminfo; + ht->removenode = (RemoveNodeFunc) shempty; + ht->disablenode = NULL; + ht->enablenode = NULL; + ht->freenode = (FreeNodeFunc) shempty; + ht->printnode = printparamnode; + ht->scantab = scanterminfo; + + return (terminfo_pm = pm); +} + +/**/ +static HashNode +getterminfo(HashTable ht, char *name) +{ + int len, num; + char *tistr; + Param pm = NULL; + + /* This depends on the termcap stuff in init.c */ + if (termflags & TERM_BAD) + return NULL; + if ((termflags & TERM_UNKNOWN) && (isset(INTERACTIVE) || !init_term())) + return NULL; + + unmetafy(name, &len); + + pm = (Param) zhalloc(sizeof(struct param)); + pm->nam = dupstring(name); + pm->flags = PM_READONLY; + pm->unsetfn = NULL; + pm->ct = 0; + pm->env = NULL; + pm->ename = NULL; + pm->old = NULL; + pm->level = 0; + + if (((num = tigetnum(name)) != -1) && (num != -2)) { + pm->u.val = num; + pm->flags |= PM_INTEGER; + pm->sets.ifn = NULL; + pm->gets.ifn = intgetfn; + } + else if ((num = tigetflag(name)) != -1) { + pm->u.str = num ? dupstring("yes") : dupstring("no"); + pm->flags |= PM_SCALAR; + pm->sets.cfn = NULL; + pm->gets.cfn = strgetfn; + } + else if ((tistr = (char *)tigetstr(name)) != NULL && tistr != (char *)-1) + { + pm->u.str = dupstring(tistr); + pm->flags |= PM_SCALAR; + } + else + { + /* zwarn("no such capability: %s", name, 0); */ + pm->u.str = dupstring(""); + pm->flags |= PM_UNSET; + pm->sets.cfn = NULL; + pm->gets.cfn = strgetfn; + } + return (HashNode) pm; +} + +/**/ +static void +scanterminfo(HashTable ht, ScanFunc func, int flags) +{ + Param pm = NULL; + int num; + char **capname, *tistr; + +#ifndef HAVE_BOOLNAMES + static char *boolnames[] = { + "bw", "am", "bce", "ccc", "xhp", "xhpa", "cpix", "crxm", "xt", "xenl", + "eo", "gn", "hc", "chts", "km", "daisy", "hs", "hls", "in", "lpix", + "da", "db", "mir", "msgr", "nxon", "xsb", "npc", "ndscr", "nrrmc", + "os", "mc5i", "xvpa", "sam", "eslok", "hz", "ul", "xon", NULL}; +#endif + +#ifndef HAVE_NUMNAMES + static char *numnames[] = { + "cols", "it", "lh", "lw", "lines", "lm", "xmc", "ma", "colors", + "pairs", "wnum", "ncv", "nlab", "pb", "vt", "wsl", "bitwin", + "bitype", "bufsz", "btns", "spinh", "spinv", "maddr", "mjump", + "mcs", "mls", "npins", "orc", "orhi", "orl", "orvi", "cps", "widcs", + NULL}; +#endif + +#ifndef HAVE_STRNAMES + static char *strnames[] = { + "acsc", "cbt", "bel", "cr", "cpi", "lpi", "chr", "cvr", "csr", "rmp", + "tbc", "mgc", "clear", "el1", "el", "ed", "hpa", "cmdch", "cwin", + "cup", "cud1", "home", "civis", "cub1", "mrcup", "cnorm", "cuf1", + "ll", "cuu1", "cvvis", "defc", "dch1", "dl1", "dial", "dsl", "dclk", + "hd", "enacs", "smacs", "smam", "blink", "bold", "smcup", "smdc", + "dim", "swidm", "sdrfq", "smir", "sitm", "slm", "smicm", "snlq", + "snrmq", "prot", "rev", "invis", "sshm", "smso", "ssubm", "ssupm", + "smul", "sum", "smxon", "ech", "rmacs", "rmam", "sgr0", "rmcup", + "rmdc", "rwidm", "rmir", "ritm", "rlm", "rmicm", "rshm", "rmso", + "rsubm", "rsupm", "rmul", "rum", "rmxon", "pause", "hook", "flash", + "ff", "fsl", "wingo", "hup", "is1", "is2", "is3", "if", "iprog", + "initc", "initp", "ich1", "il1", "ip", "ka1", "ka3", "kb2", "kbs", + "kbeg", "kcbt", "kc1", "kc3", "kcan", "ktbc", "kclr", "kclo", "kcmd", + "kcpy", "kcrt", "kctab", "kdch1", "kdl1", "kcud1", "krmir", "kend", + "kent", "kel", "ked", "kext", "kf0", "kf1", "kf10", "kf11", "kf12", + "kf13", "kf14", "kf15", "kf16", "kf17", "kf18", "kf19", "kf2", + "kf20", "kf21", "kf22", "kf23", "kf24", "kf25", "kf26", "kf27", + "kf28", "kf29", "kf3", "kf30", "kf31", "kf32", "kf33", "kf34", + "kf35", "kf36", "kf37", "kf38", "kf39", "kf4", "kf40", "kf41", + "kf42", "kf43", "kf44", "kf45", "kf46", "kf47", "kf48", "kf49", + "kf5", "kf50", "kf51", "kf52", "kf53", "kf54", "kf55", "kf56", + "kf57", "kf58", "kf59", "kf6", "kf60", "kf61", "kf62", "kf63", + "kf7", "kf8", "kf9", "kfnd", "khlp", "khome", "kich1", "kil1", + "kcub1", "kll", "kmrk", "kmsg", "kmov", "knxt", "knp", "kopn", + "kopt", "kpp", "kprv", "kprt", "krdo", "kref", "krfr", "krpl", + "krst", "kres", "kcuf1", "ksav", "kBEG", "kCAN", "kCMD", "kCPY", + "kCRT", "kDC", "kDL", "kslt", "kEND", "kEOL", "kEXT", "kind", + "kFND", "kHLP", "kHOM", "kIC", "kLFT", "kMSG", "kMOV", "kNXT", + "kOPT", "kPRV", "kPRT", "kri", "kRDO", "kRPL", "kRIT", "kRES", + "kSAV", "kSPD", "khts", "kUND", "kspd", "kund", "kcuu1", "rmkx", + "smkx", "lf0", "lf1", "lf10", "lf2", "lf3", "lf4", "lf5", "lf6", + "lf7", "lf8", "lf9", "fln", "rmln", "smln", "rmm", "smm", "mhpa", + "mcud1", "mcub1", "mcuf1", "mvpa", "mcuu1", "nel", "porder", "oc", + "op", "pad", "dch", "dl", "cud", "mcud", "ich", "indn", "il", "cub", + "mcub", "cuf", "mcuf", "rin", "cuu", "mcuu", "pfkey", "pfloc", + "pfx", "pln", "mc0", "mc5p", "mc4", "mc5", "pulse", "qdial", + "rmclk", "rep", "rfi", "rs1", "rs2", "rs3", "rf", "rc", "vpa", + "sc", "ind", "ri", "scs", "sgr", "setb", "smgb", "smgbp", "sclk", + "scp", "setf", "smgl", "smglp", "smgr", "smgrp", "hts", "smgt", + "smgtp", "wind", "sbim", "scsd", "rbim", "rcsd", "subcs", + "supcs", "ht", "docr", "tsl", "tone", "uc", "hu", "u0", "u1", + "u2", "u3", "u4", "u5", "u6", "u7", "u8", "u9", "wait", "xoffc", + "xonc", "zerom", "scesa", "bicr", "binel", "birep", "csnm", + "csin", "colornm", "defbi", "devt", "dispc", "endbi", "smpch", + "smsc", "rmpch", "rmsc", "getm", "kmous", "minfo", "pctrm", + "pfxl", "reqmp", "scesc", "s0ds", "s1ds", "s2ds", "s3ds", + "setab", "setaf", "setcolor", "smglr", "slines", "smgtb", + "ehhlm", "elhlm", "elohlm", "erhlm", "ethlm", "evhlm", "sgr1", + "slength", NULL}; +#endif + + pm = (Param) zhalloc(sizeof(struct param)); + pm->unsetfn = NULL; + pm->ct = 0; + pm->env = NULL; + pm->ename = NULL; + pm->old = NULL; + + pm->flags = PM_READONLY | PM_SCALAR; + pm->sets.cfn = NULL; + pm->gets.cfn = strgetfn; + + for (capname = (char **)boolnames; *capname; capname++) { + if ((num = tigetflag(*capname)) != -1) { + pm->u.str = num ? dupstring("yes") : dupstring("no"); + pm->nam = dupstring(*capname); + func((HashNode) pm, flags); + } + } + + pm->flags = PM_READONLY | PM_INTEGER; + pm->sets.ifn = NULL; + pm->gets.ifn = intgetfn; + + for (capname = (char **)numnames; *capname; capname++) { + if (((num = tigetnum(*capname)) != -1) && (num != -2)) { + pm->u.val = num; + pm->nam = dupstring(*capname); + func((HashNode) pm, flags); + } + } + + pm->flags = PM_READONLY | PM_SCALAR; + pm->sets.cfn = NULL; + pm->gets.cfn = strgetfn; + + for (capname = (char **)strnames; *capname; capname++) { + if ((tistr = (char *)tigetstr(*capname)) != NULL && + tistr != (char *)-1) { + pm->u.str = dupstring(tistr); + pm->nam = dupstring(*capname); + func((HashNode) pm, flags); + } + } +} + +/**/ +#endif /* HAVE_TIGETSTR */ + +/**/ +int +setup_(Module m) +{ + return 0; +} + +/**/ +int +boot_(Module m) +{ +#ifdef HAVE_TIGETSTR +# ifdef HAVE_SETUPTERM + setupterm((char *)0, 1, (int *)0); +# endif + + if (!createtihash()) + return 1; +#else + unsetparam(terminfo_nam); +#endif + return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab)); +} + +/**/ +int +cleanup_(Module m) +{ +#ifdef HAVE_TIGETSTR + Param pm; + + if ((pm = (Param) paramtab->getnode(paramtab, terminfo_nam)) && + pm == terminfo_pm) { + pm->flags &= ~PM_READONLY; + unsetparam_pm(pm, 0, 1); + } +#endif + deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab)); + return 0; +} + +/**/ +int +finish_(Module m) +{ + return 0; +} |