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

mouse: use the correct screen width for calculating the cursor position 

When there are line numbers, the effective available screen width is
smaller than COLS: editwincols.

This fixes https://savannah.gnu.org/bugs/?49821.
master
Benno Schulenberg 2016-12-10 19:38:03 +01:00
parent fd3423f79a
commit e9fde7d7dc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nano.c
View File

@ -1767,7 +1767,7 @@ int do_mouse(void)
openfile->current->next && i < mouse_y; openfile->current->next && i < mouse_y;
openfile->current = openfile->current->next, i++) { openfile->current = openfile->current->next, i++) {
openfile->current_y = i; openfile->current_y = i;
i += strlenpt(openfile->current->data) / COLS; i += strlenpt(openfile->current->data) / editwincols;
} }
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "do_mouse(): moving to current_y = %ld, index i = %lu\n", fprintf(stderr, "do_mouse(): moving to current_y = %ld, index i = %lu\n",
@ -1777,7 +1777,8 @@ int do_mouse(void)
if (i > mouse_y) { if (i > mouse_y) {
openfile->current = openfile->current->prev; openfile->current = openfile->current->prev;
openfile->current_x = actual_x(openfile->current->data, mouse_x + (mouse_y - openfile->current_y) * COLS); openfile->current_x = actual_x(openfile->current->data,
mouse_x + (mouse_y - openfile->current_y) * editwincols);
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "do_mouse(): i > mouse_y, mouse_x = %d, current_x to = %lu\n", fprintf(stderr, "do_mouse(): i > mouse_y, mouse_x = %d, current_x to = %lu\n",
mouse_x, (unsigned long)openfile->current_x); mouse_x, (unsigned long)openfile->current_x);