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] Mouse 'signal' --> mouse 'event'

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2023-07-16 17:50:14 +02:00
parent fa429c8e2f
commit 8dd3af6d31
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -747,12 +747,12 @@ OnActivate(PGUI_CONSOLE_DATA GuiData, WPARAM wParam)
} }
/* /*
* Ignore the next mouse signal when we are going to be enabled again via * Ignore the next mouse event when we are going to be enabled again via
* the mouse, in order to prevent, e.g. when we are in Edit mode, erroneous * the mouse, in order to prevent, e.g. when we are in Edit mode, erroneous
* mouse actions from the user that could spoil text selection or copy/pastes. * mouse actions from the user that could spoil text selection or copy/pastes.
*/ */
if (ActivationState == WA_CLICKACTIVE) if (ActivationState == WA_CLICKACTIVE)
GuiData->IgnoreNextMouseSignal = TRUE; GuiData->IgnoreNextMouseEvent = TRUE;
} }
static VOID static VOID
@ -1621,7 +1621,7 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
// and whether we are or not in edit mode, in order to know if we need // and whether we are or not in edit mode, in order to know if we need
// to deal with the mouse. // to deal with the mouse.
if (GuiData->IgnoreNextMouseSignal) if (GuiData->IgnoreNextMouseEvent)
{ {
if (msg != WM_LBUTTONDOWN && if (msg != WM_LBUTTONDOWN &&
msg != WM_MBUTTONDOWN && msg != WM_MBUTTONDOWN &&
@ -1629,15 +1629,15 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
msg != WM_XBUTTONDOWN) msg != WM_XBUTTONDOWN)
{ {
/* /*
* If this mouse signal is not a button-down action * If this mouse event is not a button-down action
* then this is the last one being ignored. * then this is the last one being ignored.
*/ */
GuiData->IgnoreNextMouseSignal = FALSE; GuiData->IgnoreNextMouseEvent = FALSE;
} }
else else
{ {
/* /*
* This mouse signal is a button-down action. * This mouse event is a button-down action.
* Ignore it and perform default action. * Ignore it and perform default action.
*/ */
DoDefault = TRUE; DoDefault = TRUE;
@ -1739,8 +1739,8 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
GuiData->Selection.dwFlags |= CONSOLE_MOUSE_SELECTION | CONSOLE_MOUSE_DOWN; GuiData->Selection.dwFlags |= CONSOLE_MOUSE_SELECTION | CONSOLE_MOUSE_DOWN;
UpdateSelection(GuiData, &cL, &cR); UpdateSelection(GuiData, &cL, &cR);
/* Ignore the next mouse move signal */ /* Ignore the next mouse move event */
GuiData->IgnoreNextMouseSignal = TRUE; GuiData->IgnoreNextMouseEvent = TRUE;
#undef IS_WORD_SEP #undef IS_WORD_SEP
} }
@ -1759,8 +1759,8 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam)
Copy(GuiData); Copy(GuiData);
} }
/* Ignore the next mouse move signal */ /* Ignore the next mouse move event */
GuiData->IgnoreNextMouseSignal = TRUE; GuiData->IgnoreNextMouseEvent = TRUE;
break; break;
} }

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

@ -69,7 +69,7 @@ typedef struct _GUI_CONSOLE_DATA
/*** The following may be put per-screen-buffer !! ***/ /*** The following may be put per-screen-buffer !! ***/
HCURSOR hCursor; /* Handle to the mouse cursor */ HCURSOR hCursor; /* Handle to the mouse cursor */
INT MouseCursorRefCount; /* The reference counter associated with the mouse cursor. >= 0 and the cursor is shown; < 0 and the cursor is hidden. */ INT MouseCursorRefCount; /* The reference counter associated with the mouse cursor. >= 0 and the cursor is shown; < 0 and the cursor is hidden. */
BOOL IgnoreNextMouseSignal; /* Used when we need to not process a mouse signal */ BOOL IgnoreNextMouseEvent; /* Used when we need to not process a mouse event */
BOOL HackCORE8394IgnoreNextMove; /* HACK FOR CORE-8394. See conwnd.c!OnMouse for more details. */ BOOL HackCORE8394IgnoreNextMove; /* HACK FOR CORE-8394. See conwnd.c!OnMouse for more details. */

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

@ -530,8 +530,8 @@ GuiInitFrontEnd(IN OUT PFRONTEND This,
GuiData->hCursor = ghDefaultCursor; GuiData->hCursor = ghDefaultCursor;
GuiData->MouseCursorRefCount = 0; GuiData->MouseCursorRefCount = 0;
/* A priori don't ignore mouse signals */ /* A priori don't ignore mouse events */
GuiData->IgnoreNextMouseSignal = FALSE; GuiData->IgnoreNextMouseEvent = FALSE;
/* Initialize HACK FOR CORE-8394. See conwnd.c!OnMouse for more details. */ /* Initialize HACK FOR CORE-8394. See conwnd.c!OnMouse for more details. */
GuiData->HackCORE8394IgnoreNextMove = FALSE; GuiData->HackCORE8394IgnoreNextMove = FALSE;