File xfig.3.2.5-locale.dif of Package xfig

Overview Repositories Revisions Requests Users Attributes Meta

File xfig.3.2.5-locale.dif of Package xfig (Revision 2dd46c8b1f8472630df5e2e138a024a5)

Currently displaying revision 2dd46c8b1f8472630df5e2e138a024a5 , Show latest

--- main.c
+++ main.c	2007-05-07 15:39:50.847599259 +0200
@@ -61,11 +61,13 @@
 
 /* input extensions for an input tablet */
 #ifdef USE_TAB
-#include "X11/extensions/XInput.h"
+#include <X11/extensions/XInput.h>
 #endif /* USE_TAB */
 
 #ifdef I18N
 #include <X11/keysym.h>
+#include <locale.h>
+#include <langinfo.h>
 #endif  /* I18N */
 
 /* EXPORTS */
@@ -765,11 +767,6 @@ void main(int argc, char **argv)
 	}
     }
 
-#ifdef I18N
-    setlocale(LC_ALL, "");
-    XtSetLanguageProc(NULL, NULL, NULL);
-#endif  /* I18N */
-
     /*
      * save the command line arguments
      */
@@ -860,6 +857,10 @@ void main(int argc, char **argv)
     }
 
 #ifdef I18N
+    if (NULL == strcasestr(nl_langinfo(CODESET),"ANSI") &&
+	 NULL == strcasestr(nl_langinfo(CODESET),"ISO-8859-1"))
+	appres.international = True;
+
     /************************************************************/
     /* if the international option has been set, set the locale */
     /************************************************************/
@@ -1581,6 +1582,11 @@ setup_visual(int *argc_p, char **argv, A
 	 */
 	tool = XtAppInitialize (&tool_app, "Fig", options, XtNumber (options), argc_p, argv,
 			       (String *) NULL, args, 0);
+#ifdef I18N
+	setlocale(LC_ALL, "");
+	setlocale(LC_NUMERIC, "C");
+	XtSetLanguageProc(tool_app, NULL, NULL);
+#endif  /* I18N */
 	/* save important info */
 	tool_d = XtDisplay(tool);
 	tool_s = XtScreen(tool);
--- u_print.c
+++ u_print.c	2006-11-16 13:45:46.000000000 +0100
@@ -15,6 +15,7 @@
  *
  */
 
+#include <locale.h>
 #include "fig.h"
 #include "resources.h"
 #include "object.h"

Places

File xfig.3.2.5-locale.dif of Package xfig (Revision 2dd46c8b1f8472630df5e2e138a024a5)

Places