Zach's git repos / suggpicker
suggestion picker: a persistent layer to complement virtual keyboards like wvkbd
Diffstat
-rw-r--r--config.def.h13
-rw-r--r--keyboard.c8
-rw-r--r--keyboard.h9
-rw-r--r--main.c10
4 files changed, 2 insertions, 38 deletions
diff --git a/config.def.h b/config.def.h
index 90279d6..ce6d16f 100644
--- a/config.def.h
+++ b/config.def.h
@@ -11,23 +11,10 @@ struct clr_scheme scheme = {
.swipe = {.bgra = {100, 255, 100, 64}},
.text = {.color = UINT32_MAX},
};
-struct clr_scheme scheme1 = {
- /* colors */
- .bg = {.bgra = {15, 15, 15, 225}},
- .fg = {.bgra = {32, 32, 32, 225}},
- .high = {.bgra = {100, 100, 100, 225}},
- .swipe = {.bgra = {100, 255, 100, 64}},
- .text = {.color = UINT32_MAX},
-};
/* layers is an ordered list of layouts, used to cycle through */
static enum layout_id layers[] = {
Full, // First layout is the default layout on startup
};
-/* layers is an ordered list of layouts, used to cycle through */
-static enum layout_id landscape_layers[] = {
- Full, // First layout is the default layout on startup
-};
-
#endif // config_def_h_INCLUDED
diff --git a/keyboard.c b/keyboard.c
index a2c40f3..00a568b 100644
--- a/keyboard.c
+++ b/keyboard.c
@@ -20,14 +20,8 @@ kbd_init(struct kbd *kb, struct layout *layouts) {
kb->layer_index = 0;
enum layout_id layer;
- if (kb->landscape) {
- layer = kb->landscape_layers[kb->layer_index];
- } else {
- layer = kb->layers[kb->layer_index];
- }
-
+ layer = kb->layers[kb->layer_index];
kb->layout = &kb->layouts[layer];
- kb->prevlayout = kb->layout;
}
void
diff --git a/keyboard.h b/keyboard.h
index 84e6b8c..876172d 100644
--- a/keyboard.h
+++ b/keyboard.h
@@ -5,8 +5,6 @@
#define MAX_LAYERS 25
-enum key_type;
-enum key_modifier_type;
struct clr_scheme;
struct key;
struct layout;
@@ -39,8 +37,6 @@ struct key {
struct layout {
struct key *keys;
- const char *keymap_name;
- const char *name;
uint32_t keyheight; // absolute height (pixels)
};
@@ -49,23 +45,18 @@ struct kbd {
struct layout *layout;
struct clr_scheme scheme;
- struct clr_scheme scheme1;
uint32_t w, h, s;
bool landscape;
uint8_t mods;
uint8_t compose;
struct key *last_press;
- struct key *last_swipe;
- struct layout *prevlayout;
size_t layer_index;
struct layout *layouts;
enum layout_id *layers;
- enum layout_id *landscape_layers;
struct drwsurf *surf;
- struct zwp_virtual_keyboard_v1 *vkbd;
};
void draw_inset(struct drwsurf *ds, uint32_t x, uint32_t y, uint32_t width,
diff --git a/main.c b/main.c
index 602dc6f..e204af9 100644
--- a/main.c
+++ b/main.c
@@ -258,14 +258,9 @@ display_handle_geometry(void *data, struct wl_output *wl_output, int x, int y,
}
enum layout_id layer;
- if (keyboard.landscape) {
- layer = keyboard.landscape_layers[0];
- } else {
- layer = keyboard.layers[0];
- }
+ layer = keyboard.layers[0];
keyboard.layout = &keyboard.layouts[layer];
- keyboard.prevlayout = keyboard.layout;
zwlr_layer_surface_v1_set_size(layer_surface, 0, height);
zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, height);
@@ -403,11 +398,8 @@ main(int argc, char **argv) {
/* keyboard settings */
keyboard.layers = (enum layout_id *)&layers;
- keyboard.landscape_layers = (enum layout_id *)&landscape_layers;
keyboard.scheme = scheme;
keyboard.layer_index = 0;
- keyboard.scheme1 = scheme1;
- keyboard.scheme1 = scheme1;
bool starthidden = false;