cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2024-11-10 06:31:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

updated mouse input for better grab (de-)activation and fixed window dragging

Browse source
This commit is contained in:
myT 2017-03-07 23:09:17 +01:00
parent e567ed84d0
commit 84ae1e4d9e
3 changed files with 46 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
code/win32/win_input.cpp
View file

@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
struct Mouse {
virtual qbool Init() { return qtrue; }
virtual qbool Activate( qbool active );
virtual void OnWindowMoved() {}
virtual void Shutdown() {}
virtual void Read( int* mx, int* my ) = 0;
virtual qbool ProcessMessage( UINT msg, WPARAM wParam, LPARAM lParam ) { return qfalse; } // returns true if the event was handled
@ -171,35 +172,49 @@ qbool rawmouse_t::ProcessMessage( UINT msg, WPARAM wParam, LPARAM lParam )
struct winmouse_t : public Mouse {
virtual qbool Activate( qbool active );
virtual void OnWindowMoved();
virtual void Read( int* mx, int* my );
virtual qbool ProcessMessage( UINT msg, WPARAM wParam, LPARAM lParam );
void UpdateWindowCenter();
int window_center_x, window_center_y;
};
static winmouse_t winmouse;
qbool winmouse_t::Activate( qbool active )
void winmouse_t::UpdateWindowCenter()
{
if (!active)
return qtrue;
int sw = GetSystemMetrics(SM_CXSCREEN);
int sh = GetSystemMetrics(SM_CYSCREEN);
const int sw = GetSystemMetrics( SM_CXSCREEN );
const int sh = GetSystemMetrics( SM_CYSCREEN );
RECT rc;
GetWindowRect( g_wv.hWnd, &rc );
window_center_x = ( max(rc.left, 0) + min(rc.right, sw) ) / 2;
window_center_y = ( max(rc.top, 0) + min(rc.bottom, sh) ) / 2;
window_center_x = ( max(rc.left, 0) + min(rc.right, sw) ) / 2;
window_center_y = ( max(rc.top, 0) + min(rc.bottom, sh) ) / 2;
}
qbool winmouse_t::Activate(qbool active)
{
if (!active)
return qtrue;
UpdateWindowCenter();
SetCursorPos( window_center_x, window_center_y );
return qtrue;
}
void winmouse_t::OnWindowMoved()
{
UpdateWindowCenter();
}
void winmouse_t::Read( int* mx, int* my )
{
POINT p;
@ -363,6 +378,21 @@ void IN_Activate( qbool active )
}
void IN_WindowMoved()
{
if (!mouse)
return;
mouse->OnWindowMoved();
}
qbool IN_ShouldBeActive()
{
return g_wv.activeApp && (!(cls.keyCatchers & KEYCATCH_CONSOLE) || Cvar_VariableIntegerValue("r_fullscreen"));
}
// called every frame, even if not generating commands
void IN_Frame()
@ -372,18 +402,12 @@ void IN_Frame()
if (!mouse)
return;
if (cls.keyCatchers & KEYCATCH_CONSOLE) {
// temporarily deactivate if not in the game and running on the desktop
if (!Cvar_VariableValue("r_fullscreen")) {
IN_Activate( qfalse );
return;
}
if (!IN_ShouldBeActive()) {
IN_Activate( qfalse );
return;
}
// this should really only happen on actual focus changes
// but is needed to compensate for the console+windowed hack
if (g_wv.activeApp)
IN_Activate( qtrue );
IN_Activate( qtrue );
int mx, my;
mouse->Read( &mx, &my );

2
code/win32/win_local.h
View file

@ -34,6 +34,8 @@ void Conbuf_AppendText( const char *msg );
void IN_Init();
void IN_Activate( qbool active );
void IN_WindowMoved();
qbool IN_ShouldBeActive();
qbool IN_ProcessMessage( UINT msg, WPARAM wParam, LPARAM lParam ); // returns true if the event was handled
void IN_Frame();
void IN_Shutdown();

6
code/win32/win_wndproc.cpp
View file

@ -88,8 +88,7 @@ static void VID_AppActivate( BOOL fActive, BOOL minimize )
WIN_UpdateHardwareGammaRamp( g_wv.activeApp );
// minimize/restore mouse-capture on demand
IN_Activate( g_wv.activeApp );
IN_Activate( IN_ShouldBeActive() );
}
@ -290,10 +289,9 @@ LRESULT CALLBACK MainWndProc (
Cvar_SetValue( "vid_ypos", y + r.top - monRect.top );
vid_xpos->modified = qfalse;
vid_ypos->modified = qfalse;
// @TODO: fix this broken mess
if ( g_wv.activeApp )
{
IN_Activate (qtrue);
IN_WindowMoved();
}
}
}