Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 01:15:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CONSRV]

Browse source 
- Rename a macro to something meaningful.
- Localize selection type strings.

svn path=/trunk/; revision=63545
This commit is contained in:
Hermès Bélusca-Maïto 2014-06-06 21:05:59 +00:00
parent 0c2a513314
commit a06ec7042e
25 changed files with 178 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
View file

@ -731,8 +731,8 @@ UpdateSelection(PGUI_CONSOLE_DATA GuiData, PCOORD coord)
if ((GuiData->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) == 0)
{
LPWSTR SelectionType, WindowTitle = NULL;
SIZE_T Length = 0;
LPWSTR SelTypeStr = NULL , WindowTitle = NULL;
SIZE_T SelTypeStrLength = 0, Length = 0;
/* Clear the old selection */
if (GuiData->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY)
@ -740,21 +740,34 @@ UpdateSelection(PGUI_CONSOLE_DATA GuiData, PCOORD coord)
InvalidateRect(GuiData->hWindow, &oldRect, FALSE);
}
if (GuiData->Selection.dwFlags & CONSOLE_MOUSE_SELECTION)
{
SelectionType = L"Selection - ";
}
else
{
SelectionType = L"Mark - ";
}
/*
* When passing a zero-length buffer size, LoadString(...) returns
* a read-only pointer buffer to the program's resource string.
*/
SelTypeStrLength =
LoadStringW(ConSrvDllInstance,
(GuiData->Selection.dwFlags & CONSOLE_MOUSE_SELECTION)
? IDS_SELECT_TITLE : IDS_MARK_TITLE,
(LPWSTR)&SelTypeStr, 0);
Length = Console->Title.Length + wcslen(SelectionType) + 1;
WindowTitle = ConsoleAllocHeap(0, Length * sizeof(WCHAR));
wcscpy(WindowTitle, SelectionType);
wcscat(WindowTitle, Console->Title.Buffer);
SetWindowText(GuiData->hWindow, WindowTitle);
ConsoleFreeHeap(WindowTitle);
/*
* Prepend the selection type string to the current console title
* if we succeeded in retrieving a valid localized string.
*/
if (SelTypeStr)
{
// 3 for " - " and 1 for NULL
Length = Console->Title.Length + (SelTypeStrLength + 3 + 1) * sizeof(WCHAR);
WindowTitle = ConsoleAllocHeap(0, Length);
wcsncpy(WindowTitle, SelTypeStr, SelTypeStrLength);
WindowTitle[SelTypeStrLength] = L'\0';
wcscat(WindowTitle, L" - ");
wcscat(WindowTitle, Console->Title.Buffer);
SetWindowText(GuiData->hWindow, WindowTitle);
ConsoleFreeHeap(WindowTitle);
}
GuiData->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS;
ConioPause(Console, PAUSED_FROM_SELECTION);
@ -771,6 +784,7 @@ UpdateSelection(PGUI_CONSOLE_DATA GuiData, PCOORD coord)
GuiData->Selection.dwFlags = CONSOLE_NO_SELECTION;
ConioUnpause(Console, PAUSED_FROM_SELECTION);
/* Restore the console title */
SetWindowText(GuiData->hWindow, Console->Title.Buffer);
}
}
@ -1305,10 +1319,7 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
if (GetType(Buffer) == TEXTMODE_BUFFER)
{
#ifdef IS_WHITESPACE
#undef IS_WHITESPACE
#endif
#define IS_WHITESPACE(c) \
#define IS_WORD_SEP(c) \
((c) == L'\0' || (c) == L' ' || (c) == L'\t' || (c) == L'\r' || (c) == L'\n')
PTEXTMODE_SCREEN_BUFFER TextBuffer = (PTEXTMODE_SCREEN_BUFFER)Buffer;
@ -1320,15 +1331,15 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
ptrL = ptrR = ConioCoordToPointer(TextBuffer, cL.X, cL.Y);
/* Enlarge the selection by checking for whitespace */
while ((0 < cL.X) && !IS_WHITESPACE(ptrL->Char.UnicodeChar)
&& !IS_WHITESPACE((ptrL-1)->Char.UnicodeChar))
while ((0 < cL.X) && !IS_WORD_SEP(ptrL->Char.UnicodeChar)
&& !IS_WORD_SEP((ptrL-1)->Char.UnicodeChar))
{
--cL.X;
--ptrL;
}
while ((cR.X < TextBuffer->ScreenBufferSize.X - 1) &&
!IS_WHITESPACE(ptrR->Char.UnicodeChar) &&
!IS_WHITESPACE((ptrR+1)->Char.UnicodeChar))
!IS_WORD_SEP(ptrR->Char.UnicodeChar) &&
!IS_WORD_SEP((ptrR+1)->Char.UnicodeChar))
{
++cR.X;
++ptrR;

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc
View file

@ -22,3 +22,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc
View file

@ -24,3 +24,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc
View file

@ -22,3 +22,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Eingabeaufforderung"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/el-GR.rc
View file

@ -22,3 +22,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc
View file

@ -22,3 +22,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/es-ES.rc
View file

@ -24,3 +24,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc
View file

@ -24,3 +24,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Marquage"
IDS_SELECT_TITLE "Sélection"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/he-IL.rc
View file

@ -22,3 +22,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/id-ID.rc
View file

@ -22,3 +22,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc
View file

@ -24,3 +24,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc
View file

@ -22,3 +22,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/no-NO.rc
View file

@ -22,3 +22,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pl-PL.rc
View file

@ -30,3 +30,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "Konsola ReactOS"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pt-BR.rc
View file

@ -24,3 +24,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc
View file

@ -24,3 +24,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "Consola ReactOS"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc
View file

@ -22,3 +22,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sk-SK.rc
View file

@ -27,3 +27,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc
View file

@ -24,3 +24,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc
View file

@ -24,3 +24,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc
View file

@ -24,3 +24,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc
View file

@ -22,3 +22,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

6
reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-TW.rc
View file

@ -22,3 +22,9 @@ BEGIN
*/
IDS_TERMINAL_TITLE "ReactOS Console"
END
STRINGTABLE
BEGIN
IDS_MARK_TITLE "Mark"
IDS_SELECT_TITLE "Select"
END

21
reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h
View file

@ -18,17 +18,18 @@
#define ID_SYSTEM_DEFAULTS 0xFFF6
#define ID_SYSTEM_PROPERTIES 0xFFF7
#define NCPOPUP_MENU 103
#define IDS_EDIT 204
#define IDS_MARK 205
#define IDS_COPY 206
#define IDS_PASTE 207
#define IDS_SELECTALL 208
#define IDS_SCROLL 209
#define IDS_FIND 210
#define IDS_DEFAULTS 211
#define IDS_PROPERTIES 212
#define IDS_EDIT 204
#define IDS_MARK 205
#define IDS_COPY 206
#define IDS_PASTE 207
#define IDS_SELECTALL 208
#define IDS_SCROLL 209
#define IDS_FIND 210
#define IDS_DEFAULTS 211
#define IDS_PROPERTIES 212
#define IDS_MARK_TITLE 220
#define IDS_SELECT_TITLE 221
// Scrollbar resource ids. Unused.
/*

3
reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c
View file

@ -59,9 +59,6 @@ GuiCopyFromTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer,
GuiData->Selection.srSelection.Right,
GuiData->Selection.srSelection.Bottom);
#ifdef IS_WHITESPACE
#undef IS_WHITESPACE
#endif
#define IS_WHITESPACE(c) ((c) == L'\0' || (c) == L' ' || (c) == L'\t')
/* Basic size for one line... */