aboutsummaryrefslogtreecommitdiff
path: root/driver-csi.c
diff options
context:
space:
mode:
authorPřemysl Janouch <p.janouch@gmail.com>2014-10-18 20:32:45 +0200
committerPřemysl Janouch <p.janouch@gmail.com>2014-10-18 20:32:45 +0200
commit86025fcf6fd8b58de0dee23c4fd2c33daad38e17 (patch)
treedb5cdeaea79c0097925698eb4a5fe8caf294fbe3 /driver-csi.c
parent5ca6b7fb4258af6dcfe3741522c47054916b5529 (diff)
downloadtermo-86025fcf6fd8b58de0dee23c4fd2c33daad38e17.tar.gz
termo-86025fcf6fd8b58de0dee23c4fd2c33daad38e17.tar.xz
termo-86025fcf6fd8b58de0dee23c4fd2c33daad38e17.zip
Rewrite termo_interpret_mouse()
Diffstat (limited to 'driver-csi.c')
-rw-r--r--driver-csi.c27
1 files changed, 12 insertions, 15 deletions
diff --git a/driver-csi.c b/driver-csi.c
index 24d0bdb..d3d3670 100644
--- a/driver-csi.c
+++ b/driver-csi.c
@@ -257,48 +257,45 @@ termo_interpret_mouse (termo_t *tk, const termo_key_t *key,
if (key->type != TERMO_TYPE_MOUSE)
return TERMO_RES_NONE;
- if (button)
- *button = 0;
-
- termo_key_get_linecol (key, line, col);
-
- // XXX: WTF is this logic?
- if (!event)
- return TERMO_RES_KEY;
-
int btn = 0;
int code = key->code.mouse.info;
int drag = code & 0x20;
code &= ~0x3c;
+ termo_mouse_event_t ev;
switch (code)
{
case 0:
case 1:
case 2:
- *event = drag ? TERMO_MOUSE_DRAG : TERMO_MOUSE_PRESS;
+ ev = drag ? TERMO_MOUSE_DRAG : TERMO_MOUSE_PRESS;
btn = code + 1;
break;
case 3:
- *event = TERMO_MOUSE_RELEASE;
+ ev = TERMO_MOUSE_RELEASE;
// no button hint
break;
case 64:
case 65:
- *event = drag ? TERMO_MOUSE_DRAG : TERMO_MOUSE_PRESS;
+ ev = drag ? TERMO_MOUSE_DRAG : TERMO_MOUSE_PRESS;
btn = code + 4 - 64;
break;
default:
- *event = TERMO_MOUSE_UNKNOWN;
+ ev = TERMO_MOUSE_UNKNOWN;
}
+ if (key->code.mouse.info & 0x8000)
+ ev = TERMO_MOUSE_RELEASE;
+
+ if (event)
+ *event = ev;
if (button)
*button = btn;
- if (key->code.mouse.info & 0x8000)
- *event = TERMO_MOUSE_RELEASE;
+
+ termo_key_get_linecol (key, line, col);
return TERMO_RES_KEY;
}