From 3ab4c7d714a9738a4356b28662d362ce22df069d Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 26 Nov 2016 15:24:24 +0200
Subject: [PATCH] Merge with develop

---
 code/ryzom/client/client_default.cfg           |  1 +
 .../data/gamedev/interfaces_v3/game_config.xml | 18 +++++++++++++++---
 code/ryzom/client/src/client_cfg.cpp           |  2 ++
 code/ryzom/client/src/client_cfg.h             |  1 +
 code/ryzom/client/src/events_listener.cpp      |  2 +-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg
index f6c87b625..b127ae3a6 100644
--- a/code/ryzom/client/client_default.cfg
+++ b/code/ryzom/client/client_default.cfg
@@ -105,6 +105,7 @@ FreeLookAcceleration_min	= 20;
 FreeLookAcceleration_max	= 80;
 
 FreeLookInverted			= 0;
+FreeLookTablet			= 0;
 AutomaticCamera      		= 0;
 DblClickMode			= 1;
 AutoEquipTool			= 1;
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml b/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
index 38e63cb24..bcd2bb808 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
@@ -2672,9 +2672,9 @@
         <instance template="tgcw_checkbox"
                   id="hard"
                   text="uiMouseHardware"
-                  posref="TR TR"
-                  x="-55"
-                  y="-20" />
+                  posref="TM TL"
+                  x="0"
+                  y="-35" />
         <instance template="tgcw_checkbox"
                   id="inverted"
                   text="uiMouseInverted"
@@ -2689,6 +2689,13 @@
                   posref="BL TL"
                   x="0"
                   y="-2" />
+        <instance template="tgcw_checkbox"
+                  id="tablet"
+                  text="uiMouseTablet"
+                  posparent="dbl"
+                  posref="BL TL"
+                  x="0"
+                  y="-2" />
         <view style="sgc_title2"
               type="text"
               id="inter"
@@ -3833,6 +3840,11 @@
                widget="boolbut"
                link="DblClickMode"
                realtime="true" />
+        <param ui="mouse:tablet:c"
+               type="cfg"
+               widget="boolbut"
+               link="FreeLookTablet"
+               realtime="true" />
         <param ui="mouse:dcspeed:c"
                type="db"
                widget="sbint"
diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp
index 38e48cb21..5d1099523 100644
--- a/code/ryzom/client/src/client_cfg.cpp
+++ b/code/ryzom/client/src/client_cfg.cpp
@@ -350,6 +350,7 @@ CClientConfig::CClientConfig()
 	FreeLookAcceleration    = 0;					// Default FreeLookAcceleration
 	FreeLookSmoothingPeriod = 0.f;                  // when in absolute mode, free look factor is used instead of speed, the mouse gives the absolute angle
 	FreeLookInverted		= false;
+	FreeLookTablet			= false;                // Mouse reports absolute coordinates, so avoid mouse recentering
 	AutomaticCamera			= true;
 	DblClickMode			= true;					// when in dbl click mode, a double click is needed to execute default contextual action
 	AutoEquipTool			= true;					// when true player will auto-equip last used weapon or forage tool when doing an action
@@ -855,6 +856,7 @@ void CClientConfig::setValues()
 	READ_INT_FV(FreeLookAcceleration)
 	READ_FLOAT_FV(FreeLookSmoothingPeriod)
 	READ_BOOL_FV(FreeLookInverted)
+	READ_BOOL_FV(FreeLookTablet)
 	READ_BOOL_FV(AutomaticCamera)
 	READ_BOOL_FV(DblClickMode)
 	READ_BOOL_FV(AutoEquipTool)
diff --git a/code/ryzom/client/src/client_cfg.h b/code/ryzom/client/src/client_cfg.h
index 5fe0cfa1c..3a143ec1f 100644
--- a/code/ryzom/client/src/client_cfg.h
+++ b/code/ryzom/client/src/client_cfg.h
@@ -199,6 +199,7 @@ struct CClientConfig
 	uint			FreeLookAcceleration;
 	float			FreeLookSmoothingPeriod;
 	bool			FreeLookInverted;
+	bool			FreeLookTablet;
 	// true if camera is centered when user casts a spell
 	bool			AutomaticCamera;
 	bool			DblClickMode;
diff --git a/code/ryzom/client/src/events_listener.cpp b/code/ryzom/client/src/events_listener.cpp
index 760a5dc08..028083b29 100644
--- a/code/ryzom/client/src/events_listener.cpp
+++ b/code/ryzom/client/src/events_listener.cpp
@@ -204,7 +204,7 @@ void CEventsListener::operator()(const CEvent& event)
 			// updateFreeLookPos is called in updateMouseSmoothing per frame
 
 			// Center cursor
-			if (outsideBounds && !s_MouseFreeLookWaitCenter)
+			if (outsideBounds && !s_MouseFreeLookWaitCenter && !ClientCfg.FreeLookTablet)
 			{
 				s_MouseFreeLookWaitCenter = true;
 				Driver->setMousePos(0.5f, 0.5f);