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

tweaks: rewrap two lines, and reshuffle some logic to make more sense

master
Benno Schulenberg 2019-06-26 19:40:06 +02:00
parent b96cc8c212
commit b23a5d5b29
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/winio.c
View File

@ -2410,8 +2410,7 @@ void place_the_cursor(void)
* line to be drawn, and converted is the actual string to be written with * line to be drawn, and converted is the actual string to be written with
* tabs and control characters replaced by strings of regular characters. * tabs and control characters replaced by strings of regular characters.
* from_col is the column number of the first character of this "page". */ * from_col is the column number of the first character of this "page". */
void draw_row(int row, const char *converted, linestruct *line, void draw_row(int row, const char *converted, linestruct *line, size_t from_col)
size_t from_col)
{ {
#if !defined(NANO_TINY) || defined(ENABLE_COLOR) #if !defined(NANO_TINY) || defined(ENABLE_COLOR)
size_t from_x = actual_x(line->data, from_col); size_t from_x = actual_x(line->data, from_col);
@ -2728,13 +2727,11 @@ void draw_row(int row, const char *converted, linestruct *line,
wattroff(edit, interface_color_pair[GUIDE_STRIPE]); wattroff(edit, interface_color_pair[GUIDE_STRIPE]);
} }
/* If the mark is on, and line is at least partially selected, we /* If the line is at least partially selected, paint the marked part. */
* need to paint it. */ if (openfile->mark && ((line->lineno >= openfile->mark->lineno &&
if (openfile->mark && line->lineno <= openfile->current->lineno) ||
(line->lineno <= openfile->mark->lineno || (line->lineno <= openfile->mark->lineno &&
line->lineno <= openfile->current->lineno) && line->lineno >= openfile->current->lineno))) {
(line->lineno >= openfile->mark->lineno ||
line->lineno >= openfile->current->lineno)) {
const linestruct *top, *bot; const linestruct *top, *bot;
/* The lines where the marked region begins and ends. */ /* The lines where the marked region begins and ends. */
size_t top_x, bot_x; size_t top_x, bot_x;