Skip to content

tweak(menu): Show mouse and menu immediately when shellmap is disabled #2356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 7 commits into from
Feb 28, 2026
Merged

tweak(menu): Show mouse and menu immediately when shellmap is disabled #2356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7f60d97
Fixed initialization logic.
Caball009 Feb 26, 2026
0e68540
Removed unnecessary 'notShown' checks.
Caball009 Feb 26, 2026
2a78731
Changed break statement, blank lines and case separation.
Caball009 Feb 26, 2026
6ddf90f
Merge branch 'main' into immediate-mouse-enable-main-menu-followup
Caball009 Feb 26, 2026
b99654d
Removed debug log call.
Caball009 Feb 26, 2026
b99218e
Changed variable name.
Caball009 Feb 27, 2026
e81b768
Replicated in Generals.
Caball009 Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 24 additions & 30 deletions Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,47 +895,30 @@ void MainMenuUpdate( WindowLayout *layout, void *userData )
WindowMsgHandledType MainMenuInput( GameWindow *window, UnsignedInt msg,
WindowMsgData mData1, WindowMsgData mData2 )
{

if(!notShown)
return MSG_IGNORED;

switch( msg )
{

// --------------------------------------------------------------------------------------------
case GWM_MOUSE_POS:
{
ICoord2D mouse;
mouse.x = mData1 & 0xFFFF;
mouse.y = mData1 >> 16;
// TheSuperHackers @tweak 26/02/2026 Show mouse and menu immediately when shellmap is disabled.
Bool doShow = !TheGlobalData->m_shellMapOn;

// TheSuperHackers @tweak 20/08/2025 Show mouse and menu immediately when shellmap is disabled.
if (TheGlobalData->m_shellMapOn && mouse.x == 0 && mouse.y == 0)
break;

static Int mousePosX = mouse.x;
static Int mousePosY = mouse.y;
if(abs(mouse.x - mousePosX) > 20 || abs(mouse.y - mousePosY) > 20)
if (!doShow)
{
ICoord2D mouse;
mouse.x = mData1 & 0xFFFF;
mouse.y = mData1 >> 16;

DEBUG_LOG(("Mouse X:%d, Y:%d", mouse.x, mouse.y));
if(notShown)
{
initialGadgetDelay = 1;
dropDownWindows[DROPDOWN_MAIN]->winHide(FALSE);
TheTransitionHandler->setGroup("MainMenuFade", TRUE);
TheTransitionHandler->setGroup("MainMenuDefaultMenu");
TheMouse->setVisibility(TRUE);
notShown = FALSE;
return MSG_HANDLED;
}
static Int mousePosX = mouse.x;
static Int mousePosY = mouse.y;

doShow = abs(mouse.x - mousePosX) > 20 || abs(mouse.y - mousePosY) > 20;
}

}
break;
case GWM_CHAR:
{
if(notShown)
if (doShow)
{
initialGadgetDelay = 1;
dropDownWindows[DROPDOWN_MAIN]->winHide(FALSE);
Expand All @@ -946,14 +929,25 @@ WindowMsgHandledType MainMenuInput( GameWindow *window, UnsignedInt msg,
return MSG_HANDLED;
}

break;
}

// --------------------------------------------------------------------------------------------
case GWM_CHAR:
{
initialGadgetDelay = 1;
dropDownWindows[DROPDOWN_MAIN]->winHide(FALSE);
TheTransitionHandler->setGroup("MainMenuFade", TRUE);
TheTransitionHandler->setGroup("MainMenuDefaultMenu");
TheMouse->setVisibility(TRUE);
notShown = FALSE;
return MSG_HANDLED;
}
}


return MSG_IGNORED;

}

void PrintOffsetsFromControlBarParent();
//-------------------------------------------------------------------------------------------------
/** Main menu window system callback */
Expand Down
54 changes: 24 additions & 30 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,47 +932,30 @@ void MainMenuUpdate( WindowLayout *layout, void *userData )
WindowMsgHandledType MainMenuInput( GameWindow *window, UnsignedInt msg,
WindowMsgData mData1, WindowMsgData mData2 )
{

if(!notShown)
return MSG_IGNORED;

switch( msg )
{

// --------------------------------------------------------------------------------------------
case GWM_MOUSE_POS:
{
ICoord2D mouse;
mouse.x = mData1 & 0xFFFF;
mouse.y = mData1 >> 16;
// TheSuperHackers @tweak 26/02/2026 Show mouse and menu immediately when shellmap is disabled.
Bool doShow = !TheGlobalData->m_shellMapOn;

// TheSuperHackers @tweak 20/08/2025 Show mouse and menu immediately when shellmap is disabled.
if (TheGlobalData->m_shellMapOn && mouse.x == 0 && mouse.y == 0)
break;

static Int mousePosX = mouse.x;
static Int mousePosY = mouse.y;
if(abs(mouse.x - mousePosX) > 20 || abs(mouse.y - mousePosY) > 20)
if (!doShow)
{
ICoord2D mouse;
mouse.x = mData1 & 0xFFFF;
mouse.y = mData1 >> 16;

DEBUG_LOG(("Mouse X:%d, Y:%d", mouse.x, mouse.y));
if(notShown)
{
initialGadgetDelay = 1;
dropDownWindows[DROPDOWN_MAIN]->winHide(FALSE);
TheTransitionHandler->setGroup("MainMenuFade", TRUE);
TheTransitionHandler->setGroup("MainMenuDefaultMenu");
TheMouse->setVisibility(TRUE);
notShown = FALSE;
return MSG_HANDLED;
}
static Int mousePosX = mouse.x;
static Int mousePosY = mouse.y;

doShow = abs(mouse.x - mousePosX) > 20 || abs(mouse.y - mousePosY) > 20;
}

}
break;
case GWM_CHAR:
{
if(notShown)
if (doShow)
{
initialGadgetDelay = 1;
dropDownWindows[DROPDOWN_MAIN]->winHide(FALSE);
Expand All @@ -983,14 +966,25 @@ WindowMsgHandledType MainMenuInput( GameWindow *window, UnsignedInt msg,
return MSG_HANDLED;
}

break;
}

// --------------------------------------------------------------------------------------------
case GWM_CHAR:
{
initialGadgetDelay = 1;
dropDownWindows[DROPDOWN_MAIN]->winHide(FALSE);
TheTransitionHandler->setGroup("MainMenuFade", TRUE);
TheTransitionHandler->setGroup("MainMenuDefaultMenu");
TheMouse->setVisibility(TRUE);
notShown = FALSE;
return MSG_HANDLED;
}
}


return MSG_IGNORED;

}

void PrintOffsetsFromControlBarParent();
//-------------------------------------------------------------------------------------------------
/** Main menu window system callback */
Expand Down
Loading