Find/Replace - add Go to Go To #259

Author: cshnik

src/Edit.c

@@ -6081,27 +6081,28 @@ BOOL EditReplaceAllInSelection(HWND hwnd, LPCEDITFINDREPLACE lpefr, BOOL bShowIn
 //
 INT_PTR CALLBACK EditLinenumDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
 {
-  LPEDITFINDREPLACE lpefr = NULL;
-
-
+  LPCGOTOPARAMS lpgoto = NULL;
   switch (umsg)
   {
     DPI_CHANGED_HANDLER();
 
     case WM_INITDIALOG: {
 
+        // [2e]: Find/Replace - add Go to Go To #259
         SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)lParam);
-        lpefr = (LPEDITFINDREPLACE)lParam;
+        lpgoto = (LPGOTOPARAMS)lParam;
 
-        if (!lpefr || !strlen(lpefr->szFindUTF8))
+        if (!lpgoto || lpgoto->bForceDefaultInit || !strlen(lpgoto->lpefr->szFindUTF8))
         {
+          lpgoto->bForceDefaultInit = FALSE;
           int iCurLine = (int)SendMessage(hwndEdit, SCI_LINEFROMPOSITION, SendMessage(hwndEdit, SCI_GETCURRENTPOS, 0, 0), 0) + 1;
           SetDlgItemInt(hwnd, IDC_LINENUM, iCurLine, FALSE);
         }
         else
         {
-          SetDlgItemTextA2W(CP_UTF8, hwnd, IDC_LINENUM, lpefr->szFindUTF8);
+          SetDlgItemTextA2W(CP_UTF8, hwnd, IDC_LINENUM, lpgoto->lpefr->szFindUTF8);
         }
+        // [/2e]
         SendDlgItemMessage(hwnd, IDC_LINENUM, EM_LIMITTEXT, 15, 0);
         SendDlgItemMessage(hwnd, IDC_COLNUM, EM_LIMITTEXT, 15, 0);
         SendDlgItemMessage(hwnd, IDC_POSNUM, EM_LIMITTEXT, 15, 0);
@@ -6129,16 +6130,14 @@ INT_PTR CALLBACK EditLinenumDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM
       switch (LOWORD(wParam))
       {
 
+        // [2e]: Find/Replace - add Go to Go To #259
         case IDACC_FIND:
         case IDACC_REPLACE:
-          lpefr = (LPEDITFINDREPLACE)GetWindowLongPtr(hwnd, DWLP_USER);
-          if (!lpefr)
-          {
-            lpefr = &efrSave;
-          }
-          GetDlgItemTextA2W(CP_UTF8, hwnd, IDC_LINENUM, lpefr->szFindUTF8, COUNTOF(lpefr->szFindUTF8));
+          lpgoto = (LPGOTOPARAMS)GetWindowLongPtr(hwnd, DWLP_USER);
+          GetDlgItemTextA2W(CP_UTF8, hwnd, IDC_LINENUM, lpgoto->lpefr->szFindUTF8, COUNTOF(lpgoto->lpefr->szFindUTF8));
           PostMessage(GetParent(hwnd), WM_COMMAND, MAKELONG((LOWORD(wParam) == IDACC_FIND) ? IDM_EDIT_FIND : IDM_EDIT_REPLACE, 1), 0);
           break;
+        // [/2e]
 
 
         case IDACC_SAVEPOS:
@@ -6262,15 +6261,15 @@ INT_PTR CALLBACK EditLinenumDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM
 //
 //  EditLinenumDlg()
 //
-HWND EditLinenumDlg(HWND hwnd, LPCEDITFINDREPLACE lpefr)
+HWND EditLinenumDlg(HWND hwnd, LPCGOTOPARAMS lpgoto)
 {
 
   HWND hDlg;
 
-  lpefr->hwnd = NULL;
+  lpgoto->lpefr->hwnd = NULL;
 
   hDlg = CreateThemedDialogParam(g_hInstance, MAKEINTRESOURCEW(IDD_LINENUM), 
-                                 GetParent(hwnd),  EditLinenumDlgProc, (LPARAM)lpefr);
+                                 GetParent(hwnd),  EditLinenumDlgProc, (LPARAM)lpgoto);
 
   ShowWindow(hDlg, SW_SHOW);
 

src/Edit.h

@@ -42,6 +42,12 @@ typedef struct _editfindreplace
 
 } EDITFINDREPLACE, *LPEDITFINDREPLACE, *LPCEDITFINDREPLACE;
 
+typedef struct _gotoparams
+{
+  BOOL bForceDefaultInit;
+  LPEDITFINDREPLACE lpefr;
+} GOTOPARAMS, *LPGOTOPARAMS, *LPCGOTOPARAMS;
+
 
 #define IDMSG_SWITCHTOFIND    300
 #define IDMSG_SWITCHTOREPLACE 301
@@ -118,7 +124,7 @@ BOOL  EditFindPrev(HWND, LPCEDITFINDREPLACE, BOOL);
 BOOL  EditReplace(HWND, LPCEDITFINDREPLACE);
 BOOL  EditReplaceAll(HWND, LPCEDITFINDREPLACE, BOOL);
 BOOL  EditReplaceAllInSelection(HWND, LPCEDITFINDREPLACE, BOOL);
-HWND  EditLinenumDlg(HWND, LPCEDITFINDREPLACE);
+HWND  EditLinenumDlg(HWND, LPCGOTOPARAMS);
 BOOL  EditModifyLinesDlg(HWND, LPWSTR, LPWSTR);
 BOOL  EditEncloseSelectionDlg(HWND, LPWSTR, LPWSTR);
 BOOL  EditInsertTagDlg(HWND, LPWSTR, LPWSTR);

src/Notepad2.c

@@ -264,6 +264,9 @@ EDITFINDREPLACE efrData = { "", "", "", "", 0, 0, 0, 0, 0, 0, NULL };
 UINT cpLastFind = 0;
 BOOL bReplaceInitialized = FALSE;
 
+// [2e]: Find/Replace - add Go to Go To #259
+GOTOPARAMS gotoData = { TRUE, &efrData };
+
 extern NP2ENCODING mEncoding[];
 
 int iLineEndings[3] = {
@@ -3825,14 +3828,15 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     case IDM_EDIT_GOTOLINE:
       {
+        gotoData.bForceDefaultInit = !IsWindow(hDlgFindReplace);
         if (IsWindow(hDlgFindReplace))
         {
           SendMessage(hDlgFindReplace, WM_COMMAND, MAKELONG(IDMSG_SWITCHTOGOTO, 1), 0);
           DestroyWindow(hDlgFindReplace);
         }
         if (!IsWindow(hDlgGotoLine))
         {
-          hDlgGotoLine = EditLinenumDlg(hwndEdit, &efrData);
+          hDlgGotoLine = EditLinenumDlg(hwndEdit, &gotoData);
         }
         else
         {