interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added error checking to the container painting code. More TODOs.

This commit is contained in:
Pietro Gagliardi 2015-05-05 13:01:20 -04:00
parent 40993b33ab
commit 047d5aaa4d
1 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
windows/container.c
View File

@ -33,33 +33,43 @@ static HBRUSH getControlBackgroundBrush(HWND hwnd, HDC dc)
break; break;
} }
// TODO get client rect instead?
if (GetWindowRect(parent, &r) == 0) if (GetWindowRect(parent, &r) == 0)
logLastError("error getting control's window rect in paintControlBackground()"); logLastError("error getting parent's window rect in getControlBackgroundBrush()");
// TODO check errors
cdc = CreateCompatibleDC(dc); cdc = CreateCompatibleDC(dc);
if (cdc == NULL)
logLastError("error creating compatible DC in getControlBackgroundBrush()");
bitmap = CreateCompatibleBitmap(dc, r.right - r.left, r.bottom - r.top); bitmap = CreateCompatibleBitmap(dc, r.right - r.left, r.bottom - r.top);
if (bitmap == NULL)
logLastError("error creating compatible bitmap in getControlBackgroundBrush()");
prevbitmap = SelectObject(cdc, bitmap); prevbitmap = SelectObject(cdc, bitmap);
if (prevbitmap == NULL)
logLastError("error selecting bitmap into compatible DC in getControlBackgroundBrush()");
SendMessageW(parent, WM_PRINTCLIENT, (WPARAM) cdc, PRF_CLIENT); SendMessageW(parent, WM_PRINTCLIENT, (WPARAM) cdc, PRF_CLIENT);
// create it now, just to be safe
// TODO check errors
SelectObject(cdc, prevbitmap);
DeleteDC(cdc);
brush = CreatePatternBrush(bitmap); brush = CreatePatternBrush(bitmap);
DeleteObject(bitmap); if (brush == NULL)
logLastError("error creating pattern brush in getControlBackgroundBrush()");
if (SelectObject(cdc, prevbitmap) != bitmap)
logLastError("error selecting previous bitmap back into compatible DC in getControlBackgroundBrush()");
if (DeleteObject(bitmap) == 0)
logLastError("error deleting compatible bitmap in getControlBackgroundBrush()");
if (DeleteDC(cdc) == 0)
logLastError("error deleting compatible DC in getControlBackgroundBrush()");
if (GetWindowRect(hwnd, &r) == 0) if (GetWindowRect(hwnd, &r) == 0)
logLastError("error getting control's window rect in paintControlBackground()"); logLastError("error getting control's window rect in getControlBackgroundBrush()");
// the above is a window rect in screen coordinates; convert to parent coordinates // the above is a window rect in screen coordinates; convert to parent coordinates
SetLastError(0); SetLastError(0);
if (MapWindowRect(NULL, parent, &r) == 0) { if (MapWindowRect(NULL, parent, &r) == 0) {
le = GetLastError(); le = GetLastError();
SetLastError(le); // just to be safe SetLastError(le); // just to be safe
if (le != 0) if (le != 0)
logLastError("error getting client origin of control in paintControlBackground()"); logLastError("error getting coordinates to change brush origin to in getControlBackgroundBrush()");
} }
SetBrushOrgEx(dc, -r.left, -r.top, NULL); if (SetBrushOrgEx(dc, -r.left, -r.top, NULL) == 0)
logLastError("error setting brush origin in getControlBackgroundBrush()");
return brush; return brush;
} }
@ -170,14 +180,22 @@ static LRESULT CALLBACK containerWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
if (cc == NULL) if (cc == NULL)
break; break;
c = (struct container *) (uiControl(cc)->Internal); c = (struct container *) (uiControl(cc)->Internal);
// TODO check for errors
dc = BeginPaint(c->hwnd, &ps); dc = BeginPaint(c->hwnd, &ps);
GetClientRect(c->hwnd, &r); if (dc == NULL)
logLastError("error beginning container paint in containerWndProc()");
// TODO only draw what's needed
if (GetClientRect(c->hwnd, &r) == 0)
logLastError("error getting client rect in containerWndProc()");
brush = getControlBackgroundBrush(c->hwnd, dc); brush = getControlBackgroundBrush(c->hwnd, dc);
prevbrush = SelectObject(dc, brush); prevbrush = SelectObject(dc, brush);
PatBlt(dc, r.left, r.top, r.right - r.left, r.bottom - r.top, PATCOPY); if (prevbrush == NULL)
SelectObject(dc, prevbrush); logLastError("error selecting background brush into DC in containerWndProc()");
DeleteObject(brush); if (PatBlt(dc, r.left, r.top, r.right - r.left, r.bottom - r.top, PATCOPY) == 0)
logLastError("error drawing container background in containerWndProc()");
if (SelectObject(dc, prevbrush) != brush)
logLastError("error selecting previous brush back into DC in containerWndProc()");
if (DeleteObject(brush) == 0)
logLastError("error deleting background brush in containerWndProc()");
EndPaint(c->hwnd, &ps); EndPaint(c->hwnd, &ps);
return 0; return 0;
case WM_WINDOWPOSCHANGED: case WM_WINDOWPOSCHANGED:
@ -189,7 +207,7 @@ static LRESULT CALLBACK containerWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
break; break;
c = (struct container *) (uiControl(cc)->Internal); c = (struct container *) (uiControl(cc)->Internal);
if (GetClientRect(c->hwnd, &r) == 0) if (GetClientRect(c->hwnd, &r) == 0)
logLastError("error getting client rect for resize in parentWndProc()"); logLastError("error getting client rect for resize in containerWndProc()");
resize(cc, &r); resize(cc, &r);
return 0; return 0;
} }