Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Use software cursor with attached display

Browse source 
--HG--
branch : multipass-stereo
This commit is contained in:
kaetemi 2014-08-07 19:45:26 +02:00
parent 38abf2193f
commit 93376226c4
5 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/ryzom/client/src/connection.cpp
View file

@ -223,7 +223,7 @@ void connectionRestaureVideoMode ()
} }
// And setup hardware mouse if we have to // And setup hardware mouse if we have to
InitMouseWithCursor (ClientCfg.HardwareCursor); InitMouseWithCursor (ClientCfg.HardwareCursor && !StereoDisplayAttached);
SetMouseFreeLook (); SetMouseFreeLook ();
SetMouseCursor (); SetMouseCursor ();
SetMouseSpeed (ClientCfg.CursorSpeed); SetMouseSpeed (ClientCfg.CursorSpeed);
@ -278,6 +278,8 @@ void setOutGameFullScreen()
{ {
setVideoMode(wantedMode); setVideoMode(wantedMode);
} }
InitMouseWithCursor(ClientCfg.HardwareCursor && !StereoDisplayAttached);
/* /*
InitMouseWithCursor (true); InitMouseWithCursor (true);
Driver->showCursor(false); Driver->showCursor(false);
@ -396,7 +398,7 @@ bool connection (const string &cookie, const string &fsaddr)
// not initialized at login and remain hardware until here ... // not initialized at login and remain hardware until here ...
// Re-initialise the mouse (will be now in hardware mode, if required) // Re-initialise the mouse (will be now in hardware mode, if required)
//InitMouseWithCursor (ClientCfg.HardwareCursor); // the return value of enableLowLevelMouse() has already been tested at startup //InitMouseWithCursor (ClientCfg.HardwareCursor && !StereoDisplayAttached); // the return value of enableLowLevelMouse() has already been tested at startup
// no ui init if character selection is automatic // no ui init if character selection is automatic
//SetMouseFreeLook (); //SetMouseFreeLook ();
@ -556,7 +558,7 @@ bool reconnection()
{ {
// Re-initialise the mouse (will be now in hardware mode, if required) // Re-initialise the mouse (will be now in hardware mode, if required)
SetMousePosFirstTime = true; SetMousePosFirstTime = true;
InitMouseWithCursor (ClientCfg.HardwareCursor); // the return value of enableLowLevelMouse() has already been tested at startup InitMouseWithCursor (ClientCfg.HardwareCursor && !StereoDisplayAttached); // the return value of enableLowLevelMouse() has already been tested at startup
// no ui init if character selection is automatic // no ui init if character selection is automatic
SetMouseFreeLook (); SetMouseFreeLook ();

3
code/ryzom/client/src/init_main_loop.cpp
View file

@ -1261,7 +1261,7 @@ void initMainLoop()
// Re-initialise the mouse (will be now in hardware mode, if required) // Re-initialise the mouse (will be now in hardware mode, if required)
SetMousePosFirstTime = true; SetMousePosFirstTime = true;
InitMouseWithCursor (ClientCfg.HardwareCursor); // the return value of enableLowLevelMouse() has already been tested at startup InitMouseWithCursor (ClientCfg.HardwareCursor && !StereoDisplayAttached); // the return value of enableLowLevelMouse() has already been tested at startup
// Re-initialise the keyboard, now in low-level mode, if required // Re-initialise the keyboard, now in low-level mode, if required
// NB nico : done at end of loading // NB nico : done at end of loading
@ -1504,6 +1504,7 @@ void initWelcomeWindow()
// *************************************************************************** // ***************************************************************************
// NOTE: This feature is not really used anymore, it is a patch transition
void initHardwareCursor(bool secondCall) void initHardwareCursor(bool secondCall)
{ {
CInterfaceManager * pIM = CInterfaceManager::getInstance(); CInterfaceManager * pIM = CInterfaceManager::getInstance();

3
code/ryzom/client/src/input.cpp
View file

@ -21,6 +21,7 @@
///////////// /////////////
#include "stdpch.h" #include "stdpch.h"
// Client // Client
#include "global.h"
#include "actions.h" #include "actions.h"
#include "input.h" #include "input.h"
#include "interface_v3/interface_manager.h" #include "interface_v3/interface_manager.h"
@ -310,6 +311,6 @@ CNiceInputAuto::~CNiceInputAuto()
nlassert(_Count >= 0); nlassert(_Count >= 0);
if (_Count == 0) if (_Count == 0)
{ {
InitMouseWithCursor(ClientCfg.HardwareCursor); InitMouseWithCursor(ClientCfg.HardwareCursor && !StereoDisplayAttached);
} }
} }

2
code/ryzom/client/src/login.cpp
View file

@ -867,7 +867,7 @@ bool login()
SetMouseSpeed (ClientCfg.CursorSpeed); SetMouseSpeed (ClientCfg.CursorSpeed);
SetMouseAcceleration (ClientCfg.CursorAcceleration); SetMouseAcceleration (ClientCfg.CursorAcceleration);
SetMousePosFirstTime = true; SetMousePosFirstTime = true;
InitMouseWithCursor (ClientCfg.HardwareCursor); InitMouseWithCursor (ClientCfg.HardwareCursor && !StereoDisplayAttached);
// if (ClientCfg.TestBrowser) // if (ClientCfg.TestBrowser)
// { // {

4
code/ryzom/client/src/main_loop_utilities.cpp
View file

@ -73,6 +73,8 @@ void updateFromClientCfg()
if (!StereoDisplayAttached) if (!StereoDisplayAttached)
setVideoMode(UDriver::CMode(ClientCfg.Width, ClientCfg.Height, (uint8)ClientCfg.Depth, setVideoMode(UDriver::CMode(ClientCfg.Width, ClientCfg.Height, (uint8)ClientCfg.Depth,
ClientCfg.Windowed, ClientCfg.Frequency)); ClientCfg.Windowed, ClientCfg.Frequency));
// force software cursor when attached
InitMouseWithCursor(ClientCfg.HardwareCursor && !StereoDisplayAttached);
} }
// GRAPHICS - GENERAL // GRAPHICS - GENERAL
@ -292,7 +294,7 @@ void updateFromClientCfg()
{ {
if (ClientCfg.HardwareCursor != IsMouseCursorHardware()) if (ClientCfg.HardwareCursor != IsMouseCursorHardware())
{ {
InitMouseWithCursor (ClientCfg.HardwareCursor); InitMouseWithCursor (ClientCfg.HardwareCursor && !StereoDisplayAttached);
} }
} }