Skip to content

add support for iso-level3-shift modifier #1185

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

Open
tristanitschner wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add support for iso-level3-shift modifier #1185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions src/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,11 +636,12 @@ static int parse_descriptor(char *s,
const char *layer = NULL;

switch (code) {
case KEYD_LEFTSHIFT: layer = "shift"; break;
case KEYD_LEFTCTRL: layer = "control"; break;
case KEYD_LEFTMETA: layer = "meta"; break;
case KEYD_LEFTALT: layer = "alt"; break;
case KEYD_RIGHTALT: layer = "altgr"; break;
case KEYD_LEFTSHIFT: layer = "shift"; break;
case KEYD_LEFTCTRL: layer = "control"; break;
case KEYD_LEFTMETA: layer = "meta"; break;
case KEYD_LEFTALT: layer = "alt"; break;
case KEYD_RIGHTALT: layer = "altgr"; break;
case KEYD_ISO_LEVEL3_SHIFT: layer = "iso-level3-shift"; break;
}

if (layer) {
Expand Down Expand Up @@ -1015,12 +1016,14 @@ static void config_init(struct config *config)
"altgr = layer(altgr)\n"
"meta = layer(meta)\n"
"control = layer(control)\n"
"iso-level3-shift = layer(iso-level3-shift)\n"

"[control:C]\n"
"[shift:S]\n"
"[meta:M]\n"
"[alt:A]\n"
"[altgr:G]\n";
"[altgr:G]\n"
"[iso-level3-shift:I]\n";

nw = do_parse(config, default_config, NULL);
assert(nw == 0);
Expand Down
16 changes: 10 additions & 6 deletions src/keys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@
#include "keys.h"

const struct modifier modifiers[MAX_MOD] = {
{MOD_ALT, KEYD_LEFTALT},
{MOD_ALT_GR, KEYD_RIGHTALT},
{MOD_SHIFT, KEYD_LEFTSHIFT},
{MOD_SUPER, KEYD_LEFTMETA},
{MOD_CTRL, KEYD_LEFTCTRL},
{MOD_ALT, KEYD_LEFTALT},
{MOD_ISO_LEVEL3, KEYD_ISO_LEVEL3_SHIFT},
{MOD_ALT_GR, KEYD_RIGHTALT},
{MOD_SHIFT, KEYD_LEFTSHIFT},
{MOD_SUPER, KEYD_LEFTMETA},
{MOD_CTRL, KEYD_LEFTCTRL},
};

const struct keycode_table_ent keycode_table[256] = {
Expand Down Expand Up @@ -45,7 +46,7 @@ const struct keycode_table_ent keycode_table[256] = {
[KEYD_RIGHTBRACE] = { "]", "rightbrace", "}" },
[KEYD_ENTER] = { "enter", NULL, NULL },
[KEYD_LEFTCTRL] = { "leftcontrol", "", NULL },
[KEYD_IS_LEVEL3_SHIFT] = { "iso-level3-shift", NULL, NULL }, //Oddly missing from input-event-codes.h, appears to be used as altgr in an english keymap on X
[KEYD_ISO_LEVEL3_SHIFT] = { "iso-level3-shift", NULL, NULL }, //Oddly missing from input-event-codes.h, appears to be used as altgr in an english keymap on X
[KEYD_A] = { "a", NULL, "A" },
[KEYD_S] = { "s", NULL, "S" },
[KEYD_D] = { "d", NULL, "D" },
Expand Down Expand Up @@ -327,6 +328,9 @@ int parse_modset(const char *s, uint8_t *mods)
case 'G':
*mods |= MOD_ALT_GR;
break;
case 'I':
*mods |= MOD_ISO_LEVEL3;
break;
default:
return -1;
break;
Expand Down
5 changes: 3 additions & 2 deletions src/keys.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@
#include <stdint.h>
#include <stdlib.h>

#define MOD_ISO_LEVEL3 0x20
#define MOD_ALT_GR 0x10
#define MOD_CTRL 0x8
#define MOD_SHIFT 0x4
#define MOD_SUPER 0x2
#define MOD_ALT 0x1

#define MAX_MOD 5
#define MAX_MOD 6

struct keycode_table_ent {
const char *name;
Expand Down Expand Up @@ -112,7 +113,7 @@ struct modifier {
#define KEYD_KP3 81
#define KEYD_KP0 82
#define KEYD_KPDOT 83
#define KEYD_IS_LEVEL3_SHIFT 84
#define KEYD_ISO_LEVEL3_SHIFT 84
#define KEYD_ZENKAKUHANKAKU 85
#define KEYD_102ND 86
#define KEYD_F11 87
Expand Down