X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=2f15610f8c9db3bcd504d9190fb3909d5565a686;hb=412a8de0295bf9cef6b02a6809dfda966cacd9d4;hp=e37c62948da936b67e64e40264b5b7208ee81137;hpb=35eff6783ec3d1809b70948ab5ffc475bcec7980;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index e37c629..2f15610 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -766,6 +766,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
   }
 
   JAWS_INIT
+  TranslateMenus(1);
 
 //  InitCommonControlsEx(&ex);
   InitCommonControls();
@@ -1060,7 +1061,6 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
   }
 
   InitDrawingSizes(boardSize, 0);
-  TranslateMenus(1);
   InitMenuChecks();
   buttonCount = GetSystemMetrics(SM_CMOUSEBUTTONS);
 
@@ -6255,7 +6255,7 @@ CommentDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	sizeY = newSizeY;
       }
     }
-    SendDlgItemMessage( hDlg, OPT_CommentText, EM_SETEVENTMASK, 0, ENM_MOUSEEVENTS );
+    SendDlgItemMessage( hDlg, OPT_CommentText, EM_SETEVENTMASK, 0, ENM_MOUSEEVENTS | ENM_KEYEVENTS );
     return FALSE;
 
   case WM_COMMAND: /* message: received a command */
@@ -6304,13 +6304,19 @@ CommentDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
         if( wParam == OPT_CommentText ) {
             MSGFILTER * lpMF = (MSGFILTER *) lParam;
 
-            if( lpMF->msg == WM_RBUTTONDOWN && (lpMF->wParam & (MK_CONTROL | MK_SHIFT)) == 0 ) {
+            if( lpMF->msg == WM_RBUTTONDOWN && (lpMF->wParam & (MK_CONTROL | MK_SHIFT)) == 0 ||
+                lpMF->msg == WM_CHAR && lpMF->wParam == '\022' ) {
                 POINTL pt;
                 LRESULT index;
 
                 pt.x = LOWORD( lpMF->lParam );
                 pt.y = HIWORD( lpMF->lParam );
 
+                if(lpMF->msg == WM_CHAR) {
+                        CHARRANGE sel;
+                        SendDlgItemMessage( hDlg, OPT_CommentText, EM_EXGETSEL, 0, (LPARAM) &sel );
+                        index = sel.cpMin;
+                } else
                 index = SendDlgItemMessage( hDlg, OPT_CommentText, EM_CHARFROMPOS, 0, (LPARAM) &pt );
 
 		hwndText = GetDlgItem(hDlg, OPT_CommentText); // cloned from above
@@ -6414,6 +6420,7 @@ TypeInMoveDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
   case WM_COMMAND:
     switch (LOWORD(wParam)) {
     case IDOK:
+
       shiftKey = GetKeyState(VK_SHIFT) < 0; // [HGM] remember last shift status
       GetDlgItemText(hDlg, OPT_Move, move, sizeof(move));
       { int n; Board board;
@@ -6901,7 +6908,8 @@ ConsoleTextSubclass(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       SendMessage(hInput, message, wParam, lParam);
     }
     return 0;
-   } // [HGM] navigate: for Ctrl+R, flow into nex case (moved up here) to summon up menu
+   } // [HGM] navigate: for Ctrl+R, flow into next case (moved up here) to summon up menu
+   lParam = -1;
   case WM_RBUTTONDOWN:
     if (!(GetKeyState(VK_SHIFT) & ~1)) {
       /* Move selection here if it was empty */
@@ -6910,7 +6918,7 @@ ConsoleTextSubclass(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       pt.y = HIWORD(lParam);
       SendMessage(hwnd, EM_EXGETSEL, 0, (LPARAM)&sel);
       if (sel.cpMin == sel.cpMax) {
-        sel.cpMin = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&pt); /*doc is wrong*/
+        if(lParam != -1) sel.cpMin = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&pt); /*doc is wrong*/
 	sel.cpMax = sel.cpMin;
 	SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM)&sel);
       }