Mercurial > vim
annotate src/drawline.c @ 31686:966f1213dd35 v9.0.1175
patch 9.0.1175: the set_ref_in_item() function is too long
Commit: https://github.com/vim/vim/commit/ea125393af01ecaf75cee8e085a57f8143f3ae3e
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Wed Jan 11 11:46:17 2023 +0000
patch 9.0.1175: the set_ref_in_item() function is too long
Problem: The set_ref_in_item() function is too long.
Solution: Use a separate function for more complicated types. (Yegappan
Lakshmanan, closes #11802)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 11 Jan 2023 13:00:05 +0100 |
parents | 68fed60575ca |
children | 7d0025a2940a |
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 |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
78 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
79 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
80 // using an attribute for the whole line |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
81 # define LINE_ATTR |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
82 #endif |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
83 |
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
|
84 // 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
|
85 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
|
86 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
|
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 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
|
89 |
78418bd45852
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 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
|
91 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
|
92 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
|
93 |
78418bd45852
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 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
|
95 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
|
96 #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
|
97 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
|
98 // 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
|
99 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
|
100 #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
|
101 #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
|
102 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
|
103 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
|
104 #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
|
105 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
|
106 |
78418bd45852
patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents:
29623
diff
changeset
|
107 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
|
108 |
78418bd45852
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 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
|
110 // 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
|
111 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
|
112 #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
|
113 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
|
114 #endif |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
115 #ifdef LINE_ATTR |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
116 int line_attr; // for the whole line, includes 'cursorline' |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
117 #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
|
118 |
78418bd45852
patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents:
29623
diff
changeset
|
119 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
|
120 |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
121 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
|
122 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
|
123 |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
124 #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
|
125 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
|
126 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
|
127 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
|
128 #endif |
30397
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
129 #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
|
130 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
|
131 #endif |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
132 |
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 // 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
|
134 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
|
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 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
|
137 |
78418bd45852
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 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
|
139 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
|
140 // 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
|
141 char_u *p_extra_free; // p_extra buffer that needs to be freed |
31119
e2c909e06424
patch 9.0.0894: virtual text property highlight ignores window background
Bram Moolenaar <Bram@vim.org>
parents:
31113
diff
changeset
|
142 int extra_attr; // attributes for p_extra, should be combined |
e2c909e06424
patch 9.0.0894: virtual text property highlight ignores window background
Bram Moolenaar <Bram@vim.org>
parents:
31113
diff
changeset
|
143 // with win_attr if needed |
31323
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
144 int n_attr_skip; // chars to skip before using extra_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
|
145 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
|
146 int c_final; // final char, mandatory if set |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
147 int extra_for_textprop; // wlv.n_extra set for textprop |
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
|
148 |
78418bd45852
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 // 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
|
150 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
|
151 char_u *saved_p_extra; |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
152 int saved_extra_attr; |
31323
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
153 int saved_n_attr_skip; |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
154 int saved_extra_for_textprop; |
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 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
|
156 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
|
157 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
|
158 |
30383
9126e872893d
patch 9.0.0527: long sign text may overflow buffer
Bram Moolenaar <Bram@vim.org>
parents:
30375
diff
changeset
|
159 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
|
160 // "%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
|
161 // 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
|
162 |
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
|
163 #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
|
164 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
|
165 #endif |
30367
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
166 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
|
167 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
|
168 #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
|
169 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
|
170 #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
|
171 } 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
|
172 |
78418bd45852
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 // 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
|
174 #define WL_START 0 // nothing done yet, must be zero |
30645
101f08b49ed3
patch 9.0.0657: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
30635
diff
changeset
|
175 #define WL_CMDLINE (WL_START + 1) // cmdline window 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
|
176 #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
|
177 # 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
|
178 #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
|
179 # 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
|
180 #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
|
181 #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
|
182 # 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
|
183 #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
|
184 # 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
|
185 #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
|
186 #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
|
187 #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
|
188 # 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
|
189 #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
|
190 # 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
|
191 #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
|
192 #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
|
193 # 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
|
194 #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
|
195 # 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
|
196 #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
|
197 #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
|
198 |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
199 #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
|
200 /* |
26266
365e7f083f02
patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
25778
diff
changeset
|
201 * 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
|
202 */ |
365e7f083f02
patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
25778
diff
changeset
|
203 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
|
204 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
|
205 { |
365e7f083f02
patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
25778
diff
changeset
|
206 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
|
207 && 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
|
208 && (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
|
209 } |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
210 #endif |
26266
365e7f083f02
patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
25778
diff
changeset
|
211 |
30391
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 #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
|
214 /* |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
215 * 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
|
216 */ |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
217 static void |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
218 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
|
219 { |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
220 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
|
221 |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
222 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
|
223 return; |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
224 |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
225 // 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
|
226 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
|
227 wlv->p_extra_free = alloc(MAX_MCO * fdc + 1); |
31531
6e24001000ed
patch 9.0.1098: code uses too much indent
Bram Moolenaar <Bram@vim.org>
parents:
31473
diff
changeset
|
228 if (wlv->p_extra_free == NULL) |
6e24001000ed
patch 9.0.1098: code uses too much indent
Bram Moolenaar <Bram@vim.org>
parents:
31473
diff
changeset
|
229 return; |
6e24001000ed
patch 9.0.1098: code uses too much indent
Bram Moolenaar <Bram@vim.org>
parents:
31473
diff
changeset
|
230 |
6e24001000ed
patch 9.0.1098: code uses too much indent
Bram Moolenaar <Bram@vim.org>
parents:
31473
diff
changeset
|
231 wlv->n_extra = (int)fill_foldcolumn(wlv->p_extra_free, |
6e24001000ed
patch 9.0.1098: code uses too much indent
Bram Moolenaar <Bram@vim.org>
parents:
31473
diff
changeset
|
232 wp, FALSE, wlv->lnum); |
6e24001000ed
patch 9.0.1098: code uses too much indent
Bram Moolenaar <Bram@vim.org>
parents:
31473
diff
changeset
|
233 wlv->p_extra_free[wlv->n_extra] = NUL; |
6e24001000ed
patch 9.0.1098: code uses too much indent
Bram Moolenaar <Bram@vim.org>
parents:
31473
diff
changeset
|
234 wlv->p_extra = wlv->p_extra_free; |
6e24001000ed
patch 9.0.1098: code uses too much indent
Bram Moolenaar <Bram@vim.org>
parents:
31473
diff
changeset
|
235 wlv->c_extra = NUL; |
6e24001000ed
patch 9.0.1098: code uses too much indent
Bram Moolenaar <Bram@vim.org>
parents:
31473
diff
changeset
|
236 wlv->c_final = NUL; |
6e24001000ed
patch 9.0.1098: code uses too much indent
Bram Moolenaar <Bram@vim.org>
parents:
31473
diff
changeset
|
237 if (use_cursor_line_highlight(wp, wlv->lnum)) |
6e24001000ed
patch 9.0.1098: code uses too much indent
Bram Moolenaar <Bram@vim.org>
parents:
31473
diff
changeset
|
238 wlv->char_attr = hl_combine_attr(wlv->wcr_attr, HL_ATTR(HLF_CLF)); |
6e24001000ed
patch 9.0.1098: code uses too much indent
Bram Moolenaar <Bram@vim.org>
parents:
31473
diff
changeset
|
239 else |
6e24001000ed
patch 9.0.1098: code uses too much indent
Bram Moolenaar <Bram@vim.org>
parents:
31473
diff
changeset
|
240 wlv->char_attr = hl_combine_attr(wlv->wcr_attr, HL_ATTR(HLF_FC)); |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
241 } |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
242 #endif |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
243 |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
244 #ifdef FEAT_SIGNS |
26266
365e7f083f02
patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
25778
diff
changeset
|
245 /* |
30367
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
246 * 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
|
247 * "wp". |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
248 * 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
|
249 * 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
|
250 */ |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
251 static void |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
252 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
|
253 int nrcol, |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
254 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
|
255 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
|
256 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
257 int text_sign; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
258 # 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
|
259 int icon_sign; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
260 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
261 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
262 // 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
|
263 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
|
264 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
|
265 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
|
266 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
|
267 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
268 { |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
269 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
|
270 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
|
271 else |
30367
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
272 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
|
273 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
|
274 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
275 |
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
|
276 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
|
277 #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
|
278 + 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
|
279 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
280 ) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
281 { |
30367
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
282 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
|
283 # 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
|
284 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
|
285 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
|
286 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
287 // 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
|
288 if (nrcol) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
289 { |
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
|
290 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
|
291 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
|
292 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
|
293 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
|
294 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
|
295 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
296 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
|
297 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
|
298 # 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
|
299 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
|
300 > 1)) |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
301 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
302 if (nrcol) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
303 { |
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
|
304 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
|
305 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
|
306 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
|
307 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
|
308 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
|
309 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
310 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
|
311 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
|
312 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
313 # 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
|
314 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
|
315 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
|
316 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
317 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
318 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
319 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
|
320 { |
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->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
|
322 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
|
323 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
324 if (nrcol) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
325 { |
30383
9126e872893d
patch 9.0.0527: long sign text may overflow buffer
Bram Moolenaar <Bram@vim.org>
parents:
30375
diff
changeset
|
326 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
|
327 int n; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
328 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
329 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
|
330 wlv->extra[n] = ' '; |
30383
9126e872893d
patch 9.0.0527: long sign text may overflow buffer
Bram Moolenaar <Bram@vim.org>
parents:
30375
diff
changeset
|
331 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
|
332 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
|
333 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
|
334 } |
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
|
335 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
|
336 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
|
337 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
|
338 } |
26266
365e7f083f02
patch 8.2.3664: cannot adjust sign highlighting for 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
25778
diff
changeset
|
339 |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
340 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
|
341 && 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
|
342 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
|
343 else |
30367
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
344 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
|
345 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
346 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
347 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
348 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
349 |
30367
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
350 /* |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
351 * 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
|
352 * 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
|
353 */ |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
354 static void |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
355 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
|
356 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
|
357 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
|
358 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
|
359 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
|
360 { |
30689
ac8467091916
patch 9.0.0679: tests failing with 'smoothscroll', 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents:
30685
diff
changeset
|
361 int has_cpo_n = vim_strchr(p_cpo, CPO_NUMCOL) != NULL; |
30900
51ffb2dedf04
patch 9.0.0784: text prop "above" not right with 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents:
30847
diff
changeset
|
362 int lnum_row = wlv->startrow + wlv->filler_lines |
51ffb2dedf04
patch 9.0.0784: text prop "above" not right with 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents:
30847
diff
changeset
|
363 #ifdef FEAT_PROP_POPUP |
51ffb2dedf04
patch 9.0.0784: text prop "above" not right with 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents:
30847
diff
changeset
|
364 + wlv->text_prop_above_count |
51ffb2dedf04
patch 9.0.0784: text prop "above" not right with 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents:
30847
diff
changeset
|
365 #endif |
51ffb2dedf04
patch 9.0.0784: text prop "above" not right with 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents:
30847
diff
changeset
|
366 ; |
30689
ac8467091916
patch 9.0.0679: tests failing with 'smoothscroll', 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents:
30685
diff
changeset
|
367 |
30367
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
368 if ((wp->w_p_nu || wp->w_p_rnu) |
30900
51ffb2dedf04
patch 9.0.0784: text prop "above" not right with 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents:
30847
diff
changeset
|
369 && (wlv->row <= lnum_row || !has_cpo_n) |
30691
024e1c1da31f
patch 9.0.0680: tests failing with 'breakindent', 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents:
30689
diff
changeset
|
370 // there is no line number in a wrapped line when "n" is in |
024e1c1da31f
patch 9.0.0680: tests failing with 'breakindent', 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents:
30689
diff
changeset
|
371 // 'cpoptions', but 'breakindent' assumes it anyway. |
024e1c1da31f
patch 9.0.0680: tests failing with 'breakindent', 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents:
30689
diff
changeset
|
372 && !((has_cpo_n |
024e1c1da31f
patch 9.0.0680: tests failing with 'breakindent', 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents:
30689
diff
changeset
|
373 #ifdef FEAT_LINEBREAK |
024e1c1da31f
patch 9.0.0680: tests failing with 'breakindent', 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents:
30689
diff
changeset
|
374 && !wp->w_p_bri |
024e1c1da31f
patch 9.0.0680: tests failing with 'breakindent', 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents:
30689
diff
changeset
|
375 #endif |
024e1c1da31f
patch 9.0.0680: tests failing with 'breakindent', 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents:
30689
diff
changeset
|
376 ) && wp->w_skipcol > 0 && wlv->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
|
377 { |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
378 #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
|
379 // 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
|
380 // 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
|
381 // number. |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
382 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
|
383 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
|
384 else |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
385 #endif |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
386 { |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
387 // 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
|
388 // 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
|
389 // below them. |
30900
51ffb2dedf04
patch 9.0.0784: text prop "above" not right with 'number' and "n" in 'cpo'
Bram Moolenaar <Bram@vim.org>
parents:
30847
diff
changeset
|
390 if (wlv->row == lnum_row |
30845
fa3aba805a34
patch 9.0.0757: line number not visisble with 'smoothscroll', 'nu' and 'rnu'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
391 && (wp->w_skipcol == 0 || wlv->row > wp->w_winrow |
fa3aba805a34
patch 9.0.0757: line number not visisble with 'smoothscroll', 'nu' and 'rnu'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
392 || (wp->w_p_nu && wp->w_p_rnu))) |
30367
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
393 { |
30397
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
394 long num; |
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
395 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
|
396 |
30397
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
397 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
|
398 // 'number' + 'norelativenumber' |
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
399 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
|
400 else |
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
401 { |
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
402 // '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
|
403 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
|
404 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
|
405 { |
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
406 // 'number' + 'relativenumber' |
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
407 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
|
408 fmt = "%-*ld "; |
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 |
30397
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
412 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
|
413 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
|
414 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
|
415 ++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
|
416 *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
|
417 #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
|
418 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
|
419 { |
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
420 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
|
421 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
|
422 |
30397
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
423 // 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
|
424 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
|
425 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
|
426 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
|
427 { |
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
428 t = *p1; |
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
429 *p1 = *p2; |
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
430 *p2 = t; |
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
431 } |
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
432 } |
30367
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
433 #endif |
30397
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
434 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
|
435 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
|
436 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
|
437 } |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
438 else |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
439 { |
30397
3f2fcc517d79
patch 9.0.0534: line number is displayed at virtual text "above"
Bram Moolenaar <Bram@vim.org>
parents:
30395
diff
changeset
|
440 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
|
441 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
|
442 } |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
443 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
|
444 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
|
445 #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
|
446 // 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
|
447 // 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
|
448 // 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
|
449 // 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
|
450 // 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
|
451 // 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
|
452 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
|
453 && 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
|
454 && (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
|
455 && (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
|
456 || (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
|
457 && (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
|
458 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
|
459 #endif |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
460 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
|
461 && 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
|
462 // Use LineNrAbove |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
463 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
|
464 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
|
465 && 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
|
466 // Use LineNrBelow |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
467 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
|
468 } |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
469 #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
|
470 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
|
471 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
|
472 #endif |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
473 } |
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
474 } |
30375
e40d150b66cb
patch 9.0.0523: more compiler warnings for arguments in small version
Bram Moolenaar <Bram@vim.org>
parents:
30371
diff
changeset
|
475 |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
476 #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
|
477 static void |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
478 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
|
479 { |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
480 if (wp->w_briopt_sbr && wlv->draw_state == WL_BRI - 1 |
30773
fc9993c5835a
patch 9.0.0721: virtual text "above" with padding not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents:
30767
diff
changeset
|
481 && *get_showbreak_value(wp) != NUL) |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
482 // 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
|
483 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
|
484 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
|
485 // 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
|
486 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
|
487 |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
488 // 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
|
489 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
|
490 { |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
491 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
|
492 // 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
|
493 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
|
494 # 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
|
495 && 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
|
496 # endif |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
497 # 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
|
498 && !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
|
499 # endif |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
500 ) |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
501 { |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
502 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
|
503 # 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
|
504 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
|
505 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
|
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 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
|
508 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
|
509 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
|
510 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
|
511 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
|
512 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
|
513 { |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
514 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
|
515 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
|
516 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
|
517 } |
30610
6c6ac189a05f
patch 9.0.0640: cannot scroll by screen line if a line wraps
Bram Moolenaar <Bram@vim.org>
parents:
30509
diff
changeset
|
518 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
|
519 && 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
|
520 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
|
521 // 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
|
522 // 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
|
523 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
|
524 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
|
525 } |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
526 } |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
527 } |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
528 #endif |
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
529 |
30395
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
530 #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
|
531 static void |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
532 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
|
533 { |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
534 # 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
|
535 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
|
536 { |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
537 // 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
|
538 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
|
539 { |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
540 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
|
541 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
|
542 } |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
543 else |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
544 { |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
545 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
|
546 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
|
547 } |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
548 # 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
|
549 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
|
550 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
|
551 else |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
552 # endif |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
553 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
|
554 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
|
555 } |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
556 # endif |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
557 |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
558 # 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
|
559 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
|
560 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
|
561 { |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
562 // 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
|
563 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
|
564 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
|
565 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
|
566 wlv->n_extra = (int)STRLEN(sbr); |
30614
50b2da7068d6
patch 9.0.0642: breakindent test fails
Bram Moolenaar <Bram@vim.org>
parents:
30610
diff
changeset
|
567 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
|
568 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
|
569 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
|
570 // 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
|
571 // 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
|
572 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
|
573 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
|
574 // 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
|
575 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
|
576 # 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
|
577 // 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
|
578 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
|
579 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
|
580 # endif |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
581 } |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
582 # endif |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
583 } |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
584 #endif |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
585 |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
586 #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
|
587 /* |
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
588 * 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
|
589 */ |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
590 static int |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
591 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
|
592 win_T *wp, |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
593 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
|
594 int added, |
30741
11875afe85b2
patch 9.0.0705: virtual text truncation does not take padding into account
Bram Moolenaar <Bram@vim.org>
parents:
30713
diff
changeset
|
595 int padding, |
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
596 char_u *text, |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
597 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
|
598 { |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
599 int space = (flags & (TP_FLAG_ALIGN_BELOW | TP_FLAG_ALIGN_ABOVE)) |
30759
b41ccaa6fd84
patch 9.0.0714: with 'nowrap' two virtual text below not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents:
30749
diff
changeset
|
600 ? wp->w_width - win_col_off(wp) : added; |
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
601 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
|
602 int strsize = 0; |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
603 int n_used; |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
604 |
30781
82fd47d71971
patch 9.0.0725: virtual text "after" wraps to next line when 'wrap' is off
Bram Moolenaar <Bram@vim.org>
parents:
30777
diff
changeset
|
605 // if the remaining size is to small and 'wrap' is set we wrap anyway and |
82fd47d71971
patch 9.0.0725: virtual text "after" wraps to next line when 'wrap' is off
Bram Moolenaar <Bram@vim.org>
parents:
30777
diff
changeset
|
606 // use the next line |
82fd47d71971
patch 9.0.0725: virtual text "after" wraps to next line when 'wrap' is off
Bram Moolenaar <Bram@vim.org>
parents:
30777
diff
changeset
|
607 if (space < PROP_TEXT_MIN_CELLS && wp->w_p_wrap) |
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
608 space += wp->w_width; |
30773
fc9993c5835a
patch 9.0.0721: virtual text "above" with padding not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents:
30767
diff
changeset
|
609 if (flags & (TP_FLAG_ALIGN_BELOW | TP_FLAG_ALIGN_ABOVE)) |
30741
11875afe85b2
patch 9.0.0705: virtual text truncation does not take padding into account
Bram Moolenaar <Bram@vim.org>
parents:
30713
diff
changeset
|
610 space -= padding; |
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
611 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
|
612 { |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
613 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
|
614 |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
615 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
|
616 break; |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
617 strsize += clen; |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
618 } |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
619 *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
|
620 return strsize; |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
621 } |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
622 |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
623 /* |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
624 * 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
|
625 * line. |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
626 * 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
|
627 * 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
|
628 * 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
|
629 * 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
|
630 */ |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
631 int |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
632 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
|
633 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
|
634 textprop_T *tp, |
31257
6ebd92646276
patch 9.0.0962: virtual text below cannot be placed below empty lines
Bram Moolenaar <Bram@vim.org>
parents:
31223
diff
changeset
|
635 int vcol, // current text column |
30749
6fe513996997
patch 9.0.0709: virtual text "after" not correct with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
30741
diff
changeset
|
636 int scr_col, // current screen column |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
637 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
|
638 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
|
639 int *n_attr, // attribute cells, NULL if not used |
31371
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
640 int *n_attr_skip, // cells to skip attr, NULL if not used |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
641 int do_skip) // skip_cells is not zero |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
642 { |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
643 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
|
644 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
|
645 int below = (tp->tp_flags & TP_FLAG_ALIGN_BELOW); |
31584
cfc60c536a2f
patch 9.0.1124: virtual text at a column position is truncated
Bram Moolenaar <Bram@vim.org>
parents:
31531
diff
changeset
|
646 int wrap = tp->tp_col < MAXCOL || (tp->tp_flags & TP_FLAG_WRAP); |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
647 int padding = tp->tp_col == MAXCOL && tp->tp_len > 1 |
31257
6ebd92646276
patch 9.0.0962: virtual text below cannot be placed below empty lines
Bram Moolenaar <Bram@vim.org>
parents:
31223
diff
changeset
|
648 ? tp->tp_len - 1 : 0; |
30749
6fe513996997
patch 9.0.0709: virtual text "after" not correct with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
30741
diff
changeset
|
649 int col_with_padding = scr_col + (below ? 0 : padding); |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
650 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
|
651 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
|
652 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
|
653 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
|
654 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
|
655 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
|
656 int cells = wrap ? strsize : textprop_size_after_trunc(wp, |
30741
11875afe85b2
patch 9.0.0705: virtual text truncation does not take padding into account
Bram Moolenaar <Bram@vim.org>
parents:
30713
diff
changeset
|
657 tp->tp_flags, before, padding, *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
|
658 |
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
659 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
|
660 { |
30767
5dba398584fd
patch 9.0.0718: extra empty line between two virtual text "below"
Bram Moolenaar <Bram@vim.org>
parents:
30765
diff
changeset
|
661 int col_off = win_col_off(wp) - win_col_off2(wp); |
30365
748b8dcfba57
patch 9.0.0518: virtual text highlight starts too early with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
30361
diff
changeset
|
662 |
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
663 if (above) |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
664 { |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
665 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
|
666 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
|
667 } |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
668 else |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
669 { |
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
670 // 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
|
671 if (right) |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
672 before -= cells; |
31257
6ebd92646276
patch 9.0.0962: virtual text below cannot be placed below empty lines
Bram Moolenaar <Bram@vim.org>
parents:
31223
diff
changeset
|
673 |
6ebd92646276
patch 9.0.0962: virtual text below cannot be placed below empty lines
Bram Moolenaar <Bram@vim.org>
parents:
31223
diff
changeset
|
674 // Below-align: empty line add one character |
31283
0db9f6400e71
patch 9.0.0975: virtual text below empty line misplaced when 'number' set
Bram Moolenaar <Bram@vim.org>
parents:
31257
diff
changeset
|
675 if (below && vcol == 0 && col_with_padding == col_off |
0db9f6400e71
patch 9.0.0975: virtual text below empty line misplaced when 'number' set
Bram Moolenaar <Bram@vim.org>
parents:
31257
diff
changeset
|
676 && wp->w_width - col_off == before) |
0db9f6400e71
patch 9.0.0975: virtual text below empty line misplaced when 'number' set
Bram Moolenaar <Bram@vim.org>
parents:
31257
diff
changeset
|
677 col_with_padding += 1; |
31257
6ebd92646276
patch 9.0.0962: virtual text below cannot be placed below empty lines
Bram Moolenaar <Bram@vim.org>
parents:
31223
diff
changeset
|
678 |
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
679 if (before < 0 |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
680 || !(right || below) |
31257
6ebd92646276
patch 9.0.0962: virtual text below cannot be placed below empty lines
Bram Moolenaar <Bram@vim.org>
parents:
31223
diff
changeset
|
681 || (below ? (col_with_padding <= col_off || !wp->w_p_wrap) |
6ebd92646276
patch 9.0.0962: virtual text below cannot be placed below empty lines
Bram Moolenaar <Bram@vim.org>
parents:
31223
diff
changeset
|
682 : (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
|
683 { |
30781
82fd47d71971
patch 9.0.0725: virtual text "after" wraps to next line when 'wrap' is off
Bram Moolenaar <Bram@vim.org>
parents:
30777
diff
changeset
|
684 if (right && (wrap |
82fd47d71971
patch 9.0.0725: virtual text "after" wraps to next line when 'wrap' is off
Bram Moolenaar <Bram@vim.org>
parents:
30777
diff
changeset
|
685 || (room < PROP_TEXT_MIN_CELLS && wp->w_p_wrap))) |
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
686 { |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
687 // 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
|
688 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
|
689 if (before < 0) |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
690 before = 0; |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
691 else |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
692 n_used = *n_extra; |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
693 } |
31371
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
694 else if (below && before > vcol && do_skip) |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
695 before -= vcol; |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
696 else |
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
697 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
|
698 } |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
699 } |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
700 |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
701 // 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
|
702 // 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
|
703 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
|
704 && 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
|
705 && 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
|
706 && 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
|
707 ++n_used; |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
708 |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
709 // 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
|
710 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
|
711 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
|
712 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
|
713 { |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
714 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
|
715 |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
716 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
|
717 { |
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
718 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
|
719 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
|
720 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
|
721 { |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
722 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
|
723 off += padding; |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
724 } |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
725 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
|
726 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
|
727 } |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
728 else |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
729 { |
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
730 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
|
731 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
|
732 } |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
733 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
|
734 { |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
735 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
|
736 { |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
737 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
|
738 |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
739 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
|
740 { |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
741 // 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
|
742 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
|
743 STRCPY(lp, "…"); |
30741
11875afe85b2
patch 9.0.0705: virtual text truncation does not take padding into account
Bram Moolenaar <Bram@vim.org>
parents:
30713
diff
changeset
|
744 n_used = lp - l + 3 - before - padding; |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
745 } |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
746 else |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
747 // 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
|
748 *lp = '>'; |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
749 } |
30205
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
750 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
|
751 { |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
752 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
|
753 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
|
754 } |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
755 |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
756 *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
|
757 *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
|
758 *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
|
759 if (above) |
30361
d03040b399de
patch 9.0.0516: virtual text "above" highlights gap after it
Bram Moolenaar <Bram@vim.org>
parents:
30359
diff
changeset
|
760 *n_attr -= padding + after; |
30759
b41ccaa6fd84
patch 9.0.0714: with 'nowrap' two virtual text below not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents:
30749
diff
changeset
|
761 |
31323
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
762 // n_attr_skip will not be decremented before draw_state is |
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
763 // WL_LINE |
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
764 *n_attr_skip = before + padding; |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
765 } |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
766 } |
29560
14b139cbec49
patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents:
29550
diff
changeset
|
767 } |
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
|
768 |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
769 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
|
770 return cells; |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
771 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
|
772 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
773 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
774 |
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
|
775 /* |
30628
2d7905da4e82
patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30614
diff
changeset
|
776 * Call screen_line() using values from "wlv". |
30693
a59a8ce13129
patch 9.0.0681: "<<<" shows for 'smoothscroll' even when 'showbreak is set
Bram Moolenaar <Bram@vim.org>
parents:
30691
diff
changeset
|
777 * Also takes care of putting "<<<" on the first line for 'smoothscroll' |
a59a8ce13129
patch 9.0.0681: "<<<" shows for 'smoothscroll' even when 'showbreak is set
Bram Moolenaar <Bram@vim.org>
parents:
30691
diff
changeset
|
778 * when 'showbreak' is not set. |
30628
2d7905da4e82
patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30614
diff
changeset
|
779 */ |
2d7905da4e82
patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30614
diff
changeset
|
780 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
|
781 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
|
782 { |
30693
a59a8ce13129
patch 9.0.0681: "<<<" shows for 'smoothscroll' even when 'showbreak is set
Bram Moolenaar <Bram@vim.org>
parents:
30691
diff
changeset
|
783 if (wlv->row == 0 && wp->w_skipcol > 0 |
a59a8ce13129
patch 9.0.0681: "<<<" shows for 'smoothscroll' even when 'showbreak is set
Bram Moolenaar <Bram@vim.org>
parents:
30691
diff
changeset
|
784 #if defined(FEAT_LINEBREAK) |
30847
2c03ff81cbcb
patch 9.0.0758: "precedes" from 'listchars' overwritten by <<<
Bram Moolenaar <Bram@vim.org>
parents:
30845
diff
changeset
|
785 // do not overwrite the 'showbreak' text with "<<<" |
30693
a59a8ce13129
patch 9.0.0681: "<<<" shows for 'smoothscroll' even when 'showbreak is set
Bram Moolenaar <Bram@vim.org>
parents:
30691
diff
changeset
|
786 && *get_showbreak_value(wp) == NUL |
a59a8ce13129
patch 9.0.0681: "<<<" shows for 'smoothscroll' even when 'showbreak is set
Bram Moolenaar <Bram@vim.org>
parents:
30691
diff
changeset
|
787 #endif |
30847
2c03ff81cbcb
patch 9.0.0758: "precedes" from 'listchars' overwritten by <<<
Bram Moolenaar <Bram@vim.org>
parents:
30845
diff
changeset
|
788 // do not overwrite the 'listchars' "precedes" text with "<<<" |
2c03ff81cbcb
patch 9.0.0758: "precedes" from 'listchars' overwritten by <<<
Bram Moolenaar <Bram@vim.org>
parents:
30845
diff
changeset
|
789 && !(wp->w_p_list && wp->w_lcs_chars.prec != 0)) |
30628
2d7905da4e82
patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30614
diff
changeset
|
790 { |
2d7905da4e82
patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30614
diff
changeset
|
791 int off = (int)(current_ScreenLine - ScreenLines); |
30845
fa3aba805a34
patch 9.0.0757: line number not visisble with 'smoothscroll', 'nu' and 'rnu'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
792 int skip = 0; |
30628
2d7905da4e82
patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30614
diff
changeset
|
793 |
30845
fa3aba805a34
patch 9.0.0757: line number not visisble with 'smoothscroll', 'nu' and 'rnu'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
794 if (wp->w_p_nu && wp->w_p_rnu) |
fa3aba805a34
patch 9.0.0757: line number not visisble with 'smoothscroll', 'nu' and 'rnu'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
795 // Do not overwrite the line number, change "123 text" to |
fa3aba805a34
patch 9.0.0757: line number not visisble with 'smoothscroll', 'nu' and 'rnu'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
796 // "123>>>xt". |
fa3aba805a34
patch 9.0.0757: line number not visisble with 'smoothscroll', 'nu' and 'rnu'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
797 while (skip < wp->w_width && VIM_ISDIGIT(ScreenLines[off])) |
fa3aba805a34
patch 9.0.0757: line number not visisble with 'smoothscroll', 'nu' and 'rnu'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
798 { |
fa3aba805a34
patch 9.0.0757: line number not visisble with 'smoothscroll', 'nu' and 'rnu'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
799 ++off; |
fa3aba805a34
patch 9.0.0757: line number not visisble with 'smoothscroll', 'nu' and 'rnu'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
800 ++skip; |
fa3aba805a34
patch 9.0.0757: line number not visisble with 'smoothscroll', 'nu' and 'rnu'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
801 } |
fa3aba805a34
patch 9.0.0757: line number not visisble with 'smoothscroll', 'nu' and 'rnu'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
802 |
fa3aba805a34
patch 9.0.0757: line number not visisble with 'smoothscroll', 'nu' and 'rnu'
Bram Moolenaar <Bram@vim.org>
parents:
30825
diff
changeset
|
803 for (int i = 0; i < 3 && i + skip < wp->w_width; ++i) |
30628
2d7905da4e82
patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30614
diff
changeset
|
804 { |
2d7905da4e82
patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30614
diff
changeset
|
805 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
|
806 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
|
807 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
|
808 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
|
809 ++off; |
2d7905da4e82
patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30614
diff
changeset
|
810 } |
2d7905da4e82
patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30614
diff
changeset
|
811 } |
2d7905da4e82
patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30614
diff
changeset
|
812 |
2d7905da4e82
patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30614
diff
changeset
|
813 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
|
814 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
|
815 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
|
816 } |
2d7905da4e82
patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30614
diff
changeset
|
817 |
2d7905da4e82
patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30614
diff
changeset
|
818 /* |
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
|
819 * 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
|
820 * 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
|
821 */ |
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 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
|
823 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
|
824 { |
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 #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
|
826 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
|
827 |
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 // 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
|
829 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
|
830 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
|
831 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
|
832 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
|
833 |
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 // 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
|
835 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
|
836 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
|
837 # 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
|
838 // 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
|
839 // 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
|
840 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
|
841 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
|
842 # 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
|
843 # 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
|
844 # 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
|
845 # 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
|
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 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
|
848 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
|
849 |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
850 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
|
851 && (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
|
852 && (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
|
853 (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
|
854 && wlv->lnum != wp->w_cursor.lnum) |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
855 || wlv->draw_color_col |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
856 # ifdef LINE_ATTR |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
857 || wlv->line_attr != 0 |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
858 # endif |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
859 || wlv->win_attr != 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
|
860 # 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
|
861 && !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
|
862 # 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
|
863 ) |
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 { |
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 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
|
866 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
|
867 |
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 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
|
869 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
|
870 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
|
871 // 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
|
872 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
|
873 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
|
874 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
|
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 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
|
877 { |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
878 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
|
879 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
|
880 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
|
881 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
|
882 ++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
|
883 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
|
884 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
|
885 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
|
886 |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
887 int attr = wlv->win_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
|
888 if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol) |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
889 attr = HL_ATTR(HLF_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
|
890 else if (wlv->draw_color_col && VCOL_HLC == *wlv->color_cols) |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
891 attr = HL_ATTR(HLF_MC); |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
892 # ifdef LINE_ATTR |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
893 else if (wlv->line_attr != 0) |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
894 attr = wlv->line_attr; |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
895 # endif |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
896 ScreenAttrs[wlv->off++] = attr; |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
897 |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
898 if (VCOL_HLC >= rightmost_vcol |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
899 # ifdef LINE_ATTR |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
900 && wlv->line_attr == 0 |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
901 # endif |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
902 && wlv->win_attr == 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
|
903 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
|
904 |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
905 ++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
|
906 } |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
907 } |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
908 #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
|
909 |
30628
2d7905da4e82
patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30614
diff
changeset
|
910 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
|
911 ++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
|
912 ++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
|
913 } |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
914 #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
|
915 |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
916 /* |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
917 * 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
|
918 * 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
|
919 */ |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
920 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
|
921 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
|
922 { |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
923 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
|
924 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
|
925 |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
926 #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
|
927 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
|
928 { |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
929 // 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
|
930 // 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
|
931 // 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
|
932 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
|
933 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
|
934 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
|
935 } |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
936 #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
|
937 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
|
938 { |
78418bd45852
patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents:
29623
diff
changeset
|
939 // 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
|
940 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
|
941 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
|
942 wlv->saved_p_extra = wlv->p_extra; |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
943 wlv->saved_extra_attr = wlv->extra_attr; |
31323
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
944 wlv->saved_n_attr_skip = wlv->n_attr_skip; |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
945 wlv->saved_extra_for_textprop = wlv->extra_for_textprop; |
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
|
946 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
|
947 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
|
948 #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
|
949 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
|
950 # 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
|
951 && 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
|
952 # 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
|
953 )) |
78418bd45852
patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents:
29623
diff
changeset
|
954 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
|
955 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
|
956 #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
|
957 wlv->saved_char_attr = 0; |
31323
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
958 |
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
959 // these are not used until restored in win_line_continue() |
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
|
960 wlv->n_extra = 0; |
31323
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
961 wlv->n_attr_skip = 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
|
962 } |
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
|
963 } |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
964 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
965 /* |
30395
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
966 * 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
|
967 */ |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
968 static void |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
969 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
|
970 { |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
971 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
|
972 { |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
973 // 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
|
974 wlv->n_extra = wlv->saved_n_extra; |
31221
59de2172e99d
patch 9.0.0944: 'cursorline' causes virtual text highlight to continue
Bram Moolenaar <Bram@vim.org>
parents:
31142
diff
changeset
|
975 wlv->saved_n_extra = 0; |
30395
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
976 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
|
977 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
|
978 wlv->p_extra = wlv->saved_p_extra; |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
979 wlv->extra_attr = wlv->saved_extra_attr; |
31323
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
980 wlv->n_attr_skip = wlv->saved_n_attr_skip; |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
981 wlv->extra_for_textprop = wlv->saved_extra_for_textprop; |
30395
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
982 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
|
983 } |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
984 else |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
985 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
|
986 } |
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
987 |
31431
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
988 #ifdef FEAT_SYN_HL |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
989 static void |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
990 apply_cursorline_highlight( |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
991 winlinevars_T *wlv, |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
992 int sign_present UNUSED) |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
993 { |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
994 wlv->cul_attr = HL_ATTR(HLF_CUL); |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
995 # ifdef FEAT_SIGNS |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
996 // Combine the 'cursorline' and sign highlighting, depending on |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
997 // the sign priority. |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
998 if (sign_present && wlv->sattr.sat_linehl > 0) |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
999 { |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1000 if (wlv->sattr.sat_priority >= 100) |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1001 wlv->line_attr = hl_combine_attr(wlv->cul_attr, wlv->line_attr); |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1002 else |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1003 wlv->line_attr = hl_combine_attr(wlv->line_attr, wlv->cul_attr); |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1004 } |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1005 else |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1006 # endif |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1007 # if defined(FEAT_QUICKFIX) |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1008 // let the line attribute overrule 'cursorline', otherwise |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1009 // it disappears when both have background set; |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1010 // 'cursorline' can use underline or bold to make it show |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1011 wlv->line_attr = hl_combine_attr(wlv->cul_attr, wlv->line_attr); |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1012 # else |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1013 wlv->line_attr = wlv->cul_attr; |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1014 # endif |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1015 } |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1016 #endif |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1017 |
30395
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
1018 /* |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1019 * 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
|
1020 * 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
|
1021 * 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
|
1022 * |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1023 * 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
|
1024 */ |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1025 int |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1026 win_line( |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1027 win_T *wp, |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1028 linenr_T lnum, |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1029 int startrow, |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1030 int endrow, |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1031 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
|
1032 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
|
1033 { |
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
|
1034 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
|
1035 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1036 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
|
1037 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
|
1038 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
|
1039 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
|
1040 |
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
|
1041 #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
|
1042 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
|
1043 #endif |
26374
59f2b11ad1be
patch 8.2.3718: compiler warns for unused variable without +textprop
Bram Moolenaar <Bram@vim.org>
parents:
26350
diff
changeset
|
1044 #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
|
1045 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
|
1046 #endif |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1047 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
|
1048 // 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
|
1049 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
|
1050 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
|
1051 // 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
|
1052 |
29560
14b139cbec49
patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents:
29550
diff
changeset
|
1053 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
|
1054 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
|
1055 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
|
1056 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
|
1057 |
30763
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
1058 int n_skip = 0; // nr of cells to skip for 'nowrap' or |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
1059 // concealing |
30765
3002177fa0b1
patch 9.0.0717: compiler warning for unused variable in tiny build
Bram Moolenaar <Bram@vim.org>
parents:
30763
diff
changeset
|
1060 #ifdef FEAT_PROP_POPUP |
30763
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
1061 int skip_cells = 0; // nr of cells to skip for virtual text |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
1062 // after the line, when w_skipcol is |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
1063 // larger than the text length |
30765
3002177fa0b1
patch 9.0.0717: compiler warning for unused variable in tiny build
Bram Moolenaar <Bram@vim.org>
parents:
30763
diff
changeset
|
1064 #endif |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1065 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1066 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
|
1067 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
|
1068 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
|
1069 pos_T pos; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1070 long v; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1071 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1072 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
|
1073 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
|
1074 // in this line |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1075 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
|
1076 // highlighting |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1077 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
|
1078 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
|
1079 #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
|
1080 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
|
1081 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
|
1082 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
|
1083 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
|
1084 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
|
1085 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
|
1086 #endif |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18720
diff
changeset
|
1087 #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
|
1088 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
|
1089 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
|
1090 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
|
1091 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
|
1092 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
|
1093 proptype_T *text_prop_type = NULL; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1094 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
|
1095 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
|
1096 // syntax_attr |
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
1097 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
|
1098 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
|
1099 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
|
1100 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
|
1101 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
|
1102 // 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
|
1103 int saved_area_attr = 0; // idem for area_attr |
31221
59de2172e99d
patch 9.0.0944: 'cursorline' causes virtual text highlight to continue
Bram Moolenaar <Bram@vim.org>
parents:
31142
diff
changeset
|
1104 int reset_extra_attr = FALSE; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1105 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1106 #ifdef FEAT_SPELL |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1107 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
|
1108 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
|
1109 # define SPWORDLEN 150 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1110 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
|
1111 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
|
1112 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
|
1113 // starts |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1114 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
|
1115 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
|
1116 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
|
1117 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
|
1118 // 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
|
1119 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
|
1120 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
|
1121 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
|
1122 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1123 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
|
1124 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
|
1125 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
|
1126 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
|
1127 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
|
1128 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
|
1129 #ifdef FEAT_DIFF |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1130 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
|
1131 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
|
1132 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1133 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
|
1134 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
|
1135 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
|
1136 int multispace_pos = 0; // position in lcs-multispace string |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
1137 #ifdef LINE_ATTR |
29641
b2cf1634c782
patch 9.0.0161: warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
29639
diff
changeset
|
1138 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
|
1139 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1140 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
|
1141 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
|
1142 #ifdef FEAT_ARABIC |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1143 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
|
1144 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
|
1145 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1146 #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
|
1147 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
|
1148 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1149 #ifdef FEAT_TERMINAL |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1150 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
|
1151 #endif |
30395
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
1152 |
30825
c7983f593fa7
patch 9.0.0747: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
30781
diff
changeset
|
1153 #if defined(FEAT_SYN_HL) || defined(FEAT_DIFF) |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1154 // 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
|
1155 // contains "screenline" |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1156 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
|
1157 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
|
1158 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1159 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1160 #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
|
1161 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
|
1162 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
|
1163 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1164 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1165 #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
|
1166 int match_conc = 0; // cchar for match functions |
30825
c7983f593fa7
patch 9.0.0747: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
30781
diff
changeset
|
1167 #endif |
c7983f593fa7
patch 9.0.0747: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
30781
diff
changeset
|
1168 #if defined(FEAT_CONCEAL) || defined(FEAT_SEARCH_EXTRA) || defined(FEAT_LINEBREAK) |
26334
baec4e1cee43
patch 8.2.3698: match highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents:
26266
diff
changeset
|
1169 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
|
1170 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1171 #ifdef FEAT_CONCEAL |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1172 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
|
1173 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
|
1174 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
|
1175 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
|
1176 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
|
1177 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
|
1178 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
|
1179 # 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
|
1180 # 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
|
1181 { \ |
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
|
1182 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
|
1183 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
|
1184 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
|
1185 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
|
1186 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
|
1187 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
|
1188 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1189 #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
|
1190 # 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
|
1191 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1192 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1193 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
|
1194 return startrow; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1195 |
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
|
1196 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
|
1197 |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
1198 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
|
1199 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
|
1200 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
|
1201 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
|
1202 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
|
1203 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
|
1204 #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
|
1205 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
|
1206 #endif |
18124
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 if (!number_only) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1209 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1210 // 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
|
1211 // 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
|
1212 #ifdef FEAT_LINEBREAK |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1213 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
|
1214 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1215 #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
|
1216 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
|
1217 # 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
|
1218 && !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
|
1219 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1220 ) |
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 // 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
|
1223 // 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
|
1224 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
|
1225 did_emsg = FALSE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1226 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
|
1227 if (did_emsg) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1228 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
|
1229 else |
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 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
|
1232 #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
|
1233 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
|
1234 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1235 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1236 has_syntax = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1237 extra_check = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1238 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1239 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1240 } |
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 // 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
|
1243 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
|
1244 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
|
1245 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
|
1246 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1247 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1248 #ifdef FEAT_TERMINAL |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1249 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
|
1250 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1251 extra_check = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1252 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
|
1253 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
|
1254 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1255 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1256 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1257 #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
|
1258 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
|
1259 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1260 // 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
|
1261 has_spell = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1262 extra_check = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1263 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1264 // 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
|
1265 // 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
|
1266 // 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
|
1267 nextline[SPWORDLEN] = NUL; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1268 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
|
1269 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1270 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
|
1271 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
|
1272 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1273 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1274 // 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
|
1275 // 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
|
1276 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
|
1277 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
|
1278 checked_lnum = 0; |
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 // 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
|
1281 // 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
|
1282 // the first word. |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1283 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
|
1284 cap_col = -1; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1285 if (lnum == 1) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1286 cap_col = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1287 capcol_lnum = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1288 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1289 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1290 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1291 // 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
|
1292 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
|
1293 { |
19816
f37028184d6a
patch 8.2.0464: typos and other small problems
Bram Moolenaar <Bram@vim.org>
parents:
19503
diff
changeset
|
1294 pos_T *top, *bot; |
f37028184d6a
patch 8.2.0464: typos and other small problems
Bram Moolenaar <Bram@vim.org>
parents:
19503
diff
changeset
|
1295 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1296 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
|
1297 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1298 // 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
|
1299 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
|
1300 bot = &VIsual; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1301 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1302 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1303 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1304 // 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
|
1305 top = &VIsual; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1306 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
|
1307 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1308 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
|
1309 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
|
1310 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1311 // block mode |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1312 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
|
1313 { |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
1314 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
|
1315 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
|
1316 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1317 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1318 else |
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 // non-block mode |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1321 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
|
1322 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
|
1323 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
|
1324 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1325 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
|
1326 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
|
1327 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1328 { |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
1329 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
|
1330 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
|
1331 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
|
1332 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1333 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1334 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
|
1335 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1336 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
|
1337 { |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
1338 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
|
1339 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
|
1340 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1341 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
|
1342 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
|
1343 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1344 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1345 pos = *bot; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1346 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
|
1347 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
|
1348 NULL, NULL); |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1349 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1350 { |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
1351 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
|
1352 (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
|
1353 ++wlv.tocol; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1354 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1355 } |
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 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1358 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1359 // 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
|
1360 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
|
1361 && wp == curwin |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1362 #ifdef FEAT_GUI |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1363 && !gui.in_use |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1364 #endif |
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 noinvcur = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1367 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1368 // 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
|
1369 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
|
1370 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1371 area_highlighting = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1372 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
|
1373 #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
|
1374 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
|
1375 && clip_isautosel_star()) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1376 || (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
|
1377 && clip_isautosel_plus())) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1378 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
|
1379 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1380 } |
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 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1383 // 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
|
1384 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
|
1385 && wp == curwin |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1386 && 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
|
1387 && 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
|
1388 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1389 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
|
1390 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
|
1391 (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
|
1392 else |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
1393 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
|
1394 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
|
1395 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1396 pos.lnum = lnum; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1397 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
|
1398 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
|
1399 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1400 else |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
1401 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
|
1402 // 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
|
1403 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
|
1404 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
|
1405 area_highlighting = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1406 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
|
1407 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1408 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1409 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1410 #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
|
1411 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
|
1412 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
|
1413 { |
30367
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
1414 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
|
1415 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1416 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
|
1417 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
|
1418 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
|
1419 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
|
1420 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
|
1421 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
|
1422 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1423 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
|
1424 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
|
1425 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
|
1426 area_highlighting = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1427 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1428 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
|
1429 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
|
1430 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
|
1431 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1432 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1433 #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
|
1434 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
|
1435 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
|
1436 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
|
1437 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1438 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1439 #ifdef LINE_ATTR |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1440 # ifdef FEAT_SIGNS |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
1441 // If this line has a sign with line highlighting set wlv.line_attr. |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1442 if (sign_present) |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
1443 wlv.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
|
1444 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1445 # 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
|
1446 // 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
|
1447 if (bt_quickfix(wp->w_buffer) && qf_current_entry(wp) == lnum) |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
1448 wlv.line_attr = HL_ATTR(HLF_QFL); |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1449 # endif |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
1450 if (wlv.line_attr != 0) |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1451 area_highlighting = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1452 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1453 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1454 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
|
1455 ptr = line; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1456 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1457 #ifdef FEAT_SPELL |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1458 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
|
1459 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1460 // 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
|
1461 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
|
1462 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
|
1463 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1464 // 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
|
1465 // 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
|
1466 // 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
|
1467 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
|
1468 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1469 // 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
|
1470 nextlinecol = MAXCOL; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1471 nextline_idx = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1472 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1473 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1474 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1475 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
|
1476 if (v < SPWORDLEN) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1477 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1478 // 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
|
1479 // next line. |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1480 nextlinecol = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1481 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
|
1482 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
|
1483 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
|
1484 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1485 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1486 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1487 // 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
|
1488 nextlinecol = v - SPWORDLEN; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1489 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
|
1490 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
|
1491 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1492 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1493 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1494 #endif |
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 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
|
1497 { |
23952
44be09b25619
patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents:
23901
diff
changeset
|
1498 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
|
1499 || 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
|
1500 || 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
|
1501 || wp->w_lcs_chars.trail |
44be09b25619
patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents:
23901
diff
changeset
|
1502 || wp->w_lcs_chars.lead |
44be09b25619
patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents:
23901
diff
changeset
|
1503 || 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
|
1504 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
|
1505 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1506 // 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
|
1507 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
|
1508 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1509 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
|
1510 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
|
1511 --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
|
1512 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
|
1513 } |
23825
0bd44e94dd14
patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents:
22997
diff
changeset
|
1514 // 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
|
1515 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
|
1516 { |
0bd44e94dd14
patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents:
22997
diff
changeset
|
1517 leadcol = 0; |
0bd44e94dd14
patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents:
22997
diff
changeset
|
1518 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
|
1519 ++leadcol; |
0bd44e94dd14
patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents:
22997
diff
changeset
|
1520 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
|
1521 // 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
|
1522 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
|
1523 else |
0bd44e94dd14
patch 8.2.2454: leading space can not be made visible
Bram Moolenaar <Bram@vim.org>
parents:
22997
diff
changeset
|
1524 // 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
|
1525 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
|
1526 } |
18124
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 |
30367
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
1529 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
|
1530 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
|
1531 { |
30367
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
1532 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
|
1533 area_highlighting = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1534 } |
18317
d2228d4cf1f6
patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
18245
diff
changeset
|
1535 |
31371
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1536 // When w_skipcol is non-zero and there is virtual text above the actual |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1537 // text, then this much of the virtual text is skipped. |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1538 int skipcol_in_text_prop_above = 0; |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1539 |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18720
diff
changeset
|
1540 #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
|
1541 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
|
1542 wlv.screen_line_flags |= SLF_POPUP; |
31371
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1543 |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1544 char_u *prop_start; |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1545 text_prop_count = get_text_props(wp->w_buffer, lnum, &prop_start, FALSE); |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1546 if (text_prop_count > 0) |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1547 { |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1548 // Make a copy of the properties, so that they are properly |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1549 // aligned. |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1550 text_props = ALLOC_MULT(textprop_T, text_prop_count); |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1551 if (text_props != NULL) |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1552 mch_memmove(text_props, prop_start, |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1553 text_prop_count * sizeof(textprop_T)); |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1554 |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1555 // Allocate an array for the indexes. |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1556 text_prop_idxs = ALLOC_MULT(int, text_prop_count); |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1557 if (text_prop_idxs == NULL) |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1558 VIM_CLEAR(text_props); |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1559 |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1560 if (text_props != NULL) |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1561 { |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1562 area_highlighting = TRUE; |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1563 extra_check = TRUE; |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1564 |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1565 // When skipping virtual text the props need to be sorted. The |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1566 // order is reversed! |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1567 if (lnum == wp->w_topline && wp->w_skipcol > 0) |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1568 { |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1569 for (int i = 0; i < text_prop_count; ++i) |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1570 text_prop_idxs[i] = i; |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1571 sort_text_props(wp->w_buffer, text_props, |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1572 text_prop_idxs, text_prop_count); |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1573 } |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1574 |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1575 // Text props "above" move the line number down to where the text |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1576 // is. Only count the ones that are visible, not those that are |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1577 // skipped because of w_skipcol. |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1578 int text_width = wp->w_width - win_col_off(wp); |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1579 for (int i = text_prop_count - 1; i >= 0; --i) |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1580 if (text_props[i].tp_flags & TP_FLAG_ALIGN_ABOVE) |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1581 { |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1582 if (lnum == wp->w_topline |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1583 && wp->w_skipcol - skipcol_in_text_prop_above |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1584 >= text_width) |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1585 { |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1586 // This virtual text above is skipped, remove it from |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1587 // the array. |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1588 skipcol_in_text_prop_above += text_width; |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1589 for (int j = i + 1; j < text_prop_count; ++j) |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1590 text_props[j - 1] = text_props[j]; |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1591 ++i; |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1592 --text_prop_count; |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1593 } |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1594 else |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1595 ++wlv.text_prop_above_count; |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1596 } |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1597 } |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1598 } |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1599 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1600 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1601 // '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
|
1602 // 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
|
1603 if (wp->w_p_wrap) |
31371
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1604 v = startrow == 0 ? wp->w_skipcol - skipcol_in_text_prop_above : 0; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1605 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1606 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
|
1607 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
|
1608 { |
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
1609 char_u *prev_ptr = ptr; |
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
1610 chartabsize_T cts; |
29461
69693a62f2f4
patch 9.0.0072: compiler warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
29451
diff
changeset
|
1611 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
|
1612 |
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
|
1613 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
|
1614 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
|
1615 { |
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
1616 charsize = win_lbr_chartabsize(&cts, NULL); |
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
1617 cts.cts_vcol += charsize; |
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
1618 prev_ptr = cts.cts_ptr; |
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
1619 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
|
1620 } |
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
|
1621 wlv.vcol = cts.cts_vcol; |
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
1622 ptr = cts.cts_ptr; |
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
1623 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
|
1624 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1625 // When: |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1626 // - '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
|
1627 // - '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
|
1628 // - '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
|
1629 // - 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
|
1630 // 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
|
1631 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
|
1632 #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
|
1633 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
|
1634 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1635 virtual_active() || |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1636 (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
|
1637 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
|
1638 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1639 // 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
|
1640 // 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
|
1641 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
|
1642 { |
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
|
1643 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
|
1644 ptr = prev_ptr; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1645 // 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
|
1646 // 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
|
1647 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
|
1648 && 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
|
1649 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
|
1650 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1651 |
30765
3002177fa0b1
patch 9.0.0717: compiler warning for unused variable in tiny build
Bram Moolenaar <Bram@vim.org>
parents:
30763
diff
changeset
|
1652 #ifdef FEAT_PROP_POPUP |
30763
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
1653 // If there the text doesn't reach to the desired column, need to skip |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
1654 // "skip_cells" cells when virtual text follows. |
31371
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1655 if ((!wp->w_p_wrap || (lnum == wp->w_topline && wp->w_skipcol > 0)) |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
1656 && v > wlv.vcol) |
30763
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
1657 skip_cells = v - wlv.vcol; |
30765
3002177fa0b1
patch 9.0.0717: compiler warning for unused variable in tiny build
Bram Moolenaar <Bram@vim.org>
parents:
30763
diff
changeset
|
1658 #endif |
30763
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
1659 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1660 // 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
|
1661 // 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
|
1662 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
|
1663 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
|
1664 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
|
1665 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
|
1666 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1667 #ifdef FEAT_LINEBREAK |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1668 // 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
|
1669 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
|
1670 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
|
1671 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1672 #ifdef FEAT_SPELL |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1673 // 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
|
1674 // 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
|
1675 if (has_spell) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1676 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1677 int len; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1678 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
|
1679 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
|
1680 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1681 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
|
1682 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
|
1683 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
|
1684 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
|
1685 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1686 // 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
|
1687 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
|
1688 ptr = line + linecol; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1689 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1690 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
|
1691 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1692 // 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
|
1693 // word |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1694 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
|
1695 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
|
1696 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1697 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1698 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1699 // 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
|
1700 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
|
1701 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1702 // 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
|
1703 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
|
1704 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
|
1705 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1706 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
|
1707 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1708 # 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
|
1709 // 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
|
1710 if (has_syntax) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1711 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
|
1712 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1713 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1714 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1715 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1716 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1717 // 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
|
1718 // 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
|
1719 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
|
1720 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1721 if (noinvcur) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1722 { |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
1723 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
|
1724 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1725 // 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
|
1726 // cursor |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
1727 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
|
1728 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
|
1729 } |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
1730 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
|
1731 // 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
|
1732 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
|
1733 } |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
1734 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
|
1735 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
|
1736 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1737 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1738 #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
|
1739 if (!number_only) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1740 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1741 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
|
1742 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
|
1743 &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
|
1744 &search_attr); |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1745 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
|
1746 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1747 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1748 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1749 #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
|
1750 // 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
|
1751 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
|
1752 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1753 // 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
|
1754 // 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
|
1755 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
|
1756 && 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
|
1757 { |
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
|
1758 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
|
1759 && (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
|
1760 |
31431
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1761 // Only apply CursorLine highlight here when "screenline" is not |
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1762 // present in '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
|
1763 if (!wlv.cul_screenline) |
31431
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1764 apply_cursorline_highlight(&wlv, sign_present); |
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 { |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
1767 line_attr_save = wlv.line_attr; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1768 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
|
1769 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1770 area_highlighting = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1771 } |
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 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1774 |
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
|
1775 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
|
1776 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1777 // 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
|
1778 for (;;) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1779 { |
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
|
1780 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
|
1781 #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
|
1782 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
|
1783 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1784 #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
|
1785 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
|
1786 #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
|
1787 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1788 // 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
|
1789 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
|
1790 { |
25517
b04e76e66128
patch 8.2.3295: 'cursorline' should not apply to 'breakindent'
Bram Moolenaar <Bram@vim.org>
parents:
25170
diff
changeset
|
1791 #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
|
1792 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
|
1793 { |
30395
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
1794 wlv.cul_attr = 0; |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
1795 wlv.line_attr = line_attr_save; |
25517
b04e76e66128
patch 8.2.3295: 'cursorline' should not apply to 'breakindent'
Bram Moolenaar <Bram@vim.org>
parents:
25170
diff
changeset
|
1796 } |
b04e76e66128
patch 8.2.3295: 'cursorline' should not apply to 'breakindent'
Bram Moolenaar <Bram@vim.org>
parents:
25170
diff
changeset
|
1797 #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
|
1798 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
|
1799 { |
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
|
1800 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
|
1801 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
|
1802 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1803 // 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
|
1804 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
|
1805 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
|
1806 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
|
1807 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
|
1808 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
|
1809 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1810 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1811 #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
|
1812 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
|
1813 { |
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
|
1814 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
|
1815 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
|
1816 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1817 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1818 #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
|
1819 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
|
1820 { |
30367
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
1821 // 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
|
1822 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
|
1823 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
|
1824 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
|
1825 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1826 #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
|
1827 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
|
1828 { |
30367
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
1829 // 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
|
1830 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
|
1831 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
|
1832 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1833 #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
|
1834 // 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
|
1835 // 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
|
1836 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
|
1837 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
|
1838 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1839 #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
|
1840 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
|
1841 { |
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
|
1842 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
|
1843 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
|
1844 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1845 #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
|
1846 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
|
1847 { |
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
|
1848 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
|
1849 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
|
1850 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1851 } |
30395
e516c566fd0c
patch 9.0.0533: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30391
diff
changeset
|
1852 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1853 #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
|
1854 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
|
1855 && 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
|
1856 && 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
|
1857 { |
31431
552ca9b4218d
patch 9.0.1048: with "screenline" in 'culopt' cursorline highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
31371
diff
changeset
|
1858 apply_cursorline_highlight(&wlv, sign_present); |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1859 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1860 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1861 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1862 // 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
|
1863 // 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
|
1864 // 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
|
1865 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
|
1866 && 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
|
1867 || (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
|
1868 #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
|
1869 && 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
|
1870 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1871 ) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1872 { |
30628
2d7905da4e82
patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30614
diff
changeset
|
1873 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
|
1874 // 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
|
1875 // 'cursorcolumn' is set. |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1876 #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
|
1877 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
|
1878 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
|
1879 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1880 #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
|
1881 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
|
1882 break; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1883 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1884 |
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
|
1885 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
|
1886 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1887 // 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
|
1888 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
|
1889 || (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
|
1890 && 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
|
1891 && (*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
|
1892 || ((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
|
1893 && 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
|
1894 && 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
|
1895 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
|
1896 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
|
1897 && (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
|
1898 || (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
|
1899 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
|
1900 |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18720
diff
changeset
|
1901 #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
|
1902 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
|
1903 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1904 int pi; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1905 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
|
1906 |
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
|
1907 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
|
1908 # ifdef FEAT_LINEBREAK |
4cf208415483
patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents:
26334
diff
changeset
|
1909 && !in_linebreak |
4cf208415483
patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents:
26334
diff
changeset
|
1910 # endif |
4cf208415483
patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents:
26334
diff
changeset
|
1911 ) |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1912 --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
|
1913 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1914 // 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
|
1915 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
|
1916 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1917 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
|
1918 |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
1919 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
|
1920 && 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
|
1921 + 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
|
1922 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1923 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
|
1924 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
|
1925 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
|
1926 sizeof(int) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1927 * (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
|
1928 --text_props_active; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1929 --pi; |
26338
4cf208415483
patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents:
26334
diff
changeset
|
1930 # ifdef FEAT_LINEBREAK |
4cf208415483
patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents:
26334
diff
changeset
|
1931 // 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
|
1932 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
|
1933 syntax_attr = 0; |
4cf208415483
patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents:
26334
diff
changeset
|
1934 # endif |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1935 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1936 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1937 |
26384
e624b4ddbdf0
patch 8.2.3723: when using 'linebreak' a text property starts too early
Bram Moolenaar <Bram@vim.org>
parents:
26374
diff
changeset
|
1938 # 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
|
1939 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
|
1940 // 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
|
1941 --bcol; |
e624b4ddbdf0
patch 8.2.3723: when using 'linebreak' a text property starts too early
Bram Moolenaar <Bram@vim.org>
parents:
26374
diff
changeset
|
1942 # endif |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1943 // 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
|
1944 // 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
|
1945 // 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
|
1946 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
|
1947 && (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
|
1948 ? ((*ptr == NUL |
29635
592818fd3110
patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents:
29633
diff
changeset
|
1949 && (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
|
1950 || wlv.row == startrow |
592818fd3110
patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents:
29633
diff
changeset
|
1951 || (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
|
1952 & 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
|
1953 || (bcol == 0 && |
ed6f3d2593df
patch 9.0.0438: cannot put virtual text above a line
Bram Moolenaar <Bram@vim.org>
parents:
30039
diff
changeset
|
1954 (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
|
1955 & 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
|
1956 : 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
|
1957 { |
29722
f88671dbe88b
patch 9.0.0201: CursorLine highlight overrules virtual text highlight
Bram Moolenaar <Bram@vim.org>
parents:
29706
diff
changeset
|
1958 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
|
1959 && *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
|
1960 { |
b167c91b5f6b
patch 9.0.0210: 'list' mode does not work properly with virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29738
diff
changeset
|
1961 // 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
|
1962 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
|
1963 break; |
b167c91b5f6b
patch 9.0.0210: 'list' mode does not work properly with virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29738
diff
changeset
|
1964 } |
b167c91b5f6b
patch 9.0.0210: 'list' mode does not work properly with virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29738
diff
changeset
|
1965 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
|
1966 || 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
|
1967 + 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
|
1968 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
|
1969 ++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
|
1970 } |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1971 |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
1972 if (wlv.n_extra == 0 || !wlv.extra_for_textprop) |
29736
65348cc3b656
patch 9.0.0208: the override flag has no effect for virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29722
diff
changeset
|
1973 { |
65348cc3b656
patch 9.0.0208: the override flag has no effect for virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29722
diff
changeset
|
1974 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
|
1975 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
|
1976 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
|
1977 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
|
1978 text_prop_id = 0; |
31221
59de2172e99d
patch 9.0.0944: 'cursorline' causes virtual text highlight to continue
Bram Moolenaar <Bram@vim.org>
parents:
31142
diff
changeset
|
1979 reset_extra_attr = FALSE; |
29736
65348cc3b656
patch 9.0.0208: the override flag has no effect for virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29722
diff
changeset
|
1980 } |
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
|
1981 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
|
1982 { |
29467
5b3819ce0865
patch 9.0.0075: some compilers warn for using an uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
29461
diff
changeset
|
1983 int used_tpi = -1; |
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
1984 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
|
1985 int other_tpi = -1; |
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
1986 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1987 // 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
|
1988 // 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
|
1989 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
|
1990 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
|
1991 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
|
1992 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
|
1993 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1994 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
|
1995 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1996 int tpi = text_prop_idxs[pi]; |
30749
6fe513996997
patch 9.0.0709: virtual text "after" not correct with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
30741
diff
changeset
|
1997 textprop_T *tp = &text_props[tpi]; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1998 proptype_T *pt = text_prop_type_by_id( |
30763
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
1999 wp->w_buffer, tp->tp_type); |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2000 |
30763
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2001 // Only use a text property that can be displayed. |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2002 // Skip "after" properties when wrap is off and at the |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2003 // end of the window. |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2004 if (pt != NULL |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2005 && (pt->pt_hl_id > 0 || tp->tp_id < 0) |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2006 && tp->tp_id != -MAXCOL |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2007 && !(tp->tp_id < 0 |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2008 && !wp->w_p_wrap |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2009 && (tp->tp_flags & (TP_FLAG_ALIGN_RIGHT |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2010 | TP_FLAG_ALIGN_ABOVE |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2011 | TP_FLAG_ALIGN_BELOW)) == 0 |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2012 && 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
|
2013 { |
29698
b944b7fb563b
patch 9.0.0189: invalid memory access for text prop without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29692
diff
changeset
|
2014 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
|
2015 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
|
2016 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
|
2017 text_prop_attr = |
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
2018 hl_combine_attr(text_prop_attr, used_attr); |
30749
6fe513996997
patch 9.0.0709: virtual text "after" not correct with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
30741
diff
changeset
|
2019 other_tpi = used_tpi; |
29611
608d5221a3e5
patch 9.0.0146: missing part of change for "override" flag
Bram Moolenaar <Bram@vim.org>
parents:
29597
diff
changeset
|
2020 text_prop_flags = pt->pt_flags; |
30749
6fe513996997
patch 9.0.0709: virtual text "after" not correct with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
30741
diff
changeset
|
2021 text_prop_id = tp->tp_id; |
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
2022 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
|
2023 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2024 } |
29560
14b139cbec49
patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents:
29550
diff
changeset
|
2025 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
|
2026 && -text_prop_id |
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
2027 <= 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
|
2028 { |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
2029 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
|
2030 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
|
2031 ->b_textprop_text.ga_data)[ |
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
2032 -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
|
2033 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
|
2034 & TP_FLAG_ALIGN_ABOVE); |
30759
b41ccaa6fd84
patch 9.0.0714: with 'nowrap' two virtual text below not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents:
30749
diff
changeset
|
2035 int bail_out = 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
|
2036 |
78418bd45852
patch 9.0.0153: no fold and sign column for virtual text with "below" align
Bram Moolenaar <Bram@vim.org>
parents:
29623
diff
changeset
|
2037 // 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
|
2038 // again |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
2039 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
|
2040 |
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
2041 if (p != NULL) |
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
2042 { |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
2043 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
|
2044 & 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
|
2045 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
|
2046 & 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
|
2047 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
|
2048 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
|
2049 && 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
|
2050 ? 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
|
2051 |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
2052 // 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
|
2053 // 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
|
2054 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
|
2055 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
|
2056 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
|
2057 wlv.n_extra = (int)STRLEN(p); |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
2058 wlv.extra_for_textprop = TRUE; |
31119
e2c909e06424
patch 9.0.0894: virtual text property highlight ignores window background
Bram Moolenaar <Bram@vim.org>
parents:
31113
diff
changeset
|
2059 wlv.extra_attr = hl_combine_attr(wlv.win_attr, |
e2c909e06424
patch 9.0.0894: virtual text property highlight ignores window background
Bram Moolenaar <Bram@vim.org>
parents:
31113
diff
changeset
|
2060 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
|
2061 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
|
2062 // 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
|
2063 // 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
|
2064 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
|
2065 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
|
2066 search_attr = 0; |
8d660a45299f
patch 9.0.0452: Visual highlighting extends into virtual text prop
Bram Moolenaar <Bram@vim.org>
parents:
30231
diff
changeset
|
2067 area_attr = 0; |
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
2068 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
|
2069 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
|
2070 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
|
2071 // 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
|
2072 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
|
2073 #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
|
2074 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
|
2075 { |
bab343b21da8
patch 9.0.0148: a "below" aligned text property gets 'showbreak' displayed
Bram Moolenaar <Bram@vim.org>
parents:
29611
diff
changeset
|
2076 // 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
|
2077 // 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
|
2078 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
|
2079 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
|
2080 } |
bab343b21da8
patch 9.0.0148: a "below" aligned text property gets 'showbreak' displayed
Bram Moolenaar <Bram@vim.org>
parents:
29611
diff
changeset
|
2081 #endif |
30213
4fedacdad3b4
patch 9.0.0442: virtual text "above" doesn't handel line numbers
Bram Moolenaar <Bram@vim.org>
parents:
30205
diff
changeset
|
2082 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
|
2083 || 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
|
2084 { |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
2085 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
|
2086 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
|
2087 |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
2088 // 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
|
2089 // truncation. |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
2090 // 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
|
2091 // 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
|
2092 start_line = text_prop_position(wp, tp, |
30749
6fe513996997
patch 9.0.0709: virtual text "after" not correct with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
30741
diff
changeset
|
2093 wlv.vcol, |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
2094 wlv.col, |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
2095 &wlv.n_extra, &wlv.p_extra, |
31371
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
2096 &n_attr, &wlv.n_attr_skip, |
1c43d8bad31d
patch 9.0.1019: 'smoothscroll' and virtual text above don't work together
Bram Moolenaar <Bram@vim.org>
parents:
31323
diff
changeset
|
2097 skip_cells > 0); |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
2098 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
|
2099 { |
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
2100 // 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
|
2101 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
|
2102 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
|
2103 } |
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
|
2104 |
31142
7b16ac81a349
patch 9.0.0905: virtual text after the line wraps when 'wrap' is off
Bram Moolenaar <Bram@vim.org>
parents:
31119
diff
changeset
|
2105 if (lcs_eol_one < 0 |
7b16ac81a349
patch 9.0.0905: virtual text after the line wraps when 'wrap' is off
Bram Moolenaar <Bram@vim.org>
parents:
31119
diff
changeset
|
2106 && wp->w_p_wrap |
7b16ac81a349
patch 9.0.0905: virtual text after the line wraps when 'wrap' is off
Bram Moolenaar <Bram@vim.org>
parents:
31119
diff
changeset
|
2107 && wlv.col |
30273
5f112a0b4da1
patch 9.0.0472: virtual text "below" doesn't show in list mode
Bram Moolenaar <Bram@vim.org>
parents:
30233
diff
changeset
|
2108 + 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
|
2109 // don't bail out at end of line |
30777
8f25424b4bfd
patch 9.0.0723: extra empty line below virtual text when 'list' is set
Bram Moolenaar <Bram@vim.org>
parents:
30775
diff
changeset
|
2110 text_prop_follows = TRUE; |
30273
5f112a0b4da1
patch 9.0.0472: virtual text "below" doesn't show in list mode
Bram Moolenaar <Bram@vim.org>
parents:
30233
diff
changeset
|
2111 |
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
|
2112 // When 'wrap' is off then for "below" we need |
30986
360f286b5869
patch 9.0.0828: various typos
Bram Moolenaar <Bram@vim.org>
parents:
30900
diff
changeset
|
2113 // to start a new line explicitly. |
29816
bbe62ea78aac
patch 9.0.0247: cannot add padding to virtual text without highlight
Bram Moolenaar <Bram@vim.org>
parents:
29808
diff
changeset
|
2114 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
|
2115 { |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
2116 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
|
2117 |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
2118 // 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
|
2119 // 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
|
2120 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
|
2121 { |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
2122 ++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
|
2123 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
|
2124 } |
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
|
2125 win_line_start(wp, &wlv, TRUE); |
30759
b41ccaa6fd84
patch 9.0.0714: with 'nowrap' two virtual text below not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents:
30749
diff
changeset
|
2126 bail_out = 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
|
2127 } |
29560
14b139cbec49
patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents:
29550
diff
changeset
|
2128 } |
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
2129 } |
29560
14b139cbec49
patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents:
29550
diff
changeset
|
2130 |
30763
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2131 // If the text didn't reach until the first window |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2132 // column we need to skip cells. |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2133 if (skip_cells > 0) |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2134 { |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2135 if (wlv.n_extra > skip_cells) |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2136 { |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2137 wlv.n_extra -= skip_cells; |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2138 wlv.p_extra += skip_cells; |
31323
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
2139 wlv.n_attr_skip -= skip_cells; |
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
2140 if (wlv.n_attr_skip < 0) |
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
2141 wlv.n_attr_skip = 0; |
30763
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2142 skip_cells = 0; |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2143 } |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2144 else |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2145 { |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2146 // the whole text is left of the window, drop |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2147 // it and advance to the next one |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2148 skip_cells -= wlv.n_extra; |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2149 wlv.n_extra = 0; |
31323
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
2150 wlv.n_attr_skip = 0; |
30763
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2151 bail_out = TRUE; |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2152 } |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2153 } |
8ea77a6ceff0
patch 9.0.0716: with 'nowrap' virtual text "after" does not scroll left
Bram Moolenaar <Bram@vim.org>
parents:
30759
diff
changeset
|
2154 |
29560
14b139cbec49
patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents:
29550
diff
changeset
|
2155 // 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
|
2156 // 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
|
2157 // 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
|
2158 // 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
|
2159 text_prop_above = above; |
30777
8f25424b4bfd
patch 9.0.0723: extra empty line below virtual text when 'list' is set
Bram Moolenaar <Bram@vim.org>
parents:
30775
diff
changeset
|
2160 text_prop_follows |= other_tpi != -1 |
30749
6fe513996997
patch 9.0.0709: virtual text "after" not correct with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
30741
diff
changeset
|
2161 && (wp->w_p_wrap |
6fe513996997
patch 9.0.0709: virtual text "after" not correct with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
30741
diff
changeset
|
2162 || (text_props[other_tpi].tp_flags |
6fe513996997
patch 9.0.0709: virtual text "after" not correct with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
30741
diff
changeset
|
2163 & (TP_FLAG_ALIGN_BELOW | TP_FLAG_ALIGN_RIGHT))); |
30759
b41ccaa6fd84
patch 9.0.0714: with 'nowrap' two virtual text below not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents:
30749
diff
changeset
|
2164 |
b41ccaa6fd84
patch 9.0.0714: with 'nowrap' two virtual text below not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents:
30749
diff
changeset
|
2165 if (bail_out) |
b41ccaa6fd84
patch 9.0.0714: with 'nowrap' two virtual text below not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents:
30749
diff
changeset
|
2166 // starting a new line for "below" |
b41ccaa6fd84
patch 9.0.0714: with 'nowrap' two virtual text below not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents:
30749
diff
changeset
|
2167 continue; |
29451
057c26b5c33a
patch 9.0.0067: cannot show virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29413
diff
changeset
|
2168 } |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2169 } |
29597
f2d7f20d83c3
patch 9.0.0139: truncating virtual text after a line not implemented
Bram Moolenaar <Bram@vim.org>
parents:
29583
diff
changeset
|
2170 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
|
2171 && 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
|
2172 && ((*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
|
2173 || (!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
|
2174 && 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
|
2175 && (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
|
2176 & 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
|
2177 // 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
|
2178 // 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
|
2179 // 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
|
2180 // 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
|
2181 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
|
2182 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2183 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2184 |
29706
a680dc1b089d
patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29698
diff
changeset
|
2185 #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
|
2186 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
|
2187 { |
a680dc1b089d
patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29698
diff
changeset
|
2188 // 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
|
2189 // 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
|
2190 // 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
|
2191 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
|
2192 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
|
2193 &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
|
2194 &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
|
2195 &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
|
2196 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
|
2197 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
|
2198 |
a680dc1b089d
patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29698
diff
changeset
|
2199 // 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
|
2200 // 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
|
2201 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
|
2202 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
|
2203 } |
a680dc1b089d
patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29698
diff
changeset
|
2204 #endif |
a680dc1b089d
patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29698
diff
changeset
|
2205 |
a680dc1b089d
patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29698
diff
changeset
|
2206 #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
|
2207 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
|
2208 { |
31469
c097c18dcedb
patch 9.0.1067: in diff mode virtual text is highlighted incorrectly
Bram Moolenaar <Bram@vim.org>
parents:
31431
diff
changeset
|
2209 // When there is extra text (e.g. virtual text) it gets the |
c097c18dcedb
patch 9.0.1067: in diff mode virtual text is highlighted incorrectly
Bram Moolenaar <Bram@vim.org>
parents:
31431
diff
changeset
|
2210 // diff highlighting for the line, but not for changed text. |
29706
a680dc1b089d
patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29698
diff
changeset
|
2211 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
|
2212 && 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
|
2213 wlv.diff_hlf = HLF_TXD; // changed text |
31473
edd37b53405a
patch 9.0.1069: diff mode highlight fails for special characters
Bram Moolenaar <Bram@vim.org>
parents:
31469
diff
changeset
|
2214 if (wlv.diff_hlf == HLF_TXD |
edd37b53405a
patch 9.0.1069: diff mode highlight fails for special characters
Bram Moolenaar <Bram@vim.org>
parents:
31469
diff
changeset
|
2215 && ((ptr - line > change_end && wlv.n_extra == 0) |
edd37b53405a
patch 9.0.1069: diff mode highlight fails for special characters
Bram Moolenaar <Bram@vim.org>
parents:
31469
diff
changeset
|
2216 || (wlv.n_extra > 0 && wlv.extra_for_textprop))) |
29706
a680dc1b089d
patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29698
diff
changeset
|
2217 wlv.diff_hlf = HLF_CHD; // changed line |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
2218 wlv.line_attr = HL_ATTR(wlv.diff_hlf); |
29706
a680dc1b089d
patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29698
diff
changeset
|
2219 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
|
2220 && 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
|
2221 && (!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
|
2222 && wlv.vcol <= right_curline_col))) |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
2223 wlv.line_attr = hl_combine_attr( |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
2224 wlv.line_attr, HL_ATTR(HLF_CUL)); |
29706
a680dc1b089d
patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29698
diff
changeset
|
2225 } |
a680dc1b089d
patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29698
diff
changeset
|
2226 #endif |
a680dc1b089d
patch 9.0.0193: search and match highlgith interfere with virtual text
Bram Moolenaar <Bram@vim.org>
parents:
29698
diff
changeset
|
2227 |
18374
86c00b8fefea
patch 8.1.2181: highlighting wrong when item follows tab
Bram Moolenaar <Bram@vim.org>
parents:
18364
diff
changeset
|
2228 #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
|
2229 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
|
2230 { |
18390
c34ee31d0878
patch 8.1.2189: syntax highlighting wrong for tab
Bram Moolenaar <Bram@vim.org>
parents:
18374
diff
changeset
|
2231 syntax_attr = 0; |
18374
86c00b8fefea
patch 8.1.2181: highlighting wrong when item follows tab
Bram Moolenaar <Bram@vim.org>
parents:
18364
diff
changeset
|
2232 # 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
|
2233 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
|
2234 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
|
2235 # endif |
18317
d2228d4cf1f6
patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
18245
diff
changeset
|
2236 // 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
|
2237 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
|
2238 { |
d2228d4cf1f6
patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
18245
diff
changeset
|
2239 // 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
|
2240 // 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
|
2241 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
|
2242 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
|
2243 |
d2228d4cf1f6
patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
18245
diff
changeset
|
2244 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
|
2245 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
|
2246 // 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
|
2247 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
|
2248 else |
72a0dbe1c004
patch 8.1.2156: first character after Tab is not highlighted
Bram Moolenaar <Bram@vim.org>
parents:
18321
diff
changeset
|
2249 { |
18337
b08dbcb42399
patch 8.1.2163: cannot build with +spell but without +syntax
Bram Moolenaar <Bram@vim.org>
parents:
18331
diff
changeset
|
2250 # 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
|
2251 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
|
2252 # endif |
18323
72a0dbe1c004
patch 8.1.2156: first character after Tab is not highlighted
Bram Moolenaar <Bram@vim.org>
parents:
18321
diff
changeset
|
2253 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
|
2254 # 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
|
2255 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
|
2256 # endif |
d2228d4cf1f6
patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
18245
diff
changeset
|
2257 NULL, FALSE); |
18323
72a0dbe1c004
patch 8.1.2156: first character after Tab is not highlighted
Bram Moolenaar <Bram@vim.org>
parents:
18321
diff
changeset
|
2258 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
|
2259 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
|
2260 } |
18317
d2228d4cf1f6
patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
18245
diff
changeset
|
2261 |
d2228d4cf1f6
patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
18245
diff
changeset
|
2262 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
|
2263 { |
d2228d4cf1f6
patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
18245
diff
changeset
|
2264 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
|
2265 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
|
2266 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
|
2267 } |
d2228d4cf1f6
patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
18245
diff
changeset
|
2268 else |
d2228d4cf1f6
patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
18245
diff
changeset
|
2269 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
|
2270 # 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
|
2271 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
|
2272 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
|
2273 # endif |
d2228d4cf1f6
patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
18245
diff
changeset
|
2274 |
d2228d4cf1f6
patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
18245
diff
changeset
|
2275 // 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
|
2276 // 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
|
2277 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
|
2278 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
|
2279 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
|
2280 # 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
|
2281 // 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
|
2282 // 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
|
2283 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
|
2284 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
|
2285 else |
d2228d4cf1f6
patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
18245
diff
changeset
|
2286 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
|
2287 # endif |
d2228d4cf1f6
patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
18245
diff
changeset
|
2288 } |
18374
86c00b8fefea
patch 8.1.2181: highlighting wrong when item follows tab
Bram Moolenaar <Bram@vim.org>
parents:
18364
diff
changeset
|
2289 } |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18720
diff
changeset
|
2290 # 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
|
2291 // 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
|
2292 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
|
2293 { |
29611
608d5221a3e5
patch 9.0.0146: missing part of change for "override" flag
Bram Moolenaar <Bram@vim.org>
parents:
29597
diff
changeset
|
2294 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
|
2295 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
|
2296 else |
0ac88fdbf089
patch 8.1.2279: computation of highlight attributes is too complicated
Bram Moolenaar <Bram@vim.org>
parents:
18502
diff
changeset
|
2297 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
|
2298 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
|
2299 } |
0ac88fdbf089
patch 8.1.2279: computation of highlight attributes is too complicated
Bram Moolenaar <Bram@vim.org>
parents:
18502
diff
changeset
|
2300 # endif |
18317
d2228d4cf1f6
patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
18245
diff
changeset
|
2301 #endif |
d2228d4cf1f6
patch 8.1.2153: combining text property and syntax highlight is wrong
Bram Moolenaar <Bram@vim.org>
parents:
18245
diff
changeset
|
2302 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2303 // 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
|
2304 attr_pri = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2305 #ifdef LINE_ATTR |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2306 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
|
2307 { |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
2308 wlv.char_attr = hl_combine_attr(wlv.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
|
2309 if (!highlight_match) |
e3efa11b6a1e
patch 8.2.2797: Search highlight disappears in the Visual area
Bram Moolenaar <Bram@vim.org>
parents:
24071
diff
changeset
|
2310 // 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
|
2311 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
|
2312 # 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
|
2313 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
|
2314 # endif |
ee489bb09ea8
patch 8.1.2176: syntax attributes not combined with Visual highlighting
Bram Moolenaar <Bram@vim.org>
parents:
18356
diff
changeset
|
2315 } |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2316 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
|
2317 { |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
2318 wlv.char_attr = hl_combine_attr(wlv.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
|
2319 # 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
|
2320 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
|
2321 # endif |
ee489bb09ea8
patch 8.1.2176: syntax attributes not combined with Visual highlighting
Bram Moolenaar <Bram@vim.org>
parents:
18356
diff
changeset
|
2322 } |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
2323 else if (wlv.line_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
|
2324 && ((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
|
2325 || 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
|
2326 || 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
|
2327 || 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
|
2328 { |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
2329 // Use wlv.line_attr when not in the Visual or 'incsearch' area |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2330 // (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
|
2331 # ifdef FEAT_SYN_HL |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
2332 wlv.char_attr = hl_combine_attr(syntax_attr, wlv.line_attr); |
18570
0ac88fdbf089
patch 8.1.2279: computation of highlight attributes is too complicated
Bram Moolenaar <Bram@vim.org>
parents:
18502
diff
changeset
|
2333 # else |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
2334 wlv.char_attr = wlv.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
|
2335 # endif |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2336 attr_pri = FALSE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2337 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2338 #else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2339 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
|
2340 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
|
2341 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
|
2342 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
|
2343 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2344 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2345 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2346 attr_pri = FALSE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2347 #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
|
2348 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
|
2349 #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
|
2350 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
|
2351 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2352 } |
29611
608d5221a3e5
patch 9.0.0146: missing part of change for "override" flag
Bram Moolenaar <Bram@vim.org>
parents:
29597
diff
changeset
|
2353 #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
|
2354 // 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
|
2355 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
|
2356 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
|
2357 #endif |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2358 } |
18494
04a40c1514c4
patch 8.1.2241: match highlight does not combine with 'wincolor'
Bram Moolenaar <Bram@vim.org>
parents:
18471
diff
changeset
|
2359 |
04a40c1514c4
patch 8.1.2241: match highlight does not combine with 'wincolor'
Bram Moolenaar <Bram@vim.org>
parents:
18471
diff
changeset
|
2360 // 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
|
2361 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
|
2362 { |
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
|
2363 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
|
2364 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
|
2365 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
|
2366 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
|
2367 } |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2368 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2369 // 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
|
2370 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2371 // 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
|
2372 // 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
|
2373 // 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
|
2374 // 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
|
2375 // "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
|
2376 // "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
|
2377 // 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
|
2378 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
|
2379 { |
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 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
|
2381 { |
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
|
2382 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
|
2383 ? 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
|
2384 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
|
2385 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
|
2386 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2387 mb_utf8 = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2388 u8cc[0] = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2389 c = 0xc0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2390 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2391 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2392 mb_utf8 = FALSE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2393 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2394 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2395 { |
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
|
2396 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
|
2397 if (has_mbyte) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2398 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2399 mb_c = c; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2400 if (enc_utf8) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2401 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2402 // 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
|
2403 // 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
|
2404 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
|
2405 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
|
2406 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
|
2407 mb_l = 1; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2408 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
|
2409 { |
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
|
2410 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
|
2411 mb_utf8 = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2412 c = 0xc0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2413 } |
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 |
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 // 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
|
2418 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
|
2419 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
|
2420 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 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
|
2422 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
|
2423 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2424 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
|
2425 mb_l = 1; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2426 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2427 // 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
|
2428 // last column. |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2429 if (( |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2430 # 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
|
2431 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
|
2432 # 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
|
2433 (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
|
2434 && (*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
|
2435 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2436 c = '>'; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2437 mb_c = c; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2438 mb_l = 1; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2439 mb_utf8 = FALSE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2440 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
|
2441 #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
|
2442 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
|
2443 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
|
2444 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
|
2445 #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
|
2446 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
|
2447 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2448 // 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
|
2449 // 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
|
2450 ++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
|
2451 --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
|
2452 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2453 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2454 { |
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
|
2455 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
|
2456 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
|
2457 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2458 } |
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
|
2459 ++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
|
2460 } |
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
|
2461 --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
|
2462 #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
|
2463 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
|
2464 { |
31221
59de2172e99d
patch 9.0.0944: 'cursorline' causes virtual text highlight to continue
Bram Moolenaar <Bram@vim.org>
parents:
31142
diff
changeset
|
2465 // Only restore search_attr and area_attr after "n_extra" in |
59de2172e99d
patch 9.0.0944: 'cursorline' causes virtual text highlight to continue
Bram Moolenaar <Bram@vim.org>
parents:
31142
diff
changeset
|
2466 // the next screen line is also done. |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
2467 if (wlv.saved_n_extra <= 0) |
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
2468 { |
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
2469 if (search_attr == 0) |
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
2470 search_attr = saved_search_attr; |
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
2471 if (area_attr == 0 && *ptr != NUL) |
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
2472 area_attr = saved_area_attr; |
31223
30377fd8341e
patch 9.0.0945: failures in the cursorline test
Bram Moolenaar <Bram@vim.org>
parents:
31221
diff
changeset
|
2473 |
30377fd8341e
patch 9.0.0945: failures in the cursorline test
Bram Moolenaar <Bram@vim.org>
parents:
31221
diff
changeset
|
2474 if (wlv.extra_for_textprop) |
30377fd8341e
patch 9.0.0945: failures in the cursorline test
Bram Moolenaar <Bram@vim.org>
parents:
31221
diff
changeset
|
2475 // wlv.extra_attr should be used at this position but |
30377fd8341e
patch 9.0.0945: failures in the cursorline test
Bram Moolenaar <Bram@vim.org>
parents:
31221
diff
changeset
|
2476 // not any further. |
30377fd8341e
patch 9.0.0945: failures in the cursorline test
Bram Moolenaar <Bram@vim.org>
parents:
31221
diff
changeset
|
2477 reset_extra_attr = TRUE; |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
2478 } |
31223
30377fd8341e
patch 9.0.0945: failures in the cursorline test
Bram Moolenaar <Bram@vim.org>
parents:
31221
diff
changeset
|
2479 |
30377fd8341e
patch 9.0.0945: failures in the cursorline test
Bram Moolenaar <Bram@vim.org>
parents:
31221
diff
changeset
|
2480 wlv.extra_for_textprop = FALSE; |
30377fd8341e
patch 9.0.0945: failures in the cursorline test
Bram Moolenaar <Bram@vim.org>
parents:
31221
diff
changeset
|
2481 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
|
2482 } |
26338
4cf208415483
patch 8.2.3700: text property highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents:
26334
diff
changeset
|
2483 #endif |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2484 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2485 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2486 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2487 #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
|
2488 int c0; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2489 #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
|
2490 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
|
2491 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2492 // 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
|
2493 c = *ptr; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2494 #ifdef FEAT_LINEBREAK |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2495 c0 = *ptr; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2496 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2497 if (has_mbyte) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2498 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2499 mb_c = c; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2500 if (enc_utf8) |
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 // 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
|
2503 // into "mb_c". |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2504 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
|
2505 mb_utf8 = FALSE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2506 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
|
2507 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2508 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
|
2509 // 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
|
2510 // 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
|
2511 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
|
2512 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2513 c = mb_c; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2514 #ifdef FEAT_LINEBREAK |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2515 c0 = mb_c; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2516 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2517 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2518 mb_utf8 = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2519 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2520 // 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
|
2521 // 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
|
2522 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
|
2523 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2524 int i; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2525 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2526 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
|
2527 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
|
2528 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
|
2529 mb_c = ' '; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2530 } |
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 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2533 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
|
2534 || (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
|
2535 || (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
|
2536 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2537 // 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
|
2538 // 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
|
2539 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
|
2540 # ifdef FEAT_RIGHTLEFT |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2541 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
|
2542 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
|
2543 # endif |
30367
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
2544 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
|
2545 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
|
2546 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
|
2547 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
|
2548 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
|
2549 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
|
2550 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
|
2551 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
|
2552 { |
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
|
2553 n_attr = wlv.n_extra + 1; |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
2554 wlv.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
|
2555 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
|
2556 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
|
2557 } |
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 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
|
2560 mb_l = 1; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2561 #ifdef FEAT_ARABIC |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2562 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
|
2563 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2564 // Do Arabic shaping. |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2565 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
|
2566 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
|
2567 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2568 // 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
|
2569 // 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
|
2570 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
|
2571 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2572 pc = prev_c; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2573 pc1 = prev_c1; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2574 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
|
2575 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
|
2576 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2577 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2578 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2579 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
|
2580 nc = prev_c; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2581 pc1 = pcc[0]; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2582 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2583 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
|
2584 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2585 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
|
2586 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2587 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2588 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
|
2589 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2590 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2591 else // enc_dbcs |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2592 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2593 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
|
2594 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
|
2595 mb_l = 1; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2596 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
|
2597 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2598 // 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
|
2599 // 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
|
2600 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
|
2601 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
|
2602 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2603 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2604 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
|
2605 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2606 // 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
|
2607 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
|
2608 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
|
2609 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2610 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2611 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2612 // illegal tail byte |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2613 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
|
2614 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
|
2615 } |
30367
95bf6aa369ee
patch 9.0.0519: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30365
diff
changeset
|
2616 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
|
2617 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
|
2618 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
|
2619 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
|
2620 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
|
2621 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
|
2622 { |
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
|
2623 n_attr = wlv.n_extra + 1; |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
2624 wlv.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
|
2625 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
|
2626 // 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
|
2627 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
|
2628 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2629 mb_c = c; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2630 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2631 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2632 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2633 // 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
|
2634 // 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
|
2635 // next line. |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2636 if (( |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2637 # 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
|
2638 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
|
2639 # 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
|
2640 (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
|
2641 && (*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
|
2642 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2643 c = '>'; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2644 mb_c = c; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2645 mb_utf8 = FALSE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2646 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
|
2647 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
|
2648 // 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
|
2649 // 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
|
2650 --ptr; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2651 #ifdef FEAT_CONCEAL |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2652 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
|
2653 #endif |
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 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
|
2656 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
|
2657 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2658 // 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
|
2659 // 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
|
2660 // 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
|
2661 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
|
2662 { |
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
|
2663 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
|
2664 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
|
2665 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
|
2666 c = ' '; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2667 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
|
2668 { |
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
|
2669 n_attr = wlv.n_extra + 1; |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
2670 wlv.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
|
2671 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
|
2672 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
|
2673 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2674 mb_c = c; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2675 mb_utf8 = FALSE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2676 mb_l = 1; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2677 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2678 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2679 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2680 ++ptr; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2681 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2682 if (extra_check) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2683 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2684 #ifdef FEAT_SPELL |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2685 // 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
|
2686 // 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
|
2687 // @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
|
2688 // 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
|
2689 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
|
2690 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
|
2691 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2692 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
|
2693 // 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
|
2694 // 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
|
2695 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
|
2696 # 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
|
2697 !has_syntax || |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2698 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2699 can_spell)) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2700 { |
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
|
2701 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
|
2702 int len; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2703 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
|
2704 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2705 if (has_mbyte) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2706 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
|
2707 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2708 // 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
|
2709 // next line concatenated. |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2710 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
|
2711 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
|
2712 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2713 p = prev_ptr; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2714 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
|
2715 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
|
2716 nochange); |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2717 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
|
2718 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2719 // 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
|
2720 // 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
|
2721 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
|
2722 && (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
|
2723 && 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
|
2724 && 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
|
2725 (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
|
2726 && 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
|
2727 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2728 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
|
2729 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
|
2730 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2731 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2732 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
|
2733 && (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
|
2734 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2735 // 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
|
2736 // 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
|
2737 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
|
2738 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
|
2739 + 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
|
2740 } |
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 // 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
|
2743 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
|
2744 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
|
2745 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2746 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
|
2747 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2748 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
|
2749 && (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
|
2750 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2751 // 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
|
2752 // 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
|
2753 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
|
2754 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
|
2755 - nextline_idx); |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2756 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2757 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2758 // 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
|
2759 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
|
2760 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2761 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2762 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2763 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
|
2764 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2765 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
|
2766 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
|
2767 spell_attr); |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2768 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
|
2769 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
|
2770 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
|
2771 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2772 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2773 #ifdef FEAT_LINEBREAK |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2774 // 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
|
2775 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
|
2776 && 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
|
2777 { |
25711
d1457c3f156c
patch 8.2.3391: crash with combination of 'linebreak' and other options
Bram Moolenaar <Bram@vim.org>
parents:
25517
diff
changeset
|
2778 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
|
2779 : 0; |
d1457c3f156c
patch 8.2.3391: crash with combination of 'linebreak' and other options
Bram Moolenaar <Bram@vim.org>
parents:
25517
diff
changeset
|
2780 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
|
2781 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
|
2782 |
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
|
2783 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
|
2784 # 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
|
2785 // 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
|
2786 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
|
2787 # 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
|
2788 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
|
2789 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
|
2790 |
03492b62d79a
patch 8.2.2903: cursor position wrong on wrapped line with 'signcolumn'
Bram Moolenaar <Bram@vim.org>
parents:
24514
diff
changeset
|
2791 // 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
|
2792 // 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
|
2793 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
|
2794 { |
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 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
|
2796 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
|
2797 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
|
2798 } |
27067
89bc175b25a5
patch 8.2.4062: match highlighting of tab too short
Bram Moolenaar <Bram@vim.org>
parents:
26771
diff
changeset
|
2799 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
|
2800 // 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
|
2801 // 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
|
2802 // 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
|
2803 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
|
2804 |
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 (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
|
2806 # 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
|
2807 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
|
2808 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
|
2809 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
|
2810 # 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
|
2811 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
|
2812 - 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
|
2813 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2814 |
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
|
2815 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
|
2816 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
|
2817 # 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
|
2818 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
|
2819 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
|
2820 # endif |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2821 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
|
2822 { |
18773
38a3bef525e6
patch 8.1.2376: preprocessor indents are incorrect
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2823 # 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
|
2824 if (c == TAB) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2825 // 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
|
2826 FIX_FOR_BOGUSCOLS; |
18773
38a3bef525e6
patch 8.1.2376: preprocessor indents are incorrect
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2827 # endif |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2828 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
|
2829 c = ' '; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2830 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2831 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2832 #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
|
2833 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
|
2834 && ((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
|
2835 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
|
2836 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
|
2837 |
23952
44be09b25619
patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents:
23901
diff
changeset
|
2838 // '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
|
2839 // 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
|
2840 // 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
|
2841 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
|
2842 && ((((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
|
2843 || (mb_utf8 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2844 && ((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
|
2845 || (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
|
2846 && 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
|
2847 || (c == ' ' |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2848 && 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
|
2849 && (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
|
2850 || (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
|
2851 && 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
|
2852 && 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
|
2853 && ptr - line <= trailcol))) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2854 { |
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
|
2855 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
|
2856 { |
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
|
2857 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
|
2858 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
|
2859 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
|
2860 } |
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
|
2861 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
|
2862 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
|
2863 : 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
|
2864 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
|
2865 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2866 n_attr = 1; |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
2867 wlv.extra_attr = hl_combine_attr(wlv.win_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
|
2868 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
|
2869 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
|
2870 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2871 mb_c = c; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2872 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
|
2873 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2874 mb_utf8 = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2875 u8cc[0] = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2876 c = 0xc0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2877 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2878 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2879 mb_utf8 = FALSE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2880 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2881 |
29111
bfb205095634
patch 8.2.5076: unnecessary code
Bram Moolenaar <Bram@vim.org>
parents:
29090
diff
changeset
|
2882 if (c == ' ' && ((trailcol != MAXCOL && ptr > line + trailcol) |
bfb205095634
patch 8.2.5076: unnecessary code
Bram Moolenaar <Bram@vim.org>
parents:
29090
diff
changeset
|
2883 || (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
|
2884 { |
29090
9b292596a332
patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents:
28788
diff
changeset
|
2885 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
|
2886 && 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
|
2887 { |
9b292596a332
patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents:
28788
diff
changeset
|
2888 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
|
2889 if (wp->w_lcs_chars.leadmultispace[multispace_pos] |
bfb205095634
patch 8.2.5076: unnecessary code
Bram Moolenaar <Bram@vim.org>
parents:
29090
diff
changeset
|
2890 == 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
|
2891 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
|
2892 } |
9b292596a332
patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents:
28788
diff
changeset
|
2893 |
9b292596a332
patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents:
28788
diff
changeset
|
2894 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
|
2895 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
|
2896 |
9b292596a332
patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents:
28788
diff
changeset
|
2897 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
|
2898 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
|
2899 |
29111
bfb205095634
patch 8.2.5076: unnecessary code
Bram Moolenaar <Bram@vim.org>
parents:
29090
diff
changeset
|
2900 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
|
2901 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
|
2902 |
9b292596a332
patch 8.2.5066: timer_create is not available on every Mac system
Bram Moolenaar <Bram@vim.org>
parents:
28788
diff
changeset
|
2903 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2904 if (!attr_pri) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2905 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2906 n_attr = 1; |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
2907 wlv.extra_attr = hl_combine_attr(wlv.win_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
|
2908 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
|
2909 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
|
2910 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2911 mb_c = c; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2912 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
|
2913 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2914 mb_utf8 = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2915 u8cc[0] = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2916 c = 0xc0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2917 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2918 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2919 mb_utf8 = FALSE; |
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 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2922 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2923 // 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
|
2924 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
|
2925 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2926 // 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
|
2927 // 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
|
2928 // into "ScreenLines". |
23952
44be09b25619
patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents:
23901
diff
changeset
|
2929 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
|
2930 { |
31315
6a03cc83fcc5
patch 9.0.0991: crash when reading help index with various options set
Bram Moolenaar <Bram@vim.org>
parents:
31297
diff
changeset
|
2931 int tab_len = 0; |
6a03cc83fcc5
patch 9.0.0991: crash when reading help index with various options set
Bram Moolenaar <Bram@vim.org>
parents:
31297
diff
changeset
|
2932 long vcol_adjusted = wlv.vcol; // removed showbreak len |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2933 #ifdef FEAT_LINEBREAK |
31315
6a03cc83fcc5
patch 9.0.0991: crash when reading help index with various options set
Bram Moolenaar <Bram@vim.org>
parents:
31297
diff
changeset
|
2934 char_u *sbr = get_showbreak_value(wp); |
18574
8b0114ffde2b
patch 8.1.2281: 'showbreak' cannot be set for one window
Bram Moolenaar <Bram@vim.org>
parents:
18570
diff
changeset
|
2935 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2936 // 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
|
2937 // 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
|
2938 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
|
2939 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
|
2940 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2941 // 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
|
2942 #ifdef FEAT_VARTABS |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2943 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
|
2944 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
|
2945 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
|
2946 #else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2947 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
|
2948 - 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
|
2949 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2950 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2951 #ifdef FEAT_LINEBREAK |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2952 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
|
2953 #endif |
31315
6a03cc83fcc5
patch 9.0.0991: crash when reading help index with various options set
Bram Moolenaar <Bram@vim.org>
parents:
31297
diff
changeset
|
2954 { |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2955 // 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
|
2956 wlv.n_extra = tab_len; |
31315
6a03cc83fcc5
patch 9.0.0991: crash when reading help index with various options set
Bram Moolenaar <Bram@vim.org>
parents:
31297
diff
changeset
|
2957 } |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2958 #ifdef FEAT_LINEBREAK |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2959 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2960 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2961 char_u *p; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2962 int len; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2963 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
|
2964 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
|
2965 |
25749
24b80aa4dd2e
patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents:
25711
diff
changeset
|
2966 # 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
|
2967 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
|
2968 // 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
|
2969 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
|
2970 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2971 // 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
|
2972 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
|
2973 && 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
|
2974 && 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
|
2975 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
|
2976 # endif |
30713
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2977 if (tab_len > 0) |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2978 { |
31315
6a03cc83fcc5
patch 9.0.0991: crash when reading help index with various options set
Bram Moolenaar <Bram@vim.org>
parents:
31297
diff
changeset
|
2979 // If wlv.n_extra > 0, it gives the number of chars |
6a03cc83fcc5
patch 9.0.0991: crash when reading help index with various options set
Bram Moolenaar <Bram@vim.org>
parents:
31297
diff
changeset
|
2980 // to use for a tab, else we need to calculate the |
6a03cc83fcc5
patch 9.0.0991: crash when reading help index with various options set
Bram Moolenaar <Bram@vim.org>
parents:
31297
diff
changeset
|
2981 // width for a tab. |
30713
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2982 int tab2_len = mb_char2len(wp->w_lcs_chars.tab2); |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2983 len = tab_len * tab2_len; |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2984 if (wp->w_lcs_chars.tab3) |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2985 len += mb_char2len(wp->w_lcs_chars.tab3) |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2986 - tab2_len; |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2987 if (wlv.n_extra > 0) |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2988 len += wlv.n_extra - tab_len; |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2989 c = wp->w_lcs_chars.tab1; |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2990 p = alloc(len + 1); |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2991 if (p == NULL) |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2992 wlv.n_extra = 0; |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2993 else |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2994 { |
30713
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2995 vim_memset(p, ' ', len); |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2996 p[len] = NUL; |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2997 vim_free(wlv.p_extra_free); |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2998 wlv.p_extra_free = p; |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
2999 for (i = 0; i < tab_len; i++) |
25749
24b80aa4dd2e
patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents:
25711
diff
changeset
|
3000 { |
30713
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3001 int lcs = wp->w_lcs_chars.tab2; |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3002 |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3003 if (*p == NUL) |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3004 { |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3005 tab_len = i; |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3006 break; |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3007 } |
25749
24b80aa4dd2e
patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents:
25711
diff
changeset
|
3008 |
30713
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3009 // if tab3 is given, use it for the last |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3010 // char |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3011 if (wp->w_lcs_chars.tab3 |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3012 && i == tab_len - 1) |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3013 lcs = wp->w_lcs_chars.tab3; |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3014 p += mb_char2bytes(lcs, p); |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3015 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
|
3016 - (saved_nextra > 0 ? 1 : 0); |
30713
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3017 } |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3018 wlv.p_extra = wlv.p_extra_free; |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3019 # ifdef FEAT_CONCEAL |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3020 // n_extra will be increased by |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3021 // FIX_FOX_BOGUSCOLS macro below, so need to |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3022 // adjust for that here |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3023 if (wlv.vcol_off > 0) |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3024 wlv.n_extra -= wlv.vcol_off; |
cb8094ff4f36
patch 9.0.0691: lalloc(0) error in listchars test
Bram Moolenaar <Bram@vim.org>
parents:
30711
diff
changeset
|
3025 # endif |
25749
24b80aa4dd2e
patch 8.2.3410: crash with linebreak, listchars and large tabstop
Bram Moolenaar <Bram@vim.org>
parents:
25711
diff
changeset
|
3026 } |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3027 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3028 } |
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 #ifdef FEAT_CONCEAL |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3031 { |
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
|
3032 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
|
3033 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3034 // 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
|
3035 // '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
|
3036 // 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
|
3037 // 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
|
3038 // 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
|
3039 // '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
|
3040 FIX_FOR_BOGUSCOLS; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3041 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3042 // 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
|
3043 // 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
|
3044 // 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
|
3045 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
|
3046 && 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
|
3047 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
|
3048 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3049 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3050 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
|
3051 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
|
3052 { |
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
|
3053 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
|
3054 ? wp->w_lcs_chars.tab3 |
44be09b25619
patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents:
23901
diff
changeset
|
3055 : 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
|
3056 #ifdef FEAT_LINEBREAK |
31315
6a03cc83fcc5
patch 9.0.0991: crash when reading help index with various options set
Bram Moolenaar <Bram@vim.org>
parents:
31297
diff
changeset
|
3057 if (wp->w_p_lbr && wlv.p_extra != 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
|
3058 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
|
3059 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3060 #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
|
3061 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
|
3062 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
|
3063 n_attr = tab_len + 1; |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
3064 wlv.extra_attr = hl_combine_attr(wlv.win_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
|
3065 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
|
3066 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
|
3067 mb_c = c; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3068 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
|
3069 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3070 mb_utf8 = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3071 u8cc[0] = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3072 c = 0xc0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3073 } |
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 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3076 { |
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
|
3077 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
|
3078 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
|
3079 c = ' '; |
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 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3082 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
|
3083 && (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
|
3084 || ((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
|
3085 && 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
|
3086 && 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
|
3087 && ( |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3088 # 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
|
3089 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
|
3090 # 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
|
3091 (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
|
3092 && !(noinvcur |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3093 && 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
|
3094 && (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
|
3095 && 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
|
3096 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3097 // 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
|
3098 // 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
|
3099 #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
|
3100 // 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
|
3101 // "$". |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3102 if ( |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3103 # 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
|
3104 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
|
3105 # ifdef LINE_ATTR |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3106 && |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3107 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3108 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3109 # ifdef LINE_ATTR |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
3110 wlv.line_attr == 0 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3111 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3112 ) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3113 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3114 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3115 // 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
|
3116 // 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
|
3117 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
|
3118 && 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
|
3119 && 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
|
3120 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
|
3121 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
|
3122 } |
23952
44be09b25619
patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents:
23901
diff
changeset
|
3123 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
|
3124 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
|
3125 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3126 c = ' '; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3127 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
|
3128 --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
|
3129 if (!attr_pri) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3130 { |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
3131 wlv.extra_attr = hl_combine_attr(wlv.win_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
|
3132 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
|
3133 n_attr = 1; |
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 mb_c = c; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3136 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
|
3137 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3138 mb_utf8 = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3139 u8cc[0] = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3140 c = 0xc0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3141 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3142 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3143 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
|
3144 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3145 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
|
3146 { |
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
|
3147 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
|
3148 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
|
3149 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
|
3150 #ifdef FEAT_RIGHTLEFT |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3151 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
|
3152 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
|
3153 #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
|
3154 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
|
3155 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
|
3156 #ifdef FEAT_LINEBREAK |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3157 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
|
3158 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3159 char_u *p; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3160 |
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
|
3161 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
|
3162 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
|
3163 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
|
3164 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
|
3165 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
|
3166 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
|
3167 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
|
3168 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3169 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3170 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3171 { |
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
|
3172 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
|
3173 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
|
3174 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3175 if (!attr_pri) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3176 { |
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
|
3177 n_attr = wlv.n_extra + 1; |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
3178 wlv.extra_attr = hl_combine_attr(wlv.win_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
|
3179 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
|
3180 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
|
3181 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3182 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
|
3183 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3184 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
|
3185 && (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
|
3186 || VIsual_mode == 'v') |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3187 && 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
|
3188 && 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
|
3189 && 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
|
3190 && ( |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3191 #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
|
3192 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
|
3193 #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
|
3194 (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
|
3195 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3196 c = ' '; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3197 --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
|
3198 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3199 #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
|
3200 else if (( |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3201 # 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
|
3202 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
|
3203 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3204 # 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
|
3205 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
|
3206 # endif |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
3207 wlv.line_attr != 0 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3208 ) && ( |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3209 # 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
|
3210 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
|
3211 # 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
|
3212 (wlv.col |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3213 # 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
|
3214 - wlv.boguscols |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3215 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3216 < wp->w_width))) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3217 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3218 // 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
|
3219 c = ' '; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3220 --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
|
3221 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3222 // 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
|
3223 ++did_line_attr; |
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 // don't do search HL for the rest of the line |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
3226 if (wlv.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
|
3227 && (did_line_attr > 1 |
23952
44be09b25619
patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents:
23901
diff
changeset
|
3228 || (wp->w_p_list && |
44be09b25619
patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents:
23901
diff
changeset
|
3229 wp->w_lcs_chars.eol > 0))) |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
3230 wlv.char_attr = wlv.line_attr; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3231 # 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
|
3232 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
|
3233 { |
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
|
3234 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
|
3235 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
|
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 = 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
|
3238 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
|
3239 && 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
|
3240 && (!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
|
3241 || (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
|
3242 && 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
|
3243 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
|
3244 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
|
3245 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3246 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3247 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3248 # 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
|
3249 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
|
3250 { |
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
|
3251 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
|
3252 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
|
3253 && 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
|
3254 { |
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
|
3255 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
|
3256 || (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
|
3257 && 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
|
3258 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
|
3259 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
|
3260 } |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
3261 else if (wlv.line_attr) |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
3262 wlv.char_attr = hl_combine_attr( |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
3263 wlv.char_attr, wlv.line_attr); |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3264 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3265 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3266 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3267 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3268 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3269 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3270 #ifdef FEAT_CONCEAL |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3271 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
|
3272 && (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
|
3273 || 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
|
3274 && ((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
|
3275 && !(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
|
3276 && 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
|
3277 { |
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
|
3278 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
|
3279 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
|
3280 && (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
|
3281 || 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
|
3282 && (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
|
3283 || (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
|
3284 || 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
|
3285 && 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
|
3286 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3287 // 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
|
3288 // 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
|
3289 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
|
3290 c = match_conc; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3291 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
|
3292 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
|
3293 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
|
3294 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
|
3295 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3296 c = ' '; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3297 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3298 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
|
3299 |
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
|
3300 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
|
3301 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
|
3302 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
|
3303 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
|
3304 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3305 # ifdef FEAT_RIGHTLEFT |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3306 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
|
3307 { |
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
|
3308 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
|
3309 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
|
3310 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3311 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3312 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3313 { |
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
|
3314 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
|
3315 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
|
3316 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3317 } |
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
|
3318 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
|
3319 n_attr = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3320 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3321 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
|
3322 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3323 is_concealing = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3324 n_skip = 1; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3325 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3326 mb_c = c; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3327 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
|
3328 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3329 mb_utf8 = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3330 u8cc[0] = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3331 c = 0xc0; |
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 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
|
3335 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3336 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3337 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3338 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
|
3339 is_concealing = FALSE; |
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 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3342 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
|
3343 // 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
|
3344 ++ptr; |
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 #endif // FEAT_CONCEAL |
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 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3349 #ifdef FEAT_CONCEAL |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3350 // 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
|
3351 // 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
|
3352 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
|
3353 && 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
|
3354 && 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
|
3355 && (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
|
3356 { |
22912
1b1dc9dad42c
patch 8.2.2003: build error with +conceal but without +popupwin
Bram Moolenaar <Bram@vim.org>
parents:
22886
diff
changeset
|
3357 # 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
|
3358 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
|
3359 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
|
3360 else |
22912
1b1dc9dad42c
patch 8.2.2003: build error with +conceal but without +popupwin
Bram Moolenaar <Bram@vim.org>
parents:
22886
diff
changeset
|
3361 # 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
|
3362 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
|
3363 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
|
3364 did_wcol = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3365 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
|
3366 # 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
|
3367 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
|
3368 # endif |
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 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3371 |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
3372 // Use "wlv.extra_attr", but don't override visual selection |
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
3373 // highlighting, unless text property overrides. |
31323
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
3374 // Don't use "wlv.extra_attr" until wlv.n_attr_skip is zero. |
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
3375 if (wlv.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
|
3376 && 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
|
3377 && (!attr_pri |
4092d04cd46f
patch 9.0.0209: build error with small features
Bram Moolenaar <Bram@vim.org>
parents:
29736
diff
changeset
|
3378 #ifdef FEAT_PROP_POPUP |
4092d04cd46f
patch 9.0.0209: build error with small features
Bram Moolenaar <Bram@vim.org>
parents:
29736
diff
changeset
|
3379 || (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
|
3380 #endif |
4092d04cd46f
patch 9.0.0209: build error with small features
Bram Moolenaar <Bram@vim.org>
parents:
29736
diff
changeset
|
3381 )) |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3382 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3383 #ifdef LINE_ATTR |
31297
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
3384 if (wlv.line_attr) |
d7a532c4d18d
patch 9.0.0982: 'cursorline' not drawn before virtual text below
Bram Moolenaar <Bram@vim.org>
parents:
31283
diff
changeset
|
3385 wlv.char_attr = hl_combine_attr(wlv.line_attr, wlv.extra_attr); |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3386 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3387 #endif |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
3388 wlv.char_attr = wlv.extra_attr; |
31221
59de2172e99d
patch 9.0.0944: 'cursorline' causes virtual text highlight to continue
Bram Moolenaar <Bram@vim.org>
parents:
31142
diff
changeset
|
3389 #ifdef FEAT_PROP_POPUP |
59de2172e99d
patch 9.0.0944: 'cursorline' causes virtual text highlight to continue
Bram Moolenaar <Bram@vim.org>
parents:
31142
diff
changeset
|
3390 if (reset_extra_attr) |
59de2172e99d
patch 9.0.0944: 'cursorline' causes virtual text highlight to continue
Bram Moolenaar <Bram@vim.org>
parents:
31142
diff
changeset
|
3391 { |
59de2172e99d
patch 9.0.0944: 'cursorline' causes virtual text highlight to continue
Bram Moolenaar <Bram@vim.org>
parents:
31142
diff
changeset
|
3392 reset_extra_attr = FALSE; |
59de2172e99d
patch 9.0.0944: 'cursorline' causes virtual text highlight to continue
Bram Moolenaar <Bram@vim.org>
parents:
31142
diff
changeset
|
3393 wlv.extra_attr = 0; |
59de2172e99d
patch 9.0.0944: 'cursorline' causes virtual text highlight to continue
Bram Moolenaar <Bram@vim.org>
parents:
31142
diff
changeset
|
3394 } |
59de2172e99d
patch 9.0.0944: 'cursorline' causes virtual text highlight to continue
Bram Moolenaar <Bram@vim.org>
parents:
31142
diff
changeset
|
3395 #endif |
18124
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 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3398 #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
|
3399 // 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
|
3400 // 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
|
3401 // 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
|
3402 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
|
3403 && xic != NULL |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3404 && 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
|
3405 && (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
|
3406 && !p_imdisable |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3407 && 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
|
3408 && 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
|
3409 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3410 colnr_T tcol; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3411 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3412 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
|
3413 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
|
3414 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3415 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
|
3416 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
|
3417 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3418 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
|
3419 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3420 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
|
3421 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
|
3422 } |
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
|
3423 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
|
3424 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
|
3425 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
|
3426 feedback_col++; |
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 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
|
3429 { |
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
|
3430 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
|
3431 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
|
3432 feedback_col = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3433 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3434 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3435 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3436 // 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
|
3437 // 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
|
3438 // 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
|
3439 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
|
3440 && 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
|
3441 && (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
|
3442 : 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
|
3443 #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
|
3444 && 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
|
3445 #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
|
3446 && 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
|
3447 && c != NUL) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3448 { |
23952
44be09b25619
patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents:
23901
diff
changeset
|
3449 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
|
3450 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
|
3451 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
|
3452 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3453 // 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
|
3454 // 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
|
3455 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
|
3456 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
|
3457 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
|
3458 n_attr = 2; |
31113
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
3459 wlv.extra_attr = |
6ff733178f8b
patch 9.0.0891: virtual text below after match has wrong highlight
Bram Moolenaar <Bram@vim.org>
parents:
30986
diff
changeset
|
3460 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
|
3461 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3462 mb_c = c; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3463 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
|
3464 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3465 mb_utf8 = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3466 u8cc[0] = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3467 c = 0xc0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3468 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3469 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3470 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
|
3471 if (!attr_pri) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3472 { |
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 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
|
3474 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
|
3475 n_attr3 = 1; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3476 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3477 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3478 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3479 // 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
|
3480 if ((c == NUL |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3481 #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
|
3482 || 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
|
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 ) && 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
|
3485 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3486 #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
|
3487 // 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
|
3488 // 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
|
3489 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
|
3490 (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
|
3491 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3492 // 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
|
3493 // 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
|
3494 // 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
|
3495 // 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
|
3496 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
|
3497 && ((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
|
3498 && (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
|
3499 || lnum == VIsual.lnum |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3500 || 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
|
3501 && c == NUL) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3502 #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
|
3503 // 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
|
3504 || (prevcol_hl_flag |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3505 # 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
|
3506 && !(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
|
3507 && !(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
|
3508 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3509 # 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
|
3510 && 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
|
3511 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3512 # 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
|
3513 && 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
|
3514 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3515 ) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3516 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3517 )) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3518 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3519 int n = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3520 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3521 #ifdef FEAT_RIGHTLEFT |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3522 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
|
3523 { |
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
|
3524 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
|
3525 n = 1; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3526 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3527 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3528 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3529 { |
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 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
|
3531 n = -1; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3532 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3533 if (n != 0) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3534 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3535 // 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
|
3536 // 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
|
3537 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
|
3538 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
|
3539 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3540 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3541 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3542 // 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
|
3543 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
|
3544 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
|
3545 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
|
3546 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3547 #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
|
3548 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
|
3549 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3550 // 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
|
3551 // '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
|
3552 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
|
3553 (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
|
3554 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3555 #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
|
3556 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
|
3557 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
|
3558 #ifdef FEAT_RIGHTLEFT |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3559 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
|
3560 { |
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
|
3561 --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
|
3562 --wlv.off; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3563 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3564 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3565 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3566 { |
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
|
3567 ++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
|
3568 ++wlv.off; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3569 } |
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; |
f1ed6f520d09
patch 9.0.0151: a "below" aligned text property does not work with 'nowrap'
Bram Moolenaar <Bram@vim.org>
parents:
29615
diff
changeset
|
3571 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
|
3572 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3573 } |
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 // 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
|
3576 if (c == NUL) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3577 { |
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
|
3578 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
|
3579 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3580 // 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
|
3581 // 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
|
3582 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
|
3583 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3584 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
|
3585 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
|
3586 #ifdef FEAT_FOLDING |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3587 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
|
3588 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3589 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
|
3590 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3591 break; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3592 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3593 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3594 // 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
|
3595 // 'list' is set. |
23952
44be09b25619
patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents:
23901
diff
changeset
|
3596 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
|
3597 && 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
|
3598 && 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
|
3599 && !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
|
3600 #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
|
3601 && 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
|
3602 #endif |
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 #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
|
3605 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
|
3606 #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
|
3607 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
|
3608 && (*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
|
3609 || 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
|
3610 || (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
|
3611 || *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
|
3612 { |
23952
44be09b25619
patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents:
23901
diff
changeset
|
3613 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
|
3614 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
|
3615 mb_c = c; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3616 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
|
3617 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3618 mb_utf8 = TRUE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3619 u8cc[0] = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3620 c = 0xc0; |
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 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3623 mb_utf8 = FALSE; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3624 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3625 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3626 #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
|
3627 // 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
|
3628 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
|
3629 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
|
3630 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3631 // 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
|
3632 // 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
|
3633 // 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
|
3634 // 'cursorcolumn' |
22280
47ebfc274e3f
patch 8.2.1689: 'colorcolumn' doesn't show in indent
Bram Moolenaar <Bram@vim.org>
parents:
22013
diff
changeset
|
3635 // 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
|
3636 // 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
|
3637 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
|
3638 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
|
3639 || 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
|
3640 || 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
|
3641 && !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
|
3642 && 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
|
3643 && 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
|
3644 # 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
|
3645 && 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
|
3646 # endif |
b27601c0d289
patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
22280
diff
changeset
|
3647 ) |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3648 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3649 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
|
3650 && 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
|
3651 { |
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
|
3652 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
|
3653 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
|
3654 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
|
3655 } |
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
|
3656 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
|
3657 { |
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
|
3658 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
|
3659 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
|
3660 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3661 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3662 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3663 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3664 // 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
|
3665 // 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
|
3666 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
|
3667 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
|
3668 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3669 // Store the character. |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3670 #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
|
3671 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
|
3672 { |
26771
fc859aea8cec
patch 8.2.3914: various spelling mistakes in comments
Bram Moolenaar <Bram@vim.org>
parents:
26690
diff
changeset
|
3673 // 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
|
3674 --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
|
3675 --wlv.col; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3676 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3677 #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
|
3678 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
|
3679 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
|
3680 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3681 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
|
3682 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
|
3683 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
|
3684 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3685 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
|
3686 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3687 if (mb_utf8) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3688 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3689 int i; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3690 |
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
|
3691 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
|
3692 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
|
3693 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
|
3694 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
|
3695 { |
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
|
3696 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
|
3697 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
|
3698 break; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3699 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3700 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3701 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
|
3702 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
|
3703 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3704 if (multi_attr) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3705 { |
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
|
3706 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
|
3707 multi_attr = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3708 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3709 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
|
3710 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
|
3711 |
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
|
3712 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
|
3713 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3714 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
|
3715 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3716 // 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
|
3717 ++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
|
3718 ++wlv.col; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3719 if (enc_utf8) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3720 // 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
|
3721 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
|
3722 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3723 // 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
|
3724 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
|
3725 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
|
3726 #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
|
3727 && 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
|
3728 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3729 ) |
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
|
3730 ++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
|
3731 // 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
|
3732 // 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
|
3733 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
|
3734 ++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
|
3735 |
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
|
3736 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
|
3737 |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3738 #ifdef FEAT_RIGHTLEFT |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3739 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
|
3740 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3741 // 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
|
3742 --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
|
3743 --wlv.col; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3744 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3745 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3746 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3747 #ifdef FEAT_RIGHTLEFT |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3748 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
|
3749 { |
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
|
3750 --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
|
3751 --wlv.col; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3752 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3753 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3754 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3755 { |
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
|
3756 ++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
|
3757 ++wlv.col; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3758 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3759 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3760 #ifdef FEAT_CONCEAL |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3761 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
|
3762 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3763 --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
|
3764 ++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
|
3765 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
|
3766 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
|
3767 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
|
3768 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3769 // 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
|
3770 // |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3771 // 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
|
3772 // 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
|
3773 // 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
|
3774 // 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
|
3775 // |
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 // 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
|
3777 // 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
|
3778 // 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
|
3779 // 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
|
3780 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
|
3781 { |
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
|
3782 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
|
3783 # ifdef FEAT_RIGHTLEFT |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3784 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
|
3785 { |
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
|
3786 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
|
3787 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
|
3788 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3789 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3790 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3791 { |
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
|
3792 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
|
3793 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
|
3794 } |
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
|
3795 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
|
3796 n_attr = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3797 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3798 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3799 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3800 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
|
3801 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3802 // 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
|
3803 # ifdef FEAT_RIGHTLEFT |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3804 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
|
3805 { |
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
|
3806 --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
|
3807 --wlv.col; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3808 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3809 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3810 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3811 { |
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
|
3812 ++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
|
3813 ++wlv.col; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3814 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3815 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3816 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3817 # ifdef FEAT_RIGHTLEFT |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3818 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
|
3819 { |
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
|
3820 --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
|
3821 --wlv.col; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3822 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3823 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3824 # endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3825 { |
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
|
3826 ++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
|
3827 ++wlv.col; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3828 } |
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 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3831 { |
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
|
3832 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
|
3833 { |
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
|
3834 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
|
3835 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
|
3836 n_attr = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3837 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3838 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3839 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3840 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3841 #endif // FEAT_CONCEAL |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3842 else |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3843 --n_skip; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3844 |
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 // 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
|
3846 // '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
|
3847 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
|
3848 #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
|
3849 && 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
|
3850 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3851 ) |
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
|
3852 ++wlv.vcol; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3853 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3854 #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
|
3855 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
|
3856 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
|
3857 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3858 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3859 // 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
|
3860 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
|
3861 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
|
3862 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3863 // 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
|
3864 if (n_attr > 0 && wlv.draw_state == WL_LINE |
31323
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
3865 && wlv.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
|
3866 wlv.char_attr = saved_attr2; |
31323
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
3867 if (wlv.n_attr_skip > 0) |
a93392e93a53
patch 9.0.0995: padding before virtual text is highlighted
Bram Moolenaar <Bram@vim.org>
parents:
31315
diff
changeset
|
3868 --wlv.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
|
3869 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3870 // 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
|
3871 // 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
|
3872 if (( |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3873 #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
|
3874 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
|
3875 #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
|
3876 (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
|
3877 && (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
|
3878 || *ptr != NUL |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3879 #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
|
3880 || 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
|
3881 #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
|
3882 #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
|
3883 || 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
|
3884 #endif |
23952
44be09b25619
patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents:
23901
diff
changeset
|
3885 || (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
|
3886 && 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
|
3887 || (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
|
3888 || *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
|
3889 ) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3890 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3891 #ifdef FEAT_CONCEAL |
30655
0fbf3e042602
patch 9.0.0662: concealed characters do not work correctly
Bram Moolenaar <Bram@vim.org>
parents:
30645
diff
changeset
|
3892 wlv.col -= wlv.boguscols; |
30628
2d7905da4e82
patch 9.0.0649: no indication the first line is broken for 'smoothscroll'
Bram Moolenaar <Bram@vim.org>
parents:
30614
diff
changeset
|
3893 wlv_screen_line(wp, &wlv, FALSE); |
30655
0fbf3e042602
patch 9.0.0662: concealed characters do not work correctly
Bram Moolenaar <Bram@vim.org>
parents:
30645
diff
changeset
|
3894 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
|
3895 wlv.boguscols = 0; |
31618
68fed60575ca
patch 9.0.1141: 'cursorcolumn' and 'colorcolumn' wrong after concealing
Bram Moolenaar <Bram@vim.org>
parents:
31584
diff
changeset
|
3896 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
|
3897 #else |
30632
8c0232ab725c
patch 9.0.0651: build fails without the +conceal feature
Bram Moolenaar <Bram@vim.org>
parents:
30628
diff
changeset
|
3898 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
|
3899 #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
|
3900 ++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
|
3901 ++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
|
3902 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3903 // 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
|
3904 // '$' and highlighting until last column, break here. |
30775
a9a46fbfd786
patch 9.0.0722: virtual text "after" does not show with 'list' set
Bram Moolenaar <Bram@vim.org>
parents:
30773
diff
changeset
|
3905 if (((!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
|
3906 #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
|
3907 && 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
|
3908 #endif |
14b139cbec49
patch 9.0.0121: cannot put virtual text after or below a line
Bram Moolenaar <Bram@vim.org>
parents:
29550
diff
changeset
|
3909 #ifdef FEAT_PROP_POPUP |
30775
a9a46fbfd786
patch 9.0.0722: virtual text "after" does not show with 'list' set
Bram Moolenaar <Bram@vim.org>
parents:
30773
diff
changeset
|
3910 && !text_prop_above |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3911 #endif |
30775
a9a46fbfd786
patch 9.0.0722: virtual text "after" does not show with 'list' set
Bram Moolenaar <Bram@vim.org>
parents:
30773
diff
changeset
|
3912 ) || lcs_eol_one == -1) |
a9a46fbfd786
patch 9.0.0722: virtual text "after" does not show with 'list' set
Bram Moolenaar <Bram@vim.org>
parents:
30773
diff
changeset
|
3913 #ifdef FEAT_PROP_POPUP |
a9a46fbfd786
patch 9.0.0722: virtual text "after" does not show with 'list' set
Bram Moolenaar <Bram@vim.org>
parents:
30773
diff
changeset
|
3914 && !text_prop_follows |
a9a46fbfd786
patch 9.0.0722: virtual text "after" does not show with 'list' set
Bram Moolenaar <Bram@vim.org>
parents:
30773
diff
changeset
|
3915 #endif |
a9a46fbfd786
patch 9.0.0722: virtual text "after" does not show with 'list' set
Bram Moolenaar <Bram@vim.org>
parents:
30773
diff
changeset
|
3916 ) |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3917 break; |
29635
592818fd3110
patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents:
29633
diff
changeset
|
3918 #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
|
3919 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
|
3920 { |
592818fd3110
patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents:
29633
diff
changeset
|
3921 // 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
|
3922 ptr += STRLEN(ptr); |
592818fd3110
patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents:
29633
diff
changeset
|
3923 # 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
|
3924 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
|
3925 # endif |
592818fd3110
patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents:
29633
diff
changeset
|
3926 } |
592818fd3110
patch 9.0.0158: with 'nowrap' "below" property not displayed correctly
Bram Moolenaar <Bram@vim.org>
parents:
29633
diff
changeset
|
3927 #endif |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3928 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3929 // 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
|
3930 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
|
3931 #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
|
3932 && 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
|
3933 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3934 ) |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3935 { |
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
|
3936 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
|
3937 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
|
3938 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
|
3939 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3940 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3941 // 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
|
3942 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
|
3943 { |
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
|
3944 ++wlv.row; |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3945 break; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3946 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3947 |
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
|
3948 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
|
3949 #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
|
3950 && 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
|
3951 #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
|
3952 #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
|
3953 && !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
|
3954 #endif |
18124
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3955 && 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
|
3956 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3957 // 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
|
3958 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
|
3959 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3960 // 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
|
3961 // 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
|
3962 // 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
|
3963 // (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
|
3964 // 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
|
3965 // 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
|
3966 // (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
|
3967 // 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
|
3968 // 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
|
3969 // 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
|
3970 if (p_tf |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3971 #ifdef FEAT_GUI |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3972 && !gui.in_use |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3973 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3974 && !(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
|
3975 && ((*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
|
3976 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
|
3977 == 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
|
3978 || (*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
|
3979 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
|
3980 + (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
|
3981 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
|
3982 + 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
|
3983 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3984 // 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
|
3985 // 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
|
3986 // 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
|
3987 // 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
|
3988 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
|
3989 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
|
3990 + (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
|
3991 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
|
3992 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3993 // 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
|
3994 // 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
|
3995 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
|
3996 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
|
3997 out_char(' '); |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3998 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
|
3999 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
|
4000 + (Columns - 1)]); |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4001 // 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
|
4002 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
|
4003 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
|
4004 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4005 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4006 |
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
|
4007 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
|
4008 |
23952
44be09b25619
patch 8.2.2518: 'listchars' should be window-local
Bram Moolenaar <Bram@vim.org>
parents:
23901
diff
changeset
|
4009 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
|
4010 #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
|
4011 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
|
4012 # 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
|
4013 && 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
|
4014 # endif |
29615
bab343b21da8
patch 9.0.0148: a "below" aligned text property gets 'showbreak' displayed
Bram Moolenaar <Bram@vim.org>
parents:
29611
diff
changeset
|
4015 ) |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
4016 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
|
4017 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4018 #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
|
4019 --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
|
4020 // 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
|
4021 // 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
|
4022 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
|
4023 break; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4024 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4025 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4026 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4027 } // 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
|
4028 |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4029 #ifdef FEAT_SPELL |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4030 // 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
|
4031 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
|
4032 { |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4033 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
|
4034 cap_col = 0; |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4035 } |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4036 #endif |
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18720
diff
changeset
|
4037 #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
|
4038 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
|
4039 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
|
4040 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
|
4041 #endif |
2a806e3c39f6
patch 8.1.2057: the screen.c file is much too big
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4042 |
30391
5aaacdeee0a1
patch 9.0.0531: the win_line() function is much too long
Bram Moolenaar <Bram@vim.org>
parents:
30383
diff
changeset
|
4043 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
|
4044 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
|
4045 } |