p
/
termo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added TERMKEY_FORMAT_WRAPBRACKET

This commit is contained in:
Paul LeoNerd Evans 2008-10-06 22:33:49 +01:00
parent 5b24e42d90
commit 0b8680daa4
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
demo.c
View File

@ -10,14 +10,10 @@ int main(int argc, char *argv[]) {
termkey_key key; termkey_key key;
while((ret = termkey_waitkey(tk, &key)) != TERMKEY_RES_EOF) { while((ret = termkey_waitkey(tk, &key)) != TERMKEY_RES_EOF) {
if(key.type == TERMKEY_TYPE_UNICODE && !key.modifiers) termkey_snprint_key(tk, buffer, sizeof buffer, &key, 0);
printf("%s\n", key.utf8); printf("%s or ", buffer);
else { termkey_snprint_key(tk, buffer, sizeof buffer, &key, ~0);
termkey_snprint_key(tk, buffer, sizeof buffer, &key, 0); printf("%s\n", buffer);
printf("<%s> or ", buffer);
termkey_snprint_key(tk, buffer, sizeof buffer, &key, ~0);
printf("<%s>\n", buffer);
}
if(key.type == TERMKEY_TYPE_UNICODE && if(key.type == TERMKEY_TYPE_UNICODE &&
key.modifiers & TERMKEY_KEYMOD_CTRL && key.modifiers & TERMKEY_KEYMOD_CTRL &&

15
termkey.c
View File

@ -863,6 +863,15 @@ size_t termkey_snprint_key(termkey_t *tk, char *buffer, size_t len, termkey_key
int longmod = format & TERMKEY_FORMAT_LONGMOD; int longmod = format & TERMKEY_FORMAT_LONGMOD;
int wrapbracket = (format & TERMKEY_FORMAT_WRAPBRACKET) &&
(key->type != TERMKEY_TYPE_UNICODE || key->modifiers != 0);
if(wrapbracket) {
l = snprintf(buffer + pos, len - pos, "<");
if(l <= 0) return pos;
pos += l;
}
if(format & TERMKEY_FORMAT_CARETCTRL) { if(format & TERMKEY_FORMAT_CARETCTRL) {
if(key->type == TERMKEY_TYPE_UNICODE && if(key->type == TERMKEY_TYPE_UNICODE &&
key->modifiers == TERMKEY_KEYMOD_CTRL && key->modifiers == TERMKEY_KEYMOD_CTRL &&
@ -913,5 +922,11 @@ do_codepoint:
if(l <= 0) return pos; if(l <= 0) return pos;
pos += l; pos += l;
if(wrapbracket) {
l = snprintf(buffer + pos, len - pos, ">");
if(l <= 0) return pos;
pos += l;
}
return pos; return pos;
} }

1
termkey.h
View File

@ -136,6 +136,7 @@ typedef enum {
TERMKEY_FORMAT_LONGMOD = 1, TERMKEY_FORMAT_LONGMOD = 1,
TERMKEY_FORMAT_CARETCTRL = 2, TERMKEY_FORMAT_CARETCTRL = 2,
TERMKEY_FORMAT_ALTISMETA = 4, TERMKEY_FORMAT_ALTISMETA = 4,
TERMKEY_FORMAT_WRAPBRACKET = 8,
} termkey_format; } termkey_format;
size_t termkey_snprint_key(termkey_t *tk, char *buffer, size_t len, termkey_key *key, termkey_format format); size_t termkey_snprint_key(termkey_t *tk, char *buffer, size_t len, termkey_key *key, termkey_format format);