=== modified file 'demo.c' --- demo.c 2009-11-27 15:07:05 +0000 +++ demo.c 2009-11-24 01:30:52 +0000 @@ -8,7 +8,6 @@ TERMKEY_CHECK_VERSION; int mouse = 0; - TermKeyFormat format = TERMKEY_FORMAT_VIM; char buffer[50]; TermKey *tk; @@ -21,8 +20,6 @@ mouse = atoi(optarg); else mouse = 1000; - format |= TERMKEY_FORMAT_MOUSE_POS; - break; default: fprintf(stderr, "Usage: %s [-m]\n", argv[0]); @@ -44,7 +41,7 @@ printf("\e[?%dhMouse mode active\n", mouse); while((ret = termkey_waitkey(tk, &key)) != TERMKEY_RES_EOF) { - termkey_snprint_key(tk, buffer, sizeof buffer, &key, format); + termkey_snprint_key(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_VIM); printf("%s\n", buffer); if(key.type == TERMKEY_TYPE_UNICODE && === modified file 'termkey.c' --- termkey.c 2009-11-27 15:07:05 +0000 +++ termkey.c 2009-11-27 14:56:38 +0000 @@ -1002,20 +1002,12 @@ { TermKeyMouseEvent ev; int button; - int line, col; - termkey_interpret_mouse(tk, key, &ev, &button, &line, &col); + termkey_interpret_mouse(tk, key, &ev, &button, NULL, NULL); static char *evnames[] = { "Unknown", "Press", "Drag", "Release" }; l = snprintf(buffer + pos, len - pos, "Mouse%s(%d)", evnames[ev], button); - - if(format & TERMKEY_FORMAT_MOUSE_POS) { - if(l <= 0) return pos; - pos += l; - - l = snprintf(buffer + pos, len - pos, " @ (%d,%d)", col, line); - } } break; } === modified file 'termkey.h.in' --- termkey.h.in 2009-11-27 15:07:05 +0000 +++ termkey.h.in 2009-11-27 14:36:29 +0000 @@ -174,8 +174,6 @@ TERMKEY_FORMAT_CARETCTRL = 1 << 1, // ^X instead of C-X TERMKEY_FORMAT_ALTISMETA = 1 << 2, // Meta- or M- instead of Alt- or A- TERMKEY_FORMAT_WRAPBRACKET = 1 << 3, // Wrap special keys in brackets like - - TERMKEY_FORMAT_MOUSE_POS = 1 << 8, // Include mouse position if relevant; @ col,line } TermKeyFormat; // Some useful combinations === modified file 'termkey_snprint_key.3' --- termkey_snprint_key.3 2009-11-27 15:07:05 +0000 +++ termkey_snprint_key.3 2009-07-15 19:40:44 +0000 @@ -26,9 +26,6 @@ .TP .B TERMKEY_FORMAT_WRAPBRACKET If the key event is a special key instead of unmodified Unicode, wrap it in "". -.TP -.B TERMKEY_FORMAT_MOUSE_POS -If the event is a mouse event, include the position rendered as "@ (col,line)". .PP The following shortcuts are provided for common combinations of format bits: .TP