thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.1871: modeless selection in GUI still not correct

Browse Source 
Problem:    Modeless selection in GUI still not correct.
Solution:   Fix max_col.
This commit is contained in:
Bram Moolenaar
2019-08-17 16:15:53 +02:00
parent 026587b35c
commit ff9f27cdc7
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/ui.c
View File

@@ -1098,8 +1098,9 @@ clip_start_selection(int col, int row, int repeated_click)
// Click in a popup window restricts selection to that window, // Click in a popup window restricts selection to that window,
// excluding the border. // excluding the border.
cb->min_col = wp->w_wincol + wp->w_popup_border[3]; cb->min_col = wp->w_wincol + wp->w_popup_border[3];
cb->max_col = wp->w_wincol + popup_width(wp) - 1 cb->max_col = wp->w_wincol + popup_width(wp) - wp->w_popup_border[1];
- wp->w_popup_border[1]; if (cb->max_col > screen_Columns)
cb->max_col = screen_Columns;
cb->min_row = wp->w_winrow + wp->w_popup_border[0]; cb->min_row = wp->w_winrow + wp->w_popup_border[0];
cb->max_row = wp->w_winrow + popup_height(wp) - 1 cb->max_row = wp->w_winrow + popup_height(wp) - 1
- wp->w_popup_border[2]; - wp->w_popup_border[2];
@@ -1440,7 +1441,7 @@ clip_invert_area(
int max_col; int max_col;
#ifdef FEAT_TEXT_PROP #ifdef FEAT_TEXT_PROP
max_col = cbd->max_col; max_col = cbd->max_col - 1;
#else #else
max_col = Columns - 1; max_col = Columns - 1;
#endif #endif
@@ -1519,8 +1520,8 @@ clip_invert_rectangle(
width -= cbd->min_col - col; width -= cbd->min_col - col;
col = cbd->min_col; col = cbd->min_col;
} }
if (width > cbd->max_col - col + 1) if (width > cbd->max_col - col)
width = cbd->max_col - col + 1; width = cbd->max_col - col;
if (row < cbd->min_row) if (row < cbd->min_row)
{ {
height -= cbd->min_row - row; height -= cbd->min_row - row;
@@ -1581,8 +1582,8 @@ clip_copy_modeless_selection(int both UNUSED)
#ifdef FEAT_TEXT_PROP #ifdef FEAT_TEXT_PROP
if (col1 < clip_star.min_col) if (col1 < clip_star.min_col)
col1 = clip_star.min_col; col1 = clip_star.min_col;
if (col2 > clip_star.max_col + 1) if (col2 > clip_star.max_col)
col2 = clip_star.max_col + 1; col2 = clip_star.max_col;
if (row1 < clip_star.min_row) if (row1 < clip_star.min_row)
row1 = clip_star.min_row; row1 = clip_star.min_row;
if (row2 > clip_star.max_row) if (row2 > clip_star.max_row)
@@ -1619,19 +1620,19 @@ clip_copy_modeless_selection(int both UNUSED)
if (row == row2) if (row == row2)
end_col = col2; end_col = col2;
#ifdef FEAT_TEXT_PROP
else if (clip_star.max_col < Columns)
end_col = clip_star.max_col + 1;
#endif
else else
#ifdef FEAT_TEXT_PROP
end_col = clip_star.max_col;
#else
end_col = Columns; end_col = Columns;
#endif
line_end_col = clip_get_line_end(&clip_star, row); line_end_col = clip_get_line_end(&clip_star, row);
/* See if we need to nuke some trailing whitespace */ /* See if we need to nuke some trailing whitespace */
if (end_col >= if (end_col >=
#ifdef FEAT_TEXT_PROP #ifdef FEAT_TEXT_PROP
clip_star.max_col + 1 clip_star.max_col
#else #else
Columns Columns
#endif #endif
@@ -1797,7 +1798,7 @@ clip_get_line_end(Clipboard_T *cbd UNUSED, int row)
return 0; return 0;
for (i = for (i =
#ifdef FEAT_TEXT_PROP #ifdef FEAT_TEXT_PROP
cbd->max_col >= screen_Columns ? screen_Columns : cbd->max_col + 1; cbd->max_col;
#else #else
screen_Columns; screen_Columns;
#endif #endif

2
src/version.c
View File

@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1871,
/**/ /**/
1870, 1870,
/**/ /**/