X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/fa7515b24c236292e00aa998f540721f027169a1..87871cf197134b1b88055371edcc4e35d660cce4:/windows.c

diff --git a/windows.c b/windows.c
index baa9998..0a61f3c 100644
--- a/windows.c
+++ b/windows.c
@@ -118,6 +118,7 @@ struct frontend {
     HFONT cfgfont;
     char *help_path;
     int help_has_contents;
+    char *laststatus;
 };
 
 void fatal(char *fmt, ...)
@@ -144,7 +145,14 @@ void get_random_seed(void **randseed, int *randseedsize)
 
 void status_bar(frontend *fe, char *text)
 {
-    SetWindowText(fe->statusbar, text);
+    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);
+    }
 }
 
 void frontend_default_colour(frontend *fe, float *output)
@@ -437,6 +445,8 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
     fe->fonts = NULL;
     fe->nfonts = fe->fontsize = 0;
 
+    fe->laststatus = NULL;
+
     {
 	int i, ncolours;
         float *colours;
@@ -1221,31 +1231,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.