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

Adding of _t to (u)int types, and WChar to char32_t

Browse Source 
See: eaae0bb5e
This commit is contained in:
Jonathan G Rennison
2024-01-07 16:41:53 +00:00
parent 55d78a23be
commit 97e6f3062e
655 changed files with 7555 additions and 7555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/hotkeys.cpp
View File

@@ -97,7 +97,7 @@ static const KeycodeNames _keycode_to_name[] = {
* @param end End of the string to parse.
* @return A keycode if a match is found or 0.
*/
static uint16 ParseCode(const char *start, const char *end)
static uint16_t ParseCode(const char *start, const char *end)
{
assert(start <= end);
while (start < end && *start == ' ') start++;
@@ -111,7 +111,7 @@ static uint16 ParseCode(const char *start, const char *end)
if (end - start == 1) {
if (*start >= 'a' && *start <= 'z') return *start - ('a'-'A');
/* Ignore invalid keycodes */
if (*(const uint8 *)start < 128) return *start;
if (*(const uint8_t *)start < 128) return *start;
}
return 0;
}
@@ -122,14 +122,14 @@ static uint16 ParseCode(const char *start, const char *end)
* @param end End of the input.
* @return A valid keycode or 0.
*/
static uint16 ParseKeycode(const char *start, const char *end)
static uint16_t ParseKeycode(const char *start, const char *end)
{
assert(start <= end);
uint16 keycode = 0;
uint16_t keycode = 0;
for (;;) {
const char *cur = start;
while (*cur != '+' && cur != end) cur++;
uint16 code = ParseCode(start, cur);
uint16_t code = ParseCode(start, cur);
if (code == 0) return 0;
if (code & WKC_SPECIAL_KEYS) {
/* Some completely wrong keycode we don't support. */
@@ -158,7 +158,7 @@ static void ParseHotkeys(Hotkey *hotkey, const char *value)
while (*start != '\0') {
const char *end = start;
while (*end != '\0' && *end != ',') end++;
uint16 keycode = ParseKeycode(start, end);
uint16_t keycode = ParseKeycode(start, end);
if (keycode != 0) hotkey->AddKeycode(keycode);
start = (*end == ',') ? end + 1: end;
}
@@ -171,7 +171,7 @@ static void ParseHotkeys(Hotkey *hotkey, const char *value)
* @param keycode The keycode to convert to a string.
* @return A string representation of this keycode.
*/
static std::string KeycodeToString(uint16 keycode)
static std::string KeycodeToString(uint16_t keycode)
{
std::string str;
if (keycode & WKC_GLOBAL_HOTKEY) {
@@ -229,7 +229,7 @@ std::string SaveKeycodes(const Hotkey *hotkey)
* @param name The name of this hotkey.
* @param num Number of this hotkey, should be unique within the hotkey list.
*/
Hotkey::Hotkey(uint16 default_keycode, const char *name, int num) :
Hotkey::Hotkey(uint16_t default_keycode, const char *name, int num) :
name(name),
num(num)
{
@@ -242,11 +242,11 @@ Hotkey::Hotkey(uint16 default_keycode, const char *name, int num) :
* @param name The name of this hotkey.
* @param num Number of this hotkey, should be unique within the hotkey list.
*/
Hotkey::Hotkey(const uint16 *default_keycodes, const char *name, int num) :
Hotkey::Hotkey(const uint16_t *default_keycodes, const char *name, int num) :
name(name),
num(num)
{
const uint16 *keycode = default_keycodes;
const uint16_t *keycode = default_keycodes;
while (*keycode != 0) {
this->AddKeycode(*keycode);
keycode++;
@@ -258,7 +258,7 @@ Hotkey::Hotkey(const uint16 *default_keycodes, const char *name, int num) :
* in addition to any previously added keycodes.
* @param keycode The keycode to add.
*/
void Hotkey::AddKeycode(uint16 keycode)
void Hotkey::AddKeycode(uint16_t keycode)
{
this->keycodes.insert(keycode);
}
@@ -311,7 +311,7 @@ void HotkeyList::Save(IniFile &ini) const
* @param global_only Limit the search to hotkeys defined as 'global'.
* @return The number of the matching hotkey or -1.
*/
int HotkeyList::CheckMatch(uint16 keycode, bool global_only) const
int HotkeyList::CheckMatch(uint16_t keycode, bool global_only) const
{
for (const Hotkey *list = this->items; list->name != nullptr; ++list) {
auto begin = list->keycodes.begin();
@@ -353,7 +353,7 @@ void SaveHotkeysToConfig()
SaveLoadHotkeys(true);
}
void HandleGlobalHotkeys(WChar key, uint16 keycode)
void HandleGlobalHotkeys(char32_t key, uint16_t keycode)
{
for (HotkeyList *list : *_hotkey_lists) {
if (list->global_hotkey_handler == nullptr) continue;