Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm/src
Modified Files:
feature.h startup.c
Log Message:
Fri Jul 16 17:59:48 2004 Michael Jennings (mej)
If $LANG refers to a UTF-8 or similar locale, remove that part. In
other words, en_US.utf8 becomes en_US instead.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/feature.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- feature.h 14 Jul 2004 20:18:29 -0000 1.42
+++ feature.h 16 Jul 2004 22:01:47 -0000 1.43
@@ -201,6 +201,9 @@
/* Allow option/attribute for Meta to set the 8th bit */
#define META8_OPTION
+/* Attempt to deactivate UTF-8 and similar locales. */
+#define NO_UTF8_LOCALE
+
/********************* Miscellaneous options *********************/
/* To have $DISPLAY and the "\E[7n" response be IP addresses rather than FQDN's */
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/startup.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- startup.c 10 May 2004 22:43:58 -0000 1.45
+++ startup.c 16 Jul 2004 22:01:47 -0000 1.46
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: startup.c,v 1.45 2004/05/10 22:43:58 mej Exp $";
+static const char cvs_ident[] = "$Id: startup.c,v 1.46 2004/07/16 22:01:47 mej Exp $";
#include "config.h"
#include "feature.h"
@@ -76,7 +76,8 @@
int i;
char *val;
- static char windowid_string[20], *display_string, *term_string; /*
"WINDOWID=\0" = 10 chars, UINT_MAX = 10 chars */
+ /* "WINDOWID=\0" = 10 chars, UINT_MAX = 10 chars */
+ static char windowid_string[20], *display_string, *term_string;
orig_argv0 = argv[0];
@@ -311,6 +312,19 @@
}
putenv("ETERM_VERSION=" VERSION);
+#ifdef NO_UTF8_LOCALE
+ /* Check locale for UTF-8 and deactivate if needed. */
+ val = getenv("LANG");
+ if (val && *val) {
+ char *tmp;
+
+ tmp = strcasestr(val, ".utf");
+ if (tmp) {
+ *tmp = 0;
+ }
+ }
+#endif
+
D_CMD(("init_command()\n"));
init_command(rs_exec_args);
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
