Carlo Bramini (carlo.bramix@libero.it)

- Fix the display of Line and Column in the Status Bar and add language resources for this

Patch was slightly modified by me to also react on WM_KEYDOWN messages, so that the line/column is already updated, when you're holding down the buttons. (like Windows' notepad does by the way)
We still have to keep WM_KEYUP though, otherwise this doesn't work properly when being used with Page Up/Page Down.

See issue #3702 for more details.

svn path=/trunk/; revision=37176

diff --git a/reactos/base/applications/notepad/dialog.c b/reactos/base/applications/notepad/dialog.c
index 93be73e..b435974 100644 (file)
--- a/reactos/base/applications/notepad/dialog.c
+++ b/reactos/base/applications/notepad/dialog.c
@@ -871,19 +871,15 @@ VOID DIALOG_GoTo(VOID)
 
 VOID DIALOG_StatusBarUpdateCaretPos(VOID)
 {
-    int line;
-    int col;
-    int ccol;
-    POINT point;
+    int line, col;
     TCHAR buff[MAX_PATH];
+    DWORD dwStart, dwSize;
 
-    GetCaretPos(&point);
-    line = (int) SendMessage(Globals.hEdit, EM_LINEFROMCHAR, (WPARAM)-1, (LPARAM)0);
-    ccol = (int) SendMessage(Globals.hEdit, EM_CHARFROMPOS, (WPARAM)0, (LPARAM)MAKELPARAM(point.x, point.y));
-    ccol = LOWORD(ccol);
-    col = ccol - (int) SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, (LPARAM)0);
+    SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwSize);
+    line = SendMessage(Globals.hEdit, EM_LINEFROMCHAR, (WPARAM)dwStart, 0);
+    col  = dwStart - SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, 0);
 
-    _stprintf(buff, TEXT("%S %d, %S %d"), Globals.szStatusBarLine, line+1, Globals.szStatusBarCol, col+1);
+    _stprintf(buff, Globals.szStatusBarLineCol, line+1, col+1);
     SendMessage(Globals.hStatusBar, SB_SETTEXT, (WPARAM) SB_SIMPLEID, (LPARAM)buff);
 }
 
@@ -896,8 +892,7 @@ VOID DIALOG_ViewStatusBar(VOID)
    if ( !Globals.hStatusBar )
    {
        Globals.hStatusBar = CreateStatusWindow(WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE, TEXT("test"), Globals.hMainWnd, CMD_STATUSBAR_WND_ID );
-       LoadString(Globals.hInstance, STRING_LINE, Globals.szStatusBarLine, MAX_PATH-1);
-       LoadString(Globals.hInstance, STRING_COLUMN, Globals.szStatusBarCol, MAX_PATH-1);
+       LoadString(Globals.hInstance, STRING_LINE_COLUMN, Globals.szStatusBarLineCol, MAX_PATH-1);
        SendMessage(Globals.hStatusBar, SB_SIMPLE, (WPARAM)TRUE, (LPARAM)0);
    }
     CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_STATUSBAR,

diff --git a/reactos/base/applications/notepad/lang/bg-BG.rc b/reactos/base/applications/notepad/lang/bg-BG.rc
index cd46b09..20aa32c 100644 (file)
--- a/reactos/base/applications/notepad/lang/bg-BG.rc
+++ b/reactos/base/applications/notepad/lang/bg-BG.rc
@@ -201,4 +201,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Óüèíäîóüñ"
 STRING_LF,                                      "Þíèêñ"
 STRING_CR,                                      "Ìàê"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/cs-CZ.rc b/reactos/base/applications/notepad/lang/cs-CZ.rc
index e60e3e8..065f051 100644 (file)
--- a/reactos/base/applications/notepad/lang/cs-CZ.rc
+++ b/reactos/base/applications/notepad/lang/cs-CZ.rc
@@ -203,4 +203,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/da-DK.rc b/reactos/base/applications/notepad/lang/da-DK.rc
index 606c750..44ecfbc 100644 (file)
--- a/reactos/base/applications/notepad/lang/da-DK.rc
+++ b/reactos/base/applications/notepad/lang/da-DK.rc
@@ -200,4 +200,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/de-DE.rc b/reactos/base/applications/notepad/lang/de-DE.rc
index cd5a9e3..e64bd1c 100644 (file)
--- a/reactos/base/applications/notepad/lang/de-DE.rc
+++ b/reactos/base/applications/notepad/lang/de-DE.rc
@@ -202,4 +202,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Zeile %d, Spalte %d"
 END

diff --git a/reactos/base/applications/notepad/lang/el-GR.rc b/reactos/base/applications/notepad/lang/el-GR.rc
index 699a4d1..8be10f8 100644 (file)
--- a/reactos/base/applications/notepad/lang/el-GR.rc
+++ b/reactos/base/applications/notepad/lang/el-GR.rc
@@ -199,4 +199,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/en-US.rc b/reactos/base/applications/notepad/lang/en-US.rc
index d558543..c4c5607 100644 (file)
--- a/reactos/base/applications/notepad/lang/en-US.rc
+++ b/reactos/base/applications/notepad/lang/en-US.rc
@@ -201,4 +201,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/es-ES.rc b/reactos/base/applications/notepad/lang/es-ES.rc
index 5ce33aa..7d55f99 100644 (file)
--- a/reactos/base/applications/notepad/lang/es-ES.rc
+++ b/reactos/base/applications/notepad/lang/es-ES.rc
@@ -203,5 +203,6 @@ STRING_UTF8,                    "UTF-8"
 STRING_CRLF,                    "Windows"
 STRING_LF,                      "Unix"
 STRING_CR,                      "Mac"
+STRING_LINE_COLUMN,             "Line %d, column %d"
 
 END

diff --git a/reactos/base/applications/notepad/lang/eu-ES.rc b/reactos/base/applications/notepad/lang/eu-ES.rc
index ac22afe..819c1db 100644 (file)
--- a/reactos/base/applications/notepad/lang/eu-ES.rc
+++ b/reactos/base/applications/notepad/lang/eu-ES.rc
@@ -179,5 +179,5 @@ STRING_UTF8,                    "UTF-8"
 STRING_CRLF,                    "Windows"
 STRING_LF,                      "Unix"
 STRING_CR,                      "Mac"
-
+STRING_LINE_COLUMN,             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/fi-FI.rc b/reactos/base/applications/notepad/lang/fi-FI.rc
index 2e9dba2..13378c4 100644 (file)
--- a/reactos/base/applications/notepad/lang/fi-FI.rc
+++ b/reactos/base/applications/notepad/lang/fi-FI.rc
@@ -200,4 +200,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/fr-FR.rc b/reactos/base/applications/notepad/lang/fr-FR.rc
index 238190f..0e8eaaa 100644 (file)
--- a/reactos/base/applications/notepad/lang/fr-FR.rc
+++ b/reactos/base/applications/notepad/lang/fr-FR.rc
@@ -201,4 +201,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Ligne %d, colonne %d"
 END

diff --git a/reactos/base/applications/notepad/lang/hu-HU.rc b/reactos/base/applications/notepad/lang/hu-HU.rc
index 0e32ed5..86ba21d 100644 (file)
--- a/reactos/base/applications/notepad/lang/hu-HU.rc
+++ b/reactos/base/applications/notepad/lang/hu-HU.rc
@@ -202,4 +202,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/id-ID.rc b/reactos/base/applications/notepad/lang/id-ID.rc
index ed08968..59b5ef7 100644 (file)
--- a/reactos/base/applications/notepad/lang/id-ID.rc
+++ b/reactos/base/applications/notepad/lang/id-ID.rc
@@ -202,4 +202,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/it-IT.rc b/reactos/base/applications/notepad/lang/it-IT.rc
index 2da2f35..542f27d 100644 (file)
--- a/reactos/base/applications/notepad/lang/it-IT.rc
+++ b/reactos/base/applications/notepad/lang/it-IT.rc
@@ -204,4 +204,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Linea %d, colonna %d"
 END

diff --git a/reactos/base/applications/notepad/lang/ja-JP.rc b/reactos/base/applications/notepad/lang/ja-JP.rc
index 49cc5fd..03536de 100644 (file)
--- a/reactos/base/applications/notepad/lang/ja-JP.rc
+++ b/reactos/base/applications/notepad/lang/ja-JP.rc
@@ -201,4 +201,5 @@ STRING_UTF8,                          "UTF-8"
 STRING_CRLF,                          "Windows (CR+LF)"
 STRING_LF,                            "Unix (LF)"
 STRING_CR,                            "Mac (CR)"
+STRING_LINE_COLUMN,                   "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/lt-LT.rc b/reactos/base/applications/notepad/lang/lt-LT.rc
index 4779b0e..07d0b8d 100644 (file)
--- a/reactos/base/applications/notepad/lang/lt-LT.rc
+++ b/reactos/base/applications/notepad/lang/lt-LT.rc
@@ -202,4 +202,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/nl-NL.rc b/reactos/base/applications/notepad/lang/nl-NL.rc
index d7cdf9c..da4c8ad 100644 (file)
--- a/reactos/base/applications/notepad/lang/nl-NL.rc
+++ b/reactos/base/applications/notepad/lang/nl-NL.rc
@@ -198,4 +198,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/no-NO.rc b/reactos/base/applications/notepad/lang/no-NO.rc
index 79aaab8..5304657 100644 (file)
--- a/reactos/base/applications/notepad/lang/no-NO.rc
+++ b/reactos/base/applications/notepad/lang/no-NO.rc
@@ -201,4 +201,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/pl-PL.rc b/reactos/base/applications/notepad/lang/pl-PL.rc
index e267b04..a8355ff 100644 (file)
--- a/reactos/base/applications/notepad/lang/pl-PL.rc
+++ b/reactos/base/applications/notepad/lang/pl-PL.rc
@@ -207,4 +207,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/pt-PT.rc b/reactos/base/applications/notepad/lang/pt-PT.rc
index 046e481..4a5cae4 100644 (file)
--- a/reactos/base/applications/notepad/lang/pt-PT.rc
+++ b/reactos/base/applications/notepad/lang/pt-PT.rc
@@ -200,4 +200,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/ru-RU.rc b/reactos/base/applications/notepad/lang/ru-RU.rc
index a4d4d76..9524414 100644 (file)
--- a/reactos/base/applications/notepad/lang/ru-RU.rc
+++ b/reactos/base/applications/notepad/lang/ru-RU.rc
@@ -200,4 +200,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Ìàêèíòîø"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/sk-SK.rc b/reactos/base/applications/notepad/lang/sk-SK.rc
index cdedb92..fbf236f 100644 (file)
--- a/reactos/base/applications/notepad/lang/sk-SK.rc
+++ b/reactos/base/applications/notepad/lang/sk-SK.rc
@@ -189,4 +189,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/sl-SI.rc b/reactos/base/applications/notepad/lang/sl-SI.rc
index 98679e9..8c3c3a8 100644 (file)
--- a/reactos/base/applications/notepad/lang/sl-SI.rc
+++ b/reactos/base/applications/notepad/lang/sl-SI.rc
@@ -198,4 +198,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/sv-SE.rc b/reactos/base/applications/notepad/lang/sv-SE.rc
index 127dd63..4b54bbc 100644 (file)
--- a/reactos/base/applications/notepad/lang/sv-SE.rc
+++ b/reactos/base/applications/notepad/lang/sv-SE.rc
@@ -201,4 +201,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/th-TH.rc b/reactos/base/applications/notepad/lang/th-TH.rc
index 131075d..bdb359e 100644 (file)
--- a/reactos/base/applications/notepad/lang/th-TH.rc
+++ b/reactos/base/applications/notepad/lang/th-TH.rc
@@ -193,4 +193,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/uk-UA.rc b/reactos/base/applications/notepad/lang/uk-UA.rc
index c24d8cc..11cc718 100644 (file)
--- a/reactos/base/applications/notepad/lang/uk-UA.rc
+++ b/reactos/base/applications/notepad/lang/uk-UA.rc
@@ -198,4 +198,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/lang/zh-CN.rc b/reactos/base/applications/notepad/lang/zh-CN.rc
index bb2fcf2..fe179b7 100644 (file)
--- a/reactos/base/applications/notepad/lang/zh-CN.rc
+++ b/reactos/base/applications/notepad/lang/zh-CN.rc
@@ -199,4 +199,5 @@ STRING_UTF8,                                    "UTF-8"
 STRING_CRLF,                                    "Windows"
 STRING_LF,                                      "Unix"
 STRING_CR,                                      "Mac"
+STRING_LINE_COLUMN,                             "Line %d, column %d"
 END

diff --git a/reactos/base/applications/notepad/main.c b/reactos/base/applications/notepad/main.c
index 403fae3..4b94522 100644 (file)
--- a/reactos/base/applications/notepad/main.c
+++ b/reactos/base/applications/notepad/main.c
@@ -302,6 +302,7 @@ LRESULT CALLBACK EDIT_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 { 
     switch (msg)
     {
+        case WM_KEYDOWN:
         case WM_KEYUP:
         {
             switch (wParam)

diff --git a/reactos/base/applications/notepad/main.h b/reactos/base/applications/notepad/main.h
index 37477bc..180020f 100644 (file)
--- a/reactos/base/applications/notepad/main.h
+++ b/reactos/base/applications/notepad/main.h
@@ -61,8 +61,7 @@ typedef struct
   TCHAR      szMarginRight[MAX_PATH];
   TCHAR      szHeader[MAX_PATH];
   TCHAR      szFooter[MAX_PATH];
-  TCHAR      szStatusBarLine[MAX_PATH];
-  TCHAR      szStatusBarCol[MAX_PATH];
+  TCHAR      szStatusBarLineCol[MAX_PATH];
   int        iEncoding;
   int        iEoln;
 

diff --git a/reactos/base/applications/notepad/notepad_res.h b/reactos/base/applications/notepad/notepad_res.h
index 9d6d5cb..75fe6a6 100644 (file)
--- a/reactos/base/applications/notepad/notepad_res.h
+++ b/reactos/base/applications/notepad/notepad_res.h
@@ -101,5 +101,4 @@
 #define STRING_CR 0x184
 
 #define STRING_LICENSE 0x185
-#define STRING_LINE 0x186
-#define STRING_COLUMN 0x187
+#define STRING_LINE_COLUMN 0x186

diff --git a/reactos/base/applications/notepad/settings.c b/reactos/base/applications/notepad/settings.c
index 12e4159..d363c6e 100644 (file)
--- a/reactos/base/applications/notepad/settings.c
+++ b/reactos/base/applications/notepad/settings.c
@@ -112,7 +112,7 @@ void LoadSettings(void)
        base_length = (GetSystemMetrics(SM_CXSCREEN) > GetSystemMetrics(SM_CYSCREEN))?
                GetSystemMetrics(SM_CYSCREEN) : GetSystemMetrics(SM_CXSCREEN);
 
-       dx = base_length * .95;
+       dx = (INT)(base_length * .95);
        dy = dx * 3 / 4;
        SetRect( &Globals.main_rect, 0, 0, dx, dy );