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

Merge remote-tracking branch 'krobelus/fix-mouse-click-during-insert'

Browse Source
This commit is contained in:
Maxime Coste 2023-01-18 07:48:37 +11:00
commit d8883d47c0
6 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/context.hh
View File

@ -117,7 +117,6 @@ public:
bool is_editing() const { return m_edition_level!= 0; } bool is_editing() const { return m_edition_level!= 0; }
void disable_undo_handling() { m_edition_level = -1; } void disable_undo_handling() { m_edition_level = -1; }
bool is_editing_selection() const { return m_selection_history.in_edition(); }
NestedBool& hooks_disabled() { return m_hooks_disabled; } NestedBool& hooks_disabled() { return m_hooks_disabled; }
const NestedBool& hooks_disabled() const { return m_hooks_disabled; } const NestedBool& hooks_disabled() const { return m_hooks_disabled; }

2
src/input_handler.cc
View File

@ -100,7 +100,6 @@ struct MouseHandler
switch (key.mouse_button()) switch (key.mouse_button())
{ {
case Key::MouseButton::Right: { case Key::MouseButton::Right: {
kak_assert(not context.is_editing_selection());
m_dragging.reset(); m_dragging.reset();
cursor = context.window().buffer_coord(key.coord()); cursor = context.window().buffer_coord(key.coord());
ScopedSelectionEdition selection_edition{context}; ScopedSelectionEdition selection_edition{context};
@ -114,7 +113,6 @@ struct MouseHandler
} }
case Key::MouseButton::Left: { case Key::MouseButton::Left: {
kak_assert(not context.is_editing_selection());
m_dragging.reset(new ScopedSelectionEdition{context}); m_dragging.reset(new ScopedSelectionEdition{context});
m_anchor = context.window().buffer_coord(key.coord()); m_anchor = context.window().buffer_coord(key.coord());
if (not (key.modifiers & Key::Modifiers::Control)) if (not (key.modifiers & Key::Modifiers::Control))

1
test/regression/0-mouse-during-insert/cmd Normal file
View File

@ -0,0 +1 @@

1
test/regression/0-mouse-during-insert/in Normal file
View File

@ -0,0 +1 @@
123

1
test/regression/0-mouse-during-insert/out Normal file
View File

@ -0,0 +1 @@
a1b2c3

11
test/regression/0-mouse-during-insert/script Normal file
View File

@ -0,0 +1,11 @@
ui_out -ignore 4
ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "i" ] }'
ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "a" ] }'
sleep .1
ui_in '{ "jsonrpc": "2.0", "method": "mouse_press", "params": [ "left", 0, 2 ] }'
sleep .1
ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "b" ] }'
sleep .1
ui_in '{ "jsonrpc": "2.0", "method": "mouse_release", "params": [ "left", 0, 4 ] }'
sleep .1
ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "c<esc>" ] }'