Merge branch 'jjsullivan5196:master' into feature/desktop-layout

config.h

@@ -1,43 +0,0 @@
-#ifndef config_def_h_INCLUDED
-#define config_def_h_INCLUDED
-
-#define DEFAULT_FONT "Sans 14"
-#define DEFAULT_ROUNDING 5
-static const int transparency = 255;
-
-struct clr_scheme schemes[] = {
-{
-  /* colors */
-  .bg = {.bgra = {54, 42, 40, transparency}},
-  .fg = {.bgra = {164, 114, 98, transparency}},
-  .high = {.bgra = {100, 100, 100, transparency}},
-  .swipe = {.bgra = {100, 255, 100, 64}},
-  .text = {.color = UINT32_MAX},
-  .font = DEFAULT_FONT,
-},
-{
-  /* colors */
-  .bg = {.bgra = {54, 42, 40, transparency}},
-  .fg = {.bgra = {90, 71, 68, transparency}},
-  .high = {.bgra = {100, 100, 100, transparency}},
-  .swipe = {.bgra = {100, 255, 100, 64}},
-  .text = {.color = UINT32_MAX},
-  .font = DEFAULT_FONT,
-}
-};
-
-/* 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
-  Special, 
-  NumLayouts // signals the last item, may not be omitted
-};
-
-/* layers is an ordered list of layouts, used to cycle through */
-static enum layout_id landscape_layers[] = {
-  Landscape, // First layout is the default layout on startup
-  LandscapeSpecial,
-  NumLayouts // signals the last item, may not be omitted
-};
-
-#endif // config_def_h_INCLUDED

config.mk

@@ -1,4 +1,4 @@
-VERSION = 0.16
+VERSION = 0.14.3
 CFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=700
 PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/share/man

keyboard.c

@@ -276,23 +276,13 @@ kbd_get_layer_index(struct kbd *kb, struct layout *l)
 void
 kbd_unpress_key(struct kbd *kb, uint32_t time)
 {
-    bool unlatch_shift, unlatch_ctrl, unlatch_alt, unlatch_super, unlatch_altgr;
-    unlatch_shift = unlatch_ctrl = unlatch_alt = unlatch_super = unlatch_altgr = false;
+    bool unlatch_shift = false;
 
     if (kb->last_press) {
         unlatch_shift = (kb->mods & Shift) == Shift;
-        unlatch_ctrl = (kb->mods & Ctrl) == Ctrl;
-        unlatch_alt = (kb->mods & Alt) == Alt;
-        unlatch_super = (kb->mods & Super) == Super;
-        unlatch_altgr = (kb->mods & AltGr) == AltGr;
 
-        if (unlatch_shift) kb->mods ^= Shift;
-        if (unlatch_ctrl) kb->mods ^= Ctrl;
-        if (unlatch_alt) kb->mods ^= Alt;
-        if (unlatch_super) kb->mods ^= Super;
-        if (unlatch_altgr) kb->mods ^= AltGr;
-
-        if (unlatch_shift||unlatch_ctrl||unlatch_alt||unlatch_super||unlatch_altgr) {
+        if (unlatch_shift) {
+            kb->mods ^= Shift;
             zwp_virtual_keyboard_v1_modifiers(kb->vkbd, kb->mods, 0, 0, 0);
         }
 
@@ -314,7 +304,7 @@ kbd_unpress_key(struct kbd *kb, uint32_t time)
         if (kb->compose >= 2) {
             kb->compose = 0;
             kbd_switch_layout(kb, kb->last_abc_layout, kb->last_abc_index);
-        } else if (unlatch_shift||unlatch_ctrl||unlatch_alt||unlatch_super||unlatch_altgr) {
+        } else if (unlatch_shift) {
             kbd_draw_layout(kb);
         } else {
             kbd_draw_key(kb, kb->last_press, Unpress);
@@ -428,7 +418,7 @@ kbd_press_key(struct kbd *kb, struct key *k, uint32_t time)
         break;
     case Mod:
         kb->mods ^= k->code;
-        if ((k->code == Shift) || (k->code == CapsLock)) {
+        if (k->code == Shift) {
             kbd_draw_layout(kb);
         } else {
             if (kb->mods & k->code) {
@@ -561,7 +551,7 @@ kbd_clear_last_popup(struct kbd *kb)
 void
 kbd_draw_key(struct kbd *kb, struct key *k, enum key_draw_type type)
 {
-    const char *label = ((kb->mods & Shift)||(kb->mods & CapsLock)) ? k->shift_label : k->label;
+    const char *label = (kb->mods & Shift) ? k->shift_label : k->label;
     if (kb->debug)
         fprintf(stderr, "Draw key +%d+%d %dx%d -> %s\n", k->x, k->y, k->w, k->h,
                 label);