X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/5928817c732d591bd446b6b048702a98f5ec1804..11c44cf574b43cec747d490cb264829a535ed42a:/windows.c

diff --git a/windows.c b/windows.c
index 8fbcf8e..80a929d 100644
--- a/windows.c
+++ b/windows.c
@@ -7,6 +7,7 @@
 
 #include <stdio.h>
 #include <assert.h>
+#include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <time.h>
@@ -88,6 +89,7 @@ struct frontend {
     HPEN *pens;
     HRGN clip;
     UINT timer;
+    DWORD timer_last_tickcount;
     int npresets;
     game_params **presets;
     struct font *fonts;
@@ -302,24 +304,43 @@ void deactivate_timer(frontend *fe)
 
 void activate_timer(frontend *fe)
 {
-    fe->timer = SetTimer(fe->hwnd, fe->timer, 20, NULL);
+    if (!fe->timer) {
+	fe->timer = SetTimer(fe->hwnd, fe->timer, 20, NULL);
+	fe->timer_last_tickcount = GetTickCount();
+    }
 }
 
-static frontend *new_window(HINSTANCE inst)
+static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
 {
     frontend *fe;
     int x, y;
     RECT r, sr;
     HDC hdc;
+    time_t t;
 
     fe = snew(frontend);
-    fe->me = midend_new(fe);
+
+    time(&t);
+    fe->me = midend_new(fe, &t, sizeof(t));
+
+    if (game_id) {
+        *error = midend_game_id(fe->me, game_id, FALSE);
+        if (*error) {
+            midend_free(fe->me);
+            sfree(fe);
+            return NULL;
+        }
+    }
+
     fe->inst = inst;
     midend_new_game(fe->me);
     midend_size(fe->me, &x, &y);
 
     fe->timer = 0;
 
+    fe->fonts = NULL;
+    fe->nfonts = fe->fontsize = 0;
+
     {
 	int i, ncolours;
         float *colours;
@@ -676,6 +697,7 @@ static int get_config(frontend *fe, int which)
 	    mkctrl(fe, col1l, col2r, y, y+height, "BUTTON",
 		   BS_NOTIFY | BS_AUTOCHECKBOX | WS_TABSTOP,
 		   0, i->name, (j->ctlid = id++));
+	    CheckDlgButton(fe->cfgbox, j->ctlid, (i->ival != 0));
 	    y += height;
 	    break;
 
@@ -927,7 +949,50 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		button = LEFT_BUTTON;
 	    else
 		button = RIGHT_BUTTON;
-		
+
+	    if (!midend_process_key(fe->me, LOWORD(lParam),
+				    HIWORD(lParam), button))
+		PostQuitMessage(0);
+
+	    SetCapture(hwnd);
+	}
+	break;
+      case WM_LBUTTONUP:
+      case WM_RBUTTONUP:
+      case WM_MBUTTONUP:
+	{
+	    int button;
+
+	    /*
+	     * Shift-clicks count as middle-clicks, since otherwise
+	     * two-button Windows users won't have any kind of
+	     * middle click to use.
+	     */
+	    if (message == WM_MBUTTONUP || (wParam & MK_SHIFT))
+		button = MIDDLE_RELEASE;
+	    else if (message == WM_LBUTTONUP)
+		button = LEFT_RELEASE;
+	    else
+		button = RIGHT_RELEASE;
+
+	    if (!midend_process_key(fe->me, LOWORD(lParam),
+				    HIWORD(lParam), button))
+		PostQuitMessage(0);
+
+	    ReleaseCapture();
+	}
+	break;
+      case WM_MOUSEMOVE:
+	{
+	    int button;
+
+	    if (wParam & (MK_MBUTTON | MK_SHIFT))
+		button = MIDDLE_DRAG;
+	    else if (wParam & MK_LBUTTON)
+		button = LEFT_DRAG;
+	    else
+		button = RIGHT_DRAG;
+	    
 	    if (!midend_process_key(fe->me, LOWORD(lParam),
 				    HIWORD(lParam), button))
 		PostQuitMessage(0);
@@ -938,8 +1003,12 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	    PostQuitMessage(0);
 	return 0;
       case WM_TIMER:
-	if (fe->timer)
-	    midend_timer(fe->me, (float)0.02);
+	if (fe->timer) {
+	    DWORD now = GetTickCount();
+	    float elapsed = (float) (now - fe->timer_last_tickcount) * 0.001F;
+	    midend_timer(fe->me, elapsed);
+	    fe->timer_last_tickcount = now;
+	}
 	return 0;
     }
 
@@ -949,8 +1018,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 {
     MSG msg;
-
-    srand(time(NULL));
+    char *error;
 
     InitCommonControls();
 
@@ -971,7 +1039,15 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	RegisterClass(&wndclass);
     }
 
-    new_window(inst);
+    while (*cmdline && isspace(*cmdline))
+	cmdline++;
+
+    if (!new_window(inst, *cmdline ? cmdline : NULL, &error)) {
+	char buf[128];
+	sprintf(buf, "%.100s Error", game_name);
+	MessageBox(NULL, error, buf, MB_OK|MB_ICONERROR);
+	return 1;
+    }
 
     while (GetMessage(&msg, NULL, 0, 0)) {
 	DispatchMessage(&msg);