dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Reorganise hotkey initialisation. (#10951)

Browse Source 
Hotkeys are now initialized inline, and use std::vector instead of
separate static C-arrays and std::string instead of char *. The list end
marker is no longer required.
This commit is contained in:
PeterN
2023-06-05 18:12:30 +01:00
committed by GitHub
parent 921f5afc4d
commit f814c86389
15 changed files with 410 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/hotkeys.h
View File

@@ -19,18 +19,16 @@
* a list of keycodes and a number to help identifying this hotkey.
*/
struct Hotkey {
Hotkey(uint16 default_keycode, const char *name, int num);
Hotkey(const uint16 *default_keycodes, const char *name, int num);
Hotkey(uint16 default_keycode, const std::string &name, int num);
Hotkey(const std::vector<uint16> &default_keycodes, const std::string &name, int num);
void AddKeycode(uint16 keycode);
const char *name;
const std::string name;
int num;
std::set<uint16> keycodes;
};
#define HOTKEY_LIST_END Hotkey((uint16)0, nullptr, -1)
struct IniFile;
/**
@@ -39,7 +37,7 @@ struct IniFile;
struct HotkeyList {
typedef EventState (*GlobalHotkeyHandlerFunc)(int hotkey);
HotkeyList(const char *ini_group, Hotkey *items, GlobalHotkeyHandlerFunc global_hotkey_handler = nullptr);
HotkeyList(const std::string &ini_group, const std::vector<Hotkey> &items, GlobalHotkeyHandlerFunc global_hotkey_handler = nullptr);
~HotkeyList();
void Load(IniFile *ini);
@@ -49,8 +47,8 @@ struct HotkeyList {
GlobalHotkeyHandlerFunc global_hotkey_handler;
private:
const char *ini_group;
Hotkey *items;
const std::string ini_group;
std::vector<Hotkey> items;
/**
* Dummy private copy constructor to prevent compilers from