xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix debug keys output for shift/ctrl modified mouse events

Browse Source 
Although Kakoune responds to modified mouse events, they show up in the
debug buffer corrupted. to_string() tests for equality on the mouse event
modifiers rather than testing just the relevant bits, so the modified
mouse events incorrectly fall through to the normal key handling.

Fix this and restructure to allow mouse events to be modifier-prefixed.

Signed-off-by: Chris Webb <chris@arachsys.com>
This commit is contained in:
Chris Webb 2023-05-11 20:21:31 +01:00
parent a69be6288c
commit 2f1e536ac7
1 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/keys.cc
View File

@ -184,37 +184,33 @@ Key::MouseButton str_to_button(StringView str)
String to_string(Key key) String to_string(Key key)
{ {
const auto coord = key.coord() + DisplayCoord{1,1}; const auto coord = key.coord() + DisplayCoord{1,1};
switch (Key::Modifiers(key.modifiers & ~Key::Modifiers::MouseButtonMask)) bool named = true;
{
case Key::Modifiers::MousePos:
return format("<mouse:move:{}.{}>", coord.line, coord.column);
case Key::Modifiers::MousePress:
return format("<mouse:press:{}:{}.{}>", key.mouse_button(), coord.line, coord.column);
case Key::Modifiers::MouseRelease:
return format("<mouse:release:{}:{}.{}>", key.mouse_button(), coord.line, coord.column);
case Key::Modifiers::Scroll:
return format("<scroll:{}>", static_cast<int>(key.key));
case Key::Modifiers::Resize:
return format("<resize:{}.{}>", coord.line, coord.column);
default: break;
}
bool named = false;
String res; String res;
if (key.modifiers & Key::Modifiers::MousePos)
res = format("mouse:move:{}.{}", coord.line, coord.column);
else if (key.modifiers & Key::Modifiers::MousePress)
res = format("mouse:press:{}:{}.{}", key.mouse_button(), coord.line, coord.column);
else if (key.modifiers & Key::Modifiers::MouseRelease)
res = format("mouse:release:{}:{}.{}", key.mouse_button(), coord.line, coord.column);
else if (key.modifiers & Key::Modifiers::Scroll)
res = format("scroll:{}", static_cast<int>(key.key));
else if (key.modifiers & Key::Modifiers::Resize)
res = format("resize:{}.{}", coord.line, coord.column);
else
{
auto it = find_if(keynamemap, [&key](const KeyAndName& item) auto it = find_if(keynamemap, [&key](const KeyAndName& item)
{ return item.key == key.key; }); { return item.key == key.key; });
if (it != std::end(keynamemap)) if (it != std::end(keynamemap))
{
named = true;
res = it->name; res = it->name;
}
else if (key.key >= Key::F1 and key.key <= Key::F12) else if (key.key >= Key::F1 and key.key <= Key::F12)
{
named = true;
res = "F" + to_string((int)(key.key - Key::F1 + 1)); res = "F" + to_string((int)(key.key - Key::F1 + 1));
}
else else
{
named = false;
res = String{key.key}; res = String{key.key};
}
}
if (key.modifiers & Key::Modifiers::Shift) { res = "s-" + res; named = true; } if (key.modifiers & Key::Modifiers::Shift) { res = "s-" + res; named = true; }
if (key.modifiers & Key::Modifiers::Alt) { res = "a-" + res; named = true; } if (key.modifiers & Key::Modifiers::Alt) { res = "a-" + res; named = true; }