diff options
| -rw-r--r-- | dmagick/Image.d | 14 | ||||
| -rw-r--r-- | dmagick/internal/Windows.d | 161 | ||||
| -rw-r--r-- | examples/draw.d | 2 | ||||
| -rw-r--r-- | windows.mak | 4 |
4 files changed, 177 insertions, 4 deletions
diff --git a/dmagick/Image.d b/dmagick/Image.d index 86c2a5b..b68c220 100644 --- a/dmagick/Image.d +++ b/dmagick/Image.d @@ -25,6 +25,8 @@ import dmagick.ImageView; import dmagick.Options; import dmagick.Utils; +version(Windows) import dmagick.internal.Windows; + //Import all translated c headers. import dmagick.c.MagickCore; @@ -1178,9 +1180,17 @@ class Image */ void display() { - DisplayImages(options.imageInfo, imageRef); + version(Windows) + { + Window win = new Window(this); + win.display(); + } + else + { + DisplayImages(options.imageInfo, imageRef); - DMagickException.throwException(&(imageRef.exception)); + DMagickException.throwException(&(imageRef.exception)); + } } /** diff --git a/dmagick/internal/Windows.d b/dmagick/internal/Windows.d new file mode 100644 index 0000000..50dee7b --- /dev/null +++ b/dmagick/internal/Windows.d @@ -0,0 +1,161 @@ +/** + * Copyright: Mike Wey 2011 + * License: zlib (See accompanying LICENSE file) + * Authors: Mike Wey + */ + +module dmagick.internal.Windows; + +import core.sys.windows.windows; + +import dmagick.Image; +import dmagick.Exception; +import dmagick.Geometry; + +class Window +{ + Image image; + size_t height; + size_t width; + + WNDCLASS wndclass; + HINSTANCE hInstance; + HWND hwnd; + MSG msg; + + static Window[HWND] windows; + + this(Image image) + { + this.image = image; + + height = image.rows; + width = image.columns; + + hInstance = cast(HINSTANCE) GetModuleHandleA(null); + + wndclass.style = CS_HREDRAW | CS_VREDRAW; + wndclass.lpfnWndProc = &WndProc; + wndclass.cbClsExtra = 0; + wndclass.cbWndExtra = 0; + wndclass.hInstance = hInstance; + wndclass.hIcon = LoadIconA(null, IDI_APPLICATION); + wndclass.hCursor = LoadCursorA(null, IDC_ARROW); + wndclass.hbrBackground = null; + wndclass.lpszMenuName = "DMagick"; + wndclass.lpszClassName = "DMagick"; + + if (!RegisterClassA(&wndclass)) + throw new DMagickException("This program requires Windows NT!"); + + RECT rect = RECT(0,0, width,height); + AdjustWindowRect(&rect, WS_CAPTION | WS_SYSMENU, false); + + hwnd = CreateWindowA("DMagick", "DMagick", WS_CAPTION | WS_SYSMENU, + CW_USEDEFAULT, CW_USEDEFAULT, rect.right-rect.left, rect.bottom-rect.top, + null, null, hInstance, null); + + windows[hwnd] = this; + } + + void display() + { + ShowWindow(hwnd, SW_SHOWNORMAL); + UpdateWindow(hwnd); + + while (GetMessageA(&msg, null, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + } + + extern(Windows) static LRESULT WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) + { + HDC hdc; + PAINTSTRUCT ps; + + switch (message) + { + case WM_ERASEBKGND: // don't redraw bg + return 1; + + case WM_PAINT: + // Get DC for window + hdc = BeginPaint(hwnd, &ps); + + windows[hwnd].DrawAlphaBlend(hwnd, hdc); + + EndPaint(hwnd, &ps); + return 0; + + case WM_DESTROY: + windows[hwnd] = null; + PostQuitMessage(0); + return 0; + + default: + } + + return DefWindowProcA(hwnd, message, wParam, lParam); + } + + void DrawAlphaBlend(HWND hWnd, HDC hdcwnd) + { + HDC hdc; // handle of the DC we will create + HBITMAP hbitmap; // bitmap handle + BITMAPINFO bmi; // bitmap header + VOID* pvBits; // pointer to DIB section + ULONG ulWindowWidth, ulWindowHeight; // window width/height + RECT rt; // used for getting window dimensions + + // get window dimensions + GetClientRect(hWnd, &rt); + + // calculate window width/height + ulWindowWidth = rt.right - rt.left; + ulWindowHeight = rt.bottom - rt.top; + + // make sure we have at least some window size + if (ulWindowWidth < 1 || ulWindowHeight < 1) + return; + + // create a DC for our bitmap -- the source DC for GdiAlphaBlend + hdc = CreateCompatibleDC(hdcwnd); + + // setup bitmap info + bmi.bmiHeader.biSize = BITMAPINFOHEADER.sizeof; + bmi.bmiHeader.biWidth = width; + bmi.bmiHeader.biHeight = -height; // must be inverted so Y axis is at top + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 32; // four 8-bit components + bmi.bmiHeader.biCompression = BI_RGB; + bmi.bmiHeader.biSizeImage = width * height * 4; + + // create our DIB section and select the bitmap into the dc + hbitmap = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, &pvBits, null, 0x0); + SelectObject(hdc, hbitmap); + + enum channels = "BGRA"; // win32 uses BGR(A) + Geometry area = Geometry(width, height); + byte[] arr = (cast(byte*)pvBits)[0 .. (area.width * area.height) * channels.length]; + image.exportPixels(area, arr, channels); + + BitBlt(hdcwnd, 0, 0, width, height, hdc, 0, 0, SRCCOPY); + + DeleteObject(hbitmap); + DeleteDC(hdc); + } +} + +pragma(lib, "gdi32.lib"); + +const AC_SRC_OVER = 0x00; +const AC_SRC_ALPHA = 0x01; + +enum DWORD BI_RGB = 0; +enum UINT DIB_RGB_COLORS = 0; + +extern(Windows) BOOL BitBlt(HDC, int, int, int, int, HDC, int, int, DWORD); +extern(Windows) HBITMAP CreateCompatibleBitmap(HDC, int, int); +extern(Windows) HBITMAP CreateDIBSection(HDC, const(BITMAPINFO)*, UINT, void**, HANDLE, DWORD);
\ No newline at end of file diff --git a/examples/draw.d b/examples/draw.d index deed525..6839dba 100644 --- a/examples/draw.d +++ b/examples/draw.d @@ -64,7 +64,7 @@ void main() dc.fill(cylinderTop); dc.roundRectangle(progressXmax - (2 * wc), progressYmin, progressXmax, progressYmax, wc, hc); - dc.font("Helvetica"); + dc.fontFamily("Sans"); dc.fontSize(fontsize); dc.stroke(textShadow); dc.fill(textColor); diff --git a/windows.mak b/windows.mak index ebf57c1..5b0edeb 100644 --- a/windows.mak +++ b/windows.mak @@ -108,7 +108,9 @@ SOURCE= \ dmagick\c\type.d \ dmagick\c\utility.d \ dmagick\c\xmlTree.d \ - dmagick\c\xwindow.d + dmagick\c\xwindow.d \ + \ + dmagick\internal\Windows.d \ ################## DOCS #################################### |