X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=form%2Ffty_num.c;h=f7dc90a5a1c47d2bac15bb87c9b976c41695a834;hp=eb2d5869616f87ef40f3d360b13312f287cd449d;hb=55ccd2b959766810cf7db8d1c4462f338ce0afc8;hpb=3a9b6a3bf0269231bef7de74757a910dedd04e0c

diff --git a/form/fty_num.c b/form/fty_num.c
index eb2d5869..f7dc90a5 100644
--- a/form/fty_num.c
+++ b/form/fty_num.c
@@ -1,4 +1,3 @@
-
 /*
  * THIS CODE IS SPECIFICALLY EXEMPTED FROM THE NCURSES PACKAGE COPYRIGHT.
  * You may freely copy it for use as a template for your own field types.
@@ -7,189 +6,259 @@
  */
 /***************************************************************************
 *                                                                          *
-*  Author : Juergen Pfeifer, Juergen.Pfeifer@T-Online.de                   *
+*  Author : Juergen Pfeifer                                                *
 *                                                                          *
 ***************************************************************************/
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fty_num.c,v 1.9 1997/04/19 17:26:38 juergen Exp $")
+MODULE_ID("$Id: fty_num.c,v 1.22 2005/08/20 18:26:16 tom Exp $")
 
 #if HAVE_LOCALE_H
 #include <locale.h>
 #endif
 
-typedef struct {
-  int    precision;
-  double low;
-  double high;
-  struct lconv* L;
-} numericARG;
+#if HAVE_LOCALE_H
+#define isDecimalPoint(c) ((c) == ((L && L->decimal_point) ? *(L->decimal_point) : '.'))
+#else
+#define isDecimalPoint(c) ((c) == '.')
+#endif
+
+#if USE_WIDEC_SUPPORT
+#define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c)))
+#else
+#define isDigit(c) isdigit(UChar(c))
+#endif
+
+#define thisARG numericARG
+
+typedef struct
+  {
+    int precision;
+    double low;
+    double high;
+    struct lconv *L;
+  }
+thisARG;
 
 /*---------------------------------------------------------------------------
-|   Facility      :  libnform  
-|   Function      :  static void *Make_Numeric_Type(va_list * ap)
-|   
+|   Facility      :  libnform
+|   Function      :  static void *Make_This_Type(va_list * ap)
+|
 |   Description   :  Allocate structure for numeric type argument.
 |
 |   Return Values :  Pointer to argument structure or NULL on error
 +--------------------------------------------------------------------------*/
-static void *Make_Numeric_Type(va_list * ap)
+static void *
+Make_This_Type(va_list *ap)
 {
-  numericARG *argn = (numericARG *)malloc(sizeof(numericARG));
+  thisARG *argn = (thisARG *) malloc(sizeof(thisARG));
 
   if (argn)
     {
-      argn->precision = va_arg(*ap,int);
-      argn->low       = va_arg(*ap,double);
-      argn->high      = va_arg(*ap,double);
+      argn->precision = va_arg(*ap, int);
+      argn->low = va_arg(*ap, double);
+      argn->high = va_arg(*ap, double);
+
 #if HAVE_LOCALE_H
-      argn->L         = localeconv();
+      argn->L = localeconv();
 #else
-      argn->L         = NULL;
+      argn->L = NULL;
 #endif
     }
   return (void *)argn;
 }
 
 /*---------------------------------------------------------------------------
-|   Facility      :  libnform  
-|   Function      :  static void *Copy_Numeric_Type(const void * argp)
-|   
-|   Description   :  Copy structure for numeric type argument.  
+|   Facility      :  libnform
+|   Function      :  static void *Copy_This_Type(const void * argp)
+|
+|   Description   :  Copy structure for numeric type argument.
 |
 |   Return Values :  Pointer to argument structure or NULL on error.
 +--------------------------------------------------------------------------*/
-static void *Copy_Numeric_Type(const void * argp)
+static void *
+Copy_This_Type(const void *argp)
 {
-  const numericARG *ap = (const numericARG *)argp;
-  numericARG *new = (numericARG *)0;
+  const thisARG *ap = (const thisARG *)argp;
+  thisARG *result = (thisARG *) 0;
 
   if (argp)
     {
-      new = (numericARG *)malloc(sizeof(numericARG));
-      if (new)
-	*new  = *ap;
+      result = (thisARG *) malloc(sizeof(thisARG));
+      if (result)
+	*result = *ap;
     }
-  return (void *)new;
+  return (void *)result;
 }
 
 /*---------------------------------------------------------------------------
-|   Facility      :  libnform  
-|   Function      :  static void Free_Numeric_Type(void * argp)
-|   
+|   Facility      :  libnform
+|   Function      :  static void Free_This_Type(void * argp)
+|
 |   Description   :  Free structure for numeric type argument.
 |
 |   Return Values :  -
 +--------------------------------------------------------------------------*/
-static void Free_Numeric_Type(void * argp)
+static void
+Free_This_Type(void *argp)
 {
-  if (argp) 
+  if (argp)
     free(argp);
 }
 
 /*---------------------------------------------------------------------------
-|   Facility      :  libnform  
-|   Function      :  static bool Check_Numeric_Field(FIELD * field,
-|                                                    const void * argp)
-|   
+|   Facility      :  libnform
+|   Function      :  static bool Check_This_Field(FIELD * field,
+|                                                 const void * argp)
+|
 |   Description   :  Validate buffer content to be a valid numeric value
 |
 |   Return Values :  TRUE  - field is valid
 |                    FALSE - field is invalid
 +--------------------------------------------------------------------------*/
-static bool Check_Numeric_Field(FIELD * field, const void * argp)
+static bool
+Check_This_Field(FIELD *field, const void *argp)
 {
-  const numericARG *argn = (const numericARG *)argp;
-  double low          = argn->low;
-  double high         = argn->high;
-  int prec            = argn->precision;
-  unsigned char *bp   = (unsigned char *)field_buffer(field,0);
-  char *s             = (char *)bp;
-  double val          = 0.0;
-  struct lconv* L     = argn->L;
+  const thisARG *argn = (const thisARG *)argp;
+  double low = argn->low;
+  double high = argn->high;
+  int prec = argn->precision;
+  unsigned char *bp = (unsigned char *)field_buffer(field, 0);
+  char *s = (char *)bp;
+  double val = 0.0;
+  struct lconv *L = argn->L;
   char buf[64];
+  bool result = FALSE;
 
-  while(*bp && *bp==' ') bp++;
+  while (*bp && *bp == ' ')
+    bp++;
   if (*bp)
     {
-      if (*bp=='-' || *bp=='+')
+      if (*bp == '-' || *bp == '+')
 	bp++;
-      while(*bp)
+#if USE_WIDEC_SUPPORT
+      if (*bp)
 	{
-	  if (!isdigit(*bp)) break;
+	  bool blank = FALSE;
+	  int state = 0;
+	  int len;
+	  int n;
+	  wchar_t *list = _nc_Widen_String((char *)bp, &len);
+
+	  if (list != 0)
+	    {
+	      result = TRUE;
+	      for (n = 0; n < len; ++n)
+		{
+		  if (blank)
+		    {
+		      if (list[n] != ' ')
+			{
+			  result = FALSE;
+			  break;
+			}
+		    }
+		  else if (list[n] == ' ')
+		    {
+		      blank = TRUE;
+		    }
+		  else if (isDecimalPoint(list[n]))
+		    {
+		      if (++state > 1)
+			{
+			  result = FALSE;
+			  break;
+			}
+		    }
+		  else if (!isDigit(list[n]))
+		    {
+		      result = FALSE;
+		      break;
+		    }
+		}
+	      free(list);
+	    }
+	}
+#else
+      while (*bp)
+	{
+	  if (!isdigit(UChar(*bp)))
+	    break;
 	  bp++;
 	}
-      if (*bp==(
-#if HAVE_LOCALE_H
-		(L && L->decimal_point) ? *(L->decimal_point) :
-#endif
-		'.'))
+      if (isDecimalPoint(*bp))
 	{
 	  bp++;
-	  while(*bp)
+	  while (*bp)
 	    {
-	      if (!isdigit(*bp)) break;
+	      if (!isdigit(UChar(*bp)))
+		break;
 	      bp++;
 	    }
 	}
-      while(*bp && *bp==' ') bp++;
-      if (*bp=='\0')
+      while (*bp && *bp == ' ')
+	bp++;
+      result = (*bp == '\0');
+#endif
+      if (result)
 	{
 	  val = atof(s);
-	  if (low<high)
+	  if (low < high)
+	    {
+	      if (val < low || val > high)
+		result = FALSE;
+	    }
+	  if (result)
 	    {
-	      if (val<low || val>high) return FALSE;
+	      sprintf(buf, "%.*f", (prec > 0 ? prec : 0), val);
+	      set_field_buffer(field, 0, buf);
 	    }
-	  sprintf(buf,"%.*f",(prec>0?prec:0),val);
-	  set_field_buffer(field,0,buf);
-	  return TRUE;
 	}
     }
-  return FALSE;
+  return (result);
 }
 
 /*---------------------------------------------------------------------------
-|   Facility      :  libnform  
-|   Function      :  static bool Check_Numeric_Character(
+|   Facility      :  libnform
+|   Function      :  static bool Check_This_Character(
 |                                      int c,
 |                                      const void * argp)
-|   
+|
 |   Description   :  Check a character for the numeric type.
 |
 |   Return Values :  TRUE  - character is valid
 |                    FALSE - character is invalid
 +--------------------------------------------------------------------------*/
-static bool Check_Numeric_Character(int c, const void * argp)
+static bool
+Check_This_Character(int c, const void *argp)
 {
-  const numericARG *argn = (const numericARG *)argp;
-  struct lconv* L  = argn->L;  
-
-  return (isdigit(c)  || 
-	  c == '+'    || 
-	  c == '-'    || 
-	  c == (
-#ifdef HAVE_LOCALE_H
-		(L && L->decimal_point) ? *(L->decimal_point) :
-#endif
-		'.')
-	  ) ? TRUE : FALSE;
+  const thisARG *argn = (const thisARG *)argp;
+  struct lconv *L = argn->L;
+
+  return ((isDigit(c) ||
+	   c == '+' ||
+	   c == '-' ||
+	   isDecimalPoint(c))
+	  ? TRUE
+	  : FALSE);
 }
 
-static FIELDTYPE typeNUMERIC = {
+static FIELDTYPE typeTHIS =
+{
   _HAS_ARGS | _RESIDENT,
-  1,                           /* this is mutable, so we can't be const */
+  1,				/* this is mutable, so we can't be const */
   (FIELDTYPE *)0,
   (FIELDTYPE *)0,
-  Make_Numeric_Type,
-  Copy_Numeric_Type,
-  Free_Numeric_Type,
-  Check_Numeric_Field,
-  Check_Numeric_Character,
+  Make_This_Type,
+  Copy_This_Type,
+  Free_This_Type,
+  Check_This_Field,
+  Check_This_Character,
   NULL,
   NULL
 };
 
-FIELDTYPE* TYPE_NUMERIC = &typeNUMERIC;
+NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_NUMERIC = &typeTHIS;
 
 /* fty_num.c ends here */