LibInput: Pass raw scancode in KeyEvent
This commit is contained in:
parent
2d314e72fe
commit
4d080b30ab
|
@ -46,7 +46,7 @@ namespace LibInput
|
||||||
};
|
};
|
||||||
static_assert((size_t)Key::Count == sizeof(utf8_upper) / sizeof(*utf8_lower));
|
static_assert((size_t)Key::Count == sizeof(utf8_upper) / sizeof(*utf8_lower));
|
||||||
|
|
||||||
KeyEvent event { .modifier = modifier, .key = key };
|
KeyEvent event { .modifier = modifier, .scancode = 0, .key = key };
|
||||||
return (event.shift() ^ event.caps_lock()) ? utf8_upper[static_cast<uint8_t>(key)] : utf8_lower[static_cast<uint8_t>(key)];
|
return (event.shift() ^ event.caps_lock()) ? utf8_upper[static_cast<uint8_t>(key)] : utf8_lower[static_cast<uint8_t>(key)];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -109,7 +109,7 @@ namespace LibInput
|
||||||
};
|
};
|
||||||
static_assert((size_t)Key::Count == sizeof(utf8_upper) / sizeof(*utf8_upper));
|
static_assert((size_t)Key::Count == sizeof(utf8_upper) / sizeof(*utf8_upper));
|
||||||
|
|
||||||
KeyEvent event { .modifier = modifier, .key = key };
|
KeyEvent event { .modifier = modifier, .scancode = 0, .key = key };
|
||||||
if (event.ctrl())
|
if (event.ctrl())
|
||||||
return utf8_ctrl[static_cast<uint8_t>(key)];
|
return utf8_ctrl[static_cast<uint8_t>(key)];
|
||||||
if (event.shift() ^ event.caps_lock())
|
if (event.shift() ^ event.caps_lock())
|
||||||
|
|
|
@ -85,6 +85,7 @@ namespace LibInput
|
||||||
{
|
{
|
||||||
KeyEvent result;
|
KeyEvent result;
|
||||||
result.modifier = event.modifier;
|
result.modifier = event.modifier;
|
||||||
|
result.scancode = event.keycode;
|
||||||
if (result.shift())
|
if (result.shift())
|
||||||
result.key = m_keycode_to_key_shift[event.keycode];
|
result.key = m_keycode_to_key_shift[event.keycode];
|
||||||
else if (result.ralt())
|
else if (result.ralt())
|
||||||
|
|
|
@ -97,6 +97,7 @@ namespace LibInput
|
||||||
bool released() const { return !pressed(); }
|
bool released() const { return !pressed(); }
|
||||||
|
|
||||||
uint16_t modifier;
|
uint16_t modifier;
|
||||||
|
uint8_t scancode;
|
||||||
Key key;
|
Key key;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue