p
/
termo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
termo/driver-csi.c

763 lines
18 KiB
C
Raw Normal View History

CMake-ify, rename to termkey2 for the time being
2014-10-09 23:47:24 +02:00
#include "termkey2.h"
#include "termkey2-internal.h"
Moved CSI-related code out of termkey.c into new driver-csi.c
2008-10-07 00:27:19 +02:00
#include <stdio.h>
#include <string.h>
Since CSI key info is the same for every CSI driver, just store one static copy of it rather than one for every termkey instance - simplifies construct-time allocation
2012-01-20 19:01:19 +01:00
// There are 64 codes 0x40 - 0x7F
Mark new driver-csi internal variables as static so they don't result in linkable symbols
2012-01-22 19:54:17 +01:00
static int keyinfo_initialised = 0;
static struct keyinfo ss3s[64];
static char ss3_kpalts[64];
Since CSI key info is the same for every CSI driver, just store one static copy of it rather than one for every termkey instance - simplifies construct-time allocation
2012-01-20 19:01:19 +01:00
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
typedef struct
{
termkey_t *tk;
}
termkey_csi_t;
Since CSI key info is the same for every CSI driver, just store one static copy of it rather than one for every termkey instance - simplifies construct-time allocation
2012-01-20 19:01:19 +01:00
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
typedef termkey_result_t (*csi_handler_fn)
(termkey_t *tk, termkey_key_t *key, int cmd, long *arg, int args);
static csi_handler_fn csi_handlers[64];
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
/*
* Handler for CSI/SS3 cmd keys
*/
static struct keyinfo csi_ss3s[64];
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
static termkey_result_t
handle_csi_ss3_full (termkey_t *tk,
termkey_key_t *key, int cmd, long *arg, int args)
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
{
Add -Wextra
2014-09-23 02:33:06 +02:00
(void) tk;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
if (args > 1 && arg[1] != -1)
key->modifiers = arg[1] - 1;
else
key->modifiers = 0;
key->type = csi_ss3s[cmd - 0x40].type;
key->code.sym = csi_ss3s[cmd - 0x40].sym;
key->modifiers &= ~(csi_ss3s[cmd - 0x40].modifier_mask);
key->modifiers |= csi_ss3s[cmd - 0x40].modifier_set;
if (key->code.sym == TERMKEY_SYM_UNKNOWN)
return TERMKEY_RES_NONE;
return TERMKEY_RES_KEY;
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
}
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
static void
register_csi_ss3_full (termkey_type_t type, termkey_sym_t sym,
int modifier_set, int modifier_mask, unsigned char cmd)
Since CSI key info is the same for every CSI driver, just store one static copy of it rather than one for every termkey instance - simplifies construct-time allocation
2012-01-20 19:01:19 +01:00
{
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
if (cmd < 0x40 || cmd >= 0x80)
return;
Moved CSI key registration code to be private to CSI driver
2008-10-07 00:53:25 +02:00
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
csi_ss3s[cmd - 0x40].type = type;
csi_ss3s[cmd - 0x40].sym = sym;
csi_ss3s[cmd - 0x40].modifier_set = modifier_set;
csi_ss3s[cmd - 0x40].modifier_mask = modifier_mask;
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
csi_handlers[cmd - 0x40] = &handle_csi_ss3_full;
Since CSI key info is the same for every CSI driver, just store one static copy of it rather than one for every termkey instance - simplifies construct-time allocation
2012-01-20 19:01:19 +01:00
}
Moved CSI-related code out of termkey.c into new driver-csi.c
2008-10-07 00:27:19 +02:00
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
static void
register_csi_ss3 (termkey_type_t type, termkey_sym_t sym, unsigned char cmd)
Since CSI key info is the same for every CSI driver, just store one static copy of it rather than one for every termkey instance - simplifies construct-time allocation
2012-01-20 19:01:19 +01:00
{
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
register_csi_ss3_full (type, sym, 0, 0, cmd);
Since CSI key info is the same for every CSI driver, just store one static copy of it rather than one for every termkey instance - simplifies construct-time allocation
2012-01-20 19:01:19 +01:00
}
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
/*
* Handler for SS3 keys with kpad alternate representations
*/
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
static void
register_ss3kpalt (termkey_type_t type, termkey_sym_t sym,
unsigned char cmd, char kpalt)
Since CSI key info is the same for every CSI driver, just store one static copy of it rather than one for every termkey instance - simplifies construct-time allocation
2012-01-20 19:01:19 +01:00
{
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
if (cmd < 0x40 || cmd >= 0x80)
return;
ss3s[cmd - 0x40].type = type;
ss3s[cmd - 0x40].sym = sym;
ss3s[cmd - 0x40].modifier_set = 0;
ss3s[cmd - 0x40].modifier_mask = 0;
ss3_kpalts[cmd - 0x40] = kpalt;
Since CSI key info is the same for every CSI driver, just store one static copy of it rather than one for every termkey instance - simplifies construct-time allocation
2012-01-20 19:01:19 +01:00
}
Moved CSI key registration code to be private to CSI driver
2008-10-07 00:53:25 +02:00
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
/*
* Handler for CSI number ~ function keys
*/
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
/* This value must be increased if more CSI function keys are added */
static struct keyinfo csifuncs[35];
Add -Wextra
2014-09-23 02:33:06 +02:00
#define NCSIFUNCS ((long) (sizeof csifuncs / sizeof csifuncs[0]))
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
static termkey_result_t
handle_csifunc (termkey_t *tk, termkey_key_t *key, int cmd, long *arg, int args)
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
{
Add -Wextra
2014-09-23 02:33:06 +02:00
(void) cmd;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
if (args > 1 && arg[1] != -1)
key->modifiers = arg[1] - 1;
else
key->modifiers = 0;
key->type = TERMKEY_TYPE_KEYSYM;
if (arg[0] == 27)
{
int mod = key->modifiers;
(*tk->method.emit_codepoint) (tk, arg[2], key);
key->modifiers |= mod;
}
else if (arg[0] >= 0 && arg[0] < NCSIFUNCS)
{
key->type = csifuncs[arg[0]].type;
key->code.sym = csifuncs[arg[0]].sym;
key->modifiers &= ~(csifuncs[arg[0]].modifier_mask);
key->modifiers |= csifuncs[arg[0]].modifier_set;
}
else
key->code.sym = TERMKEY_SYM_UNKNOWN;
if (key->code.sym == TERMKEY_SYM_UNKNOWN)
{
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
#ifdef DEBUG
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
fprintf (stderr, "CSI: Unknown function key %ld\n", arg[0]);
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
#endif
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
return TERMKEY_RES_NONE;
}
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
return TERMKEY_RES_KEY;
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
}
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
static void
register_csifunc (termkey_type_t type, termkey_sym_t sym, int number)
Since CSI key info is the same for every CSI driver, just store one static copy of it rather than one for every termkey instance - simplifies construct-time allocation
2012-01-20 19:01:19 +01:00
{
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
if (number >= NCSIFUNCS)
return;
Since CSI key info is the same for every CSI driver, just store one static copy of it rather than one for every termkey instance - simplifies construct-time allocation
2012-01-20 19:01:19 +01:00
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
csifuncs[number].type = type;
csifuncs[number].sym = sym;
csifuncs[number].modifier_set = 0;
csifuncs[number].modifier_mask = 0;
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
csi_handlers['~' - 0x40] = &handle_csifunc;
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
}
Move to iconv That is the major change in this commit. Also Ctrl-modified keys now should work in URxvt, which was surprisingly trivial to achieve. Coming up next: - making sure the tests still work - introducing CMake
2014-09-28 03:51:45 +02:00
/*
* URxvt seems to emit this instead of ~ when holding Ctrl
*/
static termkey_result_t
handle_csi_caret (termkey_t *tk,
termkey_key_t *key, int cmd, long *arg, int args)
{
switch (cmd)
{
case '^':
{
termkey_result_t res = handle_csifunc (tk, key, cmd, arg, args);
if (res == TERMKEY_RES_KEY)
key->modifiers |= TERMKEY_KEYMOD_CTRL;
return res;
}
default:
return TERMKEY_RES_NONE;
}
}
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
/*
* Handler for CSI u extended Unicode keys
*/
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
static termkey_result_t
handle_csi_u (termkey_t *tk, termkey_key_t *key, int cmd, long *arg, int args)
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
{
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
switch (cmd)
{
case 'u':
{
if (args > 1 && arg[1] != -1)
key->modifiers = arg[1] - 1;
else
key->modifiers = 0;
int mod = key->modifiers;
key->type = TERMKEY_TYPE_KEYSYM;
(*tk->method.emit_codepoint) (tk, arg[0], key);
key->modifiers |= mod;
return TERMKEY_RES_KEY;
}
default:
return TERMKEY_RES_NONE;
}
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
}
/*
Work on mouse support, it's a mess
2014-10-13 01:03:13 +02:00
* Handler for CSI M / CSI m mouse events in SGR and rxvt encodings
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
* Note: This does not handle X10 encoding
*/
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
static termkey_result_t
handle_csi_m (termkey_t *tk, termkey_key_t *key, int cmd, long *arg, int args)
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
{
Add -Wextra
2014-09-23 02:33:06 +02:00
(void) tk;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
int initial = cmd >> 8;
cmd &= 0xff;
switch (cmd)
{
case 'M':
case 'm':
break;
default:
return TERMKEY_RES_NONE;
}
if (!initial && args >= 3)
{
// rxvt protocol
key->type = TERMKEY_TYPE_MOUSE;
Make mode 1015 and 1006 work, prepare for 1005
2014-10-13 23:36:14 +02:00
key->code.mouse.info = arg[0] - 0x20;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
Make mode 1015 and 1006 work, prepare for 1005
2014-10-13 23:36:14 +02:00
key->modifiers = (key->code.mouse.info & 0x1c) >> 2;
key->code.mouse.info &= ~0x1c;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
Make mode 1015 and 1006 work, prepare for 1005
2014-10-13 23:36:14 +02:00
termkey_key_set_linecol (key, arg[2] - 1, arg[1] - 1);
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
return TERMKEY_RES_KEY;
}
if (initial == '<' && args >= 3)
{
// SGR protocol
key->type = TERMKEY_TYPE_MOUSE;
Make mode 1015 and 1006 work, prepare for 1005
2014-10-13 23:36:14 +02:00
key->code.mouse.info = arg[0];
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
Make mode 1015 and 1006 work, prepare for 1005
2014-10-13 23:36:14 +02:00
key->modifiers = (key->code.mouse.info & 0x1c) >> 2;
key->code.mouse.info &= ~0x1c;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
Make mode 1015 and 1006 work, prepare for 1005
2014-10-13 23:36:14 +02:00
termkey_key_set_linecol (key, arg[2] - 1, arg[1] - 1);
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
if (cmd == 'm') // release
Make mode 1015 and 1006 work, prepare for 1005
2014-10-13 23:36:14 +02:00
key->code.mouse.info |= 0x8000;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
return TERMKEY_RES_KEY;
}
return TERMKEY_RES_NONE;
Since CSI key info is the same for every CSI driver, just store one static copy of it rather than one for every termkey instance - simplifies construct-time allocation
2012-01-20 19:01:19 +01:00
}
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
termkey_result_t
termkey_interpret_mouse (termkey_t *tk, const termkey_key_t *key,
termkey_mouse_event_t *event, int *button, int *line, int *col)
Moved the other termkey_interpret_*() functions into driver-csi.c where they arguably belong
2012-11-30 16:01:20 +01:00
{
Add -Wextra
2014-09-23 02:33:06 +02:00
(void) tk;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
if (key->type != TERMKEY_TYPE_MOUSE)
return TERMKEY_RES_NONE;
if (button)
*button = 0;
termkey_key_get_linecol (key, line, col);
Work on mouse support, it's a mess
2014-10-13 01:03:13 +02:00
// XXX: WTF is this logic?
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
if (!event)
return TERMKEY_RES_KEY;
int btn = 0;
Make mode 1015 and 1006 work, prepare for 1005
2014-10-13 23:36:14 +02:00
int code = key->code.mouse.info;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
int drag = code & 0x20;
code &= ~0x3c;
switch (code)
{
case 0:
case 1:
case 2:
*event = drag ? TERMKEY_MOUSE_DRAG : TERMKEY_MOUSE_PRESS;
btn = code + 1;
break;
case 3:
*event = TERMKEY_MOUSE_RELEASE;
// no button hint
break;
case 64:
case 65:
*event = drag ? TERMKEY_MOUSE_DRAG : TERMKEY_MOUSE_PRESS;
btn = code + 4 - 64;
break;
default:
*event = TERMKEY_MOUSE_UNKNOWN;
}
if (button)
*button = btn;
Make mode 1015 and 1006 work, prepare for 1005
2014-10-13 23:36:14 +02:00
if (key->code.mouse.info & 0x8000)
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
*event = TERMKEY_MOUSE_RELEASE;
return TERMKEY_RES_KEY;
Moved the other termkey_interpret_*() functions into driver-csi.c where they arguably belong
2012-11-30 16:01:20 +01:00
}
Also handle CSI R; position report replies to CSI 6n
2012-04-24 18:27:48 +02:00
/*
Only recognise DECCPR as a position report, so it is distinct from F3
2012-11-30 17:12:26 +01:00
* Handler for CSI ? R position reports
Try to handle position reports -and- F3 concurrently.. somehow.. argh
2012-11-30 16:36:06 +01:00
* A plain CSI R with no arguments is probably actually <F3>
Also handle CSI R; position report replies to CSI 6n
2012-04-24 18:27:48 +02:00
*/
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
static termkey_result_t
handle_csi_R (termkey_t *tk, termkey_key_t *key, int cmd, long *arg, int args)
Also handle CSI R; position report replies to CSI 6n
2012-04-24 18:27:48 +02:00
{
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
switch (cmd)
{
case 'R' | '?' << 8:
if (args < 2)
return TERMKEY_RES_NONE;
key->type = TERMKEY_TYPE_POSITION;
termkey_key_set_linecol (key, arg[1], arg[0]);
return TERMKEY_RES_KEY;
default:
return handle_csi_ss3_full (tk, key, cmd, arg, args);
}
Also handle CSI R; position report replies to CSI 6n
2012-04-24 18:27:48 +02:00
}
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
termkey_result_t
termkey_interpret_position (termkey_t *tk,
const termkey_key_t *key, int *line, int *col)
Moved the other termkey_interpret_*() functions into driver-csi.c where they arguably belong
2012-11-30 16:01:20 +01:00
{
Add -Wextra
2014-09-23 02:33:06 +02:00
(void) tk;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
if (key->type != TERMKEY_TYPE_POSITION)
return TERMKEY_RES_NONE;
Moved the other termkey_interpret_*() functions into driver-csi.c where they arguably belong
2012-11-30 16:01:20 +01:00
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
termkey_key_get_linecol (key, line, col);
return TERMKEY_RES_KEY;
Moved the other termkey_interpret_*() functions into driver-csi.c where they arguably belong
2012-11-30 16:01:20 +01:00
}
Handle ANSI and DEC mode report CSIs
2012-11-30 17:34:47 +01:00
/*
* Handler for CSI $y mode status reports
*/
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
static termkey_result_t
handle_csi_y (termkey_t *tk, termkey_key_t *key, int cmd, long *arg, int args)
Handle ANSI and DEC mode report CSIs
2012-11-30 17:34:47 +01:00
{
Add -Wextra
2014-09-23 02:33:06 +02:00
(void) tk;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
switch (cmd)
{
case 'y' | '$' << 16:
case 'y' | '$' << 16 | '?' << 8:
if (args < 2)
return TERMKEY_RES_NONE;
key->type = TERMKEY_TYPE_MODEREPORT;
Make mode 1015 and 1006 work, prepare for 1005
2014-10-13 23:36:14 +02:00
key->code.mode.initial = (cmd >> 8);
key->code.mode.mode = arg[0];
key->code.mode.value = arg[1];
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
return TERMKEY_RES_KEY;
default:
return TERMKEY_RES_NONE;
}
Handle ANSI and DEC mode report CSIs
2012-11-30 17:34:47 +01:00
}
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
termkey_result_t
termkey_interpret_modereport (termkey_t *tk,
const termkey_key_t *key, int *initial, int *mode, int *value)
Handle ANSI and DEC mode report CSIs
2012-11-30 17:34:47 +01:00
{
Add -Wextra
2014-09-23 02:33:06 +02:00
(void) tk;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
if (key->type != TERMKEY_TYPE_MODEREPORT)
return TERMKEY_RES_NONE;
if (initial)
Make mode 1015 and 1006 work, prepare for 1005
2014-10-13 23:36:14 +02:00
*initial = key->code.mode.initial;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
if (mode)
Make mode 1015 and 1006 work, prepare for 1005
2014-10-13 23:36:14 +02:00
*mode = key->code.mode.mode;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
if (value)
Make mode 1015 and 1006 work, prepare for 1005
2014-10-13 23:36:14 +02:00
*value = key->code.mode.value;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
return TERMKEY_RES_KEY;
Handle ANSI and DEC mode report CSIs
2012-11-30 17:34:47 +01:00
}
Split out the actual CSI parser into its own function, separate from peekkey_csi
2012-11-30 14:52:56 +01:00
#define CHARAT(i) (tk->buffer[tk->buffstart + (i)])
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
static termkey_result_t
parse_csi (termkey_t *tk, size_t introlen, size_t *csi_len,
long args[], size_t *nargs, unsigned long *commandp)
Split out the actual CSI parser into its own function, separate from peekkey_csi
2012-11-30 14:52:56 +01:00
{
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
size_t csi_end = introlen;
while (csi_end < tk->buffcount)
{
if (CHARAT (csi_end) >= 0x40 && CHARAT (csi_end) < 0x80)
break;
csi_end++;
}
if (csi_end >= tk->buffcount)
return TERMKEY_RES_AGAIN;
unsigned char cmd = CHARAT (csi_end);
*commandp = cmd;
char present = 0;
int argi = 0;
size_t p = introlen;
// See if there is an initial byte
if (CHARAT (p) >= '<' && CHARAT (p) <= '?')
{
*commandp |= (CHARAT (p) << 8);
p++;
}
// Now attempt to parse out up number;number;... separated values
for (; p < csi_end; p++)
{
unsigned char c = CHARAT (p);
if (c >= '0' && c <= '9')
{
if (!present)
{
args[argi] = c - '0';
present = 1;
}
else
args[argi] = (args[argi] * 10) + c - '0';
}
else if (c == ';')
{
if (!present)
args[argi] = -1;
present = 0;
argi++;
if (argi > 16)
break;
}
else if (c >= 0x20 && c <= 0x2f)
{
*commandp |= c << 16;
break;
}
}
if (present)
argi++;
*nargs = argi;
*csi_len = csi_end + 1;
return TERMKEY_RES_KEY;
Split out the actual CSI parser into its own function, separate from peekkey_csi
2012-11-30 14:52:56 +01:00
}
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
termkey_result_t
termkey_interpret_csi (termkey_t *tk, const termkey_key_t *key,
long args[], size_t *nargs, unsigned long *cmd)
Moved the other termkey_interpret_*() functions into driver-csi.c where they arguably belong
2012-11-30 16:01:20 +01:00
{
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
if (tk->hightide == 0)
return TERMKEY_RES_NONE;
if (key->type != TERMKEY_TYPE_UNKNOWN_CSI)
return TERMKEY_RES_NONE;
Moved the other termkey_interpret_*() functions into driver-csi.c where they arguably belong
2012-11-30 16:01:20 +01:00
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
size_t dummy;
return parse_csi (tk, 0, &dummy, args, nargs, cmd);
Moved the other termkey_interpret_*() functions into driver-csi.c where they arguably belong
2012-11-30 16:01:20 +01:00
}
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
static int
register_keys (void)
Since CSI key info is the same for every CSI driver, just store one static copy of it rather than one for every termkey instance - simplifies construct-time allocation
2012-01-20 19:01:19 +01:00
{
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
int i;
for (i = 0; i < 64; i++)
{
csi_ss3s[i].sym = TERMKEY_SYM_UNKNOWN;
ss3s[i].sym = TERMKEY_SYM_UNKNOWN;
ss3_kpalts[i] = 0;
}
for (i = 0; i < NCSIFUNCS; i++)
csifuncs[i].sym = TERMKEY_SYM_UNKNOWN;
register_csi_ss3 (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_UP, 'A');
register_csi_ss3 (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_DOWN, 'B');
register_csi_ss3 (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_RIGHT, 'C');
register_csi_ss3 (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_LEFT, 'D');
register_csi_ss3 (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_BEGIN, 'E');
register_csi_ss3 (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_END, 'F');
register_csi_ss3 (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_HOME, 'H');
register_csi_ss3 (TERMKEY_TYPE_FUNCTION, 1, 'P');
register_csi_ss3 (TERMKEY_TYPE_FUNCTION, 2, 'Q');
register_csi_ss3 (TERMKEY_TYPE_FUNCTION, 3, 'R');
register_csi_ss3 (TERMKEY_TYPE_FUNCTION, 4, 'S');
register_csi_ss3_full (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_TAB,
TERMKEY_KEYMOD_SHIFT, TERMKEY_KEYMOD_SHIFT, 'Z');
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KPENTER, 'M', 0);
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KPEQUALS, 'X', '=');
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KPMULT, 'j', '*');
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KPPLUS, 'k', '+');
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KPCOMMA, 'l', ',');
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KPMINUS, 'm', '-');
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KPPERIOD, 'n', '.');
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KPDIV, 'o', '/');
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KP0, 'p', '0');
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KP1, 'q', '1');
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KP2, 'r', '2');
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KP3, 's', '3');
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KP4, 't', '4');
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KP5, 'u', '5');
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KP6, 'v', '6');
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KP7, 'w', '7');
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KP8, 'x', '8');
register_ss3kpalt (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_KP9, 'y', '9');
register_csifunc (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_FIND, 1);
register_csifunc (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_INSERT, 2);
register_csifunc (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_DELETE, 3);
register_csifunc (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_SELECT, 4);
register_csifunc (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_PAGEUP, 5);
register_csifunc (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_PAGEDOWN, 6);
register_csifunc (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_HOME, 7);
register_csifunc (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_END, 8);
register_csifunc (TERMKEY_TYPE_FUNCTION, 1, 11);
register_csifunc (TERMKEY_TYPE_FUNCTION, 2, 12);
register_csifunc (TERMKEY_TYPE_FUNCTION, 3, 13);
register_csifunc (TERMKEY_TYPE_FUNCTION, 4, 14);
register_csifunc (TERMKEY_TYPE_FUNCTION, 5, 15);
register_csifunc (TERMKEY_TYPE_FUNCTION, 6, 17);
register_csifunc (TERMKEY_TYPE_FUNCTION, 7, 18);
register_csifunc (TERMKEY_TYPE_FUNCTION, 8, 19);
register_csifunc (TERMKEY_TYPE_FUNCTION, 9, 20);
register_csifunc (TERMKEY_TYPE_FUNCTION, 10, 21);
register_csifunc (TERMKEY_TYPE_FUNCTION, 11, 23);
register_csifunc (TERMKEY_TYPE_FUNCTION, 12, 24);
register_csifunc (TERMKEY_TYPE_FUNCTION, 13, 25);
register_csifunc (TERMKEY_TYPE_FUNCTION, 14, 26);
register_csifunc (TERMKEY_TYPE_FUNCTION, 15, 28);
register_csifunc (TERMKEY_TYPE_FUNCTION, 16, 29);
register_csifunc (TERMKEY_TYPE_FUNCTION, 17, 31);
register_csifunc (TERMKEY_TYPE_FUNCTION, 18, 32);
register_csifunc (TERMKEY_TYPE_FUNCTION, 19, 33);
register_csifunc (TERMKEY_TYPE_FUNCTION, 20, 34);
csi_handlers['u' - 0x40] = &handle_csi_u;
csi_handlers['M' - 0x40] = &handle_csi_m;
csi_handlers['m' - 0x40] = &handle_csi_m;
csi_handlers['R' - 0x40] = &handle_csi_R;
csi_handlers['y' - 0x40] = &handle_csi_y;
Move to iconv That is the major change in this commit. Also Ctrl-modified keys now should work in URxvt, which was surprisingly trivial to achieve. Coming up next: - making sure the tests still work - introducing CMake
2014-09-28 03:51:45 +02:00
// URxvt
register_csi_ss3_full (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_UP,
TERMKEY_KEYMOD_CTRL, TERMKEY_KEYMOD_CTRL, 'a');
register_csi_ss3_full (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_DOWN,
TERMKEY_KEYMOD_CTRL, TERMKEY_KEYMOD_CTRL, 'b');
register_csi_ss3_full (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_RIGHT,
TERMKEY_KEYMOD_CTRL, TERMKEY_KEYMOD_CTRL, 'c');
register_csi_ss3_full (TERMKEY_TYPE_KEYSYM, TERMKEY_SYM_LEFT,
TERMKEY_KEYMOD_CTRL, TERMKEY_KEYMOD_CTRL, 'd');
csi_handlers['^' - 0x40] = &handle_csi_caret;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
keyinfo_initialised = 1;
return 1;
Since CSI key info is the same for every CSI driver, just store one static copy of it rather than one for every termkey instance - simplifies construct-time allocation
2012-01-20 19:01:19 +01:00
}
Moved CSI key registration code to be private to CSI driver
2008-10-07 00:53:25 +02:00
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
static void *
new_driver (termkey_t *tk, const char *term)
Moved CSI-related code out of termkey.c into new driver-csi.c
2008-10-07 00:27:19 +02:00
{
Add -Wextra
2014-09-23 02:33:06 +02:00
(void) term;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
if (!keyinfo_initialised && !register_keys ())
return NULL;
Moved CSI-related code out of termkey.c into new driver-csi.c
2008-10-07 00:27:19 +02:00
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
termkey_csi_t *csi = malloc (sizeof *csi);
if (!csi)
return NULL;
Moved CSI key registration code to be private to CSI driver
2008-10-07 00:53:25 +02:00
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
csi->tk = tk;
return csi;
Moved CSI-related code out of termkey.c into new driver-csi.c
2008-10-07 00:27:19 +02:00
}
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
static void
free_driver (void *info)
Moved CSI-related code out of termkey.c into new driver-csi.c
2008-10-07 00:27:19 +02:00
{
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
termkey_csi_t *csi = info;
free (csi);
Moved CSI-related code out of termkey.c into new driver-csi.c
2008-10-07 00:27:19 +02:00
}
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
static termkey_result_t
peekkey_csi (termkey_t *tk, termkey_csi_t *csi,
size_t introlen, termkey_key_t *key, int force, size_t *nbytep)
Moved CSI-related code out of termkey.c into new driver-csi.c
2008-10-07 00:27:19 +02:00
{
Add -Wextra
2014-09-23 02:33:06 +02:00
(void) csi;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
size_t csi_len;
size_t args = 16;
long arg[16];
unsigned long cmd;
termkey_result_t ret = parse_csi (tk, introlen, &csi_len, arg, &args, &cmd);
if (ret == TERMKEY_RES_AGAIN)
{
if (!force)
return TERMKEY_RES_AGAIN;
(*tk->method.emit_codepoint) (tk, '[', key);
key->modifiers |= TERMKEY_KEYMOD_ALT;
*nbytep = introlen;
return TERMKEY_RES_KEY;
}
Make mode 1015 and 1006 work, prepare for 1005
2014-10-13 23:36:14 +02:00
// Mouse in X10 encoding consumes the next 3 bytes also (or more with 1005)
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
if (cmd == 'M' && args < 3)
{
tk->buffstart += csi_len;
tk->buffcount -= csi_len;
termkey_result_t mouse_result =
(*tk->method.peekkey_mouse) (tk, key, nbytep);
tk->buffstart -= csi_len;
tk->buffcount += csi_len;
if (mouse_result == TERMKEY_RES_KEY)
*nbytep += csi_len;
return mouse_result;
}
termkey_result_t result = TERMKEY_RES_NONE;
// We know from the logic above that cmd must be >= 0x40 and < 0x80
if (csi_handlers[(cmd & 0xff) - 0x40])
result = (*csi_handlers[(cmd & 0xff) - 0x40]) (tk, key, cmd, arg, args);
if (result == TERMKEY_RES_NONE)
{
Make CSI driver's debugging output messages on unrecognised sequences conditional on #ifdef DEBUG
2008-11-12 14:02:30 +01:00
#ifdef DEBUG
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
switch (args)
{
case 1:
Move to iconv That is the major change in this commit. Also Ctrl-modified keys now should work in URxvt, which was surprisingly trivial to achieve. Coming up next: - making sure the tests still work - introducing CMake
2014-09-28 03:51:45 +02:00
fprintf (stderr, "CSI: Unknown arg1=%ld cmd=%c\n",
arg[0], (char) cmd);
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
break;
case 2:
Move to iconv That is the major change in this commit. Also Ctrl-modified keys now should work in URxvt, which was surprisingly trivial to achieve. Coming up next: - making sure the tests still work - introducing CMake
2014-09-28 03:51:45 +02:00
fprintf (stderr, "CSI: Unknown arg1=%ld arg2=%ld cmd=%c\n",
arg[0], arg[1], (char) cmd);
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
break;
case 3:
Move to iconv That is the major change in this commit. Also Ctrl-modified keys now should work in URxvt, which was surprisingly trivial to achieve. Coming up next: - making sure the tests still work - introducing CMake
2014-09-28 03:51:45 +02:00
fprintf (stderr, "CSI: Unknown arg1=%ld arg2=%ld arg3=%ld cmd=%c\n",
arg[0], arg[1], arg[2], (char) cmd);
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
break;
default:
Move to iconv That is the major change in this commit. Also Ctrl-modified keys now should work in URxvt, which was surprisingly trivial to achieve. Coming up next: - making sure the tests still work - introducing CMake
2014-09-28 03:51:45 +02:00
fprintf (stderr, "CSI: Unknown arg1=%ld arg2=%ld arg3=%ld ... "
"args=%zu cmd=%c\n", arg[0], arg[1], arg[2], args, (char) cmd);
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
break;
}
Neater CSI driver; dispatch command handlers from an array
2012-04-24 17:33:13 +02:00
#endif
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
key->type = TERMKEY_TYPE_UNKNOWN_CSI;
key->code.number = cmd;
Return a real key type for unrecognised CSI sequences; allow accessing them by termkey_interpret_csi()
2012-11-30 15:35:23 +01:00
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
tk->hightide = csi_len - introlen;
*nbytep = introlen; // Do not yet eat the data bytes
return TERMKEY_RES_KEY;
}
Moved CSI-related code out of termkey.c into new driver-csi.c
2008-10-07 00:27:19 +02:00
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
*nbytep = csi_len;
return result;
Moved CSI-related code out of termkey.c into new driver-csi.c
2008-10-07 00:27:19 +02:00
}
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
static termkey_result_t
peekkey_ss3 (termkey_t *tk, termkey_csi_t *csi, size_t introlen,
termkey_key_t *key, int force, size_t *nbytep)
Moved CSI-related code out of termkey.c into new driver-csi.c
2008-10-07 00:27:19 +02:00
{
Add -Wextra
2014-09-23 02:33:06 +02:00
(void) csi;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
if (tk->buffcount < introlen + 1)
{
if (!force)
return TERMKEY_RES_AGAIN;
(*tk->method.emit_codepoint) (tk, 'O', key);
key->modifiers |= TERMKEY_KEYMOD_ALT;
*nbytep = tk->buffcount;
return TERMKEY_RES_KEY;
}
unsigned char cmd = CHARAT (introlen);
if (cmd < 0x40 || cmd >= 0x80)
return TERMKEY_RES_NONE;
key->type = csi_ss3s[cmd - 0x40].type;
key->code.sym = csi_ss3s[cmd - 0x40].sym;
key->modifiers = csi_ss3s[cmd - 0x40].modifier_set;
if (key->code.sym == TERMKEY_SYM_UNKNOWN)
{
if (tk->flags & TERMKEY_FLAG_CONVERTKP && ss3_kpalts[cmd - 0x40])
{
Move to iconv That is the major change in this commit. Also Ctrl-modified keys now should work in URxvt, which was surprisingly trivial to achieve. Coming up next: - making sure the tests still work - introducing CMake
2014-09-28 03:51:45 +02:00
key->type = TERMKEY_TYPE_KEY;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
key->code.codepoint = ss3_kpalts[cmd - 0x40];
key->modifiers = 0;
Move to iconv That is the major change in this commit. Also Ctrl-modified keys now should work in URxvt, which was surprisingly trivial to achieve. Coming up next: - making sure the tests still work - introducing CMake
2014-09-28 03:51:45 +02:00
key->multibyte[0] = key->code.codepoint;
key->multibyte[1] = 0;
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
}
else
{
key->type = ss3s[cmd - 0x40].type;
key->code.sym = ss3s[cmd - 0x40].sym;
key->modifiers = ss3s[cmd - 0x40].modifier_set;
}
}
if (key->code.sym == TERMKEY_SYM_UNKNOWN)
{
Make CSI driver's debugging output messages on unrecognised sequences conditional on #ifdef DEBUG
2008-11-12 14:02:30 +01:00
#ifdef DEBUG
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
fprintf (stderr, "CSI: Unknown SS3 %c (0x%02x)\n", (char) cmd, cmd);
Make CSI driver's debugging output messages on unrecognised sequences conditional on #ifdef DEBUG
2008-11-12 14:02:30 +01:00
#endif
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
return TERMKEY_RES_NONE;
}
Moved CSI-related code out of termkey.c into new driver-csi.c
2008-10-07 00:27:19 +02:00
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
*nbytep = introlen + 1;
return TERMKEY_RES_KEY;
Moved CSI-related code out of termkey.c into new driver-csi.c
2008-10-07 00:27:19 +02:00
}
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
static termkey_result_t
peekkey (termkey_t *tk, void *info,
termkey_key_t *key, int force, size_t *nbytep)
Moved CSI-related code out of termkey.c into new driver-csi.c
2008-10-07 00:27:19 +02:00
{
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
if (tk->buffcount == 0)
return tk->is_closed ? TERMKEY_RES_EOF : TERMKEY_RES_NONE;
termkey_csi_t *csi = info;
// Now we're sure at least 1 byte is valid
unsigned char b0 = CHARAT (0);
if (b0 == 0x1b && tk->buffcount > 1 && CHARAT (1) == '[')
return peekkey_csi (tk, csi, 2, key, force, nbytep);
if (b0 == 0x1b && tk->buffcount > 1 && CHARAT (1) == 'O')
return peekkey_ss3 (tk, csi, 2, key, force, nbytep);
if (b0 == 0x8f)
return peekkey_ss3 (tk, csi, 1, key, force, nbytep);
if (b0 == 0x9b)
return peekkey_csi (tk, csi, 1, key, force, nbytep);
Move to iconv That is the major change in this commit. Also Ctrl-modified keys now should work in URxvt, which was surprisingly trivial to achieve. Coming up next: - making sure the tests still work - introducing CMake
2014-09-28 03:51:45 +02:00
return TERMKEY_RES_NONE;
Moved CSI-related code out of termkey.c into new driver-csi.c
2008-10-07 00:27:19 +02:00
}
WIP: Is mine now (^3^) Seriously though, I've got some issues with how this thing is designed, as well as with its formatting, and when you add the fact that the original author wants to merge this thing into his bigger library that also handles terminal output, which I'll kindly leave to ncurses, it kind of makes sense for me to do this. Manpages have been removed as they are going to become obsolete and they're rather difficult to maintain. If anything, there will be Doxygen-generated documentation. The plan is to throw away any direct UTF-8 support and support all uni- and multibyte character encodings. However some unrelated refactoring is about to come first.
2014-09-23 01:38:08 +02:00
termkey_driver_t termkey_driver_csi =
{
.name = "CSI",
.new_driver = new_driver,
.free_driver = free_driver,
.peekkey = peekkey,
Use vtable in driver to indirect calls to the CSI driver
2008-10-07 00:36:14 +02:00
};