Rewrite the mouse API

I wasn't aware of the fact that 1000, 1002 and 1003 are mutually
exclusive and turn each other off.

Also now it's not needed to set the protocol, it gets set by default.

1 files changed, 13 insertions, 11 deletions

diff --git a/termo.h b/termo.h
index f6a82b1..9df3e73 100644
--- a/termo.h
+++ b/termo.h
@@ -124,21 +124,23 @@ enum termo_mouse_event
 // You will want to handle GPM (incompatible license) and FreeBSD's sysmouse
 // yourself.  http://www.monkey.org/openbsd/archive/tech/0009/msg00018.html
 
-enum
+typedef enum termo_mouse_proto termo_mouse_proto_t;
+enum termo_mouse_proto
 {
-	TERMO_MOUSE_PROTO_NONE  = 0,
-	TERMO_MOUSE_PROTO_VT200 = 1 << 0,
-	TERMO_MOUSE_PROTO_UTF8  = 1 << 1 | TERMO_MOUSE_PROTO_VT200,
-	TERMO_MOUSE_PROTO_SGR   = 1 << 2 | TERMO_MOUSE_PROTO_VT200,
-	TERMO_MOUSE_PROTO_RXVT  = 1 << 3 | TERMO_MOUSE_PROTO_VT200
+	TERMO_MOUSE_PROTO_NONE,
+	TERMO_MOUSE_PROTO_XTERM,
+	TERMO_MOUSE_PROTO_UTF8,
+	TERMO_MOUSE_PROTO_SGR,
+	TERMO_MOUSE_PROTO_RXVT
 };
 
 typedef enum termo_mouse_tracking termo_mouse_tracking_t;
 enum termo_mouse_tracking
 {
-	TERMO_MOUSE_TRACKING_NORMAL,
+	TERMO_MOUSE_TRACKING_OFF,
+	TERMO_MOUSE_TRACKING_CLICK,
 	TERMO_MOUSE_TRACKING_DRAG,
-	TERMO_MOUSE_TRACKING_ANY
+	TERMO_MOUSE_TRACKING_MOVE
 };
 
 enum
@@ -229,9 +231,9 @@ size_t termo_get_buffer_remaining (termo_t *tk);
 
 void termo_canonicalise (termo_t *tk, termo_key_t *key);
 
-int termo_get_mouse_proto (termo_t *tk);
-int termo_set_mouse_proto (termo_t *tk, int proto);
-int termo_guess_mouse_proto (termo_t *tk);
+termo_mouse_proto_t termo_get_mouse_proto (termo_t *tk);
+int termo_set_mouse_proto (termo_t *tk, termo_mouse_proto_t proto);
+termo_mouse_proto_t termo_guess_mouse_proto (termo_t *tk);
 
 termo_mouse_tracking_t termo_get_mouse_tracking_mode (termo_t *tk);
 int termo_set_mouse_tracking_mode (termo_t *tk, termo_mouse_tracking_t mode);