1 files changed, 8 insertions, 3 deletions
diff --git a/termkey2.h b/termkey2.h
index 60a3038..0fa0635 100644
--- a/termkey2.h
+++ b/termkey2.h
@@ -137,9 +137,14 @@ struct termkey_key
 		uint32_t      codepoint; /* TERMKEY_TYPE_KEY */
 		int           number;    /* TERMKEY_TYPE_FUNCTION */
 		termkey_sym_t sym;       /* TERMKEY_TYPE_KEYSYM */
-		// TODO: rewrite this insanity
-		char          mouse[4];  /* TERMKEY_TYPE_MOUSE */
-								 /* opaque, see termkey_interpret_mouse() */
+
+		/* TERMKEY_TYPE_MODEREPORT */
+		/* opaque, see termkey_interpret_modereport() */
+		struct { char initial; int mode, value; } mode;
+
+		/* TERMKEY_TYPE_MOUSE */
+		/* opaque, see termkey_interpret_mouse() */
+		struct { uint16_t x, y, info; } mouse;
 	} code;
 
 	int modifiers;