Changeset 19278

Timestamp:

09/14/08 10:43:06 (5 years ago)

Author:

saturday06

Message:

iroiro

Location:

lang/cplusplus/i3

Files:

• TODO.txt (modified) (2 diffs)
• intl/wlibintl.h (modified) (4 diffs)
• src/LibintlConfig.h (moved) (moved from lang/cplusplus/i3/src/LibintlUtf16le.h) (1 prop)
• src/gui-windows/Gui.h (modified) (1 diff)
• src/os-windows/Os.cpp (modified) (1 diff)
• windows/i3.vcproj (modified) (2 diffs)
• windows/i3_test.vcproj (modified) (3 diffs)

lang/cplusplus/i3/TODO.txt

@@ -1 @@
-妄幻夢想白昼夢.txt
+妄幻夢想白昼夢.txt
 
 *(a|b|c|k|z)shと同じkey打ちで、同じ効果！、でも補完は親切に！
@@ -48 +48 @@
 *utf8 cygwinでもテストする
 *アプリケーションログを取りたい
+*MBCS版はlibintl.dllも別ビルド

lang/cplusplus/i3/intl/wlibintl.h

@@ -3 +3 @@
 
 #include <windows.h>
-#define WINDOWS_PATH_MAX_ELEMENTS 4000
+
+#define WLIBINTL_WINDOWS_PATH_MAX_ELEMENTS 4000
 
 #define WLIBINTL_UTF8_TO_UTF16LE_ALLOCA(data8, data16) \
-    WCHAR* data16 = NULL; \
+    wchar_t* data16 = NULL; \
     do { \
-        const char* check = data8;                                 \
+        const char* check = data8; check;                                \
         unsigned int num_elements = MultiByteToWideChar(CP_UTF8, 0, data8, -1, NULL, 0); \
         if (num_elements == 0 || num_elements >= WINDOWS_PATH_MAX_ELEMENTS) { \
@@ -23 +24 @@
     char* data8 = NULL; \
     do { \
-        const WCHAR* check = data16;                                 \
+        const wchar_t* check = data16; check;                           \
         unsigned int num_elements = WideCharToMultiByte( CP_UTF8, 0, data16, -1, NULL, 0, 0, 0); \
         if (num_elements == 0 || num_elements >= WINDOWS_PATH_MAX_ELEMENTS) { \
@@ -35 +36 @@
     } while (0)
 
-static inline const WCHAR* wbindtextdomain(const char* domainname, 
-                               const WCHAR* dirname16) {
+static const wchar_t* wbindtextdomain(const char* domainname, 
+                               const wchar_t* dirname16) {
     WLIBINTL_UTF16LE_TO_UTF8_ALLOCA(dirname16, dirname8);
     if (dirname8 == NULL) {
@@ -47 +48 @@
 }
 
+
+//#define _(String) (wgettext(String, L##String))
+static const wchar_t* wgettext(const char* msgid, const wchar_t* wmsgid)
+{
+    const char* translated = gettext(msgid);
+    return translated != msgid ? (const wchar_t*)translated : wmsgid;
+}
+
+
+#ifdef __cplusplus
+
+template <size_t Size1, size_t Size2>
+static inline const wchar_t* wgettext(const char (&msgid)[Size1], const wchar_t (&wmsgid)[Size2])
+{
+    char a[Size1 == 0 ? 1 : -1];
+    char b[Size1 == Size2 ? 1 : -1];
+    a,b;
+
+    return wgettext((const char*)msgid, (const wchar_t*)wmsgid);
+}
+
+#endif
+
 //undef WINDOWS_PATH_MAX_ELEMENTS
 //undef UTF8_TO_UTF16LE_ALLOCA
 
-
 #endif // WLIBINTL_H_4985016

lang/cplusplus/i3/src/gui-windows/Gui.h

@@ -2 +2 @@
 
 #include "../os-windows/WindowsCommon.h"
-
-#if defined(UNICODE) || defined(_UNICODE)
-#define _(String)   (reinterpret_cast<const TCHAR*>(i3::gettext_utf16(String, L##String)))
-#else
-#define _(String)   (reinterpret_cast<const TCHAR*>(gettext(String)))
-#endif
 
 namespace i3

lang/cplusplus/i3/src/os-windows/Os.cpp

@@ -4 +4 @@
 namespace i3
 {
+void init_windows_gettext()
+{
+    using namespace std;
+    
+    TCHAR locale_dir[1000] = {};
+    DWORD result = GetModuleFileName(
+                       GetModuleHandle(NULL),
+                       locale_dir,
+                       _countof(locale_dir));
+    if (result == 0 || result == _countof(locale_dir))   // error
+    {
+        return;
+    }
+    if (PathRemoveFileSpec(locale_dir) == FALSE)
+    {
+        return;
+    }
+    if (0 != _tcscat_s(locale_dir, _T("\\locale")))
+    {
+        return;
+    }
+
+    setlocale(LC_ALL, "");
+
+#if defined(UNICODE) || defined(_UNICODE)
+    wbindtextdomain(PACKAGE_NAME, locale_dir);
+    bind_textdomain_codeset(PACKAGE_NAME,"UTF-16LE");
+#else
+    bindtextdomain(PACKAGE_NAME, locale_dir);
+#endif
+
+    textdomain(PACKAGE_NAME);
+}
+
 void init_os_global_data(int& argc,char**& argv)
 {

lang/cplusplus/i3/windows/i3.vcproj

@@ -374 +374 @@
                         </File>
                         <File
+                                RelativePath="..\src\windows\CompletionWindowCore.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\gui-windows\CompletionWindowCore.h"
                                 >
                         </File>
                         <File
-                                RelativePath="..\src\windows\CompletionWindowCore.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\src\os-windows\CygwinPty.h"
                                 >
@@ -406 +406 @@
                         </File>
                         <File
+                                RelativePath="..\src\windows\InputWindowCore.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\gui-windows\InputWindowCore.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\windows\InputWindowCore.h"
                                 >
                         </File>

lang/cplusplus/i3/windows/i3_test.vcproj

@@ -329 +329 @@
                         </File>
                         <File
-                                RelativePath="..\src\LibintlUtf16le.cpp"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\src\Mediator.cpp"
                                 >
@@ -403 +399 @@
                         </File>
                         <File
+                                RelativePath="..\src\gui-windows\CompletionWindowCore.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\windows\CompletionWindowCore.h"
                                 >
                         </File>
                         <File
-                                RelativePath="..\src\gui-windows\CompletionWindowCore.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\src\os-windows\CygwinPty.h"
                                 >
@@ -468 +464 @@
                         <File
                                 RelativePath="..\src\os-windows\WindowsCommon.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\intl\wlibintl.h"
                                 >
                         </File>