Merge with compatibility-develop

--HG--
branch : yubo

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

@@ -4609,3 +4609,38 @@ public:
 };
 REGISTER_ACTION_HANDLER( CHandlerSortTribeFame, "sort_tribefame");
 
+// ***************************************************************************
+// navigate_charsel
+// Arg : current slot selected
+// ***************************************************************************
+class CHandlerCharselNaviGetKeys : public IActionHandler
+{
+	virtual void execute (CCtrlBase * /* pCaller */, const string &Params)
+	{
+		sint32 slot = 0;
+		if (!getParam(Params, "cs").empty())
+			fromString(getParam(Params, "cs"), slot);
+
+		if (Driver->AsyncListener.isKeyPushed(KeyESCAPE))
+			CAHManager::getInstance()->runActionHandler("proc", NULL, "proc_quit");
+
+		if (Driver->AsyncListener.isKeyPushed(KeyRETURN))
+			CAHManager::getInstance()->runActionHandler("proc", NULL, "proc_charsel_enterkeyslot");
+
+		const sint32 index = slot;
+		if (Driver->AsyncListener.isKeyPushed(KeyUP))
+		{
+			slot--;
+			if (slot < 0) slot = 4;
+		}
+		else if (Driver->AsyncListener.isKeyPushed(KeyDOWN))
+		{
+			slot++;
+			if (slot > 4) slot = 0;
+		}
+		// now select
+		if (index != slot)
+			CAHManager::getInstance()->runActionHandler("proc", NULL, toString("proc_charsel_clickslot|%i", slot));
+	}
+};
+REGISTER_ACTION_HANDLER( CHandlerCharselNaviGetKeys, "navigate_charsel" );

code/ryzom/client/src/login.cpp

@@ -61,6 +61,7 @@
 #include "game_share/bg_downloader_msg.h"
 
 #include "misc.h"
+#include "user_agent.h"
 
 void ConnectToShard();
 
@@ -783,6 +784,15 @@ void initLoginScreen()
 
 	ClientApp = ClientCfg.ConfigFile.getVar("Application").asString(0);
 
+	// version
+	std::string ext;
+	if (ClientApp.find("ryzom_") != ucstring::npos)
+		ext = " (" + ClientApp.substr(6) + ")";
+
+	CViewText *pV = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:checkpass:content:ver_value"));
+	if (pV)
+		pV->setHardText(getDisplayVersion() + (ext.empty() ? "" : ext));
+
 	// give priority to login specified as argument
 	string l = !LoginLogin.empty() ? LoginLogin:ClientCfg.LastLogin;