--- ./layout.mobile-intl.h +++ ./layout.mobile-intl.h @@ -1,4 +1,4 @@ -#define KEYS 57 +#define KEYS 60 static Key keys_en[KEYS] = { { "Esc", "", XK_Escape, 1 }, @@ -16,7 +16,7 @@ { 0 }, /* New row */ - { "↹", 0, XK_Tab, 0.75 }, + { "↹", 0, XK_Tab, 1 }, { 0, "☺", XK_q, 1 }, { 0, 0, XK_w, 1 }, { 0, 0, XK_e, 1 }, @@ -27,7 +27,7 @@ { 0, 0, XK_i, 1 }, { 0, 0, XK_o, 1 }, { 0, 0, XK_p, 1 }, - { "/", "?", XK_slash, .75 }, + { "/", "?", XK_slash, 1 }, { 0 }, /* New row */ @@ -46,7 +46,7 @@ { 0 }, /* New row */ - { "⇧", 0, XK_Shift_L, 1.5 }, + { "⇧", 0, XK_Shift_L, 1 }, { 0, 0, XK_z, 1 }, { 0, 0, XK_x, 1 }, { 0, 0, XK_c, 1 }, @@ -56,10 +56,13 @@ { 0, 0, XK_m, 1 }, { ",", "<", XK_comma, 1 }, { ".", ">", XK_period, 1 }, + { "⇧", 0, XK_Shift_R, 1 }, { "⌫", 0, XK_BackSpace, 1 }, { 0 }, /* New row */ - { "↺", 0, XK_Cancel, 1}, + { "↺", 0, XK_Cancel, 1 }, + { "Ctrl", 0, XK_Control_L, 1 }, + { "Win", 0, XK_Super_L, 1 }, { "Alt", 0, XK_Alt_L, 1 }, { "", 0, XK_space, 4 }, { "↓", 0, XK_Down, 1 }, @@ -572,23 +575,17 @@ { 0 }, /* Last item (double 0) */ }; -#define LAYERS 6 +#define LAYERS 3 static char* layer_names[LAYERS] = { "en", "symbols", - "navigation", - "dialer", - "minimal", - "ru", + "functions", }; static Key* available_layers[LAYERS] = { keys_en, keys_symbols, - keys_navigation, - keys_dialer, - keys_minimal, - keys_ru + keys_functions, }; Buttonmod buttonmods[] = {