annotate src/drawline.c @ 30635:604d7d7aa043 v9.0.0652

patch 9.0.0652: 'smoothscroll' not tested with 'number' and "n" in 'cpo' Commit: https://github.com/vim/vim/commit/b6aab8f44beb8c5d99393abdc2c9faab085c72aa Author: Bram Moolenaar <Bram@vim.org> Date: Mon Oct 3 20:01:16 2022 +0100 patch 9.0.0652: 'smoothscroll' not tested with 'number' and "n" in 'cpo' Problem: 'smoothscroll' not tested with 'number' and "n" in 'cpo'. Solution: Add tests, fix uncovered problem.
author Bram Moolenaar <Bram@vim.org>
date Mon, 03 Oct 2022 21:15:03 +0200
parents 8c0232ab725c
children 101f08b49ed3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1 /* vi:set ts=8 sts=4 sw=4 noet:
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2 *
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3 * VIM - Vi IMproved by Bram Moolenaar
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
4 *
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
5 * Do ":help uganda" in Vim to read copying and usage conditions.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
6 * Do ":help credits" in Vim to see a list of people who contributed.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
7 * See README.txt for an overview of the Vim source code.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
8 */
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
9
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
10 /*
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
11 * drawline.c: Functions for drawing window lines on the screen.
29808
3035901eceb7 patch 9.0.0243: text properties "below" sort differently on MS-Windows
Bram Moolenaar <Bram@vim.org>
parents: 29740
diff changeset
12 * This is the middle level, drawscreen.c is the higher level and screen.c the
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
13 * lower level.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
14 */
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
15
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
16 #include "vim.h"
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
17
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
18 #ifdef FEAT_SYN_HL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
19 /*
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
20 * Advance **color_cols and return TRUE when there are columns to draw.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
21 */
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
22 static int
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
23 advance_color_col(int vcol, int **color_cols)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
24 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
25 while (**color_cols >= 0 && vcol > **color_cols)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
26 ++*color_cols;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
27 return (**color_cols >= 0);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
28 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
29 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
30
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
31 #ifdef FEAT_SYN_HL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
32 /*
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
33 * Used when 'cursorlineopt' contains "screenline": compute the margins between
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
34 * which the highlighting is used.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
35 */
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
36 static void
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
37 margin_columns_win(win_T *wp, int *left_col, int *right_col)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
38 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
39 // cache previous calculations depending on w_virtcol
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
40 static int saved_w_virtcol;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
41 static win_T *prev_wp;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
42 static int prev_left_col;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
43 static int prev_right_col;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
44 static int prev_col_off;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
45
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
46 int cur_col_off = win_col_off(wp);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
47 int width1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
48 int width2;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
49
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
50 if (saved_w_virtcol == wp->w_virtcol
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
51 && prev_wp == wp && prev_col_off == cur_col_off)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
52 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
53 *right_col = prev_right_col;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
54 *left_col = prev_left_col;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
55 return;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
56 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
57
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
58 width1 = wp->w_width - cur_col_off;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
59 width2 = width1 + win_col_off2(wp);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
60
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
61 *left_col = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
62 *right_col = width1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
63
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
64 if (wp->w_virtcol >= (colnr_T)width1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
65 *right_col = width1 + ((wp->w_virtcol - width1) / width2 + 1) * width2;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
66 if (wp->w_virtcol >= (colnr_T)width1 && width2 > 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
67 *left_col = (wp->w_virtcol - width1) / width2 * width2 + width1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
68
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
69 // cache values
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
70 prev_left_col = *left_col;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
71 prev_right_col = *right_col;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
72 prev_wp = wp;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
73 saved_w_virtcol = wp->w_virtcol;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
74 prev_col_off = cur_col_off;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
75 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
76 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
77
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
78 // structure with variables passed between win_line() and other functions
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
79 typedef struct {
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
80 int draw_state; // what to draw next
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
81
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
82 linenr_T lnum; // line number to be drawn
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
83
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
84 int startrow; // first row in the window to be drawn
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
85 int row; // row in the window, excl w_winrow
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
86 int screen_row; // row on the screen, incl w_winrow
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
87
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
88 long vcol; // virtual column, before wrapping
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
89 int col; // visual column on screen, after wrapping
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
90 #ifdef FEAT_CONCEAL
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
91 int boguscols; // nonexistent columns added to "col" to force
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
92 // wrapping
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
93 int vcol_off; // offset for concealed characters
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
94 #endif
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
95 #ifdef FEAT_SYN_HL
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
96 int draw_color_col; // highlight colorcolumn
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
97 int *color_cols; // pointer to according columns array
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
98 #endif
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
99 int eol_hl_off; // 1 if highlighted char after EOL
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
100
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
101 unsigned off; // offset in ScreenLines/ScreenAttrs
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
102
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
103 int win_attr; // background for the whole window, except
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
104 // margins and "~" lines.
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
105 int wcr_attr; // attributes from 'wincolor'
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
106 #ifdef FEAT_SYN_HL
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
107 int cul_attr; // set when 'cursorline' active
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
108 #endif
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
109
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
110 int screen_line_flags; // flags for screen_line()
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
111
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
112 int fromcol; // start of inverting
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
113 int tocol; // end of inverting
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
114
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
115 #ifdef FEAT_LINEBREAK
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
116 long vcol_sbr; // virtual column after showbreak
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
117 int need_showbreak; // overlong line, skipping first x chars
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
118 int dont_use_showbreak; // do not use 'showbreak'
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
119 #endif
30397
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
120 #ifdef FEAT_PROP_POPUP
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
121 int text_prop_above_count;
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
122 #endif
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
123
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
124 // TRUE when 'cursorlineopt' has "screenline" and cursor is in this line
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
125 int cul_screenline;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
126
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
127 int char_attr; // attributes for the next character
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
128
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
129 int n_extra; // number of extra bytes
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
130 char_u *p_extra; // string of extra chars, plus NUL, only used
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
131 // when c_extra and c_final are NUL
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
132 char_u *p_extra_free; // p_extra buffer that needs to be freed
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
133 int c_extra; // extra chars, all the same
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
134 int c_final; // final char, mandatory if set
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
135
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
136 // saved "extra" items for when draw_state becomes WL_LINE (again)
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
137 int saved_n_extra;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
138 char_u *saved_p_extra;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
139 int saved_c_extra;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
140 int saved_c_final;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
141 int saved_char_attr;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
142
30383
9126e872893d patch 9.0.0527: long sign text may overflow buffer
Bram Moolenaar <Bram@vim.org>
parents: 30375
diff changeset
143 char_u extra[NUMBUFLEN + MB_MAXBYTES];
9126e872893d patch 9.0.0527: long sign text may overflow buffer
Bram Moolenaar <Bram@vim.org>
parents: 30375
diff changeset
144 // "%ld " and 'fdc' must fit in here, as well
9126e872893d patch 9.0.0527: long sign text may overflow buffer
Bram Moolenaar <Bram@vim.org>
parents: 30375
diff changeset
145 // any text sign
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
146
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
147 #ifdef FEAT_DIFF
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
148 hlf_T diff_hlf; // type of diff highlighting
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
149 #endif
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
150 int filler_lines; // nr of filler lines to be drawn
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
151 int filler_todo; // nr of filler lines still to do + 1
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
152 #ifdef FEAT_SIGNS
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
153 sign_attrs_T sattr;
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
154 #endif
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
155 } winlinevars_T;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
156
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
157 // draw_state values for items that are drawn in sequence:
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
158 #define WL_START 0 // nothing done yet, must be zero
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
159 #ifdef FEAT_CMDWIN
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
160 # define WL_CMDLINE (WL_START + 1) // cmdline window column
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
161 #else
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
162 # define WL_CMDLINE WL_START
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
163 #endif
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
164 #ifdef FEAT_FOLDING
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
165 # define WL_FOLD (WL_CMDLINE + 1) // 'foldcolumn'
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
166 #else
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
167 # define WL_FOLD WL_CMDLINE
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
168 #endif
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
169 #ifdef FEAT_SIGNS
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
170 # define WL_SIGN (WL_FOLD + 1) // column for signs
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
171 #else
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
172 # define WL_SIGN WL_FOLD // column for signs
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
173 #endif
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
174 #define WL_NR (WL_SIGN + 1) // line number
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
175 #ifdef FEAT_LINEBREAK
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
176 # define WL_BRI (WL_NR + 1) // 'breakindent'
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
177 #else
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
178 # define WL_BRI WL_NR
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
179 #endif
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
180 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF)
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
181 # define WL_SBR (WL_BRI + 1) // 'showbreak' or 'diff'
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
182 #else
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
183 # define WL_SBR WL_BRI
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
184 #endif
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
185 #define WL_LINE (WL_SBR + 1) // text in the line
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
186
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
187 #if defined(FEAT_SIGNS) || defined(FEAT_FOLDING)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
188 /*
26266
365e7f083f02 patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents: 25778
diff changeset
189 * Return TRUE if CursorLineSign highlight is to be used.
365e7f083f02 patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents: 25778
diff changeset
190 */
365e7f083f02 patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents: 25778
diff changeset
191 static int
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
192 use_cursor_line_highlight(win_T *wp, linenr_T lnum)
26266
365e7f083f02 patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents: 25778
diff changeset
193 {
365e7f083f02 patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents: 25778
diff changeset
194 return wp->w_p_cul
365e7f083f02 patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents: 25778
diff changeset
195 && lnum == wp->w_cursor.lnum
365e7f083f02 patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents: 25778
diff changeset
196 && (wp->w_p_culopt_flags & CULOPT_NBR);
365e7f083f02 patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents: 25778
diff changeset
197 }
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
198 #endif
26266
365e7f083f02 patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents: 25778
diff changeset
199
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
200
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
201 #ifdef FEAT_FOLDING
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
202 /*
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
203 * Setup for drawing the 'foldcolumn', if there is one.
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
204 */
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
205 static void
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
206 handle_foldcolumn(win_T *wp, winlinevars_T *wlv)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
207 {
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
208 int fdc = compute_foldcolumn(wp, 0);
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
209
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
210 if (fdc <= 0)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
211 return;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
212
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
213 // Allocate a buffer, "wlv->extra[]" may already be in use.
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
214 vim_free(wlv->p_extra_free);
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
215 wlv->p_extra_free = alloc(MAX_MCO * fdc + 1);
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
216 if (wlv->p_extra_free != NULL)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
217 {
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
218 wlv->n_extra = (int)fill_foldcolumn(wlv->p_extra_free,
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
219 wp, FALSE, wlv->lnum);
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
220 wlv->p_extra_free[wlv->n_extra] = NUL;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
221 wlv->p_extra = wlv->p_extra_free;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
222 wlv->c_extra = NUL;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
223 wlv->c_final = NUL;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
224 if (use_cursor_line_highlight(wp, wlv->lnum))
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
225 wlv->char_attr = hl_combine_attr(wlv->wcr_attr, HL_ATTR(HLF_CLF));
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
226 else
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
227 wlv->char_attr = hl_combine_attr(wlv->wcr_attr, HL_ATTR(HLF_FC));
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
228 }
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
229 }
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
230 #endif
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
231
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
232 #ifdef FEAT_SIGNS
26266
365e7f083f02 patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents: 25778
diff changeset
233 /*
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
234 * Get information needed to display the sign in line "wlv->lnum" in window
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
235 * "wp".
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
236 * If "nrcol" is TRUE, the sign is going to be displayed in the number column.
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
237 * Otherwise the sign is going to be displayed in the sign column.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
238 */
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
239 static void
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
240 get_sign_display_info(
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
241 int nrcol,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
242 win_T *wp,
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
243 winlinevars_T *wlv)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
244 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
245 int text_sign;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
246 # ifdef FEAT_SIGN_ICONS
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
247 int icon_sign;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
248 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
249
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
250 // Draw two cells with the sign value or blank.
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
251 wlv->c_extra = ' ';
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
252 wlv->c_final = NUL;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
253 if (nrcol)
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
254 wlv->n_extra = number_width(wp) + 1;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
255 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
256 {
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
257 if (use_cursor_line_highlight(wp, wlv->lnum))
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
258 wlv->char_attr = hl_combine_attr(wlv->wcr_attr, HL_ATTR(HLF_CLS));
26266
365e7f083f02 patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents: 25778
diff changeset
259 else
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
260 wlv->char_attr = hl_combine_attr(wlv->wcr_attr, HL_ATTR(HLF_SC));
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
261 wlv->n_extra = 2;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
262 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
263
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
264 if (wlv->row == wlv->startrow
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
265 #ifdef FEAT_DIFF
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
266 + wlv->filler_lines && wlv->filler_todo <= 0
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
267 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
268 )
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
269 {
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
270 text_sign = (wlv->sattr.sat_text != NULL) ? wlv->sattr.sat_typenr : 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
271 # ifdef FEAT_SIGN_ICONS
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
272 icon_sign = (wlv->sattr.sat_icon != NULL) ? wlv->sattr.sat_typenr : 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
273 if (gui.in_use && icon_sign != 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
274 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
275 // Use the image in this position.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
276 if (nrcol)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
277 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
278 wlv->c_extra = NUL;
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
279 sprintf((char *)wlv->extra, "%-*c ",
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
280 number_width(wp), SIGN_BYTE);
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
281 wlv->p_extra = wlv->extra;
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
282 wlv->n_extra = (int)STRLEN(wlv->p_extra);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
283 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
284 else
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
285 wlv->c_extra = SIGN_BYTE;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
286 # ifdef FEAT_NETBEANS_INTG
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
287 if (netbeans_active() && (buf_signcount(wp->w_buffer, wlv->lnum)
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
288 > 1))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
289 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
290 if (nrcol)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
291 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
292 wlv->c_extra = NUL;
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
293 sprintf((char *)wlv->extra, "%-*c ", number_width(wp),
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
294 MULTISIGN_BYTE);
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
295 wlv->p_extra = wlv->extra;
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
296 wlv->n_extra = (int)STRLEN(wlv->p_extra);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
297 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
298 else
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
299 wlv->c_extra = MULTISIGN_BYTE;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
300 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
301 # endif
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
302 wlv->c_final = NUL;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
303 wlv->char_attr = icon_sign;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
304 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
305 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
306 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
307 if (text_sign != 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
308 {
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
309 wlv->p_extra = wlv->sattr.sat_text;
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
310 if (wlv->p_extra != NULL)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
311 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
312 if (nrcol)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
313 {
30383
9126e872893d patch 9.0.0527: long sign text may overflow buffer
Bram Moolenaar <Bram@vim.org>
parents: 30375
diff changeset
314 int width = number_width(wp) - 2;
9126e872893d patch 9.0.0527: long sign text may overflow buffer
Bram Moolenaar <Bram@vim.org>
parents: 30375
diff changeset
315 int n;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
316
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
317 for (n = 0; n < width; n++)
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
318 wlv->extra[n] = ' ';
30383
9126e872893d patch 9.0.0527: long sign text may overflow buffer
Bram Moolenaar <Bram@vim.org>
parents: 30375
diff changeset
319 vim_snprintf((char *)wlv->extra + n,
9126e872893d patch 9.0.0527: long sign text may overflow buffer
Bram Moolenaar <Bram@vim.org>
parents: 30375
diff changeset
320 sizeof(wlv->extra) - n, "%s ", wlv->p_extra);
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
321 wlv->p_extra = wlv->extra;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
322 }
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
323 wlv->c_extra = NUL;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
324 wlv->c_final = NUL;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
325 wlv->n_extra = (int)STRLEN(wlv->p_extra);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
326 }
26266
365e7f083f02 patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents: 25778
diff changeset
327
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
328 if (use_cursor_line_highlight(wp, wlv->lnum)
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
329 && wlv->sattr.sat_culhl > 0)
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
330 wlv->char_attr = wlv->sattr.sat_culhl;
26266
365e7f083f02 patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents: 25778
diff changeset
331 else
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
332 wlv->char_attr = wlv->sattr.sat_texthl;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
333 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
334 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
335 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
336 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
337
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
338 /*
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
339 * Display the absolute or relative line number. After the first row fill with
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
340 * blanks when the 'n' flag isn't in 'cpo'.
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
341 */
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
342 static void
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
343 handle_lnum_col(
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
344 win_T *wp,
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
345 winlinevars_T *wlv,
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
346 int sign_present UNUSED,
30371
ba7db97776b2 patch 9.0.0521: compiler warns for unused argument in small version
Bram Moolenaar <Bram@vim.org>
parents: 30367
diff changeset
347 int num_attr UNUSED)
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
348 {
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
349 if ((wp->w_p_nu || wp->w_p_rnu)
30635
604d7d7aa043 patch 9.0.0652: 'smoothscroll' not tested with 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents: 30632
diff changeset
350 && ((wlv->row == wlv->startrow + wlv->filler_lines
604d7d7aa043 patch 9.0.0652: 'smoothscroll' not tested with 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents: 30632
diff changeset
351 && (wp->w_skipcol == 0 || wlv->row > wp->w_winrow))
604d7d7aa043 patch 9.0.0652: 'smoothscroll' not tested with 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents: 30632
diff changeset
352 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL))
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
353 {
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
354 #ifdef FEAT_SIGNS
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
355 // If 'signcolumn' is set to 'number' and a sign is present
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
356 // in 'lnum', then display the sign instead of the line
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
357 // number.
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
358 if ((*wp->w_p_scl == 'n' && *(wp->w_p_scl + 1) == 'u') && sign_present)
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
359 get_sign_display_info(TRUE, wp, wlv);
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
360 else
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
361 #endif
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
362 {
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
363 // Draw the line number (empty space after wrapping).
30397
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
364 // When there are text properties above the line put the line number
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
365 // below them.
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
366 if (wlv->row == wlv->startrow + wlv->filler_lines
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
367 #ifdef FEAT_PROP_POPUP
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
368 + wlv->text_prop_above_count
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
369 #endif
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
370 )
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
371 {
30397
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
372 long num;
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
373 char *fmt = "%*ld ";
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
374
30397
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
375 if (wp->w_p_nu && !wp->w_p_rnu)
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
376 // 'number' + 'norelativenumber'
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
377 num = (long)wlv->lnum;
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
378 else
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
379 {
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
380 // 'relativenumber', don't use negative numbers
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
381 num = labs((long)get_cursor_rel_lnum(wp, wlv->lnum));
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
382 if (num == 0 && wp->w_p_nu && wp->w_p_rnu)
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
383 {
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
384 // 'number' + 'relativenumber'
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
385 num = wlv->lnum;
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
386 fmt = "%-*ld ";
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
387 }
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
388 }
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
389
30397
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
390 sprintf((char *)wlv->extra, fmt, number_width(wp), num);
30610
6c6ac189a05f patch 9.0.0640: cannot scroll by screen line if a line wraps
Bram Moolenaar <Bram@vim.org>
parents: 30509
diff changeset
391 if (wp->w_skipcol > 0 && wlv->startrow == 0)
30397
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
392 for (wlv->p_extra = wlv->extra; *wlv->p_extra == ' ';
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
393 ++wlv->p_extra)
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
394 *wlv->p_extra = '-';
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
395 #ifdef FEAT_RIGHTLEFT
30397
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
396 if (wp->w_p_rl) // reverse line numbers
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
397 {
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
398 char_u *p1, *p2;
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
399 int t;
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
400
30397
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
401 // like rl_mirror(), but keep the space at the end
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
402 p2 = skipwhite(wlv->extra);
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
403 p2 = skiptowhite(p2) - 1;
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
404 for (p1 = skipwhite(wlv->extra); p1 < p2; ++p1, --p2)
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
405 {
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
406 t = *p1;
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
407 *p1 = *p2;
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
408 *p2 = t;
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
409 }
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
410 }
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
411 #endif
30397
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
412 wlv->p_extra = wlv->extra;
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
413 wlv->c_extra = NUL;
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
414 wlv->c_final = NUL;
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
415 }
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
416 else
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
417 {
30397
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
418 wlv->c_extra = ' ';
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
419 wlv->c_final = NUL;
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
420 }
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
421 wlv->n_extra = number_width(wp) + 1;
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
422 wlv->char_attr = hl_combine_attr(wlv->wcr_attr, HL_ATTR(HLF_N));
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
423 #ifdef FEAT_SYN_HL
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
424 // When 'cursorline' is set highlight the line number of
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
425 // the current line differently.
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
426 // When 'cursorlineopt' does not have "line" only
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
427 // highlight the line number itself.
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
428 // TODO: Can we use CursorLine instead of CursorLineNr
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
429 // when CursorLineNr isn't set?
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
430 if (wp->w_p_cul
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
431 && wlv->lnum == wp->w_cursor.lnum
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
432 && (wp->w_p_culopt_flags & CULOPT_NBR)
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
433 && (wlv->row == wlv->startrow + wlv->filler_lines
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
434 || (wlv->row > wlv->startrow + wlv->filler_lines
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
435 && (wp->w_p_culopt_flags & CULOPT_LINE))))
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
436 wlv->char_attr = hl_combine_attr(wlv->wcr_attr, HL_ATTR(HLF_CLN));
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
437 #endif
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
438 if (wp->w_p_rnu && wlv->lnum < wp->w_cursor.lnum
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
439 && HL_ATTR(HLF_LNA) != 0)
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
440 // Use LineNrAbove
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
441 wlv->char_attr = hl_combine_attr(wlv->wcr_attr, HL_ATTR(HLF_LNA));
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
442 if (wp->w_p_rnu && wlv->lnum > wp->w_cursor.lnum
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
443 && HL_ATTR(HLF_LNB) != 0)
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
444 // Use LineNrBelow
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
445 wlv->char_attr = hl_combine_attr(wlv->wcr_attr, HL_ATTR(HLF_LNB));
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
446 }
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
447 #ifdef FEAT_SIGNS
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
448 if (num_attr)
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
449 wlv->char_attr = num_attr;
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
450 #endif
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
451 }
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
452 }
30375
e40d150b66cb patch 9.0.0523: more compiler warnings for arguments in small version
Bram Moolenaar <Bram@vim.org>
parents: 30371
diff changeset
453
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
454 #ifdef FEAT_LINEBREAK
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
455 static void
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
456 handle_breakindent(win_T *wp, winlinevars_T *wlv)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
457 {
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
458 if (wp->w_briopt_sbr && wlv->draw_state == WL_BRI - 1
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
459 && *get_showbreak_value(wp) != NUL)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
460 // draw indent after showbreak value
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
461 wlv->draw_state = WL_BRI;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
462 else if (wp->w_briopt_sbr && wlv->draw_state == WL_SBR)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
463 // After the showbreak, draw the breakindent
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
464 wlv->draw_state = WL_BRI - 1;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
465
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
466 // draw 'breakindent': indent wrapped text accordingly
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
467 if (wlv->draw_state == WL_BRI - 1)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
468 {
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
469 wlv->draw_state = WL_BRI;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
470 // if wlv->need_showbreak is set, breakindent also applies
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
471 if (wp->w_p_bri && (wlv->row != wlv->startrow || wlv->need_showbreak)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
472 # ifdef FEAT_DIFF
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
473 && wlv->filler_lines == 0
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
474 # endif
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
475 # ifdef FEAT_PROP_POPUP
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
476 && !wlv->dont_use_showbreak
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
477 # endif
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
478 )
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
479 {
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
480 wlv->char_attr = 0;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
481 # ifdef FEAT_DIFF
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
482 if (wlv->diff_hlf != (hlf_T)0)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
483 wlv->char_attr = HL_ATTR(wlv->diff_hlf);
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
484 # endif
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
485 wlv->p_extra = NULL;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
486 wlv->c_extra = ' ';
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
487 wlv->c_final = NUL;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
488 wlv->n_extra = get_breakindent_win(wp,
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
489 ml_get_buf(wp->w_buffer, wlv->lnum, FALSE));
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
490 if (wlv->row == wlv->startrow)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
491 {
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
492 wlv->n_extra -= win_col_off2(wp);
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
493 if (wlv->n_extra < 0)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
494 wlv->n_extra = 0;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
495 }
30610
6c6ac189a05f patch 9.0.0640: cannot scroll by screen line if a line wraps
Bram Moolenaar <Bram@vim.org>
parents: 30509
diff changeset
496 if (wp->w_skipcol > 0 && wlv->startrow == 0
6c6ac189a05f patch 9.0.0640: cannot scroll by screen line if a line wraps
Bram Moolenaar <Bram@vim.org>
parents: 30509
diff changeset
497 && wp->w_p_wrap && wp->w_briopt_sbr)
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
498 wlv->need_showbreak = FALSE;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
499 // Correct end of highlighted area for 'breakindent',
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
500 // required when 'linebreak' is also set.
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
501 if (wlv->tocol == wlv->vcol)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
502 wlv->tocol += wlv->n_extra;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
503 }
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
504 }
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
505 }
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
506 #endif
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
507
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
508 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF)
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
509 static void
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
510 handle_showbreak_and_filler(win_T *wp, winlinevars_T *wlv)
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
511 {
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
512 # ifdef FEAT_DIFF
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
513 if (wlv->filler_todo > 0)
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
514 {
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
515 // Draw "deleted" diff line(s).
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
516 if (char2cells(wp->w_fill_chars.diff) > 1)
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
517 {
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
518 wlv->c_extra = '-';
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
519 wlv->c_final = NUL;
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
520 }
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
521 else
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
522 {
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
523 wlv->c_extra = wp->w_fill_chars.diff;
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
524 wlv->c_final = NUL;
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
525 }
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
526 # ifdef FEAT_RIGHTLEFT
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
527 if (wp->w_p_rl)
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
528 wlv->n_extra = wlv->col + 1;
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
529 else
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
530 # endif
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
531 wlv->n_extra = wp->w_width - wlv->col;
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
532 wlv->char_attr = HL_ATTR(HLF_DED);
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
533 }
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
534 # endif
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
535
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
536 # ifdef FEAT_LINEBREAK
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
537 char_u *sbr = get_showbreak_value(wp);
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
538 if (*sbr != NUL && wlv->need_showbreak)
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
539 {
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
540 // Draw 'showbreak' at the start of each broken line.
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
541 wlv->p_extra = sbr;
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
542 wlv->c_extra = NUL;
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
543 wlv->c_final = NUL;
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
544 wlv->n_extra = (int)STRLEN(sbr);
30614
50b2da7068d6 patch 9.0.0642: breakindent test fails
Bram Moolenaar <Bram@vim.org>
parents: 30610
diff changeset
545 if (wp->w_skipcol == 0 || wlv->startrow != 0 || !wp->w_p_wrap)
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
546 wlv->need_showbreak = FALSE;
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
547 wlv->vcol_sbr = wlv->vcol + MB_CHARLEN(sbr);
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
548 // Correct end of highlighted area for 'showbreak',
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
549 // required when 'linebreak' is also set.
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
550 if (wlv->tocol == wlv->vcol)
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
551 wlv->tocol += wlv->n_extra;
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
552 // combine 'showbreak' with 'wincolor'
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
553 wlv->char_attr = hl_combine_attr(wlv->win_attr, HL_ATTR(HLF_AT));
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
554 # ifdef FEAT_SYN_HL
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
555 // combine 'showbreak' with 'cursorline'
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
556 if (wlv->cul_attr != 0)
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
557 wlv->char_attr = hl_combine_attr(wlv->char_attr, wlv->cul_attr);
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
558 # endif
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
559 }
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
560 # endif
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
561 }
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
562 #endif
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
563
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
564 #if defined(FEAT_PROP_POPUP) || defined(PROTO)
29690
1a9b3c96ed08 patch 9.0.0185: virtual text does not show if text prop at same position
Bram Moolenaar <Bram@vim.org>
parents: 29688
diff changeset
565 /*
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
566 * Return the cell size of virtual text after truncation.
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
567 */
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
568 static int
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
569 textprop_size_after_trunc(
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
570 win_T *wp,
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
571 int flags, // TP_FLAG_ALIGN_*
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
572 int added,
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
573 char_u *text,
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
574 int *n_used_ptr)
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
575 {
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
576 int space = (flags & (TP_FLAG_ALIGN_BELOW | TP_FLAG_ALIGN_ABOVE))
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
577 ? wp->w_width : added;
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
578 int len = (int)STRLEN(text);
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
579 int strsize = 0;
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
580 int n_used;
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
581
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
582 // if the remaining size is to small wrap anyway and use the next line
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
583 if (space < PROP_TEXT_MIN_CELLS)
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
584 space += wp->w_width;
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
585 for (n_used = 0; n_used < len; n_used += (*mb_ptr2len)(text + n_used))
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
586 {
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
587 int clen = ptr2cells(text + n_used);
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
588
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
589 if (strsize + clen > space)
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
590 break;
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
591 strsize += clen;
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
592 }
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
593 *n_used_ptr = n_used;
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
594 return strsize;
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
595 }
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
596
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
597 /*
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
598 * Take care of padding, right-align and truncation of virtual text after a
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
599 * line.
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
600 * if "n_attr" is not NULL then "n_extra" and "p_extra" are adjusted for any
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
601 * padding, right-align and truncation. Otherwise only the size is computed.
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
602 * When "n_attr" is NULL returns the number of screen cells used.
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
603 * Otherwise returns TRUE when drawing continues on the next line.
29690
1a9b3c96ed08 patch 9.0.0185: virtual text does not show if text prop at same position
Bram Moolenaar <Bram@vim.org>
parents: 29688
diff changeset
604 */
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
605 int
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
606 text_prop_position(
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
607 win_T *wp,
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
608 textprop_T *tp,
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
609 int vcol, // current screen column
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
610 int *n_extra, // nr of bytes for virtual text
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
611 char_u **p_extra, // virtual text
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
612 int *n_attr, // attribute cells, NULL if not used
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
613 int *n_attr_skip) // cells to skip attr, NULL if not used
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
614 {
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
615 int right = (tp->tp_flags & TP_FLAG_ALIGN_RIGHT);
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
616 int above = (tp->tp_flags & TP_FLAG_ALIGN_ABOVE);
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
617 int below = (tp->tp_flags & TP_FLAG_ALIGN_BELOW);
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
618 int wrap = (tp->tp_flags & TP_FLAG_WRAP);
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
619 int padding = tp->tp_col == MAXCOL && tp->tp_len > 1
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
620 ? tp->tp_len - 1 : 0;
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
621 int col_with_padding = vcol + (below ? 0 : padding);
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
622 int room = wp->w_width - col_with_padding;
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
623 int before = room; // spaces before the text
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
624 int after = 0; // spaces after the text
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
625 int n_used = *n_extra;
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
626 char_u *l = NULL;
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
627 int strsize = vim_strsize(*p_extra);
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
628 int cells = wrap ? strsize : textprop_size_after_trunc(wp,
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
629 tp->tp_flags, before, *p_extra, &n_used);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
630
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
631 if (wrap || right || above || below || padding > 0 || n_used < *n_extra)
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
632 {
30365
748b8dcfba57 patch 9.0.0518: virtual text highlight starts too early with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30361
diff changeset
633 int col_off = win_col_off(wp) + win_col_off2(wp);
748b8dcfba57 patch 9.0.0518: virtual text highlight starts too early with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30361
diff changeset
634 int skip_add = 0;
748b8dcfba57 patch 9.0.0518: virtual text highlight starts too early with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30361
diff changeset
635
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
636 if (above)
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
637 {
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
638 before = 0;
30213
4fedacdad3b4 patch 9.0.0442: virtual text "above" doesn't handel line numbers
Bram Moolenaar <Bram@vim.org>
parents: 30205
diff changeset
639 after = wp->w_width - cells - win_col_off(wp) - padding;
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
640 }
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
641 else
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
642 {
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
643 // Right-align: fill with before
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
644 if (right)
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
645 before -= cells;
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
646 if (before < 0
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
647 || !(right || below)
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
648 || (below
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
649 ? (col_with_padding == 0 || !wp->w_p_wrap)
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
650 : (n_used < *n_extra)))
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
651 {
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
652 if (right && (wrap || room < PROP_TEXT_MIN_CELLS))
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
653 {
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
654 // right-align on next line instead of wrapping if possible
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
655 before = wp->w_width - col_off - strsize + room;
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
656 if (before < 0)
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
657 before = 0;
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
658 else
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
659 n_used = *n_extra;
30365
748b8dcfba57 patch 9.0.0518: virtual text highlight starts too early with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30361
diff changeset
660 skip_add = col_off;
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
661 }
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
662 else
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
663 before = 0;
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
664 }
30359
6391b3ca26b7 patch 9.0.0515: virtual text highlight starts too early when 'number' is set
Bram Moolenaar <Bram@vim.org>
parents: 30273
diff changeset
665 else if (below && before > 0)
6391b3ca26b7 patch 9.0.0515: virtual text highlight starts too early when 'number' is set
Bram Moolenaar <Bram@vim.org>
parents: 30273
diff changeset
666 // include 'number' column et al.
30365
748b8dcfba57 patch 9.0.0518: virtual text highlight starts too early with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30361
diff changeset
667 skip_add = col_off;
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
668 }
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
669
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
670 // With 'nowrap' add one to show the "extends" character if needed (it
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
671 // doesn't show if the text just fits).
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
672 if (!wp->w_p_wrap
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
673 && n_used < *n_extra
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
674 && wp->w_lcs_chars.ext != NUL
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
675 && wp->w_p_list)
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
676 ++n_used;
30365
748b8dcfba57 patch 9.0.0518: virtual text highlight starts too early with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30361
diff changeset
677 if (!wp->w_p_wrap && below && padding > 0)
748b8dcfba57 patch 9.0.0518: virtual text highlight starts too early with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30361
diff changeset
678 skip_add = col_off;
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
679
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
680 // add 1 for NUL, 2 for when '…' is used
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
681 if (n_attr != NULL)
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
682 l = alloc(n_used + before + after + padding + 3);
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
683 if (n_attr == NULL || l != NULL)
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
684 {
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
685 int off = 0;
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
686
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
687 if (n_attr != NULL)
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
688 {
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
689 vim_memset(l, ' ', before);
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
690 off += before;
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
691 if (padding > 0)
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
692 {
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
693 vim_memset(l + off, ' ', padding);
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
694 off += padding;
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
695 }
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
696 vim_strncpy(l + off, *p_extra, n_used);
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
697 off += n_used;
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
698 }
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
699 else
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
700 {
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
701 off = before + after + padding + n_used;
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
702 cells += before + after + padding;
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
703 }
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
704 if (n_attr != NULL)
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
705 {
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
706 if (n_used < *n_extra && wp->w_p_wrap)
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
707 {
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
708 char_u *lp = l + off - 1;
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
709
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
710 if (has_mbyte)
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
711 {
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
712 // change last character to '…'
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
713 lp -= (*mb_head_off)(l, lp);
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
714 STRCPY(lp, "…");
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
715 n_used = lp - l + 3 - padding;
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
716 }
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
717 else
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
718 // change last character to '>'
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
719 *lp = '>';
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
720 }
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
721 else if (after > 0)
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
722 {
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
723 vim_memset(l + off, ' ', after);
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
724 l[off + after] = NUL;
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
725 }
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
726
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
727 *p_extra = l;
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
728 *n_extra = n_used + before + after + padding;
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
729 *n_attr = mb_charlen(*p_extra);
30213
4fedacdad3b4 patch 9.0.0442: virtual text "above" doesn't handel line numbers
Bram Moolenaar <Bram@vim.org>
parents: 30205
diff changeset
730 if (above)
30361
d03040b399de patch 9.0.0516: virtual text "above" highlights gap after it
Bram Moolenaar <Bram@vim.org>
parents: 30359
diff changeset
731 *n_attr -= padding + after;
30365
748b8dcfba57 patch 9.0.0518: virtual text highlight starts too early with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30361
diff changeset
732 *n_attr_skip = before + padding + skip_add;
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
733 }
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
734 }
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
735 }
29690
1a9b3c96ed08 patch 9.0.0185: virtual text does not show if text prop at same position
Bram Moolenaar <Bram@vim.org>
parents: 29688
diff changeset
736
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
737 if (n_attr == NULL)
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
738 return cells;
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
739 return (below && col_with_padding > win_col_off(wp) && !wp->w_p_wrap);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
740 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
741 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
742
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
743 /*
30628
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
744 * Call screen_line() using values from "wlv".
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
745 * Also takes care of putting "<<<" on the first line for 'smoothscroll'.
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
746 */
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
747 static void
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
748 wlv_screen_line(win_T *wp, winlinevars_T *wlv, int negative_width)
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
749 {
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
750 if (wlv->row == 0 && wp->w_skipcol > 0)
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
751 {
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
752 int off = (int)(current_ScreenLine - ScreenLines);
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
753
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
754 for (int i = 0; i < 3; ++i)
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
755 {
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
756 ScreenLines[off] = '<';
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
757 if (enc_utf8)
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
758 ScreenLinesUC[off] = 0;
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
759 ScreenAttrs[off] = HL_ATTR(HLF_AT);
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
760 ++off;
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
761 }
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
762 }
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
763
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
764 screen_line(wp, wlv->screen_row, wp->w_wincol, wlv->col,
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
765 negative_width ? -wp->w_width : wp->w_width,
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
766 wlv->screen_line_flags);
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
767 }
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
768
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
769 /*
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
770 * Called when finished with the line: draw the screen line and handle any
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
771 * highlighting until the right of the window.
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
772 */
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
773 static void
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
774 draw_screen_line(win_T *wp, winlinevars_T *wlv)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
775 {
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
776 #ifdef FEAT_SYN_HL
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
777 long v;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
778
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
779 // Highlight 'cursorcolumn' & 'colorcolumn' past end of the line.
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
780 if (wp->w_p_wrap)
30610
6c6ac189a05f patch 9.0.0640: cannot scroll by screen line if a line wraps
Bram Moolenaar <Bram@vim.org>
parents: 30509
diff changeset
781 v = wlv->startrow == 0 ? wp->w_skipcol : 0;
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
782 else
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
783 v = wp->w_leftcol;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
784
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
785 // check if line ends before left margin
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
786 if (wlv->vcol < v + wlv->col - win_col_off(wp))
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
787 wlv->vcol = v + wlv->col - win_col_off(wp);
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
788 # ifdef FEAT_CONCEAL
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
789 // Get rid of the boguscols now, we want to draw until the right
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
790 // edge for 'cursorcolumn'.
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
791 wlv->col -= wlv->boguscols;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
792 wlv->boguscols = 0;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
793 # define VCOL_HLC (wlv->vcol - wlv->vcol_off)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
794 # else
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
795 # define VCOL_HLC (wlv->vcol)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
796 # endif
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
797
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
798 if (wlv->draw_color_col)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
799 wlv->draw_color_col = advance_color_col(VCOL_HLC, &wlv->color_cols);
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
800
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
801 if (((wp->w_p_cuc
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
802 && (int)wp->w_virtcol >= VCOL_HLC - wlv->eol_hl_off
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
803 && (int)wp->w_virtcol <
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
804 (long)wp->w_width * (wlv->row - wlv->startrow + 1) + v
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
805 && wlv->lnum != wp->w_cursor.lnum)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
806 || wlv->draw_color_col
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
807 || wlv->win_attr != 0)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
808 # ifdef FEAT_RIGHTLEFT
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
809 && !wp->w_p_rl
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
810 # endif
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
811 )
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
812 {
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
813 int rightmost_vcol = 0;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
814 int i;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
815
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
816 if (wp->w_p_cuc)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
817 rightmost_vcol = wp->w_virtcol;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
818 if (wlv->draw_color_col)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
819 // determine rightmost colorcolumn to possibly draw
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
820 for (i = 0; wlv->color_cols[i] >= 0; ++i)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
821 if (rightmost_vcol < wlv->color_cols[i])
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
822 rightmost_vcol = wlv->color_cols[i];
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
823
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
824 while (wlv->col < wp->w_width)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
825 {
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
826 ScreenLines[wlv->off] = ' ';
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
827 if (enc_utf8)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
828 ScreenLinesUC[wlv->off] = 0;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
829 ScreenCols[wlv->off] = MAXCOL;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
830 ++wlv->col;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
831 if (wlv->draw_color_col)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
832 wlv->draw_color_col = advance_color_col(
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
833 VCOL_HLC, &wlv->color_cols);
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
834
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
835 if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
836 ScreenAttrs[wlv->off++] = HL_ATTR(HLF_CUC);
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
837 else if (wlv->draw_color_col && VCOL_HLC == *wlv->color_cols)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
838 ScreenAttrs[wlv->off++] = HL_ATTR(HLF_MC);
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
839 else
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
840 ScreenAttrs[wlv->off++] = wlv->win_attr;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
841
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
842 if (VCOL_HLC >= rightmost_vcol && wlv->win_attr == 0)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
843 break;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
844
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
845 ++wlv->vcol;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
846 }
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
847 }
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
848 #endif
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
849
30628
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
850 wlv_screen_line(wp, wlv, FALSE);
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
851 ++wlv->row;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
852 ++wlv->screen_row;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
853 }
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
854 #undef VCOL_HLC
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
855
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
856 /*
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
857 * Start a screen line at column zero.
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
858 * When "save_extra" is TRUE save and reset n_extra, p_extra, etc.
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
859 */
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
860 static void
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
861 win_line_start(win_T *wp UNUSED, winlinevars_T *wlv, int save_extra)
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
862 {
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
863 wlv->col = 0;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
864 wlv->off = (unsigned)(current_ScreenLine - ScreenLines);
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
865
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
866 #ifdef FEAT_RIGHTLEFT
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
867 if (wp->w_p_rl)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
868 {
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
869 // Rightleft window: process the text in the normal direction, but put
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
870 // it in current_ScreenLine[] from right to left. Start at the
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
871 // rightmost column of the window.
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
872 wlv->col = wp->w_width - 1;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
873 wlv->off += wlv->col;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
874 wlv->screen_line_flags |= SLF_RIGHTLEFT;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
875 }
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
876 #endif
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
877 if (save_extra)
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
878 {
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
879 // reset the drawing state for the start of a wrapped line
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
880 wlv->draw_state = WL_START;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
881 wlv->saved_n_extra = wlv->n_extra;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
882 wlv->saved_p_extra = wlv->p_extra;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
883 wlv->saved_c_extra = wlv->c_extra;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
884 wlv->saved_c_final = wlv->c_final;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
885 #ifdef FEAT_SYN_HL
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
886 if (!(wlv->cul_screenline
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
887 # ifdef FEAT_DIFF
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
888 && wlv->diff_hlf == (hlf_T)0
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
889 # endif
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
890 ))
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
891 wlv->saved_char_attr = wlv->char_attr;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
892 else
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
893 #endif
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
894 wlv->saved_char_attr = 0;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
895 wlv->n_extra = 0;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
896 }
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
897 }
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
898
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
899 /*
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
900 * Called when wlv->draw_state is set to WL_LINE.
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
901 */
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
902 static void
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
903 win_line_continue(winlinevars_T *wlv)
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
904 {
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
905 if (wlv->saved_n_extra > 0)
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
906 {
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
907 // Continue item from end of wrapped line.
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
908 wlv->n_extra = wlv->saved_n_extra;
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
909 wlv->c_extra = wlv->saved_c_extra;
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
910 wlv->c_final = wlv->saved_c_final;
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
911 wlv->p_extra = wlv->saved_p_extra;
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
912 wlv->char_attr = wlv->saved_char_attr;
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
913 }
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
914 else
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
915 wlv->char_attr = wlv->win_attr;
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
916 }
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
917
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
918 /*
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
919 * Display line "lnum" of window 'wp' on the screen.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
920 * Start at row "startrow", stop when "endrow" is reached.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
921 * wp->w_virtcol needs to be valid.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
922 *
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
923 * Return the number of last row the line occupies.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
924 */
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
925 int
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
926 win_line(
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
927 win_T *wp,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
928 linenr_T lnum,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
929 int startrow,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
930 int endrow,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
931 int nochange UNUSED, // not updating for changed text
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
932 int number_only) // only update the number column
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
933 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
934 winlinevars_T wlv; // variables passed between functions
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
935
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
936 int c = 0; // init for GCC
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
937 long vcol_prev = -1; // "wlv.vcol" of previous character
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
938 char_u *line; // current line
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
939 char_u *ptr; // current position in "line"
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
940
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
941 #ifdef FEAT_PROP_POPUP
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
942 char_u *p_extra_free2 = NULL; // another p_extra to be freed
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
943 #endif
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
944 int extra_attr = 0; // attributes when n_extra != 0
26374
59f2b11ad1be patch 8.2.3718: compiler warns for unused variable without +textprop
Bram Moolenaar <Bram@vim.org>
parents: 26350
diff changeset
945 #if defined(FEAT_LINEBREAK) && defined(FEAT_PROP_POPUP)
26338
4cf208415483 patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents: 26334
diff changeset
946 int in_linebreak = FALSE; // n_extra set for showing linebreak
4cf208415483 patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents: 26334
diff changeset
947 #endif
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
948 static char_u *at_end_str = (char_u *)""; // used for p_extra when
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
949 // displaying eol at end-of-line
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
950 int lcs_eol_one = wp->w_lcs_chars.eol; // eol until it's been used
26374
59f2b11ad1be patch 8.2.3718: compiler warns for unused variable without +textprop
Bram Moolenaar <Bram@vim.org>
parents: 26350
diff changeset
951 int lcs_prec_todo = wp->w_lcs_chars.prec;
59f2b11ad1be patch 8.2.3718: compiler warns for unused variable without +textprop
Bram Moolenaar <Bram@vim.org>
parents: 26350
diff changeset
952 // prec until it's been used
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
953
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
954 int n_attr = 0; // chars with special attr
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
955 int n_attr_skip = 0; // chars to skip before using extra_attr
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
956 int saved_attr2 = 0; // char_attr saved for n_attr
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
957 int n_attr3 = 0; // chars with overruling special attr
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
958 int saved_attr3 = 0; // char_attr saved for n_attr3
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
959
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
960 int n_skip = 0; // nr of chars to skip for 'nowrap'
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
961
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
962 int fromcol_prev = -2; // start of inverting after cursor
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
963 int noinvcur = FALSE; // don't invert the cursor
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
964 int lnum_in_visual_area = FALSE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
965 pos_T pos;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
966 long v;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
967
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
968 int attr_pri = FALSE; // char_attr has priority
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
969 int area_highlighting = FALSE; // Visual or incsearch highlighting
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
970 // in this line
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
971 int vi_attr = 0; // attributes for Visual and incsearch
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
972 // highlighting
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
973 int area_attr = 0; // attributes desired by highlighting
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
974 int search_attr = 0; // attributes desired by 'hlsearch'
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
975 #ifdef FEAT_SYN_HL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
976 int vcol_save_attr = 0; // saved attr for 'cursorcolumn'
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
977 int syntax_attr = 0; // attributes desired by syntax
18323
72a0dbe1c004 patch 8.1.2156: first character after Tab is not highlighted
Bram Moolenaar <Bram@vim.org>
parents: 18321
diff changeset
978 int prev_syntax_col = -1; // column of prev_syntax_attr
72a0dbe1c004 patch 8.1.2156: first character after Tab is not highlighted
Bram Moolenaar <Bram@vim.org>
parents: 18321
diff changeset
979 int prev_syntax_attr = 0; // syntax_attr at prev_syntax_col
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
980 int has_syntax = FALSE; // this buffer has syntax highl.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
981 int save_did_emsg;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
982 #endif
18763
49b78d6465e5 patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents: 18720
diff changeset
983 #ifdef FEAT_PROP_POPUP
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
984 int text_prop_count;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
985 int text_prop_next = 0; // next text property to use
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
986 textprop_T *text_props = NULL;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
987 int *text_prop_idxs = NULL;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
988 int text_props_active = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
989 proptype_T *text_prop_type = NULL;
29736
65348cc3b656 patch 9.0.0208: the override flag has no effect for virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29722
diff changeset
990 int extra_for_textprop = FALSE; // wlv.n_extra set for textprop
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
991 int text_prop_attr = 0;
30039
4b9b237d1211 patch 9.0.0357: 'linebreak' interferes with text property highlight
Bram Moolenaar <Bram@vim.org>
parents: 29918
diff changeset
992 int text_prop_attr_comb = 0; // text_prop_attr combined with
4b9b237d1211 patch 9.0.0357: 'linebreak' interferes with text property highlight
Bram Moolenaar <Bram@vim.org>
parents: 29918
diff changeset
993 // syntax_attr
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
994 int text_prop_id = 0; // active property ID
29611
608d5221a3e5 patch 9.0.0146: missing part of change for "override" flag
Bram Moolenaar <Bram@vim.org>
parents: 29597
diff changeset
995 int text_prop_flags = 0;
30231
0d084880276a patch 9.0.0451: virtual text "above" does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30213
diff changeset
996 int text_prop_above = FALSE; // first doing virtual text above
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
997 int text_prop_follows = FALSE; // another text prop to display
29706
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
998 int saved_search_attr = 0; // search_attr to be used when n_extra
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
999 // goes to zero
30233
8d660a45299f patch 9.0.0452: Visual highlighting extends into virtual text prop
Bram Moolenaar <Bram@vim.org>
parents: 30231
diff changeset
1000 int saved_area_attr = 0; // idem for area_attr
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1001 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1002 #ifdef FEAT_SPELL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1003 int has_spell = FALSE; // this buffer has spell checking
27889
ec6756baed23 patch 8.2.4470: Coverity warns for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents: 27752
diff changeset
1004 int can_spell = FALSE;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1005 # define SPWORDLEN 150
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1006 char_u nextline[SPWORDLEN * 2];// text with start of the next line
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1007 int nextlinecol = 0; // column where nextline[] starts
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1008 int nextline_idx = 0; // index in nextline[] where next line
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1009 // starts
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1010 int spell_attr = 0; // attributes desired by spelling
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1011 int word_end = 0; // last byte with same spell_attr
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1012 static linenr_T checked_lnum = 0; // line number for "checked_col"
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1013 static int checked_col = 0; // column in "checked_lnum" up to which
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1014 // there are no spell errors
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1015 static int cap_col = -1; // column to check for Cap word
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1016 static linenr_T capcol_lnum = 0; // line number where "cap_col" used
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1017 int cur_checked_col = 0; // checked column for current line
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1018 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1019 int extra_check = 0; // has extra highlighting
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1020 int multi_attr = 0; // attributes desired by multibyte
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1021 int mb_l = 1; // multi-byte byte length
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1022 int mb_c = 0; // decoded multi-byte character
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1023 int mb_utf8 = FALSE; // screen char is UTF-8 char
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1024 int u8cc[MAX_MCO]; // composing UTF-8 chars
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1025 #ifdef FEAT_DIFF
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1026 int change_start = MAXCOL; // first col of changed area
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1027 int change_end = -1; // last col of changed area
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1028 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1029 colnr_T trailcol = MAXCOL; // start of trailing spaces
23825
0bd44e94dd14 patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents: 22997
diff changeset
1030 colnr_T leadcol = 0; // start of leading spaces
25778
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
1031 int in_multispace = FALSE; // in multiple consecutive spaces
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
1032 int multispace_pos = 0; // position in lcs-multispace string
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1033 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1034 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1035 # define LINE_ATTR
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1036 int line_attr = 0; // attribute for the whole line
29641
b2cf1634c782 patch 9.0.0161: warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents: 29639
diff changeset
1037 int line_attr_save = 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1038 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1039 int sign_present = FALSE;
26690
84d60deb8f82 patch 8.2.3874: cannot highlight the number column for a sign
Bram Moolenaar <Bram@vim.org>
parents: 26384
diff changeset
1040 int num_attr = 0; // attribute for the number column
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1041 #ifdef FEAT_ARABIC
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1042 int prev_c = 0; // previous Arabic character
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1043 int prev_c1 = 0; // first composing char for prev_c
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1044 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1045 #if defined(LINE_ATTR)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1046 int did_line_attr = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1047 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1048 #ifdef FEAT_TERMINAL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1049 int get_term_attr = FALSE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1050 #endif
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
1051
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1052 #ifdef FEAT_SYN_HL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1053 // margin columns for the screen line, needed for when 'cursorlineopt'
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1054 // contains "screenline"
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1055 int left_curline_col = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1056 int right_curline_col = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1057 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1058
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1059 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1060 int feedback_col = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1061 int feedback_old_attr = -1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1062 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1063
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1064 #if defined(FEAT_CONCEAL) || defined(FEAT_SEARCH_EXTRA)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1065 int match_conc = 0; // cchar for match functions
26334
baec4e1cee43 patch 8.2.3698: match highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents: 26266
diff changeset
1066 int on_last_col = FALSE;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1067 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1068 #ifdef FEAT_CONCEAL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1069 int syntax_flags = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1070 int syntax_seqnr = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1071 int prev_syntax_id = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1072 int conceal_attr = HL_ATTR(HLF_CONCEAL);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1073 int is_concealing = FALSE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1074 int did_wcol = FALSE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1075 int old_boguscols = 0;
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1076 # define VCOL_HLC (wlv.vcol - wlv.vcol_off)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1077 # define FIX_FOR_BOGUSCOLS \
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1078 { \
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1079 wlv.n_extra += wlv.vcol_off; \
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1080 wlv.vcol -= wlv.vcol_off; \
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1081 wlv.vcol_off = 0; \
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1082 wlv.col -= wlv.boguscols; \
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1083 old_boguscols = wlv.boguscols; \
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1084 wlv.boguscols = 0; \
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1085 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1086 #else
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1087 # define VCOL_HLC (wlv.vcol)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1088 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1089
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1090 if (startrow > endrow) // past the end already!
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1091 return startrow;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1092
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1093 CLEAR_FIELD(wlv);
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1094
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1095 wlv.lnum = lnum;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1096 wlv.startrow = startrow;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1097 wlv.row = startrow;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1098 wlv.screen_row = wlv.row + W_WINROW(wp);
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1099 wlv.fromcol = -10;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1100 wlv.tocol = MAXCOL;
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
1101 #ifdef FEAT_LINEBREAK
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
1102 wlv.vcol_sbr = -1;
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
1103 #endif
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1104
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1105 if (!number_only)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1106 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1107 // To speed up the loop below, set extra_check when there is linebreak,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1108 // trailing white space and/or syntax processing to be done.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1109 #ifdef FEAT_LINEBREAK
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1110 extra_check = wp->w_p_lbr;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1111 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1112 #ifdef FEAT_SYN_HL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1113 if (syntax_present(wp) && !wp->w_s->b_syn_error
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1114 # ifdef SYN_TIME_LIMIT
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1115 && !wp->w_s->b_syn_slow
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1116 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1117 )
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1118 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1119 // Prepare for syntax highlighting in this line. When there is an
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1120 // error, stop syntax highlighting.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1121 save_did_emsg = did_emsg;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1122 did_emsg = FALSE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1123 syntax_start(wp, lnum);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1124 if (did_emsg)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1125 wp->w_s->b_syn_error = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1126 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1127 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1128 did_emsg = save_did_emsg;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1129 #ifdef SYN_TIME_LIMIT
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1130 if (!wp->w_s->b_syn_slow)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1131 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1132 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1133 has_syntax = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1134 extra_check = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1135 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1136 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1137 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1138
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1139 // Check for columns to display for 'colorcolumn'.
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1140 wlv.color_cols = wp->w_p_cc_cols;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1141 if (wlv.color_cols != NULL)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1142 wlv.draw_color_col = advance_color_col(VCOL_HLC, &wlv.color_cols);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1143 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1144
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1145 #ifdef FEAT_TERMINAL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1146 if (term_show_buffer(wp->w_buffer))
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1147 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1148 extra_check = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1149 get_term_attr = TRUE;
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1150 wlv.win_attr = term_get_attr(wp, lnum, -1);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1151 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1152 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1153
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1154 #ifdef FEAT_SPELL
30509
087c42245022 patch 9.0.0590: after exiting Insert mode spelling not checked in next line
Bram Moolenaar <Bram@vim.org>
parents: 30397
diff changeset
1155 if (spell_check_window(wp))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1156 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1157 // Prepare for spell checking.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1158 has_spell = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1159 extra_check = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1160
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1161 // Get the start of the next line, so that words that wrap to the
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1162 // next line are found too: "et<line-break>al.".
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1163 // Trick: skip a few chars for C/shell/Vim comments
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1164 nextline[SPWORDLEN] = NUL;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1165 if (lnum < wp->w_buffer->b_ml.ml_line_count)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1166 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1167 line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1168 spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1169 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1170
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1171 // When a word wrapped from the previous line the start of the
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1172 // current line is valid.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1173 if (lnum == checked_lnum)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1174 cur_checked_col = checked_col;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1175 checked_lnum = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1176
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1177 // When there was a sentence end in the previous line may require a
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1178 // word starting with capital in this line. In line 1 always check
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1179 // the first word.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1180 if (lnum != capcol_lnum)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1181 cap_col = -1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1182 if (lnum == 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1183 cap_col = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1184 capcol_lnum = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1185 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1186 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1187
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1188 // handle Visual active in this window
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1189 if (VIsual_active && wp->w_buffer == curwin->w_buffer)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1190 {
19816
f37028184d6a patch 8.2.0464: typos and other small problems
Bram Moolenaar <Bram@vim.org>
parents: 19503
diff changeset
1191 pos_T *top, *bot;
f37028184d6a patch 8.2.0464: typos and other small problems
Bram Moolenaar <Bram@vim.org>
parents: 19503
diff changeset
1192
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1193 if (LTOREQ_POS(curwin->w_cursor, VIsual))
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1194 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1195 // Visual is after curwin->w_cursor
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1196 top = &curwin->w_cursor;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1197 bot = &VIsual;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1198 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1199 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1200 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1201 // Visual is before curwin->w_cursor
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1202 top = &VIsual;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1203 bot = &curwin->w_cursor;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1204 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1205 lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1206 if (VIsual_mode == Ctrl_V)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1207 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1208 // block mode
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1209 if (lnum_in_visual_area)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1210 {
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1211 wlv.fromcol = wp->w_old_cursor_fcol;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1212 wlv.tocol = wp->w_old_cursor_lcol;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1213 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1214 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1215 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1216 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1217 // non-block mode
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1218 if (lnum > top->lnum && lnum <= bot->lnum)
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1219 wlv.fromcol = 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1220 else if (lnum == top->lnum)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1221 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1222 if (VIsual_mode == 'V') // linewise
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1223 wlv.fromcol = 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1224 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1225 {
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1226 getvvcol(wp, top, (colnr_T *)&wlv.fromcol, NULL, NULL);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1227 if (gchar_pos(top) == NUL)
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1228 wlv.tocol = wlv.fromcol + 1;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1229 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1230 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1231 if (VIsual_mode != 'V' && lnum == bot->lnum)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1232 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1233 if (*p_sel == 'e' && bot->col == 0 && bot->coladd == 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1234 {
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1235 wlv.fromcol = -10;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1236 wlv.tocol = MAXCOL;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1237 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1238 else if (bot->col == MAXCOL)
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1239 wlv.tocol = MAXCOL;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1240 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1241 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1242 pos = *bot;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1243 if (*p_sel == 'e')
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1244 getvvcol(wp, &pos, (colnr_T *)&wlv.tocol,
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1245 NULL, NULL);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1246 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1247 {
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1248 getvvcol(wp, &pos, NULL, NULL,
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1249 (colnr_T *)&wlv.tocol);
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1250 ++wlv.tocol;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1251 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1252 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1253 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1254 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1255
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1256 // Check if the character under the cursor should not be inverted
18422
1848b3e07266 patch 8.1.2205: sign entry structure has confusing name
Bram Moolenaar <Bram@vim.org>
parents: 18390
diff changeset
1257 if (!highlight_match && lnum == curwin->w_cursor.lnum
1848b3e07266 patch 8.1.2205: sign entry structure has confusing name
Bram Moolenaar <Bram@vim.org>
parents: 18390
diff changeset
1258 && wp == curwin
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1259 #ifdef FEAT_GUI
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1260 && !gui.in_use
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1261 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1262 )
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1263 noinvcur = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1264
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1265 // if inverting in this line set area_highlighting
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1266 if (wlv.fromcol >= 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1267 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1268 area_highlighting = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1269 vi_attr = HL_ATTR(HLF_V);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1270 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1271 if ((clip_star.available && !clip_star.owned
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1272 && clip_isautosel_star())
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1273 || (clip_plus.available && !clip_plus.owned
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1274 && clip_isautosel_plus()))
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1275 vi_attr = HL_ATTR(HLF_VNC);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1276 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1277 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1278 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1279
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1280 // handle 'incsearch' and ":s///c" highlighting
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1281 else if (highlight_match
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1282 && wp == curwin
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1283 && lnum >= curwin->w_cursor.lnum
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1284 && lnum <= curwin->w_cursor.lnum + search_match_lines)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1285 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1286 if (lnum == curwin->w_cursor.lnum)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1287 getvcol(curwin, &(curwin->w_cursor),
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1288 (colnr_T *)&wlv.fromcol, NULL, NULL);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1289 else
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1290 wlv.fromcol = 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1291 if (lnum == curwin->w_cursor.lnum + search_match_lines)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1292 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1293 pos.lnum = lnum;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1294 pos.col = search_match_endcol;
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1295 getvcol(curwin, &pos, (colnr_T *)&wlv.tocol, NULL, NULL);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1296 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1297 else
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1298 wlv.tocol = MAXCOL;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1299 // do at least one character; happens when past end of line
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1300 if (wlv.fromcol == wlv.tocol && search_match_endcol)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1301 wlv.tocol = wlv.fromcol + 1;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1302 area_highlighting = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1303 vi_attr = HL_ATTR(HLF_I);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1304 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1305 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1306
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1307 #ifdef FEAT_DIFF
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1308 wlv.filler_lines = diff_check(wp, lnum);
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1309 if (wlv.filler_lines < 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1310 {
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1311 if (wlv.filler_lines == -1)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1312 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1313 if (diff_find_change(wp, lnum, &change_start, &change_end))
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1314 wlv.diff_hlf = HLF_ADD; // added line
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1315 else if (change_start == 0)
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1316 wlv.diff_hlf = HLF_TXD; // changed text
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1317 else
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1318 wlv.diff_hlf = HLF_CHD; // changed line
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1319 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1320 else
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1321 wlv.diff_hlf = HLF_ADD; // added line
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1322 wlv.filler_lines = 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1323 area_highlighting = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1324 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1325 if (lnum == wp->w_topline)
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1326 wlv.filler_lines = wp->w_topfill;
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1327 wlv.filler_todo = wlv.filler_lines;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1328 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1329
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1330 #ifdef FEAT_SIGNS
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1331 sign_present = buf_get_signattrs(wp, lnum, &wlv.sattr);
26690
84d60deb8f82 patch 8.2.3874: cannot highlight the number column for a sign
Bram Moolenaar <Bram@vim.org>
parents: 26384
diff changeset
1332 if (sign_present)
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1333 num_attr = wlv.sattr.sat_numhl;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1334 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1335
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1336 #ifdef LINE_ATTR
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1337 # ifdef FEAT_SIGNS
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1338 // If this line has a sign with line highlighting set line_attr.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1339 if (sign_present)
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1340 line_attr = wlv.sattr.sat_linehl;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1341 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1342 # if defined(FEAT_QUICKFIX)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1343 // Highlight the current line in the quickfix window.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1344 if (bt_quickfix(wp->w_buffer) && qf_current_entry(wp) == lnum)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1345 line_attr = HL_ATTR(HLF_QFL);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1346 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1347 if (line_attr != 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1348 area_highlighting = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1349 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1350
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1351 line = ml_get_buf(wp->w_buffer, lnum, FALSE);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1352 ptr = line;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1353
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1354 #ifdef FEAT_SPELL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1355 if (has_spell && !number_only)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1356 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1357 // For checking first word with a capital skip white space.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1358 if (cap_col == 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1359 cap_col = getwhitecols(line);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1360
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1361 // To be able to spell-check over line boundaries copy the end of the
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1362 // current line into nextline[]. Above the start of the next line was
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1363 // copied to nextline[SPWORDLEN].
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1364 if (nextline[SPWORDLEN] == NUL)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1365 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1366 // No next line or it is empty.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1367 nextlinecol = MAXCOL;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1368 nextline_idx = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1369 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1370 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1371 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1372 v = (long)STRLEN(line);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1373 if (v < SPWORDLEN)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1374 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1375 // Short line, use it completely and append the start of the
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1376 // next line.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1377 nextlinecol = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1378 mch_memmove(nextline, line, (size_t)v);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1379 STRMOVE(nextline + v, nextline + SPWORDLEN);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1380 nextline_idx = v + 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1381 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1382 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1383 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1384 // Long line, use only the last SPWORDLEN bytes.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1385 nextlinecol = v - SPWORDLEN;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1386 mch_memmove(nextline, line + nextlinecol, SPWORDLEN);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1387 nextline_idx = SPWORDLEN + 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1388 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1389 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1390 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1391 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1392
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1393 if (wp->w_p_list)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1394 {
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
1395 if (wp->w_lcs_chars.space
25778
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
1396 || wp->w_lcs_chars.multispace != NULL
29090
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
1397 || wp->w_lcs_chars.leadmultispace != NULL
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
1398 || wp->w_lcs_chars.trail
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
1399 || wp->w_lcs_chars.lead
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
1400 || wp->w_lcs_chars.nbsp)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1401 extra_check = TRUE;
23825
0bd44e94dd14 patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents: 22997
diff changeset
1402
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1403 // find start of trailing whitespace
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
1404 if (wp->w_lcs_chars.trail)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1405 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1406 trailcol = (colnr_T)STRLEN(ptr);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1407 while (trailcol > (colnr_T)0 && VIM_ISWHITE(ptr[trailcol - 1]))
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1408 --trailcol;
29413
34e93e046526 patch 9.0.0048: cursor in wrong column with mouse click after concealed text
Bram Moolenaar <Bram@vim.org>
parents: 29387
diff changeset
1409 trailcol += (colnr_T)(ptr - line);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1410 }
23825
0bd44e94dd14 patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents: 22997
diff changeset
1411 // find end of leading whitespace
29090
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
1412 if (wp->w_lcs_chars.lead || wp->w_lcs_chars.leadmultispace != NULL)
23825
0bd44e94dd14 patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents: 22997
diff changeset
1413 {
0bd44e94dd14 patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents: 22997
diff changeset
1414 leadcol = 0;
0bd44e94dd14 patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents: 22997
diff changeset
1415 while (VIM_ISWHITE(ptr[leadcol]))
0bd44e94dd14 patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents: 22997
diff changeset
1416 ++leadcol;
0bd44e94dd14 patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents: 22997
diff changeset
1417 if (ptr[leadcol] == NUL)
0bd44e94dd14 patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents: 22997
diff changeset
1418 // in a line full of spaces all of them are treated as trailing
0bd44e94dd14 patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents: 22997
diff changeset
1419 leadcol = (colnr_T)0;
0bd44e94dd14 patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents: 22997
diff changeset
1420 else
0bd44e94dd14 patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents: 22997
diff changeset
1421 // keep track of the first column not filled with spaces
29413
34e93e046526 patch 9.0.0048: cursor in wrong column with mouse click after concealed text
Bram Moolenaar <Bram@vim.org>
parents: 29387
diff changeset
1422 leadcol += (colnr_T)(ptr - line) + 1;
23825
0bd44e94dd14 patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents: 22997
diff changeset
1423 }
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1424 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1425
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1426 wlv.wcr_attr = get_wcr_attr(wp);
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1427 if (wlv.wcr_attr != 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1428 {
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1429 wlv.win_attr = wlv.wcr_attr;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1430 area_highlighting = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1431 }
18317
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
1432
18763
49b78d6465e5 patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents: 18720
diff changeset
1433 #ifdef FEAT_PROP_POPUP
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1434 if (WIN_IS_POPUP(wp))
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1435 wlv.screen_line_flags |= SLF_POPUP;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1436 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1437
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1438 // 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1439 // first character to be displayed.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1440 if (wp->w_p_wrap)
30610
6c6ac189a05f patch 9.0.0640: cannot scroll by screen line if a line wraps
Bram Moolenaar <Bram@vim.org>
parents: 30509
diff changeset
1441 v = startrow == 0 ? wp->w_skipcol : 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1442 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1443 v = wp->w_leftcol;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1444 if (v > 0 && !number_only)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1445 {
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1446 char_u *prev_ptr = ptr;
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1447 chartabsize_T cts;
29461
69693a62f2f4 patch 9.0.0072: compiler warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents: 29451
diff changeset
1448 int charsize = 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1449
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1450 init_chartabsize_arg(&cts, wp, lnum, wlv.vcol, line, ptr);
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1451 while (cts.cts_vcol < v && *cts.cts_ptr != NUL)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1452 {
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1453 charsize = win_lbr_chartabsize(&cts, NULL);
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1454 cts.cts_vcol += charsize;
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1455 prev_ptr = cts.cts_ptr;
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1456 MB_PTR_ADV(cts.cts_ptr);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1457 }
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1458 wlv.vcol = cts.cts_vcol;
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1459 ptr = cts.cts_ptr;
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1460 clear_chartabsize_arg(&cts);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1461
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1462 // When:
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1463 // - 'cuc' is set, or
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1464 // - 'colorcolumn' is set, or
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1465 // - 'virtualedit' is set, or
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1466 // - the visual mode is active,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1467 // the end of the line may be before the start of the displayed part.
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1468 if (wlv.vcol < v && (
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1469 #ifdef FEAT_SYN_HL
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1470 wp->w_p_cuc || wlv.draw_color_col ||
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1471 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1472 virtual_active() ||
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1473 (VIsual_active && wp->w_buffer == curwin->w_buffer)))
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1474 wlv.vcol = v;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1475
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1476 // Handle a character that's not completely on the screen: Put ptr at
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1477 // that character but skip the first few screen characters.
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1478 if (wlv.vcol > v)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1479 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1480 wlv.vcol -= charsize;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1481 ptr = prev_ptr;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1482 // If the character fits on the screen, don't need to skip it.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1483 // Except for a TAB.
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1484 if (((*mb_ptr2cells)(ptr) >= charsize || *ptr == TAB)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1485 && wlv.col == 0)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1486 n_skip = v - wlv.vcol;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1487 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1488
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1489 // Adjust for when the inverted text is before the screen,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1490 // and when the start of the inverted text is before the screen.
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1491 if (wlv.tocol <= wlv.vcol)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1492 wlv.fromcol = 0;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1493 else if (wlv.fromcol >= 0 && wlv.fromcol < wlv.vcol)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1494 wlv.fromcol = wlv.vcol;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1495
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1496 #ifdef FEAT_LINEBREAK
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1497 // When w_skipcol is non-zero, first line needs 'showbreak'
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1498 if (wp->w_p_wrap)
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1499 wlv.need_showbreak = TRUE;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1500 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1501 #ifdef FEAT_SPELL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1502 // When spell checking a word we need to figure out the start of the
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1503 // word and if it's badly spelled or not.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1504 if (has_spell)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1505 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1506 int len;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1507 colnr_T linecol = (colnr_T)(ptr - line);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1508 hlf_T spell_hlf = HLF_COUNT;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1509
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1510 pos = wp->w_cursor;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1511 wp->w_cursor.lnum = lnum;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1512 wp->w_cursor.col = linecol;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1513 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1514
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1515 // spell_move_to() may call ml_get() and make "line" invalid
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1516 line = ml_get_buf(wp->w_buffer, lnum, FALSE);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1517 ptr = line + linecol;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1518
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1519 if (len == 0 || (int)wp->w_cursor.col > ptr - line)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1520 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1521 // no bad word found at line start, don't check until end of a
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1522 // word
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1523 spell_hlf = HLF_COUNT;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1524 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1525 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1526 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1527 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1528 // bad word found, use attributes until end of word
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1529 word_end = wp->w_cursor.col + len + 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1530
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1531 // Turn index into actual attributes.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1532 if (spell_hlf != HLF_COUNT)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1533 spell_attr = highlight_attr[spell_hlf];
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1534 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1535 wp->w_cursor = pos;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1536
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1537 # ifdef FEAT_SYN_HL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1538 // Need to restart syntax highlighting for this line.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1539 if (has_syntax)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1540 syntax_start(wp, lnum);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1541 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1542 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1543 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1544 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1545
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1546 // Correct highlighting for cursor that can't be disabled.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1547 // Avoids having to check this for each character.
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1548 if (wlv.fromcol >= 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1549 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1550 if (noinvcur)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1551 {
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1552 if ((colnr_T)wlv.fromcol == wp->w_virtcol)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1553 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1554 // highlighting starts at cursor, let it start just after the
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1555 // cursor
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1556 fromcol_prev = wlv.fromcol;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1557 wlv.fromcol = -1;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1558 }
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1559 else if ((colnr_T)wlv.fromcol < wp->w_virtcol)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1560 // restart highlighting after the cursor
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1561 fromcol_prev = wp->w_virtcol;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1562 }
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1563 if (wlv.fromcol >= wlv.tocol)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1564 wlv.fromcol = -1;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1565 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1566
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1567 #ifdef FEAT_SEARCH_EXTRA
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1568 if (!number_only)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1569 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1570 v = (long)(ptr - line);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1571 area_highlighting |= prepare_search_hl_line(wp, lnum, (colnr_T)v,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1572 &line, &screen_search_hl,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1573 &search_attr);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1574 ptr = line + v; // "line" may have been updated
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1575 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1576 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1577
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1578 #ifdef FEAT_SYN_HL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1579 // Cursor line highlighting for 'cursorline' in the current window.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1580 if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1581 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1582 // Do not show the cursor line in the text when Visual mode is active,
28177
f04a3ec65e2d patch 8.2.4614: redrawing too much when 'cursorline' is set
Bram Moolenaar <Bram@vim.org>
parents: 28169
diff changeset
1583 // because it's not clear what is selected then.
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1584 if (!(wp == curwin && VIsual_active)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1585 && wp->w_p_culopt_flags != CULOPT_NBR)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1586 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1587 wlv.cul_screenline = (wp->w_p_wrap
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1588 && (wp->w_p_culopt_flags & CULOPT_SCRLINE));
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1589
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1590 // Only set line_attr here when "screenline" is not present in
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1591 // 'cursorlineopt'. Otherwise it's done later.
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1592 if (!wlv.cul_screenline)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1593 {
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
1594 wlv.cul_attr = HL_ATTR(HLF_CUL);
22013
125051dff419 patch 8.2.1556: cursorline highlighting always overrules sign highlighting
Bram Moolenaar <Bram@vim.org>
parents: 21014
diff changeset
1595 # ifdef FEAT_SIGNS
125051dff419 patch 8.2.1556: cursorline highlighting always overrules sign highlighting
Bram Moolenaar <Bram@vim.org>
parents: 21014
diff changeset
1596 // Combine the 'cursorline' and sign highlighting, depending on
125051dff419 patch 8.2.1556: cursorline highlighting always overrules sign highlighting
Bram Moolenaar <Bram@vim.org>
parents: 21014
diff changeset
1597 // the sign priority.
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1598 if (sign_present && wlv.sattr.sat_linehl > 0)
22013
125051dff419 patch 8.2.1556: cursorline highlighting always overrules sign highlighting
Bram Moolenaar <Bram@vim.org>
parents: 21014
diff changeset
1599 {
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1600 if (wlv.sattr.sat_priority >= 100)
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
1601 line_attr = hl_combine_attr(wlv.cul_attr, line_attr);
22013
125051dff419 patch 8.2.1556: cursorline highlighting always overrules sign highlighting
Bram Moolenaar <Bram@vim.org>
parents: 21014
diff changeset
1602 else
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
1603 line_attr = hl_combine_attr(line_attr, wlv.cul_attr);
22013
125051dff419 patch 8.2.1556: cursorline highlighting always overrules sign highlighting
Bram Moolenaar <Bram@vim.org>
parents: 21014
diff changeset
1604 }
125051dff419 patch 8.2.1556: cursorline highlighting always overrules sign highlighting
Bram Moolenaar <Bram@vim.org>
parents: 21014
diff changeset
1605 else
125051dff419 patch 8.2.1556: cursorline highlighting always overrules sign highlighting
Bram Moolenaar <Bram@vim.org>
parents: 21014
diff changeset
1606 # endif
29379
4ad168b282bd patch 9.0.0032: in the quickfix window 'cursorline' overrules QuickFixLine
Bram Moolenaar <Bram@vim.org>
parents: 29111
diff changeset
1607 # if defined(FEAT_QUICKFIX)
29662
b03c47618895 patch 9.0.0171: quickfix line highlight is overruled by 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents: 29643
diff changeset
1608 // let the line attribute overrule 'cursorline', otherwise
b03c47618895 patch 9.0.0171: quickfix line highlight is overruled by 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents: 29643
diff changeset
1609 // it disappears when both have background set;
b03c47618895 patch 9.0.0171: quickfix line highlight is overruled by 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents: 29643
diff changeset
1610 // 'cursorline' can use underline or bold to make it show
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
1611 line_attr = hl_combine_attr(wlv.cul_attr, line_attr);
29379
4ad168b282bd patch 9.0.0032: in the quickfix window 'cursorline' overrules QuickFixLine
Bram Moolenaar <Bram@vim.org>
parents: 29111
diff changeset
1612 # else
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
1613 line_attr = wlv.cul_attr;
29379
4ad168b282bd patch 9.0.0032: in the quickfix window 'cursorline' overrules QuickFixLine
Bram Moolenaar <Bram@vim.org>
parents: 29111
diff changeset
1614 # endif
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1615 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1616 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1617 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1618 line_attr_save = line_attr;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1619 margin_columns_win(wp, &left_curline_col, &right_curline_col);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1620 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1621 area_highlighting = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1622 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1623 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1624 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1625
18763
49b78d6465e5 patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents: 18720
diff changeset
1626 #ifdef FEAT_PROP_POPUP
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1627 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1628 char_u *prop_start;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1629
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1630 text_prop_count = get_text_props(wp->w_buffer, lnum,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1631 &prop_start, FALSE);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1632 if (text_prop_count > 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1633 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1634 // Make a copy of the properties, so that they are properly
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1635 // aligned.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1636 text_props = ALLOC_MULT(textprop_T, text_prop_count);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1637 if (text_props != NULL)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1638 mch_memmove(text_props, prop_start,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1639 text_prop_count * sizeof(textprop_T));
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1640
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1641 // Allocate an array for the indexes.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1642 text_prop_idxs = ALLOC_MULT(int, text_prop_count);
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1643 if (text_prop_idxs == NULL)
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1644 VIM_CLEAR(text_props);
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1645
30397
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
1646 if (text_props != NULL)
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
1647 {
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
1648 area_highlighting = TRUE;
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
1649 extra_check = TRUE;
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
1650 for (int i = 0; i < text_prop_count; ++i)
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
1651 if (text_props[i].tp_flags & TP_FLAG_ALIGN_ABOVE)
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
1652 ++wlv.text_prop_above_count;
3f2fcc517d79 patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents: 30395
diff changeset
1653 }
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1654 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1655 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1656 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1657
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1658 win_line_start(wp, &wlv, FALSE);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1659
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1660 // Repeat for the whole displayed line.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1661 for (;;)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1662 {
29413
34e93e046526 patch 9.0.0048: cursor in wrong column with mouse click after concealed text
Bram Moolenaar <Bram@vim.org>
parents: 29387
diff changeset
1663 char_u *prev_ptr = ptr;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1664 #if defined(FEAT_CONCEAL) || defined(FEAT_SEARCH_EXTRA)
29413
34e93e046526 patch 9.0.0048: cursor in wrong column with mouse click after concealed text
Bram Moolenaar <Bram@vim.org>
parents: 29387
diff changeset
1665 int has_match_conc = 0; // match wants to conceal
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1666 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1667 #ifdef FEAT_CONCEAL
29413
34e93e046526 patch 9.0.0048: cursor in wrong column with mouse click after concealed text
Bram Moolenaar <Bram@vim.org>
parents: 29387
diff changeset
1668 int did_decrement_ptr = FALSE;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1669 #endif
29413
34e93e046526 patch 9.0.0048: cursor in wrong column with mouse click after concealed text
Bram Moolenaar <Bram@vim.org>
parents: 29387
diff changeset
1670
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1671 // Skip this quickly when working on the text.
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1672 if (wlv.draw_state != WL_LINE)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1673 {
25517
b04e76e66128 patch 8.2.3295: 'cursorline' should not apply to 'breakindent'
Bram Moolenaar <Bram@vim.org>
parents: 25170
diff changeset
1674 #ifdef FEAT_SYN_HL
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1675 if (wlv.cul_screenline)
25517
b04e76e66128 patch 8.2.3295: 'cursorline' should not apply to 'breakindent'
Bram Moolenaar <Bram@vim.org>
parents: 25170
diff changeset
1676 {
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
1677 wlv.cul_attr = 0;
25517
b04e76e66128 patch 8.2.3295: 'cursorline' should not apply to 'breakindent'
Bram Moolenaar <Bram@vim.org>
parents: 25170
diff changeset
1678 line_attr = line_attr_save;
b04e76e66128 patch 8.2.3295: 'cursorline' should not apply to 'breakindent'
Bram Moolenaar <Bram@vim.org>
parents: 25170
diff changeset
1679 }
b04e76e66128 patch 8.2.3295: 'cursorline' should not apply to 'breakindent'
Bram Moolenaar <Bram@vim.org>
parents: 25170
diff changeset
1680 #endif
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1681 #ifdef FEAT_CMDWIN
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1682 if (wlv.draw_state == WL_CMDLINE - 1 && wlv.n_extra == 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1683 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1684 wlv.draw_state = WL_CMDLINE;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1685 if (cmdwin_type != 0 && wp == curwin)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1686 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1687 // Draw the cmdline character.
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1688 wlv.n_extra = 1;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1689 wlv.c_extra = cmdwin_type;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1690 wlv.c_final = NUL;
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1691 wlv.char_attr =
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1692 hl_combine_attr(wlv.wcr_attr, HL_ATTR(HLF_AT));
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1693 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1694 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1695 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1696 #ifdef FEAT_FOLDING
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1697 if (wlv.draw_state == WL_FOLD - 1 && wlv.n_extra == 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1698 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1699 wlv.draw_state = WL_FOLD;
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1700 handle_foldcolumn(wp, &wlv);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1701 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1702 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1703 #ifdef FEAT_SIGNS
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1704 if (wlv.draw_state == WL_SIGN - 1 && wlv.n_extra == 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1705 {
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1706 // Show the sign column when desired or when using Netbeans.
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1707 wlv.draw_state = WL_SIGN;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1708 if (signcolumn_on(wp))
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1709 get_sign_display_info(FALSE, wp, &wlv);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1710 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1711 #endif
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1712 if (wlv.draw_state == WL_NR - 1 && wlv.n_extra == 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1713 {
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1714 // Show the line number, if desired.
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1715 wlv.draw_state = WL_NR;
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1716 handle_lnum_col(wp, &wlv, sign_present, num_attr);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1717 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1718 #ifdef FEAT_LINEBREAK
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1719 // Check if 'breakindent' applies and show it.
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1720 // May change wlv.draw_state to WL_BRI or WL_BRI - 1.
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1721 if (wlv.n_extra == 0)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1722 handle_breakindent(wp, &wlv);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1723 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1724 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF)
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1725 if (wlv.draw_state == WL_SBR - 1 && wlv.n_extra == 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1726 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1727 wlv.draw_state = WL_SBR;
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
1728 handle_showbreak_and_filler(wp, &wlv);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1729 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1730 #endif
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1731 if (wlv.draw_state == WL_LINE - 1 && wlv.n_extra == 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1732 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1733 wlv.draw_state = WL_LINE;
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
1734 win_line_continue(&wlv); // use wlv.saved_ values
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1735 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1736 }
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
1737
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1738 #ifdef FEAT_SYN_HL
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1739 if (wlv.cul_screenline && wlv.draw_state == WL_LINE
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1740 && wlv.vcol >= left_curline_col
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1741 && wlv.vcol < right_curline_col)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1742 {
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
1743 wlv.cul_attr = HL_ATTR(HLF_CUL);
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
1744 line_attr = wlv.cul_attr;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1745 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1746 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1747
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1748 // When still displaying '$' of change command, stop at cursor.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1749 // When only displaying the (relative) line number and that's done,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1750 // stop here.
20905
802bf80bcfe4 patch 8.2.1004: line numbers below filler lines not always updated
Bram Moolenaar <Bram@vim.org>
parents: 20782
diff changeset
1751 if (((dollar_vcol >= 0 && wp == curwin
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1752 && lnum == wp->w_cursor.lnum && wlv.vcol >= (long)wp->w_virtcol)
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1753 || (number_only && wlv.draw_state > WL_NR))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1754 #ifdef FEAT_DIFF
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
1755 && wlv.filler_todo <= 0
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1756 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1757 )
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1758 {
30628
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
1759 wlv_screen_line(wp, &wlv, TRUE);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1760 // Pretend we have finished updating the window. Except when
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1761 // 'cursorcolumn' is set.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1762 #ifdef FEAT_SYN_HL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1763 if (wp->w_p_cuc)
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1764 wlv.row = wp->w_cline_row + wp->w_cline_height;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1765 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1766 #endif
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1767 wlv.row = wp->w_height;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1768 break;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1769 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1770
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1771 if (wlv.draw_state == WL_LINE && (area_highlighting || extra_check))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1772 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1773 // handle Visual or match highlighting in this line
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1774 if (wlv.vcol == wlv.fromcol
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1775 || (has_mbyte && wlv.vcol + 1 == wlv.fromcol
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1776 && wlv.n_extra == 0
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1777 && (*mb_ptr2cells)(ptr) > 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1778 || ((int)vcol_prev == fromcol_prev
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1779 && vcol_prev < wlv.vcol // not at margin
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1780 && wlv.vcol < wlv.tocol))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1781 area_attr = vi_attr; // start highlighting
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1782 else if (area_attr != 0
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1783 && (wlv.vcol == wlv.tocol
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1784 || (noinvcur && (colnr_T)wlv.vcol == wp->w_virtcol)))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1785 area_attr = 0; // stop highlighting
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1786
18763
49b78d6465e5 patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents: 18720
diff changeset
1787 #ifdef FEAT_PROP_POPUP
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1788 if (text_props != NULL)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1789 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1790 int pi;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1791 int bcol = (int)(ptr - line);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1792
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1793 if (wlv.n_extra > 0
26338
4cf208415483 patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents: 26334
diff changeset
1794 # ifdef FEAT_LINEBREAK
4cf208415483 patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents: 26334
diff changeset
1795 && !in_linebreak
4cf208415483 patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents: 26334
diff changeset
1796 # endif
4cf208415483 patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents: 26334
diff changeset
1797 )
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1798 --bcol; // still working on the previous char, e.g. Tab
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1799
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1800 // Check if any active property ends.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1801 for (pi = 0; pi < text_props_active; ++pi)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1802 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1803 int tpi = text_prop_idxs[pi];
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1804
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1805 if (text_props[tpi].tp_col != MAXCOL
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1806 && bcol >= text_props[tpi].tp_col - 1
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1807 + text_props[tpi].tp_len)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1808 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1809 if (pi + 1 < text_props_active)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1810 mch_memmove(text_prop_idxs + pi,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1811 text_prop_idxs + pi + 1,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1812 sizeof(int)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1813 * (text_props_active - (pi + 1)));
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1814 --text_props_active;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1815 --pi;
26338
4cf208415483 patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents: 26334
diff changeset
1816 # ifdef FEAT_LINEBREAK
4cf208415483 patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents: 26334
diff changeset
1817 // not exactly right but should work in most cases
30039
4b9b237d1211 patch 9.0.0357: 'linebreak' interferes with text property highlight
Bram Moolenaar <Bram@vim.org>
parents: 29918
diff changeset
1818 if (in_linebreak && syntax_attr == text_prop_attr_comb)
26338
4cf208415483 patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents: 26334
diff changeset
1819 syntax_attr = 0;
4cf208415483 patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents: 26334
diff changeset
1820 # endif
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1821 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1822 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1823
26384
e624b4ddbdf0 patch 8.2.3723: when using 'linebreak' a text property starts too early
Bram Moolenaar <Bram@vim.org>
parents: 26374
diff changeset
1824 # ifdef FEAT_LINEBREAK
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1825 if (wlv.n_extra > 0 && in_linebreak)
26384
e624b4ddbdf0 patch 8.2.3723: when using 'linebreak' a text property starts too early
Bram Moolenaar <Bram@vim.org>
parents: 26374
diff changeset
1826 // not on the next char yet, don't start another prop
e624b4ddbdf0 patch 8.2.3723: when using 'linebreak' a text property starts too early
Bram Moolenaar <Bram@vim.org>
parents: 26374
diff changeset
1827 --bcol;
e624b4ddbdf0 patch 8.2.3723: when using 'linebreak' a text property starts too early
Bram Moolenaar <Bram@vim.org>
parents: 26374
diff changeset
1828 # endif
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1829 // Add any text property that starts in this column.
29635
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
1830 // With 'nowrap' and not in the first screen line only "below"
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
1831 // text prop can show.
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1832 while (text_prop_next < text_prop_count
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
1833 && (text_props[text_prop_next].tp_col == MAXCOL
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
1834 ? ((*ptr == NUL
29635
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
1835 && (wp->w_p_wrap
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
1836 || wlv.row == startrow
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
1837 || (text_props[text_prop_next].tp_flags
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
1838 & TP_FLAG_ALIGN_BELOW)))
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
1839 || (bcol == 0 &&
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
1840 (text_props[text_prop_next].tp_flags
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
1841 & TP_FLAG_ALIGN_ABOVE)))
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
1842 : bcol >= text_props[text_prop_next].tp_col - 1))
23901
6793853063e5 patch 8.2.2493: text property for text left of window shows up
Bram Moolenaar <Bram@vim.org>
parents: 23825
diff changeset
1843 {
29722
f88671dbe88b patch 9.0.0201: CursorLine highlight overrules virtual text highlight
Bram Moolenaar <Bram@vim.org>
parents: 29706
diff changeset
1844 if (text_props[text_prop_next].tp_col == MAXCOL
29740
b167c91b5f6b patch 9.0.0210: 'list' mode does not work properly with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29738
diff changeset
1845 && *ptr == NUL && wp->w_p_list && lcs_eol_one > 0)
b167c91b5f6b patch 9.0.0210: 'list' mode does not work properly with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29738
diff changeset
1846 {
b167c91b5f6b patch 9.0.0210: 'list' mode does not work properly with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29738
diff changeset
1847 // first display the '$' after the line
b167c91b5f6b patch 9.0.0210: 'list' mode does not work properly with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29738
diff changeset
1848 text_prop_follows = TRUE;
b167c91b5f6b patch 9.0.0210: 'list' mode does not work properly with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29738
diff changeset
1849 break;
b167c91b5f6b patch 9.0.0210: 'list' mode does not work properly with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29738
diff changeset
1850 }
b167c91b5f6b patch 9.0.0210: 'list' mode does not work properly with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29738
diff changeset
1851 if (text_props[text_prop_next].tp_col == MAXCOL
29722
f88671dbe88b patch 9.0.0201: CursorLine highlight overrules virtual text highlight
Bram Moolenaar <Bram@vim.org>
parents: 29706
diff changeset
1852 || bcol <= text_props[text_prop_next].tp_col - 1
23901
6793853063e5 patch 8.2.2493: text property for text left of window shows up
Bram Moolenaar <Bram@vim.org>
parents: 23825
diff changeset
1853 + text_props[text_prop_next].tp_len)
6793853063e5 patch 8.2.2493: text property for text left of window shows up
Bram Moolenaar <Bram@vim.org>
parents: 23825
diff changeset
1854 text_prop_idxs[text_props_active++] = text_prop_next;
6793853063e5 patch 8.2.2493: text property for text left of window shows up
Bram Moolenaar <Bram@vim.org>
parents: 23825
diff changeset
1855 ++text_prop_next;
6793853063e5 patch 8.2.2493: text property for text left of window shows up
Bram Moolenaar <Bram@vim.org>
parents: 23825
diff changeset
1856 }
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1857
29736
65348cc3b656 patch 9.0.0208: the override flag has no effect for virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29722
diff changeset
1858 if (wlv.n_extra == 0 || !extra_for_textprop)
65348cc3b656 patch 9.0.0208: the override flag has no effect for virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29722
diff changeset
1859 {
65348cc3b656 patch 9.0.0208: the override flag has no effect for virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29722
diff changeset
1860 text_prop_attr = 0;
30039
4b9b237d1211 patch 9.0.0357: 'linebreak' interferes with text property highlight
Bram Moolenaar <Bram@vim.org>
parents: 29918
diff changeset
1861 text_prop_attr_comb = 0;
29736
65348cc3b656 patch 9.0.0208: the override flag has no effect for virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29722
diff changeset
1862 text_prop_flags = 0;
65348cc3b656 patch 9.0.0208: the override flag has no effect for virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29722
diff changeset
1863 text_prop_type = NULL;
65348cc3b656 patch 9.0.0208: the override flag has no effect for virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29722
diff changeset
1864 text_prop_id = 0;
65348cc3b656 patch 9.0.0208: the override flag has no effect for virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29722
diff changeset
1865 }
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1866 if (text_props_active > 0 && wlv.n_extra == 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1867 {
29467
5b3819ce0865 patch 9.0.0075: some compilers warn for using an uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents: 29461
diff changeset
1868 int used_tpi = -1;
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1869 int used_attr = 0;
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
1870 int other_tpi = -1;
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1871
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1872 // Sort the properties on priority and/or starting last.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1873 // Then combine the attributes, highest priority last.
30231
0d084880276a patch 9.0.0451: virtual text "above" does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30213
diff changeset
1874 text_prop_above = FALSE;
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
1875 text_prop_follows = FALSE;
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1876 sort_text_props(wp->w_buffer, text_props,
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1877 text_prop_idxs, text_props_active);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1878
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1879 for (pi = 0; pi < text_props_active; ++pi)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1880 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1881 int tpi = text_prop_idxs[pi];
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1882 proptype_T *pt = text_prop_type_by_id(
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1883 wp->w_buffer, text_props[tpi].tp_type);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1884
29692
042f357b455d patch 9.0.0186: virtual text without highlighting does not show
Bram Moolenaar <Bram@vim.org>
parents: 29690
diff changeset
1885 if (pt != NULL && (pt->pt_hl_id > 0
042f357b455d patch 9.0.0186: virtual text without highlighting does not show
Bram Moolenaar <Bram@vim.org>
parents: 29690
diff changeset
1886 || text_props[tpi].tp_id < 0)
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1887 && text_props[tpi].tp_id != -MAXCOL)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1888 {
29698
b944b7fb563b patch 9.0.0189: invalid memory access for text prop without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29692
diff changeset
1889 if (pt->pt_hl_id > 0)
b944b7fb563b patch 9.0.0189: invalid memory access for text prop without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29692
diff changeset
1890 used_attr = syn_id2attr(pt->pt_hl_id);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1891 text_prop_type = pt;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1892 text_prop_attr =
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1893 hl_combine_attr(text_prop_attr, used_attr);
29611
608d5221a3e5 patch 9.0.0146: missing part of change for "override" flag
Bram Moolenaar <Bram@vim.org>
parents: 29597
diff changeset
1894 text_prop_flags = pt->pt_flags;
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1895 text_prop_id = text_props[tpi].tp_id;
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
1896 other_tpi = used_tpi;
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1897 used_tpi = tpi;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1898 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1899 }
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
1900 if (text_prop_id < 0 && used_tpi >= 0
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1901 && -text_prop_id
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1902 <= wp->w_buffer->b_textprop_text.ga_len)
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1903 {
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1904 textprop_T *tp = &text_props[used_tpi];
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1905 char_u *p = ((char_u **)wp->w_buffer
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1906 ->b_textprop_text.ga_data)[
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1907 -text_prop_id - 1];
30231
0d084880276a patch 9.0.0451: virtual text "above" does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30213
diff changeset
1908 int above = (tp->tp_flags
0d084880276a patch 9.0.0451: virtual text "above" does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30213
diff changeset
1909 & TP_FLAG_ALIGN_ABOVE);
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1910
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1911 // reset the ID in the copy to avoid it being used
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1912 // again
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1913 tp->tp_id = -MAXCOL;
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1914
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1915 if (p != NULL)
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1916 {
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1917 int right = (tp->tp_flags
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
1918 & TP_FLAG_ALIGN_RIGHT);
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1919 int below = (tp->tp_flags
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
1920 & TP_FLAG_ALIGN_BELOW);
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1921 int wrap = (tp->tp_flags & TP_FLAG_WRAP);
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1922 int padding = tp->tp_col == MAXCOL
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1923 && tp->tp_len > 1
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1924 ? tp->tp_len - 1 : 0;
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
1925
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1926 // Insert virtual text before the current
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1927 // character, or add after the end of the line.
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1928 wlv.p_extra = p;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1929 wlv.c_extra = NUL;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1930 wlv.c_final = NUL;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1931 wlv.n_extra = (int)STRLEN(p);
29736
65348cc3b656 patch 9.0.0208: the override flag has no effect for virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29722
diff changeset
1932 extra_for_textprop = TRUE;
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1933 extra_attr = used_attr;
29583
32aee589fc9a patch 9.0.0132: multi-byte characters in virtual text not handled correctly
Bram Moolenaar <Bram@vim.org>
parents: 29579
diff changeset
1934 n_attr = mb_charlen(p);
30233
8d660a45299f patch 9.0.0452: Visual highlighting extends into virtual text prop
Bram Moolenaar <Bram@vim.org>
parents: 30231
diff changeset
1935 // restore search_attr and area_attr when n_extra
8d660a45299f patch 9.0.0452: Visual highlighting extends into virtual text prop
Bram Moolenaar <Bram@vim.org>
parents: 30231
diff changeset
1936 // is down to zero
29706
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
1937 saved_search_attr = search_attr;
30233
8d660a45299f patch 9.0.0452: Visual highlighting extends into virtual text prop
Bram Moolenaar <Bram@vim.org>
parents: 30231
diff changeset
1938 saved_area_attr = area_attr;
8d660a45299f patch 9.0.0452: Visual highlighting extends into virtual text prop
Bram Moolenaar <Bram@vim.org>
parents: 30231
diff changeset
1939 search_attr = 0;
8d660a45299f patch 9.0.0452: Visual highlighting extends into virtual text prop
Bram Moolenaar <Bram@vim.org>
parents: 30231
diff changeset
1940 area_attr = 0;
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1941 text_prop_attr = 0;
30039
4b9b237d1211 patch 9.0.0357: 'linebreak' interferes with text property highlight
Bram Moolenaar <Bram@vim.org>
parents: 29918
diff changeset
1942 text_prop_attr_comb = 0;
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
1943 if (*ptr == NUL)
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
1944 // don't combine char attr after EOL
29611
608d5221a3e5 patch 9.0.0146: missing part of change for "override" flag
Bram Moolenaar <Bram@vim.org>
parents: 29597
diff changeset
1945 text_prop_flags &= ~PT_FLAG_COMBINE;
29615
bab343b21da8 patch 9.0.0148: a "below" aligned text property gets 'showbreak' displayed
Bram Moolenaar <Bram@vim.org>
parents: 29611
diff changeset
1946 #ifdef FEAT_LINEBREAK
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
1947 if (above || below || right || !wrap)
29615
bab343b21da8 patch 9.0.0148: a "below" aligned text property gets 'showbreak' displayed
Bram Moolenaar <Bram@vim.org>
parents: 29611
diff changeset
1948 {
bab343b21da8 patch 9.0.0148: a "below" aligned text property gets 'showbreak' displayed
Bram Moolenaar <Bram@vim.org>
parents: 29611
diff changeset
1949 // no 'showbreak' before "below" text property
30205
ed6f3d2593df patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents: 30039
diff changeset
1950 // or after "above" or "right" text property
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1951 wlv.need_showbreak = FALSE;
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
1952 wlv.dont_use_showbreak = TRUE;
29615
bab343b21da8 patch 9.0.0148: a "below" aligned text property gets 'showbreak' displayed
Bram Moolenaar <Bram@vim.org>
parents: 29611
diff changeset
1953 }
bab343b21da8 patch 9.0.0148: a "below" aligned text property gets 'showbreak' displayed
Bram Moolenaar <Bram@vim.org>
parents: 29611
diff changeset
1954 #endif
30213
4fedacdad3b4 patch 9.0.0442: virtual text "above" doesn't handel line numbers
Bram Moolenaar <Bram@vim.org>
parents: 30205
diff changeset
1955 if ((right || above || below || !wrap
4fedacdad3b4 patch 9.0.0442: virtual text "above" doesn't handel line numbers
Bram Moolenaar <Bram@vim.org>
parents: 30205
diff changeset
1956 || padding > 0) && wp->w_width > 2)
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
1957 {
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1958 char_u *prev_p_extra = wlv.p_extra;
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1959 int start_line;
29740
b167c91b5f6b patch 9.0.0210: 'list' mode does not work properly with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29738
diff changeset
1960
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1961 // Take care of padding, right-align and
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1962 // truncation.
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1963 // Shared with win_lbr_chartabsize(), must do
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1964 // exactly the same.
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1965 start_line = text_prop_position(wp, tp,
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1966 wlv.col,
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1967 &wlv.n_extra, &wlv.p_extra,
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1968 &n_attr, &n_attr_skip);
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1969 if (wlv.p_extra != prev_p_extra)
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1970 {
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1971 // wlv.p_extra was allocated
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1972 vim_free(p_extra_free2);
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1973 p_extra_free2 = wlv.p_extra;
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
1974 }
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1975
30273
5f112a0b4da1 patch 9.0.0472: virtual text "below" doesn't show in list mode
Bram Moolenaar <Bram@vim.org>
parents: 30233
diff changeset
1976 if (lcs_eol_one < 0 && wlv.col
5f112a0b4da1 patch 9.0.0472: virtual text "below" doesn't show in list mode
Bram Moolenaar <Bram@vim.org>
parents: 30233
diff changeset
1977 + wlv.n_extra - 2 > wp->w_width)
5f112a0b4da1 patch 9.0.0472: virtual text "below" doesn't show in list mode
Bram Moolenaar <Bram@vim.org>
parents: 30233
diff changeset
1978 // don't bail out at end of line
5f112a0b4da1 patch 9.0.0472: virtual text "below" doesn't show in list mode
Bram Moolenaar <Bram@vim.org>
parents: 30233
diff changeset
1979 lcs_eol_one = 0;
5f112a0b4da1 patch 9.0.0472: virtual text "below" doesn't show in list mode
Bram Moolenaar <Bram@vim.org>
parents: 30233
diff changeset
1980
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1981 // When 'wrap' is off then for "below" we need
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1982 // to start a new line explictly.
29816
bbe62ea78aac patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents: 29808
diff changeset
1983 if (start_line)
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1984 {
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1985 draw_screen_line(wp, &wlv);
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1986
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1987 // When line got too long for screen break
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1988 // here.
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1989 if (wlv.row == endrow)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1990 {
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1991 ++wlv.row;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1992 break;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1993 }
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1994 win_line_start(wp, &wlv, TRUE);
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
1995 continue;
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
1996 }
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
1997 }
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
1998 }
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
1999
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
2000 // If another text prop follows the condition below at
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
2001 // the last window column must know.
30231
0d084880276a patch 9.0.0451: virtual text "above" does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30213
diff changeset
2002 // If this is an "above" text prop and 'nowrap' the we
0d084880276a patch 9.0.0451: virtual text "above" does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30213
diff changeset
2003 // must wrap anyway.
0d084880276a patch 9.0.0451: virtual text "above" does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30213
diff changeset
2004 text_prop_above = above;
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
2005 text_prop_follows = other_tpi != -1;
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
2006 }
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2007 }
29597
f2d7f20d83c3 patch 9.0.0139: truncating virtual text after a line not implemented
Bram Moolenaar <Bram@vim.org>
parents: 29583
diff changeset
2008 else if (text_prop_next < text_prop_count
f2d7f20d83c3 patch 9.0.0139: truncating virtual text after a line not implemented
Bram Moolenaar <Bram@vim.org>
parents: 29583
diff changeset
2009 && text_props[text_prop_next].tp_col == MAXCOL
29635
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
2010 && ((*ptr != NUL && ptr[mb_ptr2len(ptr)] == NUL)
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
2011 || (!wp->w_p_wrap
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
2012 && wlv.col == wp->w_width - 1
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
2013 && (text_props[text_prop_next].tp_flags
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
2014 & TP_FLAG_ALIGN_BELOW))))
29597
f2d7f20d83c3 patch 9.0.0139: truncating virtual text after a line not implemented
Bram Moolenaar <Bram@vim.org>
parents: 29583
diff changeset
2015 // When at last-but-one character and a text property
f2d7f20d83c3 patch 9.0.0139: truncating virtual text after a line not implemented
Bram Moolenaar <Bram@vim.org>
parents: 29583
diff changeset
2016 // follows after it, we may need to flush the line after
f2d7f20d83c3 patch 9.0.0139: truncating virtual text after a line not implemented
Bram Moolenaar <Bram@vim.org>
parents: 29583
diff changeset
2017 // displaying that character.
29635
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
2018 // Or when not wrapping and at the rightmost column.
29597
f2d7f20d83c3 patch 9.0.0139: truncating virtual text after a line not implemented
Bram Moolenaar <Bram@vim.org>
parents: 29583
diff changeset
2019 text_prop_follows = TRUE;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2020 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2021 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2022
29706
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2023 #ifdef FEAT_SEARCH_EXTRA
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2024 if (wlv.n_extra == 0)
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2025 {
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2026 // Check for start/end of 'hlsearch' and other matches.
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2027 // After end, check for start/end of next match.
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2028 // When another match, have to check for start again.
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2029 v = (long)(ptr - line);
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2030 search_attr = update_search_hl(wp, lnum, (colnr_T)v, &line,
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2031 &screen_search_hl, &has_match_conc,
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2032 &match_conc, did_line_attr, lcs_eol_one,
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2033 &on_last_col);
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2034 ptr = line + v; // "line" may have been changed
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2035 prev_ptr = ptr;
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2036
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2037 // Do not allow a conceal over EOL otherwise EOL will be missed
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2038 // and bad things happen.
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2039 if (*ptr == NUL)
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2040 has_match_conc = 0;
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2041 }
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2042 #endif
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2043
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2044 #ifdef FEAT_DIFF
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2045 if (wlv.diff_hlf != (hlf_T)0)
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2046 {
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2047 if (wlv.diff_hlf == HLF_CHD && ptr - line >= change_start
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2048 && wlv.n_extra == 0)
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2049 wlv.diff_hlf = HLF_TXD; // changed text
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2050 if (wlv.diff_hlf == HLF_TXD && ptr - line > change_end
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2051 && wlv.n_extra == 0)
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2052 wlv.diff_hlf = HLF_CHD; // changed line
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2053 line_attr = HL_ATTR(wlv.diff_hlf);
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2054 if (wp->w_p_cul && lnum == wp->w_cursor.lnum
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2055 && wp->w_p_culopt_flags != CULOPT_NBR
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2056 && (!wlv.cul_screenline || (wlv.vcol >= left_curline_col
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2057 && wlv.vcol <= right_curline_col)))
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2058 line_attr = hl_combine_attr(
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2059 line_attr, HL_ATTR(HLF_CUL));
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2060 }
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2061 #endif
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2062
18374
86c00b8fefea patch 8.1.2181: highlighting wrong when item follows tab
Bram Moolenaar <Bram@vim.org>
parents: 18364
diff changeset
2063 #ifdef FEAT_SYN_HL
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2064 if (extra_check && wlv.n_extra == 0)
18317
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2065 {
18390
c34ee31d0878 patch 8.1.2189: syntax highlighting wrong for tab
Bram Moolenaar <Bram@vim.org>
parents: 18374
diff changeset
2066 syntax_attr = 0;
18374
86c00b8fefea patch 8.1.2181: highlighting wrong when item follows tab
Bram Moolenaar <Bram@vim.org>
parents: 18364
diff changeset
2067 # ifdef FEAT_TERMINAL
18317
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2068 if (get_term_attr)
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2069 syntax_attr = term_get_attr(wp, lnum, wlv.vcol);
18374
86c00b8fefea patch 8.1.2181: highlighting wrong when item follows tab
Bram Moolenaar <Bram@vim.org>
parents: 18364
diff changeset
2070 # endif
18317
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2071 // Get syntax attribute.
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2072 if (has_syntax)
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2073 {
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2074 // Get the syntax attribute for the character. If there
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2075 // is an error, disable syntax highlighting.
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2076 save_did_emsg = did_emsg;
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2077 did_emsg = FALSE;
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2078
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2079 v = (long)(ptr - line);
18323
72a0dbe1c004 patch 8.1.2156: first character after Tab is not highlighted
Bram Moolenaar <Bram@vim.org>
parents: 18321
diff changeset
2080 if (v == prev_syntax_col)
72a0dbe1c004 patch 8.1.2156: first character after Tab is not highlighted
Bram Moolenaar <Bram@vim.org>
parents: 18321
diff changeset
2081 // at same column again
72a0dbe1c004 patch 8.1.2156: first character after Tab is not highlighted
Bram Moolenaar <Bram@vim.org>
parents: 18321
diff changeset
2082 syntax_attr = prev_syntax_attr;
72a0dbe1c004 patch 8.1.2156: first character after Tab is not highlighted
Bram Moolenaar <Bram@vim.org>
parents: 18321
diff changeset
2083 else
72a0dbe1c004 patch 8.1.2156: first character after Tab is not highlighted
Bram Moolenaar <Bram@vim.org>
parents: 18321
diff changeset
2084 {
18337
b08dbcb42399 patch 8.1.2163: cannot build with +spell but without +syntax
Bram Moolenaar <Bram@vim.org>
parents: 18331
diff changeset
2085 # ifdef FEAT_SPELL
18323
72a0dbe1c004 patch 8.1.2156: first character after Tab is not highlighted
Bram Moolenaar <Bram@vim.org>
parents: 18321
diff changeset
2086 can_spell = TRUE;
18337
b08dbcb42399 patch 8.1.2163: cannot build with +spell but without +syntax
Bram Moolenaar <Bram@vim.org>
parents: 18331
diff changeset
2087 # endif
18323
72a0dbe1c004 patch 8.1.2156: first character after Tab is not highlighted
Bram Moolenaar <Bram@vim.org>
parents: 18321
diff changeset
2088 syntax_attr = get_syntax_attr((colnr_T)v,
18317
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2089 # ifdef FEAT_SPELL
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2090 has_spell ? &can_spell :
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2091 # endif
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2092 NULL, FALSE);
18323
72a0dbe1c004 patch 8.1.2156: first character after Tab is not highlighted
Bram Moolenaar <Bram@vim.org>
parents: 18321
diff changeset
2093 prev_syntax_col = v;
72a0dbe1c004 patch 8.1.2156: first character after Tab is not highlighted
Bram Moolenaar <Bram@vim.org>
parents: 18321
diff changeset
2094 prev_syntax_attr = syntax_attr;
72a0dbe1c004 patch 8.1.2156: first character after Tab is not highlighted
Bram Moolenaar <Bram@vim.org>
parents: 18321
diff changeset
2095 }
18317
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2096
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2097 if (did_emsg)
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2098 {
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2099 wp->w_s->b_syn_error = TRUE;
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2100 has_syntax = FALSE;
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2101 syntax_attr = 0;
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2102 }
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2103 else
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2104 did_emsg = save_did_emsg;
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2105 # ifdef SYN_TIME_LIMIT
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2106 if (wp->w_s->b_syn_slow)
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2107 has_syntax = FALSE;
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2108 # endif
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2109
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2110 // Need to get the line again, a multi-line regexp may
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2111 // have made it invalid.
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2112 line = ml_get_buf(wp->w_buffer, lnum, FALSE);
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2113 ptr = line + v;
29413
34e93e046526 patch 9.0.0048: cursor in wrong column with mouse click after concealed text
Bram Moolenaar <Bram@vim.org>
parents: 29387
diff changeset
2114 prev_ptr = ptr;
18317
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2115 # ifdef FEAT_CONCEAL
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2116 // no concealing past the end of the line, it interferes
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2117 // with line highlighting
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2118 if (*ptr == NUL)
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2119 syntax_flags = 0;
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2120 else
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2121 syntax_flags = get_syntax_info(&syntax_seqnr);
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2122 # endif
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2123 }
18374
86c00b8fefea patch 8.1.2181: highlighting wrong when item follows tab
Bram Moolenaar <Bram@vim.org>
parents: 18364
diff changeset
2124 }
18763
49b78d6465e5 patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents: 18720
diff changeset
2125 # ifdef FEAT_PROP_POPUP
18570
0ac88fdbf089 patch 8.1.2279: computation of highlight attributes is too complicated
Bram Moolenaar <Bram@vim.org>
parents: 18502
diff changeset
2126 // Combine text property highlight into syntax highlight.
0ac88fdbf089 patch 8.1.2279: computation of highlight attributes is too complicated
Bram Moolenaar <Bram@vim.org>
parents: 18502
diff changeset
2127 if (text_prop_type != NULL)
0ac88fdbf089 patch 8.1.2279: computation of highlight attributes is too complicated
Bram Moolenaar <Bram@vim.org>
parents: 18502
diff changeset
2128 {
29611
608d5221a3e5 patch 9.0.0146: missing part of change for "override" flag
Bram Moolenaar <Bram@vim.org>
parents: 29597
diff changeset
2129 if (text_prop_flags & PT_FLAG_COMBINE)
18570
0ac88fdbf089 patch 8.1.2279: computation of highlight attributes is too complicated
Bram Moolenaar <Bram@vim.org>
parents: 18502
diff changeset
2130 syntax_attr = hl_combine_attr(syntax_attr, text_prop_attr);
0ac88fdbf089 patch 8.1.2279: computation of highlight attributes is too complicated
Bram Moolenaar <Bram@vim.org>
parents: 18502
diff changeset
2131 else
0ac88fdbf089 patch 8.1.2279: computation of highlight attributes is too complicated
Bram Moolenaar <Bram@vim.org>
parents: 18502
diff changeset
2132 syntax_attr = text_prop_attr;
30039
4b9b237d1211 patch 9.0.0357: 'linebreak' interferes with text property highlight
Bram Moolenaar <Bram@vim.org>
parents: 29918
diff changeset
2133 text_prop_attr_comb = syntax_attr;
18570
0ac88fdbf089 patch 8.1.2279: computation of highlight attributes is too complicated
Bram Moolenaar <Bram@vim.org>
parents: 18502
diff changeset
2134 }
0ac88fdbf089 patch 8.1.2279: computation of highlight attributes is too complicated
Bram Moolenaar <Bram@vim.org>
parents: 18502
diff changeset
2135 # endif
18317
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2136 #endif
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2137
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2138 // Decide which of the highlight attributes to use.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2139 attr_pri = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2140 #ifdef LINE_ATTR
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2141 if (area_attr != 0)
18364
ee489bb09ea8 patch 8.1.2176: syntax attributes not combined with Visual highlighting
Bram Moolenaar <Bram@vim.org>
parents: 18356
diff changeset
2142 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2143 wlv.char_attr = hl_combine_attr(line_attr, area_attr);
24514
e3efa11b6a1e patch 8.2.2797: Search highlight disappears in the Visual area
Bram Moolenaar <Bram@vim.org>
parents: 24071
diff changeset
2144 if (!highlight_match)
e3efa11b6a1e patch 8.2.2797: Search highlight disappears in the Visual area
Bram Moolenaar <Bram@vim.org>
parents: 24071
diff changeset
2145 // let search highlight show in Visual area if possible
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2146 wlv.char_attr = hl_combine_attr(search_attr, wlv.char_attr);
18364
ee489bb09ea8 patch 8.1.2176: syntax attributes not combined with Visual highlighting
Bram Moolenaar <Bram@vim.org>
parents: 18356
diff changeset
2147 # ifdef FEAT_SYN_HL
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2148 wlv.char_attr = hl_combine_attr(syntax_attr, wlv.char_attr);
18364
ee489bb09ea8 patch 8.1.2176: syntax attributes not combined with Visual highlighting
Bram Moolenaar <Bram@vim.org>
parents: 18356
diff changeset
2149 # endif
ee489bb09ea8 patch 8.1.2176: syntax attributes not combined with Visual highlighting
Bram Moolenaar <Bram@vim.org>
parents: 18356
diff changeset
2150 }
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2151 else if (search_attr != 0)
18364
ee489bb09ea8 patch 8.1.2176: syntax attributes not combined with Visual highlighting
Bram Moolenaar <Bram@vim.org>
parents: 18356
diff changeset
2152 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2153 wlv.char_attr = hl_combine_attr(line_attr, search_attr);
18364
ee489bb09ea8 patch 8.1.2176: syntax attributes not combined with Visual highlighting
Bram Moolenaar <Bram@vim.org>
parents: 18356
diff changeset
2154 # ifdef FEAT_SYN_HL
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2155 wlv.char_attr = hl_combine_attr(syntax_attr, wlv.char_attr);
18364
ee489bb09ea8 patch 8.1.2176: syntax attributes not combined with Visual highlighting
Bram Moolenaar <Bram@vim.org>
parents: 18356
diff changeset
2156 # endif
ee489bb09ea8 patch 8.1.2176: syntax attributes not combined with Visual highlighting
Bram Moolenaar <Bram@vim.org>
parents: 18356
diff changeset
2157 }
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
2158 else if (line_attr != 0
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
2159 && ((wlv.fromcol == -10 && wlv.tocol == MAXCOL)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
2160 || wlv.vcol < wlv.fromcol
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
2161 || vcol_prev < fromcol_prev
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
2162 || wlv.vcol >= wlv.tocol))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2163 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2164 // Use line_attr when not in the Visual or 'incsearch' area
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2165 // (area_attr may be 0 when "noinvcur" is set).
18317
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2166 # ifdef FEAT_SYN_HL
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2167 wlv.char_attr = hl_combine_attr(syntax_attr, line_attr);
18570
0ac88fdbf089 patch 8.1.2279: computation of highlight attributes is too complicated
Bram Moolenaar <Bram@vim.org>
parents: 18502
diff changeset
2168 # else
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2169 wlv.char_attr = line_attr;
18317
d2228d4cf1f6 patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents: 18245
diff changeset
2170 # endif
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2171 attr_pri = FALSE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2172 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2173 #else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2174 if (area_attr != 0)
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2175 wlv.char_attr = area_attr;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2176 else if (search_attr != 0)
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2177 wlv.char_attr = search_attr;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2178 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2179 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2180 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2181 attr_pri = FALSE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2182 #ifdef FEAT_SYN_HL
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2183 wlv.char_attr = syntax_attr;
18374
86c00b8fefea patch 8.1.2181: highlighting wrong when item follows tab
Bram Moolenaar <Bram@vim.org>
parents: 18364
diff changeset
2184 #else
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2185 wlv.char_attr = 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2186 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2187 }
29611
608d5221a3e5 patch 9.0.0146: missing part of change for "override" flag
Bram Moolenaar <Bram@vim.org>
parents: 29597
diff changeset
2188 #ifdef FEAT_PROP_POPUP
608d5221a3e5 patch 9.0.0146: missing part of change for "override" flag
Bram Moolenaar <Bram@vim.org>
parents: 29597
diff changeset
2189 // override with text property highlight when "override" is TRUE
608d5221a3e5 patch 9.0.0146: missing part of change for "override" flag
Bram Moolenaar <Bram@vim.org>
parents: 29597
diff changeset
2190 if (text_prop_type != NULL && (text_prop_flags & PT_FLAG_OVERRIDE))
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2191 wlv.char_attr = hl_combine_attr(wlv.char_attr, text_prop_attr);
29611
608d5221a3e5 patch 9.0.0146: missing part of change for "override" flag
Bram Moolenaar <Bram@vim.org>
parents: 29597
diff changeset
2192 #endif
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2193 }
18494
04a40c1514c4 patch 8.1.2241: match highlight does not combine with 'wincolor'
Bram Moolenaar <Bram@vim.org>
parents: 18471
diff changeset
2194
04a40c1514c4 patch 8.1.2241: match highlight does not combine with 'wincolor'
Bram Moolenaar <Bram@vim.org>
parents: 18471
diff changeset
2195 // combine attribute with 'wincolor'
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2196 if (wlv.win_attr != 0)
18494
04a40c1514c4 patch 8.1.2241: match highlight does not combine with 'wincolor'
Bram Moolenaar <Bram@vim.org>
parents: 18471
diff changeset
2197 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2198 if (wlv.char_attr == 0)
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2199 wlv.char_attr = wlv.win_attr;
18494
04a40c1514c4 patch 8.1.2241: match highlight does not combine with 'wincolor'
Bram Moolenaar <Bram@vim.org>
parents: 18471
diff changeset
2200 else
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2201 wlv.char_attr = hl_combine_attr(wlv.win_attr, wlv.char_attr);
18494
04a40c1514c4 patch 8.1.2241: match highlight does not combine with 'wincolor'
Bram Moolenaar <Bram@vim.org>
parents: 18471
diff changeset
2202 }
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2203
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2204 // Get the next character to put on the screen.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2205
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2206 // The "p_extra" points to the extra stuff that is inserted to
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2207 // represent special characters (non-printable stuff) and other
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2208 // things. When all characters are the same, c_extra is used.
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2209 // If wlv.c_final is set, it will compulsorily be used at the end.
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2210 // "p_extra" must end in a NUL to avoid mb_ptr2len() reads past
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2211 // "p_extra[n_extra]".
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2212 // For the '$' of the 'list' option, n_extra == 1, p_extra == "".
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2213 if (wlv.n_extra > 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2214 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2215 if (wlv.c_extra != NUL || (wlv.n_extra == 1 && wlv.c_final != NUL))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2216 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2217 c = (wlv.n_extra == 1 && wlv.c_final != NUL)
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2218 ? wlv.c_final : wlv.c_extra;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2219 mb_c = c; // doesn't handle non-utf-8 multi-byte!
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2220 if (enc_utf8 && utf_char2len(c) > 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2221 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2222 mb_utf8 = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2223 u8cc[0] = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2224 c = 0xc0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2225 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2226 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2227 mb_utf8 = FALSE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2228 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2229 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2230 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2231 c = *wlv.p_extra;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2232 if (has_mbyte)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2233 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2234 mb_c = c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2235 if (enc_utf8)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2236 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2237 // If the UTF-8 character is more than one byte:
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2238 // Decode it into "mb_c".
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2239 mb_l = utfc_ptr2len(wlv.p_extra);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2240 mb_utf8 = FALSE;
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2241 if (mb_l > wlv.n_extra)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2242 mb_l = 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2243 else if (mb_l > 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2244 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2245 mb_c = utfc_ptr2char(wlv.p_extra, u8cc);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2246 mb_utf8 = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2247 c = 0xc0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2248 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2249 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2250 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2251 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2252 // if this is a DBCS character, put it in "mb_c"
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2253 mb_l = MB_BYTE2LEN(c);
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2254 if (mb_l >= wlv.n_extra)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2255 mb_l = 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2256 else if (mb_l > 1)
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2257 mb_c = (c << 8) + wlv.p_extra[1];
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2258 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2259 if (mb_l == 0) // at the NUL at end-of-line
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2260 mb_l = 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2261
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2262 // If a double-width char doesn't fit display a '>' in the
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2263 // last column.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2264 if ((
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2265 # ifdef FEAT_RIGHTLEFT
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2266 wp->w_p_rl ? (wlv.col <= 0) :
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2267 # endif
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2268 (wlv.col >= wp->w_width - 1))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2269 && (*mb_char2cells)(mb_c) == 2)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2270 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2271 c = '>';
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2272 mb_c = c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2273 mb_l = 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2274 mb_utf8 = FALSE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2275 multi_attr = HL_ATTR(HLF_AT);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2276 #ifdef FEAT_SYN_HL
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
2277 if (wlv.cul_attr)
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
2278 multi_attr = hl_combine_attr(
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
2279 multi_attr, wlv.cul_attr);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2280 #endif
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2281 multi_attr = hl_combine_attr(wlv.win_attr, multi_attr);
18720
7f066dff9d70 patch 8.1.2351: 'wincolor' not used for > for not fitting double width char
Bram Moolenaar <Bram@vim.org>
parents: 18603
diff changeset
2282
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2283 // put the pointer back to output the double-width
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2284 // character at the start of the next line.
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2285 ++wlv.n_extra;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2286 --wlv.p_extra;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2287 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2288 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2289 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2290 wlv.n_extra -= mb_l - 1;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2291 wlv.p_extra += mb_l - 1;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2292 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2293 }
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2294 ++wlv.p_extra;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2295 }
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2296 --wlv.n_extra;
29706
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2297 #if defined(FEAT_PROP_POPUP)
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2298 if (wlv.n_extra <= 0)
29706
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2299 {
29736
65348cc3b656 patch 9.0.0208: the override flag has no effect for virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29722
diff changeset
2300 extra_for_textprop = FALSE;
26338
4cf208415483 patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents: 26334
diff changeset
2301 in_linebreak = FALSE;
29706
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2302 if (search_attr == 0)
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2303 search_attr = saved_search_attr;
30233
8d660a45299f patch 9.0.0452: Visual highlighting extends into virtual text prop
Bram Moolenaar <Bram@vim.org>
parents: 30231
diff changeset
2304 if (area_attr == 0 && *ptr != NUL)
8d660a45299f patch 9.0.0452: Visual highlighting extends into virtual text prop
Bram Moolenaar <Bram@vim.org>
parents: 30231
diff changeset
2305 area_attr = saved_area_attr;
29706
a680dc1b089d patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29698
diff changeset
2306 }
26338
4cf208415483 patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents: 26334
diff changeset
2307 #endif
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2308 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2309 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2310 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2311 #ifdef FEAT_LINEBREAK
29413
34e93e046526 patch 9.0.0048: cursor in wrong column with mouse click after concealed text
Bram Moolenaar <Bram@vim.org>
parents: 29387
diff changeset
2312 int c0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2313 #endif
29413
34e93e046526 patch 9.0.0048: cursor in wrong column with mouse click after concealed text
Bram Moolenaar <Bram@vim.org>
parents: 29387
diff changeset
2314 prev_ptr = ptr;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2315
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2316 // Get a character from the line itself.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2317 c = *ptr;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2318 #ifdef FEAT_LINEBREAK
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2319 c0 = *ptr;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2320 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2321 if (has_mbyte)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2322 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2323 mb_c = c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2324 if (enc_utf8)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2325 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2326 // If the UTF-8 character is more than one byte: Decode it
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2327 // into "mb_c".
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2328 mb_l = utfc_ptr2len(ptr);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2329 mb_utf8 = FALSE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2330 if (mb_l > 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2331 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2332 mb_c = utfc_ptr2char(ptr, u8cc);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2333 // Overlong encoded ASCII or ASCII with composing char
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2334 // is displayed normally, except a NUL.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2335 if (mb_c < 0x80)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2336 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2337 c = mb_c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2338 #ifdef FEAT_LINEBREAK
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2339 c0 = mb_c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2340 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2341 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2342 mb_utf8 = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2343
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2344 // At start of the line we can have a composing char.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2345 // Draw it as a space with a composing char.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2346 if (utf_iscomposing(mb_c))
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2347 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2348 int i;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2349
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2350 for (i = Screen_mco - 1; i > 0; --i)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2351 u8cc[i] = u8cc[i - 1];
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2352 u8cc[0] = mb_c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2353 mb_c = ' ';
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2354 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2355 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2356
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2357 if ((mb_l == 1 && c >= 0x80)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2358 || (mb_l >= 1 && mb_c == 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2359 || (mb_l > 1 && (!vim_isprintc(mb_c))))
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2360 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2361 // Illegal UTF-8 byte: display as <xx>.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2362 // Non-BMP character : display as ? or fullwidth ?.
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
2363 transchar_hex(wlv.extra, mb_c);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2364 # ifdef FEAT_RIGHTLEFT
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2365 if (wp->w_p_rl) // reverse
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
2366 rl_mirror(wlv.extra);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2367 # endif
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
2368 wlv.p_extra = wlv.extra;
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2369 c = *wlv.p_extra;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2370 mb_c = mb_ptr2char_adv(&wlv.p_extra);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2371 mb_utf8 = (c >= 0x80);
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2372 wlv.n_extra = (int)STRLEN(wlv.p_extra);
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2373 wlv.c_extra = NUL;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2374 wlv.c_final = NUL;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2375 if (area_attr == 0 && search_attr == 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2376 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2377 n_attr = wlv.n_extra + 1;
18795
79b689ff168d patch 8.1.2386: 'wincolor' is not used for 'listchars'
Bram Moolenaar <Bram@vim.org>
parents: 18773
diff changeset
2378 extra_attr = hl_combine_attr(
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2379 wlv.win_attr, HL_ATTR(HLF_8));
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2380 saved_attr2 = wlv.char_attr; // save current attr
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2381 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2382 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2383 else if (mb_l == 0) // at the NUL at end-of-line
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2384 mb_l = 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2385 #ifdef FEAT_ARABIC
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2386 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c))
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2387 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2388 // Do Arabic shaping.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2389 int pc, pc1, nc;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2390 int pcc[MAX_MCO];
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2391
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2392 // The idea of what is the previous and next
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2393 // character depends on 'rightleft'.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2394 if (wp->w_p_rl)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2395 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2396 pc = prev_c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2397 pc1 = prev_c1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2398 nc = utf_ptr2char(ptr + mb_l);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2399 prev_c1 = u8cc[0];
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2400 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2401 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2402 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2403 pc = utfc_ptr2char(ptr + mb_l, pcc);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2404 nc = prev_c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2405 pc1 = pcc[0];
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2406 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2407 prev_c = mb_c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2408
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2409 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2410 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2411 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2412 prev_c = mb_c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2413 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2414 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2415 else // enc_dbcs
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2416 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2417 mb_l = MB_BYTE2LEN(c);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2418 if (mb_l == 0) // at the NUL at end-of-line
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2419 mb_l = 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2420 else if (mb_l > 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2421 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2422 // We assume a second byte below 32 is illegal.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2423 // Hopefully this is OK for all double-byte encodings!
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2424 if (ptr[1] >= 32)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2425 mb_c = (c << 8) + ptr[1];
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2426 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2427 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2428 if (ptr[1] == NUL)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2429 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2430 // head byte at end of line
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2431 mb_l = 1;
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
2432 transchar_nonprint(wp->w_buffer, wlv.extra, c);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2433 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2434 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2435 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2436 // illegal tail byte
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2437 mb_l = 2;
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
2438 STRCPY(wlv.extra, "XX");
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2439 }
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
2440 wlv.p_extra = wlv.extra;
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
2441 wlv.n_extra = (int)STRLEN(wlv.extra) - 1;
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2442 wlv.c_extra = NUL;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2443 wlv.c_final = NUL;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2444 c = *wlv.p_extra++;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2445 if (area_attr == 0 && search_attr == 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2446 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2447 n_attr = wlv.n_extra + 1;
18795
79b689ff168d patch 8.1.2386: 'wincolor' is not used for 'listchars'
Bram Moolenaar <Bram@vim.org>
parents: 18773
diff changeset
2448 extra_attr = hl_combine_attr(
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2449 wlv.win_attr, HL_ATTR(HLF_8));
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2450 // save current attr
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2451 saved_attr2 = wlv.char_attr;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2452 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2453 mb_c = c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2454 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2455 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2456 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2457 // If a double-width char doesn't fit display a '>' in the
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2458 // last column; the character is displayed at the start of the
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2459 // next line.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2460 if ((
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2461 # ifdef FEAT_RIGHTLEFT
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2462 wp->w_p_rl ? (wlv.col <= 0) :
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2463 # endif
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2464 (wlv.col >= wp->w_width - 1))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2465 && (*mb_char2cells)(mb_c) == 2)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2466 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2467 c = '>';
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2468 mb_c = c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2469 mb_utf8 = FALSE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2470 mb_l = 1;
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2471 multi_attr = hl_combine_attr(wlv.win_attr, HL_ATTR(HLF_AT));
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2472 // Put pointer back so that the character will be
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2473 // displayed at the start of the next line.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2474 --ptr;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2475 #ifdef FEAT_CONCEAL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2476 did_decrement_ptr = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2477 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2478 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2479 else if (*ptr != NUL)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2480 ptr += mb_l - 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2481
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2482 // If a double-width char doesn't fit at the left side display
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2483 // a '<' in the first column. Don't do this for unprintable
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2484 // characters.
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2485 if (n_skip > 0 && mb_l > 1 && wlv.n_extra == 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2486 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2487 wlv.n_extra = 1;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2488 wlv.c_extra = MB_FILLER_CHAR;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2489 wlv.c_final = NUL;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2490 c = ' ';
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2491 if (area_attr == 0 && search_attr == 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2492 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2493 n_attr = wlv.n_extra + 1;
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2494 extra_attr = hl_combine_attr(
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2495 wlv.win_attr, HL_ATTR(HLF_AT));
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2496 saved_attr2 = wlv.char_attr; // save current attr
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2497 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2498 mb_c = c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2499 mb_utf8 = FALSE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2500 mb_l = 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2501 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2502
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2503 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2504 ++ptr;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2505
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2506 if (extra_check)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2507 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2508 #ifdef FEAT_SPELL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2509 // Check spelling (unless at the end of the line).
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2510 // Only do this when there is no syntax highlighting, the
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2511 // @Spell cluster is not used or the current syntax item
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2512 // contains the @Spell cluster.
18356
596a04c49d76 patch 8.1.2172: spell highlight is wrong at start of the line
Bram Moolenaar <Bram@vim.org>
parents: 18337
diff changeset
2513 v = (long)(ptr - line);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2514 if (has_spell && v >= word_end && v > cur_checked_col)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2515 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2516 spell_attr = 0;
29670
addac7a2d951 patch 9.0.0175: spell checking for capital not working with trailing space
Bram Moolenaar <Bram@vim.org>
parents: 29662
diff changeset
2517 // do not calculate cap_col at the end of the line or when
addac7a2d951 patch 9.0.0175: spell checking for capital not working with trailing space
Bram Moolenaar <Bram@vim.org>
parents: 29662
diff changeset
2518 // only white space is following
addac7a2d951 patch 9.0.0175: spell checking for capital not working with trailing space
Bram Moolenaar <Bram@vim.org>
parents: 29662
diff changeset
2519 if (c != 0 && (*skipwhite(prev_ptr) != NUL) && (
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2520 # ifdef FEAT_SYN_HL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2521 !has_syntax ||
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2522 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2523 can_spell))
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2524 {
29413
34e93e046526 patch 9.0.0048: cursor in wrong column with mouse click after concealed text
Bram Moolenaar <Bram@vim.org>
parents: 29387
diff changeset
2525 char_u *p;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2526 int len;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2527 hlf_T spell_hlf = HLF_COUNT;
22818
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents: 22280
diff changeset
2528
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2529 if (has_mbyte)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2530 v -= mb_l - 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2531
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2532 // Use nextline[] if possible, it has the start of the
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2533 // next line concatenated.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2534 if ((prev_ptr - line) - nextlinecol >= 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2535 p = nextline + (prev_ptr - line) - nextlinecol;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2536 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2537 p = prev_ptr;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2538 cap_col -= (int)(prev_ptr - line);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2539 len = spell_check(wp, p, &spell_hlf, &cap_col,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2540 nochange);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2541 word_end = v + len;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2542
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2543 // In Insert mode only highlight a word that
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2544 // doesn't touch the cursor.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2545 if (spell_hlf != HLF_COUNT
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28177
diff changeset
2546 && (State & MODE_INSERT)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2547 && wp->w_cursor.lnum == lnum
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2548 && wp->w_cursor.col >=
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2549 (colnr_T)(prev_ptr - line)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2550 && wp->w_cursor.col < (colnr_T)word_end)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2551 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2552 spell_hlf = HLF_COUNT;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2553 spell_redraw_lnum = lnum;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2554 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2555
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2556 if (spell_hlf == HLF_COUNT && p != prev_ptr
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2557 && (p - nextline) + len > nextline_idx)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2558 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2559 // Remember that the good word continues at the
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2560 // start of the next line.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2561 checked_lnum = lnum + 1;
18356
596a04c49d76 patch 8.1.2172: spell highlight is wrong at start of the line
Bram Moolenaar <Bram@vim.org>
parents: 18337
diff changeset
2562 checked_col = (int)((p - nextline)
596a04c49d76 patch 8.1.2172: spell highlight is wrong at start of the line
Bram Moolenaar <Bram@vim.org>
parents: 18337
diff changeset
2563 + len - nextline_idx);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2564 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2565
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2566 // Turn index into actual attributes.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2567 if (spell_hlf != HLF_COUNT)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2568 spell_attr = highlight_attr[spell_hlf];
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2569
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2570 if (cap_col > 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2571 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2572 if (p != prev_ptr
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2573 && (p - nextline) + cap_col >= nextline_idx)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2574 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2575 // Remember that the word in the next line
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2576 // must start with a capital.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2577 capcol_lnum = lnum + 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2578 cap_col = (int)((p - nextline) + cap_col
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2579 - nextline_idx);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2580 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2581 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2582 // Compute the actual column.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2583 cap_col += (int)(prev_ptr - line);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2584 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2585 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2586 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2587 if (spell_attr != 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2588 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2589 if (!attr_pri)
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2590 wlv.char_attr = hl_combine_attr(wlv.char_attr,
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2591 spell_attr);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2592 else
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2593 wlv.char_attr = hl_combine_attr(spell_attr,
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2594 wlv.char_attr);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2595 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2596 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2597 #ifdef FEAT_LINEBREAK
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2598 // Found last space before word: check for line break.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2599 if (wp->w_p_lbr && c0 == c
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2600 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr))
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2601 {
25711
d1457c3f156c patch 8.2.3391: crash with combination of 'linebreak' and other options
Bram Moolenaar <Bram@vim.org>
parents: 25517
diff changeset
2602 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1)
d1457c3f156c patch 8.2.3391: crash with combination of 'linebreak' and other options
Bram Moolenaar <Bram@vim.org>
parents: 25517
diff changeset
2603 : 0;
d1457c3f156c patch 8.2.3391: crash with combination of 'linebreak' and other options
Bram Moolenaar <Bram@vim.org>
parents: 25517
diff changeset
2604 char_u *p = ptr - (mb_off + 1);
29451
057c26b5c33a patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29413
diff changeset
2605 chartabsize_T cts;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2606
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2607 init_chartabsize_arg(&cts, wp, lnum, wlv.vcol, line, p);
29686
4153e4815b36 patch 9.0.0183: extra space after virtual text when 'linebreak' is set
Bram Moolenaar <Bram@vim.org>
parents: 29670
diff changeset
2608 # ifdef FEAT_PROP_POPUP
4153e4815b36 patch 9.0.0183: extra space after virtual text when 'linebreak' is set
Bram Moolenaar <Bram@vim.org>
parents: 29670
diff changeset
2609 // do not want virtual text counted here
4153e4815b36 patch 9.0.0183: extra space after virtual text when 'linebreak' is set
Bram Moolenaar <Bram@vim.org>
parents: 29670
diff changeset
2610 cts.cts_has_prop_with_text = FALSE;
4153e4815b36 patch 9.0.0183: extra space after virtual text when 'linebreak' is set
Bram Moolenaar <Bram@vim.org>
parents: 29670
diff changeset
2611 # endif
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2612 wlv.n_extra = win_lbr_chartabsize(&cts, NULL) - 1;
29686
4153e4815b36 patch 9.0.0183: extra space after virtual text when 'linebreak' is set
Bram Moolenaar <Bram@vim.org>
parents: 29670
diff changeset
2613 clear_chartabsize_arg(&cts);
24729
03492b62d79a patch 8.2.2903: cursor position wrong on wrapped line with 'signcolumn'
Bram Moolenaar <Bram@vim.org>
parents: 24514
diff changeset
2614
03492b62d79a patch 8.2.2903: cursor position wrong on wrapped line with 'signcolumn'
Bram Moolenaar <Bram@vim.org>
parents: 24514
diff changeset
2615 // We have just drawn the showbreak value, no need to add
25711
d1457c3f156c patch 8.2.3391: crash with combination of 'linebreak' and other options
Bram Moolenaar <Bram@vim.org>
parents: 25517
diff changeset
2616 // space for it again.
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
2617 if (wlv.vcol == wlv.vcol_sbr)
25711
d1457c3f156c patch 8.2.3391: crash with combination of 'linebreak' and other options
Bram Moolenaar <Bram@vim.org>
parents: 25517
diff changeset
2618 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2619 wlv.n_extra -= MB_CHARLEN(get_showbreak_value(wp));
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2620 if (wlv.n_extra < 0)
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2621 wlv.n_extra = 0;
25711
d1457c3f156c patch 8.2.3391: crash with combination of 'linebreak' and other options
Bram Moolenaar <Bram@vim.org>
parents: 25517
diff changeset
2622 }
27067
89bc175b25a5 patch 8.2.4062: match highlighting of tab too short
Bram Moolenaar <Bram@vim.org>
parents: 26771
diff changeset
2623 if (on_last_col && c != TAB)
26334
baec4e1cee43 patch 8.2.3698: match highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents: 26266
diff changeset
2624 // Do not continue search/match highlighting over the
27067
89bc175b25a5 patch 8.2.4062: match highlighting of tab too short
Bram Moolenaar <Bram@vim.org>
parents: 26771
diff changeset
2625 // line break, but for TABs the highlighting should
89bc175b25a5 patch 8.2.4062: match highlighting of tab too short
Bram Moolenaar <Bram@vim.org>
parents: 26771
diff changeset
2626 // include the complete width of the character
26334
baec4e1cee43 patch 8.2.3698: match highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents: 26266
diff changeset
2627 search_attr = 0;
24729
03492b62d79a patch 8.2.2903: cursor position wrong on wrapped line with 'signcolumn'
Bram Moolenaar <Bram@vim.org>
parents: 24514
diff changeset
2628
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2629 if (c == TAB && wlv.n_extra + wlv.col > wp->w_width)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2630 # ifdef FEAT_VARTABS
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2631 wlv.n_extra = tabstop_padding(wlv.vcol,
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2632 wp->w_buffer->b_p_ts,
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2633 wp->w_buffer->b_p_vts_array) - 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2634 # else
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2635 wlv.n_extra = (int)wp->w_buffer->b_p_ts
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2636 - wlv.vcol % (int)wp->w_buffer->b_p_ts - 1;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2637 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2638
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2639 wlv.c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' ';
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2640 wlv.c_final = NUL;
29686
4153e4815b36 patch 9.0.0183: extra space after virtual text when 'linebreak' is set
Bram Moolenaar <Bram@vim.org>
parents: 29670
diff changeset
2641 # ifdef FEAT_PROP_POPUP
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2642 if (wlv.n_extra > 0 && c != TAB)
26338
4cf208415483 patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents: 26334
diff changeset
2643 in_linebreak = TRUE;
26374
59f2b11ad1be patch 8.2.3718: compiler warns for unused variable without +textprop
Bram Moolenaar <Bram@vim.org>
parents: 26350
diff changeset
2644 # endif
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2645 if (VIM_ISWHITE(c))
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2646 {
18773
38a3bef525e6 patch 8.1.2376: preprocessor indents are incorrect
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2647 # ifdef FEAT_CONCEAL
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2648 if (c == TAB)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2649 // See "Tab alignment" below.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2650 FIX_FOR_BOGUSCOLS;
18773
38a3bef525e6 patch 8.1.2376: preprocessor indents are incorrect
Bram Moolenaar <Bram@vim.org>
parents: 18763
diff changeset
2651 # endif
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2652 if (!wp->w_p_list)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2653 c = ' ';
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2654 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2655 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2656 #endif
25778
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
2657 in_multispace = c == ' '
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
2658 && ((ptr > line + 1 && ptr[-2] == ' ') || *ptr == ' ');
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
2659 if (!in_multispace)
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
2660 multispace_pos = 0;
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
2661
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
2662 // 'list': Change char 160 to 'nbsp' and space to 'space'
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
2663 // setting in 'listchars'. But not when the character is
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
2664 // followed by a composing character (use mb_l to check that).
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2665 if (wp->w_p_list
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2666 && ((((c == 160 && mb_l == 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2667 || (mb_utf8
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2668 && ((mb_c == 160 && mb_l == 2)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2669 || (mb_c == 0x202f && mb_l == 3))))
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
2670 && wp->w_lcs_chars.nbsp)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2671 || (c == ' '
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2672 && mb_l == 1
25778
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
2673 && (wp->w_lcs_chars.space
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
2674 || (in_multispace
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
2675 && wp->w_lcs_chars.multispace != NULL))
23825
0bd44e94dd14 patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents: 22997
diff changeset
2676 && ptr - line >= leadcol
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2677 && ptr - line <= trailcol)))
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2678 {
25778
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
2679 if (in_multispace && wp->w_lcs_chars.multispace != NULL)
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
2680 {
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
2681 c = wp->w_lcs_chars.multispace[multispace_pos++];
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
2682 if (wp->w_lcs_chars.multispace[multispace_pos] == NUL)
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
2683 multispace_pos = 0;
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
2684 }
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
2685 else
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
2686 c = (c == ' ') ? wp->w_lcs_chars.space
373278f5bd51 patch 8.2.3424: a sequence of spaces is hard to see in list mode
Bram Moolenaar <Bram@vim.org>
parents: 25749
diff changeset
2687 : wp->w_lcs_chars.nbsp;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2688 if (area_attr == 0 && search_attr == 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2689 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2690 n_attr = 1;
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2691 extra_attr = hl_combine_attr(wlv.win_attr,
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2692 HL_ATTR(HLF_8));
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2693 saved_attr2 = wlv.char_attr; // save current attr
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2694 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2695 mb_c = c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2696 if (enc_utf8 && utf_char2len(c) > 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2697 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2698 mb_utf8 = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2699 u8cc[0] = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2700 c = 0xc0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2701 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2702 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2703 mb_utf8 = FALSE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2704 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2705
29111
bfb205095634 patch 8.2.5076: unnecessary code
Bram Moolenaar <Bram@vim.org>
parents: 29090
diff changeset
2706 if (c == ' ' && ((trailcol != MAXCOL && ptr > line + trailcol)
bfb205095634 patch 8.2.5076: unnecessary code
Bram Moolenaar <Bram@vim.org>
parents: 29090
diff changeset
2707 || (leadcol != 0 && ptr < line + leadcol)))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2708 {
29090
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
2709 if (leadcol != 0 && in_multispace && ptr < line + leadcol
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
2710 && wp->w_lcs_chars.leadmultispace != NULL)
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
2711 {
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
2712 c = wp->w_lcs_chars.leadmultispace[multispace_pos++];
29111
bfb205095634 patch 8.2.5076: unnecessary code
Bram Moolenaar <Bram@vim.org>
parents: 29090
diff changeset
2713 if (wp->w_lcs_chars.leadmultispace[multispace_pos]
bfb205095634 patch 8.2.5076: unnecessary code
Bram Moolenaar <Bram@vim.org>
parents: 29090
diff changeset
2714 == NUL)
29090
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
2715 multispace_pos = 0;
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
2716 }
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
2717
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
2718 else if (ptr > line + trailcol && wp->w_lcs_chars.trail)
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
2719 c = wp->w_lcs_chars.trail;
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
2720
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
2721 else if (ptr < line + leadcol && wp->w_lcs_chars.lead)
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
2722 c = wp->w_lcs_chars.lead;
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
2723
29111
bfb205095634 patch 8.2.5076: unnecessary code
Bram Moolenaar <Bram@vim.org>
parents: 29090
diff changeset
2724 else if (leadcol != 0 && wp->w_lcs_chars.space)
29090
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
2725 c = wp->w_lcs_chars.space;
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
2726
9b292596a332 patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents: 28788
diff changeset
2727
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2728 if (!attr_pri)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2729 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2730 n_attr = 1;
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2731 extra_attr = hl_combine_attr(wlv.win_attr,
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2732 HL_ATTR(HLF_8));
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2733 saved_attr2 = wlv.char_attr; // save current attr
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2734 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2735 mb_c = c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2736 if (enc_utf8 && utf_char2len(c) > 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2737 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2738 mb_utf8 = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2739 u8cc[0] = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2740 c = 0xc0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2741 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2742 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2743 mb_utf8 = FALSE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2744 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2745 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2746
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2747 // Handling of non-printable characters.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2748 if (!vim_isprintc(c))
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2749 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2750 // when getting a character from the file, we may have to
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2751 // turn it into something else on the way to putting it
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2752 // into "ScreenLines".
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
2753 if (c == TAB && (!wp->w_p_list || wp->w_lcs_chars.tab1))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2754 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2755 int tab_len = 0;
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2756 long vcol_adjusted = wlv.vcol; // removed showbreak length
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2757 #ifdef FEAT_LINEBREAK
18574
8b0114ffde2b patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents: 18570
diff changeset
2758 char_u *sbr = get_showbreak_value(wp);
8b0114ffde2b patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents: 18570
diff changeset
2759
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2760 // only adjust the tab_len, when at the first column
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2761 // after the showbreak value was drawn
30395
e516c566fd0c patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30391
diff changeset
2762 if (*sbr != NUL && wlv.vcol == wlv.vcol_sbr && wp->w_p_wrap)
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2763 vcol_adjusted = wlv.vcol - MB_CHARLEN(sbr);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2764 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2765 // tab amount depends on current column
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2766 #ifdef FEAT_VARTABS
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2767 tab_len = tabstop_padding(vcol_adjusted,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2768 wp->w_buffer->b_p_ts,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2769 wp->w_buffer->b_p_vts_array) - 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2770 #else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2771 tab_len = (int)wp->w_buffer->b_p_ts
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2772 - vcol_adjusted % (int)wp->w_buffer->b_p_ts - 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2773 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2774
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2775 #ifdef FEAT_LINEBREAK
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2776 if (!wp->w_p_lbr || !wp->w_p_list)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2777 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2778 // tab amount depends on current column
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2779 wlv.n_extra = tab_len;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2780 #ifdef FEAT_LINEBREAK
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2781 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2782 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2783 char_u *p;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2784 int len;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2785 int i;
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2786 int saved_nextra = wlv.n_extra;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2787
25749
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2788 # ifdef FEAT_CONCEAL
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2789 if (wlv.vcol_off > 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2790 // there are characters to conceal
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2791 tab_len += wlv.vcol_off;
25749
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2792
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2793 // boguscols before FIX_FOR_BOGUSCOLS macro from above
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
2794 if (wp->w_p_list && wp->w_lcs_chars.tab1
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2795 && old_boguscols > 0
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2796 && wlv.n_extra > tab_len)
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2797 tab_len += wlv.n_extra - tab_len;
25749
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2798 # endif
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2799 // If wlv.n_extra > 0, it gives the number of chars, to
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2800 // use for a tab, else we need to calculate the width
25749
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2801 // for a tab.
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
2802 len = (tab_len * mb_char2len(wp->w_lcs_chars.tab2));
25749
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2803 if (wp->w_lcs_chars.tab3)
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2804 len += mb_char2len(wp->w_lcs_chars.tab3);
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2805 if (wlv.n_extra > 0)
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2806 len += wlv.n_extra - tab_len;
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
2807 c = wp->w_lcs_chars.tab1;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2808 p = alloc(len + 1);
25749
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2809 if (p == NULL)
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2810 wlv.n_extra = 0;
25749
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2811 else
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2812 {
25749
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2813 vim_memset(p, ' ', len);
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2814 p[len] = NUL;
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
2815 vim_free(wlv.p_extra_free);
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
2816 wlv.p_extra_free = p;
25749
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2817 for (i = 0; i < tab_len; i++)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2818 {
25749
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2819 int lcs = wp->w_lcs_chars.tab2;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2820
25749
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2821 if (*p == NUL)
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2822 {
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2823 tab_len = i;
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2824 break;
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2825 }
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2826
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2827 // if tab3 is given, use it for the last char
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2828 if (wp->w_lcs_chars.tab3 && i == tab_len - 1)
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2829 lcs = wp->w_lcs_chars.tab3;
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2830 p += mb_char2bytes(lcs, p);
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2831 wlv.n_extra += mb_char2len(lcs)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2832 - (saved_nextra > 0 ? 1 : 0);
25749
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2833 }
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
2834 wlv.p_extra = wlv.p_extra_free;
25749
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2835 # ifdef FEAT_CONCEAL
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2836 // n_extra will be increased by FIX_FOX_BOGUSCOLS
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2837 // macro below, so need to adjust for that here
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2838 if (wlv.vcol_off > 0)
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2839 wlv.n_extra -= wlv.vcol_off;
25749
24b80aa4dd2e patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents: 25711
diff changeset
2840 # endif
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2841 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2842 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2843 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2844 #ifdef FEAT_CONCEAL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2845 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2846 int vc_saved = wlv.vcol_off;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2847
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2848 // Tab alignment should be identical regardless of
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2849 // 'conceallevel' value. So tab compensates of all
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2850 // previous concealed characters, and thus resets
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2851 // vcol_off and boguscols accumulated so far in the
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2852 // line. Note that the tab can be longer than
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2853 // 'tabstop' when there are concealed characters.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2854 FIX_FOR_BOGUSCOLS;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2855
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2856 // Make sure, the highlighting for the tab char will be
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2857 // correctly set further below (effectively reverts the
26771
fc859aea8cec patch 8.2.3914: various spelling mistakes in comments
Bram Moolenaar <Bram@vim.org>
parents: 26690
diff changeset
2858 // FIX_FOR_BOGSUCOLS macro).
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2859 if (wlv.n_extra == tab_len + vc_saved && wp->w_p_list
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
2860 && wp->w_lcs_chars.tab1)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2861 tab_len += vc_saved;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2862 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2863 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2864 mb_utf8 = FALSE; // don't draw as UTF-8
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2865 if (wp->w_p_list)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2866 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2867 c = (wlv.n_extra == 0 && wp->w_lcs_chars.tab3)
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
2868 ? wp->w_lcs_chars.tab3
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
2869 : wp->w_lcs_chars.tab1;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2870 #ifdef FEAT_LINEBREAK
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2871 if (wp->w_p_lbr)
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2872 wlv.c_extra = NUL; // using p_extra from above
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2873 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2874 #endif
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2875 wlv.c_extra = wp->w_lcs_chars.tab2;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2876 wlv.c_final = wp->w_lcs_chars.tab3;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2877 n_attr = tab_len + 1;
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2878 extra_attr = hl_combine_attr(wlv.win_attr,
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2879 HL_ATTR(HLF_8));
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2880 saved_attr2 = wlv.char_attr; // save current attr
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2881 mb_c = c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2882 if (enc_utf8 && utf_char2len(c) > 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2883 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2884 mb_utf8 = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2885 u8cc[0] = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2886 c = 0xc0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2887 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2888 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2889 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2890 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2891 wlv.c_final = NUL;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2892 wlv.c_extra = ' ';
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2893 c = ' ';
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2894 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2895 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2896 else if (c == NUL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2897 && (wp->w_p_list
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
2898 || ((wlv.fromcol >= 0 || fromcol_prev >= 0)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
2899 && wlv.tocol > wlv.vcol
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2900 && VIsual_mode != Ctrl_V
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2901 && (
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2902 # ifdef FEAT_RIGHTLEFT
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2903 wp->w_p_rl ? (wlv.col >= 0) :
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2904 # endif
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2905 (wlv.col < wp->w_width))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2906 && !(noinvcur
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2907 && lnum == wp->w_cursor.lnum
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2908 && (colnr_T)wlv.vcol == wp->w_virtcol)))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2909 && lcs_eol_one > 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2910 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2911 // Display a '$' after the line or highlight an extra
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2912 // character if the line break is included.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2913 #if defined(FEAT_DIFF) || defined(LINE_ATTR)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2914 // For a diff line the highlighting continues after the
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2915 // "$".
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2916 if (
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2917 # ifdef FEAT_DIFF
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2918 wlv.diff_hlf == (hlf_T)0
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2919 # ifdef LINE_ATTR
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2920 &&
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2921 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2922 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2923 # ifdef LINE_ATTR
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2924 line_attr == 0
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2925 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2926 )
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2927 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2928 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2929 // In virtualedit, visual selections may extend
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2930 // beyond end of line.
29740
b167c91b5f6b patch 9.0.0210: 'list' mode does not work properly with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29738
diff changeset
2931 if (!(area_highlighting && virtual_active()
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
2932 && wlv.tocol != MAXCOL
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
2933 && wlv.vcol < wlv.tocol))
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2934 wlv.p_extra = at_end_str;
29740
b167c91b5f6b patch 9.0.0210: 'list' mode does not work properly with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29738
diff changeset
2935 wlv.n_extra = 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2936 }
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
2937 if (wp->w_p_list && wp->w_lcs_chars.eol > 0)
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
2938 c = wp->w_lcs_chars.eol;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2939 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2940 c = ' ';
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2941 lcs_eol_one = -1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2942 --ptr; // put it back at the NUL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2943 if (!attr_pri)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2944 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2945 extra_attr = hl_combine_attr(wlv.win_attr,
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2946 HL_ATTR(HLF_AT));
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2947 n_attr = 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2948 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2949 mb_c = c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2950 if (enc_utf8 && utf_char2len(c) > 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2951 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2952 mb_utf8 = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2953 u8cc[0] = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2954 c = 0xc0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2955 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2956 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2957 mb_utf8 = FALSE; // don't draw as UTF-8
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2958 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2959 else if (c != NUL)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2960 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2961 wlv.p_extra = transchar_buf(wp->w_buffer, c);
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2962 if (wlv.n_extra == 0)
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2963 wlv.n_extra = byte2cells(c) - 1;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2964 #ifdef FEAT_RIGHTLEFT
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2965 if ((dy_flags & DY_UHEX) && wp->w_p_rl)
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2966 rl_mirror(wlv.p_extra); // reverse "<12>"
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2967 #endif
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2968 wlv.c_extra = NUL;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2969 wlv.c_final = NUL;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2970 #ifdef FEAT_LINEBREAK
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2971 if (wp->w_p_lbr)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2972 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2973 char_u *p;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2974
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2975 c = *wlv.p_extra;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2976 p = alloc(wlv.n_extra + 1);
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2977 vim_memset(p, ' ', wlv.n_extra);
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2978 STRNCPY(p, wlv.p_extra + 1, STRLEN(wlv.p_extra) - 1);
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2979 p[wlv.n_extra] = NUL;
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
2980 vim_free(wlv.p_extra_free);
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
2981 wlv.p_extra_free = wlv.p_extra = p;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2982 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2983 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2984 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2985 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2986 wlv.n_extra = byte2cells(c) - 1;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2987 c = *wlv.p_extra++;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2988 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2989 if (!attr_pri)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2990 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2991 n_attr = wlv.n_extra + 1;
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2992 extra_attr = hl_combine_attr(wlv.win_attr,
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
2993 HL_ATTR(HLF_8));
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
2994 saved_attr2 = wlv.char_attr; // save current attr
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2995 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2996 mb_utf8 = FALSE; // don't draw as UTF-8
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2997 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2998 else if (VIsual_active
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2999 && (VIsual_mode == Ctrl_V
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3000 || VIsual_mode == 'v')
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3001 && virtual_active()
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
3002 && wlv.tocol != MAXCOL
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
3003 && wlv.vcol < wlv.tocol
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3004 && (
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3005 #ifdef FEAT_RIGHTLEFT
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3006 wp->w_p_rl ? (wlv.col >= 0) :
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3007 #endif
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3008 (wlv.col < wp->w_width)))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3009 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3010 c = ' ';
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3011 --ptr; // put it back at the NUL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3012 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3013 #if defined(LINE_ATTR)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3014 else if ((
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3015 # ifdef FEAT_DIFF
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3016 wlv.diff_hlf != (hlf_T)0 ||
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3017 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3018 # ifdef FEAT_TERMINAL
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3019 wlv.win_attr != 0 ||
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3020 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3021 line_attr != 0
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3022 ) && (
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3023 # ifdef FEAT_RIGHTLEFT
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3024 wp->w_p_rl ? (wlv.col >= 0) :
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3025 # endif
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3026 (wlv.col
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3027 # ifdef FEAT_CONCEAL
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3028 - wlv.boguscols
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3029 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3030 < wp->w_width)))
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3031 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3032 // Highlight until the right side of the window
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3033 c = ' ';
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3034 --ptr; // put it back at the NUL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3035
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3036 // Remember we do the char for line highlighting.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3037 ++did_line_attr;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3038
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3039 // don't do search HL for the rest of the line
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3040 if (line_attr != 0 && wlv.char_attr == search_attr
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3041 && (did_line_attr > 1
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
3042 || (wp->w_p_list &&
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
3043 wp->w_lcs_chars.eol > 0)))
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3044 wlv.char_attr = line_attr;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3045 # ifdef FEAT_DIFF
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3046 if (wlv.diff_hlf == HLF_TXD)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3047 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3048 wlv.diff_hlf = HLF_CHD;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3049 if (vi_attr == 0 || wlv.char_attr != vi_attr)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3050 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3051 wlv.char_attr = HL_ATTR(wlv.diff_hlf);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3052 if (wp->w_p_cul && lnum == wp->w_cursor.lnum
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3053 && wp->w_p_culopt_flags != CULOPT_NBR
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3054 && (!wlv.cul_screenline
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3055 || (wlv.vcol >= left_curline_col
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3056 && wlv.vcol <= right_curline_col)))
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3057 wlv.char_attr = hl_combine_attr(
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3058 wlv.char_attr, HL_ATTR(HLF_CUL));
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3059 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3060 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3061 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3062 # ifdef FEAT_TERMINAL
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3063 if (wlv.win_attr != 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3064 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3065 wlv.char_attr = wlv.win_attr;
18321
2ffe3309958c patch 8.1.2155: in a terminal window 'cursorlineopt' does not work properly
Bram Moolenaar <Bram@vim.org>
parents: 18317
diff changeset
3066 if (wp->w_p_cul && lnum == wp->w_cursor.lnum
2ffe3309958c patch 8.1.2155: in a terminal window 'cursorlineopt' does not work properly
Bram Moolenaar <Bram@vim.org>
parents: 18317
diff changeset
3067 && wp->w_p_culopt_flags != CULOPT_NBR)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3068 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3069 if (!wlv.cul_screenline
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3070 || (wlv.vcol >= left_curline_col
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3071 && wlv.vcol <= right_curline_col))
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3072 wlv.char_attr = hl_combine_attr(
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3073 wlv.char_attr, HL_ATTR(HLF_CUL));
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3074 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3075 else if (line_attr)
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3076 wlv.char_attr = hl_combine_attr(wlv.char_attr,
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3077 line_attr);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3078 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3079 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3080 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3081 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3082 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3083
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3084 #ifdef FEAT_CONCEAL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3085 if ( wp->w_p_cole > 0
28788
a79f44a2d1ce patch 8.2.4918: conceal character from matchadd() displayed too many times
Bram Moolenaar <Bram@vim.org>
parents: 28773
diff changeset
3086 && (wp != curwin || lnum != wp->w_cursor.lnum
a79f44a2d1ce patch 8.2.4918: conceal character from matchadd() displayed too many times
Bram Moolenaar <Bram@vim.org>
parents: 28773
diff changeset
3087 || conceal_cursor_line(wp))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3088 && ((syntax_flags & HL_CONCEAL) != 0 || has_match_conc > 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3089 && !(lnum_in_visual_area
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3090 && vim_strchr(wp->w_p_cocu, 'v') == NULL))
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3091 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3092 wlv.char_attr = conceal_attr;
28788
a79f44a2d1ce patch 8.2.4918: conceal character from matchadd() displayed too many times
Bram Moolenaar <Bram@vim.org>
parents: 28773
diff changeset
3093 if (((prev_syntax_id != syntax_seqnr
a79f44a2d1ce patch 8.2.4918: conceal character from matchadd() displayed too many times
Bram Moolenaar <Bram@vim.org>
parents: 28773
diff changeset
3094 && (syntax_flags & HL_CONCEAL) != 0)
a79f44a2d1ce patch 8.2.4918: conceal character from matchadd() displayed too many times
Bram Moolenaar <Bram@vim.org>
parents: 28773
diff changeset
3095 || has_match_conc > 1)
21010
ca2e18364888 patch 8.2.1056: wrong display when mixing match conceal and syntax conceal
Bram Moolenaar <Bram@vim.org>
parents: 20905
diff changeset
3096 && (syn_get_sub_char() != NUL
ca2e18364888 patch 8.2.1056: wrong display when mixing match conceal and syntax conceal
Bram Moolenaar <Bram@vim.org>
parents: 20905
diff changeset
3097 || (has_match_conc && match_conc)
ca2e18364888 patch 8.2.1056: wrong display when mixing match conceal and syntax conceal
Bram Moolenaar <Bram@vim.org>
parents: 20905
diff changeset
3098 || wp->w_p_cole == 1)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3099 && wp->w_p_cole != 3)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3100 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3101 // First time at this concealed item: display one
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3102 // character.
21010
ca2e18364888 patch 8.2.1056: wrong display when mixing match conceal and syntax conceal
Bram Moolenaar <Bram@vim.org>
parents: 20905
diff changeset
3103 if (has_match_conc && match_conc)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3104 c = match_conc;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3105 else if (syn_get_sub_char() != NUL)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3106 c = syn_get_sub_char();
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
3107 else if (wp->w_lcs_chars.conceal != NUL)
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
3108 c = wp->w_lcs_chars.conceal;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3109 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3110 c = ' ';
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3111
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3112 prev_syntax_id = syntax_seqnr;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3113
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3114 if (wlv.n_extra > 0)
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3115 wlv.vcol_off += wlv.n_extra;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3116 wlv.vcol += wlv.n_extra;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3117 if (wp->w_p_wrap && wlv.n_extra > 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3118 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3119 # ifdef FEAT_RIGHTLEFT
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3120 if (wp->w_p_rl)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3121 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3122 wlv.col -= wlv.n_extra;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3123 wlv.boguscols -= wlv.n_extra;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3124 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3125 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3126 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3127 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3128 wlv.boguscols += wlv.n_extra;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3129 wlv.col += wlv.n_extra;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3130 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3131 }
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3132 wlv.n_extra = 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3133 n_attr = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3134 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3135 else if (n_skip == 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3136 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3137 is_concealing = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3138 n_skip = 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3139 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3140 mb_c = c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3141 if (enc_utf8 && utf_char2len(c) > 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3142 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3143 mb_utf8 = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3144 u8cc[0] = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3145 c = 0xc0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3146 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3147 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3148 mb_utf8 = FALSE; // don't draw as UTF-8
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3149 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3150 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3151 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3152 prev_syntax_id = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3153 is_concealing = FALSE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3154 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3155
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3156 if (n_skip > 0 && did_decrement_ptr)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3157 // not showing the '>', put pointer back to avoid getting stuck
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3158 ++ptr;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3159
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3160 #endif // FEAT_CONCEAL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3161 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3162
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3163 #ifdef FEAT_CONCEAL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3164 // In the cursor line and we may be concealing characters: correct
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3165 // the cursor column when we reach its position.
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3166 if (!did_wcol && wlv.draw_state == WL_LINE
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3167 && wp == curwin && lnum == wp->w_cursor.lnum
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3168 && conceal_cursor_line(wp)
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3169 && (int)wp->w_virtcol <= wlv.vcol + n_skip)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3170 {
22912
1b1dc9dad42c patch 8.2.2003: build error with +conceal but without +popupwin
Bram Moolenaar <Bram@vim.org>
parents: 22886
diff changeset
3171 # ifdef FEAT_RIGHTLEFT
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3172 if (wp->w_p_rl)
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3173 wp->w_wcol = wp->w_width - wlv.col + wlv.boguscols - 1;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3174 else
22912
1b1dc9dad42c patch 8.2.2003: build error with +conceal but without +popupwin
Bram Moolenaar <Bram@vim.org>
parents: 22886
diff changeset
3175 # endif
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3176 wp->w_wcol = wlv.col - wlv.boguscols;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3177 wp->w_wrow = wlv.row;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3178 did_wcol = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3179 curwin->w_valid |= VALID_WCOL|VALID_WROW|VALID_VIRTCOL;
22912
1b1dc9dad42c patch 8.2.2003: build error with +conceal but without +popupwin
Bram Moolenaar <Bram@vim.org>
parents: 22886
diff changeset
3180 # ifdef FEAT_PROP_POPUP
22886
38324d4f1c94 patch 8.2.1990: cursor position wrong in terminal popup with finished job
Bram Moolenaar <Bram@vim.org>
parents: 22818
diff changeset
3181 curwin->w_flags &= ~(WFLAG_WCOL_OFF_ADDED | WFLAG_WROW_OFF_ADDED);
22912
1b1dc9dad42c patch 8.2.2003: build error with +conceal but without +popupwin
Bram Moolenaar <Bram@vim.org>
parents: 22886
diff changeset
3182 # endif
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3183 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3184 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3185
29736
65348cc3b656 patch 9.0.0208: the override flag has no effect for virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29722
diff changeset
3186 // Use "extra_attr", but don't override visual selection highlighting,
65348cc3b656 patch 9.0.0208: the override flag has no effect for virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29722
diff changeset
3187 // unless text property overrides.
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
3188 // Don't use "extra_attr" until n_attr_skip is zero.
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
3189 if (n_attr_skip == 0 && n_attr > 0
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3190 && wlv.draw_state == WL_LINE
29738
4092d04cd46f patch 9.0.0209: build error with small features
Bram Moolenaar <Bram@vim.org>
parents: 29736
diff changeset
3191 && (!attr_pri
4092d04cd46f patch 9.0.0209: build error with small features
Bram Moolenaar <Bram@vim.org>
parents: 29736
diff changeset
3192 #ifdef FEAT_PROP_POPUP
4092d04cd46f patch 9.0.0209: build error with small features
Bram Moolenaar <Bram@vim.org>
parents: 29736
diff changeset
3193 || (text_prop_flags & PT_FLAG_OVERRIDE)
4092d04cd46f patch 9.0.0209: build error with small features
Bram Moolenaar <Bram@vim.org>
parents: 29736
diff changeset
3194 #endif
4092d04cd46f patch 9.0.0209: build error with small features
Bram Moolenaar <Bram@vim.org>
parents: 29736
diff changeset
3195 ))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3196 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3197 #ifdef LINE_ATTR
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3198 if (line_attr)
29722
f88671dbe88b patch 9.0.0201: CursorLine highlight overrules virtual text highlight
Bram Moolenaar <Bram@vim.org>
parents: 29706
diff changeset
3199 wlv.char_attr = hl_combine_attr(line_attr, extra_attr);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3200 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3201 #endif
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3202 wlv.char_attr = extra_attr;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3203 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3204
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3205 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3206 // XIM don't send preedit_start and preedit_end, but they send
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3207 // preedit_changed and commit. Thus Vim can't set "im_is_active", use
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3208 // im_is_preediting() here.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3209 if (p_imst == IM_ON_THE_SPOT
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3210 && xic != NULL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3211 && lnum == wp->w_cursor.lnum
28773
d770568e6c98 patch 8.2.4911: the mode #defines are not clearly named
Bram Moolenaar <Bram@vim.org>
parents: 28177
diff changeset
3212 && (State & MODE_INSERT)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3213 && !p_imdisable
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3214 && im_is_preediting()
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3215 && wlv.draw_state == WL_LINE)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3216 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3217 colnr_T tcol;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3218
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3219 if (preedit_end_col == MAXCOL)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3220 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3221 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3222 tcol = preedit_end_col;
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3223 if ((long)preedit_start_col <= wlv.vcol && wlv.vcol < (long)tcol)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3224 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3225 if (feedback_old_attr < 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3226 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3227 feedback_col = 0;
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3228 feedback_old_attr = wlv.char_attr;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3229 }
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3230 wlv.char_attr = im_get_feedback_attr(feedback_col);
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3231 if (wlv.char_attr < 0)
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3232 wlv.char_attr = feedback_old_attr;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3233 feedback_col++;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3234 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3235 else if (feedback_old_attr >= 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3236 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3237 wlv.char_attr = feedback_old_attr;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3238 feedback_old_attr = -1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3239 feedback_col = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3240 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3241 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3242 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3243 // Handle the case where we are in column 0 but not on the first
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3244 // character of the line and the user wants us to show us a
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3245 // special character (via 'listchars' option "precedes:<char>".
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3246 if (lcs_prec_todo != NUL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3247 && wp->w_p_list
30610
6c6ac189a05f patch 9.0.0640: cannot scroll by screen line if a line wraps
Bram Moolenaar <Bram@vim.org>
parents: 30509
diff changeset
3248 && (wp->w_p_wrap ? (wp->w_skipcol > 0 && wlv.row == 0)
6c6ac189a05f patch 9.0.0640: cannot scroll by screen line if a line wraps
Bram Moolenaar <Bram@vim.org>
parents: 30509
diff changeset
3249 : wp->w_leftcol > 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3250 #ifdef FEAT_DIFF
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
3251 && wlv.filler_todo <= 0
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3252 #endif
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3253 && wlv.draw_state > WL_NR
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3254 && c != NUL)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3255 {
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
3256 c = wp->w_lcs_chars.prec;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3257 lcs_prec_todo = NUL;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3258 if (has_mbyte && (*mb_char2cells)(mb_c) > 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3259 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3260 // Double-width character being overwritten by the "precedes"
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3261 // character, need to fill up half the character.
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3262 wlv.c_extra = MB_FILLER_CHAR;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3263 wlv.c_final = NUL;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3264 wlv.n_extra = 1;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3265 n_attr = 2;
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3266 extra_attr = hl_combine_attr(wlv.win_attr, HL_ATTR(HLF_AT));
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3267 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3268 mb_c = c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3269 if (enc_utf8 && utf_char2len(c) > 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3270 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3271 mb_utf8 = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3272 u8cc[0] = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3273 c = 0xc0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3274 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3275 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3276 mb_utf8 = FALSE; // don't draw as UTF-8
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3277 if (!attr_pri)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3278 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3279 saved_attr3 = wlv.char_attr; // save current attr
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3280 wlv.char_attr = hl_combine_attr(wlv.win_attr, HL_ATTR(HLF_AT));
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3281 n_attr3 = 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3282 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3283 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3284
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3285 // At end of the text line or just after the last character.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3286 if ((c == NUL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3287 #if defined(LINE_ATTR)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3288 || did_line_attr == 1
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3289 #endif
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3290 ) && wlv.eol_hl_off == 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3291 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3292 #ifdef FEAT_SEARCH_EXTRA
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3293 // flag to indicate whether prevcol equals startcol of search_hl or
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3294 // one of the matches
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3295 int prevcol_hl_flag = get_prevcol_hl_flag(wp, &screen_search_hl,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3296 (long)(ptr - line) - (c == NUL));
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3297 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3298 // Invert at least one char, used for Visual and empty line or
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3299 // highlight match at end of line. If it's beyond the last
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3300 // char on the screen, just overwrite that one (tricky!) Not
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3301 // needed when a '$' was displayed for 'list'.
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
3302 if (wp->w_lcs_chars.eol == lcs_eol_one
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
3303 && ((area_attr != 0 && wlv.vcol == wlv.fromcol
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3304 && (VIsual_mode != Ctrl_V
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3305 || lnum == VIsual.lnum
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3306 || lnum == curwin->w_cursor.lnum)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3307 && c == NUL)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3308 #ifdef FEAT_SEARCH_EXTRA
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3309 // highlight 'hlsearch' match at end of line
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3310 || (prevcol_hl_flag
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3311 # ifdef FEAT_SYN_HL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3312 && !(wp->w_p_cul && lnum == wp->w_cursor.lnum
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3313 && !(wp == curwin && VIsual_active))
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3314 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3315 # ifdef FEAT_DIFF
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3316 && wlv.diff_hlf == (hlf_T)0
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3317 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3318 # if defined(LINE_ATTR)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3319 && did_line_attr <= 1
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3320 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3321 )
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3322 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3323 ))
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3324 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3325 int n = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3326
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3327 #ifdef FEAT_RIGHTLEFT
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3328 if (wp->w_p_rl)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3329 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3330 if (wlv.col < 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3331 n = 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3332 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3333 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3334 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3335 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3336 if (wlv.col >= wp->w_width)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3337 n = -1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3338 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3339 if (n != 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3340 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3341 // At the window boundary, highlight the last character
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3342 // instead (better than nothing).
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3343 wlv.off += n;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3344 wlv.col += n;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3345 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3346 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3347 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3348 // Add a blank character to highlight.
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3349 ScreenLines[wlv.off] = ' ';
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3350 if (enc_utf8)
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3351 ScreenLinesUC[wlv.off] = 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3352 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3353 #ifdef FEAT_SEARCH_EXTRA
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3354 if (area_attr == 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3355 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3356 // Use attributes from match with highest priority among
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3357 // 'search_hl' and the match list.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3358 get_search_match_hl(wp, &screen_search_hl,
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3359 (long)(ptr - line), &wlv.char_attr);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3360 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3361 #endif
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3362 ScreenAttrs[wlv.off] = wlv.char_attr;
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3363 ScreenCols[wlv.off] = MAXCOL;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3364 #ifdef FEAT_RIGHTLEFT
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3365 if (wp->w_p_rl)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3366 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3367 --wlv.col;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3368 --wlv.off;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3369 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3370 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3371 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3372 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3373 ++wlv.col;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3374 ++wlv.off;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3375 }
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3376 ++wlv.vcol;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3377 wlv.eol_hl_off = 1;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3378 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3379 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3380
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3381 // At end of the text line.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3382 if (c == NUL)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3383 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3384 draw_screen_line(wp, &wlv);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3385
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3386 // Update w_cline_height and w_cline_folded if the cursor line was
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3387 // updated (saves a call to plines() later).
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3388 if (wp == curwin && lnum == curwin->w_cursor.lnum)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3389 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3390 curwin->w_cline_row = startrow;
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3391 curwin->w_cline_height = wlv.row - startrow;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3392 #ifdef FEAT_FOLDING
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3393 curwin->w_cline_folded = FALSE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3394 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3395 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3396 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3397 break;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3398 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3399
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3400 // Show "extends" character from 'listchars' if beyond the line end and
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3401 // 'list' is set.
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
3402 if (wp->w_lcs_chars.ext != NUL
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3403 && wlv.draw_state == WL_LINE
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3404 && wp->w_p_list
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3405 && !wp->w_p_wrap
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3406 #ifdef FEAT_DIFF
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
3407 && wlv.filler_todo <= 0
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3408 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3409 && (
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3410 #ifdef FEAT_RIGHTLEFT
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3411 wp->w_p_rl ? wlv.col == 0 :
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3412 #endif
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3413 wlv.col == wp->w_width - 1)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3414 && (*ptr != NUL
29740
b167c91b5f6b patch 9.0.0210: 'list' mode does not work properly with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29738
diff changeset
3415 || lcs_eol_one > 0
b167c91b5f6b patch 9.0.0210: 'list' mode does not work properly with virtual text
Bram Moolenaar <Bram@vim.org>
parents: 29738
diff changeset
3416 || (wlv.n_extra > 0 && (wlv.c_extra != NUL
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3417 || *wlv.p_extra != NUL))))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3418 {
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
3419 c = wp->w_lcs_chars.ext;
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3420 wlv.char_attr = hl_combine_attr(wlv.win_attr, HL_ATTR(HLF_AT));
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3421 mb_c = c;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3422 if (enc_utf8 && utf_char2len(c) > 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3423 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3424 mb_utf8 = TRUE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3425 u8cc[0] = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3426 c = 0xc0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3427 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3428 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3429 mb_utf8 = FALSE;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3430 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3431
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3432 #ifdef FEAT_SYN_HL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3433 // advance to the next 'colorcolumn'
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3434 if (wlv.draw_color_col)
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3435 wlv.draw_color_col = advance_color_col(VCOL_HLC, &wlv.color_cols);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3436
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3437 // Highlight the cursor column if 'cursorcolumn' is set. But don't
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3438 // highlight the cursor position itself.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3439 // Also highlight the 'colorcolumn' if it is different than
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3440 // 'cursorcolumn'
22280
47ebfc274e3f patch 8.2.1689: 'colorcolumn' doesn't show in indent
Bram Moolenaar <Bram@vim.org>
parents: 22013
diff changeset
3441 // Also highlight the 'colorcolumn' if 'breakindent' and/or 'showbreak'
47ebfc274e3f patch 8.2.1689: 'colorcolumn' doesn't show in indent
Bram Moolenaar <Bram@vim.org>
parents: 22013
diff changeset
3442 // options are set
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3443 vcol_save_attr = -1;
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3444 if (((wlv.draw_state == WL_LINE
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3445 || wlv.draw_state == WL_BRI
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3446 || wlv.draw_state == WL_SBR)
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3447 && !lnum_in_visual_area
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3448 && search_attr == 0
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3449 && area_attr == 0)
22818
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents: 22280
diff changeset
3450 # ifdef FEAT_DIFF
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
3451 && wlv.filler_todo <= 0
22818
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents: 22280
diff changeset
3452 # endif
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents: 22280
diff changeset
3453 )
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3454 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3455 if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3456 && lnum != wp->w_cursor.lnum)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3457 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3458 vcol_save_attr = wlv.char_attr;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3459 wlv.char_attr = hl_combine_attr(wlv.char_attr,
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3460 HL_ATTR(HLF_CUC));
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3461 }
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3462 else if (wlv.draw_color_col && VCOL_HLC == *wlv.color_cols)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3463 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3464 vcol_save_attr = wlv.char_attr;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3465 wlv.char_attr = hl_combine_attr(wlv.char_attr, HL_ATTR(HLF_MC));
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3466 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3467 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3468 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3469
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3470 // Store character to be displayed.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3471 // Skip characters that are left of the screen for 'nowrap'.
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3472 vcol_prev = wlv.vcol;
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3473 if (wlv.draw_state < WL_LINE || n_skip <= 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3474 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3475 // Store the character.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3476 #if defined(FEAT_RIGHTLEFT)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3477 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3478 {
26771
fc859aea8cec patch 8.2.3914: various spelling mistakes in comments
Bram Moolenaar <Bram@vim.org>
parents: 26690
diff changeset
3479 // A double-wide character is: put first half in left cell.
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3480 --wlv.off;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3481 --wlv.col;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3482 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3483 #endif
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3484 ScreenLines[wlv.off] = c;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3485 if (enc_dbcs == DBCS_JPNU)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3486 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3487 if ((mb_c & 0xff00) == 0x8e00)
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3488 ScreenLines[wlv.off] = 0x8e;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3489 ScreenLines2[wlv.off] = mb_c & 0xff;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3490 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3491 else if (enc_utf8)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3492 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3493 if (mb_utf8)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3494 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3495 int i;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3496
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3497 ScreenLinesUC[wlv.off] = mb_c;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3498 if ((c & 0xff) == 0)
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3499 ScreenLines[wlv.off] = 0x80; // avoid storing zero
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3500 for (i = 0; i < Screen_mco; ++i)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3501 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3502 ScreenLinesC[i][wlv.off] = u8cc[i];
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3503 if (u8cc[i] == 0)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3504 break;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3505 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3506 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3507 else
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3508 ScreenLinesUC[wlv.off] = 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3509 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3510 if (multi_attr)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3511 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3512 ScreenAttrs[wlv.off] = multi_attr;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3513 multi_attr = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3514 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3515 else
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3516 ScreenAttrs[wlv.off] = wlv.char_attr;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3517
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3518 ScreenCols[wlv.off] = (colnr_T)(prev_ptr - line);
29413
34e93e046526 patch 9.0.0048: cursor in wrong column with mouse click after concealed text
Bram Moolenaar <Bram@vim.org>
parents: 29387
diff changeset
3519
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3520 if (has_mbyte && (*mb_char2cells)(mb_c) > 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3521 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3522 // Need to fill two screen columns.
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3523 ++wlv.off;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3524 ++wlv.col;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3525 if (enc_utf8)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3526 // UTF-8: Put a 0 in the second screen char.
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3527 ScreenLines[wlv.off] = 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3528 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3529 // DBCS: Put second byte in the second screen char.
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3530 ScreenLines[wlv.off] = mb_c & 0xff;
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3531 if (wlv.draw_state > WL_NR
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3532 #ifdef FEAT_DIFF
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
3533 && wlv.filler_todo <= 0
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3534 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3535 )
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3536 ++wlv.vcol;
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
3537 // When "wlv.tocol" is halfway a character, set it to the end
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
3538 // of the character, otherwise highlighting won't stop.
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
3539 if (wlv.tocol == wlv.vcol)
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
3540 ++wlv.tocol;
29413
34e93e046526 patch 9.0.0048: cursor in wrong column with mouse click after concealed text
Bram Moolenaar <Bram@vim.org>
parents: 29387
diff changeset
3541
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3542 ScreenCols[wlv.off] = (colnr_T)(prev_ptr - line);
29413
34e93e046526 patch 9.0.0048: cursor in wrong column with mouse click after concealed text
Bram Moolenaar <Bram@vim.org>
parents: 29387
diff changeset
3543
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3544 #ifdef FEAT_RIGHTLEFT
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3545 if (wp->w_p_rl)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3546 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3547 // now it's time to backup one cell
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3548 --wlv.off;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3549 --wlv.col;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3550 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3551 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3552 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3553 #ifdef FEAT_RIGHTLEFT
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3554 if (wp->w_p_rl)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3555 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3556 --wlv.off;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3557 --wlv.col;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3558 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3559 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3560 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3561 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3562 ++wlv.off;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3563 ++wlv.col;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3564 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3565 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3566 #ifdef FEAT_CONCEAL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3567 else if (wp->w_p_cole > 0 && is_concealing)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3568 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3569 --n_skip;
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3570 ++wlv.vcol_off;
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3571 if (wlv.n_extra > 0)
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3572 wlv.vcol_off += wlv.n_extra;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3573 if (wp->w_p_wrap)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3574 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3575 // Special voodoo required if 'wrap' is on.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3576 //
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3577 // Advance the column indicator to force the line
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3578 // drawing to wrap early. This will make the line
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3579 // take up the same screen space when parts are concealed,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3580 // so that cursor line computations aren't messed up.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3581 //
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3582 // To avoid the fictitious advance of 'wlv.col' causing
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3583 // trailing junk to be written out of the screen line
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3584 // we are building, 'boguscols' keeps track of the number
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3585 // of bad columns we have advanced.
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3586 if (wlv.n_extra > 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3587 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3588 wlv.vcol += wlv.n_extra;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3589 # ifdef FEAT_RIGHTLEFT
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3590 if (wp->w_p_rl)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3591 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3592 wlv.col -= wlv.n_extra;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3593 wlv.boguscols -= wlv.n_extra;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3594 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3595 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3596 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3597 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3598 wlv.col += wlv.n_extra;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3599 wlv.boguscols += wlv.n_extra;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3600 }
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3601 wlv.n_extra = 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3602 n_attr = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3603 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3604
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3605
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3606 if (has_mbyte && (*mb_char2cells)(mb_c) > 1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3607 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3608 // Need to fill two screen columns.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3609 # ifdef FEAT_RIGHTLEFT
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3610 if (wp->w_p_rl)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3611 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3612 --wlv.boguscols;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3613 --wlv.col;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3614 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3615 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3616 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3617 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3618 ++wlv.boguscols;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3619 ++wlv.col;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3620 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3621 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3622
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3623 # ifdef FEAT_RIGHTLEFT
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3624 if (wp->w_p_rl)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3625 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3626 --wlv.boguscols;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3627 --wlv.col;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3628 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3629 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3630 # endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3631 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3632 ++wlv.boguscols;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3633 ++wlv.col;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3634 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3635 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3636 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3637 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3638 if (wlv.n_extra > 0)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3639 {
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3640 wlv.vcol += wlv.n_extra;
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3641 wlv.n_extra = 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3642 n_attr = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3643 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3644 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3645
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3646 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3647 #endif // FEAT_CONCEAL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3648 else
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3649 --n_skip;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3650
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3651 // Only advance the "wlv.vcol" when after the 'number' or
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3652 // 'relativenumber' column.
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3653 if (wlv.draw_state > WL_NR
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3654 #ifdef FEAT_DIFF
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
3655 && wlv.filler_todo <= 0
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3656 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3657 )
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3658 ++wlv.vcol;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3659
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3660 #ifdef FEAT_SYN_HL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3661 if (vcol_save_attr >= 0)
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3662 wlv.char_attr = vcol_save_attr;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3663 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3664
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3665 // restore attributes after "predeces" in 'listchars'
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3666 if (wlv.draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0)
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3667 wlv.char_attr = saved_attr3;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3668
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3669 // restore attributes after last 'listchars' or 'number' char
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3670 if (n_attr > 0 && wlv.draw_state == WL_LINE
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
3671 && n_attr_skip == 0 && --n_attr == 0)
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3672 wlv.char_attr = saved_attr2;
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
3673 if (n_attr_skip > 0)
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
3674 --n_attr_skip;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3675
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3676 // At end of screen line and there is more to come: Display the line
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3677 // so far. If there is no more to display it is caught above.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3678 if ((
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3679 #ifdef FEAT_RIGHTLEFT
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3680 wp->w_p_rl ? (wlv.col < 0) :
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3681 #endif
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3682 (wlv.col >= wp->w_width))
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3683 && (wlv.draw_state != WL_LINE
25170
ac54d215fbec patch 8.2.3121: 'listchars' "exceeds" character appears in foldcolumn
Bram Moolenaar <Bram@vim.org>
parents: 24950
diff changeset
3684 || *ptr != NUL
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3685 #ifdef FEAT_DIFF
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
3686 || wlv.filler_todo > 0
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3687 #endif
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
3688 #ifdef FEAT_PROP_POPUP
30231
0d084880276a patch 9.0.0451: virtual text "above" does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30213
diff changeset
3689 || text_prop_above || text_prop_follows
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
3690 #endif
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
3691 || (wp->w_p_list && wp->w_lcs_chars.eol != NUL
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3692 && wlv.p_extra != at_end_str)
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3693 || (wlv.n_extra != 0 && (wlv.c_extra != NUL
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3694 || *wlv.p_extra != NUL)))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3695 )
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3696 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3697 #ifdef FEAT_CONCEAL
30628
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
3698 wlv.col += wlv.boguscols;
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
3699 wlv_screen_line(wp, &wlv, FALSE);
2d7905da4e82 patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents: 30614
diff changeset
3700 wlv.col -= wlv.boguscols;
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3701 wlv.boguscols = 0;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3702 #else
30632
8c0232ab725c patch 9.0.0651: build fails without the +conceal feature
Bram Moolenaar <Bram@vim.org>
parents: 30628
diff changeset
3703 wlv_screen_line(wp, &wlv, FALSE);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3704 #endif
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3705 ++wlv.row;
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3706 ++wlv.screen_row;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3707
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3708 // When not wrapping and finished diff lines, or when displayed
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3709 // '$' and highlighting until last column, break here.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3710 if ((!wp->w_p_wrap
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3711 #ifdef FEAT_DIFF
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
3712 && wlv.filler_todo <= 0
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
3713 #endif
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
3714 #ifdef FEAT_PROP_POPUP
30231
0d084880276a patch 9.0.0451: virtual text "above" does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30213
diff changeset
3715 && !text_prop_above && !text_prop_follows
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3716 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3717 ) || lcs_eol_one == -1)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3718 break;
29635
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
3719 #ifdef FEAT_PROP_POPUP
30231
0d084880276a patch 9.0.0451: virtual text "above" does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30213
diff changeset
3720 if (!wp->w_p_wrap && text_prop_follows && !text_prop_above)
29635
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
3721 {
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
3722 // do not output more of the line, only the "below" prop
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
3723 ptr += STRLEN(ptr);
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
3724 # ifdef FEAT_LINEBREAK
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
3725 wlv.dont_use_showbreak = TRUE;
29635
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
3726 # endif
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
3727 }
592818fd3110 patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents: 29633
diff changeset
3728 #endif
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3729
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3730 // When the window is too narrow draw all "@" lines.
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3731 if (wlv.draw_state != WL_LINE
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3732 #ifdef FEAT_DIFF
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
3733 && wlv.filler_todo <= 0
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3734 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3735 )
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3736 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3737 win_draw_end(wp, '@', ' ', TRUE, wlv.row, wp->w_height, HLF_AT);
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3738 draw_vsep_win(wp, wlv.row);
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3739 wlv.row = endrow;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3740 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3741
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3742 // When line got too long for screen break here.
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3743 if (wlv.row == endrow)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3744 {
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3745 ++wlv.row;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3746 break;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3747 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3748
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3749 if (screen_cur_row == wlv.screen_row - 1
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3750 #ifdef FEAT_DIFF
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
3751 && wlv.filler_todo <= 0
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3752 #endif
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
3753 #ifdef FEAT_PROP_POPUP
30231
0d084880276a patch 9.0.0451: virtual text "above" does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 30213
diff changeset
3754 && !text_prop_above && !text_prop_follows
29560
14b139cbec49 patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents: 29550
diff changeset
3755 #endif
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3756 && wp->w_width == Columns)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3757 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3758 // Remember that the line wraps, used for modeless copy.
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3759 LineWraps[wlv.screen_row - 1] = TRUE;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3760
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3761 // Special trick to make copy/paste of wrapped lines work with
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3762 // xterm/screen: write an extra character beyond the end of
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3763 // the line. This will work with all terminal types
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3764 // (regardless of the xn,am settings).
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3765 // Only do this on a fast tty.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3766 // Only do this if the cursor is on the current line
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3767 // (something has been written in it).
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3768 // Don't do this for the GUI.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3769 // Don't do this for double-width characters.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3770 // Don't do this for a window not at the right screen border.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3771 if (p_tf
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3772 #ifdef FEAT_GUI
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3773 && !gui.in_use
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3774 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3775 && !(has_mbyte
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3776 && ((*mb_off2cells)(LineOffset[wlv.screen_row],
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3777 LineOffset[wlv.screen_row] + screen_Columns)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3778 == 2
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3779 || (*mb_off2cells)(
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3780 LineOffset[wlv.screen_row - 1]
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3781 + (int)Columns - 2,
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3782 LineOffset[wlv.screen_row]
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3783 + screen_Columns) == 2)))
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3784 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3785 // First make sure we are at the end of the screen line,
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3786 // then output the same character again to let the
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3787 // terminal know about the wrap. If the terminal doesn't
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3788 // auto-wrap, we overwrite the character.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3789 if (screen_cur_col != wp->w_width)
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3790 screen_char(LineOffset[wlv.screen_row - 1]
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3791 + (unsigned)Columns - 1,
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3792 wlv.screen_row - 1, (int)(Columns - 1));
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3793
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3794 // When there is a multi-byte character, just output a
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3795 // space to keep it simple.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3796 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3797 wlv.screen_row - 1] + (Columns - 1)]) > 1)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3798 out_char(' ');
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3799 else
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3800 out_char(ScreenLines[LineOffset[wlv.screen_row - 1]
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3801 + (Columns - 1)]);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3802 // force a redraw of the first char on the next line
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3803 ScreenAttrs[LineOffset[wlv.screen_row]] = (sattr_T)-1;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3804 screen_start(); // don't know where cursor is now
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3805 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3806 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3807
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3808 win_line_start(wp, &wlv, TRUE);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3809
23952
44be09b25619 patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents: 23901
diff changeset
3810 lcs_prec_todo = wp->w_lcs_chars.prec;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3811 #ifdef FEAT_LINEBREAK
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
3812 if (!wlv.dont_use_showbreak
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3813 # ifdef FEAT_DIFF
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
3814 && wlv.filler_todo <= 0
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3815 # endif
29615
bab343b21da8 patch 9.0.0148: a "below" aligned text property gets 'showbreak' displayed
Bram Moolenaar <Bram@vim.org>
parents: 29611
diff changeset
3816 )
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
3817 wlv.need_showbreak = TRUE;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3818 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3819 #ifdef FEAT_DIFF
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
3820 --wlv.filler_todo;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3821 // When the filler lines are actually below the last line of the
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3822 // file, don't draw the line itself, break here.
30367
95bf6aa369ee patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30365
diff changeset
3823 if (wlv.filler_todo == 0 && wp->w_botfill)
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3824 break;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3825 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3826 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3827
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3828 } // for every character in the line
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3829
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3830 #ifdef FEAT_SPELL
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3831 // After an empty line check first word for capital.
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3832 if (*skipwhite(line) == NUL)
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3833 {
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3834 capcol_lnum = lnum + 1;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3835 cap_col = 0;
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3836 }
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3837 #endif
18763
49b78d6465e5 patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents: 18720
diff changeset
3838 #ifdef FEAT_PROP_POPUP
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3839 vim_free(text_props);
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3840 vim_free(text_prop_idxs);
29625
78418bd45852 patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents: 29623
diff changeset
3841 vim_free(p_extra_free2);
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3842 #endif
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3843
30391
5aaacdeee0a1 patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents: 30383
diff changeset
3844 vim_free(wlv.p_extra_free);
29621
f1ed6f520d09 patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents: 29615
diff changeset
3845 return wlv.row;
18124
2a806e3c39f6 patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3846 }