Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:32:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CONSRV]: Code formatting only.

Browse source 
svn path=/branches/condrv_restructure/; revision=63990
This commit is contained in:
Hermès Bélusca-Maïto 2014-08-30 15:59:35 +00:00
parent e3e54a09b3
commit ccaa07fecf
1 changed files with 190 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

53
win32ss/user/winsrv/consrv/lineinput.c
View file

@ -165,7 +165,6 @@ LineInputKeyDown(PCONSRV_CONSOLE Console,
{ {
UINT Pos = Console->LinePos; UINT Pos = Console->LinePos;
UNICODE_STRING Entry; UNICODE_STRING Entry;
// INT HistPos;
/* /*
* First, deal with control keys... * First, deal with control keys...
@ -174,24 +173,34 @@ LineInputKeyDown(PCONSRV_CONSOLE Console,
switch (KeyEvent->wVirtualKeyCode) switch (KeyEvent->wVirtualKeyCode)
{ {
case VK_ESCAPE: case VK_ESCAPE:
{
/* Clear entire line */ /* Clear entire line */
LineInputSetPos(Console, 0); LineInputSetPos(Console, 0);
LineInputEdit(Console, Console->LineSize, 0, NULL); LineInputEdit(Console, Console->LineSize, 0, NULL);
return; return;
}
case VK_HOME: case VK_HOME:
{
/* Move to start of line. With CTRL, erase everything left of cursor */ /* Move to start of line. With CTRL, erase everything left of cursor */
LineInputSetPos(Console, 0); LineInputSetPos(Console, 0);
if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED))
LineInputEdit(Console, Pos, 0, NULL); LineInputEdit(Console, Pos, 0, NULL);
return; return;
}
case VK_END: case VK_END:
{
/* Move to end of line. With CTRL, erase everything right of cursor */ /* Move to end of line. With CTRL, erase everything right of cursor */
if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED))
LineInputEdit(Console, Console->LineSize - Pos, 0, NULL); LineInputEdit(Console, Console->LineSize - Pos, 0, NULL);
else else
LineInputSetPos(Console, Console->LineSize); LineInputSetPos(Console, Console->LineSize);
return; return;
}
case VK_LEFT: case VK_LEFT:
{
/* Move left. With CTRL, move to beginning of previous word */ /* Move left. With CTRL, move to beginning of previous word */
if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED))
{ {
@ -204,8 +213,11 @@ LineInputKeyDown(PCONSRV_CONSOLE Console,
} }
LineInputSetPos(Console, Pos); LineInputSetPos(Console, Pos);
return; return;
}
case VK_RIGHT: case VK_RIGHT:
case VK_F1: case VK_F1:
{
/* Move right. With CTRL, move to beginning of next word */ /* Move right. With CTRL, move to beginning of next word */
if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED))
{ {
@ -223,26 +235,41 @@ LineInputKeyDown(PCONSRV_CONSOLE Console,
LineInputEdit(Console, 0, 1, &Entry.Buffer[Pos]); LineInputEdit(Console, 0, 1, &Entry.Buffer[Pos]);
} }
return; return;
}
case VK_INSERT: case VK_INSERT:
{
/* Toggle between insert and overstrike */ /* Toggle between insert and overstrike */
Console->LineInsertToggle = !Console->LineInsertToggle; Console->LineInsertToggle = !Console->LineInsertToggle;
TermSetCursorInfo(Console, Console->ActiveBuffer); TermSetCursorInfo(Console, Console->ActiveBuffer);
return; return;
}
case VK_DELETE: case VK_DELETE:
{
/* Remove character to right of cursor */ /* Remove character to right of cursor */
if (Pos != Console->LineSize) if (Pos != Console->LineSize)
LineInputEdit(Console, 1, 0, NULL); LineInputEdit(Console, 1, 0, NULL);
return; return;
}
case VK_PRIOR: case VK_PRIOR:
{
/* Recall first history entry */ /* Recall first history entry */
LineInputRecallHistory(Console, ExeName, -((WORD)-1)); LineInputRecallHistory(Console, ExeName, -((WORD)-1));
return; return;
}
case VK_NEXT: case VK_NEXT:
{
/* Recall last history entry */ /* Recall last history entry */
LineInputRecallHistory(Console, ExeName, +((WORD)-1)); LineInputRecallHistory(Console, ExeName, +((WORD)-1));
return; return;
}
case VK_UP: case VK_UP:
case VK_F5: case VK_F5:
{
/* /*
* Recall previous history entry. On first time, actually recall the * Recall previous history entry. On first time, actually recall the
* current (usually last) entry; on subsequent times go back. * current (usually last) entry; on subsequent times go back.
@ -250,11 +277,17 @@ LineInputKeyDown(PCONSRV_CONSOLE Console,
LineInputRecallHistory(Console, ExeName, Console->LineUpPressed ? -1 : 0); LineInputRecallHistory(Console, ExeName, Console->LineUpPressed ? -1 : 0);
Console->LineUpPressed = TRUE; Console->LineUpPressed = TRUE;
return; return;
}
case VK_DOWN: case VK_DOWN:
{
/* Recall next history entry */ /* Recall next history entry */
LineInputRecallHistory(Console, ExeName, +1); LineInputRecallHistory(Console, ExeName, +1);
return; return;
}
case VK_F3: case VK_F3:
{
/* Recall remainder of current history entry */ /* Recall remainder of current history entry */
HistoryGetCurrentEntry(Console, ExeName, &Entry); HistoryGetCurrentEntry(Console, ExeName, &Entry);
if (Pos * sizeof(WCHAR) < Entry.Length) if (Pos * sizeof(WCHAR) < Entry.Length)
@ -264,16 +297,23 @@ LineInputKeyDown(PCONSRV_CONSOLE Console,
LineInputEdit(Console, DeleteSize, InsertSize, &Entry.Buffer[Pos]); LineInputEdit(Console, DeleteSize, InsertSize, &Entry.Buffer[Pos]);
} }
return; return;
}
case VK_F6: case VK_F6:
{
/* Insert a ^Z character */ /* Insert a ^Z character */
KeyEvent->uChar.UnicodeChar = 26; KeyEvent->uChar.UnicodeChar = 26;
break; break;
}
case VK_F7: case VK_F7:
{
if (KeyEvent->dwControlKeyState & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) if (KeyEvent->dwControlKeyState & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED))
HistoryDeleteCurrentBuffer(Console, ExeName); HistoryDeleteCurrentBuffer(Console, ExeName);
return; return;
case VK_F8: }
case VK_F8:
{ {
UNICODE_STRING EntryFound; UNICODE_STRING EntryFound;
@ -288,9 +328,13 @@ LineInputKeyDown(PCONSRV_CONSOLE Console,
/* Cursor stays where it was */ /* Cursor stays where it was */
LineInputSetPos(Console, Pos); LineInputSetPos(Console, Pos);
} }
return;
} }
#if 0 #if 0
{
PHISTORY_BUFFER Hist; PHISTORY_BUFFER Hist;
INT HistPos;
/* Search for history entries starting with input. */ /* Search for history entries starting with input. */
Hist = HistoryCurrentBuffer(Console, ExeName); Hist = HistoryCurrentBuffer(Console, ExeName);
@ -326,6 +370,9 @@ LineInputKeyDown(PCONSRV_CONSOLE Console,
} }
if (--HistPos < 0) HistPos += Hist->NumEntries; if (--HistPos < 0) HistPos += Hist->NumEntries;
} while (HistPos != Hist->Position); } while (HistPos != Hist->Position);
return;
}
#endif #endif
return; return;
@ -333,7 +380,7 @@ LineInputKeyDown(PCONSRV_CONSOLE Console,
/* /*
* OK, we can continue... * OK, we deal with normal keys, we can continue...
*/ */
if (KeyEvent->uChar.UnicodeChar == L'\b' && Console->InputBuffer.Mode & ENABLE_PROCESSED_INPUT) if (KeyEvent->uChar.UnicodeChar == L'\b' && Console->InputBuffer.Mode & ENABLE_PROCESSED_INPUT)