# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1325142471 0
# Node ID a26edf086082f4930ae099a863ab46aae1348dd3
# Parent  f33dca7369176089d47dec50d8203aacfc86099f
Windows Aero work towards making it enabled on the fly... also attempt at making controls opaque.

diff -r f33dca736917 -r a26edf086082 win/dw.c
--- a/win/dw.c	Thu Dec 29 03:46:51 2011 +0000
+++ b/win/dw.c	Thu Dec 29 07:07:51 2011 +0000
@@ -106,6 +106,8 @@
 
 #ifdef AEROGLASS
 HRESULT (WINAPI *_DwmExtendFrameIntoClientArea)(HWND hWnd, const MARGINS *pMarInset) = 0;
+HRESULT (WINAPI *_DwmIsCompositionEnabled)(BOOL *pfEnabled) = 0;
+BOOL _dw_composition = FALSE;
 #endif
 
 /*
@@ -2078,6 +2080,25 @@
    /* Now that any handlers are done... do normal processing */
    switch( msg )
    {
+#ifdef AEROGLASS   
+   case WM_DWMCOMPOSITIONCHANGED:
+      if(_DwmIsCompositionEnabled)
+         _DwmIsCompositionEnabled(&_dw_composition);
+      break;
+   case WM_ERASEBKGND: 
+      if(_dw_composition)
+      {
+         static HBRUSH hbrush = 0;
+         RECT rect;
+         
+         if(!hbrush)
+            hbrush = CreateSolidBrush(RGB(0,0,0));
+            
+         GetClientRect(hWnd, &rect);
+         FillRect((HDC)mp1, &rect, hbrush);
+      }
+      return TRUE;
+#endif      
    case WM_PAINT:
       {
          PAINTSTRUCT ps;
@@ -2297,6 +2318,21 @@
    case WM_MOUSEMOVE:
       _wndproc(hWnd, msg, mp1, mp2);
       break;
+#ifdef AEROGLASS   
+   case WM_ERASEBKGND: 
+      if(_dw_composition)
+      {
+         static HBRUSH hbrush = 0;
+         RECT rect;
+         
+         if(!hbrush)
+            hbrush = CreateSolidBrush(RGB(0,0,0));
+            
+         GetClientRect(hWnd, &rect);
+         FillRect((HDC)mp1, &rect, hbrush);
+      }
+      return TRUE;
+#endif      
    case WM_PAINT:
       {
          ColorInfo *thiscinfo = (ColorInfo *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
@@ -3579,11 +3615,7 @@
    wc.lpfnWndProc = (WNDPROC)_wndproc;
    wc.cbClsExtra = 0;
    wc.cbWndExtra = 32;
-#ifdef AEROGLASS
-   wc.hbrBackground = CreateSolidBrush(RGB(0,0,0));
-#else
    wc.hbrBackground = NULL;
-#endif
    wc.lpszMenuName = NULL;
    wc.lpszClassName = ClassName;
 
@@ -3619,11 +3651,7 @@
    wc.lpfnWndProc = (WNDPROC)_framewndproc;
    wc.cbClsExtra = 0;
    wc.cbWndExtra = 32;
-#ifdef AEROGLASS
-   wc.hbrBackground = CreateSolidBrush(RGB(0,0,0));
-#else
    wc.hbrBackground = (HBRUSH)GetSysColorBrush(COLOR_3DFACE);
-#endif
    wc.hCursor = LoadCursor(NULL, IDC_ARROW);
    wc.lpszMenuName = NULL;
    wc.lpszClassName = FRAMECLASSNAME;
@@ -3725,7 +3753,12 @@
 #ifdef AEROGLASS
    /* Attempt to load the Desktop Window Manager library */
    if((hdwm = LoadLibrary("dwmapi")))
+   {
       _DwmExtendFrameIntoClientArea = (HRESULT (WINAPI *)(HWND, const MARGINS *))GetProcAddress(hdwm, "DwmExtendFrameIntoClientArea");
+      if((_DwmIsCompositionEnabled = (HRESULT (WINAPI *)(BOOL *))GetProcAddress(hdwm, "DwmIsCompositionEnabled")))
+         _DwmIsCompositionEnabled(&_dw_composition);
+      
+   }
       
 #endif
    return 0;
@@ -6484,22 +6517,29 @@
 
       if(strnicmp(tmpbuf, FRAMECLASSNAME, strlen(FRAMECLASSNAME)+1)==0)
          tmpitem[index].type = TYPEBOX;
-      else if(strnicmp(tmpbuf, "SysMonthCal32", 13)==0)
-      {
-         RECT rc;
-         MonthCal_GetMinReqRect(item, &rc);
-         width = 1 + rc.right - rc.left;
-         height = 1 + rc.bottom - rc.top;
-         tmpitem[index].type = TYPEITEM;
-      }
       else
       {
-         if ( width == 0 && hsize == FALSE )
-            dw_messagebox(funcname, DW_MB_OK|DW_MB_ERROR, "Width and expand Horizonal both unset for box: %x item: %x",box,item);
-         if ( height == 0 && vsize == FALSE )
-            dw_messagebox(funcname, DW_MB_OK|DW_MB_ERROR, "Height and expand Vertical both unset for box: %x item: %x",box,item);
-
-         tmpitem[index].type = TYPEITEM;
+         if(strnicmp(tmpbuf, "SysMonthCal32", 13)==0)
+         {
+            RECT rc;
+            MonthCal_GetMinReqRect(item, &rc);
+            width = 1 + rc.right - rc.left;
+            height = 1 + rc.bottom - rc.top;
+            tmpitem[index].type = TYPEITEM;
+         }
+         else
+         {
+            if ( width == 0 && hsize == FALSE )
+               dw_messagebox(funcname, DW_MB_OK|DW_MB_ERROR, "Width and expand Horizonal both unset for box: %x item: %x",box,item);
+            if ( height == 0 && vsize == FALSE )
+               dw_messagebox(funcname, DW_MB_OK|DW_MB_ERROR, "Height and expand Vertical both unset for box: %x item: %x",box,item);
+
+            tmpitem[index].type = TYPEITEM;
+         }
+#ifdef AEROGLASS
+         if(_dw_composition)
+            SetLayeredWindowAttributes(item, 0, 255, LWA_ALPHA);
+#endif            
       }
 
       tmpitem[index].hwnd = item;