RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 14:47:44 +00:00
Code Issues Activity Actions

Keymap: Add ability to load keymap files by name

Browse source
This commit is contained in:
Jami Kettunen 2019-12-30 14:06:18 +02:00 • committed by Andreas Kling
parent 0b3f1e70ca
commit 76f0a74b0c
1 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Userland/keymap.cpp
View file

@ -40,10 +40,30 @@ char* read_map(const JsonObject& json, const String& name)
return map; return map;
} }
int read_map_from_file(String filename) RefPtr<CFile> open_keymap_file(String& filename)
{ {
auto file = CFile::construct(filename); auto file = CFile::construct(filename);
if (!file->open(CIODevice::ReadOnly)) { if (file->open(CIODevice::ReadOnly))
return file;
if (!filename.ends_with(".json")) {
StringBuilder full_path;
full_path.append("/res/keymaps/");
full_path.append(filename);
full_path.append(".json");
filename = full_path.to_string();
file = CFile::construct(filename);
if (file->open(CIODevice::ReadOnly))
return file;
}
return file;
}
int read_map_from_file(String& filename)
{
auto file = open_keymap_file(filename);
if (!file->is_open()) {
fprintf(stderr, "Failed to open %s: %s\n", filename.characters(), file->error_string()); fprintf(stderr, "Failed to open %s: %s\n", filename.characters(), file->error_string());
return 1; return 1;
} }
@ -61,7 +81,7 @@ int read_map_from_file(String filename)
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
if (argc != 2) { if (argc != 2) {
fprintf(stderr, "usage: keymap <file>\n"); fprintf(stderr, "usage: keymap <name|file>\n");
return 0; return 0;
} }