X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/eb2ad6f1d0284c83b3cb5caf631c659441189d7d..ea25d9da1671ff72154b974522350b70ef46e0ce:/windows.c diff --git a/windows.c b/windows.c index 618d440..bf7c210 100644 --- a/windows.c +++ b/windows.c @@ -1,10 +1,22 @@ /* * 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 +#include #include +#include +#include #include #include #include @@ -16,19 +28,92 @@ #define IDM_UNDO 0x0030 #define IDM_REDO 0x0040 #define IDM_QUIT 0x0050 +#define IDM_CONFIG 0x0060 +#define IDM_SEED 0x0070 +#define IDM_HELPC 0x0080 +#define IDM_GAMEHELP 0x0090 #define IDM_PRESETS 0x0100 +#define HELP_FILE_NAME "puzzles.hlp" +#define HELP_CNT_NAME "puzzles.cnt" + +#ifdef DEBUG +static FILE *debug_fp = NULL; +static HANDLE debug_hdl = INVALID_HANDLE_VALUE; +static int debug_got_console = 0; + +void dputs(char *buf) +{ + DWORD dw; + + if (!debug_got_console) { + if (AllocConsole()) { + debug_got_console = 1; + debug_hdl = GetStdHandle(STD_OUTPUT_HANDLE); + } + } + if (!debug_fp) { + debug_fp = fopen("debug.log", "w"); + } + + if (debug_hdl != INVALID_HANDLE_VALUE) { + WriteFile(debug_hdl, buf, strlen(buf), &dw, NULL); + } + fputs(buf, debug_fp); + fflush(debug_fp); +} + +void debug_printf(char *fmt, ...) +{ + char buf[4096]; + va_list ap; + + va_start(ap, fmt); + vsprintf(buf, fmt, ap); + dputs(buf); + va_end(ap); +} + +#define debug(x) (debug_printf x) + +#else + +#define debug(x) + +#endif + +struct font { + HFONT font; + int type; + int size; +}; + +struct cfg_aux { + int ctlid; +}; + struct frontend { midend_data *me; - HWND hwnd; + HWND hwnd, statusbar, cfgbox; + HINSTANCE inst; HBITMAP bitmap, prevbm; HDC hdc_bm; COLORREF *colours; HBRUSH *brushes; HPEN *pens; + HRGN clip; UINT timer; + DWORD timer_last_tickcount; int npresets; game_params **presets; + struct font *fonts; + int nfonts, fontsize; + config_item *cfg; + struct cfg_aux *cfgaux; + int cfg_which, cfg_done; + HFONT cfgfont; + char *help_path; + int help_has_contents; }; void fatal(char *fmt, ...) @@ -45,6 +130,19 @@ void fatal(char *fmt, ...) exit(1); } +void get_random_seed(void **randseed, int *randseedsize) +{ + time_t *tp = snew(time_t); + time(tp); + *randseed = (void *)tp; + *randseedsize = sizeof(time_t); +} + +void status_bar(frontend *fe, char *text) +{ + SetWindowText(fe->statusbar, text); +} + void frontend_default_colour(frontend *fe, float *output) { DWORD c = GetSysColor(COLOR_MENU); /* ick */ @@ -54,6 +152,81 @@ void frontend_default_colour(frontend *fe, float *output) output[2] = (float)(GetBValue(c) / 255.0); } +void clip(frontend *fe, int x, int y, int w, int h) +{ + IntersectClipRect(fe->hdc_bm, x, y, x+w, y+h); +} + +void unclip(frontend *fe) +{ + SelectClipRgn(fe->hdc_bm, NULL); +} + +void draw_text(frontend *fe, int x, int y, int fonttype, int fontsize, + int align, int colour, char *text) +{ + int i; + + /* + * Find or create the font. + */ + for (i = 0; i < fe->nfonts; i++) + if (fe->fonts[i].type == fonttype && fe->fonts[i].size == fontsize) + break; + + if (i == fe->nfonts) { + if (fe->fontsize <= fe->nfonts) { + fe->fontsize = fe->nfonts + 10; + fe->fonts = sresize(fe->fonts, fe->fontsize, struct font); + } + + fe->nfonts++; + + fe->fonts[i].type = fonttype; + fe->fonts[i].size = fontsize; + + /* + * FIXME: Really I should make at least _some_ effort to + * pick the correct font. + */ + fe->fonts[i].font = CreateFont(-fontsize, 0, 0, 0, 0, + FALSE, FALSE, FALSE, DEFAULT_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, + (fonttype == FONT_FIXED ? + FIXED_PITCH | FF_DONTCARE : + VARIABLE_PITCH | FF_SWISS), + NULL); + } + + /* + * Position and draw the text. + */ + { + HFONT oldfont; + TEXTMETRIC tm; + SIZE size; + + oldfont = SelectObject(fe->hdc_bm, fe->fonts[i].font); + if (GetTextMetrics(fe->hdc_bm, &tm)) { + if (align & ALIGN_VCENTRE) + y -= (tm.tmAscent+tm.tmDescent)/2; + else + y -= tm.tmAscent; + } + if (GetTextExtentPoint32(fe->hdc_bm, text, strlen(text), &size)) { + if (align & ALIGN_HCENTRE) + x -= size.cx / 2; + else if (align & ALIGN_HRIGHT) + 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); + } +} + void draw_rect(frontend *fe, int x, int y, int w, int h, int colour) { if (w == 1 && h == 1) { @@ -116,6 +289,8 @@ void start_draw(frontend *fe) fe->hdc_bm = CreateCompatibleDC(hdc_win); fe->prevbm = SelectObject(fe->hdc_bm, fe->bitmap); ReleaseDC(fe->hwnd, hdc_win); + fe->clip = NULL; + SetMapMode(fe->hdc_bm, MM_TEXT); } void draw_update(frontend *fe, int x, int y, int w, int h) @@ -134,6 +309,10 @@ void end_draw(frontend *fe) { SelectObject(fe->hdc_bm, fe->prevbm); DeleteDC(fe->hdc_bm); + if (fe->clip) { + DeleteObject(fe->clip); + fe->clip = NULL; + } } void deactivate_timer(frontend *fe) @@ -144,23 +323,73 @@ 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) +/* + * See if we can find a help file. + */ +static void find_help_file(frontend *fe) +{ + char b[2048], *p, *q, *r; + FILE *fp; + if (!fe->help_path) { + GetModuleFileName(NULL, b, sizeof(b) - 1); + r = b; + p = strrchr(b, '\\'); + if (p && p >= r) r = p+1; + q = strrchr(b, ':'); + if (q && q >= r) r = q+1; + strcpy(r, HELP_FILE_NAME); + if ( (fp = fopen(b, "r")) != NULL) { + fe->help_path = dupstr(b); + fclose(fp); + } else + fe->help_path = NULL; + strcpy(r, HELP_CNT_NAME); + if ( (fp = fopen(b, "r")) != NULL) { + fe->help_has_contents = TRUE; + fclose(fp); + } else + fe->help_has_contents = FALSE; + } +} + +static frontend *new_window(HINSTANCE inst, char *game_id, char **error) { frontend *fe; int x, y; - RECT r; + RECT r, sr; HDC hdc; fe = snew(frontend); - fe->me = midend_new(fe); - midend_new_game(fe->me, NULL); + + fe->me = midend_new(fe, &thegame); + + if (game_id) { + *error = midend_game_id(fe->me, game_id, FALSE); + if (*error) { + midend_free(fe->me); + sfree(fe); + return NULL; + } + } + + fe->help_path = NULL; + find_help_file(fe); + + 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; @@ -176,8 +405,6 @@ static frontend *new_window(HINSTANCE inst) 255 * colours[i*3+1], 255 * colours[i*3+2]); fe->brushes[i] = CreateSolidBrush(fe->colours[i]); - if (!fe->brushes[i]) - MessageBox(fe->hwnd, "ooh", "eck", MB_OK); fe->pens[i] = CreatePen(PS_SOLID, 1, fe->colours[i]); } } @@ -189,7 +416,7 @@ static frontend *new_window(HINSTANCE inst) (WS_THICKFRAME | WS_MAXIMIZEBOX | WS_OVERLAPPED), TRUE, 0); - fe->hwnd = CreateWindowEx(0, "puzzle", "puzzle", + fe->hwnd = CreateWindowEx(0, thegame.name, thegame.name, WS_OVERLAPPEDWINDOW &~ (WS_THICKFRAME | WS_MAXIMIZEBOX), CW_USEDEFAULT, CW_USEDEFAULT, @@ -203,12 +430,14 @@ static frontend *new_window(HINSTANCE inst) AppendMenu(bar, MF_ENABLED|MF_POPUP, (UINT)menu, "Game"); AppendMenu(menu, MF_ENABLED, IDM_NEW, "New"); AppendMenu(menu, MF_ENABLED, IDM_RESTART, "Restart"); + AppendMenu(menu, MF_ENABLED, IDM_SEED, "Specific..."); - if ((fe->npresets = midend_num_presets(fe->me)) > 0) { + if ((fe->npresets = midend_num_presets(fe->me)) > 0 || + thegame.can_configure) { HMENU sub = CreateMenu(); int i; - AppendMenu(menu, MF_ENABLED|MF_POPUP, (UINT)sub, "Type"); + AppendMenu(bar, MF_ENABLED|MF_POPUP, (UINT)sub, "Type"); fe->presets = snewn(fe->npresets, game_params *); @@ -224,6 +453,10 @@ static frontend *new_window(HINSTANCE inst) AppendMenu(sub, MF_ENABLED, IDM_PRESETS + 0x10 * i, name); } + + if (thegame.can_configure) { + AppendMenu(sub, MF_ENABLED, IDM_CONFIG, "Custom..."); + } } AppendMenu(menu, MF_SEPARATOR, 0, 0); @@ -231,9 +464,37 @@ static frontend *new_window(HINSTANCE inst) AppendMenu(menu, MF_ENABLED, IDM_REDO, "Redo"); AppendMenu(menu, MF_SEPARATOR, 0, 0); AppendMenu(menu, MF_ENABLED, IDM_QUIT, "Exit"); + if (fe->help_path) { + HMENU hmenu = CreateMenu(); + AppendMenu(bar, MF_ENABLED|MF_POPUP, (UINT)hmenu, "Help"); + AppendMenu(hmenu, MF_ENABLED, IDM_HELPC, "Contents"); + if (thegame.winhelp_topic) { + char *item; + 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); + } + } SetMenu(fe->hwnd, bar); } + if (midend_wants_statusbar(fe->me)) { + fe->statusbar = CreateWindowEx(0, STATUSCLASSNAME, "ooh", + WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, /* status bar does these */ + fe->hwnd, NULL, inst, NULL); + GetWindowRect(fe->statusbar, &sr); + SetWindowPos(fe->hwnd, NULL, 0, 0, + r.right - r.left, r.bottom - r.top + sr.bottom - sr.top, + SWP_NOMOVE | SWP_NOZORDER); + SetWindowPos(fe->statusbar, NULL, 0, y, x, sr.bottom - sr.top, + SWP_NOZORDER); + } else { + fe->statusbar = NULL; + } + hdc = GetDC(fe->hwnd); fe->bitmap = CreateCompatibleBitmap(hdc, x, y); ReleaseDC(fe->hwnd, hdc); @@ -248,6 +509,366 @@ static frontend *new_window(HINSTANCE inst) return fe; } +static int CALLBACK ConfigDlgProc(HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam) +{ + frontend *fe = (frontend *)GetWindowLong(hwnd, GWL_USERDATA); + config_item *i; + struct cfg_aux *j; + + switch (msg) { + case WM_INITDIALOG: + return 0; + + case WM_COMMAND: + /* + * OK and Cancel are special cases. + */ + if ((HIWORD(wParam) == BN_CLICKED || + HIWORD(wParam) == BN_DOUBLECLICKED) && + (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)) { + if (LOWORD(wParam) == IDOK) { + char *err = midend_set_config(fe->me, fe->cfg_which, fe->cfg); + + if (err) { + MessageBox(hwnd, err, "Validation error", + MB_ICONERROR | MB_OK); + } else { + fe->cfg_done = 2; + } + } else { + fe->cfg_done = 1; + } + return 0; + } + + /* + * First find the control whose id this is. + */ + for (i = fe->cfg, j = fe->cfgaux; i->type != C_END; i++, j++) { + if (j->ctlid == LOWORD(wParam)) + break; + } + if (i->type == C_END) + return 0; /* not our problem */ + + if (i->type == C_STRING && HIWORD(wParam) == EN_CHANGE) { + char buffer[4096]; + GetDlgItemText(fe->cfgbox, j->ctlid, buffer, lenof(buffer)); + buffer[lenof(buffer)-1] = '\0'; + sfree(i->sval); + i->sval = dupstr(buffer); + } else if (i->type == C_BOOLEAN && + (HIWORD(wParam) == BN_CLICKED || + HIWORD(wParam) == BN_DOUBLECLICKED)) { + i->ival = IsDlgButtonChecked(fe->cfgbox, j->ctlid); + } else if (i->type == C_CHOICES && + HIWORD(wParam) == CBN_SELCHANGE) { + i->ival = SendDlgItemMessage(fe->cfgbox, j->ctlid, + CB_GETCURSEL, 0, 0); + } + + return 0; + + case WM_CLOSE: + fe->cfg_done = 1; + return 0; + } + + return 0; +} + +HWND mkctrl(frontend *fe, int x1, int x2, int y1, int y2, + char *wclass, int wstyle, + int exstyle, char *wtext, int wid) +{ + HWND ret; + ret = CreateWindowEx(exstyle, wclass, wtext, + wstyle | WS_CHILD | WS_VISIBLE, x1, y1, x2-x1, y2-y1, + fe->cfgbox, (HMENU) wid, fe->inst, NULL); + SendMessage(ret, WM_SETFONT, (WPARAM)fe->cfgfont, MAKELPARAM(TRUE, 0)); + return ret; +} + +static int get_config(frontend *fe, int which) +{ + config_item *i; + struct cfg_aux *j; + char *title; + WNDCLASS wc; + MSG msg; + TEXTMETRIC tm; + HDC hdc; + HFONT oldfont; + SIZE size; + HWND ctl; + int gm, id, nctrls; + int winwidth, winheight, col1l, col1r, col2l, col2r, y; + int height, width, maxlabel, maxcheckbox; + + wc.style = CS_DBLCLKS | CS_SAVEBITS | CS_BYTEALIGNWINDOW; + wc.lpfnWndProc = DefDlgProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = DLGWINDOWEXTRA + 8; + wc.hInstance = fe->inst; + wc.hIcon = NULL; + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH) (COLOR_BACKGROUND +1); + wc.lpszMenuName = NULL; + wc.lpszClassName = "GameConfigBox"; + RegisterClass(&wc); + + hdc = GetDC(fe->hwnd); + SetMapMode(hdc, MM_TEXT); + + fe->cfg_done = FALSE; + + fe->cfgfont = CreateFont(-MulDiv(8, GetDeviceCaps(hdc, LOGPIXELSY), 72), + 0, 0, 0, 0, + FALSE, FALSE, FALSE, DEFAULT_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, + FF_SWISS, + "MS Shell Dlg"); + + oldfont = SelectObject(hdc, fe->cfgfont); + if (GetTextMetrics(hdc, &tm)) { + height = tm.tmAscent + tm.tmDescent; + width = tm.tmAveCharWidth; + } else { + height = width = 30; + } + + fe->cfg = midend_get_config(fe->me, which, &title); + fe->cfg_which = which; + + /* + * Figure out the layout of the config box by measuring the + * length of each piece of text. + */ + maxlabel = maxcheckbox = 0; + winheight = height/2; + + for (i = fe->cfg; i->type != C_END; i++) { + switch (i->type) { + case C_STRING: + case C_CHOICES: + /* + * Both these control types have a label filling only + * the left-hand column of the box. + */ + if (GetTextExtentPoint32(hdc, i->name, strlen(i->name), &size) && + maxlabel < size.cx) + maxlabel = size.cx; + winheight += height * 3 / 2 + (height / 2); + break; + + case C_BOOLEAN: + /* + * Checkboxes take up the whole of the box width. + */ + if (GetTextExtentPoint32(hdc, i->name, strlen(i->name), &size) && + maxcheckbox < size.cx) + maxcheckbox = size.cx; + winheight += height + (height / 2); + break; + } + } + + winheight += height + height * 7 / 4; /* OK / Cancel buttons */ + + col1l = 2*width; + col1r = col1l + maxlabel; + col2l = col1r + 2*width; + col2r = col2l + 30*width; + if (col2r < col1l+2*height+maxcheckbox) + col2r = col1l+2*height+maxcheckbox; + winwidth = col2r + 2*width; + + ReleaseDC(fe->hwnd, hdc); + + /* + * Create the dialog, now that we know its size. + */ + { + RECT r, r2; + + r.left = r.top = 0; + r.right = winwidth; + r.bottom = winheight; + + AdjustWindowRectEx(&r, (WS_OVERLAPPEDWINDOW /*| + DS_MODALFRAME | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU*/) &~ + (WS_MAXIMIZEBOX | WS_OVERLAPPED), + FALSE, 0); + + /* + * Centre the dialog on its parent window. + */ + r.right -= r.left; + r.bottom -= r.top; + GetWindowRect(fe->hwnd, &r2); + r.left = (r2.left + r2.right - r.right) / 2; + r.top = (r2.top + r2.bottom - r.bottom) / 2; + r.right += r.left; + r.bottom += r.top; + + fe->cfgbox = CreateWindowEx(0, wc.lpszClassName, title, + DS_MODALFRAME | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU, + r.left, r.top, + r.right-r.left, r.bottom-r.top, + fe->hwnd, NULL, fe->inst, NULL); + sfree(title); + } + + SendMessage(fe->cfgbox, WM_SETFONT, (WPARAM)fe->cfgfont, FALSE); + + SetWindowLong(fe->cfgbox, GWL_USERDATA, (LONG)fe); + SetWindowLong(fe->cfgbox, DWL_DLGPROC, (LONG)ConfigDlgProc); + + /* + * Count the controls so we can allocate cfgaux. + */ + for (nctrls = 0, i = fe->cfg; i->type != C_END; i++) + nctrls++; + fe->cfgaux = snewn(nctrls, struct cfg_aux); + + id = 1000; + y = height/2; + for (i = fe->cfg, j = fe->cfgaux; i->type != C_END; i++, j++) { + switch (i->type) { + case C_STRING: + /* + * Edit box with a label beside it. + */ + mkctrl(fe, col1l, col1r, y+height*1/8, y+height*9/8, + "Static", 0, 0, i->name, id++); + ctl = mkctrl(fe, col2l, col2r, y, y+height*3/2, + "EDIT", WS_TABSTOP | ES_AUTOHSCROLL, + WS_EX_CLIENTEDGE, "", (j->ctlid = id++)); + SetWindowText(ctl, i->sval); + y += height*3/2; + break; + + case C_BOOLEAN: + /* + * Simple checkbox. + */ + 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; + + case C_CHOICES: + /* + * Drop-down list with a label beside it. + */ + mkctrl(fe, col1l, col1r, y+height*1/8, y+height*9/8, + "STATIC", 0, 0, i->name, id++); + ctl = mkctrl(fe, col2l, col2r, y, y+height*41/2, + "COMBOBOX", WS_TABSTOP | + CBS_DROPDOWNLIST | CBS_HASSTRINGS, + WS_EX_CLIENTEDGE, "", (j->ctlid = id++)); + { + char c, *p, *q, *str; + + SendMessage(ctl, CB_RESETCONTENT, 0, 0); + p = i->sval; + c = *p++; + while (*p) { + q = p; + while (*q && *q != c) q++; + str = snewn(q-p+1, char); + strncpy(str, p, q-p); + str[q-p] = '\0'; + SendMessage(ctl, CB_ADDSTRING, 0, (LPARAM)str); + sfree(str); + if (*q) q++; + p = q; + } + } + + SendMessage(ctl, CB_SETCURSEL, i->ival, 0); + + y += height*3/2; + break; + } + + assert(y < winheight); + y += height/2; + } + + y += height/2; /* extra space before OK and Cancel */ + mkctrl(fe, col1l, (col1l+col2r)/2-width, y, y+height*7/4, "BUTTON", + BS_PUSHBUTTON | BS_NOTIFY | WS_TABSTOP | BS_DEFPUSHBUTTON, 0, + "OK", IDOK); + mkctrl(fe, (col1l+col2r)/2+width, col2r, y, y+height*7/4, "BUTTON", + BS_PUSHBUTTON | BS_NOTIFY | WS_TABSTOP, 0, "Cancel", IDCANCEL); + + SendMessage(fe->cfgbox, WM_INITDIALOG, 0, 0); + + EnableWindow(fe->hwnd, FALSE); + ShowWindow(fe->cfgbox, SW_NORMAL); + while ((gm=GetMessage(&msg, NULL, 0, 0)) > 0) { + if (!IsDialogMessage(fe->cfgbox, &msg)) + DispatchMessage(&msg); + if (fe->cfg_done) + break; + } + EnableWindow(fe->hwnd, TRUE); + SetForegroundWindow(fe->hwnd); + DestroyWindow(fe->cfgbox); + DeleteObject(fe->cfgfont); + + free_cfg(fe->cfg); + sfree(fe->cfgaux); + + return (fe->cfg_done == 2); +} + +static void new_game_type(frontend *fe) +{ + RECT r, sr; + HDC hdc; + int x, y; + + midend_new_game(fe->me); + midend_size(fe->me, &x, &y); + + r.left = r.top = 0; + r.right = x; + r.bottom = y; + AdjustWindowRectEx(&r, WS_OVERLAPPEDWINDOW &~ + (WS_THICKFRAME | WS_MAXIMIZEBOX | + WS_OVERLAPPED), + TRUE, 0); + + if (fe->statusbar != NULL) { + GetWindowRect(fe->statusbar, &sr); + } else { + sr.left = sr.right = sr.top = sr.bottom = 0; + } + SetWindowPos(fe->hwnd, NULL, 0, 0, + r.right - r.left, + r.bottom - r.top + sr.bottom - sr.top, + SWP_NOMOVE | SWP_NOZORDER); + if (fe->statusbar != NULL) + SetWindowPos(fe->statusbar, NULL, 0, y, x, + sr.bottom - sr.top, SWP_NOZORDER); + + DeleteObject(fe->bitmap); + + hdc = GetDC(fe->hwnd); + fe->bitmap = CreateCompatibleBitmap(hdc, x, y); + ReleaseDC(fe->hwnd, hdc); + + midend_redraw(fe->me); +} + static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -279,38 +900,36 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, if (!midend_process_key(fe->me, 0, 0, 'q')) PostQuitMessage(0); break; + case IDM_CONFIG: + if (get_config(fe, CFG_SETTINGS)) + new_game_type(fe); + break; + case IDM_SEED: + if (get_config(fe, CFG_SEED)) + new_game_type(fe); + break; + case IDM_HELPC: + assert(fe->help_path); + WinHelp(hwnd, fe->help_path, + fe->help_has_contents ? HELP_FINDER : HELP_CONTENTS, 0); + break; + case IDM_GAMEHELP: + assert(fe->help_path); + assert(thegame.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); + } + break; default: { int p = ((wParam &~ 0xF) - IDM_PRESETS) / 0x10; if (p >= 0 && p < fe->npresets) { - RECT r; - HDC hdc; - int x, y; - midend_set_params(fe->me, fe->presets[p]); - midend_new_game(fe->me, NULL); - midend_size(fe->me, &x, &y); - - r.left = r.top = 0; - r.right = x; - r.bottom = y; - AdjustWindowRectEx(&r, WS_OVERLAPPEDWINDOW &~ - (WS_THICKFRAME | WS_MAXIMIZEBOX | - WS_OVERLAPPED), - TRUE, 0); - - SetWindowPos(fe->hwnd, NULL, 0, 0, - r.right - r.left, r.bottom - r.top, - SWP_NOMOVE | SWP_NOZORDER); - - DeleteObject(fe->bitmap); - - hdc = GetDC(fe->hwnd); - fe->bitmap = CreateCompatibleBitmap(hdc, x, y); - ReleaseDC(fe->hwnd, hdc); - - midend_redraw(fe->me); + new_game_type(fe); } } break; @@ -349,31 +968,124 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, case VK_RIGHT: key = CURSOR_RIGHT; break; case VK_UP: key = CURSOR_UP; break; case VK_DOWN: key = CURSOR_DOWN; break; + /* + * Diagonal keys on the numeric keypad. + */ + case VK_PRIOR: + if (!(lParam & 0x01000000)) key = CURSOR_UP_RIGHT; + break; + case VK_NEXT: + if (!(lParam & 0x01000000)) key = CURSOR_DOWN_RIGHT; + break; + case VK_HOME: + if (!(lParam & 0x01000000)) key = CURSOR_UP_LEFT; + break; + case VK_END: + if (!(lParam & 0x01000000)) key = CURSOR_DOWN_LEFT; + break; + /* + * Numeric keypad keys with Num Lock on. + */ + case VK_NUMPAD4: key = CURSOR_LEFT; break; + case VK_NUMPAD6: key = CURSOR_RIGHT; break; + case VK_NUMPAD8: key = CURSOR_UP; break; + case VK_NUMPAD2: key = CURSOR_DOWN; break; + case VK_NUMPAD9: key = CURSOR_UP_RIGHT; break; + case VK_NUMPAD3: key = CURSOR_DOWN_RIGHT; break; + case VK_NUMPAD7: key = CURSOR_UP_LEFT; break; + case VK_NUMPAD1: key = CURSOR_DOWN_LEFT; break; } if (key != -1) { if (!midend_process_key(fe->me, 0, 0, key)) PostQuitMessage(0); + } else { + MSG m; + m.hwnd = hwnd; + m.message = WM_KEYDOWN; + m.wParam = wParam; + m.lParam = lParam & 0xdfff; + TranslateMessage(&m); } } break; case WM_LBUTTONDOWN: case WM_RBUTTONDOWN: case WM_MBUTTONDOWN: - if (!midend_process_key(fe->me, LOWORD(lParam), HIWORD(lParam), - (message == WM_LBUTTONDOWN ? LEFT_BUTTON : - message == WM_RBUTTONDOWN ? RIGHT_BUTTON : - MIDDLE_BUTTON))) - PostQuitMessage(0); - + { + 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_MBUTTONDOWN || (wParam & MK_SHIFT)) + button = MIDDLE_BUTTON; + else if (message == WM_LBUTTONDOWN) + button = LEFT_BUTTON; + else + button = RIGHT_BUTTON; + + if (!midend_process_key(fe->me, (signed short)LOWORD(lParam), + (signed short)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, (signed short)LOWORD(lParam), + (signed short)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, (signed short)LOWORD(lParam), + (signed short)HIWORD(lParam), button)) + PostQuitMessage(0); + } break; case WM_CHAR: if (!midend_process_key(fe->me, 0, 0, (unsigned char)wParam)) 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; } @@ -383,8 +1095,9 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) { MSG msg; + char *error; - srand(time(NULL)); + InitCommonControls(); if (!prev) { WNDCLASS wndclass; @@ -398,15 +1111,22 @@ 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 = "puzzle"; + wndclass.lpszClassName = thegame.name; 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", thegame.name); + MessageBox(NULL, error, buf, MB_OK|MB_ICONERROR); + return 1; + } while (GetMessage(&msg, NULL, 0, 0)) { - TranslateMessage(&msg); DispatchMessage(&msg); }