Changeset 26757 for lang/cplusplus

Timestamp:

12/15/08 16:21:11 (4 years ago)

Author:

saturday06

Message:

いろいろさまざま

Location:

lang/cplusplus/i3/trunk

Files:

• configure.ac (modified) (1 diff)
• src/Common.h (modified) (2 diffs)
• src/CompletionWindow.h (modified) (1 diff)
• src/ConfigFile.cpp (modified) (1 diff)
• src/InputWindow.h (modified) (1 diff)
• src/OutputWindow.h (modified) (1 diff)
• src/ShellManager.h (modified) (1 diff)
• src/gui-windows/CompletionWindowCore.h (modified) (1 diff)
• src/gui-windows/InputWindowCore.cpp (modified) (4 diffs)
• src/gui-windows/InputWindowCore.h (modified) (2 diffs)
• src/mol/include/mol/gui-windows/GuiModule.h (modified) (7 diffs)

lang/cplusplus/i3/trunk/configure.ac

@@ -87 +87 @@
 CFLAGS_ORIG="$CFLAGS"
 CFLAGS="$CFLAGS $LIBINTL"
-AC_CHECK_FUNC([wbindtextdomain])
+AC_CHECK_FUNCS([wbindtextdomain])
 CFLAGS="$CFLAGS_ORIG"
 

lang/cplusplus/i3/trunk/src/Common.h

@@ -14 +14 @@
 #  define PACKAGE_NAME "i3"
 #  define PACKAGE_VERSION "1.0"
-#  define ENABLE_NLS 1
+//#  define ENABLE_NLS 1
 #  define ICONV_CONST const
 #endif
@@ -33 +33 @@
 // mol
 #include <mol/Mol.h>
-#include <mol/Module.h>
-#include <mol/Thread.h>
 
 namespace i3

lang/cplusplus/i3/trunk/src/CompletionWindow.h

@@ -4 +4 @@
 
 #pragma once
-#include "Common.h"
 #include "CompletionWindowCore.h"
 

lang/cplusplus/i3/trunk/src/ConfigFile.cpp

@@ -1 +1 @@
 #include <PrecompiledHeaders.h>
 #include "Common.h"
-#include "Mediator.h"
 #include "ConfigFile.h"
 

lang/cplusplus/i3/trunk/src/InputWindow.h

@@ -1 +1 @@
 #pragma once
 
+#include <mol/GuiModule.h>
 #include "Common.h"
 #include "InputWindowCore.h"

lang/cplusplus/i3/trunk/src/OutputWindow.h

@@ -4 +4 @@
 
 #pragma once
+#include <mol/GuiModule.h>
 #include "Common.h"
 

lang/cplusplus/i3/trunk/src/ShellManager.h

@@ -4 +4 @@
 
 #pragma once
+#include <mol/Module.h>
 #include "Common.h"
-#include <mol/Module.h>
 
 namespace i3

lang/cplusplus/i3/trunk/src/gui-windows/CompletionWindowCore.h

@@ -4 +4 @@
 
 #pragma once
+#include <mol/GuiModule.h>
 #include "Common.h"
-#include "CompletionWindowCore.h"
 
 namespace i3

lang/cplusplus/i3/trunk/src/gui-windows/InputWindowCore.cpp

@@ -9 +9 @@
 
 template <>
-InputWindowCore<InputWindow>::InputWindowCore(Mediator& mediator) : mediator(mediator), hEdit(NULL)
+InputWindowCore<InputWindow>::InputWindowCore(Mediator& mediator) : mediator(mediator), hEdit(NULL), riched32_dll(NULL)
 {
 }
@@ -30 +30 @@
     MessageBox(NULL, _T("bye"), _T("NOT TRANSLATED 645678241758"), MB_OK);
 
+    if (riched32_dll) {
+        FreeLibrary(riched32_dll);
+    }
+
     //ofstream o7("nul");
     //ofstream o8("nul");
@@ -49 +53 @@
     }
 
-    LoadLibrary(_T("RICHED32.DLL"));
-    //LoadLibrary(_T("Riched20.dll")); // required?
+    riched32_dll = LoadLibrary(_T("riched20.dll"));
+    //riched32_dll = LoadLibrary(_T("riched32.dll"));
+
 
     const TCHAR ClassName[] = _T("InputWindow 0zuhiIf");
@@ -102 +107 @@
     hEdit = CreateWindowEx(
                 0,
-                //_T("RICHEDIT_CLASS"),
-                _T("RICHEDIT"),
+                RICHEDIT_CLASS,
+                //_T("RICHEDIT"),
                 _T(""),
                 WS_CHILD | WS_VISIBLE | WS_BORDER,

lang/cplusplus/i3/trunk/src/gui-windows/InputWindowCore.h

@@ -1 +1 @@
 #pragma once
 
+#include <mol/GuiModule.h>
 #include "Common.h"
-#include <windows.h>
 
 namespace i3
@@ -25 +25 @@
 private:
     HWND hEdit;
+    HMODULE riched32_dll;
 public:
     // for copipe

lang/cplusplus/i3/trunk/src/mol/include/mol/gui-windows/GuiModule.h

@@ -70 +70 @@
 
     LONG_PTR breakLoopRequest;
+
 public:
     Child& getChild()
@@ -78 +79 @@
     {
         InterlockedExchangePointer(&breakLoopRequest, 1);
-        if (getWindow())
-        {
-            if (DestroyWindow(getWindow()) != 0)
-            {
-                // ok
-            }
-            else
-            {
-                // error
-            }
-            setWindow(NULL);
+        if (InterlockedExchangePointer(&destroyed, 1) == 0)
+        {
+            HWND w = getWindow();
+            if (IsWindow(w))
+            { 
+                if (DestroyWindow(w) != 0)
+                {
+                    // ok
+                }
+                else
+                {
+                    // error
+                    DebugBreak();
+                }
+            }
         }
     }
     ~GuiModule() {
+        assert(!IsWindow(getWindow()) || destroyed);
         destroy();
     }
     void loop()
     {
-        if (breakLoopRequest)
-        {
-            PostQuitMessage(0);
+        if (InterlockedExchangePointer(&breakLoopRequest, 0)) // danger ?
+        {
+            InterlockedExchangePointer(&breakLoopRequest, 1);
+            //PostQuitMessage(0);
             return;
         }
 
-        SetTimer(NULL,0,10000,NULL); // for check "break message loop request"
+        //SetTimer(NULL, 0, 10000, NULL); // for check "break message loop request"
 
         MSG msg = {};
-        for (BOOL result = 0; (result = GetMessage(&msg, NULL, 0, 0)), result;)
-        {
-            if (result == -1)
+        for (;;)
+        {
+            BOOL result = GetMessage(&msg, NULL, 0, 0);
+            if (!result)
+            {
+                break;
+            }
+            else if (result == -1)
             {
                 // error
@@ -113 +125 @@
                 break;
             }
-            if (breakLoopRequest)   // danger ?
-            {
-                PostQuitMessage(0);
-                break;
-            }
+            //if (breakLoopRequest)   // danger ?
+            //{
+            //    PostQuitMessage(0);
+            //    break;
+            //}
 
             TranslateMessage(&msg);
@@ -124 +136 @@
     }
 
-    GuiModule(): hWnd(NULL), wndproc(getChild()), breakLoopRequest(false), repost(false), handled(true)
+    GuiModule(): hWnd(NULL), wndproc(getChild()), breakLoopRequest(false), repost(false), handled(true), destroyed(0)
     {
     }
@@ -156 +168 @@
     bool repost;
     bool handled;
+    DWORD_PTR destroyed;
 protected:
     void repostEvent()
@@ -173 +186 @@
             e->execute(e, &getChild());
             return 0;
+        } else if (msg == WM_DESTROY || msg == WM_QUIT) {
+            InterlockedExchangePointer(&destroyed, 1);
         }
 
@@ -179 +194 @@
         {
 #include "MessageCracker-inl.h"
+        default:
+            SetMsgHandled(false);
+            break;
         }