aboutsummaryrefslogtreecommitdiff
path: root/include/rootston
diff options
context:
space:
mode:
authorTony Crisci <tony@dubstepdish.com>2017-10-03 18:58:38 -0400
committerTony Crisci <tony@dubstepdish.com>2017-10-03 18:58:38 -0400
commit30eabf38b8a79f95a8bad441833b062a4d34d1fc (patch)
treec8e39ef48bfa4db116dfd3b51167617e5d2b8683 /include/rootston
parent4c9807d3a68688ee0d6f96e3fc2a60f5edcca857 (diff)
parent836242b0c4b6028c6d04209f575d894fbfe85b08 (diff)
Merge branch 'master' into feature/xdg-popup
Diffstat (limited to 'include/rootston')
-rw-r--r--include/rootston/config.h9
-rw-r--r--include/rootston/input.h4
2 files changed, 13 insertions, 0 deletions
diff --git a/include/rootston/config.h b/include/rootston/config.h
index 0832d88d..ece11829 100644
--- a/include/rootston/config.h
+++ b/include/rootston/config.h
@@ -18,6 +18,14 @@ struct device_config {
struct wl_list link;
};
+struct binding_config {
+ uint32_t modifiers;
+ xkb_keysym_t *keysyms;
+ size_t keysyms_len;
+ char *command;
+ struct wl_list link;
+};
+
struct roots_config {
// TODO: Multiple cursors, multiseat
struct {
@@ -27,6 +35,7 @@ struct roots_config {
struct wl_list outputs;
struct wl_list devices;
+ struct wl_list bindings;
char *config_path;
};
diff --git a/include/rootston/input.h b/include/rootston/input.h
index ecd53f3b..6161eb7a 100644
--- a/include/rootston/input.h
+++ b/include/rootston/input.h
@@ -10,11 +10,15 @@
#include "rootston/view.h"
#include "rootston/server.h"
+#define ROOTS_KEYBOARD_PRESSED_KEYSYMS_CAP 32
+
struct roots_keyboard {
struct roots_input *input;
struct wlr_input_device *device;
struct wl_listener key;
struct wl_list link;
+
+ xkb_keysym_t pressed_keysyms[ROOTS_KEYBOARD_PRESSED_KEYSYMS_CAP];
};
struct roots_pointer {