ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-21 22:47:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

acpi_event: generalize config for any key

Browse Source 
Fixes #4748
This commit is contained in:
Christian Helmuth 2023-01-31 16:33:13 +01:00
parent 3403a91213
commit 264ee999a1
2 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
repos/libports/src/app/acpi_event/main.cc
View File

@ -147,7 +147,7 @@ struct Transform::Main
uint64_t acpi_value = 0;
String<8> acpi_type;
String<8> acpi_value_string;
String<32> to_key;
Input::Key_name to_key;
String<16> key_type("PRESS_RELEASE");
Keys::Type press_release = Keys::Type::PRESS_RELEASE;
@ -185,24 +185,7 @@ struct Transform::Main
} else
map_node.attribute("value").value(acpi_value);
Input::Keycode key_code = Input::Keycode::KEY_UNKNOWN;
if (to_key == "KEY_VENDOR")
key_code = Input::Keycode::KEY_VENDOR;
else if (to_key == "KEY_POWER")
key_code = Input::Keycode::KEY_POWER;
else if (to_key == "KEY_SLEEP")
key_code = Input::Keycode::KEY_SLEEP;
else if (to_key == "KEY_WAKEUP")
key_code = Input::Keycode::KEY_WAKEUP;
else if (to_key == "KEY_BATTERY")
key_code = Input::Keycode::KEY_BATTERY;
else if (to_key == "KEY_BRIGHTNESSUP")
key_code = Input::Keycode::KEY_BRIGHTNESSUP;
else if (to_key == "KEY_BRIGHTNESSDOWN")
key_code = Input::Keycode::KEY_BRIGHTNESSDOWN;
else if (to_key == "KEY_FN_F4")
key_code = Input::Keycode::KEY_FN_F4;
Input::Keycode key_code = Input::key_code(to_key);
if (key_code == Input::Keycode::KEY_UNKNOWN)
throw 4;
@ -228,17 +211,9 @@ struct Transform::Main
throw 5;
} catch (...) {
using namespace Genode;
map_node.with_raw_node([&] (char const *start, size_t length) {
String<64> invalid_node(Cstring(start, length));
error("map item : '", invalid_node, "'");
/* abort on malformed configuration */
class Invalid_config { };
throw Invalid_config();
});
/* abort on malformed configuration */
error("map item '", map_node, "' Aborting...");
env.parent().exit(1);
}
});

2
repos/os/include/input/keycodes.h
View File

@ -489,7 +489,7 @@ namespace Input {
/**
* Return key code for name (linear search)
*/
Keycode key_code(Key_name name)
static inline Keycode key_code(Key_name const &name)
{
for (unsigned i = 0; i < KEY_MAX; ++i) {
Keycode const code = Keycode(i);