Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CONSRV]: GUI frontend: support the 3rd and 4th mouse button.

Browse source 
svn path=/trunk/; revision=67217
This commit is contained in:
Hermès Bélusca-Maïto 2015-04-16 23:08:19 +00:00
parent 3c22869668
commit e00d2e49be
1 changed files with 71 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1498,19 +1498,20 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
BOOL Err = FALSE; BOOL Err = FALSE;
PCONSRV_CONSOLE Console = GuiData->Console; PCONSRV_CONSOLE Console = GuiData->Console;
// FIXME: It's here that we need to check whether we has focus or not // FIXME: It's here that we need to check whether we have focus or not
// and whether we are in edit mode or not, to know if we need to deal // and whether we are or not in edit mode, in order to know if we need
// with the mouse, or not. // to deal with the mouse.
if (GuiData->IgnoreNextMouseSignal) if (GuiData->IgnoreNextMouseSignal)
{ {
if (msg != WM_LBUTTONDOWN && if (msg != WM_LBUTTONDOWN &&
msg != WM_MBUTTONDOWN && msg != WM_MBUTTONDOWN &&
msg != WM_RBUTTONDOWN) msg != WM_RBUTTONDOWN &&
msg != WM_XBUTTONDOWN)
{ {
/* /*
* If this mouse signal is not a button-down action * If this mouse signal is not a button-down action
* then it is the last signal being ignored. * then this is the last one being ignored.
*/ */
GuiData->IgnoreNextMouseSignal = FALSE; GuiData->IgnoreNextMouseSignal = FALSE;
} }
@ -1672,6 +1673,26 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
dwEventFlags = 0; dwEventFlags = 0;
break; break;
case WM_XBUTTONDOWN:
{
/* Get which X-button was pressed */
WORD wButton = GET_XBUTTON_WPARAM(wParam);
/* Check for X-button validity */
if (wButton & ~(XBUTTON1 | XBUTTON2))
{
DPRINT1("X-button 0x%04x invalid\n", wButton);
Err = TRUE;
break;
}
SetCapture(GuiData->hWindow);
dwButtonState = (wButton == XBUTTON1 ? FROM_LEFT_3RD_BUTTON_PRESSED
: FROM_LEFT_4TH_BUTTON_PRESSED);
dwEventFlags = 0;
break;
}
case WM_LBUTTONUP: case WM_LBUTTONUP:
ReleaseCapture(); ReleaseCapture();
dwButtonState = 0; dwButtonState = 0;
@ -1690,6 +1711,24 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
dwEventFlags = 0; dwEventFlags = 0;
break; break;
case WM_XBUTTONUP:
{
/* Get which X-button was released */
WORD wButton = GET_XBUTTON_WPARAM(wParam);
/* Check for X-button validity */
if (wButton & ~(XBUTTON1 | XBUTTON2))
{
DPRINT1("X-button 0x%04x invalid\n", wButton);
/* Ok, just release the button anyway... */
}
ReleaseCapture();
dwButtonState = 0;
dwEventFlags = 0;
break;
}
case WM_LBUTTONDBLCLK: case WM_LBUTTONDBLCLK:
dwButtonState = FROM_LEFT_1ST_BUTTON_PRESSED; dwButtonState = FROM_LEFT_1ST_BUTTON_PRESSED;
dwEventFlags = DOUBLE_CLICK; dwEventFlags = DOUBLE_CLICK;
@ -1705,6 +1744,25 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
dwEventFlags = DOUBLE_CLICK; dwEventFlags = DOUBLE_CLICK;
break; break;
case WM_XBUTTONDBLCLK:
{
/* Get which X-button was double-clicked */
WORD wButton = GET_XBUTTON_WPARAM(wParam);
/* Check for X-button validity */
if (wButton & ~(XBUTTON1 | XBUTTON2))
{
DPRINT1("X-button 0x%04x invalid\n", wButton);
Err = TRUE;
break;
}
dwButtonState = (wButton == XBUTTON1 ? FROM_LEFT_3RD_BUTTON_PRESSED
: FROM_LEFT_4TH_BUTTON_PRESSED);
dwEventFlags = DOUBLE_CLICK;
break;
}
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
dwButtonState = 0; dwButtonState = 0;
dwEventFlags = MOUSE_MOVED; dwEventFlags = MOUSE_MOVED;
@ -1734,6 +1792,7 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
case WM_MBUTTONDOWN: case WM_MBUTTONDOWN:
case WM_RBUTTONDOWN: case WM_RBUTTONDOWN:
case WM_XBUTTONDOWN:
GuiData->IgnoreNextMouseSignal = TRUE; GuiData->IgnoreNextMouseSignal = TRUE;
default: default:
break; break;
@ -1747,6 +1806,10 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
dwButtonState |= FROM_LEFT_2ND_BUTTON_PRESSED; dwButtonState |= FROM_LEFT_2ND_BUTTON_PRESSED;
if (wKeyState & MK_RBUTTON) if (wKeyState & MK_RBUTTON)
dwButtonState |= RIGHTMOST_BUTTON_PRESSED; dwButtonState |= RIGHTMOST_BUTTON_PRESSED;
if (wKeyState & MK_XBUTTON1)
dwButtonState |= FROM_LEFT_3RD_BUTTON_PRESSED;
if (wKeyState & MK_XBUTTON2)
dwButtonState |= FROM_LEFT_4TH_BUTTON_PRESSED;
if (GetKeyState(VK_RMENU) & 0x8000) if (GetKeyState(VK_RMENU) & 0x8000)
dwControlKeyState |= RIGHT_ALT_PRESSED; dwControlKeyState |= RIGHT_ALT_PRESSED;
@ -2263,12 +2326,15 @@ ConWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
case WM_MBUTTONDOWN: case WM_MBUTTONDOWN:
case WM_RBUTTONDOWN: case WM_RBUTTONDOWN:
case WM_XBUTTONDOWN:
case WM_LBUTTONUP: case WM_LBUTTONUP:
case WM_MBUTTONUP: case WM_MBUTTONUP:
case WM_RBUTTONUP: case WM_RBUTTONUP:
case WM_XBUTTONUP:
case WM_LBUTTONDBLCLK: case WM_LBUTTONDBLCLK:
case WM_MBUTTONDBLCLK: case WM_MBUTTONDBLCLK:
case WM_RBUTTONDBLCLK: case WM_RBUTTONDBLCLK:
case WM_XBUTTONDBLCLK:
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
case WM_MOUSEWHEEL: case WM_MOUSEWHEEL:
case WM_MOUSEHWHEEL: case WM_MOUSEHWHEEL: