ncurses 5.6 - patch 20070602
[ncurses.git] / ncurses / base / lib_getstr.c
index 485c6e35c8ff3679ea24cbe43597f214c7c4d98b..274e878873715ab4c483255a9a530b1633179cfd 100644 (file)
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -31,7 +31,6 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-
 /*
 **     lib_getstr.c
 **
 #include <curses.priv.h>
 #include <term.h>
 
-MODULE_ID("$Id: lib_getstr.c,v 1.20 1998/12/20 00:16:01 tom Exp $")
+MODULE_ID("$Id: lib_getstr.c,v 1.25 2006/01/12 00:33:52 tom Exp $")
 
 /*
  * This wipes out the last character, no matter whether it was a tab, control
  * or other character, and handles reverse wraparound.
  */
-static char *WipeOut(WINDOW *win, int y, int x, char *first, char *last, bool echoed)
+static char *
+WipeOut(WINDOW *win, int y, int x, char *first, char *last, bool echoed)
 {
-       if (last > first) {
-               *--last = '\0';
-               if (echoed) {
-                       int y1 = win->_cury;
-                       int x1 = win->_curx;
-
-                       wmove(win, y, x);
-                       waddstr(win, first);
-                       getyx(win, y, x);
-                       while (win->_cury < y1
-                          || (win->_cury == y1 && win->_curx < x1))
-                               waddch(win, ' ');
-
-                       wmove(win, y, x);
-               }
+    if (last > first) {
+       *--last = '\0';
+       if (echoed) {
+           int y1 = win->_cury;
+           int x1 = win->_curx;
+
+           wmove(win, y, x);
+           waddstr(win, first);
+           getyx(win, y, x);
+           while (win->_cury < y1
+                  || (win->_cury == y1 && win->_curx < x1))
+               waddch(win, (chtype) ' ');
+
+           wmove(win, y, x);
        }
-       return last;
+    }
+    return last;
 }
 
-int wgetnstr(WINDOW *win, char *str, int maxlen)
+NCURSES_EXPORT(int)
+wgetnstr_events(WINDOW *win,
+               char *str,
+               int maxlen,
+               EVENTLIST_1st(_nc_eventlist * evl))
 {
-TTY    buf;
-bool   oldnl, oldecho, oldraw, oldcbreak;
-char   erasec;
-char   killc;
-char   *oldstr;
-int ch;
-int    y, x;
+    TTY buf;
+    bool oldnl, oldecho, oldraw, oldcbreak;
+    char erasec;
+    char killc;
+    char *oldstr;
+    int ch;
+    int y, x;
 
-       T((T_CALLED("wgetnstr(%p,%p, %d)"), win, str, maxlen));
+    T((T_CALLED("wgetnstr(%p,%p, %d)"), win, str, maxlen));
 
-       if (!win)
-         returnCode(ERR);
+    if (!win)
+       returnCode(ERR);
 
-       _nc_get_tty_mode(&buf);
+    _nc_get_tty_mode(&buf);
 
-       oldnl = SP->_nl;
-       oldecho = SP->_echo;
-       oldraw = SP->_raw;
-       oldcbreak = SP->_cbreak;
-       nl();
-       noecho();
-       noraw();
-       cbreak();
+    oldnl = SP->_nl;
+    oldecho = SP->_echo;
+    oldraw = SP->_raw;
+    oldcbreak = SP->_cbreak;
+    nl();
+    noecho();
+    noraw();
+    cbreak();
 
-       erasec = erasechar();
-       killc = killchar();
+    erasec = erasechar();
+    killc = killchar();
 
-       oldstr = str;
-       getyx(win, y, x);
+    oldstr = str;
+    getyx(win, y, x);
 
-       if (is_wintouched(win) || (win->_flags & _HASMOVED))
-               wrefresh(win);
+    if (is_wintouched(win) || (win->_flags & _HASMOVED))
+       wrefresh(win);
 
-       while ((ch = wgetch(win)) != ERR) {
-               /*
-                * Some terminals (the Wyse-50 is the most common) generate
-                * a \n from the down-arrow key.  With this logic, it's the
-                * user's choice whether to set kcud=\n for wgetch();
-                * terminating *getstr() with \n should work either way.
-                */
-               if (ch == '\n'
-                || ch == '\r'
-                || ch == KEY_DOWN
-                || ch == KEY_ENTER) {
-                       if (oldecho == TRUE
-                        && win->_cury == win->_maxy
-                        && win->_scroll)
-                               wechochar(win, '\n');
-                       break;
-               }
-               if (ch == erasec || ch == KEY_LEFT || ch == KEY_BACKSPACE) {
-                       if (str > oldstr) {
-                               str = WipeOut(win, y, x, oldstr, str, oldecho);
-                       }
-               } else if (ch == killc) {
-                       while (str > oldstr) {
-                               str = WipeOut(win, y, x, oldstr, str, oldecho);
-                       }
-               } else if (ch >= KEY_MIN
-                          || (maxlen >= 0 && str - oldstr >= maxlen)) {
-                       beep();
-               } else {
-                       *str++ = ch;
-                       if (oldecho == TRUE) {
-                               int oldy = win->_cury;
-                               if (waddch(win, ch) == ERR) {
-                                       /*
-                                        * We can't really use the lower-right
-                                        * corner for input, since it'll mess
-                                        * up bookkeeping for erases.
-                                        */
-                                       win->_flags &= ~_WRAPPED;
-                                       waddch(win, ' ');
-                                       str = WipeOut(win, y, x, oldstr, str, oldecho);
-                                       continue;
-                               } else if (win->_flags & _WRAPPED) {
-                                       /*
-                                        * If the last waddch forced a wrap &
-                                        * scroll, adjust our reference point
-                                        * for erasures.
-                                        */
-                                       if (win->_scroll
-                                        && oldy == win->_maxy
-                                        && win->_cury == win->_maxy) {
-                                               if (--y <= 0) {
-                                                       y = 0;
-                                               }
-                                       }
-                                       win->_flags &= ~_WRAPPED;
-                               }
-                               wrefresh(win);
+    while ((ch = wgetch_events(win, evl)) != ERR) {
+       /*
+        * Some terminals (the Wyse-50 is the most common) generate
+        * a \n from the down-arrow key.  With this logic, it's the
+        * user's choice whether to set kcud=\n for wgetch();
+        * terminating *getstr() with \n should work either way.
+        */
+       if (ch == '\n'
+           || ch == '\r'
+           || ch == KEY_DOWN
+           || ch == KEY_ENTER) {
+           if (oldecho == TRUE
+               && win->_cury == win->_maxy
+               && win->_scroll)
+               wechochar(win, (chtype) '\n');
+           break;
+       }
+#ifdef KEY_EVENT
+       if (ch == KEY_EVENT)
+           break;
+#endif
+#ifdef KEY_RESIZE
+       if (ch == KEY_RESIZE)
+           break;
+#endif
+       if (ch == erasec || ch == KEY_LEFT || ch == KEY_BACKSPACE) {
+           if (str > oldstr) {
+               str = WipeOut(win, y, x, oldstr, str, oldecho);
+           }
+       } else if (ch == killc) {
+           while (str > oldstr) {
+               str = WipeOut(win, y, x, oldstr, str, oldecho);
+           }
+       } else if (ch >= KEY_MIN
+                  || (maxlen >= 0 && str - oldstr >= maxlen)) {
+           beep();
+       } else {
+           *str++ = ch;
+           if (oldecho == TRUE) {
+               int oldy = win->_cury;
+               if (waddch(win, (chtype) ch) == ERR) {
+                   /*
+                    * We can't really use the lower-right
+                    * corner for input, since it'll mess
+                    * up bookkeeping for erases.
+                    */
+                   win->_flags &= ~_WRAPPED;
+                   waddch(win, (chtype) ' ');
+                   str = WipeOut(win, y, x, oldstr, str, oldecho);
+                   continue;
+               } else if (win->_flags & _WRAPPED) {
+                   /*
+                    * If the last waddch forced a wrap &
+                    * scroll, adjust our reference point
+                    * for erasures.
+                    */
+                   if (win->_scroll
+                       && oldy == win->_maxy
+                       && win->_cury == win->_maxy) {
+                       if (--y <= 0) {
+                           y = 0;
                        }
+                   }
+                   win->_flags &= ~_WRAPPED;
                }
+               wrefresh(win);
+           }
        }
+    }
+
+    win->_curx = 0;
+    win->_flags &= ~_WRAPPED;
+    if (win->_cury < win->_maxy)
+       win->_cury++;
+    wrefresh(win);
+
+    /* Restore with a single I/O call, to fix minor asymmetry between
+     * raw/noraw, etc.
+     */
+    SP->_nl = oldnl;
+    SP->_echo = oldecho;
+    SP->_raw = oldraw;
+    SP->_cbreak = oldcbreak;
+
+    _nc_set_tty_mode(&buf);
+
+    *str = '\0';
+    if (ch == ERR)
+       returnCode(ch);
+
+    T(("wgetnstr returns %s", _nc_visbuf(oldstr)));
+
+#ifdef KEY_EVENT
+    if (ch == KEY_EVENT)
+       returnCode(ch);
+#endif
+#ifdef KEY_RESIZE
+    if (ch == KEY_RESIZE)
+       returnCode(ch);
+#endif
+
+    returnCode(OK);
+}
 
-       win->_curx = 0;
-       win->_flags &= ~_WRAPPED;
-       if (win->_cury < win->_maxy)
-               win->_cury++;
-       wrefresh(win);
-
-       /* Restore with a single I/O call, to fix minor asymmetry between
-        * raw/noraw, etc.
-        */
-       SP->_nl = oldnl;
-       SP->_echo = oldecho;
-       SP->_raw = oldraw;
-       SP->_cbreak = oldcbreak;
-
-       _nc_set_tty_mode(&buf);
-
-       *str = '\0';
-       if (ch == ERR)
-               returnCode(ERR);
-
-       T(("wgetnstr returns %s", _nc_visbuf(oldstr)));
-
-       returnCode(OK);
+#ifdef NCURSES_WGETCH_EVENTS
+NCURSES_EXPORT(int)
+wgetnstr(WINDOW *win, char *str, int maxlen)
+{
+    returnCode(wgetnstr_events(win,
+                              str,
+                              maxlen,
+                              EVENTLIST_1st((_nc_eventlist *) 0)));
 }
+#endif