aux/kbdfs: changes to allow support of NEO2 layout

aux/kbdfs: changes to allow support of NEO2 layout

[Jstsmthrgk]

I would really like to add support for NEO2 layout [0], but I've got two
problems:

First of all, the NEO2 layout uses six layers, while the current kbdfs
only allows for four of them (out of the eight tables three are only
used to allow multi-byte keycodes starting with E0 and another one is
used for something with the ctrl key). Therefore I would have to add two
more tables to kbdfs (and one more Private Unicode Space Rune to
keyboard.h). As this would be my first ever contribution to 9front I
wanted to ask beforehand if there is anything I have to pay attention to?

The second one is that there are many dead-keys in the NEO2 layout, it
seems like currently those are replaced by the compose key in the
current implementation. I guess I should just do it alike?

I would really value some feedback beforehand, as already stated, this
would be my first ever contribution. (I will try to program it tomorrow)

[0] https://neo-layout.org/

Re: [9front] aux/kbdfs: changes to allow support of NEO2 layout

[sirjofri]

Hello,

Jstsmthrgk <jstsmthrgk@jstsmthrgk.eu> schrieb am Sa., 18. Apr. 2020, 23:15:
> I would really like to add support for NEO2 layout [0], but I've got two
> problems:

Fun fact: yesterday I also thought about adding neo2 support to
9front. More like a coding challenge and to learn programming for 9.

> First of all, the NEO2 layout uses six layers, while the current kbdfs
> only allows for four of them

Some of these tables use other layers, but I don't know how to
activate them and if they are used simultaneously. I also didn't look
into kbdfs, I only looked at the tables. I remember the po keymap file
using some layer 7 or so? Also I don't know if you can activate layers
with a combination of modifier keys (like neo wants).

> As this would be my first ever contribution to 9front I
> wanted to ask beforehand if there is anything I have to pay attention to?

I wish you every luck and also a lot of fun. I never contributed code
to any open source project, but I want to help if I can.

Please let me know if I can help somehow. I am a native German speaker
and can help testing and maybe review/write some code. I am not that
experienced with the native plan9 C libraries (and also no
professional with the libc). I'm also not that experienced with neo2,
but I am very interested and also learned it a little.

I only have one real limitation: My current native plan9 terminal is a
thinkpad T61 which has a limited keyboard. Also it's imported and had
a very weird keyboard layout (with stickers on the keycaps). I already
missed the <>| keynext to the left shift key on the German layout, so
I use the us layout.

I hope I can still help you somehow and make 9 a better place.

sirjofri

(This is a duplicate mail, I tried sending it from the gmail app.
Gmail app does not support sending plain text messages, so it's
possible that this mail is doubled. This is the plain text version.)

Re: [9front] aux/kbdfs: changes to allow support of NEO2 layout

[Jstsmthrgk]

> Some of these tables use other layers, but I don't know how to
> activate them and if they are used simultaneously. I also didn't look
> into kbdfs, I only looked at the tables. I remember the po keymap file
> using some layer 7 or so? Also I don't know if you can activate layers
> with a combination of modifier keys (like neo wants).

Today I tried adding a new key Kmod4 to keyboard.h and then adding two
new tables kbtabmod4 and kbtabaltgrmod4 to kbdfs.

Somehow a read of /dev/kbtab still only shows me 8 tables instead of 10.
I think somehow my modified version of kbdfs didn't get loaded.

If anyone knows if there is something like initramfs in linux that I
have to regenerate to get my modified kbdfs on boot, please tell me
about it!

Re: [9front] aux/kbdfs: changes to allow support of NEO2 layout

[Sigrid Zirukin]

You would need to rebuild the kernel (and copy it where it's going to
be loaded from) after installing updated kbdfs.

On Sun, Apr 19, 2020 at 10:16 PM Jstsmthrgk <jstsmthrgk@jstsmthrgk.eu> wrote:
>
> > Some of these tables use other layers, but I don't know how to
> > activate them and if they are used simultaneously. I also didn't look
> > into kbdfs, I only looked at the tables. I remember the po keymap file
> > using some layer 7 or so? Also I don't know if you can activate layers
> > with a combination of modifier keys (like neo wants).
>
> Today I tried adding a new key Kmod4 to keyboard.h and then adding two
> new tables kbtabmod4 and kbtabaltgrmod4 to kbdfs.
>
> Somehow a read of /dev/kbtab still only shows me 8 tables instead of 10.
> I think somehow my modified version of kbdfs didn't get loaded.
>
> If anyone knows if there is something like initramfs in linux that I
> have to regenerate to get my modified kbdfs on boot, please tell me
> about it!
>

Re: [9front] aux/kbdfs: changes to allow support of NEO2 layout

[Jstsmthrgk]

On 19.04.20 22:37, Sigrid Zirukin wrote:
> You would need to rebuild the kernel (and copy it where it's going to
> be loaded from) after installing updated kbdfs.

Thank you! I now got the two additional tables showing up! I'll try
tomorrow if it works like expected and to actually do the kbmap for neo2.

If anyone is interested, I've made a diff of my changes so far:
https://nemo.jstsmthrgk.eu/neo2.diff

Re: [9front] aux/kbdfs: changes to allow support of NEO2 layout

[Jstsmthrgk]

On 19.04.20 19:35, sirjofri wrote:
> Please let me know if I can help somehow. I am a native German speaker
> and can help testing and maybe review/write some code. I am not that
> experienced with the native plan9 C libraries (and also no
> professional with the libc). I'm also not that experienced with neo2,
> but I am very interested and also learned it a little.

If you want to test it, I am done now.

How do I correctly submit this to someone who can review it and push it
into the main repository? I've uploaded the mercurial changeset here:
https://nemo.jstsmthrgk.eu/neo2.patch

Re: [9front] aux/kbdfs: changes to allow support of NEO2 layout

[Sigrid Solveig Haflínudóttir]

On Mon, Apr 20, 2020 at 2:52 PM Jstsmthrgk <jstsmthrgk@jstsmthrgk.eu> wrote:
>
> On 19.04.20 19:35, sirjofri wrote:
> > Please let me know if I can help somehow. I am a native German speaker
> > and can help testing and maybe review/write some code. I am not that
> > experienced with the native plan9 C libraries (and also no
> > professional with the libc). I'm also not that experienced with neo2,
> > but I am very interested and also learned it a little.
>
> If you want to test it, I am done now.
>
> How do I correctly submit this to someone who can review it and push it
> into the main repository? I've uploaded the mercurial changeset here:
> https://nemo.jstsmthrgk.eu/neo2.patch
>

Pretty sure that's enough for a review and possible merge (other
developers are subscribed to this list as well).

Re: [9front] aux/kbdfs: changes to allow support of NEO2 layout

[ori]

> How do I correctly submit this to someone who can review it and push it
> into the main repository? I've uploaded the mercurial changeset here:
> https://nemo.jstsmthrgk.eu/neo2.patch

You've already done that -- though I prefer reviewing patches in
the email body inline -- easier comment on it, and the patch will
remain in my inbox, even if your site goes down.

The code looks ok to me. I'll test soon. I'm also hoping that
sirjofri shows up and confirms that it works as expected for
on their end.

Re: [9front] aux/kbdfs: changes to allow support of NEO2 layout

[Jstsmthrgk]

On 21.04.20 16:44, ori@eigenstate.org wrote:> You've already done that
-- though I prefer reviewing patches in
> the email body inline -- easier comment on it, and the patch will
> remain in my inbox, even if your site goes down
Below is the full patch inline.

Also some reasoning, why I did it how I did it:
- I needed to add a new modifier in order for neo2 to work.
- Even though Mod4 uses the Key labeled AltGr, I decided to use Kaltgr
for Mod3, as it makes more sense in that it switches to a layer full of
special characters. Also it only needs two additional tables, while the
other way around would have needed three.
- Kmod4 was implemented just like Kaltgr.
- I only implemented the alphanumeric block of the keyboard in the
kbmap, as neo2 is mainly used for blind typing and is not needed that
much anywhere else, this leaves the numpad like it is.

# HG changeset patch
# User Jstsmthrgk <jstsmthrgk@jstsmthrgk.eu>
# Date 1587379472 -7200
# Node ID 325ccc18cd74d92518ed7314d7c4d97ba7818e1d
# Parent  258f4b8b88b966bd94b03a7b874d4580f82d68d3
added support for neo2 layout

diff -r 258f4b8b88b9 -r 325ccc18cd74 sys/include/keyboard.h
--- a/sys/include/keyboard.h	Sun Apr 19 11:26:31 2020 -0700
+++ b/sys/include/keyboard.h	Mon Apr 20 12:44:32 2020 +0200
@@ -61,5 +61,6 @@
 	Knum=	Spec|0x65,
 	Kmiddle=	Spec|0x66,
 	Kaltgr=	Spec|0x67,
+	Kmod4=	Spec|0x68,
 	Kmouse=	Spec|0x100,
 };
diff -r 258f4b8b88b9 -r 325ccc18cd74 sys/lib/kbmap/neo2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/lib/kbmap/neo2	Mon Apr 20 12:44:32 2020 +0200
@@ -0,0 +1,344 @@
+0	2	'1
+0	3	'2
+0	4	'3
+0	5	'4
+0	6	'5
+0	7	'6
+0	8	'7
+0	9	'8
+0	10	'9
+0	11	'0
+0	12	'-
+0	13	'`
+0	14	^H
+0	15	^I
+0	16	'x
+0	17	'v
+0	18	'l
+0	19	'c
+0	20	'w
+0	21	'k
+0	22	'h
+0	23	'g
+0	24	'f
+0	25	'q
+0	26	'ß
+0	27	'´
+0	28	^J
+0	29	0xf017
+0	30	'u
+0	31	'i
+0	32	'a
+0	33	'e
+0	34	'o
+0	35	's
+0	36	'n
+0	37	'r
+0	38	't
+0	39	'd
+0	40	'y
+0	41	'ˆ
+0	42	0xf016
+0	43	0xf867
+0	44	'ü
+0	45	'ö
+0	46	'ä
+0	47	'p
+0	48	'z
+0	49	'b
+0	50	'm
+0	51	',
+0	52	'.
+0	53	'j
+0	54	0xf016
+0	56	0xf015
+0	57	'
+0	58	0xf867
+0	86	0xf868
+1	2	'°
+1	3	'§
+1	4	'ℓ
+1	5	'»
+1	6	'«
+1	7	'$
+1	8	'€
+1	9	'„
+1	10	'“
+1	11	'”
+1	12	'—
+1	13	'¸
+1	14	^H
+1	15	0
+1	16	'X
+1	17	'V
+1	18	'L
+1	19	'C
+1	20	'W
+1	21	'K
+1	22	'H
+1	23	'G
+1	24	'F
+1	25	'Q
+1	26	'ẞ
+1	27	'˜
+1	28	^J
+1	29	0xf017
+1	30	'U
+1	31	'I
+1	32	'A
+1	33	'E
+1	34	'O
+1	35	'S
+1	36	'N
+1	37	'R
+1	38	'T
+1	39	'D
+1	40	'Y
+1	41	'ˇ
+1	42	0xf016
+1	43	0xf867
+1	44	'Ü
+1	45	'Ö
+1	46	'Ä
+1	47	'P
+1	48	'Z
+1	49	'B
+1	50	'M
+1	51	'–
+1	52	'•
+1	53	'J
+1	54	0xf016
+1	56	0xf015
+1	57	'
+1	58	0xf867
+1	86	0xf868
+2	29	0xf017
+2	56	0xf868
+3	2	'¹
+3	3	'²
+3	4	'³
+3	5	'›
+3	6	'‹
+3	7	'¢
+3	8	'¥
+3	9	'‚
+3	10	'‘
+3	11	'’
+3	12	0
+3	13	'˚
+3	14	^H
+3	15	0xf015
+3	16	'…
+3	17	'_
+3	18	'[
+3	19	']
+3	20	'^
+3	21	'!
+3	22	'<
+3	23	'>
+3	24	'=
+3	25	'&
+3	26	'ſ
+3	27	'/
+3	28	^J
+3	29	0xf017
+3	30	'\
+3	31	'/
+3	32	'{
+3	33	'}
+3	34	'*
+3	35	'?
+3	36	'(
+3	37	')
+3	38	'-
+3	39	':
+3	40	'@
+3	41	'↻
+3	42	0xf016
+3	43	0xf867
+3	44	'#
+3	45	'$
+3	46	'|
+3	47	'~
+3	48	'`
+3	49	'+
+3	50	'%
+3	51	'"
+3	52	''
+3	53	';
+3	54	0xf016
+3	56	0xf015
+3	57	'
+3	58	0xf867
+3	86	0xf868
+7	2	'₁
+7	3	'₂
+7	4	'₃
+7	5	'♀
+7	6	'♂
+7	7	0x26A5
+7	8	'ϰ
+7	9	'⟨
+7	10	'⟩
+7	11	'₀
+7	12	'‑
+7	13	'῾
+7	14	^H
+7	15	0
+7	16	'ξ
+7	17	0
+7	18	'λ
+7	19	'χ
+7	20	'ω
+7	21	'κ
+7	22	'ψ
+7	23	'γ
+7	24	'φ
+7	25	'ϕ
+7	26	'ς
+7	27	'᾿
+7	28	^J
+7	29	0xf017	
+7	30	0
+7	31	'ι
+7	32	'α
+7	33	'ε
+7	34	'ο
+7	35	'σ
+7	36	'ν
+7	37	'ρ
+7	38	'τ
+7	39	'δ
+7	40	'υ
+7	41	'˞
+7	42	0xf016
+7	43	0xf867
+7	44	0
+7	45	'ϵ
+7	46	'η
+7	47	'π
+7	48	'ζ
+7	49	'β
+7	50	'μ
+7	51	'ϱ
+7	52	'ϑ
+7	53	'θ
+7	54	0xf016
+7	56	0xf015
+7	57	0x00A0
+7	58	0xf867
+7	86	0xf868
+8	2	'ª
+8	3	'º
+8	4	'№
+8	5	0
+8	6	'·
+8	7	'£
+8	8	'¤
+8	9	'⇥
+8	10	'/
+8	11	'*
+8	12	'-
+8	13	'¨
+8	14	^H
+8	15	0
+8	16	0xf00f
+8	17	^H
+8	18	0x000e
+8	19	0
+8	20	0xf013
+8	21	'¡
+8	22	'7
+8	23	'8
+8	24	'9
+8	25	'+
+8	26	'−
+8	27	'˝
+8	28	^J
+8	29	0xf017
+8	30	0xf00d
+8	31	0xf011
+8	32	0xf800
+8	33	0xf012
+8	34	0xf018
+8	35	'¿
+8	36	'4
+8	37	'5
+8	38	'6
+8	39	',
+8	40	'.
+8	41	'˙
+8	42	0xf016
+8	43	0xf867
+8	44	0x001b
+8	45	^I
+8	46	0x0014
+8	47	^J
+8	48	0
+8	49	':
+8	50	'1
+8	51	'2
+8	52	'3
+8	53	';
+8	54	0xf016
+8	56	0xf015
+8	57	'0
+8	58	0xf867
+8	86	0xf868
+9	2	'¬
+9	3	'∨
+9	4	'∧
+9	5	'⊥
+9	6	'∡
+9	7	'∥
+9	8	'→
+9	9	'∞
+9	10	'∝
+9	11	'∅
+9	12	'╌
+9	13	'¯
+9	14	^H
+9	15	0
+9	16	'Ξ
+9	17	'√
+9	18	'Λ
+9	19	'ℂ
+9	20	'Ω
+9	21	'×
+9	22	'Ψ
+9	23	'Γ
+9	24	'Φ
+9	25	'ℚ
+9	26	'∘
+9	27	'˘
+9	28	^J
+9	29	0xf017
+9	30	'⊂
+9	31	'∫
+9	32	'∀
+9	33	'∃
+9	34	'∈
+9	35	'Σ
+9	36	'ℕ
+9	37	'ℝ
+9	38	'∂
+9	39	'Δ
+9	40	'∇
+9	41	'.
+9	42	0xf016
+9	43	0xf867
+9	44	'∪
+9	45	'∩
+9	46	'ℵ
+9	47	'Π
+9	48	'ℤ
+9	49	'⇐
+9	50	'⇔
+9	51	'⇒
+9	52	'↦
+9	53	'Θ
+9	54	0xf016
+9	56	0xf015
+9	57	0x202f
+9	58	0xf867
+9	86	0xf868
diff -r 258f4b8b88b9 -r 325ccc18cd74 sys/src/cmd/aux/kbdfs/kbdfs.c
--- a/sys/src/cmd/aux/kbdfs/kbdfs.c	Sun Apr 19 11:26:31 2020 -0700
+++ b/sys/src/cmd/aux/kbdfs/kbdfs.c	Mon Apr 20 12:44:32 2020 +0200
@@ -42,6 +42,7 @@
 	int	ctl;
 	int	alt;
 	int	altgr;
+	int	mod4;
 	int	leds;
 };

@@ -285,6 +286,46 @@
 [0x78]	0,	0,	0,	0,	0,	0,	0,	0,
 };

+Rune kbtabmod4[Nscan] =
+{
+[0x00]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x08]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x10]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x18]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x20]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x28]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x30]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x38]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x40]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x48]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x50]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x58]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x60]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x68]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x70]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x78]	0,	0,	0,	0,	0,	0,	0,	0,
+};
+
+Rune kbtabaltgrmod4[Nscan] =
+{
+[0x00]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x08]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x10]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x18]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x20]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x28]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x30]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x38]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x40]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x48]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x50]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x58]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x60]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x68]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x70]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x78]	0,	0,	0,	0,	0,	0,	0,	0,
+};
+
 char*
 dev(char *file)
 {
@@ -368,6 +409,10 @@
 		key.r = kbtabshiftesc1[c];
 	else if(scan->esc1)
 		key.r = kbtabesc1[c];
+	else if(scan->altgr && scan->mod4 && kbtabaltgrmod4[c] != 0)
+		key.r = kbtabaltgrmod4[c];
+	else if(scan->mod4 && kbtabmod4[c] != 0)
+		key.r = kbtabmod4[c];
 	else if(scan->shift && scan->altgr && kbtabshiftaltgr[c] != 0)
 		key.r = kbtabshiftaltgr[c];
 	else if(scan->shift)
@@ -403,6 +448,9 @@
 	case Kaltgr:
 		scan->altgr = key.down;
 		break;
+	case Kmod4:
+		scan->mod4 = key.down;
+		break;
 	case Kalt:
 		scan->alt = key.down;
 		break;
@@ -470,6 +518,8 @@
 			a->shift = k.down;
 		else if(k.r == Kaltgr)
 			a->altgr = k.down;
+		else if(k.r == Kmod4)
+			a->mod4 = k.down;
 		else if(k.r == Kctl)
 			a->ctl = k.down;
 		send(keychan, &k);
@@ -664,6 +714,7 @@
 		case Knum:
 		case Kshift:
 		case Kaltgr:
+		case Kmod4:
 			/* ignore modifiers */
 			continue;

@@ -1081,6 +1132,8 @@
 	/* 5 */	kbtabctrlesc1,
 	/* 6 */	kbtabshiftesc1,
 	/* 7 */	kbtabshiftaltgr,
+	/* 8 */ kbtabmod4,
+	/* 9 */ kbtabaltgrmod4,
 	};
 	if(t >= 0 && t < nelem(tabs) && sc >= 0 && sc < Nscan)
 		return &tabs[t][sc];
@@ -1116,6 +1169,7 @@
 	static Rune o = Spec|0x60, tab[] = {
 		Kshift, Kbreak, Kctl, Kalt,
 		Kcaps, Knum, Kmiddle, Kaltgr,
+		Kmod4,
 	};
 	if(r >= o && r < o+nelem(tab))
 		return tab[r - o];

Re: [9front] aux/kbdfs: changes to allow support of NEO2 layout

[jstsmthrgk]

I tried contacting several people if they wanted to verify the keymap, some said they are not interested, others didn't answer.

However I am quite confident it actually is correct, as I copied most characters directly over from the reference [0].

[0] (in German) https://git.neo-layout.org/neo/neo-layout/raw/branch/master/A-REFERENZ-A/neo20.txt

Re: [9front] aux/kbdfs: changes to allow support of NEO2 layout

[ori]

> I tried contacting several people if they wanted to verify the keymap, some said they are not interested, others didn't answer.
> 
> However I am quite confident it actually is correct, as I copied most characters directly over from the reference [0].
> 
> [0] (in German) https://git.neo-layout.org/neo/neo-layout/raw/branch/master/A-REFERENZ-A/neo20.txt

Alright; thanks for the effort!

Going to test out the patch, and if nobody objects, I can commit.

Re: [9front] aux/kbdfs: changes to allow support of NEO2 layout

[ori]

> On 21.04.20 16:44, ori@eigenstate.org wrote:> You've already done that
> -- though I prefer reviewing patches in
>> the email body inline -- easier comment on it, and the patch will
>> remain in my inbox, even if your site goes down
> Below is the full patch inline.

Committed, thanks!

Re: [9front] aux/kbdfs: changes to allow support of NEO2 layout

[Jstsmthrgk]

> Committed, thanks!

Thank you!

I've found someone to verify the kbmap, but it may take some time.

Re: [9front] aux/kbdfs: changes to allow support of NEO2 layout

[qwx]

Hello,

There's an issue with the patch:

; cd /sys/src/cmd/aux/kbdfs
; mk
@{objtype=$cputype mk -f mkfile.mklatin mklatin.amd64
6c -FTVw mklatin.c
6l  -o mklatin.amd64 mklatin.6
./mklatin.$cputype /lib/keyboard >latin1.h
6c -FTVw kbdfs.c
kbdfs.c:451 name not declared: Kmod4
kbdfs.c:521 name not declared: Kmod4
kbdfs.c:717 name not declared: Kmod4
kbdfs.c:1172 name not declared: Kmod4
mk: 6c -FTVw kbdfs.c  : exit status=rc 15515: 6c 15517: error

Thanks,

qwx

Re: [9front] aux/kbdfs: changes to allow support of NEO2 layout

[Jstsmthrgk]

> Hello,
> 
> There's an issue with the patch:
> 
> ; cd /sys/src/cmd/aux/kbdfs
> ; mk
> @{objtype=$cputype mk -f mkfile.mklatin mklatin.amd64
> 6c -FTVw mklatin.c
> 6l  -o mklatin.amd64 mklatin.6
> ./mklatin.$cputype /lib/keyboard >latin1.h
> 6c -FTVw kbdfs.c
> kbdfs.c:451 name not declared: Kmod4
> kbdfs.c:521 name not declared: Kmod4
> kbdfs.c:717 name not declared: Kmod4
> kbdfs.c:1172 name not declared: Kmod4
> mk: 6c -FTVw kbdfs.c  : exit status=rc 15515: 6c 15517: error
> 
> Thanks,
> 
> qwx
> 

Seems like Ori only commited /sys/src/cmd/aux/kbdfs/kbdfs.c, while
/sys/include/keyboard.h is also needed.

diff -r 258f4b8b88b9 -r 325ccc18cd74 sys/include/keyboard.h
--- a/sys/include/keyboard.h	Sun Apr 19 11:26:31 2020 -0700
+++ b/sys/include/keyboard.h	Mon Apr 20 12:44:32 2020 +0200
@@ -61,5 +61,6 @@
 	Knum=	Spec|0x65,
 	Kmiddle=	Spec|0x66,
 	Kaltgr=	Spec|0x67,
+	Kmod4=	Spec|0x68,
 	Kmouse=	Spec|0x100,
 };

Re: [9front] aux/kbdfs: changes to allow support of NEO2 layout

[qwx]

Thanks, that makes it build.

Any objections to pushing this?

Thanks,

qwx


> Seems like Ori only commited /sys/src/cmd/aux/kbdfs/kbdfs.c, while
> /sys/include/keyboard.h is also needed.

diff -r 258f4b8b88b9 -r 325ccc18cd74 sys/include/keyboard.h
--- a/sys/include/keyboard.h	Sun Apr 19 11:26:31 2020 -0700
+++ b/sys/include/keyboard.h	Mon Apr 20 12:44:32 2020 +0200
@@ -61,5 +61,6 @@
 	Knum=	Spec|0x65,
 	Kmiddle=	Spec|0x66,
 	Kaltgr=	Spec|0x67,
+	Kmod4=	Spec|0x68,
 	Kmouse=	Spec|0x100,
 };

Re: [9front] aux/kbdfs: changes to allow support of NEO2 layout

[ori]

> Thanks, that makes it build.
> 
> Any objections to pushing this?
> 
> Thanks,
> 
> qwx
> 
> 
>> Seems like Ori only commited /sys/src/cmd/aux/kbdfs/kbdfs.c, while
>> /sys/include/keyboard.h is also needed.

Yep, thanks for the catch. Committed it.