* PATCH: zcurses builtin
@ 2007-10-08 14:05 Clint Adams
2007-10-08 23:19 ` Clint Adams
0 siblings, 1 reply; 2+ messages in thread
From: Clint Adams @ 2007-10-08 14:05 UTC (permalink / raw)
To: zsh-workers
This adds the zcurses builtin, replacing _newwin, _delwin, _wrefresh,
and _wmove with -a, -d, -r, and -m switches respectively.
I haven't done the rest yet mostly due to indecision about option
letters.
The following test script works, though I'm certain there's quite a bit
of error-checking lacking now.
--8<--
zmodload curses
zcurses -a 10 10 10 10 5
zcurses_wborder 5
zcurses -m 5 1 1
zcurses_wadd_wch 5 B
zcurses_wadd_wch 5 l
zcurses_wadd_wch 5 a
zcurses_wadd_wch 5 h
zcurses -r 5
sleep 5
--8<--
Index: Src/Modules/curses.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/curses.c,v
retrieving revision 1.1
diff -u -r1.1 curses.c
--- Src/Modules/curses.c 8 Oct 2007 02:04:02 -0000 1.1
+++ Src/Modules/curses.c 8 Oct 2007 13:57:48 -0000
@@ -37,116 +37,137 @@
#include "curses.mdh"
#include "curses.pro"
-static char *nam="curses";
-
#define ZCURSES_MAX_WINDOWS 9
static WINDOW *zcurses_WIN[ZCURSES_MAX_WINDOWS + 1];
-/**/
-static int
-bin_zcurses_newwin(char *nam, char **args, Options ops, UNUSED(int func))
-{
- int nlines, ncols, begin_y, begin_x;
- unsigned winnum;
-
- nlines = atoi(args[0]);
- ncols = atoi(args[1]);
- begin_y = atoi(args[2]);
- begin_x = atoi(args[3]);
- winnum = atoi(args[4]);
-
- if(winnum > ZCURSES_MAX_WINDOWS) {
- zerrnam(nam, "bad window number: %s", args[4], 0);
- return 1;
- }
+#define ZCURSES_ERANGE 1
+#define ZCURSES_EDEFINED 2
+#define ZCURSES_EUNDEFINED 3
- if(zcurses_WIN[winnum]!=NULL) {
- zwarnnam(nam, "window number %s already defined", args[4], 0);
- return 1;
- }
+#define ZCURSES_UNUSED 1
+#define ZCURSES_USED 2
- zcurses_WIN[winnum]=newwin(nlines, ncols, begin_y, begin_x);
+static int zc_errno;
- if(zcurses_WIN[winnum]==NULL)
- return 1;
+/**/
+static const char *
+zcurses_strerror(int err)
+{
+ static const char *errs[] = {
+ NULL,
+ "window number out of range",
+ "window already defined",
+ NULL };
- return 0;
+ return errs[err];
}
/**/
-static int
-bin_zcurses_delwin(char *nam, char **args, Options ops, UNUSED(int func))
+static unsigned
+zcurses_validate_window(char *win, int criteria)
{
- unsigned winnum;
+ unsigned target;
- winnum = atoi(args[0]);
+ if (win==NULL) {
+ zc_errno = ZCURSES_ERANGE;
+ return -1;
+ }
- if(winnum > ZCURSES_MAX_WINDOWS) {
- zerrnam(nam, "bad window number: %s", args[0], 0);
- return 1;
+ target = (unsigned)atoi(win);
+
+ if (target > ZCURSES_MAX_WINDOWS) {
+ zc_errno = ZCURSES_ERANGE;
+ return -1;
}
- if(zcurses_WIN[winnum]==NULL) {
- zwarnnam(nam, "window number %s does not exist", args[0], 0);
- return 1;
+ if(zcurses_WIN[target]!=NULL && (criteria & ZCURSES_UNUSED)) {
+ zc_errno = ZCURSES_EDEFINED;
+ return -1;
}
- if(delwin(zcurses_WIN[winnum])!=OK)
- return 1;
+ if(zcurses_WIN[target]==NULL && (criteria & ZCURSES_USED)) {
+ zc_errno = ZCURSES_EUNDEFINED;
+ return -1;
+ }
- zcurses_WIN[winnum]=NULL;
- return 0;
+ return target;
}
/**/
static int
-bin_zcurses_wrefresh(char *nam, char **args, Options ops, UNUSED(int func))
+bin_zcurses(char *nam, char **args, Options ops, UNUSED(int func))
{
- unsigned winnum;
+ int targetwin;
- winnum = atoi(args[0]);
+ if (OPT_ISSET(ops,'a')) {
+ int nlines, ncols, begin_y, begin_x;
+ unsigned winnum;
- if(winnum > ZCURSES_MAX_WINDOWS) {
- zerrnam(nam, "bad window number: %s", args[0], 0);
- return 1;
- }
+ nlines = atoi(args[0]);
+ ncols = atoi(args[1]);
+ begin_y = atoi(args[2]);
+ begin_x = atoi(args[3]);
+ winnum = zcurses_validate_window(args[4], ZCURSES_UNUSED);
- if(zcurses_WIN[winnum]==NULL) {
- zwarnnam(nam, "window number %s does not exist", args[0], 0);
- return 1;
- }
+ if (winnum == -1) {
+ zerrnam(nam, "%s: %s", zcurses_strerror(zc_errno), args[4], 0);
+ return 1;
+ }
- if(wrefresh(zcurses_WIN[winnum])!=OK)
- return 1;
+ zcurses_WIN[winnum]=newwin(nlines, ncols, begin_y, begin_x);
- return 0;
-}
+ if(zcurses_WIN[winnum]==NULL)
+ return 1;
-/**/
-static int
-bin_zcurses_wmove(char *nam, char **args, Options ops, UNUSED(int func))
-{
- int y, x;
- unsigned winnum;
+ return 0;
+ }
+ if (OPT_ISSET(ops,'d')) {
+ targetwin = zcurses_validate_window(OPT_ARG(ops,'d'), ZCURSES_USED);
+ if (targetwin == -1) {
+ zwarnnam(nam, "%s: %s", zcurses_strerror(zc_errno), OPT_ARG(ops,'d'), 0);
+ return 1;
+ }
- winnum = atoi(args[0]);
- y = atoi(args[1]);
- x = atoi(args[2]);
+ if(delwin(zcurses_WIN[targetwin])!=OK)
+ return 1;
- if(winnum > ZCURSES_MAX_WINDOWS) {
- zerrnam(nam, "bad window number: %s", args[0], 0);
- return 1;
+ zcurses_WIN[targetwin]=NULL;
+ return 0;
}
- if(zcurses_WIN[winnum]==NULL) {
- zwarnnam(nam, "window number %s is not defined", args[0], 0);
- return 1;
+ if (OPT_ISSET(ops,'r')) {
+ targetwin = zcurses_validate_window(OPT_ARG(ops,'r'), ZCURSES_USED);
+ if (targetwin == -1) {
+ zwarnnam(nam, "%s: %s", zcurses_strerror(zc_errno), OPT_ARG(ops,'r'), 0);
+ return 1;
+ }
+
+ return (wrefresh(zcurses_WIN[targetwin])!=OK) ? 1 : 0;
}
+ if (OPT_ISSET(ops,'m')) {
+ int y, x;
+ unsigned winnum;
- if(wmove(zcurses_WIN[winnum], y, x)!=OK)
- return 1;
+ winnum = atoi(args[0]);
+ y = atoi(args[1]);
+ x = atoi(args[2]);
+
+ if(winnum > ZCURSES_MAX_WINDOWS) {
+ zerrnam(nam, "bad window number: %s", args[0], 0);
+ return 1;
+ }
+
+ if(zcurses_WIN[winnum]==NULL) {
+ zwarnnam(nam, "window number %s is not defined", args[0], 0);
+ return 1;
+ }
+
+ if(wmove(zcurses_WIN[winnum], y, x)!=OK)
+ return 1;
+ return 0;
+ }
return 0;
}
@@ -167,13 +188,13 @@
return 1;
if(winnum > ZCURSES_MAX_WINDOWS) {
- zerrnam(nam, "bad window number: %s", args[0], 0);
- return 1;
+ zerrnam(nam, "bad window number: %s", args[0], 0);
+ return 1;
}
if(zcurses_WIN[winnum]==NULL) {
- zwarnnam(nam, "window number %s is not defined", args[0], 0);
- return 1;
+ zwarnnam(nam, "window number %s is not defined", args[0], 0);
+ return 1;
}
if(wadd_wch(zcurses_WIN[winnum], &cc)!=OK)
@@ -194,19 +215,19 @@
winnum = atoi(args[0]);
if(winnum > ZCURSES_MAX_WINDOWS) {
- zerrnam(nam, "bad window number: %s", args[0], 0);
- return 1;
+ zerrnam(nam, "bad window number: %s", args[0], 0);
+ return 1;
}
if(zcurses_WIN[winnum]==NULL) {
- zwarnnam(nam, "window number %s is not defined", args[0], 0);
- return 1;
+ zwarnnam(nam, "window number %s is not defined", args[0], 0);
+ return 1;
}
sl = strlen(args[1]);
if(sl == 0) {
- return 0;
+ return 0;
}
ws = malloc(sl * sizeof(wchar_t));
@@ -225,7 +246,7 @@
free(ws);
if(wadd_wchstr(zcurses_WIN[winnum], wcc)!=OK) {
- free(wcc);
+ free(wcc);
return 1;
}
@@ -242,13 +263,13 @@
winnum = atoi(args[0]);
if(winnum > ZCURSES_MAX_WINDOWS) {
- zerrnam(nam, "bad window number: %s", args[0], 0);
- return 1;
+ zerrnam(nam, "bad window number: %s", args[0], 0);
+ return 1;
}
if(zcurses_WIN[winnum]==NULL) {
- zwarnnam(nam, "window number %s does not exist", args[0], 0);
- return 1;
+ zwarnnam(nam, "window number %s does not exist", args[0], 0);
+ return 1;
}
if(wborder(zcurses_WIN[winnum], 0, 0, 0, 0, 0, 0, 0, 0)!=OK)
@@ -257,17 +278,12 @@
return 0;
}
-
-
/*
* boot_ is executed when the module is loaded.
*/
static struct builtin bintab[] = {
- BUILTIN("zcurses_newwin", 0, bin_zcurses_newwin, 5, 5, 0, NULL, NULL),
- BUILTIN("zcurses_delwin", 0, bin_zcurses_delwin, 1, 1, 0, NULL, NULL),
- BUILTIN("zcurses_wrefresh", 0, bin_zcurses_wrefresh, 1, 1, 0, NULL, NULL),
- BUILTIN("zcurses_wmove", 0, bin_zcurses_wmove, 3, 3, 0, NULL, NULL),
+ BUILTIN("zcurses", 0, bin_zcurses, 0, 5, 0, "ad:mr:", NULL),
BUILTIN("zcurses_wadd_wch", 0, bin_zcurses_wadd_wch, 2, 2, 0, NULL, NULL),
BUILTIN("zcurses_wadd_wchstr", 0, bin_zcurses_wadd_wchstr, 2, 2, 0, NULL, NULL),
BUILTIN("zcurses_wborder", 0, bin_zcurses_wborder, 1, 1, 0, NULL, NULL),
Index: Src/Modules/curses.mdd
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/curses.mdd,v
retrieving revision 1.1
diff -u -r1.1 curses.mdd
--- Src/Modules/curses.mdd 8 Oct 2007 02:04:02 -0000 1.1
+++ Src/Modules/curses.mdd 8 Oct 2007 13:57:48 -0000
@@ -2,6 +2,6 @@
link='if test "x$ac_cv_func_initscr" = xyes -a "x$ac_cv_header_curses_h" = xyes -a "x$ac_cv_func_setcchar" = xyes; then echo dynamic; else echo no; fi'
load=no
-autobins="zcurses_newwin"
+autobins="zcurses"
objects="curses.o"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: PATCH: zcurses builtin
2007-10-08 14:05 PATCH: zcurses builtin Clint Adams
@ 2007-10-08 23:19 ` Clint Adams
0 siblings, 0 replies; 2+ messages in thread
From: Clint Adams @ 2007-10-08 23:19 UTC (permalink / raw)
To: zsh-workers
On Mon, Oct 08, 2007 at 10:05:54AM -0400, Clint Adams wrote:
> I haven't done the rest yet mostly due to indecision about option
> letters.
Here's the rest. It assumes that the user is passing the current number
of arguments.
zcurses -s is still not functioning properly.
Example script, evolved:
--8<--
zmodload curses
zcurses -a 10 10 10 10 5
zcurses -b 5
zcurses -m 5 1 1
zcurses -c 5 B
zcurses -c 5 l
zcurses -c 5 a
zcurses -c 5 h
zcurses -r 5
sleep 5
--8<--
Index: Src/Modules/curses.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/curses.c,v
retrieving revision 1.2
diff -u -r1.2 curses.c
--- Src/Modules/curses.c 8 Oct 2007 14:11:29 -0000 1.2
+++ Src/Modules/curses.c 8 Oct 2007 22:59:42 -0000
@@ -55,12 +55,12 @@
zcurses_strerror(int err)
{
static const char *errs[] = {
- NULL,
+ "unknown error",
"window number out of range",
"window already defined",
NULL };
- return errs[err];
+ return errs[(err < 1 || err > 2) ? 0 : err];
}
/**/
@@ -81,12 +81,12 @@
return -1;
}
- if(zcurses_WIN[target]!=NULL && (criteria & ZCURSES_UNUSED)) {
+ if (zcurses_WIN[target]!=NULL && (criteria & ZCURSES_UNUSED)) {
zc_errno = ZCURSES_EDEFINED;
return -1;
}
- if(zcurses_WIN[target]==NULL && (criteria & ZCURSES_USED)) {
+ if (zcurses_WIN[target]==NULL && (criteria & ZCURSES_USED)) {
zc_errno = ZCURSES_EUNDEFINED;
return -1;
}
@@ -98,30 +98,30 @@
static int
bin_zcurses(char *nam, char **args, Options ops, UNUSED(int func))
{
- int targetwin;
+ unsigned targetwin;
if (OPT_ISSET(ops,'a')) {
int nlines, ncols, begin_y, begin_x;
- unsigned winnum;
nlines = atoi(args[0]);
ncols = atoi(args[1]);
begin_y = atoi(args[2]);
begin_x = atoi(args[3]);
- winnum = zcurses_validate_window(args[4], ZCURSES_UNUSED);
+ targetwin = zcurses_validate_window(args[4], ZCURSES_UNUSED);
- if (winnum == -1) {
+ if (targetwin == -1) {
zerrnam(nam, "%s: %s", zcurses_strerror(zc_errno), args[4], 0);
return 1;
}
- zcurses_WIN[winnum]=newwin(nlines, ncols, begin_y, begin_x);
+ zcurses_WIN[targetwin]=newwin(nlines, ncols, begin_y, begin_x);
- if(zcurses_WIN[winnum]==NULL)
+ if (zcurses_WIN[targetwin]==NULL)
return 1;
return 0;
}
+
if (OPT_ISSET(ops,'d')) {
targetwin = zcurses_validate_window(OPT_ARG(ops,'d'), ZCURSES_USED);
if (targetwin == -1) {
@@ -129,7 +129,7 @@
return 1;
}
- if(delwin(zcurses_WIN[targetwin])!=OK)
+ if (delwin(zcurses_WIN[targetwin])!=OK)
return 1;
zcurses_WIN[targetwin]=NULL;
@@ -145,136 +145,102 @@
return (wrefresh(zcurses_WIN[targetwin])!=OK) ? 1 : 0;
}
+
if (OPT_ISSET(ops,'m')) {
int y, x;
- unsigned winnum;
-
- winnum = atoi(args[0]);
- y = atoi(args[1]);
- x = atoi(args[2]);
- if(winnum > ZCURSES_MAX_WINDOWS) {
- zerrnam(nam, "bad window number: %s", args[0], 0);
+ targetwin = zcurses_validate_window(args[0], ZCURSES_USED);
+ if (targetwin == -1) {
+ zwarnnam(nam, "%s: %s", zcurses_strerror(zc_errno), args[0], 0);
return 1;
}
- if(zcurses_WIN[winnum]==NULL) {
- zwarnnam(nam, "window number %s is not defined", args[0], 0);
- return 1;
- }
+ y = atoi(args[1]);
+ x = atoi(args[2]);
- if(wmove(zcurses_WIN[winnum], y, x)!=OK)
+ if (wmove(zcurses_WIN[targetwin], y, x)!=OK)
return 1;
return 0;
}
- return 0;
-}
-/**/
-static int
-bin_zcurses_wadd_wch(char *nam, char **args, Options ops, UNUSED(int func))
-{
- unsigned winnum;
- wchar_t c;
- cchar_t cc;
+ if (OPT_ISSET(ops,'c')) {
+ wchar_t c;
+ cchar_t cc;
- winnum = atoi(args[0]);
+ targetwin = zcurses_validate_window(args[0], ZCURSES_USED);
+ if (targetwin == -1) {
+ zwarnnam(nam, "%s: %s", zcurses_strerror(zc_errno), args[0], 0);
+ return 1;
+ }
- if(mbrtowc(&c, args[1], MB_CUR_MAX, NULL) < 1)
- return 1;
+ if (mbrtowc(&c, args[1], MB_CUR_MAX, NULL) < 1)
+ return 1;
- if (setcchar(&cc, &c, A_NORMAL, 0, NULL)==ERR)
- return 1;
+ if (setcchar(&cc, &c, A_NORMAL, 0, NULL)==ERR)
+ return 1;
- if(winnum > ZCURSES_MAX_WINDOWS) {
- zerrnam(nam, "bad window number: %s", args[0], 0);
- return 1;
- }
+ if (wadd_wch(zcurses_WIN[targetwin], &cc)!=OK)
+ return 1;
- if(zcurses_WIN[winnum]==NULL) {
- zwarnnam(nam, "window number %s is not defined", args[0], 0);
- return 1;
+ return 0;
}
- if(wadd_wch(zcurses_WIN[winnum], &cc)!=OK)
- return 1;
+ if (OPT_ISSET(ops,'s')) {
+ wchar_t *ws;
+ cchar_t *wcc;
+ size_t sl;
- return 0;
-}
-
-/**/
-static int
-bin_zcurses_wadd_wchstr(char *nam, char **args, Options ops, UNUSED(int func))
-{
- unsigned winnum;
- wchar_t *ws;
- cchar_t *wcc;
- size_t sl;
+ targetwin = zcurses_validate_window(args[0], ZCURSES_USED);
+ if (targetwin == -1) {
+ zwarnnam(nam, "%s: %s", zcurses_strerror(zc_errno), args[0], 0);
+ return 1;
+ }
- winnum = atoi(args[0]);
+ sl = strlen(args[1]);
- if(winnum > ZCURSES_MAX_WINDOWS) {
- zerrnam(nam, "bad window number: %s", args[0], 0);
- return 1;
- }
+ if (sl == 0) {
+ return 0;
+ }
- if(zcurses_WIN[winnum]==NULL) {
- zwarnnam(nam, "window number %s is not defined", args[0], 0);
- return 1;
- }
+ ws = malloc(sl * sizeof(wchar_t));
- sl = strlen(args[1]);
+ if (mbstowcs(ws, args[1], sl) < 1) {
+ free(ws);
+ return 1;
+ }
- if(sl == 0) {
- return 0;
- }
+ wcc = malloc(wcslen(ws) * sizeof(cchar_t));
- ws = malloc(sl * sizeof(wchar_t));
+ if (setcchar(wcc, ws, A_NORMAL, 0, NULL)==ERR) {
+ return 1;
+ }
- if(mbstowcs(ws, args[1], sl) < 1) {
free(ws);
- return 1;
- }
- wcc = malloc(wcslen(ws) * sizeof(cchar_t));
-
- if (setcchar(wcc, ws, A_NORMAL, 0, NULL)==ERR) {
- return 1;
- }
-
- free(ws);
+ if (wadd_wchstr(zcurses_WIN[targetwin], wcc)!=OK) {
+ free(wcc);
+ return 1;
+ }
- if(wadd_wchstr(zcurses_WIN[winnum], wcc)!=OK) {
free(wcc);
- return 1;
+ return 0;
}
- free(wcc);
- return 0;
-}
-
-/**/
-static int
-bin_zcurses_wborder(char *nam, char **args, Options ops, UNUSED(int func))
-{
- unsigned winnum;
+ if (OPT_ISSET(ops,'b')) {
- winnum = atoi(args[0]);
+ targetwin = zcurses_validate_window(OPT_ARG(ops,'b'), ZCURSES_USED);
+ if (targetwin == -1) {
+ zwarnnam(nam, "%s: %s", zcurses_strerror(zc_errno), OPT_ARG(ops,'b'), 0);
+ return 1;
+ }
- if(winnum > ZCURSES_MAX_WINDOWS) {
- zerrnam(nam, "bad window number: %s", args[0], 0);
- return 1;
- }
+ if (wborder(zcurses_WIN[targetwin], 0, 0, 0, 0, 0, 0, 0, 0)!=OK)
+ return 1;
- if(zcurses_WIN[winnum]==NULL) {
- zwarnnam(nam, "window number %s does not exist", args[0], 0);
- return 1;
+ return 0;
}
- if(wborder(zcurses_WIN[winnum], 0, 0, 0, 0, 0, 0, 0, 0)!=OK)
- return 1;
-
return 0;
}
@@ -283,10 +249,7 @@
*/
static struct builtin bintab[] = {
- BUILTIN("zcurses", 0, bin_zcurses, 0, 5, 0, "ad:mr:", NULL),
- BUILTIN("zcurses_wadd_wch", 0, bin_zcurses_wadd_wch, 2, 2, 0, NULL, NULL),
- BUILTIN("zcurses_wadd_wchstr", 0, bin_zcurses_wadd_wchstr, 2, 2, 0, NULL, NULL),
- BUILTIN("zcurses_wborder", 0, bin_zcurses_wborder, 1, 1, 0, NULL, NULL),
+ BUILTIN("zcurses", 0, bin_zcurses, 0, 5, 0, "ab:cd:mr:rs", NULL),
};
static struct features module_features = {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-10-08 23:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-10-08 14:05 PATCH: zcurses builtin Clint Adams
2007-10-08 23:19 ` Clint Adams
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).