ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: drop two unneeded initializations, and trim a comment

master
Benno Schulenberg 2018-01-27 20:15:54 +01:00
parent f5c87a7fee
commit b18e76d4d8
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/winio.c
View File

@ -1586,26 +1586,20 @@ int *parse_verbatim_kbinput(WINDOW *win, size_t *count)
/* Handle any mouse event that may have occurred. We currently handle /* Handle any mouse event that may have occurred. We currently handle
* releases/clicks of the first mouse button. If allow_shortcuts is * releases/clicks of the first mouse button. If allow_shortcuts is
* TRUE, releasing/clicking on a visible shortcut will put back the * TRUE, releasing/clicking on a visible shortcut will put back the
* keystroke associated with that shortcut. If NCURSES_MOUSE_VERSION is * keystroke associated with that shortcut. If ncurses supports them,
* at least 2, we also currently handle presses of the fourth mouse * we also handle presses of the fourth mouse button (upward rolls of
* button (upward rolls of the mouse wheel) by putting back the * the mouse wheel) by putting back keystrokes to move up, and presses
* keystrokes to move up, and presses of the fifth mouse button * of the fifth mouse button (downward rolls of the mouse wheel) by
* (downward rolls of the mouse wheel) by putting back the keystrokes to * putting back keystrokes to move down. We also store the coordinates
* move down. We also store the coordinates of a mouse event that needs * of a mouse event that needs further handling in mouse_x and mouse_y.
* to be handled in mouse_x and mouse_y, relative to the entire screen. * Return -1 on error, 0 if the mouse event needs to be handled, 1 if it's
* Return -1 on error, 0 if the mouse event needs to be handled, 1 if * been handled by putting back keystrokes, or 2 if it's been ignored. */
* it's been handled by putting back keystrokes that need to be handled.
* or 2 if it's been ignored. Assume that KEY_MOUSE has already been
* read in. */
int get_mouseinput(int *mouse_y, int *mouse_x, bool allow_shortcuts) int get_mouseinput(int *mouse_y, int *mouse_x, bool allow_shortcuts)
{ {
MEVENT mevent; MEVENT mevent;
bool in_bottomwin; bool in_bottomwin;
subnfunc *f; subnfunc *f;
*mouse_x = -1;
*mouse_y = -1;
/* First, get the actual mouse event. */ /* First, get the actual mouse event. */
if (getmouse(&mevent) == ERR) if (getmouse(&mevent) == ERR)
return -1; return -1;
@ -1618,7 +1612,7 @@ int get_mouseinput(int *mouse_y, int *mouse_x, bool allow_shortcuts)
/* Handle releases/clicks of the first mouse button. */ /* Handle releases/clicks of the first mouse button. */
if (mevent.bstate & (BUTTON1_RELEASED | BUTTON1_CLICKED)) { if (mevent.bstate & (BUTTON1_RELEASED | BUTTON1_CLICKED)) {
/* If we're allowing shortcuts, the current shortcut list is /* If we're allowing shortcuts, and the current shortcut list is
* being displayed on the last two lines of the screen, and the * being displayed on the last two lines of the screen, and the
* first mouse button was released on/clicked inside it, we need * first mouse button was released on/clicked inside it, we need
* to figure out which shortcut was released on/clicked and put * to figure out which shortcut was released on/clicked and put