X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/7f89707cfefc99bd87511cb5d1f48a217c85e8fa..7cdb7c552b412b3139d1f737f5bfcf785bb78d2d:/windows.c diff --git a/windows.c b/windows.c index 45ec69c..0171baa 100644 --- a/windows.c +++ b/windows.c @@ -1,14 +1,5 @@ /* * 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 @@ -19,6 +10,7 @@ #include #include #include +#include #include #include "puzzles.h" @@ -35,13 +27,15 @@ #define IDM_SEED 0x00A0 #define IDM_HELPC 0x00B0 #define IDM_GAMEHELP 0x00C0 +#define IDM_ABOUT 0x00D0 +#define IDM_SAVE 0x00E0 +#define IDM_LOAD 0x00F0 #define IDM_PRESETS 0x0100 -#define IDM_ABOUT 0x0110 #define HELP_FILE_NAME "puzzles.hlp" #define HELP_CNT_NAME "puzzles.cnt" -#ifdef DEBUG +#ifdef DEBUGGING static FILE *debug_fp = NULL; static HANDLE debug_hdl = INVALID_HANDLE_VALUE; static int debug_got_console = 0; @@ -77,13 +71,6 @@ void debug_printf(char *fmt, ...) dputs(buf); va_end(ap); } - -#define debug(x) (debug_printf x) - -#else - -#define debug(x) - #endif struct font { @@ -96,8 +83,14 @@ struct cfg_aux { int ctlid; }; +struct blitter { + HBITMAP bitmap; + frontend *fe; + int x, y, w, h; +}; + struct frontend { - midend_data *me; + midend *me; HWND hwnd, statusbar, cfgbox; HINSTANCE inst; HBITMAP bitmap, prevbm; @@ -118,6 +111,7 @@ struct frontend { HFONT cfgfont; char *help_path; int help_has_contents; + char *laststatus; }; void fatal(char *fmt, ...) @@ -142,9 +136,95 @@ void get_random_seed(void **randseed, int *randseedsize) *randseedsize = sizeof(time_t); } -void status_bar(frontend *fe, char *text) +static void win_status_bar(void *handle, char *text) +{ + frontend *fe = (frontend *)handle; + char *rewritten = midend_rewrite_statusbar(fe->me, text); + if (!fe->laststatus || strcmp(rewritten, fe->laststatus)) { + SetWindowText(fe->statusbar, rewritten); + sfree(fe->laststatus); + fe->laststatus = rewritten; + } else { + sfree(rewritten); + } +} + +static blitter *win_blitter_new(void *handle, int w, int h) +{ + blitter *bl = snew(blitter); + + memset(bl, 0, sizeof(blitter)); + bl->w = w; + bl->h = h; + bl->bitmap = 0; + + return bl; +} + +static void win_blitter_free(void *handle, blitter *bl) +{ + if (bl->bitmap) DeleteObject(bl->bitmap); + sfree(bl); +} + +static void blitter_mkbitmap(frontend *fe, blitter *bl) +{ + HDC hdc = GetDC(fe->hwnd); + bl->bitmap = CreateCompatibleBitmap(hdc, bl->w, bl->h); + ReleaseDC(fe->hwnd, hdc); +} + +/* BitBlt(dstDC, dstX, dstY, dstW, dstH, srcDC, srcX, srcY, dType) */ + +static void win_blitter_save(void *handle, blitter *bl, int x, int y) { - SetWindowText(fe->statusbar, text); + frontend *fe = (frontend *)handle; + HDC hdc_win, hdc_blit; + HBITMAP prev_blit; + + if (!bl->bitmap) blitter_mkbitmap(fe, bl); + + bl->x = x; bl->y = y; + + hdc_win = GetDC(fe->hwnd); + hdc_blit = CreateCompatibleDC(hdc_win); + if (!hdc_blit) fatal("hdc_blit failed: 0x%x", GetLastError()); + + prev_blit = SelectObject(hdc_blit, bl->bitmap); + if (prev_blit == NULL || prev_blit == HGDI_ERROR) + fatal("SelectObject for hdc_main failed: 0x%x", GetLastError()); + + if (!BitBlt(hdc_blit, 0, 0, bl->w, bl->h, + fe->hdc_bm, x, y, SRCCOPY)) + fatal("BitBlt failed: 0x%x", GetLastError()); + + SelectObject(hdc_blit, prev_blit); + DeleteDC(hdc_blit); + ReleaseDC(fe->hwnd, hdc_win); +} + +static void win_blitter_load(void *handle, blitter *bl, int x, int y) +{ + frontend *fe = (frontend *)handle; + HDC hdc_win, hdc_blit; + HBITMAP prev_blit; + + assert(bl->bitmap); /* we should always have saved before loading */ + + if (x == BLITTER_FROMSAVED) x = bl->x; + if (y == BLITTER_FROMSAVED) y = bl->y; + + hdc_win = GetDC(fe->hwnd); + hdc_blit = CreateCompatibleDC(hdc_win); + + prev_blit = SelectObject(hdc_blit, bl->bitmap); + + BitBlt(fe->hdc_bm, x, y, bl->w, bl->h, + hdc_blit, 0, 0, SRCCOPY); + + SelectObject(hdc_blit, prev_blit); + DeleteDC(hdc_blit); + ReleaseDC(fe->hwnd, hdc_win); } void frontend_default_colour(frontend *fe, float *output) @@ -156,19 +236,22 @@ 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) +static void win_clip(void *handle, int x, int y, int w, int h) { + frontend *fe = (frontend *)handle; IntersectClipRect(fe->hdc_bm, x, y, x+w, y+h); } -void unclip(frontend *fe) +static void win_unclip(void *handle) { + frontend *fe = (frontend *)handle; SelectClipRgn(fe->hdc_bm, NULL); } -void draw_text(frontend *fe, int x, int y, int fonttype, int fontsize, - int align, int colour, char *text) +static void win_draw_text(void *handle, int x, int y, int fonttype, + int fontsize, int align, int colour, char *text) { + frontend *fe = (frontend *)handle; int i; /* @@ -227,8 +310,9 @@ void draw_text(frontend *fe, int x, int y, int fonttype, int fontsize, } } -void draw_rect(frontend *fe, int x, int y, int w, int h, int colour) +static void win_draw_rect(void *handle, int x, int y, int w, int h, int colour) { + frontend *fe = (frontend *)handle; if (w == 1 && h == 1) { /* * Rectangle() appears to get uppity if asked to draw a 1x1 @@ -246,8 +330,9 @@ void draw_rect(frontend *fe, int x, int y, int w, int h, int colour) } } -void draw_line(frontend *fe, int x1, int y1, int x2, int y2, int colour) +static void win_draw_line(void *handle, int x1, int y1, int x2, int y2, int colour) { + frontend *fe = (frontend *)handle; HPEN oldpen = SelectObject(fe->hdc_bm, fe->pens[colour]); MoveToEx(fe->hdc_bm, x1, y1, NULL); LineTo(fe->hdc_bm, x2, y2); @@ -255,9 +340,32 @@ void draw_line(frontend *fe, int x1, int y1, int x2, int y2, int colour) SelectObject(fe->hdc_bm, oldpen); } -void draw_polygon(frontend *fe, int *coords, int npoints, - int fill, int colour) +static void win_draw_circle(void *handle, int cx, int cy, int radius, + int fillcolour, int outlinecolour) +{ + frontend *fe = (frontend *)handle; + assert(outlinecolour >= 0); + + if (fillcolour >= 0) { + HBRUSH oldbrush = SelectObject(fe->hdc_bm, fe->brushes[fillcolour]); + HPEN oldpen = SelectObject(fe->hdc_bm, fe->pens[outlinecolour]); + Ellipse(fe->hdc_bm, cx - radius, cy - radius, + cx + radius + 1, cy + radius + 1); + SelectObject(fe->hdc_bm, oldbrush); + SelectObject(fe->hdc_bm, oldpen); + } else { + HPEN oldpen = SelectObject(fe->hdc_bm, fe->pens[outlinecolour]); + Arc(fe->hdc_bm, cx - radius, cy - radius, + cx + radius + 1, cy + radius + 1, + cx - radius, cy, cx - radius, cy); + SelectObject(fe->hdc_bm, oldpen); + } +} + +static void win_draw_polygon(void *handle, int *coords, int npoints, + int fillcolour, int outlinecolour) { + frontend *fe = (frontend *)handle; POINT *pts = snewn(npoints+1, POINT); int i; @@ -267,14 +375,16 @@ void draw_polygon(frontend *fe, int *coords, int npoints, pts[i].y = coords[j*2+1]; } - if (fill) { - HBRUSH oldbrush = SelectObject(fe->hdc_bm, fe->brushes[colour]); - HPEN oldpen = SelectObject(fe->hdc_bm, fe->pens[colour]); + assert(outlinecolour >= 0); + + if (fillcolour >= 0) { + HBRUSH oldbrush = SelectObject(fe->hdc_bm, fe->brushes[fillcolour]); + HPEN oldpen = SelectObject(fe->hdc_bm, fe->pens[outlinecolour]); Polygon(fe->hdc_bm, pts, npoints); SelectObject(fe->hdc_bm, oldbrush); SelectObject(fe->hdc_bm, oldpen); } else { - HPEN oldpen = SelectObject(fe->hdc_bm, fe->pens[colour]); + HPEN oldpen = SelectObject(fe->hdc_bm, fe->pens[outlinecolour]); Polyline(fe->hdc_bm, pts, npoints+1); SelectObject(fe->hdc_bm, oldpen); } @@ -282,8 +392,9 @@ void draw_polygon(frontend *fe, int *coords, int npoints, sfree(pts); } -void start_draw(frontend *fe) +static void win_start_draw(void *handle) { + frontend *fe = (frontend *)handle; HDC hdc_win; hdc_win = GetDC(fe->hwnd); fe->hdc_bm = CreateCompatibleDC(hdc_win); @@ -293,8 +404,9 @@ void start_draw(frontend *fe) SetMapMode(fe->hdc_bm, MM_TEXT); } -void draw_update(frontend *fe, int x, int y, int w, int h) +static void win_draw_update(void *handle, int x, int y, int w, int h) { + frontend *fe = (frontend *)handle; RECT r; r.left = x; @@ -305,8 +417,9 @@ void draw_update(frontend *fe, int x, int y, int w, int h) InvalidateRect(fe->hwnd, &r, FALSE); } -void end_draw(frontend *fe) +static void win_end_draw(void *handle) { + frontend *fe = (frontend *)handle; SelectObject(fe->hdc_bm, fe->prevbm); DeleteDC(fe->hdc_bm); if (fe->clip) { @@ -315,9 +428,29 @@ void end_draw(frontend *fe) } } +const struct drawing_api win_drawing = { + win_draw_text, + win_draw_rect, + win_draw_line, + win_draw_polygon, + win_draw_circle, + win_draw_update, + win_clip, + win_unclip, + win_start_draw, + win_end_draw, + win_status_bar, + win_blitter_new, + win_blitter_free, + win_blitter_save, + win_blitter_load, + NULL, NULL, NULL, NULL, NULL, NULL, /* {begin,end}_{doc,page,puzzle} */ + NULL, /* line_width */ +}; + void deactivate_timer(frontend *fe) { - KillTimer(fe->hwnd, fe->timer); + if (fe->hwnd) KillTimer(fe->hwnd, fe->timer); fe->timer = 0; } @@ -329,6 +462,15 @@ void activate_timer(frontend *fe) } } +/* + * Since this front end does not support printing (yet), we need + * this stub to satisfy the reference in midend_print_puzzle(). + */ +void document_add_puzzle(document *doc, const game *game, game_params *par, + game_state *st, game_state *st2) +{ +} + void write_clip(HWND hwnd, char *data) { HGLOBAL clipdata; @@ -405,16 +547,62 @@ static void find_help_file(frontend *fe) } } +static void check_window_size(frontend *fe, int *px, int *py) +{ + RECT r; + int x, y, sy; + + if (fe->statusbar) { + RECT sr; + GetWindowRect(fe->statusbar, &sr); + sy = sr.bottom - sr.top; + } else { + sy = 0; + } + + /* + * See if we actually got the window size we wanted, and adjust + * the puzzle size if not. + */ + GetClientRect(fe->hwnd, &r); + x = r.right - r.left; + y = r.bottom - r.top - sy; + midend_size(fe->me, &x, &y, FALSE); + if (x != r.right - r.left || y != r.bottom - r.top) { + /* + * Resize the window, now we know what size we _really_ + * want it to be. + */ + r.left = r.top = 0; + r.right = x; + r.bottom = y + sy; + 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); + } + + if (fe->statusbar) { + GetClientRect(fe->hwnd, &r); + SetWindowPos(fe->statusbar, NULL, 0, r.bottom-r.top-sy, r.right-r.left, + sy, SWP_NOZORDER); + } + + *px = x; + *py = y; +} + static frontend *new_window(HINSTANCE inst, char *game_id, char **error) { frontend *fe; int x, y; - RECT r, sr; + RECT r; HDC hdc; fe = snew(frontend); - fe->me = midend_new(fe, &thegame); + fe->me = midend_new(fe, &thegame, &win_drawing, fe); if (game_id) { *error = midend_game_id(fe->me, game_id); @@ -429,14 +617,17 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error) find_help_file(fe); fe->inst = inst; - midend_new_game(fe->me); - midend_size(fe->me, &x, &y); fe->timer = 0; + fe->hwnd = NULL; + + midend_new_game(fe->me); fe->fonts = NULL; fe->nfonts = fe->fontsize = 0; + fe->laststatus = NULL; + { int i, ncolours; float *colours; @@ -456,6 +647,9 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error) } } + x = y = INT_MAX; /* find puzzle's preferred size */ + midend_size(fe->me, &x, &y, FALSE); + r.left = r.top = 0; r.right = x; r.bottom = y; @@ -470,6 +664,24 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error) r.right - r.left, r.bottom - r.top, NULL, NULL, inst, NULL); + if (midend_wants_statusbar(fe->me)) { + RECT sr; + fe->statusbar = CreateWindowEx(0, STATUSCLASSNAME, "ooh", + WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, /* status bar does these */ + fe->hwnd, NULL, inst, NULL); + /* + * Now resize the window to take account of the status bar. + */ + GetWindowRect(fe->statusbar, &sr); + GetWindowRect(fe->hwnd, &r); + SetWindowPos(fe->hwnd, NULL, 0, 0, r.right - r.left, + r.bottom - r.top + sr.bottom - sr.top, + SWP_NOMOVE | SWP_NOZORDER); + } else { + fe->statusbar = NULL; + } + { HMENU bar = CreateMenu(); HMENU menu = CreateMenu(); @@ -508,6 +720,9 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error) } AppendMenu(menu, MF_SEPARATOR, 0, 0); + AppendMenu(menu, MF_ENABLED, IDM_LOAD, "Load"); + AppendMenu(menu, MF_ENABLED, IDM_SAVE, "Save"); + AppendMenu(menu, MF_SEPARATOR, 0, 0); AppendMenu(menu, MF_ENABLED, IDM_UNDO, "Undo"); AppendMenu(menu, MF_ENABLED, IDM_REDO, "Redo"); if (thegame.can_format_as_text) { @@ -538,20 +753,7 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error) 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; - } + check_window_size(fe, &x, &y); hdc = GetDC(fe->hwnd); fe->bitmap = CreateCompatibleBitmap(hdc, x, y); @@ -1065,14 +1267,14 @@ static int get_config(frontend *fe, int which) return (fe->dlg_done == 2); } -static void new_game_type(frontend *fe) +static void new_game_size(frontend *fe) { RECT r, sr; HDC hdc; int x, y; - midend_new_game(fe->me); - midend_size(fe->me, &x, &y); + x = y = INT_MAX; + midend_size(fe->me, &x, &y, FALSE); r.left = r.top = 0; r.right = x; @@ -1091,6 +1293,9 @@ static void new_game_type(frontend *fe) r.right - r.left, r.bottom - r.top + sr.bottom - sr.top, SWP_NOMOVE | SWP_NOZORDER); + + check_window_size(fe, &x, &y); + if (fe->statusbar != NULL) SetWindowPos(fe->statusbar, NULL, 0, y, x, sr.bottom - sr.top, SWP_NOZORDER); @@ -1104,17 +1309,53 @@ static void new_game_type(frontend *fe) midend_redraw(fe->me); } +static void new_game_type(frontend *fe) +{ + midend_new_game(fe->me); + new_game_size(fe); +} + +static int is_alt_pressed(void) +{ + BYTE keystate[256]; + int r = GetKeyboardState(keystate); + if (!r) + return FALSE; + if (keystate[VK_MENU] & 0x80) + return TRUE; + if (keystate[VK_RMENU] & 0x80) + return TRUE; + return FALSE; +} + +static void savefile_write(void *wctx, void *buf, int len) +{ + FILE *fp = (FILE *)wctx; + fwrite(buf, 1, len, fp); +} + +static int savefile_read(void *wctx, void *buf, int len) +{ + FILE *fp = (FILE *)wctx; + int ret; + + ret = fread(buf, 1, len, fp); + return (ret == len); +} + static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { frontend *fe = (frontend *)GetWindowLong(hwnd, GWL_USERDATA); + int cmd; switch (message) { case WM_CLOSE: DestroyWindow(hwnd); return 0; case WM_COMMAND: - switch (wParam & ~0xF) { /* low 4 bits reserved to Windows */ + cmd = wParam & ~0xF; /* low 4 bits reserved to Windows */ + switch (cmd) { case IDM_NEW: if (!midend_process_key(fe->me, 0, 0, 'n')) PostQuitMessage(0); @@ -1167,6 +1408,92 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, case IDM_ABOUT: about(fe); break; + case IDM_LOAD: + case IDM_SAVE: + { + OPENFILENAME of; + char filename[FILENAME_MAX]; + int ret; + + memset(&of, 0, sizeof(of)); + of.hwndOwner = hwnd; + of.lpstrFilter = "All Files (*.*)\0*\0\0\0"; + of.lpstrCustomFilter = NULL; + of.nFilterIndex = 1; + of.lpstrFile = filename; + filename[0] = '\0'; + of.nMaxFile = lenof(filename); + of.lpstrFileTitle = NULL; + of.lpstrTitle = (cmd == IDM_SAVE ? + "Enter name of game file to save" : + "Enter name of saved game file to load"); + of.Flags = 0; +#ifdef OPENFILENAME_SIZE_VERSION_400 + of.lStructSize = OPENFILENAME_SIZE_VERSION_400; +#else + of.lStructSize = sizeof(of); +#endif + of.lpstrInitialDir = NULL; + + if (cmd == IDM_SAVE) + ret = GetSaveFileName(&of); + else + ret = GetOpenFileName(&of); + + if (ret) { + if (cmd == IDM_SAVE) { + FILE *fp; + + if ((fp = fopen(filename, "r")) != NULL) { + char buf[256 + FILENAME_MAX]; + fclose(fp); + /* file exists */ + + sprintf(buf, "Are you sure you want to overwrite" + " the file \"%.*s\"?", + FILENAME_MAX, filename); + if (MessageBox(hwnd, buf, "Question", + MB_YESNO | MB_ICONQUESTION) + != IDYES) + break; + } + + fp = fopen(filename, "w"); + + if (!fp) { + MessageBox(hwnd, "Unable to open save file", + "Error", MB_ICONERROR | MB_OK); + break; + } + + midend_serialise(fe->me, savefile_write, fp); + + fclose(fp); + } else { + FILE *fp = fopen(filename, "r"); + char *err; + + if (!fp) { + MessageBox(hwnd, "Unable to open saved game file", + "Error", MB_ICONERROR | MB_OK); + break; + } + + err = midend_deserialise(fe->me, savefile_read, fp); + + fclose(fp); + + if (err) { + MessageBox(hwnd, err, "Error", MB_ICONERROR|MB_OK); + break; + } + + new_game_size(fe); + } + } + } + + break; case IDM_HELPC: assert(fe->help_path); WinHelp(hwnd, fe->help_path, @@ -1221,31 +1548,35 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, case WM_KEYDOWN: { int key = -1; + BYTE keystate[256]; + int r = GetKeyboardState(keystate); + int shift = (r && (keystate[VK_SHIFT] & 0x80)) ? MOD_SHFT : 0; + int ctrl = (r && (keystate[VK_CONTROL] & 0x80)) ? MOD_CTRL : 0; switch (wParam) { case VK_LEFT: if (!(lParam & 0x01000000)) key = MOD_NUM_KEYPAD | '4'; - else - key = CURSOR_LEFT; + else + key = shift | ctrl | CURSOR_LEFT; break; case VK_RIGHT: if (!(lParam & 0x01000000)) key = MOD_NUM_KEYPAD | '6'; - else - key = CURSOR_RIGHT; + else + key = shift | ctrl | CURSOR_RIGHT; break; case VK_UP: if (!(lParam & 0x01000000)) key = MOD_NUM_KEYPAD | '8'; - else - key = CURSOR_UP; + else + key = shift | ctrl | CURSOR_UP; break; case VK_DOWN: if (!(lParam & 0x01000000)) key = MOD_NUM_KEYPAD | '2'; - else - key = CURSOR_DOWN; + else + key = shift | ctrl | CURSOR_DOWN; break; /* * Diagonal keys on the numeric keypad. @@ -1309,10 +1640,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, */ if (message == WM_MBUTTONDOWN || (wParam & MK_SHIFT)) button = MIDDLE_BUTTON; - else if (message == WM_LBUTTONDOWN) - button = LEFT_BUTTON; - else + else if (message == WM_RBUTTONDOWN || is_alt_pressed()) button = RIGHT_BUTTON; + else + button = LEFT_BUTTON; if (!midend_process_key(fe->me, (signed short)LOWORD(lParam), (signed short)HIWORD(lParam), button)) @@ -1334,10 +1665,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, */ if (message == WM_MBUTTONUP || (wParam & MK_SHIFT)) button = MIDDLE_RELEASE; - else if (message == WM_LBUTTONUP) - button = LEFT_RELEASE; - else + else if (message == WM_RBUTTONUP || is_alt_pressed()) button = RIGHT_RELEASE; + else + button = LEFT_RELEASE; if (!midend_process_key(fe->me, (signed short)LOWORD(lParam), (signed short)HIWORD(lParam), button)) @@ -1352,10 +1683,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, if (wParam & (MK_MBUTTON | MK_SHIFT)) button = MIDDLE_DRAG; - else if (wParam & MK_LBUTTON) - button = LEFT_DRAG; - else + else if (wParam & MK_RBUTTON || is_alt_pressed()) button = RIGHT_DRAG; + else + button = LEFT_DRAG; if (!midend_process_key(fe->me, (signed short)LOWORD(lParam), (signed short)HIWORD(lParam), button)) @@ -1403,7 +1734,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) RegisterClass(&wndclass); } - while (*cmdline && isspace(*cmdline)) + while (*cmdline && isspace((unsigned char)*cmdline)) cmdline++; if (!new_window(inst, *cmdline ? cmdline : NULL, &error)) {