Fixed: #1034 Implement CCustomMouse for Linux

code/nel/src/3d/driver/direct3d/driver_direct3d.cpp

@@ -173,7 +173,7 @@ CDriverD3D::CDriverD3D()
 	_CurrRot = 0;
 	_CurrHotSpotX = 0;
 	_CurrHotSpotY = 0;
-	_CursorScale = 0.85f;
+	_CursorScale = 1.f;
 
 	_UserViewMtx.identity();
 	_UserModelMtx.identity();

code/nel/src/3d/driver/direct3d/driver_direct3d.h

@@ -923,14 +923,15 @@ public:
 	// see if system cursor is currently captured
 	virtual bool			isSystemCursorCaptured();
 
-	virtual void			setHardwareCursorScale(float scale) { _CursorScale = scale; }
-
 	// Add a new cursor (name is case unsensitive)
 	virtual void			addCursor(const std::string &name, const NLMISC::CBitmap &bitmap);
 
 	// Display a cursor from its name (case unsensitive)
 	virtual void			setCursor(const std::string &name, NLMISC::CRGBA col, uint8 rot, sint hotSpotX, sint hotSpotY, bool forceRebuild = false);
 
+	// Change default scale for all cursors
+	virtual void			setCursorScale(float scale);
+
 	virtual NLMISC::IMouseDevice			*enableLowLevelMouse(bool enable, bool exclusive);
 	virtual NLMISC::IKeyboardDevice			*enableLowLevelKeyboard(bool enable);
 	virtual NLMISC::IInputDeviceManager		*getLowLevelInputDeviceManager();

code/nel/src/3d/driver/direct3d/driver_direct3d_inputs.cpp

@@ -300,6 +300,12 @@ void CDriverD3D::setCursor(const std::string &name, NLMISC::CRGBA col, uint8 rot
 
 }
 
+// *************************************************************************************
+void CDriverD3D::setCursorScale(float scale)
+{
+	_CursorScale = scale;
+}
+
 // *************************************************************************************
 nlCursor CDriverD3D::buildCursor(const CBitmap &src, NLMISC::CRGBA col, uint8 rot, sint hotSpotX, sint hotSpotY)
 {

code/nel/src/3d/driver/opengl/driver_opengl.cpp

@@ -223,7 +223,7 @@ CDriverGL::CDriverGL()
 	_CurrRot = 0;
 	_CurrHotSpotX = 0;
 	_CurrHotSpotY = 0;
-	_CursorScale = 0.85f;
+	_CursorScale = 1.f;
 	_MouseCaptured = false;
 
 	_NeedToRestaureGammaRamp = false;

code/nel/src/3d/driver/opengl/driver_opengl.h

@@ -523,14 +523,15 @@ public:
 	// see if system cursor is currently captured
 	virtual bool			isSystemCursorCaptured();
 
-	virtual void			setHardwareCursorScale(float scale) { _CursorScale = scale; }
-
 	// Add a new cursor (name is case unsensitive)
 	virtual void			addCursor(const std::string &name, const NLMISC::CBitmap &bitmap);
 
 	// Display a cursor from its name (case unsensitive)
 	virtual void			setCursor(const std::string &name, NLMISC::CRGBA col, uint8 rot, sint hotSpotX, sint hotSpotY, bool forceRebuild = false);
 
+	// Change default scale for all cursors
+	virtual void			setCursorScale(float scale);
+
 	virtual NLMISC::IMouseDevice			*enableLowLevelMouse(bool enable, bool exclusive);
 
 	virtual NLMISC::IKeyboardDevice			*enableLowLevelKeyboard(bool enable);

code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp

@@ -367,6 +367,12 @@ void CDriverGL::setCursor(const std::string &name, NLMISC::CRGBA col, uint8 rot,
 
 }
 
+// *************************************************************************************
+void CDriverGL::setCursorScale(float scale)
+{
+	_CursorScale = scale;
+}
+
 // *************************************************************************************
 nlCursor CDriverGL::buildCursor(const CBitmap &src, NLMISC::CRGBA col, uint8 rot, sint hotSpotX, sint hotSpotY)
 {

code/nel/src/3d/driver_user.cpp

@@ -1664,6 +1664,13 @@ void			CDriverUser::setCursor(const std::string &name, NLMISC::CRGBA col, uint8
 	_Driver->setCursor(name, col, rot, hotSpotX, hotSpotY, forceRebuild);
 }
 
+void			CDriverUser::setCursorScale(float scale)
+{
+	NL3D_HAUTO_UI_DRIVER;
+
+	_Driver->setCursorScale(scale);
+}
+
 // ***************************************************************************
 // ***************************************************************************
 // Async Texture loading mgt

code/ryzom/client/src/interface_v3/input_handler_manager.cpp

@@ -157,7 +157,6 @@ void CInputHandlerManager::operator ()(const NLMISC::CEvent &event)
 			_MouseButtonsReleased = noButton;
 			_MouseButtonsState = noButton;
 			_Focus = false;
-			// Driver->setFocus(false);
 
 			if (!_SkipInterfaceManager)
 			{

code/ryzom/client/src/interface_v3/view_renderer.cpp

@@ -729,7 +729,7 @@ void CViewRenderer::loadTextures (const std::string &textureFileName, const std:
 
 	_GlobalTextures.push_back (gt);
 
-//	Driver->setHardwareCursorScale(ClientCfg.HardwareCursorScale);
+	Driver->setCursorScale(ClientCfg.HardwareCursorScale);
 
 	char bufTmp[256], tgaName[256];
 	string sTGAname;