diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Doc/Zsh/mod_curses.yo | 12 | ||||
-rw-r--r-- | Src/Modules/curses.c | 6 |
3 files changed, 14 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 469b4dfb2..bb8dc1ce1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-10-23 Clint Adams <clint@zsh.org> + + * 24012: Src/Modules/curses.c: rename "endwin", "c", and "s" to + "endwin", "char", and "string" respectively. + 2007-10-23 Peter Stephenson <p.w.stephenson@ntlworld.com> * 24011 (tweaked to include 24010 and to remove unneeded diff --git a/Doc/Zsh/mod_curses.yo b/Doc/Zsh/mod_curses.yo index 8404b2940..e85aa5c67 100644 --- a/Doc/Zsh/mod_curses.yo +++ b/Doc/Zsh/mod_curses.yo @@ -7,18 +7,18 @@ startitem() findex(zcurses) cindex(windows, curses) xitem(tt(zcurses) tt(init)) -xitem(tt(zcurses) tt(endwin)) +xitem(tt(zcurses) tt(end)) xitem(tt(zcurses) tt(addwin) var(targetwin) var(nlines) var(ncols) var(begin_y) var(begin_x) ) xitem(tt(zcurses) tt(delwin) var(targetwin) ) xitem(tt(zcurses) tt(refresh) [ var(targetwin) ] ) xitem(tt(zcurses) tt(move) var(targetwin) var(new_y) var(new_x) ) -xitem(tt(zcurses) tt(c) var(targetwin) var(character) ) -xitem(tt(zcurses) tt(s) var(targetwin) var(string) ) +xitem(tt(zcurses) tt(char) var(targetwin) var(character) ) +xitem(tt(zcurses) tt(string) var(targetwin) var(string) ) xitem(tt(zcurses) tt(border) var(targetwin) var(border) )( item(tt(zcurses) tt(addwin) var(targetwin) var({+/-}attribute) [var({+/-}attribute)] [...])( Manipulate curses windows. All uses of this command should be bracketed by `tt(zcurses init)' to initialise use of curses, and -`tt(zcurses endwin)' to end it; omitting `tt(zcurses endwin)' can cause +`tt(zcurses end)' to end it; omitting `tt(zcurses end)' can cause the terminal to be in an unwanted state. With tt(addwin), create a window with var(nlines) lines and var(ncols) columns. @@ -30,13 +30,13 @@ Use tt(delwin) to delete a window created with tt(addwin). The tt(refresh) command will refresh window var(targetwin); this is necessary to make any pending changes (such as characters you have prepared for output -with tt(c)) visible on the screen. If no argument is given, +with tt(char)) visible on the screen. If no argument is given, all windows are refreshed; this is necessary after deleting a window. tt(move) moves the cursor position in var(targetwin) to new coordinates var(new_y) and var(new_x). -Outputting characters and strings are achieved by tt(c) and tt(s) +Outputting characters and strings are achieved by tt(char) and tt(string) respectively. To draw a border around window var(targetwin), use tt(border). diff --git a/Src/Modules/curses.c b/Src/Modules/curses.c index c21e81e52..8c9fed4ad 100644 --- a/Src/Modules/curses.c +++ b/Src/Modules/curses.c @@ -612,10 +612,10 @@ bin_zcurses(char *nam, char **args, Options ops, UNUSED(int func)) {"delwin", zccmd_delwin, 1, 1}, {"refresh", zccmd_refresh, 0, 1}, {"move", zccmd_move, 3, 3}, - {"c", zccmd_char, 2, 2}, - {"s", zccmd_string, 2, 2}, + {"char", zccmd_char, 2, 2}, + {"string", zccmd_string, 2, 2}, {"border", zccmd_border, 1, 1}, - {"endwin", zccmd_endwin, 0, 0}, + {"end", zccmd_endwin, 0, 0}, {"attr", zccmd_attr, 2, -1}, {"color", zccmd_color, 2, 2}, {NULL, (zccmd_t)0, 0, 0} |