Mercurial > projects > dwt2
comparison base/src/java/nonstandard/Locale.d @ 120:536e43f63c81
Comprehensive update for Win32/Linux32 dmd-2.053/dmd-1.068+Tango-r5661
===D2===
* added [Try]Immutable/Const/Shared templates to work with differenses in D1/D2 instead of version statements
used these templates to work with strict type storage rules of dmd-2.053
* com.ibm.icu now also compilable with D2, but not tested yet
* small fixes
Snippet288 - shared data is in TLS
===Phobos===
* fixed critical bugs in Phobos implemention
completely incorrect segfault prone fromStringz (Linux's port ruthless killer)
terrible, incorrect StringBuffer realization (StyledText killer)
* fixed small bugs as well
Snippet72 - misprint in the snippet
* implemented missed functionality for Phobos
ByteArrayOutputStream implemented (image loading available)
formatting correctly works for all DWT's cases
As a result, folowing snippets now works with Phobos (Snippet### - what is fixed):
Snippet24, 42, 111, 115, 130, 235, 276 - bad string formatting
Snippet48, 282 - crash on image loading
Snippet163, 189, 211, 213, 217, 218, 222 - crash on copy/cut in StyledText
Snippet244 - hang-up
===Tango===
* few changes for the latest Tango trunc-r5661
* few small performance improvments
===General===
* implMissing-s for only one version changed to implMissingInTango/InPhobos
* incorrect calls to Format in toString-s fixed
* fixed loading \uXXXX characters in ResourceBundle
* added good UTF-8 support for StyledText, TextLayout (Win32) and friends
UTF functions revised and tested. It is now in java.nonstandard.*Utf modules
StyledText and TextLayout (Win32) modules revised for UTF-8 support
* removed small diferences in most identical files in *.swt.* folders
*.swt.internal.image, *.swt.events and *.swt.custom are identical in Win32/Linux32
now 179 of 576 (~31%) files in *.swt.* folders are fully identical
* Win32: snippets now have right subsystem, pretty icons and native system style controls
* small fixes in snippets
Snippet44 - it's not Snippet44
Snippet212 - functions work with different images and offsets arrays
Win32: Snippet282 - crash on close if the button has an image
Snippet293 - setGrayed is commented
and others
Win32: As a result, folowing snippets now works
Snippet68 - color doesn't change
Snippet163, 189, 211, 213, 217, 218, 222 - UTF-8 issues (see above)
Snippet193 - no tabel headers
author | Denis Shelomovskij <verylonglogin.reg@gmail.com> |
---|---|
date | Sat, 09 Jul 2011 15:50:20 +0300 |
parents | 3daece18b48e |
children |
comparison
equal
deleted
inserted
replaced
119:d00e8db0a568 | 120:536e43f63c81 |
---|---|
12 version(Tango){ | 12 version(Tango){ |
13 private import tango.text.locale.Core; | 13 private import tango.text.locale.Core; |
14 } else { // Phobos | 14 } else { // Phobos |
15 private import std.conv; | 15 private import std.conv; |
16 private import std.exception; | 16 private import std.exception; |
17 | |
18 version (Windows) { | |
19 private import std.c.string; | |
20 private import std.c.windows.windows; | |
21 private bool W_VERSION; | |
22 static this() { | |
23 W_VERSION = GetVersion < 0x80000000; | |
24 } | |
25 private extern (Windows) { | |
26 enum LCID : DWORD { | |
27 /// The default locale for the user or process. | |
28 LOCALE_USER_DEFAULT = 0x0400, | |
29 } | |
30 enum LCTYPE : DWORD { | |
31 /// ISO639 language name. | |
32 LOCALE_SISO639LANGNAME = 0x0059, | |
33 /// ISO3166 country name. | |
34 LOCALE_SISO3166CTRYNAME = 0x005A | |
35 } | |
36 /// Retrieves information about a locale specified by identifier. | |
37 /// See_Also: GetLocaleInfo Function (Windows) | |
38 /// (http://msdn.microsoft.com/en-us/library/dd318101%28VS.85%29.aspx) | |
39 INT GetLocaleInfoW( | |
40 LCID Locale, | |
41 LCTYPE LCType, | |
42 LPWSTR lpLCData, | |
43 INT cchData | |
44 ); | |
45 /// ditto | |
46 INT GetLocaleInfoA( | |
47 LCID Locale, | |
48 LCTYPE LCType, | |
49 LPCSTR lpLCData, | |
50 INT cchData | |
51 ); | |
52 } | |
53 /// A purpose of this templete is switch of W or A in Windows. | |
54 private String caltureNameImpl(Char, alias GetLocalInfo)() { | |
55 INT len; | |
56 Char[] res; | |
57 Char[] buf; | |
58 len = GetLocalInfo(LCID.LOCALE_USER_DEFAULT, | |
59 LCTYPE.LOCALE_SISO639LANGNAME, null, 0); | |
60 enforce(len, new Exception("LOCALE_SISO639LANGNAME (len)", __FILE__, __LINE__)); | |
61 buf.length = len; | |
62 len = GetLocalInfo(LCID.LOCALE_USER_DEFAULT, | |
63 LCTYPE.LOCALE_SISO639LANGNAME, buf.ptr, buf.length); | |
64 enforce(len, new Exception("LOCALE_SISO639LANGNAME", __FILE__, __LINE__)); | |
65 res ~= buf[0 .. len - 1]; | |
66 res ~= "-"; | |
67 len = GetLocalInfo(LCID.LOCALE_USER_DEFAULT, | |
68 LCTYPE.LOCALE_SISO3166CTRYNAME, null, 0); | |
69 enforce(len, new Exception("LOCALE_SISO3166CTRYNAME (len)", __FILE__, __LINE__)); | |
70 buf.length = len; | |
71 len = GetLocalInfo(LCID.LOCALE_USER_DEFAULT, | |
72 LCTYPE.LOCALE_SISO3166CTRYNAME, buf.ptr, buf.length); | |
73 enforce(len, new Exception("LOCALE_SISO3166CTRYNAME", __FILE__, __LINE__)); | |
74 res ~= buf[0 .. len - 1]; | |
75 return to!(String)(res); | |
76 } | |
77 } else version (Posix) { | |
78 private import std.process : getenv; | |
79 private import std.string : indexOf, replace; | |
80 } | |
17 } | 81 } |
18 version (Windows) { | |
19 private import std.c.string; | |
20 private import std.c.windows.windows; | |
21 private bool W_VERSION; | |
22 static this() { | |
23 W_VERSION = GetVersion < 0x80000000; | |
24 } | |
25 private extern (Windows) { | |
26 enum LCID : DWORD { | |
27 /// The default locale for the user or process. | |
28 LOCALE_USER_DEFAULT = 0x0400, | |
29 } | |
30 enum LCTYPE : DWORD { | |
31 /// ISO639 language name. | |
32 LOCALE_SISO639LANGNAME = 0x0059, | |
33 /// ISO3166 country name. | |
34 LOCALE_SISO3166CTRYNAME = 0x005A | |
35 } | |
36 /// Retrieves information about a locale specified by identifier. | |
37 /// See_Also: GetLocaleInfo Function (Windows) | |
38 /// (http://msdn.microsoft.com/en-us/library/dd318101%28VS.85%29.aspx) | |
39 INT GetLocaleInfoW( | |
40 LCID Locale, | |
41 LCTYPE LCType, | |
42 LPWSTR lpLCData, | |
43 INT cchData | |
44 ); | |
45 /// ditto | |
46 INT GetLocaleInfoA( | |
47 LCID Locale, | |
48 LCTYPE LCType, | |
49 LPCSTR lpLCData, | |
50 INT cchData | |
51 ); | |
52 } | |
53 /// A purpose of this templete is switch of W or A in Windows. | |
54 private String caltureNameImpl(Char, alias GetLocalInfo)() { | |
55 INT len; | |
56 Char[] res; | |
57 Char[] buf; | |
58 len = GetLocalInfo(LCID.LOCALE_USER_DEFAULT, | |
59 LCTYPE.LOCALE_SISO639LANGNAME, null, 0); | |
60 enforce(len, new Exception("LOCALE_SISO639LANGNAME (len)", __FILE__, __LINE__)); | |
61 buf.length = len; | |
62 len = GetLocalInfo(LCID.LOCALE_USER_DEFAULT, | |
63 LCTYPE.LOCALE_SISO639LANGNAME, buf.ptr, buf.length); | |
64 enforce(len, new Exception("LOCALE_SISO639LANGNAME", __FILE__, __LINE__)); | |
65 res ~= buf[0 .. len - 1]; | |
66 res ~= "-"; | |
67 len = GetLocalInfo(LCID.LOCALE_USER_DEFAULT, | |
68 LCTYPE.LOCALE_SISO3166CTRYNAME, null, 0); | |
69 enforce(len, new Exception("LOCALE_SISO3166CTRYNAME (len)", __FILE__, __LINE__)); | |
70 buf.length = len; | |
71 len = GetLocalInfo(LCID.LOCALE_USER_DEFAULT, | |
72 LCTYPE.LOCALE_SISO3166CTRYNAME, buf.ptr, buf.length); | |
73 enforce(len, new Exception("LOCALE_SISO3166CTRYNAME", __FILE__, __LINE__)); | |
74 res ~= buf[0 .. len - 1]; | |
75 return to!(String)(res); | |
76 } | |
77 } else version (Posix) { | |
78 private import std.process : getenv; | |
79 private import std.string : indexOf, replace; | |
80 } | |
81 | |
82 /// Get a omitted calture name. for example: "en-US" | 82 /// Get a omitted calture name. for example: "en-US" |
83 String caltureName() { | 83 String caltureName() { |
84 version(Tango){ | 84 version(Tango){ |
85 return Culture.current.name; | 85 return Culture.current.name; |
86 } else { // Phobos | 86 } else { // Phobos |
101 } | 101 } |
102 int dot = .indexOf(res, '.'); | 102 int dot = .indexOf(res, '.'); |
103 if (dot != -1) res = res[0 .. dot]; | 103 if (dot != -1) res = res[0 .. dot]; |
104 return .replace(res, "_", "-"); | 104 return .replace(res, "_", "-"); |
105 } else { | 105 } else { |
106 implMissing(__FILE__, __LINE__); | 106 static assert(0); |
107 return ""; | |
108 } | 107 } |
109 } | 108 } |
110 } | 109 } |