The core code has always assumed a locale of "C".

Do not change the locale globally, else things will break in weird and 
wonderful ways.

Introduce utils/locale.[ch], which provide locale-specific wrappers for various 
functions (currently just the <ctype.h> ones).

Fix up the few places I can see that actually require that the underlying 
locale is paid attention to.

Some notes:

  1) The GTK frontend code has not been touched. It is possible that reading of 
     numeric values (e.g. from the preferences dialogue) may break with this 
     change, particularly in locales that use something other than '.' as their
     decimal separator.
  2) The search code is left unchanged (i.e. assuming a locale of "C"). 
     This may break case insensitive matching of non-ASCII characters. 
     I doubt that ever actually worked, anyway. In future, it should use
     Unicode case conversion to achieve the same effect.
  3) The text input handling in the core makes use of isspace() to detect
     word boundaries. This is fine for western languages (even in the C locale,
     which it's currently assuming). It will, however, break for CJK et. al. 
     (this has always been the case, rather than being a new issue)
  4) text-transform uses locale-specific variants of to{lower,upper}. In future
     this should probably be performing Unicode case conversion. This is the
     only part of the core code that makes use of locale information.

In future, if you require locale-specific behaviour, do the following:

  setlocale(LC_<whatever>, "");
  <your operation(s) here>
  setlocale(LC_<whatever>, "C");

  The first setlocale will change the current locale to the native environment.
  The second setlocale will reset the current locale to "C".
  Any value other than "" or "C" is probably a bug, unless there's a really
  good reason for it.

In the long term, it is expected that all locale-dependent code will reside in 
platform frontends -- the core being wholly locale agnostic (though assuming 
"C" for things like decimal separators).


svn path=/trunk/netsurf/; revision=4153

Makefile.sources

@@ -11,7 +11,7 @@ S_CSS := css.c css_enum.c parser.c ruleset.c scanner.c
 S_RENDER := box.c box_construct.c box_normalise.c	\
 	directory.c form.c html.c html_redraw.c		\
 	imagemap.c layout.c list.c table.c textplain.c
-S_UTILS := base64.c filename.c hashtable.c messages.c talloc.c	\
+S_UTILS := base64.c filename.c hashtable.c locale.c messages.c talloc.c	\
 	url.c utf8.c utils.c useragent.c
 S_DESKTOP := knockout.c options.c tree.c version.c
 

css/ruleset.c

@@ -31,7 +31,6 @@
 
 #define _GNU_SOURCE  /* for strndup */
 #include <assert.h>
-#include <ctype.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>

desktop/browser.c

@@ -26,7 +26,6 @@
  */
 
 #include <assert.h>
-#include <ctype.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>

desktop/frames.c

@@ -21,7 +21,6 @@
  */
 
 #include <assert.h>
-#include <ctype.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>

desktop/netsurf.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <locale.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -111,7 +110,6 @@ void netsurf_init(int argc, char** argv)
 	lib_init();
 	url_init();
 	gui_init(argc, argv);
-	setlocale(LC_ALL, "");
 	fetch_init();
 	fetchcache_init();
 	gui_init2(argc, argv);

render/box_construct.c

@@ -43,6 +43,7 @@
 #include "render/form.h"
 #include "render/html.h"
 #include "desktop/gui.h"
+#include "utils/locale.h"
 //#define NDEBUG
 #include "utils/log.h"
 #include "utils/messages.h"
@@ -1362,20 +1363,20 @@ void box_text_transform(char *s, unsigned int len,
 		case CSS_TEXT_TRANSFORM_UPPERCASE:
 			for (i = 0; i < len; ++i)
 				if ((unsigned char) s[i] < 0x80)
-					s[i] = toupper(s[i]);
+					s[i] = ls_toupper(s[i]);
 			break;
 		case CSS_TEXT_TRANSFORM_LOWERCASE:
 			for (i = 0; i < len; ++i)
 				if ((unsigned char) s[i] < 0x80)
-					s[i] = tolower(s[i]);
+					s[i] = ls_tolower(s[i]);
 			break;
 		case CSS_TEXT_TRANSFORM_CAPITALIZE:
 			if ((unsigned char) s[0] < 0x80)
-				s[0] = toupper(s[0]);
+				s[0] = ls_toupper(s[0]);
 			for (i = 1; i < len; ++i)
 				if ((unsigned char) s[i] < 0x80 &&
-						isspace(s[i - 1]))
-					s[i] = toupper(s[i]);
+						ls_isspace(s[i - 1]))
+					s[i] = ls_toupper(s[i]);
 			break;
 		default:
 			break;

render/layout.c

@@ -33,7 +33,6 @@
 
 #define _GNU_SOURCE  /* for strndup */
 #include <assert.h>
-#include <ctype.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>

riscos/401login.c

@@ -17,7 +17,6 @@
  */
 
 #include <assert.h>
-#include <ctype.h>
 #include <stdbool.h>
 #include <string.h>
 #include "oslib/wimp.h"

riscos/download.c

@@ -29,7 +29,6 @@
  */
 
 #include <assert.h>
-#include <ctype.h>
 #include <string.h>
 #include <sys/time.h>
 #include <time.h>

riscos/plugin.c

@@ -38,7 +38,6 @@
  */
 
 #include <assert.h>
-#include <ctype.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>

riscos/wimp.c

@@ -21,7 +21,7 @@
  */
 
 #include <assert.h>
-#include <ctype.h>
+#include <locale.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
@@ -51,7 +51,7 @@ static wimp_w furniture_window = NULL;
 unsigned char last_sprite_found[16];
 
 /**
- * Gets the horzontal scrollbar height
+ * Gets the horizontal scrollbar height
  *
  * \param  w  the window to read (or NULL to read a cached value)
  */
@@ -398,7 +398,13 @@ void ro_gui_set_icon_string_le(wimp_w w, wimp_i i, const char *text) {
  */
 void ro_gui_set_icon_integer(wimp_w w, wimp_i i, int value) {
 	char buffer[20]; // Big enough for 64-bit int
+
+	setlocale(LC_NUMERIC, "");
+
 	sprintf(buffer, "%d", value);
+
+	setlocale(LC_NUMERIC, "C");
+
 	ro_gui_set_icon_string(w, i, buffer);
 }
 
@@ -413,6 +419,8 @@ void ro_gui_set_icon_integer(wimp_w w, wimp_i i, int value) {
 void ro_gui_set_icon_decimal(wimp_w w, wimp_i i, int value, int decimal_places) {
 	char buffer[20]; // Big enough for 64-bit int
 
+	setlocale(LC_NUMERIC, "");
+
 	switch (decimal_places) {
 		case 0:
 			sprintf(buffer, "%d", value);
@@ -427,6 +435,9 @@ void ro_gui_set_icon_decimal(wimp_w w, wimp_i i, int value, int decimal_places)
 			assert(!"Unsupported decimal format");
 			break;
 	}
+
+	setlocale(LC_NUMERIC, "C");
+
 	ro_gui_set_icon_string(w, i, buffer);
 }
 
@@ -445,7 +456,12 @@ int ro_gui_get_icon_decimal(wimp_w w, wimp_i i, int decimal_places) {
 	for (; decimal_places > 0; decimal_places--)
 		multiple *= 10;
 
+	setlocale(LC_NUMERIC, "");
+
 	value = atof(ro_gui_get_icon_string(w, i)) * multiple;
+
+	setlocale(LC_NUMERIC, "C");
+
 	return (int)value;
 }
 

utils/locale.c

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008 John-Mark Bell <jmb@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** \file
+ * Locale-specific variants of various routines (implementation)
+ */
+
+#include <ctype.h>
+#include <locale.h>
+
+#include "utils/locale.h"
+
+/* <ctype.h> functions */
+#define MAKELSCTYPE(x) int ls_##x(int c)				\
+{									\
+	int ret;							\
+	setlocale(LC_ALL, "");						\
+	ret = x(c);							\
+	setlocale(LC_ALL, "C");						\
+	return ret;							\
+}
+
+MAKELSCTYPE(isalpha)
+MAKELSCTYPE(isalnum)
+MAKELSCTYPE(iscntrl)
+MAKELSCTYPE(isdigit)
+MAKELSCTYPE(isgraph)
+MAKELSCTYPE(islower)
+MAKELSCTYPE(isprint)
+MAKELSCTYPE(ispunct)
+MAKELSCTYPE(isspace)
+MAKELSCTYPE(isupper)
+MAKELSCTYPE(isxdigit)
+MAKELSCTYPE(tolower)
+MAKELSCTYPE(toupper)
+
+#undef MAKELSCTYPE
+

utils/locale.h

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2008 John-Mark Bell <jmb@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** \file
+ * Locale-specific variants of various routines (interface)
+ */
+
+#ifndef _NETSURF_UTILS_LOCALE_H_
+#define _NETSURF_UTILS_LOCALE_H_
+
+/* <ctype.h> functions */
+int ls_isalpha(int c);
+int ls_isalnum(int c);
+int ls_iscntrl(int c);
+int ls_isdigit(int c);
+int ls_isgraph(int c);
+int ls_islower(int c);
+int ls_isprint(int c);
+int ls_ispunct(int c);
+int ls_isspace(int c);
+int ls_isupper(int c);
+int ls_isxdigit(int c);
+int ls_tolower(int c);
+int ls_toupper(int c);
+
+#endif
+