mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2025-02-07 17:08:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use std::unordered_map

Browse Source
This commit is contained in:
Chris Thrasher 2023-01-23 15:02:44 -07:00
parent 9f08d67dcc
commit 0c418dce4d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/SFML/Window/Unix/KeyboardImpl.cpp
View File

@ -37,8 +37,8 @@
#include <X11/keysym.h> #include <X11/keysym.h>
#include <cstring> #include <cstring>
#include <map>
#include <string> #include <string>
#include <unordered_map>
#include <utility> #include <utility>
namespace namespace
@ -275,9 +275,9 @@ sf::Keyboard::Scancode translateKeyCode(Display* display, KeyCode keycode)
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
std::map<std::string, sf::Keyboard::Scancode> getNameScancodeMap() std::unordered_map<std::string, sf::Keyboard::Scancode> getNameScancodeMap()
{ {
std::map<std::string, sf::Keyboard::Scancode> mapping; std::unordered_map<std::string, sf::Keyboard::Scancode> mapping;
mapping.emplace("LSGT", sf::Keyboard::Scan::NonUsBackslash); mapping.emplace("LSGT", sf::Keyboard::Scan::NonUsBackslash);
@ -471,8 +471,8 @@ void ensureMapping()
XkbDescPtr descriptor = XkbGetMap(display, 0, XkbUseCoreKbd); XkbDescPtr descriptor = XkbGetMap(display, 0, XkbUseCoreKbd);
XkbGetNames(display, XkbKeyNamesMask, descriptor); XkbGetNames(display, XkbKeyNamesMask, descriptor);
std::map<std::string, sf::Keyboard::Scancode> nameScancodeMap = getNameScancodeMap(); std::unordered_map<std::string, sf::Keyboard::Scancode> nameScancodeMap = getNameScancodeMap();
sf::Keyboard::Scancode scancode = sf::Keyboard::Scan::Unknown; sf::Keyboard::Scancode scancode = sf::Keyboard::Scan::Unknown;
for (int keycode = descriptor->min_key_code; keycode <= descriptor->max_key_code; ++keycode) for (int keycode = descriptor->min_key_code; keycode <= descriptor->max_key_code; ++keycode)
{ {
@ -484,8 +484,9 @@ void ensureMapping()
std::memcpy(name, descriptor->names->keys[keycode].name, XkbKeyNameLength); std::memcpy(name, descriptor->names->keys[keycode].name, XkbKeyNameLength);
name[XkbKeyNameLength] = '\0'; name[XkbKeyNameLength] = '\0';
std::map<std::string, sf::Keyboard::Scancode>::iterator mappedScancode = nameScancodeMap.find(std::string(name)); std::unordered_map<std::string, sf::Keyboard::Scancode>::iterator mappedScancode = nameScancodeMap.find(
scancode = sf::Keyboard::Scan::Unknown; std::string(name));
scancode = sf::Keyboard::Scan::Unknown;
if (mappedScancode != nameScancodeMap.end()) if (mappedScancode != nameScancodeMap.end())
scancode = mappedScancode->second; scancode = mappedScancode->second;