=== modified file 'driver-csi.c'
--- driver-csi.c	2012-04-24 16:42:01 +0000
+++ driver-csi.c	2012-04-24 16:27:48 +0000
@@ -160,7 +160,6 @@
   cmd &= 0xff;
 
   if(!initial && args >= 3) { // rxvt protocol
-    key->type = TERMKEY_TYPE_MOUSE;
     key->code.mouse[0] = arg[0];
 
     key->modifiers     = (key->code.mouse[0] & 0x1c) >> 2;
@@ -172,7 +171,6 @@
   }
 
   if(initial == '<' && args >= 3) { // SGR protocol
-    key->type = TERMKEY_TYPE_MOUSE;
     key->code.mouse[0] = arg[0];
 
     key->modifiers     = (key->code.mouse[0] & 0x1c) >> 2;

=== modified file 't/30mouse.c'
--- t/30mouse.c	2012-04-24 16:42:01 +0000
+++ t/30mouse.c	2012-04-24 14:58:37 +0000
@@ -16,12 +16,10 @@
 
   termkey_push_bytes(tk, "\e[M !!", 6);
 
-  key.type = -1;
   is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for mouse press");
 
   is_int(key.type, TERMKEY_TYPE_MOUSE, "key.type for mouse press");
 
-  ev = -1; button = -1; line = -1; col = -1;
   is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY");
 
   is_int(ev,     TERMKEY_MOUSE_PRESS, "mouse event for press");
@@ -40,8 +38,6 @@
 
   termkey_push_bytes(tk, "\e[M@\"!", 6);
 
-  key.type = -1;
-  ev = -1; button = -1; line = -1; col = -1;
   termkey_getkey(tk, &key);
   is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY");
 
@@ -53,8 +49,6 @@
 
   termkey_push_bytes(tk, "\e[M##!", 6);
 
-  key.type = -1;
-  ev = -1; button = -1; line = -1; col = -1;
   termkey_getkey(tk, &key);
   is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY");
 
@@ -65,8 +59,6 @@
 
   termkey_push_bytes(tk, "\e[M0++", 6);
 
-  key.type = -1;
-  ev = -1; button = -1; line = -1; col = -1;
   termkey_getkey(tk, &key);
   is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY");
 
@@ -83,7 +75,6 @@
   // rxvt protocol
   termkey_push_bytes(tk, "\e[0;20;20M", 10);
 
-  key.type = -1;
   is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for mouse press rxvt protocol");
 
   is_int(key.type, TERMKEY_TYPE_MOUSE, "key.type for mouse press rxvt protocol");
@@ -102,7 +93,6 @@
 
   is_int(key.type, TERMKEY_TYPE_MOUSE, "key.type for mouse release rxvt protocol");
 
-  ev = -1; button = -1; line = -1; col = -1;
   is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY");
 
   is_int(ev,     TERMKEY_MOUSE_RELEASE, "mouse event for release rxvt protocol");
@@ -113,12 +103,10 @@
   // SGR protocol
   termkey_push_bytes(tk, "\e[<0;30;30M", 11);
 
-  key.type = -1;
   is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for mouse press SGR encoding");
 
   is_int(key.type, TERMKEY_TYPE_MOUSE, "key.type for mouse press SGR encoding");
 
-  ev = -1; button = -1; line = -1; col = -1;
   is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY");
 
   is_int(ev,     TERMKEY_MOUSE_PRESS, "mouse event for press SGR");
@@ -129,20 +117,16 @@
 
   termkey_push_bytes(tk, "\e[<0;30;30m", 11);
 
-  key.type = -1;
   is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY for mouse release SGR encoding");
 
   is_int(key.type, TERMKEY_TYPE_MOUSE, "key.type for mouse release SGR encoding");
 
-  ev = -1; button = -1; line = -1; col = -1;
   is_int(termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col), TERMKEY_RES_KEY, "interpret_mouse yields RES_KEY");
 
   is_int(ev,     TERMKEY_MOUSE_RELEASE, "mouse event for release SGR");
 
   termkey_push_bytes(tk, "\e[<0;500;300M", 13);
 
-  key.type = -1;
-  ev = -1; button = -1; line = -1; col = -1;
   termkey_getkey(tk, &key);
   termkey_interpret_mouse(tk, &key, &ev, &button, &line, &col);