Skip to content

Multiple bindings (upper, lower, optional control) from one definition #85

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
dsalt wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Multiple bindings (upper, lower, optional control) from one definition #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8c7ba4
Multiple bindings (upper, lower, optional control) from one definition
dsalt Apr 4, 2026
5305400
Fix up test scripts for the keybinding changes.
dsalt Apr 6, 2026
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
46 changes: 42 additions & 4 deletions joe/kbd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ static int keyval(char *s)
default:
return s[1] & 0x1F;
}
else if (s[0] == '^' && s[1] == '^' && s[2] >= '@' && s[2] <= 127 && !s[3])
return KEY_CTRLCAPLOWER | (s[2] & 0x1F);
else if (s[0] == '^' && s[1] == '@' && (s[2] & 0xDF) >= 'A' && (s[2] & 0xDF) <= 'Z' && !s[3])
return KEY_CAPLOWER | (s[2] & 0x1F);
else if ((s[0] == 'S' || s[0] == 's')
&& (s[1] == 'P' || s[1] == 'p') && !s[2])
return ' ';
Expand Down Expand Up @@ -163,6 +167,8 @@ static char *range(char *seq, int *vv, int *ww)
return NULL;
seq[x] = c; /* Restore the space or 0 */
for (seq += x; *seq == ' '; ++seq) ; /* Skip over spaces */
if (v >= KEY_CTRLCAPLOWER && v <= KEY_CAPLOWER_LAST)
goto done;

/* Check for 'TO ' */
if ((seq[0] == 'T' || seq[0] == 't') && (seq[1] == 'O' || seq[1] == 'o') && seq[2] == ' ') {
Expand All @@ -180,6 +186,7 @@ static char *range(char *seq, int *vv, int *ww)
if (v > w)
return NULL;

done:
*vv = v;
*ww = w;
return seq;
Expand Down Expand Up @@ -296,16 +303,37 @@ static KMAP *kbuild(CAP *cap, KMAP *kmap, char *seq, MACRO *bind, int *err, cons
if (!kmap)
kmap = mkkmap(); /* Create new keymap if 'kmap' was NULL */

/* Make bindings between v and w */
if (v <= w) {
if (v >= KEY_CTRLCAPLOWER && v <= KEY_CAPLOWER_LAST) {
/* Make two or three bindings, e.g. Ctrl-A (if three), 'A' and 'a' */
int k = v >= KEY_CAPLOWER ? 64 : 0;
v &= 31;
for (; k <= 96; k += 32) {
if (*seq) {
KMAP *old;
if (k == 32)
continue;
old = (KMAP *)interval_lookup(kmap->src, NULL, k|v);
if (!old || !old->what) {
kmap->src = interval_add(kmap->src, k|v, k|v, kbuild(cap, NULL, seq, bind, err, NULL, 0));
++kmap->src_version;
} else
kbuild(cap, old, seq, bind, err, NULL, 0);
} else {
kmap->src = interval_add(kmap->src, k|v, k|v, bind);
++kmap->src_version;
}
}
} else if (v <= w) {
if (*seq || seql) {
/* Make bindings from a looked-up sequence */
KMAP *old = (KMAP *)interval_lookup(kmap->src, NULL, v);
if (!old || !old->what) {
kmap->src = interval_add(kmap->src, v, w, kbuild(cap, NULL, seq, bind, err, capseq, seql));
++kmap->src_version;
} else
kbuild(cap, old, seq, bind, err, capseq, seql);
} else {
/* Make bindings between v and w */
kmap->src = interval_add(kmap->src, v, w, bind);
++kmap->src_version;
}
Expand Down Expand Up @@ -348,8 +376,18 @@ int kdel(KMAP *kmap, char *seq)
if (!seq)
return -1;

/* Clear bindings between v and w */
if (v <= w) {
if (v >= KEY_CTRLCAPLOWER && v <= KEY_CTRLCAPLOWER_LAST) {
/* Clear three codes, e.g Ctrl-A, 'A' and 'a' */
char s[2] = {};
char c = (char)v & 31;
s[0] = c;
kdel(kmap, s);
s[0] = c | 64;
kdel(kmap, s);
s[0] = c | 96;
kdel(kmap, s);
} else if (v <= w) {
/* Clear bindings between v and w */
if (*seq) {
KMAP *old = (KMAP *)interval_lookup(kmap->src, NULL, v);
if (old->what == 1) {
Expand Down
7 changes: 7 additions & 0 deletions joe/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,13 @@ typedef int pid_t;
#define KEY_MIDDLEUP 0x10000B
#define KEY_MIDDLEDOWN 0x10000C

/* This one's for letters which may be modified with Ctrl or Shift: three-in-one */
#define KEY_CTRLCAPLOWER 0x110000
#define KEY_CTRLCAPLOWER_LAST (KEY_CTRLCAPLOWER + 31)
/* And just for upper and lower case: two-in-one */
#define KEY_CAPLOWER (KEY_CTRLCAPLOWER + 32)
#define KEY_CAPLOWER_LAST (KEY_CAPLOWER + 31)

#define stdsiz 8192
#define FITHEIGHT 4 /* Minimum height needed for new text windows */
#define FITMIN 2 /* Minimum main window height */
Expand Down
Loading
Loading