tweak get_mouseinput() to work properly when -O/--morespace is used

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2304 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index f39f845eb0a794b762c478d5a71044b55a664e44..8a8021cf3f7e6ab058680693638e7f6af9958291 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -124,8 +124,8 @@ CVS code -
          be treated as part of the edit window.  New functions
          no_more_space() and blank_topbar(); changes to global_init(),
          window_init(), handle_sigwinch(), do_toggle(), do_mouse(),
-         etc. (DLR; suggested by Mike Frysinger, Rocco, and Robert
-         Schultz)
+         get_mouseinput(), etc. (DLR; suggested by Mike Frysinger,
+         Rocco, and Robert Schultz)
        - Add support for moving to the next or previous word at the
          statusbar prompt.  New functions do_statusbar_next_word() and
          do_statusbar_prev_word(); changes to do_statusbar_input().

diff --git a/src/winio.c b/src/winio.c
index 0d5ce0a54f916f81b0d12c922927ff1a29308eb2..74dbcad9ddffce2a3a2d73784d542a91ca71425f 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -1512,9 +1512,9 @@ bool get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts)
        else
            i = COLS / ((currslen / 2) + (currslen % 2));
 
-       /* Calculate the y-coordinates relative to the beginning of
-        * bottomwin, i.e, the bottom three lines of the screen. */
-       j = *mouse_y - (editwinrows + 3);
+       /* Calculate the y-coordinate relative to the beginning of
+        * bottomwin. */
+       j = *mouse_y - ((2 - no_more_space()) + 1) - editwinrows;
 
        /* If we're on the statusbar, beyond the end of the shortcut
         * list, or beyond the end of a shortcut on the right side of