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: Wed, 17 Oct 2007 14:58:27 -0400 [thread overview]
Message-ID: <20071017185827.GA6074@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 -A window +standout
>
> with +/- to enable and disable options which correspond to attributes
> that we can either parse out of the header or hardcode as { A_STANDOUT,
> "standout"} etc.
Here goes, and here's my current test script:
-8<-
zcurses -i
zcurses -a tw $(( LINES - 10 )) $(( COLUMNS - 20 )) 5 10
zcurses -b tw
zcurses -m tw 1 1
zcurses -c tw B
zcurses -c tw l
zcurses -c tw a
zcurses -c tw h
zcurses -r tw
zcurses -m tw 2 2
zcurses -s tw String
zcurses -m tw 3 3
zcurses -A tw +bold +underline
zcurses -s tw BoLD
zcurses -r tw
sleep 5
zcurses -e
-8<-
Index: Src/Modules/curses.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/curses.c,v
retrieving revision 1.9
diff -u -r1.9 curses.c
--- Src/Modules/curses.c 17 Oct 2007 13:11:11 -0000 1.9
+++ Src/Modules/curses.c 17 Oct 2007 18:56:28 -0000
@@ -44,6 +44,11 @@
char *name;
} *ZCWin;
+struct zcurses_attribute {
+ char *name;
+ int number;
+};
+
static WINDOW *win_zero;
static struct ttyinfo saved_tty_state;
static struct ttyinfo curses_tty_state;
@@ -56,6 +61,9 @@
#define ZCURSES_UNUSED 1
#define ZCURSES_USED 2
+#define ZCURSES_ATTRON 1
+#define ZCURSES_ATTROFF 2
+
static int zc_errno;
static const char *
@@ -123,6 +131,41 @@
return 0;
}
+static int
+zcurses_attribute(WINDOW *w, char *attr, int op)
+{
+ struct zcurses_attribute *zca;
+
+ static const struct zcurses_attribute zcurses_attributes[] = {
+ {"blink", A_BLINK},
+ {"bold", A_BOLD},
+ {"dim", A_DIM},
+ {"reverse", A_REVERSE},
+ {"standout", A_STANDOUT},
+ {"underline", A_UNDERLINE},
+ {NULL, 0}
+ };
+
+ if (!attr)
+ return 1;
+
+ for(zca=(struct zcurses_attribute *)zcurses_attributes;zca->name;zca++)
+ if (!strcmp(attr, zca->name)) {
+ switch(op) {
+ case ZCURSES_ATTRON:
+ wattron(w, zca->number);
+ break;
+ case ZCURSES_ATTROFF:
+ wattroff(w, zca->number);
+ break;
+ }
+
+ return 0;
+ }
+
+ return 1;
+}
+
/**/
static int
bin_zcurses(char *nam, char **args, Options ops, UNUSED(int func))
@@ -141,7 +184,7 @@
if (OPT_ISSET(ops,'a')) {
int nlines, ncols, begin_y, begin_x;
- ZCWin w;
+ ZCWin w;
if (zcurses_validate_window(args[0], ZCURSES_UNUSED) == NULL && zc_errno) {
zerrnam(nam, "%s: %s", zcurses_strerror(zc_errno), args[0], 0);
@@ -153,11 +196,11 @@
begin_y = atoi(args[3]);
begin_x = atoi(args[4]);
- w = (ZCWin)zshcalloc(sizeof(struct zc_win));
- if (!w)
+ w = (ZCWin)zshcalloc(sizeof(struct zc_win));
+ if (!w)
return 1;
- w->name = ztrdup(args[0]);
+ w->name = ztrdup(args[0]);
w->win = newwin(nlines, ncols, begin_y, begin_x);
if (w->win == NULL) {
@@ -166,7 +209,7 @@
return 1;
}
- zinsertlinknode(zcurses_windows, lastnode(zcurses_windows), (void *)w);
+ zinsertlinknode(zcurses_windows, lastnode(zcurses_windows), (void *)w);
return 0;
}
@@ -193,7 +236,7 @@
if (w->name)
zsfree(w->name);
- zfree((ZCWin)remnode(zcurses_windows, node), sizeof(struct zc_win));
+ zfree((ZCWin)remnode(zcurses_windows, node), sizeof(struct zc_win));
return 0;
}
@@ -206,7 +249,7 @@
node = zcurses_validate_window(args[0], ZCURSES_USED);
if (node == NULL) {
zwarnnam(nam, "%s: %s", zcurses_strerror(zc_errno), args[0],
- 0);
+ 0);
return 1;
}
@@ -361,6 +404,37 @@
}
return 0;
}
+ if (OPT_ISSET(ops,'A')) {
+ LinkNode node;
+ ZCWin w;
+ char **attrs;
+
+ if (!args[0])
+ 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);
+
+ for(attrs = args+1; *attrs; attrs++) {
+ switch(*attrs[0]) {
+ case '-':
+ zcurses_attribute(w->win, (*attrs)+1, ZCURSES_ATTROFF);
+ break;
+ case '+':
+ zcurses_attribute(w->win, (*attrs)+1, ZCURSES_ATTRON);
+ break;
+ default:
+ /* maybe a bad idea to spew warnings here */
+ break;
+ }
+ }
+ return 0;
+ }
return 0;
}
@@ -370,7 +444,7 @@
*/
static struct builtin bintab[] = {
- BUILTIN("zcurses", 0, bin_zcurses, 0, 5, 0, "ab:cd:eimrs", NULL),
+ BUILTIN("zcurses", 0, bin_zcurses, 0, 5, 0, "Aab:cd:eimrs", NULL),
};
static struct features module_features = {
next prev parent reply other threads:[~2007-10-17 18:58 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 [this message]
2007-10-17 19:19 ` Clint Adams
2007-10-18 20:40 ` Clint Adams
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=20071017185827.GA6074@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).