zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-14 00:21:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Playing a demo in windowed mode no longer grabs the mouse.

Browse source 
SVN r487 (trunk)
This commit is contained in:
Randy Heit 2007-02-19 23:48:52 +00:00
parent 981afe2831
commit 99df21c901
4 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/rh-log.txt
View file

@ -1,3 +1,6 @@
February 19, 2007
- Fixed: Playing a demo in windowed mode no longer grabs the mouse.
February 14, 2007 February 14, 2007
- Added two new net commands: DEM_WIPEON and DEM_WIPEOFF. They keep track of - Added two new net commands: DEM_WIPEON and DEM_WIPEOFF. They keep track of
when a player is going through a screen wipe and act like a pause, so the when a player is going through a screen wipe and act like a pause, so the

2
src/sdl/i_input.cpp
View file

@ -284,7 +284,7 @@ static void I_CheckNativeMouse ()
== (SDL_APPINPUTFOCUS|SDL_APPACTIVE); == (SDL_APPINPUTFOCUS|SDL_APPACTIVE);
bool fs = (SDL_GetVideoSurface ()->flags & SDL_FULLSCREEN) != 0; bool fs = (SDL_GetVideoSurface ()->flags & SDL_FULLSCREEN) != 0;
bool wantNative = !focus || !use_mouse || (!fs && (GUICapture || paused)); bool wantNative = !focus || !use_mouse || (!fs && (GUICapture || paused || demoplayback));
if (wantNative != NativeMouse) if (wantNative != NativeMouse)
{ {

4
src/win32/i_input.cpp
View file

@ -418,7 +418,7 @@ static void I_CheckGUICapture ()
void I_CheckNativeMouse (bool preferNative) void I_CheckNativeMouse (bool preferNative)
{ {
bool wantNative = !HaveFocus || bool wantNative = !HaveFocus ||
((!screen || !screen->IsFullscreen()) && (GUICapture || paused || preferNative || !use_mouse)); ((!screen || !screen->IsFullscreen()) && (GUICapture || paused || preferNative || !use_mouse || demoplayback));
// Printf ("%d -> %d\n", NativeMouse, wantNative); // Printf ("%d -> %d\n", NativeMouse, wantNative);
if (wantNative != NativeMouse) if (wantNative != NativeMouse)
@ -470,7 +470,7 @@ LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
break; break;
case WM_PAINT: case WM_PAINT:
if (screen != NULL) if (screen != NULL && 0)
{ {
static_cast<BaseWinFB *> (screen)->PaintToWindow (); static_cast<BaseWinFB *> (screen)->PaintToWindow ();
} }

8
zdoom.sln
View file

@ -45,6 +45,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg-6b", "jpeg-6b\jpeg-6b.
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fixrtext", "tools\fixrtext\fixrtext.vcproj", "{DA47396F-60C1-4BDE-A977-7F7DE461CF77}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fixrtext", "tools\fixrtext\fixrtext.vcproj", "{DA47396F-60C1-4BDE-A977-7F7DE461CF77}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mediahelper", "mediahelper\mediahelper.vcproj", "{B775D890-D329-4173-9DBA-7361334A23FB}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
@ -145,6 +147,12 @@ Global
{DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Release|Win32.ActiveCfg = Release|Win32 {DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Release|Win32.ActiveCfg = Release|Win32
{DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Release|Win32.Build.0 = Release|Win32 {DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Release|Win32.Build.0 = Release|Win32
{DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Release|x64.ActiveCfg = Release|Win32 {DA47396F-60C1-4BDE-A977-7F7DE461CF77}.Release|x64.ActiveCfg = Release|Win32
{B775D890-D329-4173-9DBA-7361334A23FB}.Debug|Win32.ActiveCfg = Debug|Win32
{B775D890-D329-4173-9DBA-7361334A23FB}.Debug|Win32.Build.0 = Debug|Win32
{B775D890-D329-4173-9DBA-7361334A23FB}.Debug|x64.ActiveCfg = Debug|Win32
{B775D890-D329-4173-9DBA-7361334A23FB}.Release|Win32.ActiveCfg = Release|Win32
{B775D890-D329-4173-9DBA-7361334A23FB}.Release|Win32.Build.0 = Release|Win32
{B775D890-D329-4173-9DBA-7361334A23FB}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE