ncurses 5.7 - patch 20090815

[ncurses.git] / form / frm_driver.c

diff --git a/form/frm_driver.c b/form/frm_driver.c
index 5208113010ccdf8c39b9e287dea6e9f9d780c806..e5db6cbca8ff98358aeafb15aa0e73284744a099 100644 (file)
--- a/form/frm_driver.c
+++ b/form/frm_driver.c
@@ -32,7 +32,7 @@
 
 #include "form.priv.h"
 
 
 #include "form.priv.h"
 

-MODULE_ID("$Id: frm_driver.c,v 1.87 2008/07/12 21:24:07 tom Exp $")
+MODULE_ID("$Id: frm_driver.c,v 1.89 2008/12/06 23:08:12 tom Exp $")

 
 /*----------------------------------------------------------------------------
   This is the core module of the form library. It contains the majority
 
 /*----------------------------------------------------------------------------
   This is the core module of the form library. It contains the majority


@@ -4333,15 +4333,6 @@ set_field_buffer(FIELD *field, int buffer, const char *value)
 
   len = Buffer_Length(field);
 
 
   len = Buffer_Length(field);
 

-  if (buffer == 0)
-    {
-      for (i = 0; (value[i] != '\0') && (i < len); ++i)
-       {
-         if (iscntrl(UChar(value[i])))
-           RETURN(E_BAD_ARGUMENT);
-       }
-    }
-

   if (Growable(field))
     {
       /* for a growable field we must assume zero terminated strings, because
   if (Growable(field))
     {
       /* for a growable field we must assume zero terminated strings, because


@@ -4356,14 +4347,6 @@ set_field_buffer(FIELD *field, int buffer, const char *value)
                                                     * field->cols))))
            RETURN(E_SYSTEM_ERROR);
 
                                                     * field->cols))))
            RETURN(E_SYSTEM_ERROR);
 

-         /* in this case we also have to check, whether or not the remaining
-            characters in value are also printable for buffer 0. */
-         if (buffer == 0)
-           {
-             for (i = len; i < vlen; i++)
-               if (iscntrl(UChar(value[i])))
-                 RETURN(E_BAD_ARGUMENT);
-           }

          len = vlen;
        }
     }
          len = vlen;
        }
     }


@@ -4376,6 +4359,14 @@ set_field_buffer(FIELD *field, int buffer, const char *value)
    * There should be a better way, but this handles nonspacing characters
    * and other special cases that we really do not want to handle here.
    */
    * There should be a better way, but this handles nonspacing characters
    * and other special cases that we really do not want to handle here.
    */

+#if NCURSES_EXT_FUNCS
+  if (wresize(field->working, field->drows, field->dcols) == ERR)
+#endif
+    {
+      delwin(field->working);
+      field->working = newpad(field->drows, field->dcols);
+    }
+  len = Buffer_Length(field);

   wclear(field->working);
   mvwaddstr(field->working, 0, 0, value);
 
   wclear(field->working);
   mvwaddstr(field->working, 0, 0, value);
 


@@ -4385,7 +4376,12 @@ set_field_buffer(FIELD *field, int buffer, const char *value)
     }
   else
     {
     }
   else
     {

-      mvwin_wchnstr(field->working, 0, 0, widevalue, (int)len);
+      for (i = 0; i < (unsigned)field->drows; ++i)
+       {
+         mvwin_wchnstr(field->working, i, 0,
+                       widevalue + (i * field->dcols),
+                       field->dcols);
+       }

       for (i = 0; i < len; ++i)
        {
          if (CharEq(myZEROS, widevalue[i]))
       for (i = 0; i < len; ++i)
        {
          if (CharEq(myZEROS, widevalue[i]))