suckless
/
svkbd
mirror of git://git.suckless.org/svkbd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Extended key definition to allow setting explicit symbol for shift modifier. 

This allow key definitions as :

{ "?", XK_slash, 1, XK_Shift_L },

Which will press <S-/> wich output `?`

Signed-off-by: Reed Wade <reedwade@misterbanal.net>
Signed-off-by: Maarten van Gompel <proycon@anaproy.nl>
This commit is contained in:
Reed Wade 2021-03-06 15:09:08 +01:00 committed by Hiltjo Posthuma
parent 3be1e21c9f
commit d10af923a3
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
svkbd.c
View File

@ -41,6 +41,7 @@ typedef struct {
char *label;
KeySym keysym;
unsigned int width;
KeySym modifier;
int x, y, w, h;
Bool pressed;
Bool highlighted;
@ -183,14 +184,20 @@ buttonpress(XEvent *e)
ispressing = True;
for (i = 0; i < LENGTH(buttonmods); i++) {
if (ev->button == buttonmods[i].button) {
mod = buttonmods[i].mod;
break;
if (!(k = findkey(ev->x, ev->y)))
return;
if (k->modifier)
mod = k->modifier;
else
for (i = 0; i < LENGTH(buttonmods); i++) {
if (ev->button == buttonmods[i].button) {
mod = buttonmods[i].mod;
break;
}
}
}
if ((k = findkey(ev->x, ev->y)))
press(k, mod);
press(k, mod);
}
void
@ -212,8 +219,10 @@ buttonrelease(XEvent *e)
if (ev->x < 0 || ev->y < 0) {
unpress(NULL, mod);
} else {
if ((k = findkey(ev->x, ev->y)))
} else if ((k = findkey(ev->x, ev->y))) {
if (k->modifier)
unpress(k, k->modifier);
else
unpress(k, mod);
}
}
@ -872,6 +881,7 @@ showoverlay(int idx)
j++;
keys[j].label = overlay[i].label;
keys[j].keysym = overlay[i].keysym;
keys[j].modifier = overlay[i].modifier;
}
currentoverlay = idx;
overlaykeysym = ispressingkeysym;