Changeset 36380 for lang/objective-cplusplus/i3/trunk/src

Timestamp:

01/10/10 02:33:27 (3 years ago)

Author:

saturday06

Message:

高付加時にがめんがちじゃいｋ

Files:

• lang/objective-cplusplus/i3/trunk/src/gui-windows/InputWindowPlatform.cpp (modified) (5 diffs)

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

@@ -16 +16 @@
 
 static WNDPROC EditDefaultWndProc = NULL;
-static LRESULT CALLBACK EditWndProc2(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
+#if defined(UNICODE) && defined(_UNICODE)
+LRESULT MyCallWindowProc(WNDPROC WndProc, HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
+        return WndProc(hWnd, message, wParam, lParam);
+}
+#else
+LRESULT MyCallWindowProc(WNDPROC WndProc, HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
+        return CallWindowProc(WndProc, hWnd, message, wParam, lParam);
+}
+#endif
+static LRESULT CALLBACK BlurEditWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
     static bool captured = false;
     static bool focused = false;
@@ -66 +75 @@
         PAINTSTRUCT ps;
         HDC hdc = BeginPaint(hWnd, &ps);
-        FillRect(ps.hdc, &ps.rcPaint, (HBRUSH)GetStockObject(BLACK_BRUSH)); // XXX
+//        FillRect(ps.hdc, &ps.rcPaint, (HBRUSH)GetStockObject(BLACK_BRUSH)); // XXX
                 BLENDFUNCTION bf = {};
                 bf.BlendOp = AC_SRC_OVER;
@@ -91 +100 @@
                 if (paint_buffer == 0) {
                     EndPaint(hWnd, &ps);
-                        return CallWindowProc(EditDefaultWndProc, hWnd, message, wParam, lParam); // XXX
+                        return MyCallWindowProc(EditDefaultWndProc, hWnd, message, wParam, lParam); // XXX
                 }
-        FillRect(mem_dc, &ps.rcPaint, (HBRUSH)GetStockObject(BLACK_BRUSH));
-
-                CallWindowProc(EditDefaultWndProc, hWnd, WM_PRINTCLIENT, (WPARAM)mem_dc, PRF_CLIENT); // XXX
+        //FillRect(mem_dc, &ps.rcPaint, (HBRUSH)GetStockObject(BLACK_BRUSH));
+
+                MyCallWindowProc(EditDefaultWndProc, hWnd, WM_PRINTCLIENT, (WPARAM)mem_dc, PRF_CLIENT); // XXX
 
         dll.dll_BufferedPaintSetAlpha(paint_buffer, 0, 255);
+
+        FillRect(ps.hdc, &ps.rcPaint, (HBRUSH)GetStockObject(BLACK_BRUSH)); // XXX
         dll.dll_EndBufferedPaint(paint_buffer, TRUE);
                 EndPaint(hWnd, &ps);
@@ -104 +115 @@
     }
 
-    return CallWindowProc(EditDefaultWndProc, hWnd, message, wParam, lParam); // XXX
+    return MyCallWindowProc(EditDefaultWndProc, hWnd, message, wParam, lParam); // XXX
 }
 
@@ -852 +863 @@
                 NULL
             );
-    EditDefaultWndProc = (WNDPROC)GetWindowLongPtr(edit, GWLP_WNDPROC);
-    SetWindowLongPtr(edit, GWLP_WNDPROC, (LONG_PTR)EditWndProc2);
+
+    if (is_dwm_extend_frame_into_client_area) {
+            EditDefaultWndProc = (WNDPROC)GetWindowLongPtr(edit, GWLP_WNDPROC);
+                SetWindowLongPtr(edit, GWLP_WNDPROC, (LONG_PTR)BlurEditWndProc);
+        }
 
     SendMessage(edit, WM_SETFONT, (WPARAM)font, (LPARAM)FALSE);