kbdfs: "glenda" key modifier

kbdfs: "glenda" key modifier

[Sigrid Solveig Haflínudóttir]

[-- Attachment #1: Type: text/plain, Size: 503 bytes --]

I added support for "glenda" key (the one that usually has Windows
logo) support to kbdfs as an additional modifier to be used by
whoever needs it. I use it with https://github.com/ftrvxmtrx/riow
to get window management shortcuts although I plan to make riow
depend solely on kbdfs change alone without having any rio mods
by having a "filter" on top of kbdfs to intercept this modifier.
If there is not much objection I would like to merge this change
alone to 9front.
Comments and ideas are welcome.

[-- Attachment #2: kbdfs-glenda.patch --]
[-- Type: text/plain, Size: 4653 bytes --]

diff -r 9d154a594d99 sys/include/keyboard.h
--- a/sys/include/keyboard.h	Sat Apr 11 14:20:41 2020 +0200
+++ b/sys/include/keyboard.h	Sat Apr 11 18:50:50 2020 +0200
@@ -44,6 +44,8 @@
 	Kscrolloneup=	KF|0x20,
 	Kscrollonedown=	KF|0x21,
 
+	Kglenda=	KF|0x22,
+
 	Ksoh=	0x01,
 	Kstx=	0x02,
 	Ketx=	0x03,
diff -r 9d154a594d99 sys/lib/kbmap/fi
--- a/sys/lib/kbmap/fi	Sat Apr 11 14:20:41 2020 +0200
+++ b/sys/lib/kbmap/fi	Sat Apr 11 18:50:50 2020 +0200
@@ -32,6 +32,8 @@
 1	52	':
 1	53	'_
 1	86	'>
+2	91	0xf022
+2	125	0xf022
 3	3	'@
 3	4	'£
 3	5	'$
@@ -44,3 +46,5 @@
 3	27	'~
 3	46	'¢
 3	86	'|
+3	91	0xf022
+4	91	0xf022
diff -r 9d154a594d99 sys/lib/kbmap/us
--- a/sys/lib/kbmap/us	Sat Apr 11 14:20:41 2020 +0200
+++ b/sys/lib/kbmap/us	Sat Apr 11 18:50:50 2020 +0200
@@ -345,7 +345,7 @@
 2	88	0
 2	89	0
 2	90	0
-2	91	0
+2	91	0xf022
 2	92	0
 2	93	0
 2	94	0
@@ -379,7 +379,7 @@
 2	122	0
 2	123	0
 2	124	0
-2	125	0
+2	125	0xf022
 2	126	0
 2	127	0
 3	0	0
@@ -473,7 +473,7 @@
 3	88	0
 3	89	0
 3	90	0
-3	91	0
+3	91	0xf022
 3	92	0
 3	93	0
 3	94	0
@@ -601,7 +601,7 @@
 4	88	^L
 4	89	0
 4	90	0
-4	91	0
+4	91	0xf022
 4	92	0
 4	93	0
 4	94	0
diff -r 9d154a594d99 sys/src/cmd/aux/kbdfs/kbdfs.c
--- a/sys/src/cmd/aux/kbdfs/kbdfs.c	Sat Apr 11 14:20:41 2020 +0200
+++ b/sys/src/cmd/aux/kbdfs/kbdfs.c	Sat Apr 11 18:50:50 2020 +0200
@@ -42,6 +42,7 @@
 	int	ctl;
 	int	alt;
 	int	altgr;
+	int	glenda;
 	int	leds;
 };
 
@@ -178,11 +179,11 @@
 [0x40]	0,	0,	0,	0,	0,	0,	Kbreak,	Khome,
 [0x48]	Kup,	Kpgup,	0,	Kleft,	0,	Kright,	0,	Kend,
 [0x50]	Kdown,	Kpgdown,Kins,	Kdel,	0,	0,	0,	0,
-[0x58]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x58]	0,	0,	0,	Kglenda,	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,	Kup,	0,	0,	0,	0,	0,	0,
+[0x78]	0,	Kup,	0,	0,	0,	Kglenda,	0,	0,
 };
 
 Rune kbtabshiftesc1[Nscan] =
@@ -198,11 +199,11 @@
 [0x40]	0,	0,	0,	0,	0,	0,	0,	0,
 [0x48]	Kup,	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,
+[0x58]	0,	0,	0,	Kglenda,	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,	Kup,	0,	0,	0,	0,	0,	0,
+[0x78]	0,	Kup,	0,	0,	0,	Kglenda,	0,	0,
 };
 
 Rune kbtabctrlesc1[Nscan] =
@@ -218,11 +219,11 @@
 [0x40]	0,	0,	0,	0,	0,	0,	0,	0,
 [0x48]	Kup,	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,
+[0x58]	0,	0,	0,	Kglenda,	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,	Kup,	0,	0,	0,	0,	0,	0,
+[0x78]	0,	Kup,	0,	0,	0,	Kglenda,	0,	0,
 };
 
 Rune kbtabaltgr[Nscan] =
@@ -238,11 +239,11 @@
 [0x40]	0,	0,	0,	0,	0,	0,	Kbreak,	Khome,
 [0x48]	Kup,	Kpgup,	0,	Kleft,	0,	Kright,	0,	Kend,
 [0x50]	Kdown,	Kpgdown,Kins,	Kdel,	0,	0,	0,	0,
-[0x58]	0,	0,	0,	0,	0,	0,	0,	0,
+[0x58]	0,	0,	0,	Kglenda,	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,	Kup,	0,	0,	0,	0,	0,	0,
+[0x78]	0,	Kup,	0,	0,	0,	Kglenda,	0,	0,
 };
 
 Rune kbtabctl[Nscan] =
@@ -258,11 +259,11 @@
 [0x40]	'\x06', 	'\a', 	'\f', 	'\r', 	'\x0e', 	'\x05', 	'\x06', 	'\x17', 
 [0x48]	'\x18', 	'\x19', 	'\r', 	'\x14', 	'\x15', 	'\x16', 	'\v', 	'\x11', 
 [0x50]	'\x12', 	'\x13', 	'\x10', 	'\x0e', 	0,	0,	0,	'\x0f', 
-[0x58]	'\f', 	0,	0,	0,	0,	0,	0,	0,
+[0x58]	'\f', 	0,	0,	Kglenda,	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,	'\a', 	0,	'\b',	0,	0,	0,	0,
+[0x78]	0,	'\a', 	0,	'\b',	0,	Kglenda,	0,	0,
 };
 
 Rune kbtabshiftaltgr[Nscan] =
@@ -344,7 +345,7 @@
 	if(scan->esc2){
 		scan->esc2--;
 		return;
-	} else if(c == 0xe1 || c == 0xe2){
+	} else if(c == 0xe1 || c == 0xe2 || c == 0xe3){
 		scan->esc2 = 2;
 		return;
 	} else if(c == 0xe0){
@@ -412,6 +413,9 @@
 	case Kcaps:
 		scan->caps ^= key.down;
 		break;
+	case Kglenda:
+		scan->glenda ^= key.down;
+		break;
 	}
 	scan->esc1 = 0;
 }
@@ -464,7 +468,7 @@
 			}
 		}
 		/* button unknown to kbtab, use rune if no modifier keys are active */
-		if(k.b == 0 && !a->shift && !a->altgr && !a->ctl)
+		if(k.b == 0 && !a->shift && !a->altgr && !a->ctl && !a->glenda)
 			k.b = k.r;
 		if(k.r == Kshift)
 			a->shift = k.down;
@@ -472,6 +476,8 @@
 			a->altgr = k.down;
 		else if(k.r == Kctl)
 			a->ctl = k.down;
+		else if(k.r == Kglenda)
+			a->glenda = k.down;
 		send(keychan, &k);
 		break;
 
@@ -664,6 +670,7 @@
 		case Knum:
 		case Kshift:
 		case Kaltgr:
+		case Kglenda:
 			/* ignore modifiers */
 			continue;
 

Re: [9front] kbdfs: "glenda" key modifier

[kvik]

Re: [9front] kbdfs: "glenda" key modifier

[kvik]

Re: [9front] kbdfs: "glenda" key modifier

[ori]

Seems like this patch struck you speechless.

Re: [9front] kbdfs: "glenda" key modifier

[kvik]

Those two were "Yes, please!" votes, in case you failed to notice.

Re: [9front] kbdfs: "glenda" key modifier

[kvik]

Very useful addition, thanks! Please commit.

Re: [9front] kbdfs: "glenda" key modifier

[ori]

> I added support for "glenda" key (the one that usually has Windows
> logo) support to kbdfs as an additional modifier to be used by
> whoever needs it. I use it with https://github.com/ftrvxmtrx/riow
> to get window management shortcuts although I plan to make riow
> depend solely on kbdfs change alone without having any rio mods
> by having a "filter" on top of kbdfs to intercept this modifier.
> If there is not much objection I would like to merge this change
> alone to 9front.
> Comments and ideas are welcome.


I haven't heard objections, and the code looks good to me -- go ahead
and merge!

Re: [9front] kbdfs: "glenda" key modifier

[Sigrid Solveig Haflínudóttir]

k, gonna finish with other kbmaps and merge then.

On Tue, Apr 21, 2020 at 8:48 PM <ori@eigenstate.org> wrote:
>
> > I added support for "glenda" key (the one that usually has Windows
> > logo) support to kbdfs as an additional modifier to be used by
> > whoever needs it. I use it with https://github.com/ftrvxmtrx/riow
> > to get window management shortcuts although I plan to make riow
> > depend solely on kbdfs change alone without having any rio mods
> > by having a "filter" on top of kbdfs to intercept this modifier.
> > If there is not much objection I would like to merge this change
> > alone to 9front.
> > Comments and ideas are welcome.
>
>
> I haven't heard objections, and the code looks good to me -- go ahead
> and merge!
>

Re: [9front] kbdfs: "glenda" key modifier

[Jstsmthrgk]

Does this use the 0xF868 rune? If it does I have to modify my neo2 patch.

(I think joined the mailing list after the patch was sent.)

Re: [9front] kbdfs: "glenda" key modifier

[Jstsmthrgk]

On 21.04.20 21:03, Jstsmthrgk wrote:
> Does this use the 0xF868 rune? If it does I have to modify my neo2 patch.
> 
> (I think joined the mailing list after the patch was sent.)

Sorry, looked it up, it's 0xF022, so no conflict.