mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tweaks: factor out a piece of common code

This commit is contained in:
Benno Schulenberg 2017-12-24 11:25:10 +01:00
parent a70db34fc9
commit 184bb11fd9
1 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/text.c
View File

@ -356,6 +356,25 @@ size_t length_of_white(const char *text)
}
}
/* Adjust the positions of mark and cursor when they are on the given line. */
void compensate_leftward(filestruct *line, size_t leftshift)
{
if (line == openfile->mark) {
if (openfile->mark_x < leftshift)
openfile->mark_x = 0;
else
openfile->mark_x -= leftshift;
}
if (line == openfile->current) {
if (openfile->current_x < leftshift)
openfile->current_x = 0;
else
openfile->current_x -= leftshift;
openfile->placewewant = xplustabs();
}
}
/* Remove an indent from the given line. */
void unindent_a_line(filestruct *line, size_t indent_len)
{
@ -370,20 +389,8 @@ void unindent_a_line(filestruct *line, size_t indent_len)
openfile->totsize -= indent_len;
/* Compensate for the change in the current line. */
if (line == openfile->mark) {
if (openfile->mark_x < indent_len)
openfile->mark_x = 0;
else
openfile->mark_x -= indent_len;
}
if (line == openfile->current) {
if (openfile->current_x < indent_len)
openfile->current_x = 0;
else
openfile->current_x -= indent_len;
openfile->placewewant = xplustabs();
}
/* Adjust the positions of mark and cursor, when they are affected. */
compensate_leftward(line, indent_len);
}
/* Unindent the current line (or the marked lines) by tabsize columns.
@ -582,20 +589,8 @@ bool comment_line(undo_type action, filestruct *line, const char *comment_seq)
openfile->totsize -= pre_len + post_len;
/* If needed, adjust the position of the mark and then the cursor. */
if (line == openfile->mark) {
if (openfile->mark_x < pre_len)
openfile->mark_x = 0;
else
openfile->mark_x -= pre_len;
}
if (line == openfile->current) {
if (openfile->current_x < pre_len)
openfile->current_x = 0;
else
openfile->current_x -= pre_len;
openfile->placewewant = xplustabs();
}
/* Adjust the positions of mark and cursor, when needed. */
compensate_leftward(line, pre_len);
return TRUE;
}