From b7965b394020b97433c04534a8cf6c74b89292bb Mon Sep 17 00:00:00 2001 From: Vincent Wei Date: Tue, 11 Feb 2020 18:09:30 +0800 Subject: [PATCH] use dwBkColor for compositing schema --- Version.md | 1 + examples/drawtext.c | 2 +- examples/registerwindowclass.c | 13 ++++++++----- include/common.h | 2 +- src/control/bidiedit.c | 4 ++++ src/control/button.c | 5 +++++ src/control/combobox.c | 5 +++++ src/control/edit.c | 4 ++++ src/control/listbox.c | 4 ++++ src/control/menubutton.c | 9 +++++++-- src/control/newtoolbar.c | 4 ++++ src/control/progressbar.c | 9 +++++++-- src/control/propsheet.c | 9 +++++++-- src/control/scrollbar.c | 7 +++++-- src/control/scrollview.c | 4 ++++ src/control/scrollwnd.c | 8 ++++++++ src/control/static.c | 14 ++++++++++---- src/control/textedit.c | 4 ++++ src/control/trackbar.c | 8 +++++++- src/ex_ctrl/animation.c | 4 ++++ src/ex_ctrl/coolbar.c | 8 +++++++- src/ex_ctrl/gridview.c | 16 ++++++++++------ src/ex_ctrl/iconview.c | 4 ++++ src/ex_ctrl/listview.c | 16 ++++++++++------ src/ex_ctrl/monthcalendar.c | 17 ++++++++++------- src/ex_ctrl/spinbox.c | 4 ++++ src/ex_ctrl/treeview.c | 4 ++++ src/ex_ctrl/treeview_rdr.c | 6 +++++- src/gui/ctrlclass.c | 16 ++++++++++++++++ src/include/ctrlclass.h | 4 ++++ src/kernel/compsor-fallback.c | 2 +- src/textedit/mtextedit.c | 5 +++++ 32 files changed, 180 insertions(+), 42 deletions(-) diff --git a/Version.md b/Version.md index d8cf4557..017bee2a 100644 --- a/Version.md +++ b/Version.md @@ -3,6 +3,7 @@ Version 4.1.0 (2019/01/22) This is a developing version, an unstable version. It needs the following packages: +- GVFB: `gvfb-1.2.4.tar.gz` - The resource package: `minigui-res-4.0.0.tar.gz` - The test cases package: `mg-tests-4.1.0.tar.gz` - The sample package: `mg-samples-4.1.0.tar.gz` diff --git a/examples/drawtext.c b/examples/drawtext.c index d5f7669c..e4862014 100644 --- a/examples/drawtext.c +++ b/examples/drawtext.c @@ -18,7 +18,7 @@ void OnModeDrawText (HDC hdc) rc3.left = 0; rc3.top = 361; rc3.right = 401; rc3.bottom = 451; rc4.left = 0; rc4.top = 461; rc4.right = 401; rc4.bottom = 551; - SetBkColor (hdc, COLOR_lightwhite); + SetBkColor (hdc, DWORD2Pixel (hdc, COLOR_lightwhite)); Rectangle (hdc, rc1.left, rc1.top, rc1.right, rc1.bottom); Rectangle (hdc, rc2.left, rc2.top, rc2.right, rc2.bottom); diff --git a/examples/registerwindowclass.c b/examples/registerwindowclass.c index fae499e7..e348941c 100644 --- a/examples/registerwindowclass.c +++ b/examples/registerwindowclass.c @@ -17,7 +17,7 @@ static LRESULT StepControlProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l info = (HELPWININFO*)GetWindowAdditionalData (hwnd); /* Draw the step information. */ - ...... + ... EndPaint (hwnd, hdc); break; @@ -43,8 +43,7 @@ static LRESULT StepControlProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l return DefaultControlProc (hwnd, message, wParam, lParam); } - -static BOOL RegisterStepControl () +static BOOL RegisterStepControl (void) { int result; WNDCLASS StepClass; @@ -52,13 +51,17 @@ static BOOL RegisterStepControl () StepClass.spClassName = STEP_CTRL_NAME; StepClass.dwStyle = 0; StepClass.hCursor = GetSystemCursor (IDC_ARROW); - StepClass.iBkColor = COLOR_lightwhite; +#ifdef _MGSCHEMA_COMPOSITING + StepClass.dwBkRGBA = COLOR_lightwhite; +#else + StepClass.iBkColor = PIXEL_lightwhite; +#endif StepClass.WinProc = StepControlProc; return RegisterWindowClass (&StepClass); } -static void UnregisterStepControl () +static void UnregisterStepControl (void) { UnregisterWindowClass (STEP_CTRL_NAME); } diff --git a/include/common.h b/include/common.h index b3f9d170..37b818db 100644 --- a/include/common.h +++ b/include/common.h @@ -855,7 +855,7 @@ typedef UINT_PTR LPARAM; /** * \var typedef DWORD32 RGBCOLOR - * \brief A type definition for a RGB color. + * \brief A type definition for a RGB color value. */ typedef DWORD32 RGBCOLOR; diff --git a/src/control/bidiedit.c b/src/control/bidiedit.c index 504389fd..7fb07306 100644 --- a/src/control/bidiedit.c +++ b/src/control/bidiedit.c @@ -106,7 +106,11 @@ BOOL RegisterBIDISLEditControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (IDC_IBEAM); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif WndClass.WinProc = SLEditCtrlProc; if (AddNewControlClass (&WndClass) != ERR_OK) diff --git a/src/control/button.c b/src/control/button.c index 724d235c..8065f1d0 100644 --- a/src/control/button.c +++ b/src/control/button.c @@ -666,8 +666,13 @@ BOOL RegisterButtonControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (IDC_ARROW); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = + GetWindowElementAttr (HWND_NULL, WE_MAINC_THREED_BODY); +#else WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_MAINC_THREED_BODY); +#endif WndClass.WinProc = ButtonCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; diff --git a/src/control/combobox.c b/src/control/combobox.c index 50b36455..9dfe101a 100644 --- a/src/control/combobox.c +++ b/src/control/combobox.c @@ -93,8 +93,13 @@ BOOL RegisterComboBoxControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (0); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = + GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif WndClass.WinProc = ComboBoxCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; diff --git a/src/control/edit.c b/src/control/edit.c index 0b84eef1..c5f6c8c8 100644 --- a/src/control/edit.c +++ b/src/control/edit.c @@ -115,7 +115,11 @@ BOOL RegisterSLEditControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (IDC_IBEAM); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif WndClass.WinProc = SLEditCtrlProc; if (AddNewControlClass (&WndClass) != ERR_OK) diff --git a/src/control/listbox.c b/src/control/listbox.c index 7e54510c..54d9062c 100644 --- a/src/control/listbox.c +++ b/src/control/listbox.c @@ -90,7 +90,11 @@ BOOL RegisterListboxControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (0); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif WndClass.WinProc = ListboxCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; } diff --git a/src/control/menubutton.c b/src/control/menubutton.c index 0f8615f8..ec7f62e4 100644 --- a/src/control/menubutton.c +++ b/src/control/menubutton.c @@ -87,8 +87,13 @@ BOOL RegisterMenuButtonControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (IDC_ARROW); - WndClass.iBkColor = - GetWindowElementPixel (HWND_NULL, WE_MAINC_THREED_BODY); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, + WE_MAINC_THREED_BODY); +#else + WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, + WE_MAINC_THREED_BODY); +#endif WndClass.WinProc = MenuButtonCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; diff --git a/src/control/newtoolbar.c b/src/control/newtoolbar.c index 8970fb64..3cd48f10 100644 --- a/src/control/newtoolbar.c +++ b/src/control/newtoolbar.c @@ -87,7 +87,11 @@ BOOL RegisterNewToolbarControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (IDC_ARROW); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif WndClass.WinProc = NewToolbarCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; diff --git a/src/control/progressbar.c b/src/control/progressbar.c index 9fd555ad..9606dfac 100644 --- a/src/control/progressbar.c +++ b/src/control/progressbar.c @@ -223,8 +223,13 @@ BOOL RegisterProgressBarControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (0); - WndClass.iBkColor = - GetWindowElementPixel (HWND_NULL, WE_MAINC_THREED_BODY); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, + WE_MAINC_THREED_BODY); +#else + WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, + WE_MAINC_THREED_BODY); +#endif WndClass.WinProc = ProgressBarCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; diff --git a/src/control/propsheet.c b/src/control/propsheet.c index a2094df5..6b701f25 100644 --- a/src/control/propsheet.c +++ b/src/control/propsheet.c @@ -92,8 +92,13 @@ BOOL RegisterPropSheetControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (0); - WndClass.iBkColor = - GetWindowElementPixel (HWND_NULL, WE_MAINC_THREED_BODY); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, + WE_MAINC_THREED_BODY); +#else + WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, + WE_MAINC_THREED_BODY); +#endif WndClass.WinProc = PropSheetCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; diff --git a/src/control/scrollbar.c b/src/control/scrollbar.c index 84f99149..ddc7b1fa 100644 --- a/src/control/scrollbar.c +++ b/src/control/scrollbar.c @@ -1257,8 +1257,11 @@ BOOL RegisterScrollBarControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (0); - WndClass.iBkColor = - GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else + WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif WndClass.WinProc = ScrollBarCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; diff --git a/src/control/scrollview.c b/src/control/scrollview.c index 06ac204c..3a289895 100644 --- a/src/control/scrollview.c +++ b/src/control/scrollview.c @@ -597,7 +597,11 @@ BOOL RegisterScrollViewControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (IDC_ARROW); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif WndClass.WinProc = ScrollViewCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; diff --git a/src/control/scrollwnd.c b/src/control/scrollwnd.c index fe42ba2e..95430257 100644 --- a/src/control/scrollwnd.c +++ b/src/control/scrollwnd.c @@ -286,7 +286,11 @@ BOOL RegisterScrollWndControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (IDC_ARROW); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif WndClass.WinProc = ScrollWndCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; @@ -358,7 +362,11 @@ static BOOL RegisterContainer (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (IDC_ARROW); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif WndClass.WinProc = DefaultContainerProc; return AddNewControlClass (&WndClass) == ERR_OK; diff --git a/src/control/static.c b/src/control/static.c index b1a45f85..4f221ab3 100644 --- a/src/control/static.c +++ b/src/control/static.c @@ -92,13 +92,13 @@ StaticControlProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) /* DK[01/11/10]: For bug 4336 */ switch (pCtrl->dwStyle & SS_TYPEMASK) { case SS_GRAYRECT: - pCtrl->iBkColor = PIXEL_lightgray; + pCtrl->iBkColor = DWORD2PixelByWindow (hwnd, COLOR_lightgray); break; case SS_BLACKRECT: - pCtrl->iBkColor = PIXEL_black; + pCtrl->iBkColor = DWORD2PixelByWindow (hwnd, COLOR_black); break; case SS_WHITERECT: - pCtrl->iBkColor = PIXEL_lightwhite; + pCtrl->iBkColor = DWORD2PixelByWindow (hwnd, COLOR_lightwhite); break; default: break; @@ -350,7 +350,13 @@ BOOL RegisterStaticControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (IDC_ARROW); - WndClass.iBkColor = GetWindowElementPixel (HWND_NULL,WE_MAINC_THREED_BODY); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, + WE_MAINC_THREED_BODY); +#else + WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, + WE_MAINC_THREED_BODY); +#endif WndClass.WinProc = StaticControlProc; return AddNewControlClass (&WndClass) == ERR_OK; diff --git a/src/control/textedit.c b/src/control/textedit.c index 03fd0568..3dd4dd41 100644 --- a/src/control/textedit.c +++ b/src/control/textedit.c @@ -3598,7 +3598,11 @@ BOOL RegisterTextEditControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (IDC_IBEAM); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif WndClass.WinProc = TextEditCtrlProc; if (AddNewControlClass (&WndClass) != ERR_OK) diff --git a/src/control/trackbar.c b/src/control/trackbar.c index e870a4dc..cba95afb 100644 --- a/src/control/trackbar.c +++ b/src/control/trackbar.c @@ -542,7 +542,13 @@ BOOL RegisterTrackBarControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (0); - WndClass.iBkColor = GetWindowElementPixel (HWND_DESKTOP, WE_MAINC_THREED_BODY); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, + WE_MAINC_THREED_BODY); +#else + WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, + WE_MAINC_THREED_BODY); +#endif WndClass.WinProc = TrackBarCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; } diff --git a/src/ex_ctrl/animation.c b/src/ex_ctrl/animation.c index 2f62f300..396243fc 100644 --- a/src/ex_ctrl/animation.c +++ b/src/ex_ctrl/animation.c @@ -76,7 +76,11 @@ BOOL RegisterAnimationControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (IDC_ARROW); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif WndClass.WinProc = AnimationCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; diff --git a/src/ex_ctrl/coolbar.c b/src/ex_ctrl/coolbar.c index 5395c675..161a949f 100644 --- a/src/ex_ctrl/coolbar.c +++ b/src/ex_ctrl/coolbar.c @@ -81,7 +81,13 @@ BOOL RegisterCoolBarControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (IDC_ARROW); - WndClass.iBkColor = GetWindowElementPixel (HWND_DESKTOP, WE_MAINC_THREED_BODY); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, + WE_MAINC_THREED_BODY); +#else + WndClass.iBkColor = GetWindowElementPixel (HWND_DESKTOP, + WE_MAINC_THREED_BODY); +#endif WndClass.WinProc = CoolBarCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; diff --git a/src/ex_ctrl/gridview.c b/src/ex_ctrl/gridview.c index 718973fb..c8329b30 100644 --- a/src/ex_ctrl/gridview.c +++ b/src/ex_ctrl/gridview.c @@ -2525,12 +2525,16 @@ BOOL RegisterGridViewControl (void) { WNDCLASS WndClass; - WndClass.spClassName = CTRL_GRIDVIEW; - WndClass.dwStyle = WS_NONE; - WndClass.dwExStyle = WS_EX_NONE; - WndClass.hCursor = GetSystemCursor (0); - WndClass.iBkColor = GetWindowElementPixel (HWND_DESKTOP, WE_BGC_WINDOW); - WndClass.WinProc = GridViewCtrlProc; + WndClass.spClassName = CTRL_GRIDVIEW; + WndClass.dwStyle = WS_NONE; + WndClass.dwExStyle = WS_EX_NONE; + WndClass.hCursor = GetSystemCursor (0); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else + WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif + WndClass.WinProc = GridViewCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; } diff --git a/src/ex_ctrl/iconview.c b/src/ex_ctrl/iconview.c index f5e7e511..103548a5 100644 --- a/src/ex_ctrl/iconview.c +++ b/src/ex_ctrl/iconview.c @@ -723,7 +723,11 @@ BOOL RegisterIconViewControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (IDC_ARROW); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif WndClass.WinProc = IconViewCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; diff --git a/src/ex_ctrl/listview.c b/src/ex_ctrl/listview.c index 34c98671..e0e18e4d 100644 --- a/src/ex_ctrl/listview.c +++ b/src/ex_ctrl/listview.c @@ -2195,12 +2195,16 @@ BOOL RegisterListViewControl (void) { WNDCLASS WndClass; - WndClass.spClassName = CTRL_LISTVIEW; - WndClass.dwStyle = WS_NONE; - WndClass.dwExStyle = WS_EX_NONE; - WndClass.hCursor = GetSystemCursor (0); - WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); - WndClass.WinProc = ListViewCtrlProc; + WndClass.spClassName = CTRL_LISTVIEW; + WndClass.dwStyle = WS_NONE; + WndClass.dwExStyle = WS_EX_NONE; + WndClass.hCursor = GetSystemCursor (0); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else + WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif + WndClass.WinProc = ListViewCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; } diff --git a/src/ex_ctrl/monthcalendar.c b/src/ex_ctrl/monthcalendar.c index a239fddf..ffccbcaa 100644 --- a/src/ex_ctrl/monthcalendar.c +++ b/src/ex_ctrl/monthcalendar.c @@ -118,13 +118,16 @@ BOOL RegisterMonthCalendarControl (void) { WNDCLASS WndClass; - WndClass.spClassName = "monthcalendar"; - WndClass.dwStyle = WS_NONE; - WndClass.dwExStyle = WS_EX_NONE; - WndClass.hCursor = GetSystemCursor (IDC_ARROW); - WndClass.iBkColor = - GetWindowElementPixel (HWND_DESKTOP, WE_BGC_WINDOW); - WndClass.WinProc = MonthCalendarCtrlProc; + WndClass.spClassName = "monthcalendar"; + WndClass.dwStyle = WS_NONE; + WndClass.dwExStyle = WS_EX_NONE; + WndClass.hCursor = GetSystemCursor (IDC_ARROW); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else + WndClass.iBkColor = GetWindowElementPixel (HWND_DESKTOP, WE_BGC_WINDOW); +#endif + WndClass.WinProc = MonthCalendarCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; } diff --git a/src/ex_ctrl/spinbox.c b/src/ex_ctrl/spinbox.c index 6629fd88..2016316a 100644 --- a/src/ex_ctrl/spinbox.c +++ b/src/ex_ctrl/spinbox.c @@ -411,7 +411,11 @@ BOOL RegisterSpinControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (IDC_ARROW); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif WndClass.WinProc = SpinCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; diff --git a/src/ex_ctrl/treeview.c b/src/ex_ctrl/treeview.c index 504f7432..aebde0db 100644 --- a/src/ex_ctrl/treeview.c +++ b/src/ex_ctrl/treeview.c @@ -112,7 +112,11 @@ BOOL RegisterTreeViewControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (0); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif WndClass.WinProc = TreeViewCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; diff --git a/src/ex_ctrl/treeview_rdr.c b/src/ex_ctrl/treeview_rdr.c index ebaa2389..003bbead 100644 --- a/src/ex_ctrl/treeview_rdr.c +++ b/src/ex_ctrl/treeview_rdr.c @@ -84,7 +84,11 @@ BOOL RegisterTreeViewRdrControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (0); - WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else + WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif WndClass.WinProc = TreeViewCtrlProc; return AddNewControlClass (&WndClass) == ERR_OK; diff --git a/src/gui/ctrlclass.c b/src/gui/ctrlclass.c index 26f1b2f9..30384d51 100644 --- a/src/gui/ctrlclass.c +++ b/src/gui/ctrlclass.c @@ -353,7 +353,11 @@ int gui_ControlClassDataOp (int Operation, PWNDCLASS pWndClass) if (pWndClass->opMask & COP_HCURSOR) pWndClass->hCursor = cci->hCursor; if (pWndClass->opMask & COP_BKCOLOR) +#ifdef _MGSCHEMA_COMPOSITING + pWndClass->dwBkColor = cci->dwBkColor; +#else pWndClass->iBkColor = cci->iBkColor; +#endif if (pWndClass->opMask & COP_WINPROC) pWndClass->WinProc = cci->ControlProc; if (pWndClass->opMask & COP_ADDDATA) @@ -367,7 +371,11 @@ int gui_ControlClassDataOp (int Operation, PWNDCLASS pWndClass) if (pWndClass->opMask & COP_HCURSOR) cci->hCursor = pWndClass->hCursor; if (pWndClass->opMask & COP_BKCOLOR) +#ifdef _MGSCHEMA_COMPOSITING + cci->dwBkColor = pWndClass->dwBkColor; +#else cci->iBkColor = pWndClass->iBkColor; +#endif if (pWndClass->opMask & COP_WINPROC) cci->ControlProc = pWndClass->WinProc; if (pWndClass->opMask & COP_ADDDATA) @@ -445,7 +453,11 @@ int AddNewControlClass (PWNDCLASS pWndClass) newcci->dwStyle = pWndClass->dwStyle; newcci->dwExStyle = pWndClass->dwExStyle; newcci->hCursor = pWndClass->hCursor; +#ifdef _MGSCHEMA_COMPOSITING + newcci->dwBkColor = pWndClass->dwBkColor; +#else newcci->iBkColor = pWndClass->iBkColor; +#endif newcci->ControlProc = pWndClass->WinProc; newcci->dwAddData = pWndClass->dwAddData; newcci->nUseCount = 0; @@ -554,7 +566,11 @@ static void DumpCtrlClassInfo (PCTRLCLASSINFO cci) { printf ("\tClass Name: %s\n", cci->name); printf ("\tClass Cursor: %p\n", cci->hCursor); +#ifdef _MGSCHEMA_COMPOSITING + printf ("\tClass Background color: 0x%08X\n", (int)cci->dwBkColor); +#else printf ("\tClass Background color: %d\n", cci->iBkColor); +#endif printf ("\tClass Control Proc: %p\n", cci->ControlProc); printf ("\tClass Use Count: %d\n", cci->nUseCount); } diff --git a/src/include/ctrlclass.h b/src/include/ctrlclass.h index 4d65da5d..6365d4b9 100644 --- a/src/include/ctrlclass.h +++ b/src/include/ctrlclass.h @@ -66,8 +66,12 @@ typedef struct _CTRLCLASSINFO HCURSOR hCursor; // control cursor +#ifdef _MGSCHEMA_COMPOSITING + DWORD dwBkColor; // control background color. +#else gal_pixel iFgColor; // control foreground color. gal_pixel iBkColor; // control background color. +#endif LRESULT (*ControlProc)(HWND, UINT, WPARAM, LPARAM); // control procedure. diff --git a/src/kernel/compsor-fallback.c b/src/kernel/compsor-fallback.c index a708ae33..17faa22f 100644 --- a/src/kernel/compsor-fallback.c +++ b/src/kernel/compsor-fallback.c @@ -539,7 +539,7 @@ static void on_dirty_wpp (CompositorCtxt* ctxt) { const ZNODEHEADER* znode_hdr; - _DBG_PRINTF ("called\n"); + //_DBG_PRINTF ("called\n"); znode_hdr = ServerGetWinZNodeHeader (NULL, 0, NULL, TRUE); assert (znode_hdr); diff --git a/src/textedit/mtextedit.c b/src/textedit/mtextedit.c index 48930f4b..b2ecfb08 100644 --- a/src/textedit/mtextedit.c +++ b/src/textedit/mtextedit.c @@ -6792,9 +6792,14 @@ BOOL RegisterTextEditControl (void) WndClass.dwStyle = WS_NONE; WndClass.dwExStyle = WS_EX_NONE; WndClass.hCursor = GetSystemCursor (IDC_IBEAM); +#ifdef _MGSCHEMA_COMPOSITING + WndClass.dwBkColor = GetWindowElementAttr (HWND_NULL, WE_BGC_WINDOW); +#else WndClass.iBkColor = GetWindowElementPixel (HWND_NULL, WE_BGC_WINDOW); +#endif WndClass.WinProc = mTextEditCtrlProc; + init_textedit(); if (AddNewControlClass (&WndClass) != ERR_OK)