Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-31 00:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CONSRV]: Remove unused (anymore) ProcessKeyCallback support for terminal frontends.

Browse source 
svn path=/branches/condrv_restructure/; revision=63387
This commit is contained in:
Hermès Bélusca-Maïto 2014-05-20 19:56:47 +00:00
parent e4155c95c7
commit b1623c7976
6 changed files with 16 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1927,7 +1927,7 @@ ConWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
/* Detect Alt-Esc/Space/Tab presses defer to DefWindowProc */
if ( (HIWORD(lParam) & KF_ALTDOWN) && (wParam == VK_ESCAPE || wParam == VK_SPACE || wParam == VK_TAB))
{
return DefWindowProcW(hWnd, msg, wParam, lParam);
return DefWindowProcW(hWnd, msg, wParam, lParam);
}
OnKey(GuiData, msg, wParam, lParam);

20
win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
View file

@ -795,25 +795,6 @@ GuiReleaseScreenBuffer(IN OUT PFRONTEND This,
}
}
static BOOL NTAPI
GuiProcessKeyCallback(IN OUT PFRONTEND This,
MSG* msg,
BYTE KeyStateMenu,
DWORD ShiftState,
UINT VirtualKeyCode,
BOOL Down)
{
if ((ShiftState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED) || KeyStateMenu & 0x80) &&
(VirtualKeyCode == VK_ESCAPE || VirtualKeyCode == VK_TAB || VirtualKeyCode == VK_SPACE))
{
DPRINT1("GuiProcessKeyCallback\n");
//DefWindowProcW(msg->hwnd, msg->message, msg->wParam, msg->lParam);
//return TRUE;
}
return FALSE;
}
static BOOL NTAPI
GuiSetMouseCursor(IN OUT PFRONTEND This,
HCURSOR CursorHandle);
@ -1098,7 +1079,6 @@ static FRONTEND_VTBL GuiVtbl =
GuiResizeTerminal,
GuiSetActiveScreenBuffer,
GuiReleaseScreenBuffer,
GuiProcessKeyCallback,
GuiRefreshInternalInfo,
GuiChangeTitle,
GuiChangeIcon,

10
win32ss/user/winsrv/consrv/frontends/input.c
View file

@ -175,16 +175,6 @@ ConioProcessKey(PCONSOLE Console, MSG* msg)
UnicodeChar = (1 == RetChars ? Chars[0] : 0);
}
if (TermProcessKeyCallback(Console,
msg,
KeyState[VK_MENU],
ShiftState,
VirtualKeyCode,
Down))
{
return;
}
Fake = UnicodeChar &&
(msg->message != WM_CHAR && msg->message != WM_SYSCHAR &&
msg->message != WM_KEYUP && msg->message != WM_SYSKEYUP);

42
win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
View file

@ -276,6 +276,21 @@ TuiConsoleWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_KEYUP:
case WM_SYSKEYUP:
{
#if 0
if ((HIWORD(lParam) & KF_ALTDOWN) && wParam == VK_TAB)
{
// if ((HIWORD(lParam) & (KF_UP | KF_REPEAT)) != KF_REPEAT)
TuiSwapConsole(ShiftState & SHIFT_PRESSED ? -1 : 1);
break;
}
else if (wParam == VK_MENU /* && !Down */)
{
TuiSwapConsole(0);
break;
}
#endif
if (ConDrvValidateConsoleUnsafe(ActiveConsole->Console, CONSOLE_RUNNING, TRUE))
{
MSG Message;
@ -688,32 +703,6 @@ TuiResizeTerminal(IN OUT PFRONTEND This)
{
}
static BOOL NTAPI
TuiProcessKeyCallback(IN OUT PFRONTEND This,
MSG* msg,
BYTE KeyStateMenu,
DWORD ShiftState,
UINT VirtualKeyCode,
BOOL Down)
{
if (0 != (ShiftState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED)) &&
VK_TAB == VirtualKeyCode)
{
if (Down)
{
TuiSwapConsole(ShiftState & SHIFT_PRESSED ? -1 : 1);
}
return TRUE;
}
else if (VK_MENU == VirtualKeyCode && !Down)
{
return TuiSwapConsole(0);
}
return FALSE;
}
static VOID NTAPI
TuiRefreshInternalInfo(IN OUT PFRONTEND This)
{
@ -814,7 +803,6 @@ static FRONTEND_VTBL TuiVtbl =
TuiSetCursorInfo,
TuiSetScreenInfo,
TuiResizeTerminal,
TuiProcessKeyCallback,
TuiRefreshInternalInfo,
TuiChangeTitle,
TuiChangeIcon,

6
win32ss/user/winsrv/consrv/include/conio_winsrv.h
View file

@ -46,12 +46,6 @@ typedef struct _FRONTEND_VTBL
VOID (NTAPI *SetActiveScreenBuffer)(IN OUT PFRONTEND This);
VOID (NTAPI *ReleaseScreenBuffer)(IN OUT PFRONTEND This,
IN PCONSOLE_SCREEN_BUFFER ScreenBuffer);
BOOL (NTAPI *ProcessKeyCallback)(IN OUT PFRONTEND This,
MSG* msg,
BYTE KeyStateMenu,
DWORD ShiftState,
UINT VirtualKeyCode,
BOOL Down);
VOID (NTAPI *RefreshInternalInfo)(IN OUT PFRONTEND This);
/*

2
win32ss/user/winsrv/consrv/include/term.h
View file

@ -25,8 +25,6 @@
(Console)->TermIFace.Vtbl->SetActiveScreenBuffer(&(Console)->TermIFace)
#define TermReleaseScreenBuffer(Console, ScreenBuffer) \
(Console)->TermIFace.Vtbl->ReleaseScreenBuffer(&(Console)->TermIFace, (ScreenBuffer))
#define TermProcessKeyCallback(Console, Msg, KeyStateMenu, ShiftState, VirtualKeyCode, Down) \
(Console)->FrontEndIFace.Vtbl->ProcessKeyCallback(&(Console)->FrontEndIFace, (Msg), (KeyStateMenu), (ShiftState), (VirtualKeyCode), (Down))
#define TermRefreshInternalInfo(Console) \
(Console)->FrontEndIFace.Vtbl->RefreshInternalInfo(&(Console)->FrontEndIFace)