https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8dd3af6d317c0d73c2ef462fffedf4f36d110103
commit 8dd3af6d317c0d73c2ef462fffedf4f36d110103 Author: Hermès Bélusca-Maïto <[email protected]> AuthorDate: Sun Jul 16 17:50:14 2023 +0200 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Sun Jul 16 19:12:00 2023 +0200 [CONSRV] Mouse 'signal' --> mouse 'event' --- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c | 20 ++++++++++---------- win32ss/user/winsrv/consrv/frontends/gui/conwnd.h | 2 +- win32ss/user/winsrv/consrv/frontends/gui/guiterm.c | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c index d265711f261..12e14f9cec8 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c @@ -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 * mouse actions from the user that could spoil text selection or copy/pastes. */ if (ActivationState == WA_CLICKACTIVE) - GuiData->IgnoreNextMouseSignal = TRUE; + GuiData->IgnoreNextMouseEvent = TRUE; } 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 // to deal with the mouse. - if (GuiData->IgnoreNextMouseSignal) + if (GuiData->IgnoreNextMouseEvent) { if (msg != WM_LBUTTONDOWN && msg != WM_MBUTTONDOWN && @@ -1629,15 +1629,15 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam) 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. */ - GuiData->IgnoreNextMouseSignal = FALSE; + GuiData->IgnoreNextMouseEvent = FALSE; } else { /* - * This mouse signal is a button-down action. + * This mouse event is a button-down action. * Ignore it and perform default action. */ 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; UpdateSelection(GuiData, &cL, &cR); - /* Ignore the next mouse move signal */ - GuiData->IgnoreNextMouseSignal = TRUE; + /* Ignore the next mouse move event */ + GuiData->IgnoreNextMouseEvent = TRUE; #undef IS_WORD_SEP } @@ -1759,8 +1759,8 @@ OnMouse(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam) Copy(GuiData); } - /* Ignore the next mouse move signal */ - GuiData->IgnoreNextMouseSignal = TRUE; + /* Ignore the next mouse move event */ + GuiData->IgnoreNextMouseEvent = TRUE; break; } diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h index 6a5215fb693..826f3fa875d 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h +++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h @@ -69,7 +69,7 @@ typedef struct _GUI_CONSOLE_DATA /*** The following may be put per-screen-buffer !! ***/ 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. */ - 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. */ diff --git a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c index f272b57acf0..5b9cf9d8cdc 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c @@ -530,8 +530,8 @@ GuiInitFrontEnd(IN OUT PFRONTEND This, GuiData->hCursor = ghDefaultCursor; GuiData->MouseCursorRefCount = 0; - /* A priori don't ignore mouse signals */ - GuiData->IgnoreNextMouseSignal = FALSE; + /* A priori don't ignore mouse events */ + GuiData->IgnoreNextMouseEvent = FALSE; /* Initialize HACK FOR CORE-8394. See conwnd.c!OnMouse for more details. */ GuiData->HackCORE8394IgnoreNextMove = FALSE;
