diff options
Diffstat (limited to 'libterminput_unmarshal_mouseevent__.c')
| -rw-r--r-- | libterminput_unmarshal_mouseevent__.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/libterminput_unmarshal_mouseevent__.c b/libterminput_unmarshal_mouseevent__.c index 55f72ea..f91b606 100644 --- a/libterminput_unmarshal_mouseevent__.c +++ b/libterminput_unmarshal_mouseevent__.c @@ -3,7 +3,7 @@ int -libterminput_unmarshal_mouseevent__(struct libterminput_unmarshaller *how, struct libterminput_mouseevent *what) +libterminput_unmarshal_mouseevent__(struct libterminput_unmarshaller *how, struct libterminput_mouseevent *what) /* TODO test */ { what->type = LIBTERMINPUT_MOUSEEVENT; if (how->load(how, &what->event, sizeof(what->event)) || @@ -11,13 +11,20 @@ libterminput_unmarshal_mouseevent__(struct libterminput_unmarshaller *how, struc return -1; what->mods = 0; what->button = LIBTERMINPUT_BUTTON1; - if (what->event == LIBTERMINPUT_HIGHLIGHT_OUTSIDE) { - if (how->load(how, &what->start_x, sizeof(size_t) * 4U)) - return -1; - } else if (what->event != LIBTERMINPUT_HIGHLIGHT_INSIDE) { + switch ((int)what->event) { + case LIBTERMINPUT_PRESS: + case LIBTERMINPUT_RELEASE: + case LIBTERMINPUT_MOTION: if (how->load(how, &what->mods, sizeof(what->mods)) || how->load(how, &what->button, sizeof(what->button))) return -1; + /* fall through */ + case LIBTERMINPUT_HIGHLIGHT_INSIDE: + return 0; + case LIBTERMINPUT_HIGHLIGHT_OUTSIDE: + return how->load(how, &what->start_x, sizeof(size_t) * 4U); + default: + errno = EINVAL; + return -1; } - return 0; } |