From: Clint Adams <clint@zsh.org>
To: Peter Stephenson <pws@csr.com>
Cc: Zsh Hackers' List <zsh-workers@sunsite.dk>
Subject: Re: PATCH: curses tweaks, maybe
Date: Thu, 18 Oct 2007 16:40:16 -0400 [thread overview]
Message-ID: <20071018204016.GA31055@scowler.net> (raw)
In-Reply-To: <200710171539.l9HFdKWC025510@news01.csr.com>
On Wed, Oct 17, 2007 at 04:39:19PM +0100, Peter Stephenson wrote:
> zcurses -C window black/red
I don't know why this doesn't work; perhaps another man page I'm
misreading.
Index: Src/Modules/curses.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/curses.c,v
retrieving revision 1.11
diff -u -r1.11 curses.c
--- Src/Modules/curses.c 18 Oct 2007 08:29:34 -0000 1.11
+++ Src/Modules/curses.c 18 Oct 2007 20:16:02 -0000
@@ -49,7 +49,7 @@
char *name;
} *ZCWin;
-struct zcurses_attribute {
+struct zcurses_namenumberpair {
char *name;
int number;
};
@@ -58,6 +58,7 @@
static struct ttyinfo saved_tty_state;
static struct ttyinfo curses_tty_state;
static LinkList zcurses_windows;
+static HashTable zcurses_colorpairs;
#define ZCURSES_ERANGE 1
#define ZCURSES_EDEFINED 2
@@ -69,7 +70,7 @@
#define ZCURSES_ATTRON 1
#define ZCURSES_ATTROFF 2
-static int zc_errno;
+static int zc_errno, zc_color_phase=0, next_cp=0;
static const char *
zcurses_strerror(int err)
@@ -139,9 +140,9 @@
static int
zcurses_attribute(WINDOW *w, char *attr, int op)
{
- struct zcurses_attribute *zca;
+ struct zcurses_namenumberpair *zca;
- static const struct zcurses_attribute zcurses_attributes[] = {
+ static const struct zcurses_namenumberpair zcurses_attributes[] = {
{"blink", A_BLINK},
{"bold", A_BOLD},
{"dim", A_DIM},
@@ -154,7 +155,7 @@
if (!attr)
return 1;
- for(zca=(struct zcurses_attribute *)zcurses_attributes;zca->name;zca++)
+ for(zca=(struct zcurses_namenumberpair *)zcurses_attributes;zca->name;zca++)
if (!strcmp(attr, zca->name)) {
switch(op) {
case ZCURSES_ATTRON:
@@ -171,6 +172,85 @@
return 1;
}
+static int
+zcurses_color(char *color)
+{
+ struct zcurses_namenumberpair *zc;
+
+ static const struct zcurses_namenumberpair zcurses_colors[] = {
+ {"black", COLOR_BLACK},
+ {"red", COLOR_RED},
+ {"green", COLOR_GREEN},
+ {"yellow", COLOR_YELLOW},
+ {"blue", COLOR_BLUE},
+ {"magenta", COLOR_MAGENTA},
+ {"cyan", COLOR_CYAN},
+ {"white", COLOR_WHITE},
+ {NULL, 0}
+ };
+
+ for(zc=(struct zcurses_namenumberpair *)zcurses_colors;zc->name;zc++)
+ if (!strcmp(color, zc->name)) {
+ return zc->number;
+ }
+
+ return -1;
+}
+
+static int
+zcurses_colorset(WINDOW *w, char *colorpair)
+{
+ char *fg, *bg, *cp;
+ int *c, f, b;
+
+ if (zc_color_phase==1 || !(c = (int *) gethashnode(zcurses_colorpairs, colorpair))) {
+ zc_color_phase = 2;
+ cp = ztrdup(colorpair);
+ fg = strtok(cp, "/");
+ bg = strtok(NULL, "/");
+
+ if (bg==NULL) {
+ zsfree(cp);
+ return 1;
+ }
+
+ f = zcurses_color(fg);
+ b = zcurses_color(bg);
+
+ zsfree(cp);
+
+ if (f==-1 || b==-1)
+ return 1;
+
+ ++next_cp;
+ if (next_cp >= COLOR_PAIRS)
+ return 1;
+
+ if (init_pair(next_cp, f, b) == ERR)
+ return 1;
+
+ c = (int *)zalloc(sizeof(int *));
+
+ if(!c)
+ return 1;
+
+ *c = next_cp;
+ addhashnode(zcurses_colorpairs, colorpair, (void *)c);
+ }
+
+ fprintf(stderr, "%d\n", *c);
+
+ return (wcolor_set(w, *c, NULL) == ERR);
+}
+
+static void
+freecolornode(HashNode hn)
+{
+ int *i = (int *) hn;
+
+ zfree(i, sizeof(int));
+}
+
/**/
static int
bin_zcurses(char *nam, char **args, Options ops, UNUSED(int func))
@@ -180,6 +260,25 @@
if (!win_zero) {
gettyinfo(&saved_tty_state);
win_zero = initscr();
+ if (start_color() != ERR) {
+ if(!zc_color_phase)
+ zc_color_phase = 1;
+ zcurses_colorpairs = newhashtable(8, "zc_colorpairs", NULL);
+
+ zcurses_colorpairs->hash = hasher;
+ zcurses_colorpairs->emptytable = emptyhashtable;
+ zcurses_colorpairs->filltable = NULL;
+ zcurses_colorpairs->cmpnodes = strcmp;
+ zcurses_colorpairs->addnode = addhashnode;
+ zcurses_colorpairs->getnode = gethashnode2;
+ zcurses_colorpairs->getnode2 = gethashnode2;
+ zcurses_colorpairs->removenode = removehashnode;
+ zcurses_colorpairs->disablenode = NULL;
+ zcurses_colorpairs->enablenode = NULL;
+ zcurses_colorpairs->freenode = freecolornode;
+ zcurses_colorpairs->printnode = NULL;
+
+ }
gettyinfo(&curses_tty_state);
} else {
settyinfo(&curses_tty_state);
@@ -427,6 +526,23 @@
}
return 0;
}
+ if (OPT_ISSET(ops,'C')) {
+ LinkNode node;
+ ZCWin w;
+
+ if (!args[0] || !args[1] || !zc_color_phase)
+ return 1;
+
+ node = zcurses_validate_window(args[0], ZCURSES_USED);
+ if (node == NULL) {
+ zwarnnam(nam, "%s: %s", zcurses_strerror(zc_errno), args[0], 0);
+ return 1;
+ }
+
+ w = (ZCWin)getdata(node);
+
+ return zcurses_colorset(w->win, args[1]);
+ }
return 0;
}
@@ -436,7 +552,7 @@
*/
static struct builtin bintab[] = {
- BUILTIN("zcurses", 0, bin_zcurses, 0, 5, 0, "Aab:cd:eimrs", NULL),
+ BUILTIN("zcurses", 0, bin_zcurses, 0, 5, 0, "Aab:Ccd:eimrs", NULL),
};
static struct features module_features = {
@@ -483,6 +599,7 @@
cleanup_(Module m)
{
freelinklist(zcurses_windows, (FreeFunc) zcurses_free_window);
+ deletehashtable(zcurses_colorpairs);
return setfeatureenables(m, &module_features, NULL);
}
next prev parent reply other threads:[~2007-10-18 20:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-16 8:40 Peter Stephenson
2007-10-17 3:29 ` Clint Adams
2007-10-17 8:57 ` Peter Stephenson
2007-10-17 9:14 ` Peter Stephenson
2007-10-17 13:01 ` Clint Adams
2007-10-17 14:57 ` Bart Schaefer
2007-10-17 15:05 ` Peter Stephenson
2007-10-17 15:25 ` Clint Adams
2007-10-17 15:39 ` Peter Stephenson
2007-10-17 18:58 ` Clint Adams
2007-10-17 19:19 ` Clint Adams
2007-10-18 20:40 ` Clint Adams [this message]
2007-10-20 12:12 ` Peter Stephenson
2007-10-20 13:37 ` Clint Adams
2007-10-21 19:50 ` Clint Adams
2007-10-21 21:13 ` Clint Adams
2007-10-17 17:09 ` Bart Schaefer
2007-10-17 17:53 ` Peter Stephenson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071018204016.GA31055@scowler.net \
--to=clint@zsh.org \
--cc=pws@csr.com \
--cc=zsh-workers@sunsite.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).