vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Menu: Add input redirection verification in case we've forcefully changed menu input modes.

Browse source
This commit is contained in:
Marco Cawthorne 2020-09-29 14:24:21 +02:00
parent 8fab5921a0
commit 1a0193ad3a
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/menu-fn/entry.cpp
View file

@ -184,16 +184,25 @@ m_draw(vector screensize)
g_background = cvar("_background");
/* make sure input carries over when a map background is active */
if (g_background) {
setkeydest(KEY_MENU);
setmousetarget(TARGET_MENU);
setcursormode(TRUE, "gfx/cursor");
if (getkeydest() != KEY_MENU) {
setkeydest(KEY_MENU);
setmousetarget(TARGET_MENU);
setcursormode(TRUE, "gfx/cursor");
}
}
/* to prevent TCP timeouts */
menu_chatrooms_keepalive();
if (!g_active && !g_background) {
/* make sure we're redirecting input when the background's gone */
if (getkeydest() != KEY_GAME) {
setkeydest(KEY_GAME);
setmousetarget(TARGET_CLIENT);
setcursormode(FALSE);
}
return;
}

17
src/menu-vgui/main.cpp
View file

@ -65,13 +65,22 @@ void m_draw ( vector vecScreensize )
g_background = cvar("_background");
/* make sure input carries over when a map background is active */
if (g_background) {
setkeydest(KEY_MENU);
setmousetarget(TARGET_MENU);
setcursormode(TRUE, "gfx/cursor");
if (getkeydest() != KEY_MENU) {
setkeydest(KEY_MENU);
setmousetarget(TARGET_MENU);
setcursormode(TRUE, "gfx/cursor");
}
}
if ( !g_iMenuActive && !g_background ) {
if (!g_iMenuActive && !g_background) {
/* make sure we're redirecting input when the background's gone */
if (getkeydest() != KEY_GAME) {
setkeydest(KEY_GAME);
setmousetarget(TARGET_CLIENT);
setcursormode(FALSE);
}
return;
}