Skip to content

implement keyboard input #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 31, 2020
Merged

implement keyboard input #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d9ca42
initial text input channel support
ardera Jan 25, 2020
38d7367
update 2
ardera Jan 29, 2020
7656977
add initial text input support
ardera Jan 30, 2020
d8e4e11
text input & unicode support working
ardera Jan 31, 2020
7801482
added raw keyboard input
ardera Jan 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
out
.vscode
build.sh
build.sh
compile_commands.json
.clang-format
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
CC = cc
LD = cc
REAL_CFLAGS = -I./include $(shell pkg-config --cflags dri gbm libdrm glesv2 egl) -DBUILD_ELM327PLUGIN $(CFLAGS)
REAL_CFLAGS = -I./include $(shell pkg-config --cflags dri gbm libdrm glesv2 egl) -DBUILD_ELM327_PLUGIN -DBUILD_TEST_PLUGIN -ggdb $(CFLAGS)
REAL_LDFLAGS = $(shell pkg-config --libs dri gbm libdrm glesv2 egl) -lrt -lflutter_engine -lpthread -ldl $(LDFLAGS)

SOURCES = src/flutter-pi.c src/platformchannel.c src/pluginregistry.c src/plugins/elm327plugin.c src/plugins/services-plugin.c src/plugins/testplugin.c
SOURCES = src/flutter-pi.c src/platformchannel.c src/pluginregistry.c src/console_keyboard.c \
src/plugins/elm327plugin.c src/plugins/services-plugin.c src/plugins/testplugin.c src/plugins/text_input.c \
src/plugins/raw_keyboard.c
OBJECTS = $(patsubst src/%.c,out/obj/%.o,$(SOURCES))

all: out/flutter-pi
Expand Down
191 changes: 191 additions & 0 deletions include/console_keyboard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
#ifndef _CONSOLE_KEYBOARD_H
#define _CONSOLE_KEYBOARD_H

#include <stdlib.h>
#include <linux/input-event-codes.h>

// small subset of the GLFW key ids.
// (only the ones needed for text input)

typedef enum {
GLFW_KEY_UNKNOWN = -1,
GLFW_KEY_SPACE = 32,
GLFW_KEY_APOSTROPHE = 39,
GLFW_KEY_COMMA = 44,
GLFW_KEY_MINUS = 45,
GLFW_KEY_PERIOD = 46,
GLFW_KEY_SLASH = 47,
GLFW_KEY_0 = 48,
GLFW_KEY_1 = 49,
GLFW_KEY_2 = 50,
GLFW_KEY_3 = 51,
GLFW_KEY_4 = 52,
GLFW_KEY_5 = 53,
GLFW_KEY_6 = 54,
GLFW_KEY_7 = 55,
GLFW_KEY_8 = 56,
GLFW_KEY_9 = 57,
GLFW_KEY_SEMICOLON = 59,
GLFW_KEY_EQUAL = 61,
GLFW_KEY_A = 65,
GLFW_KEY_B = 66,
GLFW_KEY_C = 67,
GLFW_KEY_D = 68,
GLFW_KEY_E = 69,
GLFW_KEY_F = 70,
GLFW_KEY_G = 71,
GLFW_KEY_H = 72,
GLFW_KEY_I = 73,
GLFW_KEY_J = 74,
GLFW_KEY_K = 75,
GLFW_KEY_L = 76,
GLFW_KEY_M = 77,
GLFW_KEY_N = 78,
GLFW_KEY_O = 79,
GLFW_KEY_P = 80,
GLFW_KEY_Q = 81,
GLFW_KEY_R = 82,
GLFW_KEY_S = 83,
GLFW_KEY_T = 84,
GLFW_KEY_U = 85,
GLFW_KEY_V = 86,
GLFW_KEY_W = 87,
GLFW_KEY_X = 88,
GLFW_KEY_Y = 89,
GLFW_KEY_Z = 90,
GLFW_KEY_LEFT_BRACKET = 91,
GLFW_KEY_BACKSLASH = 92,
GLFW_KEY_RIGHT_BRACKET = 93,
GLFW_KEY_GRAVE_ACCENT = 96,
GLFW_KEY_WORLD_1 = 161,
GLFW_KEY_WORLD_2 = 162,
GLFW_KEY_ESCAPE = 256,
GLFW_KEY_ENTER = 257,
GLFW_KEY_TAB = 258,
GLFW_KEY_BACKSPACE = 259,
GLFW_KEY_INSERT = 260,
GLFW_KEY_DELETE = 261,
GLFW_KEY_RIGHT = 262,
GLFW_KEY_LEFT = 263,
GLFW_KEY_DOWN = 264,
GLFW_KEY_UP = 265,
GLFW_KEY_PAGE_UP = 266,
GLFW_KEY_PAGE_DOWN = 267,
GLFW_KEY_HOME = 268,
GLFW_KEY_END = 269,
GLFW_KEY_CAPS_LOCK = 280,
GLFW_KEY_SCROLL_LOCK = 281,
GLFW_KEY_NUM_LOCK = 282,
GLFW_KEY_PRINT_SCREEN = 283,
GLFW_KEY_PAUSE = 284,
GLFW_KEY_F1 = 290,
GLFW_KEY_F2 = 291,
GLFW_KEY_F3 = 292,
GLFW_KEY_F4 = 293,
GLFW_KEY_F5 = 294,
GLFW_KEY_F6 = 295,
GLFW_KEY_F7 = 296,
GLFW_KEY_F8 = 297,
GLFW_KEY_F9 = 298,
GLFW_KEY_F10 = 299,
GLFW_KEY_F11 = 300,
GLFW_KEY_F12 = 301,
GLFW_KEY_F13 = 302,
GLFW_KEY_F14 = 303,
GLFW_KEY_F15 = 304,
GLFW_KEY_F16 = 305,
GLFW_KEY_F17 = 306,
GLFW_KEY_F18 = 307,
GLFW_KEY_F19 = 308,
GLFW_KEY_F20 = 309,
GLFW_KEY_F21 = 310,
GLFW_KEY_F22 = 311,
GLFW_KEY_F23 = 312,
GLFW_KEY_F24 = 313,
GLFW_KEY_F25 = 314,
GLFW_KEY_KP_0 = 320,
GLFW_KEY_KP_1 = 321,
GLFW_KEY_KP_2 = 322,
GLFW_KEY_KP_3 = 323,
GLFW_KEY_KP_4 = 324,
GLFW_KEY_KP_5 = 325,
GLFW_KEY_KP_6 = 326,
GLFW_KEY_KP_7 = 327,
GLFW_KEY_KP_8 = 328,
GLFW_KEY_KP_9 = 329,
GLFW_KEY_KP_DECIMAL = 330,
GLFW_KEY_KP_DIVIDE = 331,
GLFW_KEY_KP_MULTIPLY = 332,
GLFW_KEY_KP_SUBTRACT = 333,
GLFW_KEY_KP_ADD = 334,
GLFW_KEY_KP_ENTER = 335,
GLFW_KEY_KP_EQUAL = 336,
GLFW_KEY_LEFT_SHIFT = 340,
GLFW_KEY_LEFT_CONTROL = 341,
GLFW_KEY_LEFT_ALT = 342,
GLFW_KEY_LEFT_SUPER = 343,
GLFW_KEY_RIGHT_SHIFT = 344,
GLFW_KEY_RIGHT_CONTROL = 345,
GLFW_KEY_RIGHT_ALT = 346,
GLFW_KEY_RIGHT_SUPER = 347,
GLFW_KEY_MENU = 348,
} glfw_key;

#define GLFW_KEY_LAST 348

typedef enum {
GLFW_RELEASE = 0,
GLFW_PRESS = 1,
GLFW_REPEAT = 2
} glfw_key_action;

typedef enum {
GLFW_MOD_SHIFT = 1,
GLFW_MOD_CONTROL = 2,
GLFW_MOD_ALT = 4,
GLFW_MOD_SUPER = 8,
GLFW_MOD_CAPS_LOCK = 16,
GLFW_MOD_NUM_LOCK = 32
} glfw_keymod;

#define GLFW_KEYMOD_FOR_KEY(keycode) \
(((keycode == GLFW_KEY_LEFT_SHIFT) || (keycode == GLFW_KEY_RIGHT_SHIFT)) ? GLFW_MOD_SHIFT : \
((keycode == GLFW_KEY_LEFT_CONTROL) || (keycode == GLFW_KEY_RIGHT_CONTROL)) ? GLFW_MOD_CONTROL : \
((keycode == GLFW_KEY_LEFT_ALT) || (keycode == GLFW_KEY_RIGHT_ALT)) ? GLFW_MOD_ALT : \
((keycode == GLFW_KEY_LEFT_SUPER) || (keycode == GLFW_KEY_RIGHT_SUPER)) ? GLFW_MOD_SUPER : \
(keycode == GLFW_KEY_CAPS_LOCK) ? GLFW_MOD_CAPS_LOCK : \
(keycode == GLFW_KEY_NUM_LOCK) ? GLFW_MOD_NUM_LOCK : 0);

#define GLFW_KEY_IS_RIGHTSIDED(keycode) \
((keycode == GLFW_KEY_RIGHT_SHIFT) ? true : \
(keycode == GLFW_KEY_RIGHT_CONTROL) ? true : \
(keycode == GLFW_KEY_RIGHT_ALT) ? true : \
(keycode == GLFW_KEY_RIGHT_SUPER) ? true : false)

typedef uint8_t glfw_keymod_map;

extern char *glfw_key_control_sequence[GLFW_KEY_LAST+1];
extern glfw_key evdev_code_glfw_key[KEY_CNT];

#define EVDEV_KEY_TO_GLFW_KEY(key) evdev_code_glfw_key[key]


int console_flush_stdin(void);
int console_make_raw(void);
int console_restore(void);

/// tries to parse the console input represented by the string `input`
/// as a keycode ()
size_t utf8_symbol_length(char *c);

static inline char *utf8_symbol_at(char *utf8str, unsigned int symbol_index) {
for (; symbol_index && *utf8str; symbol_index--)
utf8str += utf8_symbol_length(utf8str);

return symbol_index? NULL : utf8str;
}

glfw_key console_try_get_key(char *input, char **input_out);
char *console_try_get_utf8char(char *input, char **input_out);

#endif
10 changes: 9 additions & 1 deletion include/flutter-pi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ struct mousepointer_mtslot {
FlutterPointerPhase phase;
};


#define INPUT_BUSTYPE_FRIENDLY_NAME(bustype) ( \
(bustype) == BUS_PCI ? "PCI/e" : \
(bustype) == BUS_USB ? "USB" : \
Expand All @@ -91,6 +92,14 @@ struct mousepointer_mtslot {
(code) == BTN_BACK ? kFlutterPointerButtonMouseBack : \
(code) == BTN_TOUCH ? (1 << 8) : 0)

#define MODIFIER_KEY_FROM_EVENT_CODE(code) ((uint16_t) \
((code) == KEY_LEFTCTRL) || ((code) == KEY_RIGHTCTRL) ? kControlModifier : \
((code) == KEY_LEFTSHIFT) || ((code) == KEY_RIGHTSHIFT) ? kShiftModifier : \
((code) == KEY_LEFTALT) || ((code) == KEY_RIGHTALT) ? kAltModifier : \
((code) == KEY_LEFTMETA) || ((code) == KEY_RIGHTMETA) ? kMetaModifier : \
((code) == KEY_CAPSLOCK) ? kCapsLockModifier : \
((code) == KEY_NUMLOCK) ? kNumLockModifier : 0)

#define POINTER_PHASE_AS_STRING(phase) ( \
(phase) == kCancel ? "kCancel" : \
(phase) == kUp ? "kUp" : \
Expand Down Expand Up @@ -126,7 +135,6 @@ struct input_device {
size_t n_mtslots;
size_t i_active_mtslot;
struct mousepointer_mtslot *mtslots;
//struct mousepointer_mtslot *active_mtslot;

// currently pressed buttons (for mouse, touchpad, stylus)
// (active_buttons & 0xFF) will be the value of the "buttons" field
Expand Down
7 changes: 6 additions & 1 deletion include/platformchannel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@ typedef int (*PlatformMessageResponseCallback)(struct ChannelObject *object, voi
/// you'd have to manually deep-copy it.
int PlatformChannel_decode(uint8_t *buffer, size_t size, enum ChannelCodec codec, struct ChannelObject *object_out);

/// decodes a JSON String into a JSONMsgCodecValue
int PlatformChannel_decodeJSON(char *string, struct JSONMsgCodecValue *out);

/// Encodes a generic ChannelObject into a buffer (that is, too, allocated by PlatformChannel_encode)
/// A pointer to the buffer is put into buffer_out and the size of that buffer into size_out.
/// The lifetime of the buffer is independent of the ChannelObject, so contents of the ChannelObject
Expand Down Expand Up @@ -246,9 +249,11 @@ int PlatformChannel_respondError(FlutterPlatformMessageResponseHandle *handle, e
/// not freeing ChannelObjects may result in a memory leak.
int PlatformChannel_free(struct ChannelObject *object);

int PlatformChannel_freeJSONMsgCodecValue(struct JSONMsgCodecValue *value, bool shallow);

/// returns true if values a and b are equal.
/// for JS arrays, the order of the values is relevant
/// (so two arrays are only equal if the same values in appear in exactly same order)
/// (so two arrays are only equal if the same values appear in exactly same order)
/// for objects, the order of the entries is irrelevant.
bool jsvalue_equals(struct JSONMsgCodecValue *a, struct JSONMsgCodecValue *b);

Expand Down
Loading