Changeset 32306 for lang/objective-cplusplus

Timestamp:

04/12/09 15:33:54 (4 years ago)

Author:

saturday06

Message:

jn

Location:

lang/objective-cplusplus/i3/trunk/src/gui-windows

Files:

• Gui.cpp (modified) (2 diffs)
• Gui.h (modified) (1 diff)
• InputWindowPlatform.cpp (modified) (5 diffs)

lang/objective-cplusplus/i3/trunk/src/gui-windows/Gui.cpp

@@ -5 +5 @@
 {
 
-HRESULT (*dll_DwmExtendFrameIntoClientArea)(HWND hWnd, const MARGINS *pMarInset) = NULL;
-HRESULT (*dll_DwmIsCompositionEnabled)(BOOL *pfEnabled) = NULL;
-HRESULT (*dll_DwmEnableBlurBehindWindow)(HWND hWnd, const DWM_BLURBEHIND *pBlurBehind) = NULL;
+dll_ dll = {};
+OSVERSIONINFO version_info = {};
 
 int global_loop()
@@ -39 +38 @@
     init_hInstance();
 
+    version_info.dwOSVersionInfoSize = sizeof(version_info);
+    BOOL result = GetVersionEx(&version_info);
 
-#define SET_DLL_ADDRESS(dll, name) dll_##name = (decltype(dll_##name))GetProcAddress(dll, #name);
+    if (version_info.dwMajorVersion >= 6) {
 
-    HMODULE dwmapi_dll = LoadLibrary(_T("dwmapi.dll"));
-    if (dwmapi_dll) {
-        SET_DLL_ADDRESS(dwmapi_dll, DwmExtendFrameIntoClientArea);
-        SET_DLL_ADDRESS(dwmapi_dll, DwmIsCompositionEnabled);
-        SET_DLL_ADDRESS(dwmapi_dll, DwmEnableBlurBehindWindow);
+        #define SET_DLL_ADDRESS(module, name) i3::dll.dll_##name = (decltype(i3::dll.dll_##name))GetProcAddress(module, #name);
+
+        HMODULE dwmapi_dll = LoadLibrary(_T("dwmapi.dll"));
+        if (dwmapi_dll) {
+            dll.have_dwmapi_dll = true;
+            SET_DLL_ADDRESS(dwmapi_dll, DwmExtendFrameIntoClientArea);
+            SET_DLL_ADDRESS(dwmapi_dll, DwmIsCompositionEnabled);
+            SET_DLL_ADDRESS(dwmapi_dll, DwmEnableBlurBehindWindow);
+        }
     }
     return 0;

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

@@ -47 +47 @@
 typedef boost::basic_format<TCHAR> format;
 
-extern HRESULT (*dll_DwmExtendFrameIntoClientArea)(HWND hWnd, const MARGINS *pMarInset);
-extern HRESULT (*dll_DwmIsCompositionEnabled)(BOOL *pfEnabled);
-extern HRESULT (*dll_DwmEnableBlurBehindWindow)(HWND hWnd, const DWM_BLURBEHIND *pBlurBehind);
+extern struct dll_ {
+    bool have_dwmapi_dll;
+    HRESULT (*dll_DwmExtendFrameIntoClientArea)(HWND hWnd, const MARGINS *pMarInset);
+    HRESULT (*dll_DwmIsCompositionEnabled)(BOOL *pfEnabled);
+    HRESULT (*dll_DwmEnableBlurBehindWindow)(HWND hWnd, const DWM_BLURBEHIND *pBlurBehind);
+} dll;
 
 }

lang/objective-cplusplus/i3/trunk/src/gui-windows/InputWindowPlatform.cpp

@@ -264 +264 @@
     HDC hdc = BeginPaint(hwnd , &ps);
 
-    FillRect(ps.hdc, &ps.rcPaint, (HBRUSH)GetStockObject(BLACK_BRUSH));
+    if (dll.have_dwmapi_dll) {
+        FillRect(ps.hdc, &ps.rcPaint, (HBRUSH)GetStockObject(BLACK_BRUSH));
+    }
 
     //HBRUSH hBrushYellow = NULL;
@@ -280 +282 @@
     }
 
-    EndPaint(hwnd , &ps);
+    EndPaint(hwnd, &ps);
     SetMsgHandled(false);
 }
@@ -345 +347 @@
 
     int richedit_style = WS_CHILD | WS_VISIBLE;
-    if (!dll_DwmExtendFrameIntoClientArea) {
+    if (!dll.dll_DwmExtendFrameIntoClientArea) {
         richedit_style |= WS_BORDER;
     }
@@ -411 +413 @@
     SetWindowPos(hEdit, 0, edit_height, 0, DEFAULT_WINDOW_WIDTH - nc_width - edit_height, edit_height, SWP_NOACTIVATE | SWP_NOREDRAW | SWP_NOOWNERZORDER | SWP_NOZORDER);
 
-
-    LRESULT dwEvent = SendMessage(hEdit, EM_GETEVENTMASK, 0, 0);
-    dwEvent |= ENM_MOUSEEVENTS | ENM_KEYEVENTS | ENM_CHANGE;
-    SendMessage(hEdit, EM_SETEVENTMASK, 0, (LPARAM)dwEvent);
-
-    InvalidateRect(w, NULL, FALSE);
-    UpdateWindow(w);
-    ShowWindow(w, nCmdShow);
-    SetFocus(hEdit);
-
-    //SetLayeredWindowAttributes(w, 0, 200, LWA_ALPHA);
-
-    // �^�X�N�g���C�p�̃A�C�R���̍쐬
-    NOTIFYICONDATA connectingIcon = {};
-        connectingIcon.cbSize = sizeof(connectingIcon);
-    connectingIcon.hIcon = LoadIcon(get_hInstance(), _T("IDI_ICON1"));
-    connectingIcon.hWnd = w;
-    connectingIcon.uCallbackMessage = WM_USER + 10;
-    connectingIcon.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
-    _tcscpy_s(connectingIcon.szTip, _T(""));
-    Shell_NotifyIcon(NIM_ADD, &connectingIcon);
-
     setWindow(w);
     wndproc.set(w);
 
     // f
-    if (dll_DwmIsCompositionEnabled && 
-        dll_DwmExtendFrameIntoClientArea &&
-        dll_DwmEnableBlurBehindWindow) {
+    if (dll.have_dwmapi_dll) {
         BOOL enabled = FALSE;
-        HRESULT hr = dll_DwmIsCompositionEnabled(&enabled);
+        HRESULT hr = dll.dll_DwmIsCompositionEnabled(&enabled);
         if (SUCCEEDED(hr) && enabled) {
             HRESULT hr = S_OK;
@@ -455 +433 @@
             //SendMessage(hEdit, EM_SETBKGNDCOLOR, (WPARAM)0, (LPARAM)RGB(0, 0, 0));
             MARGINS margins = {edit_height, 0, 0, 0};
-            hr = dll_DwmExtendFrameIntoClientArea(w,&margins);
-        }
-    }
+            hr = dll.dll_DwmExtendFrameIntoClientArea(w,&margins);
+        }
+    }
+    //InvalidateRect(w, NULL, FALSE);
+    UpdateWindow(w);
+    ShowWindow(w, nCmdShow);
+    //UpdateWindow(hEdit);
+    SetFocus(hEdit);
+
+
+    // -------------------------------------------------------------
+    // lazy init
+
+    LRESULT dwEvent = SendMessage(hEdit, EM_GETEVENTMASK, 0, 0);
+    dwEvent |= ENM_MOUSEEVENTS | ENM_KEYEVENTS | ENM_CHANGE;
+    SendMessage(hEdit, EM_SETEVENTMASK, 0, (LPARAM)dwEvent);
+
+    //SetLayeredWindowAttributes(w, 0, 200, LWA_ALPHA);
+
+    // �^�X�N�g���C�p�̃A�C�R���̍쐬
+    NOTIFYICONDATA connectingIcon = {};
+        connectingIcon.cbSize = sizeof(connectingIcon);
+    connectingIcon.hIcon = LoadIcon(get_hInstance(), _T("IDI_ICON1"));
+    connectingIcon.hWnd = w;
+    connectingIcon.uCallbackMessage = WM_USER + 10;
+    connectingIcon.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
+    _tcscpy_s(connectingIcon.szTip, _T(""));
+    Shell_NotifyIcon(NIM_ADD, &connectingIcon);
 }