X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/cbb5549e12c8edfd8b38b642b7b25c1fb8912c9b..6ae3730169b0c020d90fe20ace77262d19d26a2b:/windows.c

diff --git a/windows.c b/windows.c
index ac5e20c..bf7c210 100644
--- a/windows.c
+++ b/windows.c
@@ -1,5 +1,14 @@
 /*
  * windows.c: Windows front end for my puzzle collection.
+ * 
+ * TODO:
+ * 
+ *  - Figure out what to do if a puzzle requests a size bigger than
+ *    the screen will take. In principle we could put scrollbars in
+ *    the window, although that would be pretty horrid. Another
+ *    option is to detect in advance that this will be a problem -
+ *    we can probably tell this using midend_size() before actually
+ *    generating the puzzle - and simply refuse to do it.
  */
 
 #include <windows.h>
@@ -145,18 +154,12 @@ void frontend_default_colour(frontend *fe, float *output)
 
 void clip(frontend *fe, int x, int y, int w, int h)
 {
-    if (!fe->clip) {
-	fe->clip = CreateRectRgn(0, 0, 1, 1);
-	GetClipRgn(fe->hdc_bm, fe->clip);
-    }
-
     IntersectClipRect(fe->hdc_bm, x, y, x+w, y+h);
 }
 
 void unclip(frontend *fe)
 {
-    assert(fe->clip);
-    SelectClipRgn(fe->hdc_bm, fe->clip);
+    SelectClipRgn(fe->hdc_bm, NULL);
 }
 
 void draw_text(frontend *fe, int x, int y, int fonttype, int fontsize,
@@ -218,6 +221,7 @@ void draw_text(frontend *fe, int x, int y, int fonttype, int fontsize,
 		x -= size.cx;
 	}
 	SetBkMode(fe->hdc_bm, TRANSPARENT);
+	SetTextColor(fe->hdc_bm, fe->colours[colour]);
 	TextOut(fe->hdc_bm, x, y, text, strlen(text));
 	SelectObject(fe->hdc_bm, oldfont);
     }
@@ -363,7 +367,7 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
 
     fe = snew(frontend);
 
-    fe->me = midend_new(fe);
+    fe->me = midend_new(fe, &thegame);
 
     if (game_id) {
         *error = midend_game_id(fe->me, game_id, FALSE);
@@ -412,7 +416,7 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
 		       (WS_THICKFRAME | WS_MAXIMIZEBOX | WS_OVERLAPPED),
 		       TRUE, 0);
 
-    fe->hwnd = CreateWindowEx(0, game_name, game_name,
+    fe->hwnd = CreateWindowEx(0, thegame.name, thegame.name,
 			      WS_OVERLAPPEDWINDOW &~
 			      (WS_THICKFRAME | WS_MAXIMIZEBOX),
 			      CW_USEDEFAULT, CW_USEDEFAULT,
@@ -429,7 +433,7 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
 	AppendMenu(menu, MF_ENABLED, IDM_SEED, "Specific...");
 
 	if ((fe->npresets = midend_num_presets(fe->me)) > 0 ||
-	    game_can_configure) {
+	    thegame.can_configure) {
 	    HMENU sub = CreateMenu();
 	    int i;
 
@@ -450,7 +454,7 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
 		AppendMenu(sub, MF_ENABLED, IDM_PRESETS + 0x10 * i, name);
 	    }
 
-	    if (game_can_configure) {
+	    if (thegame.can_configure) {
 		AppendMenu(sub, MF_ENABLED, IDM_CONFIG, "Custom...");
 	    }
 	}
@@ -464,11 +468,11 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
             HMENU hmenu = CreateMenu();
             AppendMenu(bar, MF_ENABLED|MF_POPUP, (UINT)hmenu, "Help");
             AppendMenu(hmenu, MF_ENABLED, IDM_HELPC, "Contents");
-            if (game_winhelp_topic) {
+            if (thegame.winhelp_topic) {
                 char *item;
-                assert(game_name);
-                item = snewn(9+strlen(game_name), char); /*ick*/
-                sprintf(item, "Help on %s", game_name);
+                assert(thegame.name);
+                item = snewn(9+strlen(thegame.name), char); /*ick*/
+                sprintf(item, "Help on %s", thegame.name);
                 AppendMenu(hmenu, MF_ENABLED, IDM_GAMEHELP, item);
                 sfree(item);
             }
@@ -911,10 +915,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
             break;
           case IDM_GAMEHELP:
             assert(fe->help_path);
-            assert(game_winhelp_topic);
+            assert(thegame.winhelp_topic);
             {
-                char *cmd = snewn(10+strlen(game_winhelp_topic), char); /*ick*/
-                sprintf(cmd, "JI(`',`%s')", game_winhelp_topic);
+                char *cmd = snewn(10+strlen(thegame.winhelp_topic), char);
+                sprintf(cmd, "JI(`',`%s')", thegame.winhelp_topic);
                 WinHelp(hwnd, fe->help_path, HELP_COMMAND, (DWORD)cmd);
                 sfree(cmd);
             }
@@ -1107,7 +1111,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
 	wndclass.hbrBackground = NULL;
 	wndclass.lpszMenuName = NULL;
-	wndclass.lpszClassName = game_name;
+	wndclass.lpszClassName = thegame.name;
 
 	RegisterClass(&wndclass);
     }
@@ -1117,7 +1121,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 
     if (!new_window(inst, *cmdline ? cmdline : NULL, &error)) {
 	char buf[128];
-	sprintf(buf, "%.100s Error", game_name);
+	sprintf(buf, "%.100s Error", thegame.name);
 	MessageBox(NULL, error, buf, MB_OK|MB_ICONERROR);
 	return 1;
     }