xrGame, xrEngine: add mouse key handle

eagleivg · eagleivg · commit d379a0ad59ce · 2018-07-08T17:43:29.000+04:00
diff --git a/src/xrEngine/xr_input.cpp b/src/xrEngine/xr_input.cpp
@@ -164,21 +164,24 @@ void CInput::KeyUpdate(SDL_Event* event)
     */
 }
 
-bool CInput::get_key_name(SDL_Scancode dik, LPSTR dest_str, int dest_sz)
+bool CInput::get_key_name(int dik, LPSTR dest_str, int dest_sz)
 {
-    const char* keyname = SDL_GetKeyName(SDL_GetKeyFromScancode(dik));
-    if (0 == strlen(keyname))
+    if (dik < SDL_NUM_SCANCODES)
     {
-        Msg("! cant convert dik_name for dik[%d]", dik);
-        return false;
+        const char* keyname = SDL_GetKeyName(SDL_GetKeyFromScancode((SDL_Scancode)dik));
+        if (0 == strlen(keyname))
+        {
+            Msg("! cant convert dik_name for dik[%d]", dik);
+            return false;
+        }
+        strcpy_s(dest_str, dest_sz, keyname);
     }
-    strcpy_s(dest_str, dest_sz, keyname);
 
     return true;
 }
 
-#define MOUSE_1 (0xED + 100)
-#define MOUSE_8 (0xED + 107)
+#define MOUSE_1 (SDL_NUM_SCANCODES + SDL_BUTTON_LEFT)
+#define MOUSE_8 (SDL_NUM_SCANCODES + 8)
 
 BOOL CInput::iGetAsyncKeyState(int dik)
 {
diff --git a/src/xrEngine/xr_input.h b/src/xrEngine/xr_input.h
@@ -84,7 +84,7 @@ class ENGINE_API CInput
     IC bool get_exclusive_mode();
     void unacquire();
     void acquire(const bool& exclusive);
-    bool get_key_name(SDL_Scancode dik, LPSTR dest, int dest_sz);
+    bool get_key_name(int dik, LPSTR dest, int dest_sz);
 
     void feedback(u16 s1, u16 s2, float time);
 };
diff --git a/src/xrGame/Actor.cpp b/src/xrGame/Actor.cpp
@@ -943,7 +943,7 @@ void CActor::UpdateCL()
     {
         if (CurrentGameUI() && NULL == CurrentGameUI()->TopInputReceiver())
         {
-            SDL_Scancode dik = get_action_dik(kUSE, 0);
+            int dik = get_action_dik(kUSE, 0);
             if (dik && pInput->iGetAsyncKeyState(dik))
                 m_bPickupMode = true;
 
diff --git a/src/xrGame/Level_input.cpp b/src/xrGame/Level_input.cpp
@@ -72,7 +72,7 @@ void CLevel::IR_OnMouseWheel(int direction)
     }
 }
 
-static int mouse_button_2_key[] = {MOUSE_1, MOUSE_2, MOUSE_3};
+static int mouse_button_2_key[] = {SDL_NUM_SCANCODES, MOUSE_1, MOUSE_2, MOUSE_3};
 
 void CLevel::IR_OnMousePress(int btn) {IR_OnKeyboardPress(mouse_button_2_key[btn]); }
 void CLevel::IR_OnMouseRelease(int btn) {IR_OnKeyboardRelease(mouse_button_2_key[btn]); }
diff --git a/src/xrGame/MainMenu.cpp b/src/xrGame/MainMenu.cpp
@@ -302,7 +302,7 @@ bool CMainMenu::ReloadUI()
 bool CMainMenu::IsActive() { return !!m_Flags.test(flActive); }
 bool CMainMenu::CanSkipSceneRendering() { return IsActive() && !m_Flags.test(flGameSaveScreenshot); }
 // IInputReceiver
-static int mouse_button_2_key[] = {MOUSE_1, MOUSE_2, MOUSE_3};
+static int mouse_button_2_key[] = {SDL_NUM_SCANCODES, MOUSE_1, MOUSE_2, MOUSE_3};
 void CMainMenu::IR_OnMousePress(int btn)
 {
     if (!IsActive())
diff --git a/src/xrGame/ui/UIXmlInit.cpp b/src/xrGame/ui/UIXmlInit.cpp
@@ -24,7 +24,7 @@
 #include "UItabButtonMP.h"
 #include "UILines.h"
 
-extern SDL_Scancode keyname_to_dik(LPCSTR);
+extern int keyname_to_dik(LPCSTR);
 
 #define ARIAL_FONT_NAME "arial"
 
@@ -345,7 +345,7 @@ bool CUIXmlInit::InitText(CUIXml& xml_doc, LPCSTR path, int index, CUILines* pLi
     return true;
 }
 ////////////////////////////////////////////////////////////////////////////////////////////
-extern SDL_Scancode keyname_to_dik(LPCSTR);
+extern int keyname_to_dik(LPCSTR);
 
 bool CUIXmlInit::Init3tButton(CUIXml& xml_doc, LPCSTR path, int index, CUI3tButton* pWnd)
 {
diff --git a/src/xrGame/xr_level_controller.cpp b/src/xrGame/xr_level_controller.cpp
@@ -84,8 +84,8 @@ _keyboard keyboards[] = {{"kESCAPE", SDL_SCANCODE_ESCAPE}, {"k1", SDL_SCANCODE_1
     {"kNEXT", SDL_SCANCODE_AUDIONEXT}, {"kINSERT", SDL_SCANCODE_INSERT}, {"kDELETE", SDL_SCANCODE_DELETE},
     {"kLWIN", SDL_SCANCODE_LGUI}, {"kRWIN", SDL_SCANCODE_RGUI}, {"kAPPS", SDL_SCANCODE_APPLICATION},
     {"kPAUSE", SDL_SCANCODE_PAUSE}, 
-//    {"mouse1", MOUSE_1}, {"mouse2", MOUSE_2}, {"mouse3", MOUSE_3}, {"mouse4", MOUSE_4},
-//    {"mouse5", MOUSE_5}, {"mouse6", MOUSE_6}, {"mouse7", MOUSE_7}, {"mouse8", MOUSE_8}, 
+    {"mouse1", MOUSE_1}, {"mouse2", MOUSE_2}, {"mouse3", MOUSE_3}, {"mouse4", MOUSE_4},
+    {"mouse5", MOUSE_5}, {"mouse6", MOUSE_6}, {"mouse7", MOUSE_7}, {"mouse8", MOUSE_8}, 
     {NULL, SDL_SCANCODE_UNKNOWN}};
 
 void initialize_bindings()
@@ -195,7 +195,7 @@ _keyboard* dik_to_ptr(SDL_Scancode _dik, bool bSafe)
     return NULL;
 }
 
-SDL_Scancode keyname_to_dik(pcstr _name)
+int keyname_to_dik(pcstr _name)
 {
     _keyboard* _kb = keyname_to_ptr(_name);
     return _kb->dik;
@@ -234,7 +234,7 @@ bool is_binded(EGameActions _action_id, SDL_Scancode _dik)
     return false;
 }
 
-SDL_Scancode get_action_dik(EGameActions _action_id, int idx)
+int get_action_dik(EGameActions _action_id, int idx)
 {
     _binding* pbinding = &g_key_bindings[_action_id];
 
@@ -478,7 +478,7 @@ class CCC_BindConsoleCmd : public IConsole_Command
         _GetItems(args, 0, cnt - 1, console_command, ' ');
         _GetItem(args, cnt - 1, key, ' ');
 
-        SDL_Scancode dik = keyname_to_dik(key);
+        int dik = keyname_to_dik(key);
         bindConsoleCmds.bind(dik, console_command);
     }
 
@@ -491,17 +491,17 @@ class CCC_UnBindConsoleCmd : public IConsole_Command
     CCC_UnBindConsoleCmd(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = FALSE; };
     virtual void Execute(LPCSTR args)
     {
-        SDL_Scancode _dik = keyname_to_dik(args);
+        int _dik = keyname_to_dik(args);
         bindConsoleCmds.unbind(_dik);
     }
 };
 
-void ConsoleBindCmds::bind(SDL_Scancode dik, LPCSTR N)
+void ConsoleBindCmds::bind(int dik, LPCSTR N)
 {
     _conCmd& c = m_bindConsoleCmds[dik];
     c.cmd = N;
 }
-void ConsoleBindCmds::unbind(SDL_Scancode dik)
+void ConsoleBindCmds::unbind(int dik)
 {
     xr_map<int, _conCmd>::iterator it = m_bindConsoleCmds.find(dik);
     if (it == m_bindConsoleCmds.end())
@@ -511,7 +511,7 @@ void ConsoleBindCmds::unbind(SDL_Scancode dik)
 }
 
 void ConsoleBindCmds::clear() { m_bindConsoleCmds.clear(); }
-bool ConsoleBindCmds::execute(SDL_Scancode dik)
+bool ConsoleBindCmds::execute(int dik)
 {
     xr_map<int, _conCmd>::iterator it = m_bindConsoleCmds.find(dik);
     if (it == m_bindConsoleCmds.end())
diff --git a/src/xrGame/xr_level_controller.h b/src/xrGame/xr_level_controller.h
@@ -92,7 +92,7 @@ enum EGameActions
 struct _keyboard
 {
     pcstr key_name;
-    SDL_Scancode dik;
+    int dik;
     xr_string key_local_name;
 };
 enum _key_group
@@ -114,7 +114,7 @@ struct _action
 };
 
 pcstr dik_to_keyname(SDL_Scancode _dik);
-SDL_Scancode keyname_to_dik(pcstr _name);
+int keyname_to_dik(pcstr _name);
 _keyboard* keyname_to_ptr(pcstr _name);
 _keyboard* dik_to_ptr(SDL_Scancode _dik, bool bSafe);
 
@@ -136,7 +136,7 @@ struct _binding
 extern _binding g_key_bindings[];
 
 bool is_binded(EGameActions action_id, SDL_Scancode dik);
-SDL_Scancode get_action_dik(EGameActions action_id, int idx = -1);
+int get_action_dik(EGameActions action_id, int idx = -1);
 EGameActions get_binded_action(SDL_Scancode dik);
 
 extern void CCC_RegisterInput();
@@ -151,9 +151,9 @@ class ConsoleBindCmds
 public:
     xr_map<int, _conCmd> m_bindConsoleCmds;
 
-    void bind(SDL_Scancode dik, LPCSTR N);
-    void unbind(SDL_Scancode dik);
-    bool execute(SDL_Scancode dik);
+    void bind(int dik, LPCSTR N);
+    void unbind(int dik);
+    bool execute(int dik);
     void clear();
     void save(IWriter* F);
 };
@@ -162,13 +162,13 @@ void GetActionAllBinding(LPCSTR action, char* dst_buff, int dst_buff_sz);
 
 extern ConsoleBindCmds bindConsoleCmds;
 
-// 0xED - max vavue in DIK* enum
-#define MOUSE_1 (0xED + 100)
-#define MOUSE_2 (0xED + 101)
-#define MOUSE_3 (0xED + 102)
+// SDL_NUM_SCANCODES - max vavue in SDL_SCANCODE_* enum
+#define MOUSE_1 (SDL_NUM_SCANCODES + SDL_BUTTON_LEFT)
+#define MOUSE_2 (SDL_NUM_SCANCODES + SDL_BUTTON_MIDDLE)
+#define MOUSE_3 (SDL_NUM_SCANCODES + SDL_BUTTON_RIGHT)
 
-#define MOUSE_4 (0xED + 103)
-#define MOUSE_5 (0xED + 104)
-#define MOUSE_6 (0xED + 105)
-#define MOUSE_7 (0xED + 106)
-#define MOUSE_8 (0xED + 107)
+#define MOUSE_4 (SDL_NUM_SCANCODES + SDL_BUTTON_X1)
+#define MOUSE_5 (SDL_NUM_SCANCODES + SDL_BUTTON_X2)
+#define MOUSE_6 (SDL_NUM_SCANCODES + 6)
+#define MOUSE_7 (SDL_NUM_SCANCODES + 7)
+#define MOUSE_8 (SDL_NUM_SCANCODES + 8)

Original file line number	Diff line number	Diff line change
`@@ -164,21 +164,24 @@ void CInput::KeyUpdate(SDL_Event* event)`
`164`	`164`	`*/`
`165`	`165`	`}`
`166`	`166`
`167`		`-bool CInput::get_key_name(SDL_Scancode dik, LPSTR dest_str, int dest_sz)`
	`167`	`+bool CInput::get_key_name(int dik, LPSTR dest_str, int dest_sz)`
`168`	`168`	`{`
`169`		`- const char* keyname = SDL_GetKeyName(SDL_GetKeyFromScancode(dik));`
`170`		`- if (0 == strlen(keyname))`
	`169`	`+ if (dik < SDL_NUM_SCANCODES)`
`171`	`170`	`{`
`172`		`- Msg("! cant convert dik_name for dik[%d]", dik);`
`173`		`- return false;`
	`171`	`+ const char* keyname = SDL_GetKeyName(SDL_GetKeyFromScancode((SDL_Scancode)dik));`
	`172`	`+ if (0 == strlen(keyname))`
	`173`	`+ {`
	`174`	`+ Msg("! cant convert dik_name for dik[%d]", dik);`
	`175`	`+ return false;`
	`176`	`+ }`
	`177`	`+ strcpy_s(dest_str, dest_sz, keyname);`
`174`	`178`	`}`
`175`		`- strcpy_s(dest_str, dest_sz, keyname);`
`176`	`179`
`177`	`180`	`return true;`
`178`	`181`	`}`
`179`	`182`
`180`		`-#define MOUSE_1 (0xED + 100)`
`181`		`-#define MOUSE_8 (0xED + 107)`
	`183`	`+#define MOUSE_1 (SDL_NUM_SCANCODES + SDL_BUTTON_LEFT)`
	`184`	`+#define MOUSE_8 (SDL_NUM_SCANCODES + 8)`
`182`	`185`
`183`	`186`	`BOOL CInput::iGetAsyncKeyState(int dik)`
`184`	`187`	`{`
Original file line number	Diff line number	Diff line change
`@@ -943,7 +943,7 @@ void CActor::UpdateCL()`
`943`	`943`	`{`
`944`	`944`	`if (CurrentGameUI() && NULL == CurrentGameUI()->TopInputReceiver())`
`945`	`945`	`{`
`946`		`- SDL_Scancode dik = get_action_dik(kUSE, 0);`
	`946`	`+ int dik = get_action_dik(kUSE, 0);`
`947`	`947`	`if (dik && pInput->iGetAsyncKeyState(dik))`
`948`	`948`	`m_bPickupMode = true;`
`949`	`949`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ void CLevel::IR_OnMouseWheel(int direction)`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`		`-static int mouse_button_2_key[] = {MOUSE_1, MOUSE_2, MOUSE_3};`
	`75`	`+static int mouse_button_2_key[] = {SDL_NUM_SCANCODES, MOUSE_1, MOUSE_2, MOUSE_3};`
`76`	`76`
`77`	`77`	`void CLevel::IR_OnMousePress(int btn) {IR_OnKeyboardPress(mouse_button_2_key[btn]); }`
`78`	`78`	`void CLevel::IR_OnMouseRelease(int btn) {IR_OnKeyboardRelease(mouse_button_2_key[btn]); }`
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ bool CMainMenu::ReloadUI()`
`302`	`302`	`bool CMainMenu::IsActive() { return !!m_Flags.test(flActive); }`
`303`	`303`	`bool CMainMenu::CanSkipSceneRendering() { return IsActive() && !m_Flags.test(flGameSaveScreenshot); }`
`304`	`304`	`// IInputReceiver`
`305`		`-static int mouse_button_2_key[] = {MOUSE_1, MOUSE_2, MOUSE_3};`
	`305`	`+static int mouse_button_2_key[] = {SDL_NUM_SCANCODES, MOUSE_1, MOUSE_2, MOUSE_3};`
`306`	`306`	`void CMainMenu::IR_OnMousePress(int btn)`
`307`	`307`	`{`
`308`	`308`	`if (!IsActive())`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`#include "UItabButtonMP.h"`
`25`	`25`	`#include "UILines.h"`
`26`	`26`
`27`		`-extern SDL_Scancode keyname_to_dik(LPCSTR);`
	`27`	`+extern int keyname_to_dik(LPCSTR);`
`28`	`28`
`29`	`29`	`#define ARIAL_FONT_NAME "arial"`
`30`	`30`
`@@ -345,7 +345,7 @@ bool CUIXmlInit::InitText(CUIXml& xml_doc, LPCSTR path, int index, CUILines* pLi`
`345`	`345`	`return true;`
`346`	`346`	`}`
`347`	`347`	`////////////////////////////////////////////////////////////////////////////////////////////`
`348`		`-extern SDL_Scancode keyname_to_dik(LPCSTR);`
	`348`	`+extern int keyname_to_dik(LPCSTR);`
`349`	`349`
`350`	`350`	`bool CUIXmlInit::Init3tButton(CUIXml& xml_doc, LPCSTR path, int index, CUI3tButton* pWnd)`
`351`	`351`	`{`
Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,8 @@ _keyboard keyboards[] = {{"kESCAPE", SDL_SCANCODE_ESCAPE}, {"k1", SDL_SCANCODE_1`
`84`	`84`	`{"kNEXT", SDL_SCANCODE_AUDIONEXT}, {"kINSERT", SDL_SCANCODE_INSERT}, {"kDELETE", SDL_SCANCODE_DELETE},`
`85`	`85`	`{"kLWIN", SDL_SCANCODE_LGUI}, {"kRWIN", SDL_SCANCODE_RGUI}, {"kAPPS", SDL_SCANCODE_APPLICATION},`
`86`	`86`	`{"kPAUSE", SDL_SCANCODE_PAUSE},`
`87`		`-// {"mouse1", MOUSE_1}, {"mouse2", MOUSE_2}, {"mouse3", MOUSE_3}, {"mouse4", MOUSE_4},`
`88`		`-// {"mouse5", MOUSE_5}, {"mouse6", MOUSE_6}, {"mouse7", MOUSE_7}, {"mouse8", MOUSE_8},`
	`87`	`+ {"mouse1", MOUSE_1}, {"mouse2", MOUSE_2}, {"mouse3", MOUSE_3}, {"mouse4", MOUSE_4},`
	`88`	`+ {"mouse5", MOUSE_5}, {"mouse6", MOUSE_6}, {"mouse7", MOUSE_7}, {"mouse8", MOUSE_8},`
`89`	`89`	`{NULL, SDL_SCANCODE_UNKNOWN}};`
`90`	`90`
`91`	`91`	`void initialize_bindings()`
`@@ -195,7 +195,7 @@ _keyboard* dik_to_ptr(SDL_Scancode _dik, bool bSafe)`
`195`	`195`	`return NULL;`
`196`	`196`	`}`
`197`	`197`
`198`		`-SDL_Scancode keyname_to_dik(pcstr _name)`
	`198`	`+int keyname_to_dik(pcstr _name)`
`199`	`199`	`{`
`200`	`200`	`_keyboard* _kb = keyname_to_ptr(_name);`
`201`	`201`	`return _kb->dik;`
`@@ -234,7 +234,7 @@ bool is_binded(EGameActions _action_id, SDL_Scancode _dik)`
`234`	`234`	`return false;`
`235`	`235`	`}`
`236`	`236`
`237`		`-SDL_Scancode get_action_dik(EGameActions _action_id, int idx)`
	`237`	`+int get_action_dik(EGameActions _action_id, int idx)`
`238`	`238`	`{`
`239`	`239`	`_binding* pbinding = &g_key_bindings[_action_id];`
`240`	`240`
`@@ -478,7 +478,7 @@ class CCC_BindConsoleCmd : public IConsole_Command`
`478`	`478`	`_GetItems(args, 0, cnt - 1, console_command, ' ');`
`479`	`479`	`_GetItem(args, cnt - 1, key, ' ');`
`480`	`480`
`481`		`- SDL_Scancode dik = keyname_to_dik(key);`
	`481`	`+ int dik = keyname_to_dik(key);`
`482`	`482`	`bindConsoleCmds.bind(dik, console_command);`
`483`	`483`	`}`
`484`	`484`
`@@ -491,17 +491,17 @@ class CCC_UnBindConsoleCmd : public IConsole_Command`
`491`	`491`	`CCC_UnBindConsoleCmd(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = FALSE; };`
`492`	`492`	`virtual void Execute(LPCSTR args)`
`493`	`493`	`{`
`494`		`- SDL_Scancode _dik = keyname_to_dik(args);`
	`494`	`+ int _dik = keyname_to_dik(args);`
`495`	`495`	`bindConsoleCmds.unbind(_dik);`
`496`	`496`	`}`
`497`	`497`	`};`
`498`	`498`
`499`		`-void ConsoleBindCmds::bind(SDL_Scancode dik, LPCSTR N)`
	`499`	`+void ConsoleBindCmds::bind(int dik, LPCSTR N)`
`500`	`500`	`{`
`501`	`501`	`_conCmd& c = m_bindConsoleCmds[dik];`
`502`	`502`	`c.cmd = N;`
`503`	`503`	`}`
`504`		`-void ConsoleBindCmds::unbind(SDL_Scancode dik)`
	`504`	`+void ConsoleBindCmds::unbind(int dik)`
`505`	`505`	`{`
`506`	`506`	`xr_map<int, _conCmd>::iterator it = m_bindConsoleCmds.find(dik);`
`507`	`507`	`if (it == m_bindConsoleCmds.end())`
`@@ -511,7 +511,7 @@ void ConsoleBindCmds::unbind(SDL_Scancode dik)`
`511`	`511`	`}`
`512`	`512`
`513`	`513`	`void ConsoleBindCmds::clear() { m_bindConsoleCmds.clear(); }`
`514`		`-bool ConsoleBindCmds::execute(SDL_Scancode dik)`
	`514`	`+bool ConsoleBindCmds::execute(int dik)`
`515`	`515`	`{`
`516`	`516`	`xr_map<int, _conCmd>::iterator it = m_bindConsoleCmds.find(dik);`
`517`	`517`	`if (it == m_bindConsoleCmds.end())`