mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Use StringConsumer to parse hotkeys.

pull/14172/head
frosch 2025-04-30 12:23:46 +02:00 committed by frosch
parent 66733e2a50
commit b564fbb5e6
1 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/hotkeys.cpp
View File

@ -13,6 +13,7 @@
#include "ini_type.h" #include "ini_type.h"
#include "string_func.h" #include "string_func.h"
#include "window_gui.h" #include "window_gui.h"
#include "core/string_consumer.hpp"
#include "safeguards.h" #include "safeguards.h"
@ -90,56 +91,49 @@ static const std::initializer_list<KeycodeNames> _keycode_to_name = {
/** /**
* Try to parse a single part of a keycode. * Try to parse a single part of a keycode.
* @param start Start of the string to parse. * @param keystr Input.
* @param end End of the string to parse. * @return A keycode if a match is found.
* @return A keycode if a match is found or 0.
*/ */
static uint16_t ParseCode(const char *start, const char *end) static std::optional<uint16_t> ParseCode(std::string_view keystr)
{ {
assert(start <= end); keystr = StrTrimView(keystr);
while (start < end && *start == ' ') start++;
while (end > start && *end == ' ') end--;
std::string_view str{start, end};
for (const auto &kn : _keycode_to_name) { for (const auto &kn : _keycode_to_name) {
if (StrEqualsIgnoreCase(str, kn.name)) { if (StrEqualsIgnoreCase(keystr, kn.name)) {
return kn.keycode; return kn.keycode;
} }
} }
if (end - start == 1) { if (keystr.size() == 1) {
if (*start >= 'a' && *start <= 'z') return *start - ('a'-'A'); auto c = keystr[0];
if (c >= 'a' && c <= 'z') return c - ('a'-'A');
/* Ignore invalid keycodes */ /* Ignore invalid keycodes */
if (*(const uint8_t *)start < 128) return *start; if (static_cast<uint8_t>(c) < 128) return c;
} }
return 0; return std::nullopt;
} }
/** /**
* Parse a string representation of a keycode. * Parse a string representation of a keycode.
* @param start Start of the input. * @param keystr Input.
* @param end End of the input. * @return A valid keycode or std::nullopt.
* @return A valid keycode or 0.
*/ */
static uint16_t ParseKeycode(const char *start, const char *end) static std::optional<uint16_t> ParseKeycode(std::string_view keystr)
{ {
assert(start <= end); if (keystr.empty()) return std::nullopt;
StringConsumer consumer{keystr};
uint16_t keycode = 0; uint16_t keycode = 0;
for (;;) { while (consumer.AnyBytesLeft()) {
const char *cur = start; auto cur = consumer.ReadUntilChar('+', StringConsumer::SKIP_ONE_SEPARATOR);
while (*cur != '+' && cur != end) cur++; auto code = ParseCode(cur);
uint16_t code = ParseCode(start, cur); if (!code.has_value()) return std::nullopt;
if (code == 0) return 0; if (*code & WKC_SPECIAL_KEYS) {
if (code & WKC_SPECIAL_KEYS) {
/* Some completely wrong keycode we don't support. */ /* Some completely wrong keycode we don't support. */
if (code & ~WKC_SPECIAL_KEYS) return 0; if (*code & ~WKC_SPECIAL_KEYS) return std::nullopt;
keycode |= code; keycode |= *code;
} else { } else {
/* Ignore the code if it has more then 1 letter. */ /* Ignore the code if it has more then 1 letter. */
if (keycode & ~WKC_SPECIAL_KEYS) return 0; if (keycode & ~WKC_SPECIAL_KEYS) return std::nullopt;
keycode |= code; keycode |= *code;
} }
if (cur == end) break;
assert(cur < end);
start = cur + 1;
} }
return keycode; return keycode;
} }
@ -149,15 +143,13 @@ static uint16_t ParseKeycode(const char *start, const char *end)
* @param hotkey The hotkey object to add the keycodes to * @param hotkey The hotkey object to add the keycodes to
* @param value The string to parse * @param value The string to parse
*/ */
static void ParseHotkeys(Hotkey &hotkey, const char *value) static void ParseHotkeys(Hotkey &hotkey, std::string_view value)
{ {
const char *start = value; StringConsumer consumer{value};
while (*start != '\0') { while (consumer.AnyBytesLeft()) {
const char *end = start; auto keystr = consumer.ReadUntilChar(',', StringConsumer::SKIP_ONE_SEPARATOR);
while (*end != '\0' && *end != ',') end++; auto keycode = ParseKeycode(keystr);
uint16_t keycode = ParseKeycode(start, end); if (keycode.has_value()) hotkey.AddKeycode(*keycode);
if (keycode != 0) hotkey.AddKeycode(keycode);
start = (*end == ',') ? end + 1: end;
} }
} }
@ -282,7 +274,7 @@ void HotkeyList::Load(const IniFile &ini)
const IniItem *item = group->GetItem(hotkey.name); const IniItem *item = group->GetItem(hotkey.name);
if (item != nullptr) { if (item != nullptr) {
hotkey.keycodes.clear(); hotkey.keycodes.clear();
if (item->value.has_value()) ParseHotkeys(hotkey, item->value->c_str()); if (item->value.has_value()) ParseHotkeys(hotkey, *item->value);
} }
} }
} }