From 4181b1dff68e901e5ac73f7464d7df474cad96bc Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 25 Mar 2025 19:57:02 +0100 Subject: [PATCH] add onchange for "alwaysgrabmouse" --- src/m_menu.c | 2 +- src/sdl/i_video.c | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 94b0bbe98..edf53662e 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3209,7 +3209,7 @@ menu_t OP_ChatOptionsDef = DEFAULTMENUSTYLE("M_HUD", OP_ChatOptionsMenu, &OP_HUD menu_t OP_SoundAdvancedDef = DEFAULTMENUSTYLE("M_SOUND", OP_SoundAdvancedMenu, &OP_SoundOptionsDef, 30, 30); -menu_t OP_FocusOptionsDef = DEFAULTMENUSTYLE(NULL, OP_FocusOptionsMenu, &OP_MainDef, 30, 30); +menu_t OP_FocusOptionsDef = DEFAULTMENUSTYLE(NULL, OP_FocusOptionsMenu, &OP_MainDef, 10, 30); menu_t OP_GameOptionsDef = DEFAULTMENUSTYLE("M_GAME", OP_GameOptionsMenu, &OP_MainDef, 30, 20); menu_t OP_ServerOptionsDef = DEFAULTMENUSTYLE("M_SERVER", OP_ServerOptionsMenu, &OP_MainDef, 24, 20); diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index adf0441e8..555cdc968 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -140,7 +140,8 @@ static void I_ResetFBOSurface(void); consvar_t cv_vidwait = {"vid_wait", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Impl_SetVsync, 0, NULL, NULL, 0, 0, NULL}; static consvar_t cv_stretch = {"stretch", "Off", CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_alwaysgrabmouse = {"alwaysgrabmouse", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +static void mousegrabOnChange(void); +consvar_t cv_alwaysgrabmouse = {"alwaysgrabmouse", "Off", CV_SAVE|CV_CALL, CV_OnOff, mousegrabOnChange, 0, NULL, NULL, 0, 0, NULL}; // these cant be used since config is read after window creation, so need to use command line parameter instead //static CV_PossibleValue_t msaa_cons_t[] = {{0, "Off"}, {2, "2X"}, {4, "4X"}, {8, "8X"}, {16, "16X"}, {0, NULL}}; @@ -226,6 +227,9 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen); //static void Impl_SetWindowName(const char *title); static void Impl_SetWindowIcon(void); +static void SDLdoGrabMouse(void); +static void SDLdoUngrabMouse(void); + #ifdef USE_FBO_OGL boolean downsample = false; @@ -239,6 +243,23 @@ void RefreshOGLSDLSurface(void) } #endif +static void mousegrabOnChange(void) +{ + static SDL_bool firsttimeonmouse = SDL_TRUE; + + if (!firsttimeonmouse) + { + HalfWarpMouse(realwidth, realheight); // warp to center + } + else + firsttimeonmouse = SDL_FALSE; + + if (cv_usemouse.value || cv_alwaysgrabmouse.value) + SDLdoGrabMouse(); + else + SDLdoUngrabMouse(); +} + static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen) { static SDL_bool wasfullscreen = SDL_FALSE;