Miroirs/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-11-16 07:48:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

natkeyboard.cpp: Convert more string posting methods to std::string_view
Some checks failed
CI (Linux) / build-linux (-U_FORTIFY_SOURCE, gcc, gcc, g++, mametiny, tiny) (push) Has been cancelled
Details
CI (Linux) / build-linux (clang, clang, clang++, mame, mame) (push) Has been cancelled
Details
CI (macOS) / build-macos (push) Has been cancelled
Details
CI (Windows) / build-windows (clang, clang, clang++, mametiny, tiny) (push) Has been cancelled
Details
CI (Windows) / build-windows (gcc, gcc, g++, mame, mame) (push) Has been cancelled
Details
XML/JSON validation / validate (push) Has been cancelled
Details

Browse source
This commit is contained in:
AJR 2024-09-14 21:00:09 -04:00
parent b895038b02
commit 15dd5beab4
2 changed files with 49 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
src/emu/natkeyboard.cpp
View file

@ -455,22 +455,19 @@ void natural_keyboard::post_char(char32_t ch, bool normalize_crlf)
// post - post a unicode encoded string
//-------------------------------------------------
void natural_keyboard::post(const char32_t *text, size_t length, const attotime &rate)
void natural_keyboard::post(std::u32string_view text, const attotime &rate)
{
// set the fixed rate
m_current_rate = rate;
// 0 length means strlen
if (length == 0)
for (const char32_t *scan = text; *scan != 0; scan++)
length++;
// iterate over characters or until the buffer is full up
while (length > 0 && !full())
for (char32_t ch : text)
{
if (full())
break;
// fetch next character
post_char(*text++, true);
length--;
post_char(ch, true);
}
}
@ -479,21 +476,17 @@ void natural_keyboard::post(const char32_t *text, size_t length, const attotime
// post_utf8 - post a UTF-8 encoded string
//-------------------------------------------------
void natural_keyboard::post_utf8(const char *text, size_t length, const attotime &rate)
void natural_keyboard::post_utf8(std::string_view text, const attotime &rate)
{
// set the fixed rate
m_current_rate = rate;
// 0-length means strlen
if (length == 0)
length = strlen(text);
// iterate until out of characters
while (length > 0)
while (!text.empty())
{
// decode the next character
char32_t uc;
int count = uchar_from_utf8(&uc, text, length);
int count = uchar_from_utf8(&uc, text);
if (count < 0)
{
count = 1;
@ -502,83 +495,71 @@ void natural_keyboard::post_utf8(const char *text, size_t length, const attotime
// append to the buffer
post_char(uc, true);
text += count;
length -= count;
text.remove_prefix(count);
}
}
void natural_keyboard::post_utf8(std::string_view text, const attotime &rate)
{
if (!text.empty())
post_utf8(text.data(), text.size(), rate);
}
//-------------------------------------------------
// post_coded - post a coded string
//-------------------------------------------------
void natural_keyboard::post_coded(const char *text, size_t length, const attotime &rate)
void natural_keyboard::post_coded(std::string_view text, const attotime &rate)
{
using namespace std::literals;
static const struct
{
const char *key;
std::string_view key;
char32_t code;
} codes[] =
{
{ "BACKSPACE", 8 },
{ "BS", 8 },
{ "BKSP", 8 },
{ "DEL", UCHAR_MAMEKEY(DEL) },
{ "DELETE", UCHAR_MAMEKEY(DEL) },
{ "END", UCHAR_MAMEKEY(END) },
{ "ENTER", 13 },
{ "ESC", '\033' },
{ "HOME", UCHAR_MAMEKEY(HOME) },
{ "INS", UCHAR_MAMEKEY(INSERT) },
{ "INSERT", UCHAR_MAMEKEY(INSERT) },
{ "PGDN", UCHAR_MAMEKEY(PGDN) },
{ "PGUP", UCHAR_MAMEKEY(PGUP) },
{ "SPACE", 32 },
{ "TAB", 9 },
{ "F1", UCHAR_MAMEKEY(F1) },
{ "F2", UCHAR_MAMEKEY(F2) },
{ "F3", UCHAR_MAMEKEY(F3) },
{ "F4", UCHAR_MAMEKEY(F4) },
{ "F5", UCHAR_MAMEKEY(F5) },
{ "F6", UCHAR_MAMEKEY(F6) },
{ "F7", UCHAR_MAMEKEY(F7) },
{ "F8", UCHAR_MAMEKEY(F8) },
{ "F9", UCHAR_MAMEKEY(F9) },
{ "F10", UCHAR_MAMEKEY(F10) },
{ "F11", UCHAR_MAMEKEY(F11) },
{ "F12", UCHAR_MAMEKEY(F12) },
{ "QUOTE", '\"' }
{ "BACKSPACE"sv, 8 },
{ "BS"sv, 8 },
{ "BKSP"sv, 8 },
{ "DEL"sv, UCHAR_MAMEKEY(DEL) },
{ "DELETE"sv, UCHAR_MAMEKEY(DEL) },
{ "END"sv, UCHAR_MAMEKEY(END) },
{ "ENTER"sv, 13 },
{ "ESC"sv, '\033' },
{ "HOME"sv, UCHAR_MAMEKEY(HOME) },
{ "INS"sv, UCHAR_MAMEKEY(INSERT) },
{ "INSERT"sv, UCHAR_MAMEKEY(INSERT) },
{ "PGDN"sv, UCHAR_MAMEKEY(PGDN) },
{ "PGUP"sv, UCHAR_MAMEKEY(PGUP) },
{ "SPACE"sv, 32 },
{ "TAB"sv, 9 },
{ "F1"sv, UCHAR_MAMEKEY(F1) },
{ "F2"sv, UCHAR_MAMEKEY(F2) },
{ "F3"sv, UCHAR_MAMEKEY(F3) },
{ "F4"sv, UCHAR_MAMEKEY(F4) },
{ "F5"sv, UCHAR_MAMEKEY(F5) },
{ "F6"sv, UCHAR_MAMEKEY(F6) },
{ "F7"sv, UCHAR_MAMEKEY(F7) },
{ "F8"sv, UCHAR_MAMEKEY(F8) },
{ "F9"sv, UCHAR_MAMEKEY(F9) },
{ "F10"sv, UCHAR_MAMEKEY(F10) },
{ "F11"sv, UCHAR_MAMEKEY(F11) },
{ "F12"sv, UCHAR_MAMEKEY(F12) },
{ "QUOTE"sv, '\"' }
};
// set the fixed rate
m_current_rate = rate;
// 0-length means strlen
if (length == 0)
length = strlen(text);
// iterate through the source string
size_t curpos = 0;
while (curpos < length)
while (!text.empty())
{
// extract next character
char32_t ch = text[curpos];
size_t increment = 1;
char32_t ch = text.front();
std::string_view::size_type increment = 1;
// look for escape characters
if (ch == '{')
for (auto & code : codes)
{
size_t keylen = strlen(code.key);
if (curpos + keylen + 2 <= length)
if (core_strnicmp(code.key, &text[curpos + 1], keylen) == 0 && text[curpos + keylen + 1] == '}')
std::string_view::size_type keylen = code.key.length();
if (keylen + 2 <= text.length())
if (util::strequpper(text.substr(1, keylen), code.key) && text[keylen + 1] == '}')
{
ch = code.code;
increment = keylen + 2;
@ -588,18 +569,11 @@ void natural_keyboard::post_coded(const char *text, size_t length, const attotim
// if we got a code, post it
if (ch != 0)
post_char(ch);
curpos += increment;
text.remove_prefix(increment);
}
}
void natural_keyboard::post_coded(std::string_view text, const attotime &rate)
{
if (!text.empty())
post_coded(text.data(), text.size(), rate);
}
//-------------------------------------------------
// paste - does a paste from the keyboard
//-------------------------------------------------

4
src/emu/natkeyboard.h
View file

@ -62,10 +62,8 @@ public:
// posting
void post_char(char32_t ch, bool normalize_crlf = false);
void post(const char32_t *text, size_t length = 0, const attotime &rate = attotime::zero);
void post_utf8(const char *text, size_t length = 0, const attotime &rate = attotime::zero);
void post(std::u32string_view text, const attotime &rate = attotime::zero);
void post_utf8(std::string_view text, const attotime &rate = attotime::zero);
void post_coded(const char *text, size_t length = 0, const attotime &rate = attotime::zero);
void post_coded(std::string_view text, const attotime &rate = attotime::zero);
void paste();