diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Modules/curses.c | 18 | ||||
| -rw-r--r-- | Src/Modules/curses.mdd | 2 |
3 files changed, 23 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 9cda04ee7..72e8985b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-10-14 Clint Adams <clint@zsh.org> + + * 23952: Src/Modules/curses.c, Src/Modules/curses.mdd: work with + non-wide curses as well. + 2007-10-13 Clint Adams <clint@zsh.org> * 23947: Functions/Prompts/prompt_clint_setup: remove apm battery diff --git a/Src/Modules/curses.c b/Src/Modules/curses.c index 325c08292..bfcbeca01 100644 --- a/Src/Modules/curses.c +++ b/Src/Modules/curses.c @@ -30,7 +30,9 @@ #define _XOPEN_SOURCE_EXTENDED 1 #include <ncurses.h> -#include <wchar.h> +#ifdef HAVE_SETCCHAR +# include <wchar.h> +#endif #include <stdio.h> @@ -165,8 +167,10 @@ bin_zcurses(char *nam, char **args, Options ops, UNUSED(int func)) } if (OPT_ISSET(ops,'c')) { +#ifdef HAVE_SETCCHAR wchar_t c; cchar_t cc; +#endif targetwin = zcurses_validate_window(args[0], ZCURSES_USED); if (targetwin == -1) { @@ -174,6 +178,7 @@ bin_zcurses(char *nam, char **args, Options ops, UNUSED(int func)) return 1; } +#ifdef HAVE_SETCCHAR if (mbrtowc(&c, args[1], MB_CUR_MAX, NULL) < 1) return 1; @@ -182,14 +187,20 @@ bin_zcurses(char *nam, char **args, Options ops, UNUSED(int func)) if (wadd_wch(zcurses_WIN[targetwin], &cc)!=OK) return 1; +#else + if (waddch(zcurses_WIN[targetwin], (chtype)args[1][0])!=OK) + return 1; +#endif return 0; } if (OPT_ISSET(ops,'s')) { +#ifdef HAVE_SETCCHAR wchar_t *ws; cchar_t *wcc; size_t sl; +#endif targetwin = zcurses_validate_window(args[0], ZCURSES_USED); if (targetwin == -1) { @@ -197,6 +208,7 @@ bin_zcurses(char *nam, char **args, Options ops, UNUSED(int func)) return 1; } +#ifdef HAVE_SETCCHAR sl = strlen(args[1]); if (sl == 0) { @@ -224,6 +236,10 @@ bin_zcurses(char *nam, char **args, Options ops, UNUSED(int func)) } free(wcc); +#else + if (waddstr(zcurses_WIN[targetwin], args[1])!=OK) + return 1; +#endif return 0; } diff --git a/Src/Modules/curses.mdd b/Src/Modules/curses.mdd index 4d27d5c4f..c9c31f267 100644 --- a/Src/Modules/curses.mdd +++ b/Src/Modules/curses.mdd @@ -1,5 +1,5 @@ name=zsh/curses -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' +link='if test "x$ac_cv_func_initscr" = xyes -a "x$ac_cv_header_curses_h" = xyes; then echo dynamic; else echo no; fi' load=no autobins="zcurses" |