Take the Windows taskbar into account when deciding on the maximum

[sgt/puzzles] / windows.c

diff --git a/windows.c b/windows.c
index 50ca7c2..72d0120 100644 (file)
--- a/windows.c
+++ b/windows.c
@@ -74,6 +74,11 @@ void debug_printf(char *fmt, ...)
 }
 #endif
 
+#define WINFLAGS (WS_OVERLAPPEDWINDOW &~ \
+                     (WS_THICKFRAME | WS_MAXIMIZEBOX | WS_OVERLAPPED))
+
+static void new_game_size(frontend *fe);
+
 struct font {
     HFONT font;
     int type;
@@ -177,8 +182,6 @@ static void win_status_bar(void *handle, char *text)
     frontend *fe = (frontend *)handle;
     char *rewritten;
 
-    assert(fe->drawstatus == DRAWING);
-
     rewritten = midend_rewrite_statusbar(fe->me, text);
     if (!fe->laststatus || strcmp(rewritten, fe->laststatus)) {
        SetWindowText(fe->statusbar, rewritten);
@@ -367,7 +370,6 @@ static void win_set_pen(frontend *fe, int colour, int thin)
        int width = thin ? 0 : fe->linewidth;
 
        print_get_colour(fe->dr, colour, &hatch, &r, &g, &b);
-       /* FIXME: line thickness here */
        if (fe->printcolour)
            pen = CreatePen(PS_SOLID, width,
                            RGB(r * 255, g * 255, b * 255));
@@ -757,12 +759,7 @@ static void win_end_page(void *handle, int number)
     frontend *fe = (frontend *)handle;
 
     assert(fe->drawstatus != DRAWING);
-    /*
-     * The MSDN web site sample code doesn't bother to call EndDoc
-     * if an error occurs half way through printing. I expect doing
-     * so would cause the erroneous document to actually be
-     * printed, or something equally undesirable.
-     */
+
     if (fe->drawstatus == NOTHING)
        return;
 
@@ -790,6 +787,12 @@ static void win_end_doc(void *handle)
     }
     fe->fontstart = 0;
 
+    /*
+     * The MSDN web site sample code doesn't bother to call EndDoc
+     * if an error occurs half way through printing. I expect doing
+     * so would cause the erroneous document to actually be
+     * printed, or something equally undesirable.
+     */
     if (fe->drawstatus == NOTHING)
        return;
 
@@ -885,8 +888,10 @@ void print(frontend *fe)
     pd.nFromPage = pd.nToPage = 0xFFFF;
     pd.nMinPage = pd.nMaxPage = 1;
 
-    if (!PrintDlg(&pd))
+    if (!PrintDlg(&pd)) {
+       document_free(doc);
        return;
+    }
 
     /*
      * Now pd.hDC is a device context for the printer.
@@ -916,6 +921,7 @@ void print(frontend *fe)
     fe->drawstatus = NOTHING;
 
     DeleteDC(pd.hDC);
+    document_free(doc);
 }
 
 void deactivate_timer(frontend *fe)
@@ -1041,9 +1047,7 @@ static void check_window_size(frontend *fe, int *px, int *py)
        r.left = r.top = 0;
        r.right = x;
        r.bottom = y + sy;
-       AdjustWindowRectEx(&r, WS_OVERLAPPEDWINDOW &~
-                          (WS_THICKFRAME | WS_MAXIMIZEBOX | WS_OVERLAPPED),
-                          TRUE, 0);
+       AdjustWindowRectEx(&r, WINFLAGS, TRUE, 0);
        SetWindowPos(fe->hwnd, NULL, 0, 0, r.right - r.left, r.bottom - r.top,
                     SWP_NOMOVE | SWP_NOZORDER);
     }
@@ -1058,6 +1062,30 @@ static void check_window_size(frontend *fe, int *px, int *py)
     *py = y;
 }
 
+static void get_max_puzzle_size(frontend *fe, int *x, int *y)
+{
+    RECT r, sr;
+
+    if (SystemParametersInfo(SPI_GETWORKAREA, 0, &sr, FALSE)) {
+       *x = sr.right - sr.left;
+       *y = sr.bottom - sr.top;
+       r.left = 100;
+       r.right = 200;
+       r.top = 100;
+       r.bottom = 200;
+       AdjustWindowRectEx(&r, WINFLAGS, TRUE, 0);
+       *x -= r.right - r.left - 100;
+       *y -= r.bottom - r.top - 100;
+    } else {
+       *x = *y = INT_MAX;
+    }
+
+    if (fe->statusbar != NULL) {
+       GetWindowRect(fe->statusbar, &sr);
+       *y -= sr.bottom - sr.top;
+    }
+}
+
 static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
 {
     frontend *fe;
@@ -1114,17 +1142,23 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
            fe->brushes[i] = CreateSolidBrush(fe->colours[i]);
            fe->pens[i] = CreatePen(PS_SOLID, 1, fe->colours[i]);
        }
+        sfree(colours);
     }
 
-    x = y = INT_MAX;                  /* find puzzle's preferred size */
+    if (midend_wants_statusbar(fe->me)) {
+       fe->statusbar = CreateWindowEx(0, STATUSCLASSNAME, "ooh",
+                                      WS_CHILD | WS_VISIBLE,
+                                      0, 0, 0, 0, /* status bar does these */
+                                      NULL, NULL, inst, NULL);
+    }
+
+    get_max_puzzle_size(fe, &x, &y);
     midend_size(fe->me, &x, &y, FALSE);
 
     r.left = r.top = 0;
     r.right = x;
     r.bottom = y;
-    AdjustWindowRectEx(&r, WS_OVERLAPPEDWINDOW &~
-                      (WS_THICKFRAME | WS_MAXIMIZEBOX | WS_OVERLAPPED),
-                      TRUE, 0);
+    AdjustWindowRectEx(&r, WINFLAGS, TRUE, 0);
 
     fe->hwnd = CreateWindowEx(0, thegame.name, thegame.name,
                              WS_OVERLAPPEDWINDOW &~
@@ -1135,6 +1169,7 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
 
     if (midend_wants_statusbar(fe->me)) {
        RECT sr;
+       DestroyWindow(fe->statusbar);
        fe->statusbar = CreateWindowEx(0, STATUSCLASSNAME, "ooh",
                                       WS_CHILD | WS_VISIBLE,
                                       0, 0, 0, 0, /* status bar does these */
@@ -1226,6 +1261,7 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
        SetMenu(fe->hwnd, bar);
     }
 
+    new_game_size(fe);
     check_window_size(fe, &x, &y);
 
     hdc = GetDC(fe->hwnd);
@@ -1846,16 +1882,13 @@ static void new_game_size(frontend *fe)
     HDC hdc;
     int x, y;
 
-    x = y = INT_MAX;
+    get_max_puzzle_size(fe, &x, &y);
     midend_size(fe->me, &x, &y, FALSE);
 
     r.left = r.top = 0;
     r.right = x;
     r.bottom = y;
-    AdjustWindowRectEx(&r, WS_OVERLAPPEDWINDOW &~
-                      (WS_THICKFRAME | WS_MAXIMIZEBOX |
-                       WS_OVERLAPPED),
-                      TRUE, 0);
+    AdjustWindowRectEx(&r, WINFLAGS, TRUE, 0);
 
     if (fe->statusbar != NULL) {
        GetWindowRect(fe->statusbar, &sr);