summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--wintable/draw.h91
-rw-r--r--wintable/test.c18
2 files changed, 68 insertions, 41 deletions
diff --git a/wintable/draw.h b/wintable/draw.h
index 19b136a..a5a35a2 100644
--- a/wintable/draw.h
+++ b/wintable/draw.h
@@ -10,18 +10,70 @@ struct drawCellParams {
LRESULT xoff; // result of HDM_GETBITMAPMARGIN
};
+static void drawTextCell(struct table *t, HDC dc, struct drawCellParams *p, RECT *r, int textColor)
+{
+ WCHAR *text;
+
+ toCellContentRect(t, r, p->xoff, 0, 0); // TODO get the text height
+ if (SetTextColor(dc, GetSysColor(textColor)) == CLR_INVALID)
+ panic("error setting Table cell text color");
+ if (SetBkMode(dc, TRANSPARENT) == 0)
+ panic("error setting transparent text drawing mode for Table cell");
+ text = (WCHAR *) notify(t, tableNotificationGetCellData, p->row, p->column, 0);
+ if (DrawTextExW(dc, text, -1, r, DT_END_ELLIPSIS | DT_LEFT | DT_NOPREFIX | DT_SINGLELINE, NULL) == 0)
+ panic("error drawing Table cell text");
+ notify(t, tableNotificationFinishedWithCellData, p->row, p->column, (uintptr_t) text);
+}
+
+static void drawImageCell(struct table *t, HDC dc, struct drawCellParams *p, RECT *r)
+{
+ HBITMAP bitmap;
+ BITMAP bi;
+ HDC idc;
+ HBITMAP previbitmap;
+ BLENDFUNCTION bf;
+
+ // only call tableImageWidth() and tableImageHeight() here in case it changes partway through
+ // we can get the values back out with basic subtraction (r->right - r->left/r->bottom - r->top)
+ toCellContentRect(t, r, p->xoff, tableImageWidth(), tableImageHeight());
+
+ bitmap = (HBITMAP) notify(t, tableNotificationGetCellData, p->row, p->column, 0);
+ ZeroMemory(&bi, sizeof (BITMAP));
+ if (GetObject(bitmap, sizeof (BITMAP), &bi) == 0)
+ panic("error getting Table cell image dimensions for drawing");
+
+ idc = CreateCompatibleDC(dc);
+ if (idc == NULL)
+ panic("error creating compatible DC for Table image cell drawing");
+ previbitmap = SelectObject(idc, bitmap);
+ if (previbitmap == NULL)
+ panic("error selecting Table cell image into compatible DC for image drawing");
+
+ ZeroMemory(&bf, sizeof (BLENDFUNCTION));
+ bf.BlendOp = AC_SRC_OVER;
+ bf.BlendFlags = 0;
+ bf.SourceConstantAlpha = 255; // per-pixel alpha values
+ bf.AlphaFormat = AC_SRC_ALPHA;
+ if (AlphaBlend(dc, r->left, r->top, r->right - r->left, r->bottom - r->top,
+ idc, 0, 0, bi.bmWidth, bi.bmHeight, bf) == FALSE)
+ panic("error drawing image into Table cell");
+
+ if (SelectObject(idc, previbitmap) != bitmap)
+ panic("error deselecting Table cell image for drawing image");
+ if (DeleteDC(idc) == 0)
+ panic("error deleting Table compatible DC for image cell drawing");
+
+ notify(t, tableNotificationFinishedWithCellData, p->row, p->column, (uintptr_t) bitmap);
+}
+
static void drawCell(struct table *t, HDC dc, struct drawCellParams *p)
{
RECT r;
- WCHAR *text;
HBRUSH background;
int textColor;
POINT pt;
int cbState;
RECT cellrect;
- HDC idc;
- HBITMAP previbitmap;
- BLENDFUNCTION bf;
// TODO verify these two
background = (HBRUSH) (COLOR_WINDOW + 1);
@@ -48,37 +100,10 @@ static void drawCell(struct table *t, HDC dc, struct drawCellParams *p)
switch (t->columnTypes[p->column]) {
case tableColumnText:
- toCellContentRect(t, &r, p->xoff, 0, 0); // TODO get the text height
- if (SetTextColor(dc, GetSysColor(textColor)) == CLR_INVALID)
- panic("error setting Table cell text color");
- if (SetBkMode(dc, TRANSPARENT) == 0)
- panic("error setting transparent text drawing mode for Table cell");
- text = (WCHAR *) notify(t, tableNotificationGetCellData, p->row, p->column, 0);
- if (DrawTextExW(dc, text, -1, &r, DT_END_ELLIPSIS | DT_LEFT | DT_NOPREFIX | DT_SINGLELINE, NULL) == 0)
- panic("error drawing Table cell text");
- notify(t, tableNotificationFinishedWithCellData, p->row, p->column, (uintptr_t) text);
+ drawTextCell(t, dc, p, &r, textColor);
break;
case tableColumnImage:
- toCellContentRect(t, &r, p->xoff, tableImageWidth(), tableImageHeight());
- idc = CreateCompatibleDC(dc);
- if (idc == NULL)
- panic("error creating compatible DC for Table image cell drawing");
- previbitmap = SelectObject(idc, testbitmap);
- if (previbitmap == NULL)
- panic("error selecting Table cell image into compatible DC for image drawing");
- ZeroMemory(&bf, sizeof (BLENDFUNCTION));
- bf.BlendOp = AC_SRC_OVER;
- bf.BlendFlags = 0;
- bf.SourceConstantAlpha = 255; // per-pixel alpha values
- bf.AlphaFormat = AC_SRC_ALPHA;
- // TODO 16 and 16 are the width and height of the image; we would need to get that out somehow
- if (AlphaBlend(dc, r.left, r.top, r.right - r.left, r.bottom - r.top,
- idc, 0, 0, 16, 16, bf) == FALSE)
- panic("error drawing image into Table cell");
- if (SelectObject(idc, previbitmap) != testbitmap)
- panic("error deselecting Table cell image for drawing image");
- if (DeleteDC(idc) == 0)
- panic("error deleting Table compatible DC for image cell drawing");
+ drawImageCell(t, dc, p, &r);
break;
case tableColumnCheckbox:
toCheckboxRect(t, &r, p->xoff);
diff --git a/wintable/test.c b/wintable/test.c
index 1ffad26..f09d609 100644
--- a/wintable/test.c
+++ b/wintable/test.c
@@ -3,14 +3,13 @@
// #qo LIBS: user32 kernel32 gdi32 comctl32 uxtheme ole32 oleaut32 oleacc uuid msimg32
-HBITMAP testbitmap;
-void mkbitmap(void);
-
#include "main.h"
HWND tablehwnd = NULL;
BOOL msgfont = FALSE;
+HBITMAP mkbitmap(void);
+
BOOL mainwinCreate(HWND hwnd, LPCREATESTRUCT lpcs)
{
tablehwnd = CreateWindowExW(0,
@@ -77,7 +76,7 @@ LRESULT CALLBACK mainwndproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
_swprintf(text, L"mainwin (%d,%d)", nm->row, nm->column);
return (LRESULT) text;
case tableColumnImage:
- return (LRESULT) testbitmap;
+ return (LRESULT) mkbitmap();
case tableColumnCheckbox:
; // TODO
}
@@ -88,7 +87,8 @@ LRESULT CALLBACK mainwndproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
free((void *) (nm->data));
break;
case tableColumnImage:
- // do nothing
+ if (DeleteObject((HBITMAP) (nm->data)) == 0)
+ panic("(test program) error deleting cell image");
break;
}
return 0;
@@ -161,10 +161,11 @@ COLORREF iconpix[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1B050A11, 0x4000102, 0x0, 0x0,
};
-void mkbitmap(void)
+HBITMAP mkbitmap(void)
{
BITMAPINFO bi;
void *ppvBits;
+ HBITMAP b;
ZeroMemory(&bi, sizeof (BITMAPINFO));
bi.bmiHeader.biSize = sizeof (BITMAPINFOHEADER);
@@ -174,8 +175,9 @@ void mkbitmap(void)
bi.bmiHeader.biBitCount = 32;
bi.bmiHeader.biCompression = BI_RGB;
bi.bmiHeader.biSizeImage = 16 * 16 * 4;
- testbitmap = CreateDIBSection(NULL, &bi, DIB_RGB_COLORS, &ppvBits, 0, 0);
- if (testbitmap == 0)
+ b = CreateDIBSection(NULL, &bi, DIB_RGB_COLORS, &ppvBits, 0, 0);
+ if (b == 0)
panic("test bitmap creation failed");
memcpy(ppvBits, iconpix, bi.bmiHeader.biSizeImage);
+ return b;
}
generated by cgit v1.2.3 (git 2.51.0) at 2025-11-05 17:39:21 +0000