diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-11-22 23:12:30 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-11-22 23:12:30 +0100 |
| commit | 8c959be51104fbf2aa01aa09f82df6cec515770c (patch) | |
| tree | 045eab5e6aa1819c1ab13fcf1967c4a59cb82870 /src/nvim/tui | |
| parent | a4f6cec7a31ff8dbfa089b9e22227afbeb951e9b (diff) | |
| parent | fe2546c81a8a7c0be5bbf0737d1169f6cd49bba0 (diff) | |
| download | rneovim-8c959be51104fbf2aa01aa09f82df6cec515770c.tar.gz rneovim-8c959be51104fbf2aa01aa09f82df6cec515770c.tar.bz2 rneovim-8c959be51104fbf2aa01aa09f82df6cec515770c.zip | |
Merge #7593 'PVS static analysis fixes'
Diffstat (limited to 'src/nvim/tui')
| -rw-r--r-- | src/nvim/tui/input.c | 31 | ||||
| -rw-r--r-- | src/nvim/tui/tui.c | 2 |
2 files changed, 20 insertions, 13 deletions
diff --git a/src/nvim/tui/input.c b/src/nvim/tui/input.c index 8e08b77b00..96bb692db9 100644 --- a/src/nvim/tui/input.c +++ b/src/nvim/tui/input.c @@ -199,18 +199,25 @@ static void forward_mouse_event(TermInput *input, TermKeyKey *key) len += (size_t)snprintf(buf + len, sizeof(buf) - len, "Right"); } - if (ev == TERMKEY_MOUSE_PRESS) { - if (button == 4) { - len += (size_t)snprintf(buf + len, sizeof(buf) - len, "ScrollWheelUp"); - } else if (button == 5) { - len += (size_t)snprintf(buf + len, sizeof(buf) - len, "ScrollWheelDown"); - } else { - len += (size_t)snprintf(buf + len, sizeof(buf) - len, "Mouse"); - } - } else if (ev == TERMKEY_MOUSE_DRAG) { - len += (size_t)snprintf(buf + len, sizeof(buf) - len, "Drag"); - } else if (ev == TERMKEY_MOUSE_RELEASE) { - len += (size_t)snprintf(buf + len, sizeof(buf) - len, "Release"); + switch (ev) { + case TERMKEY_MOUSE_PRESS: + if (button == 4) { + len += (size_t)snprintf(buf + len, sizeof(buf) - len, "ScrollWheelUp"); + } else if (button == 5) { + len += (size_t)snprintf(buf + len, sizeof(buf) - len, + "ScrollWheelDown"); + } else { + len += (size_t)snprintf(buf + len, sizeof(buf) - len, "Mouse"); + } + break; + case TERMKEY_MOUSE_DRAG: + len += (size_t)snprintf(buf + len, sizeof(buf) - len, "Drag"); + break; + case TERMKEY_MOUSE_RELEASE: + len += (size_t)snprintf(buf + len, sizeof(buf) - len, "Release"); + break; + case TERMKEY_MOUSE_UNKNOWN: + assert(false); } len += (size_t)snprintf(buf + len, sizeof(buf) - len, "><%d,%d>", col, row); diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index f35e99840d..b447b4aae2 100644 --- a/src/nvim/tui/tui.c +++ b/src/nvim/tui/tui.c @@ -1644,7 +1644,7 @@ static void flush_buf(UI *ui, bool toggle_cursor) { uv_write_t req; uv_buf_t bufs[3]; - uv_buf_t *bufp = bufs; + uv_buf_t *bufp = &bufs[0]; TUIData *data = ui->data; if (data->bufpos <= 0 && data->busy == data->is_invisible) { |