RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 05:27:46 +00:00
Code Issues Activity Actions

LibLine: Support multi-character key callbacks

Browse source
This commit is contained in:
AnotherTest 2020-10-19 09:39:36 +03:30 • committed by Andreas Kling
parent f79e28bd65
commit c057225a36
5 changed files with 259 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Libraries/LibLine/Editor.h
View file

@ -41,6 +41,7 @@
#include <LibCore/DirIterator.h>
#include <LibCore/Notifier.h>
#include <LibCore/Object.h>
#include <LibLine/KeyCallbackMachine.h>
#include <LibLine/Span.h>
#include <LibLine/StringMetrics.h>
#include <LibLine/Style.h>
@ -53,33 +54,8 @@
namespace Line {
struct Key {
enum Modifier : int {
None = 0,
Alt = 1,
};
int modifiers { None };
unsigned key { 0 };
Key(unsigned c)
: modifiers(None)
, key(c) {};
Key(unsigned c, int modifiers)
: modifiers(modifiers)
, key(c)
{
}
bool operator==(const Key& other) const
{
return other.key == key && other.modifiers == modifiers;
}
};
struct KeyBinding {
Key key;
Vector<Key> keys;
enum class Kind {
InternalFunction,
Insertion,
@ -171,7 +147,8 @@ public:
const Vector<String>& history() const { return m_history; }
void register_key_input_callback(const KeyBinding&);
void register_key_input_callback(Key, Function<bool(Editor&)> callback);
void register_key_input_callback(Vector<Key> keys, Function<bool(Editor&)> callback) { m_callback_machine.register_key_input_callback(move(keys), move(callback)); }
void register_key_input_callback(Key key, Function<bool(Editor&)> callback) { register_key_input_callback(Vector<Key> { key }, move(callback)); }
static StringMetrics actual_rendered_string_metrics(const StringView&);
static StringMetrics actual_rendered_string_metrics(const Utf32View&);
@ -283,14 +260,6 @@ private:
// FIXME: Port to Core::Property
void save_to(JsonObject&);
struct KeyCallback {
KeyCallback(Function<bool(Editor&)> cb)
: callback(move(cb))
{
}
Function<bool(Editor&)> callback;
};
void handle_interrupt_event();
void handle_read_event();
@ -460,7 +429,7 @@ private:
};
TabDirection m_tab_direction { TabDirection::Forward };
HashMap<Key, NonnullOwnPtr<KeyCallback>> m_key_callbacks;
KeyCallbackMachine m_callback_machine;
struct termios m_termios {
};
@ -500,13 +469,3 @@ private:
};
}
namespace AK {
template<>
struct Traits<Line::Key> : public GenericTraits<Line::Key> {
static constexpr bool is_trivial() { return true; }
static unsigned hash(Line::Key k) { return pair_int_hash(k.key, k.modifiers); }
};
}