ncurses 5.7 - patch 20090523

[ncurses.git] / ncurses / widechar / lib_get_wch.c

diff --git a/ncurses/widechar/lib_get_wch.c b/ncurses/widechar/lib_get_wch.c
index e2a7ce55980938219dc5b4af60e95d184e16036c..c6ab927748faffa9d83a5e41f9ab8ca93fcd46da 100644 (file)
--- a/ncurses/widechar/lib_get_wch.c
+++ b/ncurses/widechar/lib_get_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2002 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2002-2008,2009 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /****************************************************************************
  ****************************************************************************/
 
 /****************************************************************************

- *  Author: Thomas E. Dickey 2002                                           *
+ *  Author: Thomas E. Dickey 2002-on                                        *

  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*


@@ -38,62 +38,91 @@
 */
 
 #include <curses.priv.h>
 */
 
 #include <curses.priv.h>

+#include <ctype.h>

 
 

-MODULE_ID("$Id: lib_get_wch.c,v 1.5 2002/09/02 00:04:25 tom Exp $")
+MODULE_ID("$Id: lib_get_wch.c,v 1.18 2009/04/18 22:41:33 tom Exp $")
+
+#if HAVE_MBTOWC && HAVE_MBLEN
+#define reset_mbytes(state) mblen(NULL, 0), mbtowc(NULL, NULL, 0)
+#define count_mbytes(buffer,length,state) mblen(buffer,length)
+#define check_mbytes(wch,buffer,length,state) \
+       (int) mbtowc(&wch, buffer, length)
+#define state_unused
+#elif HAVE_MBRTOWC && HAVE_MBRLEN
+#define reset_mbytes(state) init_mb(state)
+#define count_mbytes(buffer,length,state) mbrlen(buffer,length,&state)
+#define check_mbytes(wch,buffer,length,state) \
+       (int) mbrtowc(&wch, buffer, length, &state)
+#else
+make an error
+#endif

 
 NCURSES_EXPORT(int)
 
 NCURSES_EXPORT(int)

-wget_wch(WINDOW *win, wint_t * result)
+wget_wch(WINDOW *win, wint_t *result)

 {
 {

+    SCREEN *sp;

     int code;
     char buffer[(MB_LEN_MAX * 9) + 1]; /* allow some redundant shifts */
     int status;
     int code;
     char buffer[(MB_LEN_MAX * 9) + 1]; /* allow some redundant shifts */
     int status;

-    mbstate_t state;

     size_t count = 0;
     unsigned long value;
     wchar_t wch;
     size_t count = 0;
     unsigned long value;
     wchar_t wch;

+#ifndef state_unused
+    mbstate_t state;
+#endif

 
     T((T_CALLED("wget_wch(%p)"), win));
 
     T((T_CALLED("wget_wch(%p)"), win));

+

     /*
      * We can get a stream of single-byte characters and KEY_xxx codes from
      * _nc_wgetch(), while we want to return a wide character or KEY_xxx code.
      */
     /*
      * We can get a stream of single-byte characters and KEY_xxx codes from
      * _nc_wgetch(), while we want to return a wide character or KEY_xxx code.
      */

-    for (;;) {
-       T(("reading %d of %d", count + 1, sizeof(buffer)));
-       code = _nc_wgetch(win, &value, TRUE);
-       if (code == ERR) {
-           break;
-       } else if (code == KEY_CODE_YES) {
-           /*
-            * If we were processing an incomplete multibyte character, return
-            * an error since we have a KEY_xxx code which interrupts it.  For
-            * some cases, we could improve this by writing a new version of
-            * lib_getch.c(!), but it is not clear whether the improvement
-            * would be worth the effort.
-            */
-           if (count != 0) {
-               ungetch(value);
-               code = ERR;
-           }
-           break;
-       } else if (count + 1 >= sizeof(buffer)) {
-           ungetch(value);
-           code = ERR;
-           break;
-       } else {
-           buffer[count++] = UChar(value);
-           memset(&state, 0, sizeof(state));
-           status = mbrlen(buffer, count, &state);
-           if (status >= 0) {
-               memset(&state, 0, sizeof(state));
-               if ((int) mbrtowc(&wch, buffer, count, &state) != status) {
-                   code = ERR; /* the two calls should match */
+    _nc_lock_global(curses);
+    sp = _nc_screen_of(win);
+    if (sp != 0) {
+       for (;;) {
+           T(("reading %d of %d", (int) count + 1, (int) sizeof(buffer)));
+           code = _nc_wgetch(win, &value, TRUE EVENTLIST_2nd((_nc_eventlist
+                                                              *) 0));
+           if (code == ERR) {
+               break;
+           } else if (code == KEY_CODE_YES) {
+               /*
+                * If we were processing an incomplete multibyte character,
+                * return an error since we have a KEY_xxx code which
+                * interrupts it.  For some cases, we could improve this by
+                * writing a new version of lib_getch.c(!), but it is not clear
+                * whether the improvement would be worth the effort.
+                */
+               if (count != 0) {
+                   safe_ungetch (SP_PARM, (int) value);
+                   code = ERR;

                }
                }

-               value = wch;

                break;
                break;

+           } else if (count + 1 >= sizeof(buffer)) {
+               safe_ungetch (SP_PARM, (int) value);
+               code = ERR;
+               break;
+           } else {
+               buffer[count++] = (char) UChar(value);
+               reset_mbytes(state);
+               status = count_mbytes(buffer, count, state);
+               if (status >= 0) {
+                   reset_mbytes(state);
+                   if (check_mbytes(wch, buffer, count, state) != status) {
+                       code = ERR;     /* the two calls should match */
+                       safe_ungetch (SP_PARM, (int) value);
+                   }
+                   value = wch;
+                   break;
+               }

            }
        }
            }
        }

+    } else {
+       code = ERR;

     }
     *result = value;
     }
     *result = value;

+    _nc_unlock_global(curses);

     T(("result %#lo", value));
     returnCode(code);
 }
     T(("result %#lo", value));
     returnCode(code);
 }