Mercurial > vim
annotate src/screen.c @ 18047:6650e3dff8d4 v8.1.2019
patch 8.1.2019: 'cursorline' always highlights the whole line
Commit: https://github.com/vim/vim/commit/410e98a70bc00ea4bed51e55a8fe20e56a72c087
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Sep 9 22:05:49 2019 +0200
patch 8.1.2019: 'cursorline' always highlights the whole line
Problem: 'cursorline' always highlights the whole line.
Solution: Add 'cursorlineopt' to specify what is highlighted.
(closes #4693)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 09 Sep 2019 22:15:04 +0200 |
| parents | 079e10a49ea1 |
| children | 1101eacc1444 |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9992
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 | |
| 10 /* | |
| 11 * screen.c: code for displaying on the screen | |
| 12 * | |
| 13 * Output to the screen (console, terminal emulator or GUI window) is minimized | |
| 14 * by remembering what is already on the screen, and only updating the parts | |
| 15 * that changed. | |
| 16 * | |
| 17 * ScreenLines[off] Contains a copy of the whole screen, as it is currently | |
| 18 * displayed (excluding text written by external commands). | |
| 19 * ScreenAttrs[off] Contains the associated attributes. | |
| 20 * LineOffset[row] Contains the offset into ScreenLines*[] and ScreenAttrs[] | |
| 21 * for each line. | |
| 22 * LineWraps[row] Flag for each line whether it wraps to the next line. | |
| 23 * | |
| 24 * For double-byte characters, two consecutive bytes in ScreenLines[] can form | |
| 25 * one character which occupies two display cells. | |
| 26 * For UTF-8 a multi-byte character is converted to Unicode and stored in | |
| 27 * ScreenLinesUC[]. ScreenLines[] contains the first byte only. For an ASCII | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
28 * character without composing chars ScreenLinesUC[] will be 0 and |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
29 * ScreenLinesC[][] is not used. When the character occupies two display |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
30 * cells the next byte in ScreenLines[] is 0. |
| 714 | 31 * ScreenLinesC[][] contain up to 'maxcombine' composing characters |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
32 * (drawn on top of the first character). There is 0 after the last one used. |
| 7 | 33 * ScreenLines2[] is only used for euc-jp to store the second byte if the |
| 34 * first byte is 0x8e (single-width character). | |
| 35 * | |
| 36 * The screen_*() functions write to the screen and handle updating | |
| 37 * ScreenLines[]. | |
| 38 * | |
| 39 * update_screen() is the function that updates all windows and status lines. | |
| 40 * It is called form the main loop when must_redraw is non-zero. It may be | |
| 1213 | 41 * called from other places when an immediate screen update is needed. |
| 7 | 42 * |
| 43 * The part of the buffer that is displayed in a window is set with: | |
| 44 * - w_topline (first buffer line in window) | |
| 5946 | 45 * - w_topfill (filler lines above the first line) |
| 7 | 46 * - w_leftcol (leftmost window cell in window), |
| 47 * - w_skipcol (skipped window cells of first line) | |
| 48 * | |
| 49 * Commands that only move the cursor around in a window, do not need to take | |
| 50 * action to update the display. The main loop will check if w_topline is | |
| 51 * valid and update it (scroll the window) when needed. | |
| 52 * | |
| 53 * Commands that scroll a window change w_topline and must call | |
| 54 * check_cursor() to move the cursor into the visible part of the window, and | |
| 55 * call redraw_later(VALID) to have the window displayed by update_screen() | |
| 56 * later. | |
| 57 * | |
| 58 * Commands that change text in the buffer must call changed_bytes() or | |
| 59 * changed_lines() to mark the area that changed and will require updating | |
| 60 * later. The main loop will call update_screen(), which will update each | |
| 61 * window that shows the changed buffer. This assumes text above the change | |
| 62 * can remain displayed as it is. Text after the change may need updating for | |
| 63 * scrolling, folding and syntax highlighting. | |
| 64 * | |
| 65 * Commands that change how a window is displayed (e.g., setting 'list') or | |
| 66 * invalidate the contents of a window in another way (e.g., change fold | |
| 67 * settings), must call redraw_later(NOT_VALID) to have the whole window | |
| 68 * redisplayed by update_screen() later. | |
| 69 * | |
| 70 * Commands that change how a buffer is displayed (e.g., setting 'tabstop') | |
| 71 * must call redraw_curbuf_later(NOT_VALID) to have all the windows for the | |
| 72 * buffer redisplayed by update_screen() later. | |
| 73 * | |
| 743 | 74 * Commands that change highlighting and possibly cause a scroll too must call |
| 75 * redraw_later(SOME_VALID) to update the whole window but still use scrolling | |
| 76 * to avoid redrawing everything. But the length of displayed lines must not | |
| 77 * change, use NOT_VALID then. | |
| 78 * | |
| 7 | 79 * Commands that move the window position must call redraw_later(NOT_VALID). |
| 80 * TODO: should minimize redrawing by scrolling when possible. | |
| 81 * | |
| 82 * Commands that change everything (e.g., resizing the screen) must call | |
| 83 * redraw_all_later(NOT_VALID) or redraw_all_later(CLEAR). | |
| 84 * | |
| 85 * Things that are handled indirectly: | |
| 86 * - When messages scroll the screen up, msg_scrolled will be set and | |
| 87 * update_screen() called to redraw. | |
| 88 */ | |
| 89 | |
| 90 #include "vim.h" | |
| 91 | |
| 3586 | 92 #define MB_FILLER_CHAR '<' /* character used when a double-width character |
| 93 * doesn't fit. */ | |
| 94 | |
| 7 | 95 /* |
| 96 * The attributes that are actually active for writing to the screen. | |
| 97 */ | |
| 98 static int screen_attr = 0; | |
| 99 | |
| 100 /* | |
| 101 * Positioning the cursor is reduced by remembering the last position. | |
| 102 * Mostly used by windgoto() and screen_char(). | |
| 103 */ | |
| 104 static int screen_cur_row, screen_cur_col; /* last known cursor position */ | |
| 105 | |
| 106 #ifdef FEAT_SEARCH_EXTRA | |
|
17490
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
107 static match_T search_hl; // used for 'hlsearch' highlight matching |
| 7 | 108 #endif |
| 109 | |
| 110 #ifdef FEAT_FOLDING | |
| 111 static foldinfo_T win_foldinfo; /* info for 'foldcolumn' */ | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
112 static int compute_foldcolumn(win_T *wp, int col); |
| 7 | 113 #endif |
| 114 | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
115 /* Flag that is set when drawing for a callback, not from the main command |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
116 * loop. */ |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
117 static int redrawing_for_callback = 0; |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
118 |
| 7 | 119 /* |
| 120 * Buffer for one screen line (characters and attributes). | |
| 121 */ | |
| 122 static schar_T *current_ScreenLine; | |
| 123 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
124 static void win_update(win_T *wp); |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
125 static void win_redr_status(win_T *wp, int ignore_pum); |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
126 static void win_draw_end(win_T *wp, int c1, int c2, int draw_margin, int row, int endrow, hlf_T hl); |
| 7 | 127 #ifdef FEAT_FOLDING |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
128 static void fold_line(win_T *wp, long fold_count, foldinfo_T *foldinfo, linenr_T lnum, int row); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
129 static void fill_foldcolumn(char_u *p, win_T *wp, int closed, linenr_T lnum); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
130 static void copy_text_attr(int off, char_u *buf, int len, int attr); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
131 #endif |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
132 static int win_line(win_T *, linenr_T, int, int, int nochange, int number_only); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
133 static void draw_vsep_win(win_T *wp, int row); |
| 680 | 134 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
135 static void redraw_custom_statusline(win_T *wp); |
| 680 | 136 #endif |
| 7 | 137 #ifdef FEAT_SEARCH_EXTRA |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
138 static void start_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
139 static void end_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
140 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
141 static void screen_char(unsigned off, int row, int col); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
142 static void screen_char_2(unsigned off, int row, int col); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
143 static void screenclear2(void); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
144 static void lineclear(unsigned off, int width, int attr); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
145 static void lineinvalid(unsigned off, int width); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
146 static int win_do_lines(win_T *wp, int row, int line_count, int mayclear, int del, int clear_attr); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
147 static void win_rest_invalid(win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
148 static void msg_pos_mode(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
149 static void recording_mode(int attr); |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
150 static int fillchar_status(int *attr, win_T *wp); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
151 static int fillchar_vsep(int *attr); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
152 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
153 static void redraw_win_toolbar(win_T *wp); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
154 #endif |
| 7 | 155 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
156 static void win_redr_custom(win_T *wp, int draw_ruler); |
| 7 | 157 #endif |
| 158 #ifdef FEAT_CMDL_INFO | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
159 static void win_redr_ruler(win_T *wp, int always, int ignore_pum); |
| 7 | 160 #endif |
| 161 | |
| 162 /* Ugly global: overrule attribute used by screen_char() */ | |
| 163 static int screen_char_attr = 0; | |
| 164 | |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
165 #ifdef FEAT_RIGHTLEFT |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
166 # define HAS_RIGHTLEFT(x) x |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
167 #else |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
168 # define HAS_RIGHTLEFT(x) FALSE |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
169 #endif |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
170 |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
171 // flags for screen_line() |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
172 #define SLF_RIGHTLEFT 1 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
173 #define SLF_POPUP 2 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
174 |
| 7 | 175 /* |
| 176 * Redraw the current window later, with update_screen(type). | |
| 177 * Set must_redraw only if not already set to a higher value. | |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
178 * E.g. if must_redraw is CLEAR, type NOT_VALID will do nothing. |
| 7 | 179 */ |
| 180 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
181 redraw_later(int type) |
| 7 | 182 { |
| 183 redraw_win_later(curwin, type); | |
| 184 } | |
| 185 | |
| 186 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
187 redraw_win_later( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
188 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
189 int type) |
| 7 | 190 { |
|
12672
4e846c9d61a8
patch 8.0.1214: accessing freed memory when EXITFREE is set
Christian Brabandt <cb@256bit.org>
parents:
12582
diff
changeset
|
191 if (!exiting && wp->w_redr_type < type) |
| 7 | 192 { |
| 193 wp->w_redr_type = type; | |
| 194 if (type >= NOT_VALID) | |
| 195 wp->w_lines_valid = 0; | |
| 196 if (must_redraw < type) /* must_redraw is the maximum of all windows */ | |
| 197 must_redraw = type; | |
| 198 } | |
| 199 } | |
| 200 | |
| 201 /* | |
| 202 * Force a complete redraw later. Also resets the highlighting. To be used | |
| 203 * after executing a shell command that messes up the screen. | |
| 204 */ | |
| 205 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
206 redraw_later_clear(void) |
| 7 | 207 { |
| 208 redraw_all_later(CLEAR); | |
| 826 | 209 #ifdef FEAT_GUI |
| 210 if (gui.in_use) | |
| 211 /* Use a code that will reset gui.highlight_mask in | |
| 212 * gui_stop_highlight(). */ | |
| 213 screen_attr = HL_ALL + 1; | |
| 214 else | |
| 215 #endif | |
| 216 /* Use attributes that is very unlikely to appear in text. */ | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
217 screen_attr = HL_BOLD | HL_UNDERLINE | HL_INVERSE | HL_STRIKETHROUGH; |
| 7 | 218 } |
| 219 | |
| 220 /* | |
| 221 * Mark all windows to be redrawn later. | |
| 222 */ | |
| 223 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
224 redraw_all_later(int type) |
| 7 | 225 { |
| 226 win_T *wp; | |
| 227 | |
| 228 FOR_ALL_WINDOWS(wp) | |
| 229 redraw_win_later(wp, type); | |
|
15384
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
230 // This may be needed when switching tabs. |
|
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
231 if (must_redraw < type) |
|
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
232 must_redraw = type; |
| 7 | 233 } |
| 234 | |
| 235 /* | |
| 301 | 236 * Mark all windows that are editing the current buffer to be updated later. |
| 7 | 237 */ |
| 238 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
239 redraw_curbuf_later(int type) |
| 7 | 240 { |
| 241 redraw_buf_later(curbuf, type); | |
| 242 } | |
| 243 | |
| 244 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
245 redraw_buf_later(buf_T *buf, int type) |
| 7 | 246 { |
| 247 win_T *wp; | |
| 248 | |
| 249 FOR_ALL_WINDOWS(wp) | |
| 250 { | |
| 251 if (wp->w_buffer == buf) | |
| 252 redraw_win_later(wp, type); | |
| 253 } | |
| 254 } | |
| 255 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
256 #if defined(FEAT_SIGNS) || defined(PROTO) |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
257 void |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
258 redraw_buf_line_later(buf_T *buf, linenr_T lnum) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
259 { |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
260 win_T *wp; |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
261 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
262 FOR_ALL_WINDOWS(wp) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
263 if (wp->w_buffer == buf && lnum >= wp->w_topline |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
264 && lnum < wp->w_botline) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
265 redrawWinline(wp, lnum); |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
266 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
267 #endif |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
268 |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
269 #if defined(FEAT_JOB_CHANNEL) || defined(PROTO) |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
270 void |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
271 redraw_buf_and_status_later(buf_T *buf, int type) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
272 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
273 win_T *wp; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
274 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
275 #ifdef FEAT_WILDMENU |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
276 if (wild_menu_showing != 0) |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
277 /* Don't redraw while the command line completion is displayed, it |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
278 * would disappear. */ |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
279 return; |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
280 #endif |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
281 FOR_ALL_WINDOWS(wp) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
282 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
283 if (wp->w_buffer == buf) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
284 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
285 redraw_win_later(wp, type); |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
286 wp->w_redr_status = TRUE; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
287 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
288 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
289 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
290 #endif |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
291 |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
292 #if defined(FEAT_TERMRESPONSE) || defined(PROTO) |
| 7 | 293 /* |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
294 * Redraw as soon as possible. When the command line is not scrolled redraw |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
295 * right away and restore what was on the command line. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
296 * Return a code indicating what happened. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
297 */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
298 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
299 redraw_asap(int type) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
300 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
301 int rows; |
| 6959 | 302 int cols = screen_Columns; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
303 int r; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
304 int ret = 0; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
305 schar_T *screenline; /* copy from ScreenLines[] */ |
|
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
306 sattr_T *screenattr; /* copy from ScreenAttrs[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
307 int i; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
308 u8char_T *screenlineUC = NULL; /* copy from ScreenLinesUC[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
309 u8char_T *screenlineC[MAX_MCO]; /* copy from ScreenLinesC[][] */ |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
310 schar_T *screenline2 = NULL; /* copy from ScreenLines2[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
311 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
312 redraw_later(type); |
| 6959 | 313 if (msg_scrolled || (State != NORMAL && State != NORMAL_BUSY) || exiting) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
314 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
315 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
316 /* Allocate space to save the text displayed in the command line area. */ |
| 6959 | 317 rows = screen_Rows - cmdline_row; |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
318 screenline = LALLOC_MULT(schar_T, rows * cols); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
319 screenattr = LALLOC_MULT(sattr_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
320 if (screenline == NULL || screenattr == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
321 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
322 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
323 { |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
324 screenlineUC = LALLOC_MULT(u8char_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
325 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
326 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
327 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
328 { |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
329 screenlineC[i] = LALLOC_MULT(u8char_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
330 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
331 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
332 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
333 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
334 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
335 { |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
336 screenline2 = LALLOC_MULT(schar_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
337 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
338 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
339 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
340 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
341 if (ret != 2) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
342 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
343 /* Save the text displayed in the command line area. */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
344 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
345 { |
| 6959 | 346 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
347 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 348 (size_t)cols * sizeof(schar_T)); |
| 349 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
350 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 351 (size_t)cols * sizeof(sattr_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
352 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
353 { |
| 6959 | 354 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
355 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 356 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
357 for (i = 0; i < p_mco; ++i) |
| 6959 | 358 mch_memmove(screenlineC[i] + r * cols, |
| 359 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 360 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
361 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
362 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 363 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
364 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 365 (size_t)cols * sizeof(schar_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
366 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
367 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
368 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
369 ret = 3; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
370 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
371 if (must_redraw == 0) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
372 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
373 int off = (int)(current_ScreenLine - ScreenLines); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
374 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
375 /* Restore the text displayed in the command line area. */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
376 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
377 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
378 mch_memmove(current_ScreenLine, |
| 6959 | 379 screenline + r * cols, |
| 380 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
381 mch_memmove(ScreenAttrs + off, |
| 6959 | 382 screenattr + r * cols, |
| 383 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
384 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
385 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
386 mch_memmove(ScreenLinesUC + off, |
| 6959 | 387 screenlineUC + r * cols, |
| 388 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
389 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
390 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 391 screenlineC[i] + r * cols, |
| 392 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
393 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
394 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
395 mch_memmove(ScreenLines2 + off, |
| 6959 | 396 screenline2 + r * cols, |
| 397 (size_t)cols * sizeof(schar_T)); | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
398 screen_line(cmdline_row + r, 0, cols, cols, 0); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
399 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
400 ret = 4; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
401 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
402 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
403 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
404 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
405 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
406 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
407 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
408 vim_free(screenlineUC); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
409 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
410 vim_free(screenlineC[i]); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
411 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
412 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
413 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
414 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
415 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
416 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
417 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
418 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
419 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
420 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
421 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
422 #endif |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
423 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
424 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
425 * Invoked after an asynchronous callback is called. |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
426 * If an echo command was used the cursor needs to be put back where |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
427 * it belongs. If highlighting was changed a redraw is needed. |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
428 * If "call_update_screen" is FALSE don't call update_screen() when at the |
|
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
429 * command line. |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
430 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
431 void |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
432 redraw_after_callback(int call_update_screen) |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
433 { |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
434 ++redrawing_for_callback; |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
435 |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
436 if (State == HITRETURN || State == ASKMORE) |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
437 ; // do nothing |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
438 else if (State & CMDLINE) |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
439 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
440 // Don't redraw when in prompt_for_number(). |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
441 if (cmdline_row > 0) |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
442 { |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
443 // Redrawing only works when the screen didn't scroll. Don't clear |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
444 // wildmenu entries. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
445 if (msg_scrolled == 0 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
446 #ifdef FEAT_WILDMENU |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
447 && wild_menu_showing == 0 |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
448 #endif |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
449 && call_update_screen) |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
450 update_screen(0); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
451 |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
452 // Redraw in the same position, so that the user can continue |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
453 // editing the command. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
454 redrawcmdline_ex(FALSE); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
455 } |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
456 } |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
457 else if (State & (NORMAL | INSERT | TERMINAL)) |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
458 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
459 // keep the command line if possible |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
460 update_screen(VALID_NO_UPDATE); |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
461 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
462 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
463 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
464 #ifdef FEAT_GUI |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
465 if (gui.in_use && !gui_mch_is_blink_off()) |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
466 // Don't update the cursor when it is blinking and off to avoid |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
467 // flicker. |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
468 out_flush_cursor(FALSE, FALSE); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
469 else |
|
13204
a8a154cafc60
patch 8.0.1476: screen isn't always updated right away
Christian Brabandt <cb@256bit.org>
parents:
13150
diff
changeset
|
470 #endif |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
471 out_flush(); |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
472 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
473 --redrawing_for_callback; |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
474 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
475 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
476 /* |
| 7 | 477 * Changed something in the current window, at buffer line "lnum", that |
| 478 * requires that line and possibly other lines to be redrawn. | |
| 479 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 480 * Used to remove the "$" from a change command. | |
| 481 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 482 * may become invalid and the whole window will have to be redrawn. | |
| 483 */ | |
| 484 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
485 redrawWinline( |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
486 win_T *wp, |
|
15400
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15396
diff
changeset
|
487 linenr_T lnum) |
|
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15396
diff
changeset
|
488 { |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
489 if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
490 wp->w_redraw_top = lnum; |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
491 if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
492 wp->w_redraw_bot = lnum; |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
493 redraw_win_later(wp, VALID); |
| 7 | 494 } |
| 495 | |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
496 /* |
|
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
497 * To be called when "updating_screen" was set before and now the postponed |
|
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
498 * side effects may take place. |
|
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
499 */ |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
500 void |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
501 after_updating_screen(int may_resize_shell UNUSED) |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
502 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
503 updating_screen = FALSE; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
504 #ifdef FEAT_GUI |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
505 if (may_resize_shell) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
506 gui_may_resize_shell(); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
507 #endif |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
508 #ifdef FEAT_TERMINAL |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
509 term_check_channel_closed_recently(); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
510 #endif |
|
14428
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
511 |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
512 #ifdef HAVE_DROP_FILE |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
513 // If handle_drop() was called while updating_screen was TRUE need to |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
514 // handle the drop now. |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
515 handle_any_postponed_drop(); |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
516 #endif |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
517 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
518 |
| 7 | 519 /* |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
520 * Update all windows that are editing the current buffer. |
| 7 | 521 */ |
| 522 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
523 update_curbuf(int type) |
| 7 | 524 { |
| 525 redraw_curbuf_later(type); | |
| 526 update_screen(type); | |
| 527 } | |
| 528 | |
| 529 /* | |
| 530 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 531 * of stuff from Filemem to ScreenLines[], and update curwin->w_botline. | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
532 * Return OK when the screen was updated, FAIL if it was not done. |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
533 */ |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
534 int |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
535 update_screen(int type_arg) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
536 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
537 int type = type_arg; |
| 7 | 538 win_T *wp; |
| 539 static int did_intro = FALSE; | |
| 540 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 541 int did_one; | |
| 542 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
543 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
544 int did_undraw = FALSE; |
|
16405
840fa633ad64
patch 8.1.1207: some compilers give warning messages
Bram Moolenaar <Bram@vim.org>
parents:
16374
diff
changeset
|
545 int gui_cursor_col = 0; |
|
840fa633ad64
patch 8.1.1207: some compilers give warning messages
Bram Moolenaar <Bram@vim.org>
parents:
16374
diff
changeset
|
546 int gui_cursor_row = 0; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
547 #endif |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
548 int no_update = FALSE; |
| 7 | 549 |
| 2008 | 550 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 551 if (!screen_valid(TRUE)) |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
552 return FAIL; |
| 7 | 553 |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
554 if (type == VALID_NO_UPDATE) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
555 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
556 no_update = TRUE; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
557 type = 0; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
558 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
559 |
|
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
560 #ifdef FEAT_EVAL |
|
16660
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
561 { |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
562 buf_T *buf; |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
563 |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
564 // Before updating the screen, notify any listeners of changed text. |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
565 FOR_ALL_BUFFERS(buf) |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
566 invoke_listeners(buf); |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
567 } |
|
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
568 #endif |
|
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
569 |
|
17851
ba63a184e6b6
patch 8.1.1922: in diff mode global operations can be very slow
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
570 #ifdef FEAT_DIFF |
|
ba63a184e6b6
patch 8.1.1922: in diff mode global operations can be very slow
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
571 // May have postponed updating diffs. |
|
ba63a184e6b6
patch 8.1.1922: in diff mode global operations can be very slow
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
572 if (need_diff_redraw) |
|
ba63a184e6b6
patch 8.1.1922: in diff mode global operations can be very slow
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
573 diff_redraw(TRUE); |
|
ba63a184e6b6
patch 8.1.1922: in diff mode global operations can be very slow
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
574 #endif |
|
ba63a184e6b6
patch 8.1.1922: in diff mode global operations can be very slow
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
575 |
| 7 | 576 if (must_redraw) |
| 577 { | |
| 578 if (type < must_redraw) /* use maximal type */ | |
| 579 type = must_redraw; | |
| 1331 | 580 |
| 581 /* must_redraw is reset here, so that when we run into some weird | |
| 582 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 583 * scrolling), or update_topline() in win_update() will cause a | |
| 584 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 585 must_redraw = 0; |
| 586 } | |
| 587 | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
588 /* May need to update w_lines[]. */ |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
589 if (curwin->w_lines_valid == 0 && type < NOT_VALID |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
590 #ifdef FEAT_TERMINAL |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
591 && !term_do_update_window(curwin) |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
592 #endif |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
593 ) |
| 7 | 594 type = NOT_VALID; |
| 595 | |
| 2008 | 596 /* Postpone the redrawing when it's not needed and when being called |
| 597 * recursively. */ | |
| 598 if (!redrawing() || updating_screen) | |
| 7 | 599 { |
| 600 redraw_later(type); /* remember type for next time */ | |
| 601 must_redraw = type; | |
| 602 if (type > INVERTED_ALL) | |
| 603 curwin->w_lines_valid = 0; /* don't use w_lines[].wl_size now */ | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
604 return FAIL; |
| 7 | 605 } |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
606 updating_screen = TRUE; |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
607 |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
608 #ifdef FEAT_TEXT_PROP |
|
17034
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
609 // Update popup_mask if needed. This may set w_redraw_top and w_redraw_bot |
|
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
610 // in some windows. |
|
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
611 may_update_popup_mask(type); |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
612 #endif |
| 7 | 613 |
| 614 #ifdef FEAT_SYN_HL | |
| 615 ++display_tick; /* let syntax code know we're in a next round of | |
| 616 * display updating */ | |
| 617 #endif | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
618 if (no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
619 ++no_win_do_lines_ins; |
| 7 | 620 |
| 621 /* | |
| 622 * if the screen was scrolled up when displaying a message, scroll it down | |
| 623 */ | |
| 624 if (msg_scrolled) | |
| 625 { | |
| 626 clear_cmdline = TRUE; | |
| 627 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 628 type = CLEAR; | |
| 629 else if (type != CLEAR) | |
| 630 { | |
| 631 check_for_delay(FALSE); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
632 if (screen_ins_lines(0, 0, msg_scrolled, (int)Rows, 0, NULL) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
633 == FAIL) |
| 7 | 634 type = CLEAR; |
| 635 FOR_ALL_WINDOWS(wp) | |
| 636 { | |
|
16910
6a99709c6ae3
patch 8.1.1456: WinBar not redrawn after scrolling one line
Bram Moolenaar <Bram@vim.org>
parents:
16904
diff
changeset
|
637 if (wp->w_winrow < msg_scrolled) |
| 7 | 638 { |
| 639 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 640 && wp->w_redr_type < REDRAW_TOP | |
| 641 && wp->w_lines_valid > 0 | |
| 642 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 643 { | |
| 644 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 645 wp->w_redr_type = REDRAW_TOP; | |
| 646 } | |
| 647 else | |
| 648 { | |
| 649 wp->w_redr_type = NOT_VALID; | |
|
12529
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
650 if (W_WINROW(wp) + wp->w_height + wp->w_status_height |
|
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
651 <= msg_scrolled) |
| 7 | 652 wp->w_redr_status = TRUE; |
| 653 } | |
| 654 } | |
| 655 } | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
656 if (!no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
657 redraw_cmdline = TRUE; |
| 673 | 658 redraw_tabline = TRUE; |
| 7 | 659 } |
| 660 msg_scrolled = 0; | |
| 661 need_wait_return = FALSE; | |
| 662 } | |
| 663 | |
| 664 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 665 compute_cmdrow(); | |
| 666 | |
| 667 /* Check for changed highlighting */ | |
| 668 if (need_highlight_changed) | |
| 669 highlight_changed(); | |
| 670 | |
| 671 if (type == CLEAR) /* first clear screen */ | |
| 672 { | |
| 673 screenclear(); /* will reset clear_cmdline */ | |
| 674 type = NOT_VALID; | |
|
11607
24664144de4e
patch 8.0.0686: extra redraw when using CTRL-L in second window
Christian Brabandt <cb@256bit.org>
parents:
11585
diff
changeset
|
675 /* must_redraw may be set indirectly, avoid another redraw later */ |
|
24664144de4e
patch 8.0.0686: extra redraw when using CTRL-L in second window
Christian Brabandt <cb@256bit.org>
parents:
11585
diff
changeset
|
676 must_redraw = 0; |
| 7 | 677 } |
| 678 | |
| 679 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 680 check_for_delay(FALSE); | |
| 681 | |
| 13 | 682 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
683 /* Force redraw when width of 'number' or 'relativenumber' column |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
684 * changes. */ |
| 13 | 685 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
686 && curwin->w_nrwidth != ((curwin->w_p_nu || curwin->w_p_rnu) |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
687 ? number_width(curwin) : 0)) |
| 13 | 688 curwin->w_redr_type = NOT_VALID; |
| 689 #endif | |
| 690 | |
| 7 | 691 /* |
| 692 * Only start redrawing if there is really something to do. | |
| 693 */ | |
| 694 if (type == INVERTED) | |
| 695 update_curswant(); | |
| 696 if (curwin->w_redr_type < type | |
| 697 && !((type == VALID | |
| 698 && curwin->w_lines[0].wl_valid | |
| 699 #ifdef FEAT_DIFF | |
| 700 && curwin->w_topfill == curwin->w_old_topfill | |
| 701 && curwin->w_botfill == curwin->w_old_botfill | |
| 702 #endif | |
| 703 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 704 || (type == INVERTED | |
| 1043 | 705 && VIsual_active |
| 7 | 706 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 707 && curwin->w_old_visual_mode == VIsual_mode | |
| 708 && (curwin->w_valid & VALID_VIRTCOL) | |
| 709 && curwin->w_old_curswant == curwin->w_curswant) | |
| 710 )) | |
| 711 curwin->w_redr_type = type; | |
| 712 | |
| 849 | 713 /* Redraw the tab pages line if needed. */ |
| 714 if (redraw_tabline || type >= NOT_VALID) | |
| 715 draw_tabline(); | |
| 716 | |
| 7 | 717 #ifdef FEAT_SYN_HL |
| 718 /* | |
| 719 * Correct stored syntax highlighting info for changes in each displayed | |
| 720 * buffer. Each buffer must only be done once. | |
| 721 */ | |
| 722 FOR_ALL_WINDOWS(wp) | |
| 723 { | |
| 724 if (wp->w_buffer->b_mod_set) | |
| 725 { | |
| 726 win_T *wwp; | |
| 727 | |
| 728 /* Check if we already did this buffer. */ | |
| 729 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 730 if (wwp->w_buffer == wp->w_buffer) | |
| 731 break; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
732 if (wwp == wp && syntax_present(wp)) |
| 7 | 733 syn_stack_apply_changes(wp->w_buffer); |
| 734 } | |
| 735 } | |
| 736 #endif | |
| 737 | |
| 738 /* | |
| 739 * Go from top to bottom through the windows, redrawing the ones that need | |
| 740 * it. | |
| 741 */ | |
| 742 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 743 did_one = FALSE; | |
| 744 #endif | |
| 745 #ifdef FEAT_SEARCH_EXTRA | |
| 746 search_hl.rm.regprog = NULL; | |
| 747 #endif | |
| 748 FOR_ALL_WINDOWS(wp) | |
| 749 { | |
| 750 if (wp->w_redr_type != 0) | |
| 751 { | |
| 752 cursor_off(); | |
| 753 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 754 if (!did_one) | |
| 755 { | |
| 756 did_one = TRUE; | |
| 757 # ifdef FEAT_SEARCH_EXTRA | |
| 758 start_search_hl(); | |
| 759 # endif | |
| 760 # ifdef FEAT_CLIPBOARD | |
| 761 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 762 if (clip_star.available && clip_isautosel_star()) |
| 763 clip_update_selection(&clip_star); | |
| 764 if (clip_plus.available && clip_isautosel_plus()) | |
| 765 clip_update_selection(&clip_plus); | |
| 7 | 766 # endif |
| 767 #ifdef FEAT_GUI | |
| 768 /* Remove the cursor before starting to do anything, because | |
| 769 * scrolling may make it difficult to redraw the text under | |
| 770 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
771 if (gui.in_use && wp == curwin) |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
772 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
773 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
774 gui_cursor_row = gui.cursor_row; |
| 7 | 775 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
776 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
777 } |
| 7 | 778 #endif |
| 779 } | |
| 780 #endif | |
| 781 win_update(wp); | |
| 782 } | |
| 783 | |
| 784 /* redraw status line after the window to minimize cursor movement */ | |
| 785 if (wp->w_redr_status) | |
| 786 { | |
| 787 cursor_off(); | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
788 win_redr_status(wp, TRUE); // any popup menu will be redrawn below |
| 7 | 789 } |
| 790 } | |
| 791 #if defined(FEAT_SEARCH_EXTRA) | |
| 792 end_search_hl(); | |
| 793 #endif | |
| 4107 | 794 /* May need to redraw the popup menu. */ |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
795 pum_may_redraw(); |
| 7 | 796 |
| 797 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 798 * than going through all buffers (there could be many buffers). */ | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
799 FOR_ALL_WINDOWS(wp) |
| 7 | 800 wp->w_buffer->b_mod_set = FALSE; |
| 801 | |
|
17551
8cca2654d459
patch 8.1.1773: the preview popup window may be too far to the right
Bram Moolenaar <Bram@vim.org>
parents:
17498
diff
changeset
|
802 #ifdef FEAT_TEXT_PROP |
|
8cca2654d459
patch 8.1.1773: the preview popup window may be too far to the right
Bram Moolenaar <Bram@vim.org>
parents:
17498
diff
changeset
|
803 // Display popup windows on top of the windows and command line. |
|
8cca2654d459
patch 8.1.1773: the preview popup window may be too far to the right
Bram Moolenaar <Bram@vim.org>
parents:
17498
diff
changeset
|
804 update_popups(win_update); |
|
8cca2654d459
patch 8.1.1773: the preview popup window may be too far to the right
Bram Moolenaar <Bram@vim.org>
parents:
17498
diff
changeset
|
805 #endif |
|
8cca2654d459
patch 8.1.1773: the preview popup window may be too far to the right
Bram Moolenaar <Bram@vim.org>
parents:
17498
diff
changeset
|
806 |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
807 after_updating_screen(TRUE); |
| 7 | 808 |
| 809 /* Clear or redraw the command line. Done last, because scrolling may | |
| 810 * mess up the command line. */ | |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
811 if (clear_cmdline || redraw_cmdline || redraw_mode) |
| 7 | 812 showmode(); |
| 813 | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
814 if (no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
815 --no_win_do_lines_ins; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
816 |
| 7 | 817 /* May put up an introductory message when not editing a file */ |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
818 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
819 maybe_intro_message(); |
| 7 | 820 did_intro = TRUE; |
| 821 | |
| 822 #ifdef FEAT_GUI | |
| 823 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 824 * done. */ | |
| 825 if (gui.in_use) | |
| 826 { | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
827 if (did_undraw && !gui_mch_is_blink_off()) |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
828 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
829 mch_disable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
830 out_flush(); /* required before updating the cursor */ |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
831 mch_enable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
832 |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
833 /* Put the GUI position where the cursor was, gui_update_cursor() |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
834 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
835 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
836 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
837 gui.col = mb_fix_col(gui.col, gui.row); |
| 7 | 838 gui_update_cursor(FALSE, FALSE); |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
839 gui_may_flush(); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
840 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
841 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
842 } |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
843 else |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
844 out_flush(); |
| 7 | 845 gui_update_scrollbars(FALSE); |
| 846 } | |
| 847 #endif | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
848 return OK; |
| 7 | 849 } |
| 850 | |
|
15947
4aaf68cbed32
patch 8.1.0979: compiler warning for unused functions
Bram Moolenaar <Bram@vim.org>
parents:
15939
diff
changeset
|
851 #if defined(FEAT_NETBEANS_INTG) || defined(FEAT_GUI) |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
852 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
853 * Prepare for updating one or more windows. |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
854 * Caller must check for "updating_screen" already set to avoid recursiveness. |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
855 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
856 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
857 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
858 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
859 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
860 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
861 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
862 /* Remove the cursor before starting to do anything, because scrolling may |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
863 * make it difficult to redraw the text under it. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
864 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
865 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
866 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
867 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
868 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
869 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
870 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
871 // Update popup_mask if needed. |
|
17196
983950357c40
patch 8.1.1597: cannot scroll a popup window with the mouse
Bram Moolenaar <Bram@vim.org>
parents:
17162
diff
changeset
|
872 may_update_popup_mask(must_redraw); |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
873 #endif |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
874 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
876 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
877 * Finish updating one or more windows. |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
878 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
879 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
880 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
881 { |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
882 if (redraw_cmdline || redraw_mode) |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
883 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
884 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
885 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
886 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
887 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
888 |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
889 after_updating_screen(TRUE); |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
890 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
891 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
892 /* Redraw the cursor and update the scrollbars when all screen updating is |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
893 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
894 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
895 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
896 out_flush_cursor(FALSE, FALSE); |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
897 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
898 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
899 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
900 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
901 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
902 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
903 #if defined(FEAT_CONCEAL) || defined(PROTO) |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
904 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
905 * Return TRUE if the cursor line in window "wp" may be concealed, according |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
906 * to the 'concealcursor' option. |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
907 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
908 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
909 conceal_cursor_line(win_T *wp) |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
910 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
911 int c; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
912 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
913 if (*wp->w_p_cocu == NUL) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
914 return FALSE; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
915 if (get_real_state() & VISUAL) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
916 c = 'v'; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
917 else if (State & INSERT) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
918 c = 'i'; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
919 else if (State & NORMAL) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
920 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
921 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
922 c = 'c'; |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
923 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
924 return FALSE; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
925 return vim_strchr(wp->w_p_cocu, c) != NULL; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
926 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
927 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
928 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
929 * Check if the cursor line needs to be redrawn because of 'concealcursor'. |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
930 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
931 void |
|
13876
156ebdcb8ef5
patch 8.0.1809: various typos
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
932 conceal_check_cursor_line(void) |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
933 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
934 if (curwin->w_p_cole > 0 && conceal_cursor_line(curwin)) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
935 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
936 need_cursor_line_redraw = TRUE; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
937 /* Need to recompute cursor column, e.g., when starting Visual mode |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
938 * without concealing. */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
939 curs_columns(TRUE); |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
940 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
941 } |
| 7 | 942 #endif |
| 943 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
944 #if defined(FEAT_NETBEANS_INTG) || defined(PROTO) |
| 7 | 945 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
946 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 947 { |
| 948 win_T *wp; | |
| 949 int doit = FALSE; | |
| 950 | |
| 951 # ifdef FEAT_FOLDING | |
| 952 win_foldinfo.fi_level = 0; | |
| 953 # endif | |
| 954 | |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
955 // update/delete a specific sign |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
956 redraw_buf_line_later(buf, lnum); |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
957 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
958 // check if it resulted in the need to redraw a window |
| 7 | 959 FOR_ALL_WINDOWS(wp) |
| 960 if (wp->w_redr_type != 0) | |
| 961 doit = TRUE; | |
| 962 | |
| 3250 | 963 /* Return when there is nothing to do, screen updating is already |
|
11915
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
964 * happening (recursive call), messages on the screen or still starting up. |
|
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
965 */ |
| 3250 | 966 if (!doit || updating_screen |
|
11915
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
967 || State == ASKMORE || State == HITRETURN |
|
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
968 || msg_scrolled |
| 3250 | 969 #ifdef FEAT_GUI |
| 970 || gui.starting | |
| 971 #endif | |
| 972 || starting) | |
| 7 | 973 return; |
| 974 | |
| 975 /* update all windows that need updating */ | |
| 976 update_prepare(); | |
| 977 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
978 FOR_ALL_WINDOWS(wp) |
| 7 | 979 { |
| 980 if (wp->w_redr_type != 0) | |
| 981 win_update(wp); | |
| 982 if (wp->w_redr_status) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
983 win_redr_status(wp, FALSE); |
| 7 | 984 } |
| 985 | |
| 986 update_finish(); | |
| 987 } | |
| 988 #endif | |
| 989 | |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
990 /* |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
991 * Get 'wincolor' attribute for window "wp". If not set and "wp" is a popup |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
992 * window then get the "Pmenu" highlight attribute. |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
993 */ |
|
17055
f4de7ccdfd8c
patch 8.1.1527: when moving popup window over the cmdline it is not redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17041
diff
changeset
|
994 int |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
995 get_wcr_attr(win_T *wp) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
996 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
997 int wcr_attr = 0; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
998 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
999 if (*wp->w_p_wcr != NUL) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1000 wcr_attr = syn_name2attr(wp->w_p_wcr); |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1001 #ifdef FEAT_TEXT_PROP |
|
17628
6146b10714de
patch 8.1.1811: popup window color cannot be set to "Normal"
Bram Moolenaar <Bram@vim.org>
parents:
17551
diff
changeset
|
1002 else if (WIN_IS_POPUP(wp)) |
|
17771
4bd21046902b
patch 8.1.1882: cannot specify properties of the info popup window
Bram Moolenaar <Bram@vim.org>
parents:
17742
diff
changeset
|
1003 { |
|
4bd21046902b
patch 8.1.1882: cannot specify properties of the info popup window
Bram Moolenaar <Bram@vim.org>
parents:
17742
diff
changeset
|
1004 if (wp->w_popup_flags & POPF_INFO) |
|
4bd21046902b
patch 8.1.1882: cannot specify properties of the info popup window
Bram Moolenaar <Bram@vim.org>
parents:
17742
diff
changeset
|
1005 wcr_attr = HL_ATTR(HLF_PSI); // PmenuSel |
|
4bd21046902b
patch 8.1.1882: cannot specify properties of the info popup window
Bram Moolenaar <Bram@vim.org>
parents:
17742
diff
changeset
|
1006 else |
|
4bd21046902b
patch 8.1.1882: cannot specify properties of the info popup window
Bram Moolenaar <Bram@vim.org>
parents:
17742
diff
changeset
|
1007 wcr_attr = HL_ATTR(HLF_PNI); // Pmenu |
|
4bd21046902b
patch 8.1.1882: cannot specify properties of the info popup window
Bram Moolenaar <Bram@vim.org>
parents:
17742
diff
changeset
|
1008 } |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1009 #endif |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1010 return wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1011 } |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1012 |
| 7 | 1013 #if defined(FEAT_GUI) || defined(PROTO) |
| 1014 /* | |
| 1015 * Update a single window, its status line and maybe the command line msg. | |
| 1016 * Used for the GUI scrollbar. | |
| 1017 */ | |
| 1018 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1019 updateWindow(win_T *wp) |
| 7 | 1020 { |
| 2008 | 1021 /* return if already busy updating */ |
| 1022 if (updating_screen) | |
| 1023 return; | |
| 1024 | |
| 7 | 1025 update_prepare(); |
| 1026 | |
| 1027 #ifdef FEAT_CLIPBOARD | |
| 1028 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1029 if (clip_star.available && clip_isautosel_star()) |
| 1030 clip_update_selection(&clip_star); | |
| 1031 if (clip_plus.available && clip_isautosel_plus()) | |
| 1032 clip_update_selection(&clip_plus); | |
| 7 | 1033 #endif |
| 670 | 1034 |
| 7 | 1035 win_update(wp); |
| 670 | 1036 |
| 1037 /* When the screen was cleared redraw the tab pages line. */ | |
| 673 | 1038 if (redraw_tabline) |
| 677 | 1039 draw_tabline(); |
| 670 | 1040 |
| 7 | 1041 if (wp->w_redr_status |
| 1042 # ifdef FEAT_CMDL_INFO | |
| 1043 || p_ru | |
| 1044 # endif | |
| 1045 # ifdef FEAT_STL_OPT | |
| 40 | 1046 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1047 # endif |
| 1048 ) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
1049 win_redr_status(wp, FALSE); |
| 7 | 1050 |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1051 #ifdef FEAT_TEXT_PROP |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1052 // Display popup windows on top of everything. |
|
17055
f4de7ccdfd8c
patch 8.1.1527: when moving popup window over the cmdline it is not redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17041
diff
changeset
|
1053 update_popups(win_update); |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1054 #endif |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1055 |
| 7 | 1056 update_finish(); |
| 1057 } | |
| 1058 #endif | |
| 1059 | |
| 1060 /* | |
| 1061 * Update a single window. | |
| 1062 * | |
| 1063 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1064 * screen or scrolling lines). | |
| 1065 * | |
| 1066 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1067 * implies the one below it. | |
| 1068 * NOT_VALID redraw the whole window | |
| 743 | 1069 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1070 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1071 * INVERTED redraw the changed part of the Visual area | |
| 1072 * INVERTED_ALL redraw the whole Visual area | |
| 1073 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1074 * 2. update lines at the top when scrolled down | |
| 1075 * 3. redraw changed text: | |
| 301 | 1076 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1077 * b_mod_top and b_mod_bot. |
| 1078 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1079 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1080 * - continue redrawing when syntax status is invalid. | |
| 1081 * 4. if scrolled up, update lines at the bottom. | |
| 1082 * This results in three areas that may need updating: | |
| 1083 * top: from first row to top_end (when scrolled down) | |
| 1084 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1085 * bot: from bot_start to last row (when scrolled up) | |
| 1086 */ | |
| 1087 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1088 win_update(win_T *wp) |
| 7 | 1089 { |
| 1090 buf_T *buf = wp->w_buffer; | |
| 1091 int type; | |
| 1092 int top_end = 0; /* Below last row of the top area that needs | |
| 1093 updating. 0 when no top area updating. */ | |
| 1094 int mid_start = 999;/* first row of the mid area that needs | |
| 1095 updating. 999 when no mid area updating. */ | |
| 1096 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1097 updating. 0 when no mid area updating. */ | |
| 1098 int bot_start = 999;/* first row of the bot area that needs | |
| 1099 updating. 999 when no bot area updating */ | |
| 1100 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1101 w_topline got smaller a bit */ | |
| 1102 #ifdef FEAT_SEARCH_EXTRA | |
|
17498
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
1103 int top_to_mod = FALSE; // redraw above mod_top |
| 7 | 1104 #endif |
| 1105 | |
| 1106 int row; /* current window row to display */ | |
| 1107 linenr_T lnum; /* current buffer lnum to display */ | |
| 1108 int idx; /* current index in w_lines[] */ | |
| 1109 int srow; /* starting row of the current line */ | |
| 1110 | |
| 1111 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1112 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1113 int i; | |
| 1114 long j; | |
| 1115 static int recursive = FALSE; /* being called recursively */ | |
| 1116 int old_botline = wp->w_botline; | |
| 1117 #ifdef FEAT_FOLDING | |
| 1118 long fold_count; | |
| 1119 #endif | |
| 1120 #ifdef FEAT_SYN_HL | |
| 1121 /* remember what happened to the previous line, to know if | |
| 1122 * check_visual_highlight() can be used */ | |
| 1123 #define DID_NONE 1 /* didn't update a line */ | |
| 1124 #define DID_LINE 2 /* updated a normal line */ | |
| 1125 #define DID_FOLD 3 /* updated a folded line */ | |
| 1126 int did_update = DID_NONE; | |
| 1127 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1128 #endif | |
| 1129 linenr_T mod_top = 0; | |
| 1130 linenr_T mod_bot = 0; | |
| 1131 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1132 int save_got_int; | |
| 1133 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1134 #ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1135 proftime_T syntax_tm; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1136 #endif |
| 7 | 1137 |
| 1138 type = wp->w_redr_type; | |
| 1139 | |
| 1140 if (type == NOT_VALID) | |
| 1141 { | |
| 1142 wp->w_redr_status = TRUE; | |
| 1143 wp->w_lines_valid = 0; | |
| 1144 } | |
| 1145 | |
| 1146 /* Window is zero-height: nothing to draw. */ | |
|
12998
dd734ee3e2fe
patch 8.0.1375: window size wrong after maximizing with WinBar
Christian Brabandt <cb@256bit.org>
parents:
12964
diff
changeset
|
1147 if (wp->w_height + WINBAR_HEIGHT(wp) == 0) |
| 7 | 1148 { |
| 1149 wp->w_redr_type = 0; | |
| 1150 return; | |
| 1151 } | |
| 1152 | |
| 1153 /* Window is zero-width: Only need to draw the separator. */ | |
| 1154 if (wp->w_width == 0) | |
| 1155 { | |
| 1156 /* draw the vertical separator right of this window */ | |
| 1157 draw_vsep_win(wp, 0); | |
| 1158 wp->w_redr_type = 0; | |
| 1159 return; | |
| 1160 } | |
| 1161 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1162 #ifdef FEAT_TERMINAL |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1163 // If this window contains a terminal, redraw works completely differently. |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1164 if (term_do_update_window(wp)) |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1165 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1166 term_update_window(wp); |
|
13292
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1167 # ifdef FEAT_MENU |
|
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1168 /* Draw the window toolbar, if there is one. */ |
|
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1169 if (winbar_height(wp) > 0) |
|
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1170 redraw_win_toolbar(wp); |
|
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1171 # endif |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1172 wp->w_redr_type = 0; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1173 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1174 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1175 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1176 |
| 7 | 1177 #ifdef FEAT_SEARCH_EXTRA |
|
17490
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
1178 init_search_hl(wp, &search_hl); |
| 7 | 1179 #endif |
| 1180 | |
| 13 | 1181 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1182 /* Force redraw when width of 'number' or 'relativenumber' column |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1183 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1184 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1185 if (wp->w_nrwidth != i) |
| 13 | 1186 { |
| 1187 type = NOT_VALID; | |
| 677 | 1188 wp->w_nrwidth = i; |
| 13 | 1189 } |
| 1190 else | |
| 1191 #endif | |
| 1192 | |
| 7 | 1193 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1194 { | |
| 1195 /* | |
| 1196 * When there are both inserted/deleted lines and specific lines to be | |
| 1197 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1198 * everything (only happens when redrawing is off for while). | |
| 1199 */ | |
| 1200 type = NOT_VALID; | |
| 1201 } | |
| 1202 else | |
| 1203 { | |
| 1204 /* | |
| 1205 * Set mod_top to the first line that needs displaying because of | |
| 1206 * changes. Set mod_bot to the first line after the changes. | |
| 1207 */ | |
| 1208 mod_top = wp->w_redraw_top; | |
| 1209 if (wp->w_redraw_bot != 0) | |
| 1210 mod_bot = wp->w_redraw_bot + 1; | |
| 1211 else | |
| 1212 mod_bot = 0; | |
| 1213 if (buf->b_mod_set) | |
| 1214 { | |
| 1215 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1216 { | |
| 1217 mod_top = buf->b_mod_top; | |
| 1218 #ifdef FEAT_SYN_HL | |
| 1219 /* Need to redraw lines above the change that may be included | |
| 1220 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1221 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1222 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1223 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1224 if (mod_top < 1) |
| 1225 mod_top = 1; | |
| 1226 } | |
| 1227 #endif | |
| 1228 } | |
| 1229 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1230 mod_bot = buf->b_mod_bot; | |
| 1231 | |
| 1232 #ifdef FEAT_SEARCH_EXTRA | |
|
17498
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
1233 // When 'hlsearch' is on and using a multi-line search pattern, a |
|
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
1234 // change in one line may make the Search highlighting in a |
|
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
1235 // previous line invalid. Simple solution: redraw all visible |
|
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
1236 // lines above the change. |
|
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
1237 // Same for a match pattern. |
| 699 | 1238 if (search_hl.rm.regprog != NULL |
| 1239 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1240 top_to_mod = TRUE; |
| 699 | 1241 else |
| 1326 | 1242 { |
|
17498
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
1243 matchitem_T *cur = wp->w_match_head; |
|
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
1244 |
| 1326 | 1245 while (cur != NULL) |
| 1246 { | |
| 1247 if (cur->match.regprog != NULL | |
| 1248 && re_multiline(cur->match.regprog)) | |
| 699 | 1249 { |
| 1250 top_to_mod = TRUE; | |
| 1251 break; | |
| 1252 } | |
| 1326 | 1253 cur = cur->next; |
| 1254 } | |
| 1255 } | |
| 7 | 1256 #endif |
| 1257 } | |
| 1258 #ifdef FEAT_FOLDING | |
| 1259 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1260 { | |
| 1261 linenr_T lnumt, lnumb; | |
| 1262 | |
| 1263 /* | |
| 1264 * A change in a line can cause lines above it to become folded or | |
| 1265 * unfolded. Find the top most buffer line that may be affected. | |
| 1266 * If the line was previously folded and displayed, get the first | |
| 1267 * line of that fold. If the line is folded now, get the first | |
| 1268 * folded line. Use the minimum of these two. | |
| 1269 */ | |
| 1270 | |
| 1271 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1272 * the line below it. If there is no valid entry, use w_topline. | |
| 1273 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1274 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1275 lnumt = wp->w_topline; | |
| 1276 lnumb = MAXLNUM; | |
| 1277 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1278 if (wp->w_lines[i].wl_valid) | |
| 1279 { | |
| 1280 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1281 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1282 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1283 { | |
| 1284 lnumb = wp->w_lines[i].wl_lnum; | |
| 1285 /* When there is a fold column it might need updating | |
| 1286 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1287 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1288 ++lnumb; |
| 1289 } | |
| 1290 } | |
| 1291 | |
| 1292 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1293 if (mod_top > lnumt) | |
| 1294 mod_top = lnumt; | |
| 1295 | |
| 1296 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1297 --mod_bot; | |
| 1298 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1299 ++mod_bot; | |
| 1300 if (mod_bot < lnumb) | |
| 1301 mod_bot = lnumb; | |
| 1302 } | |
| 1303 #endif | |
| 1304 | |
| 1305 /* When a change starts above w_topline and the end is below | |
| 1306 * w_topline, start redrawing at w_topline. | |
| 36 | 1307 * If the end of the change is above w_topline: do like no change was |
| 1308 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1309 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1310 { | |
| 1311 if (mod_bot > wp->w_topline) | |
| 1312 mod_top = wp->w_topline; | |
| 1313 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1314 else if (syntax_present(wp)) |
| 7 | 1315 top_end = 1; |
| 1316 #endif | |
| 1317 } | |
| 36 | 1318 |
| 1319 /* When line numbers are displayed need to redraw all lines below | |
| 1320 * inserted/deleted lines. */ | |
| 1321 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1322 mod_bot = MAXLNUM; | |
| 7 | 1323 } |
|
15715
52930462eec4
patch 8.1.0865: when 'listchars' only contains "nbsp:X" it does not work
Bram Moolenaar <Bram@vim.org>
parents:
15683
diff
changeset
|
1324 wp->w_redraw_top = 0; // reset for next time |
|
52930462eec4
patch 8.1.0865: when 'listchars' only contains "nbsp:X" it does not work
Bram Moolenaar <Bram@vim.org>
parents:
15683
diff
changeset
|
1325 wp->w_redraw_bot = 0; |
| 7 | 1326 |
| 1327 /* | |
| 1328 * When only displaying the lines at the top, set top_end. Used when | |
| 1329 * window has scrolled down for msg_scrolled. | |
| 1330 */ | |
| 1331 if (type == REDRAW_TOP) | |
| 1332 { | |
| 1333 j = 0; | |
| 1334 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1335 { | |
| 1336 j += wp->w_lines[i].wl_size; | |
| 1337 if (j >= wp->w_upd_rows) | |
| 1338 { | |
| 1339 top_end = j; | |
| 1340 break; | |
| 1341 } | |
| 1342 } | |
| 1343 if (top_end == 0) | |
| 1344 /* not found (cannot happen?): redraw everything */ | |
| 1345 type = NOT_VALID; | |
| 1346 else | |
| 1347 /* top area defined, the rest is VALID */ | |
| 1348 type = VALID; | |
| 1349 } | |
| 1350 | |
| 1378 | 1351 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1352 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1353 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1354 * called. */ | |
| 1355 if (screen_cleared) | |
| 1356 screen_cleared = MAYBE; | |
| 1357 | |
| 7 | 1358 /* |
| 1359 * If there are no changes on the screen that require a complete redraw, | |
| 1360 * handle three cases: | |
| 1361 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1362 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1363 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1364 * w_lines[] that needs updating. | |
| 1365 */ | |
| 743 | 1366 if ((type == VALID || type == SOME_VALID |
| 1367 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1368 #ifdef FEAT_DIFF |
| 1369 && !wp->w_botfill && !wp->w_old_botfill | |
| 1370 #endif | |
| 1371 ) | |
| 1372 { | |
| 1373 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1374 { | |
| 1375 /* | |
| 1376 * w_topline is the first changed line, the scrolling will be done | |
| 1377 * further down. | |
| 1378 */ | |
| 1379 } | |
| 1380 else if (wp->w_lines[0].wl_valid | |
| 1381 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1382 #ifdef FEAT_DIFF | |
| 1383 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1384 && wp->w_topfill > wp->w_old_topfill) | |
| 1385 #endif | |
| 1386 )) | |
| 1387 { | |
| 1388 /* | |
| 1389 * New topline is above old topline: May scroll down. | |
| 1390 */ | |
| 1391 #ifdef FEAT_FOLDING | |
| 1392 if (hasAnyFolding(wp)) | |
| 1393 { | |
| 1394 linenr_T ln; | |
| 1395 | |
| 1396 /* count the number of lines we are off, counting a sequence | |
| 1397 * of folded lines as one */ | |
| 1398 j = 0; | |
| 1399 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1400 { | |
| 1401 ++j; | |
| 1402 if (j >= wp->w_height - 2) | |
| 1403 break; | |
| 1404 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1405 } | |
| 1406 } | |
| 1407 else | |
| 1408 #endif | |
| 1409 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1410 if (j < wp->w_height - 2) /* not too far off */ | |
| 1411 { | |
| 1412 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1413 #ifdef FEAT_DIFF | |
| 1414 /* insert extra lines for previously invisible filler lines */ | |
| 1415 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1416 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1417 - wp->w_old_topfill; | |
| 1418 #endif | |
| 1419 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1420 { | |
| 1421 /* | |
| 1422 * Try to insert the correct number of lines. | |
| 1423 * If not the last window, delete the lines at the bottom. | |
| 1424 * win_ins_lines may fail when the terminal can't do it. | |
| 1425 */ | |
| 1426 if (i > 0) | |
| 1427 check_for_delay(FALSE); | |
| 1428 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1429 { | |
| 1430 if (wp->w_lines_valid != 0) | |
| 1431 { | |
| 1432 /* Need to update rows that are new, stop at the | |
| 1433 * first one that scrolled down. */ | |
| 1434 top_end = i; | |
| 1435 scrolled_down = TRUE; | |
| 1436 | |
| 1437 /* Move the entries that were scrolled, disable | |
| 1438 * the entries for the lines to be redrawn. */ | |
| 1439 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1440 wp->w_lines_valid = wp->w_height; | |
| 1441 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1442 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1443 while (idx >= 0) | |
| 1444 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1445 } | |
| 1446 } | |
| 1447 else | |
| 1448 mid_start = 0; /* redraw all lines */ | |
| 1449 } | |
| 1450 else | |
| 1451 mid_start = 0; /* redraw all lines */ | |
| 1452 } | |
| 1453 else | |
| 1454 mid_start = 0; /* redraw all lines */ | |
| 1455 } | |
| 1456 else | |
| 1457 { | |
| 1458 /* | |
| 1459 * New topline is at or below old topline: May scroll up. | |
| 1460 * When topline didn't change, find first entry in w_lines[] that | |
| 1461 * needs updating. | |
| 1462 */ | |
| 1463 | |
| 1464 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1465 j = -1; | |
| 1466 row = 0; | |
| 1467 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1468 { | |
| 1469 if (wp->w_lines[i].wl_valid | |
| 1470 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1471 { | |
| 1472 j = i; | |
| 1473 break; | |
| 1474 } | |
| 1475 row += wp->w_lines[i].wl_size; | |
| 1476 } | |
| 1477 if (j == -1) | |
| 1478 { | |
| 1479 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1480 * lines */ | |
| 1481 mid_start = 0; | |
| 1482 } | |
| 1483 else | |
| 1484 { | |
| 1485 /* | |
| 1486 * Try to delete the correct number of lines. | |
| 1487 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1488 */ | |
| 1489 #ifdef FEAT_DIFF | |
| 1490 /* If the topline didn't change, delete old filler lines, | |
| 1491 * otherwise delete filler lines of the new topline... */ | |
| 1492 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1493 row += wp->w_old_topfill; | |
| 1494 else | |
| 1495 row += diff_check_fill(wp, wp->w_topline); | |
| 1496 /* ... but don't delete new filler lines. */ | |
| 1497 row -= wp->w_topfill; | |
| 1498 #endif | |
| 1499 if (row > 0) | |
| 1500 { | |
| 1501 check_for_delay(FALSE); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
1502 if (win_del_lines(wp, 0, row, FALSE, wp == firstwin, 0) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
1503 == OK) |
| 7 | 1504 bot_start = wp->w_height - row; |
| 1505 else | |
| 1506 mid_start = 0; /* redraw all lines */ | |
| 1507 } | |
| 1508 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1509 { | |
| 1510 /* | |
| 1511 * Skip the lines (below the deleted lines) that are still | |
| 1512 * valid and don't need redrawing. Copy their info | |
| 1513 * upwards, to compensate for the deleted lines. Set | |
| 1514 * bot_start to the first row that needs redrawing. | |
| 1515 */ | |
| 1516 bot_start = 0; | |
| 1517 idx = 0; | |
| 1518 for (;;) | |
| 1519 { | |
| 1520 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1521 /* stop at line that didn't fit, unless it is still | |
| 1522 * valid (no lines deleted) */ | |
| 1523 if (row > 0 && bot_start + row | |
| 1524 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1525 { | |
| 1526 wp->w_lines_valid = idx + 1; | |
| 1527 break; | |
| 1528 } | |
| 1529 bot_start += wp->w_lines[idx++].wl_size; | |
| 1530 | |
| 1531 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1532 if (++j >= wp->w_lines_valid) | |
| 1533 { | |
| 1534 wp->w_lines_valid = idx; | |
| 1535 break; | |
| 1536 } | |
| 1537 } | |
| 1538 #ifdef FEAT_DIFF | |
| 1539 /* Correct the first entry for filler lines at the top | |
| 1540 * when it won't get updated below. */ | |
| 1541 if (wp->w_p_diff && bot_start > 0) | |
| 1542 wp->w_lines[0].wl_size = | |
| 1543 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1544 + wp->w_topfill; | |
| 1545 #endif | |
| 1546 } | |
| 1547 } | |
| 1548 } | |
| 1549 | |
| 1550 /* When starting redraw in the first line, redraw all lines. When | |
| 1551 * there is only one window it's probably faster to clear the screen | |
| 1552 * first. */ | |
| 1553 if (mid_start == 0) | |
| 1554 { | |
| 1555 mid_end = wp->w_height; | |
|
17225
09fa437d33d8
patch 8.1.1612: cannot show an existing buffer in a popup window
Bram Moolenaar <Bram@vim.org>
parents:
17208
diff
changeset
|
1556 if (ONE_WINDOW && !WIN_IS_POPUP(wp)) |
| 981 | 1557 { |
| 1331 | 1558 /* Clear the screen when it was not done by win_del_lines() or |
| 1559 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1560 * then. */ | |
| 1561 if (screen_cleared != TRUE) | |
| 1562 screenclear(); | |
| 981 | 1563 /* The screen was cleared, redraw the tab pages line. */ |
| 1564 if (redraw_tabline) | |
| 1565 draw_tabline(); | |
| 1566 } | |
| 7 | 1567 } |
| 1331 | 1568 |
| 1569 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1570 * cleared (only happens for the first window) or when screenclear() | |
| 1571 * was called directly above, "must_redraw" will have been set to | |
| 1572 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1573 if (screen_cleared == TRUE) | |
| 1574 must_redraw = 0; | |
| 7 | 1575 } |
| 1576 else | |
| 1577 { | |
| 1578 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1579 mid_start = 0; | |
| 1580 mid_end = wp->w_height; | |
| 1581 } | |
| 1582 | |
| 743 | 1583 if (type == SOME_VALID) |
| 1584 { | |
| 1585 /* SOME_VALID: redraw all lines. */ | |
| 1586 mid_start = 0; | |
| 1587 mid_end = wp->w_height; | |
| 1588 type = NOT_VALID; | |
| 1589 } | |
| 1590 | |
| 7 | 1591 /* check if we are updating or removing the inverted part */ |
| 1592 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1593 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1594 { | |
| 1595 linenr_T from, to; | |
| 1596 | |
| 1597 if (VIsual_active) | |
| 1598 { | |
| 1599 if (VIsual_active | |
| 1600 && (VIsual_mode != wp->w_old_visual_mode | |
| 1601 || type == INVERTED_ALL)) | |
| 1602 { | |
| 1603 /* | |
| 1604 * If the type of Visual selection changed, redraw the whole | |
| 1605 * selection. Also when the ownership of the X selection is | |
| 1606 * gained or lost. | |
| 1607 */ | |
| 1608 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1609 { | |
| 1610 from = curwin->w_cursor.lnum; | |
| 1611 to = VIsual.lnum; | |
| 1612 } | |
| 1613 else | |
| 1614 { | |
| 1615 from = VIsual.lnum; | |
| 1616 to = curwin->w_cursor.lnum; | |
| 1617 } | |
| 1618 /* redraw more when the cursor moved as well */ | |
| 1619 if (wp->w_old_cursor_lnum < from) | |
| 1620 from = wp->w_old_cursor_lnum; | |
| 1621 if (wp->w_old_cursor_lnum > to) | |
| 1622 to = wp->w_old_cursor_lnum; | |
| 1623 if (wp->w_old_visual_lnum < from) | |
| 1624 from = wp->w_old_visual_lnum; | |
| 1625 if (wp->w_old_visual_lnum > to) | |
| 1626 to = wp->w_old_visual_lnum; | |
| 1627 } | |
| 1628 else | |
| 1629 { | |
| 1630 /* | |
| 1631 * Find the line numbers that need to be updated: The lines | |
| 1632 * between the old cursor position and the current cursor | |
| 1633 * position. Also check if the Visual position changed. | |
| 1634 */ | |
| 1635 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1636 { | |
| 1637 from = curwin->w_cursor.lnum; | |
| 1638 to = wp->w_old_cursor_lnum; | |
| 1639 } | |
| 1640 else | |
| 1641 { | |
| 1642 from = wp->w_old_cursor_lnum; | |
| 1643 to = curwin->w_cursor.lnum; | |
| 1644 if (from == 0) /* Visual mode just started */ | |
| 1645 from = to; | |
| 1646 } | |
| 1647 | |
| 422 | 1648 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1649 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1650 { |
| 1651 if (wp->w_old_visual_lnum < from | |
| 1652 && wp->w_old_visual_lnum != 0) | |
| 1653 from = wp->w_old_visual_lnum; | |
| 1654 if (wp->w_old_visual_lnum > to) | |
| 1655 to = wp->w_old_visual_lnum; | |
| 1656 if (VIsual.lnum < from) | |
| 1657 from = VIsual.lnum; | |
| 1658 if (VIsual.lnum > to) | |
| 1659 to = VIsual.lnum; | |
| 1660 } | |
| 1661 } | |
| 1662 | |
| 1663 /* | |
| 1664 * If in block mode and changed column or curwin->w_curswant: | |
| 1665 * update all lines. | |
| 1666 * First compute the actual start and end column. | |
| 1667 */ | |
| 1668 if (VIsual_mode == Ctrl_V) | |
| 1669 { | |
| 6266 | 1670 colnr_T fromc, toc; |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
1671 #if defined(FEAT_LINEBREAK) |
| 6266 | 1672 int save_ve_flags = ve_flags; |
| 1673 | |
| 1674 if (curwin->w_p_lbr) | |
| 1675 ve_flags = VE_ALL; | |
| 1676 #endif | |
| 7 | 1677 getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
1678 #if defined(FEAT_LINEBREAK) |
| 6266 | 1679 ve_flags = save_ve_flags; |
| 1680 #endif | |
| 7 | 1681 ++toc; |
| 1682 if (curwin->w_curswant == MAXCOL) | |
| 1683 toc = MAXCOL; | |
| 1684 | |
| 1685 if (fromc != wp->w_old_cursor_fcol | |
| 1686 || toc != wp->w_old_cursor_lcol) | |
| 1687 { | |
| 1688 if (from > VIsual.lnum) | |
| 1689 from = VIsual.lnum; | |
| 1690 if (to < VIsual.lnum) | |
| 1691 to = VIsual.lnum; | |
| 1692 } | |
| 1693 wp->w_old_cursor_fcol = fromc; | |
| 1694 wp->w_old_cursor_lcol = toc; | |
| 1695 } | |
| 1696 } | |
| 1697 else | |
| 1698 { | |
| 1699 /* Use the line numbers of the old Visual area. */ | |
| 1700 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1701 { | |
| 1702 from = wp->w_old_cursor_lnum; | |
| 1703 to = wp->w_old_visual_lnum; | |
| 1704 } | |
| 1705 else | |
| 1706 { | |
| 1707 from = wp->w_old_visual_lnum; | |
| 1708 to = wp->w_old_cursor_lnum; | |
| 1709 } | |
| 1710 } | |
| 1711 | |
| 1712 /* | |
| 1713 * There is no need to update lines above the top of the window. | |
| 1714 */ | |
| 1715 if (from < wp->w_topline) | |
| 1716 from = wp->w_topline; | |
| 1717 | |
| 1718 /* | |
| 1719 * If we know the value of w_botline, use it to restrict the update to | |
| 1720 * the lines that are visible in the window. | |
| 1721 */ | |
| 1722 if (wp->w_valid & VALID_BOTLINE) | |
| 1723 { | |
| 1724 if (from >= wp->w_botline) | |
| 1725 from = wp->w_botline - 1; | |
| 1726 if (to >= wp->w_botline) | |
| 1727 to = wp->w_botline - 1; | |
| 1728 } | |
| 1729 | |
| 1730 /* | |
| 1731 * Find the minimal part to be updated. | |
| 1732 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1733 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1734 * top_end; need to redraw from top_end to the "to" line. | |
| 1735 * A middle mouse click with a Visual selection may change the text | |
| 1736 * above the Visual area and reset wl_valid, do count these for | |
| 1737 * mid_end (in srow). | |
| 1738 */ | |
| 1739 if (mid_start > 0) | |
| 1740 { | |
| 1741 lnum = wp->w_topline; | |
| 1742 idx = 0; | |
| 1743 srow = 0; | |
| 1744 if (scrolled_down) | |
| 1745 mid_start = top_end; | |
| 1746 else | |
| 1747 mid_start = 0; | |
| 1748 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1749 { | |
| 1750 if (wp->w_lines[idx].wl_valid) | |
| 1751 mid_start += wp->w_lines[idx].wl_size; | |
| 1752 else if (!scrolled_down) | |
| 1753 srow += wp->w_lines[idx].wl_size; | |
| 1754 ++idx; | |
| 1755 # ifdef FEAT_FOLDING | |
| 1756 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1757 lnum = wp->w_lines[idx].wl_lnum; | |
| 1758 else | |
| 1759 # endif | |
| 1760 ++lnum; | |
| 1761 } | |
| 1762 srow += mid_start; | |
| 1763 mid_end = wp->w_height; | |
| 1764 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1765 { | |
| 1766 if (wp->w_lines[idx].wl_valid | |
| 1767 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1768 { | |
| 1769 /* Only update until first row of this line */ | |
| 1770 mid_end = srow; | |
| 1771 break; | |
| 1772 } | |
| 1773 srow += wp->w_lines[idx].wl_size; | |
| 1774 } | |
| 1775 } | |
| 1776 } | |
| 1777 | |
| 1778 if (VIsual_active && buf == curwin->w_buffer) | |
| 1779 { | |
| 1780 wp->w_old_visual_mode = VIsual_mode; | |
| 1781 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1782 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1783 wp->w_old_visual_col = VIsual.col; |
| 7 | 1784 wp->w_old_curswant = curwin->w_curswant; |
| 1785 } | |
| 1786 else | |
| 1787 { | |
| 1788 wp->w_old_visual_mode = 0; | |
| 1789 wp->w_old_cursor_lnum = 0; | |
| 1790 wp->w_old_visual_lnum = 0; | |
| 422 | 1791 wp->w_old_visual_col = 0; |
| 7 | 1792 } |
| 1793 | |
| 1794 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1795 /* reset got_int, otherwise regexp won't work */ | |
| 1796 save_got_int = got_int; | |
| 1797 got_int = 0; | |
| 1798 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1799 #ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1800 /* Set the time limit to 'redrawtime'. */ |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1801 profile_setlimit(p_rdt, &syntax_tm); |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
1802 syn_set_timeout(&syntax_tm); |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1803 #endif |
| 7 | 1804 #ifdef FEAT_FOLDING |
| 1805 win_foldinfo.fi_level = 0; | |
| 1806 #endif | |
| 1807 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1808 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1809 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1810 * Draw the window toolbar, if there is one. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1811 * TODO: only when needed. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1812 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1813 if (winbar_height(wp) > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1814 redraw_win_toolbar(wp); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1815 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1816 |
| 7 | 1817 /* |
| 1818 * Update all the window rows. | |
| 1819 */ | |
| 1820 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1821 row = 0; | |
| 1822 srow = 0; | |
| 1823 lnum = wp->w_topline; /* first line shown in window */ | |
| 1824 for (;;) | |
| 1825 { | |
| 1826 /* stop updating when reached the end of the window (check for _past_ | |
| 1827 * the end of the window is at the end of the loop) */ | |
| 1828 if (row == wp->w_height) | |
| 1829 { | |
| 1830 didline = TRUE; | |
| 1831 break; | |
| 1832 } | |
| 1833 | |
| 1834 /* stop updating when hit the end of the file */ | |
| 1835 if (lnum > buf->b_ml.ml_line_count) | |
| 1836 { | |
| 1837 eof = TRUE; | |
| 1838 break; | |
| 1839 } | |
| 1840 | |
| 1841 /* Remember the starting row of the line that is going to be dealt | |
| 1842 * with. It is used further down when the line doesn't fit. */ | |
| 1843 srow = row; | |
| 1844 | |
| 1845 /* | |
| 1846 * Update a line when it is in an area that needs updating, when it | |
| 1847 * has changes or w_lines[idx] is invalid. | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
1848 * "bot_start" may be halfway a wrapped line after using |
| 7 | 1849 * win_del_lines(), check if the current line includes it. |
| 1850 * When syntax folding is being used, the saved syntax states will | |
| 1851 * already have been updated, we can't see where the syntax state is | |
| 1852 * the same again, just update until the end of the window. | |
| 1853 */ | |
| 1854 if (row < top_end | |
| 1855 || (row >= mid_start && row < mid_end) | |
| 1856 #ifdef FEAT_SEARCH_EXTRA | |
| 1857 || top_to_mod | |
| 1858 #endif | |
| 1859 || idx >= wp->w_lines_valid | |
| 1860 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1861 || (mod_top != 0 | |
| 1862 && (lnum == mod_top | |
| 1863 || (lnum >= mod_top | |
| 1864 && (lnum < mod_bot | |
| 1865 #ifdef FEAT_SYN_HL | |
| 1866 || did_update == DID_FOLD | |
| 1867 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1868 && syntax_present(wp) |
| 7 | 1869 && ( |
| 1870 # ifdef FEAT_FOLDING | |
| 1871 (foldmethodIsSyntax(wp) | |
| 1872 && hasAnyFolding(wp)) || | |
| 1873 # endif | |
| 1874 syntax_check_changed(lnum))) | |
| 1875 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1876 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1877 /* match in fixed position might need redraw |
| 1878 * if lines were inserted or deleted */ | |
| 1879 || (wp->w_match_head != NULL | |
| 1880 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1881 #endif |
| 7 | 1882 ))))) |
| 1883 { | |
| 1884 #ifdef FEAT_SEARCH_EXTRA | |
| 1885 if (lnum == mod_top) | |
| 1886 top_to_mod = FALSE; | |
| 1887 #endif | |
| 1888 | |
| 1889 /* | |
| 1890 * When at start of changed lines: May scroll following lines | |
| 1891 * up or down to minimize redrawing. | |
| 1892 * Don't do this when the change continues until the end. | |
| 3318 | 1893 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1894 */ |
| 1895 if (lnum == mod_top | |
| 1896 && mod_bot != MAXLNUM | |
| 3318 | 1897 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1898 { |
| 1899 int old_rows = 0; | |
| 1900 int new_rows = 0; | |
| 1901 int xtra_rows; | |
| 1902 linenr_T l; | |
| 1903 | |
| 1904 /* Count the old number of window rows, using w_lines[], which | |
| 1905 * should still contain the sizes for the lines as they are | |
| 1906 * currently displayed. */ | |
| 1907 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1908 { | |
| 1909 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1910 * lines are part of the changed area. */ | |
| 1911 if (wp->w_lines[i].wl_valid | |
| 1912 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1913 break; | |
| 1914 old_rows += wp->w_lines[i].wl_size; | |
| 1915 #ifdef FEAT_FOLDING | |
| 1916 if (wp->w_lines[i].wl_valid | |
| 1917 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1918 { | |
| 1919 /* Must have found the last valid entry above mod_bot. | |
| 1920 * Add following invalid entries. */ | |
| 1921 ++i; | |
| 1922 while (i < wp->w_lines_valid | |
| 1923 && !wp->w_lines[i].wl_valid) | |
| 1924 old_rows += wp->w_lines[i++].wl_size; | |
| 1925 break; | |
| 1926 } | |
| 1927 #endif | |
| 1928 } | |
| 1929 | |
| 1930 if (i >= wp->w_lines_valid) | |
| 1931 { | |
| 1932 /* We can't find a valid line below the changed lines, | |
| 1933 * need to redraw until the end of the window. | |
| 1934 * Inserting/deleting lines has no use. */ | |
| 1935 bot_start = 0; | |
| 1936 } | |
| 1937 else | |
| 1938 { | |
| 1939 /* Able to count old number of rows: Count new window | |
| 1940 * rows, and may insert/delete lines */ | |
| 1941 j = idx; | |
| 1942 for (l = lnum; l < mod_bot; ++l) | |
| 1943 { | |
| 1944 #ifdef FEAT_FOLDING | |
| 1945 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1946 ++new_rows; | |
| 1947 else | |
| 1948 #endif | |
| 1949 #ifdef FEAT_DIFF | |
| 1950 if (l == wp->w_topline) | |
| 1951 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1952 + wp->w_topfill; | |
| 1953 else | |
| 1954 #endif | |
| 1955 new_rows += plines_win(wp, l, TRUE); | |
| 1956 ++j; | |
| 1957 if (new_rows > wp->w_height - row - 2) | |
| 1958 { | |
| 1959 /* it's getting too much, must redraw the rest */ | |
| 1960 new_rows = 9999; | |
| 1961 break; | |
| 1962 } | |
| 1963 } | |
| 1964 xtra_rows = new_rows - old_rows; | |
| 1965 if (xtra_rows < 0) | |
| 1966 { | |
| 1967 /* May scroll text up. If there is not enough | |
| 1968 * remaining text or scrolling fails, must redraw the | |
| 1969 * rest. If scrolling works, must redraw the text | |
| 1970 * below the scrolled text. */ | |
| 1971 if (row - xtra_rows >= wp->w_height - 2) | |
| 1972 mod_bot = MAXLNUM; | |
| 1973 else | |
| 1974 { | |
| 1975 check_for_delay(FALSE); | |
| 1976 if (win_del_lines(wp, row, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
1977 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 1978 mod_bot = MAXLNUM; |
| 1979 else | |
| 1980 bot_start = wp->w_height + xtra_rows; | |
| 1981 } | |
| 1982 } | |
| 1983 else if (xtra_rows > 0) | |
| 1984 { | |
| 1985 /* May scroll text down. If there is not enough | |
| 1986 * remaining text of scrolling fails, must redraw the | |
| 1987 * rest. */ | |
| 1988 if (row + xtra_rows >= wp->w_height - 2) | |
| 1989 mod_bot = MAXLNUM; | |
| 1990 else | |
| 1991 { | |
| 1992 check_for_delay(FALSE); | |
| 1993 if (win_ins_lines(wp, row + old_rows, | |
| 1994 xtra_rows, FALSE, FALSE) == FAIL) | |
| 1995 mod_bot = MAXLNUM; | |
| 1996 else if (top_end > row + old_rows) | |
| 1997 /* Scrolled the part at the top that requires | |
| 1998 * updating down. */ | |
| 1999 top_end += xtra_rows; | |
| 2000 } | |
| 2001 } | |
| 2002 | |
| 2003 /* When not updating the rest, may need to move w_lines[] | |
| 2004 * entries. */ | |
| 2005 if (mod_bot != MAXLNUM && i != j) | |
| 2006 { | |
| 2007 if (j < i) | |
| 2008 { | |
| 2009 int x = row + new_rows; | |
| 2010 | |
| 2011 /* move entries in w_lines[] upwards */ | |
| 2012 for (;;) | |
| 2013 { | |
| 2014 /* stop at last valid entry in w_lines[] */ | |
| 2015 if (i >= wp->w_lines_valid) | |
| 2016 { | |
| 2017 wp->w_lines_valid = j; | |
| 2018 break; | |
| 2019 } | |
| 2020 wp->w_lines[j] = wp->w_lines[i]; | |
| 2021 /* stop at a line that won't fit */ | |
| 2022 if (x + (int)wp->w_lines[j].wl_size | |
| 2023 > wp->w_height) | |
| 2024 { | |
| 2025 wp->w_lines_valid = j + 1; | |
| 2026 break; | |
| 2027 } | |
| 2028 x += wp->w_lines[j++].wl_size; | |
| 2029 ++i; | |
| 2030 } | |
| 2031 if (bot_start > x) | |
| 2032 bot_start = x; | |
| 2033 } | |
| 2034 else /* j > i */ | |
| 2035 { | |
| 2036 /* move entries in w_lines[] downwards */ | |
| 2037 j -= i; | |
| 2038 wp->w_lines_valid += j; | |
| 2039 if (wp->w_lines_valid > wp->w_height) | |
| 2040 wp->w_lines_valid = wp->w_height; | |
| 2041 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2042 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2043 | |
| 2044 /* The w_lines[] entries for inserted lines are | |
| 2045 * now invalid, but wl_size may be used above. | |
| 2046 * Reset to zero. */ | |
| 2047 while (i >= idx) | |
| 2048 { | |
| 2049 wp->w_lines[i].wl_size = 0; | |
| 2050 wp->w_lines[i--].wl_valid = FALSE; | |
| 2051 } | |
| 2052 } | |
| 2053 } | |
| 2054 } | |
| 2055 } | |
| 2056 | |
| 2057 #ifdef FEAT_FOLDING | |
| 2058 /* | |
| 2059 * When lines are folded, display one line for all of them. | |
| 2060 * Otherwise, display normally (can be several display lines when | |
| 2061 * 'wrap' is on). | |
| 2062 */ | |
| 2063 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2064 if (fold_count != 0) | |
| 2065 { | |
| 2066 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2067 ++row; | |
| 2068 --fold_count; | |
| 2069 wp->w_lines[idx].wl_folded = TRUE; | |
| 2070 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2071 # ifdef FEAT_SYN_HL | |
| 2072 did_update = DID_FOLD; | |
| 2073 # endif | |
| 2074 } | |
| 2075 else | |
| 2076 #endif | |
| 2077 if (idx < wp->w_lines_valid | |
| 2078 && wp->w_lines[idx].wl_valid | |
| 2079 && wp->w_lines[idx].wl_lnum == lnum | |
| 2080 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2081 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
|
17225
09fa437d33d8
patch 8.1.1612: cannot show an existing buffer in a popup window
Bram Moolenaar <Bram@vim.org>
parents:
17208
diff
changeset
|
2082 && !WIN_IS_POPUP(wp) |
| 7 | 2083 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2084 #ifdef FEAT_DIFF | |
| 2085 && diff_check_fill(wp, lnum) == 0 | |
| 2086 #endif | |
| 2087 ) | |
| 2088 { | |
| 2089 /* This line is not going to fit. Don't draw anything here, | |
| 2090 * will draw "@ " lines below. */ | |
| 2091 row = wp->w_height + 1; | |
| 2092 } | |
| 2093 else | |
| 2094 { | |
| 2095 #ifdef FEAT_SEARCH_EXTRA | |
|
17490
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
2096 prepare_search_hl(wp, &search_hl, lnum); |
| 7 | 2097 #endif |
| 2098 #ifdef FEAT_SYN_HL | |
| 2099 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2100 if (syntax_last_parsed != 0 && syntax_last_parsed + 1 < lnum | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2101 && syntax_present(wp)) |
| 7 | 2102 syntax_end_parsing(syntax_last_parsed + 1); |
| 2103 #endif | |
| 2104 | |
| 2105 /* | |
| 2106 * Display one line. | |
| 2107 */ | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2108 row = win_line(wp, lnum, srow, wp->w_height, |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2109 mod_top == 0, FALSE); |
| 7 | 2110 |
| 2111 #ifdef FEAT_FOLDING | |
| 2112 wp->w_lines[idx].wl_folded = FALSE; | |
| 2113 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2114 #endif | |
| 2115 #ifdef FEAT_SYN_HL | |
| 2116 did_update = DID_LINE; | |
| 2117 syntax_last_parsed = lnum; | |
| 2118 #endif | |
| 2119 } | |
| 2120 | |
| 2121 wp->w_lines[idx].wl_lnum = lnum; | |
| 2122 wp->w_lines[idx].wl_valid = TRUE; | |
|
12700
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2123 |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2124 /* Past end of the window or end of the screen. Note that after |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2125 * resizing wp->w_height may be end up too big. That's a problem |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2126 * elsewhere, but prevent a crash here. */ |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2127 if (row > wp->w_height || row + wp->w_winrow >= Rows) |
| 7 | 2128 { |
| 2129 /* we may need the size of that too long line later on */ | |
| 3318 | 2130 if (dollar_vcol == -1) |
| 7 | 2131 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2132 ++idx; | |
| 2133 break; | |
| 2134 } | |
| 3318 | 2135 if (dollar_vcol == -1) |
| 7 | 2136 wp->w_lines[idx].wl_size = row - srow; |
| 2137 ++idx; | |
| 2138 #ifdef FEAT_FOLDING | |
| 2139 lnum += fold_count + 1; | |
| 2140 #else | |
| 2141 ++lnum; | |
| 2142 #endif | |
| 2143 } | |
| 2144 else | |
| 2145 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2146 if (wp->w_p_rnu) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2147 { |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2148 #ifdef FEAT_FOLDING |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2149 // 'relativenumber' set: The text doesn't need to be drawn, but |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2150 // the number column nearly always does. |
|
14875
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2151 fold_count = foldedCount(wp, lnum, &win_foldinfo); |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2152 if (fold_count != 0) |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2153 fold_line(wp, fold_count, &win_foldinfo, lnum, row); |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2154 else |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2155 #endif |
|
14875
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2156 (void)win_line(wp, lnum, srow, wp->w_height, TRUE, TRUE); |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2157 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2158 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2159 // This line does not need to be drawn, advance to the next one. |
| 7 | 2160 row += wp->w_lines[idx++].wl_size; |
| 2161 if (row > wp->w_height) /* past end of screen */ | |
| 2162 break; | |
| 2163 #ifdef FEAT_FOLDING | |
| 2164 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2165 #else | |
| 2166 ++lnum; | |
| 2167 #endif | |
| 2168 #ifdef FEAT_SYN_HL | |
| 2169 did_update = DID_NONE; | |
| 2170 #endif | |
| 2171 } | |
| 2172 | |
| 2173 if (lnum > buf->b_ml.ml_line_count) | |
| 2174 { | |
| 2175 eof = TRUE; | |
| 2176 break; | |
| 2177 } | |
| 2178 } | |
| 2179 /* | |
| 2180 * End of loop over all window lines. | |
| 2181 */ | |
| 2182 | |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2183 #ifdef FEAT_VTP |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2184 /* Rewrite the character at the end of the screen line. */ |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2185 if (use_vtp()) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2186 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2187 int i; |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2188 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2189 for (i = 0; i < Rows; ++i) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2190 if (enc_utf8) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2191 if ((*mb_off2cells)(LineOffset[i] + Columns - 2, |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2192 LineOffset[i] + screen_Columns) > 1) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2193 screen_draw_rectangle(i, Columns - 2, 1, 2, FALSE); |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2194 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2195 screen_draw_rectangle(i, Columns - 1, 1, 1, FALSE); |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2196 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2197 screen_char(LineOffset[i] + Columns - 1, i, Columns - 1); |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2198 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2199 #endif |
| 7 | 2200 |
| 2201 if (idx > wp->w_lines_valid) | |
| 2202 wp->w_lines_valid = idx; | |
| 2203 | |
| 2204 #ifdef FEAT_SYN_HL | |
| 2205 /* | |
| 2206 * Let the syntax stuff know we stop parsing here. | |
| 2207 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2208 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2209 syntax_end_parsing(syntax_last_parsed + 1); |
| 2210 #endif | |
| 2211 | |
| 2212 /* | |
| 2213 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2214 * line we were working on, then the line didn't fit. | |
| 2215 */ | |
| 2216 wp->w_empty_rows = 0; | |
| 2217 #ifdef FEAT_DIFF | |
| 2218 wp->w_filler_rows = 0; | |
| 2219 #endif | |
| 2220 if (!eof && !didline) | |
| 2221 { | |
| 2222 if (lnum == wp->w_topline) | |
| 2223 { | |
| 2224 /* | |
| 2225 * Single line that does not fit! | |
| 2226 * Don't overwrite it, it can be edited. | |
| 2227 */ | |
| 2228 wp->w_botline = lnum + 1; | |
| 2229 } | |
| 2230 #ifdef FEAT_DIFF | |
| 2231 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2232 { | |
| 2233 /* Window ends in filler lines. */ | |
| 2234 wp->w_botline = lnum; | |
| 2235 wp->w_filler_rows = wp->w_height - srow; | |
| 2236 } | |
| 2237 #endif | |
|
16839
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2238 #ifdef FEAT_TEXT_PROP |
|
17225
09fa437d33d8
patch 8.1.1612: cannot show an existing buffer in a popup window
Bram Moolenaar <Bram@vim.org>
parents:
17208
diff
changeset
|
2239 else if (WIN_IS_POPUP(wp)) |
|
16839
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2240 { |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2241 // popup line that doesn't fit is left as-is |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2242 wp->w_botline = lnum; |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2243 } |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2244 #endif |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2245 else if (dy_flags & DY_TRUNCATE) /* 'display' has "truncate" */ |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2246 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2247 int scr_row = W_WINROW(wp) + wp->w_height - 1; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2248 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2249 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2250 * Last line isn't finished: Display "@@@" in the last screen line. |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2251 */ |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2252 screen_puts_len((char_u *)"@@", 2, scr_row, wp->w_wincol, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2253 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2254 screen_fill(scr_row, scr_row + 1, |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2255 (int)wp->w_wincol + 2, (int)W_ENDCOL(wp), |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2256 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2257 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2258 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2259 } |
| 7 | 2260 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2261 { | |
| 2262 /* | |
| 2263 * Last line isn't finished: Display "@@@" at the end. | |
| 2264 */ | |
| 2265 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2266 W_WINROW(wp) + wp->w_height, | |
| 2267 (int)W_ENDCOL(wp) - 3, (int)W_ENDCOL(wp), | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2268 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2269 set_empty_rows(wp, srow); |
| 2270 wp->w_botline = lnum; | |
| 2271 } | |
| 2272 else | |
| 2273 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2274 win_draw_end(wp, '@', ' ', TRUE, srow, wp->w_height, HLF_AT); |
| 7 | 2275 wp->w_botline = lnum; |
| 2276 } | |
| 2277 } | |
| 2278 else | |
| 2279 { | |
| 2280 draw_vsep_win(wp, row); | |
| 2281 if (eof) /* we hit the end of the file */ | |
| 2282 { | |
| 2283 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2284 #ifdef FEAT_DIFF | |
| 2285 j = diff_check_fill(wp, wp->w_botline); | |
| 2286 if (j > 0 && !wp->w_botfill) | |
| 2287 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2288 // Display filler lines at the end of the file. |
| 7 | 2289 if (char2cells(fill_diff) > 1) |
| 2290 i = '-'; | |
| 2291 else | |
| 2292 i = fill_diff; | |
| 2293 if (row + j > wp->w_height) | |
| 2294 j = wp->w_height - row; | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2295 win_draw_end(wp, i, i, TRUE, row, row + (int)j, HLF_DED); |
| 7 | 2296 row += j; |
| 2297 } | |
| 2298 #endif | |
| 2299 } | |
| 3318 | 2300 else if (dollar_vcol == -1) |
| 7 | 2301 wp->w_botline = lnum; |
| 2302 | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2303 // Make sure the rest of the screen is blank |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2304 // put '~'s on rows that aren't part of the file. |
|
17225
09fa437d33d8
patch 8.1.1612: cannot show an existing buffer in a popup window
Bram Moolenaar <Bram@vim.org>
parents:
17208
diff
changeset
|
2305 win_draw_end(wp, WIN_IS_POPUP(wp) ? ' ' : '~', |
|
09fa437d33d8
patch 8.1.1612: cannot show an existing buffer in a popup window
Bram Moolenaar <Bram@vim.org>
parents:
17208
diff
changeset
|
2306 ' ', FALSE, row, wp->w_height, HLF_EOB); |
| 7 | 2307 } |
| 2308 | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2309 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2310 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2311 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2312 |
| 7 | 2313 /* Reset the type of redrawing required, the window has been updated. */ |
| 2314 wp->w_redr_type = 0; | |
| 2315 #ifdef FEAT_DIFF | |
| 2316 wp->w_old_topfill = wp->w_topfill; | |
| 2317 wp->w_old_botfill = wp->w_botfill; | |
| 2318 #endif | |
| 2319 | |
| 3318 | 2320 if (dollar_vcol == -1) |
| 7 | 2321 { |
| 2322 /* | |
| 2323 * There is a trick with w_botline. If we invalidate it on each | |
| 2324 * change that might modify it, this will cause a lot of expensive | |
| 2325 * calls to plines() in update_topline() each time. Therefore the | |
| 2326 * value of w_botline is often approximated, and this value is used to | |
| 2327 * compute the value of w_topline. If the value of w_botline was | |
| 2328 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2329 * the visible part of the text). If it's not, we need to redraw | |
| 2330 * again. Mostly this just means scrolling up a few lines, so it | |
| 2331 * doesn't look too bad. Only do this for the current window (where | |
| 2332 * changes are relevant). | |
| 2333 */ | |
| 2334 wp->w_valid |= VALID_BOTLINE; | |
| 2335 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2336 { | |
| 2337 recursive = TRUE; | |
| 2338 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2339 update_topline(); /* may invalidate w_botline again */ | |
| 2340 if (must_redraw != 0) | |
| 2341 { | |
| 2342 /* Don't update for changes in buffer again. */ | |
| 2343 i = curbuf->b_mod_set; | |
| 2344 curbuf->b_mod_set = FALSE; | |
| 2345 win_update(curwin); | |
| 2346 must_redraw = 0; | |
| 2347 curbuf->b_mod_set = i; | |
| 2348 } | |
| 2349 recursive = FALSE; | |
| 2350 } | |
| 2351 } | |
| 2352 | |
| 2353 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2354 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2355 if (!got_int) | |
| 2356 got_int = save_got_int; | |
| 2357 #endif | |
| 2358 } | |
| 2359 | |
| 2360 /* | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2361 * Call screen_fill() with the columns adjusted for 'rightleft' if needed. |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2362 * Return the new offset. |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2363 */ |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2364 static int |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2365 screen_fill_end( |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2366 win_T *wp, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2367 int c1, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2368 int c2, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2369 int off, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2370 int width, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2371 int row, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2372 int endrow, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2373 int attr) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2374 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2375 int nn = off + width; |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2376 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2377 if (nn > wp->w_width) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2378 nn = wp->w_width; |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2379 #ifdef FEAT_RIGHTLEFT |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2380 if (wp->w_p_rl) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2381 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2382 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2383 W_ENDCOL(wp) - nn, (int)W_ENDCOL(wp) - off, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2384 c1, c2, attr); |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2385 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2386 else |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2387 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2388 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2389 wp->w_wincol + off, (int)wp->w_wincol + nn, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2390 c1, c2, attr); |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2391 return nn; |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2392 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2393 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2394 /* |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2395 * Clear lines near the end the window and mark the unused lines with "c1". |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2396 * use "c2" as the filler character. |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2397 * When "draw_margin" is TRUE then draw the sign, fold and number columns. |
| 7 | 2398 */ |
| 2399 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2400 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2401 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2402 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2403 int c2, |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2404 int draw_margin, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2405 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2406 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2407 hlf_T hl) |
| 7 | 2408 { |
| 2409 int n = 0; | |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2410 int attr = HL_ATTR(hl); |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
2411 int wcr_attr = get_wcr_attr(wp); |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
2412 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
2413 attr = hl_combine_attr(wcr_attr, attr); |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2414 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2415 if (draw_margin) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2416 { |
| 6553 | 2417 #ifdef FEAT_FOLDING |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2418 int fdc = compute_foldcolumn(wp, 0); |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2419 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2420 if (fdc > 0) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2421 // draw the fold column |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2422 n = screen_fill_end(wp, ' ', ' ', n, fdc, |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2423 row, endrow, hl_combine_attr(wcr_attr, HL_ATTR(HLF_FC))); |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2424 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2425 #ifdef FEAT_SIGNS |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2426 if (signcolumn_on(wp)) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2427 // draw the sign column |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2428 n = screen_fill_end(wp, ' ', ' ', n, 2, |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2429 row, endrow, hl_combine_attr(wcr_attr, HL_ATTR(HLF_SC))); |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2430 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2431 if ((wp->w_p_nu || wp->w_p_rnu) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2432 && vim_strchr(p_cpo, CPO_NUMCOL) == NULL) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2433 // draw the number column |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2434 n = screen_fill_end(wp, ' ', ' ', n, number_width(wp) + 1, |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2435 row, endrow, hl_combine_attr(wcr_attr, HL_ATTR(HLF_N))); |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2436 } |
| 7 | 2437 |
| 2438 #ifdef FEAT_RIGHTLEFT | |
| 2439 if (wp->w_p_rl) | |
| 2440 { | |
| 2441 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2442 wp->w_wincol, W_ENDCOL(wp) - 1 - n, |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2443 c2, c2, attr); |
| 7 | 2444 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2445 W_ENDCOL(wp) - 1 - n, W_ENDCOL(wp) - n, |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2446 c1, c2, attr); |
| 7 | 2447 } |
| 2448 else | |
| 2449 #endif | |
| 2450 { | |
| 2451 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2452 wp->w_wincol + n, (int)W_ENDCOL(wp), |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2453 c1, c2, attr); |
| 7 | 2454 } |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2455 |
| 7 | 2456 set_empty_rows(wp, row); |
| 2457 } | |
| 2458 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2459 #ifdef FEAT_SYN_HL |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2460 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2461 * Advance **color_cols and return TRUE when there are columns to draw. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2462 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2463 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2464 advance_color_col(int vcol, int **color_cols) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2465 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2466 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2467 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2468 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2469 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2470 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2471 |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2472 #if defined(FEAT_MENU) || defined(FEAT_FOLDING) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2473 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2474 * Copy "text" to ScreenLines using "attr". |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2475 * Returns the next screen column. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2476 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2477 static int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2478 text_to_screenline(win_T *wp, char_u *text, int col) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2479 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2480 int off = (int)(current_ScreenLine - ScreenLines); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2481 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2482 if (has_mbyte) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2483 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2484 int cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2485 int u8c, u8cc[MAX_MCO]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2486 int i; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2487 int idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2488 int c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2489 char_u *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2490 # ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2491 int prev_c = 0; /* previous Arabic character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2492 int prev_c1 = 0; /* first composing char for prev_c */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2493 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2494 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2495 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2496 if (wp->w_p_rl) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2497 idx = off; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2498 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2499 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2500 idx = off + col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2501 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2502 /* Store multibyte characters in ScreenLines[] et al. correctly. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2503 for (p = text; *p != NUL; ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2504 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2505 cells = (*mb_ptr2cells)(p); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2506 c_len = (*mb_ptr2len)(p); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2507 if (col + cells > wp->w_width |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2508 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2509 - (wp->w_p_rl ? col : 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2510 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2511 ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2512 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2513 ScreenLines[idx] = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2514 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2515 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2516 u8c = utfc_ptr2char(p, u8cc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2517 if (*p < 0x80 && u8cc[0] == 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2518 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2519 ScreenLinesUC[idx] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2520 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2521 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2522 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2523 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2524 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2525 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2526 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2527 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2528 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2529 /* Do Arabic shaping. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2530 int pc, pc1, nc; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2531 int pcc[MAX_MCO]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2532 int firstbyte = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2533 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2534 /* The idea of what is the previous and next |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2535 * character depends on 'rightleft'. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2536 if (wp->w_p_rl) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2537 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2538 pc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2539 pc1 = prev_c1; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2540 nc = utf_ptr2char(p + c_len); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2541 prev_c1 = u8cc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2542 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2543 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2544 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2545 pc = utfc_ptr2char(p + c_len, pcc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2546 nc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2547 pc1 = pcc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2548 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2549 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2550 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2551 u8c = arabic_shape(u8c, &firstbyte, &u8cc[0], |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2552 pc, pc1, nc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2553 ScreenLines[idx] = firstbyte; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2554 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2555 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2556 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2557 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2558 /* Non-BMP character: display as ? or fullwidth ?. */ |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
2559 ScreenLinesUC[idx] = u8c; |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2560 for (i = 0; i < Screen_mco; ++i) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2561 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2562 ScreenLinesC[i][idx] = u8cc[i]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2563 if (u8cc[i] == 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2564 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2565 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2566 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2567 if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2568 ScreenLines[idx + 1] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2569 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2570 else if (enc_dbcs == DBCS_JPNU && *p == 0x8e) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2571 /* double-byte single width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2572 ScreenLines2[idx] = p[1]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2573 else if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2574 /* double-width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2575 ScreenLines[idx + 1] = p[1]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2576 col += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2577 idx += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2578 p += c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2579 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2580 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2581 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2582 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2583 int len = (int)STRLEN(text); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2584 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2585 if (len > wp->w_width - col) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2586 len = wp->w_width - col; |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2587 if (len > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2588 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2589 #ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2590 if (wp->w_p_rl) |
|
15939
8013b532a1f7
patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
2591 mch_memmove(current_ScreenLine, text, len); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2592 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2593 #endif |
|
15939
8013b532a1f7
patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
2594 mch_memmove(current_ScreenLine + col, text, len); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2595 col += len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2596 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2597 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2598 return col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2599 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2600 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2601 |
| 7 | 2602 #ifdef FEAT_FOLDING |
| 2603 /* | |
| 6553 | 2604 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2605 * space is available for window "wp", minus "col". | |
| 2606 */ | |
| 2607 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2608 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2609 { |
| 2610 int fdc = wp->w_p_fdc; | |
| 2611 int wmw = wp == curwin && p_wmw == 0 ? 1 : p_wmw; | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2612 int wwidth = wp->w_width; |
| 6553 | 2613 |
| 2614 if (fdc > wwidth - (col + wmw)) | |
| 2615 fdc = wwidth - (col + wmw); | |
| 2616 return fdc; | |
| 2617 } | |
| 2618 | |
| 2619 /* | |
| 7 | 2620 * Display one folded line. |
| 2621 */ | |
| 2622 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2623 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2624 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2625 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2626 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2627 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2628 int row) |
| 7 | 2629 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2630 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2631 pos_T *top, *bot; |
| 2632 linenr_T lnume = lnum + fold_count - 1; | |
| 2633 int len; | |
| 29 | 2634 char_u *text; |
| 7 | 2635 int fdc; |
| 2636 int col; | |
| 2637 int txtcol; | |
| 2638 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2639 int ri; |
| 7 | 2640 |
| 2641 /* Build the fold line: | |
| 2642 * 1. Add the cmdwin_type for the command-line window | |
| 2643 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2644 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2645 * 4. Compose the text |
| 2646 * 5. Add the text | |
| 2647 * 6. set highlighting for the Visual area an other text | |
| 2648 */ | |
| 2649 col = 0; | |
| 2650 | |
| 2651 /* | |
| 2652 * 1. Add the cmdwin_type for the command-line window | |
| 2653 * Ignores 'rightleft', this window is never right-left. | |
| 2654 */ | |
| 2655 #ifdef FEAT_CMDWIN | |
| 2656 if (cmdwin_type != 0 && wp == curwin) | |
| 2657 { | |
| 2658 ScreenLines[off] = cmdwin_type; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2659 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2660 if (enc_utf8) |
| 2661 ScreenLinesUC[off] = 0; | |
| 2662 ++col; | |
| 2663 } | |
| 2664 #endif | |
| 2665 | |
| 2666 /* | |
| 2667 * 2. Add the 'foldcolumn' | |
| 6553 | 2668 * Reduce the width when there is not enough space. |
| 7 | 2669 */ |
| 6553 | 2670 fdc = compute_foldcolumn(wp, col); |
| 7 | 2671 if (fdc > 0) |
| 2672 { | |
| 2673 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2674 #ifdef FEAT_RIGHTLEFT | |
| 2675 if (wp->w_p_rl) | |
| 2676 { | |
| 2677 int i; | |
| 2678 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2679 copy_text_attr(off + wp->w_width - fdc - col, buf, fdc, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2680 HL_ATTR(HLF_FC)); |
| 7 | 2681 /* reverse the fold column */ |
| 2682 for (i = 0; i < fdc; ++i) | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2683 ScreenLines[off + wp->w_width - i - 1 - col] = buf[i]; |
| 7 | 2684 } |
| 2685 else | |
| 2686 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2687 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2688 col += fdc; |
| 2689 } | |
| 2690 | |
| 2691 #ifdef FEAT_RIGHTLEFT | |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2692 # define RL_MEMSET(p, v, l) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2693 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2694 if (wp->w_p_rl) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2695 for (ri = 0; ri < l; ++ri) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2696 ScreenAttrs[off + (wp->w_width - (p) - (l)) + ri] = v; \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2697 else \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2698 for (ri = 0; ri < l; ++ri) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2699 ScreenAttrs[off + (p) + ri] = v; \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2700 } while (0) |
| 7 | 2701 #else |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2702 # define RL_MEMSET(p, v, l) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2703 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2704 for (ri = 0; ri < l; ++ri) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2705 ScreenAttrs[off + (p) + ri] = v; \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2706 } while (0) |
| 7 | 2707 #endif |
| 2708 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2709 /* Set all attributes of the 'number' or 'relativenumber' column and the |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2710 * text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2711 RL_MEMSET(col, HL_ATTR(HLF_FL), wp->w_width - col); |
| 7 | 2712 |
| 2713 #ifdef FEAT_SIGNS | |
| 2714 /* If signs are being displayed, add two spaces. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2715 if (signcolumn_on(wp)) |
| 7 | 2716 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2717 len = wp->w_width - col; |
| 7 | 2718 if (len > 0) |
| 2719 { | |
| 2720 if (len > 2) | |
| 2721 len = 2; | |
| 2722 # ifdef FEAT_RIGHTLEFT | |
| 2723 if (wp->w_p_rl) | |
| 2724 /* the line number isn't reversed */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2725 copy_text_attr(off + wp->w_width - len - col, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2726 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2727 else |
| 2728 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2729 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2730 col += len; |
| 2731 } | |
| 2732 } | |
| 2733 #endif | |
| 2734 | |
| 2735 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2736 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2737 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2738 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2739 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2740 len = wp->w_width - col; |
| 7 | 2741 if (len > 0) |
| 2742 { | |
| 13 | 2743 int w = number_width(wp); |
| 5905 | 2744 long num; |
| 2745 char *fmt = "%*ld "; | |
| 13 | 2746 |
| 2747 if (len > w + 1) | |
| 2748 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2749 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2750 if (wp->w_p_nu && !wp->w_p_rnu) |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2751 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2752 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2753 else |
| 4065 | 2754 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2755 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2756 num = labs((long)get_cursor_rel_lnum(wp, lnum)); |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2757 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2758 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2759 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2760 * line number */ |
| 4065 | 2761 num = lnum; |
| 2762 fmt = "%-*ld "; | |
| 2763 } | |
| 2764 } | |
| 2765 | |
| 2766 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2767 #ifdef FEAT_RIGHTLEFT |
| 2768 if (wp->w_p_rl) | |
| 2769 /* the line number isn't reversed */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2770 copy_text_attr(off + wp->w_width - len - col, buf, len, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2771 HL_ATTR(HLF_FL)); |
| 7 | 2772 else |
| 2773 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2774 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2775 col += len; |
| 2776 } | |
| 2777 } | |
| 2778 | |
| 2779 /* | |
| 2780 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2781 */ | |
| 29 | 2782 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2783 |
| 2784 txtcol = col; /* remember where text starts */ | |
| 2785 | |
| 2786 /* | |
| 2787 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2788 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2789 * in columns number-col - window-width. | |
| 2790 */ | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2791 col = text_to_screenline(wp, text, col); |
| 7 | 2792 |
| 2793 /* Fill the rest of the line with the fold filler */ | |
| 2794 #ifdef FEAT_RIGHTLEFT | |
| 2795 if (wp->w_p_rl) | |
| 2796 col -= txtcol; | |
| 2797 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2798 while (col < wp->w_width |
| 7 | 2799 #ifdef FEAT_RIGHTLEFT |
| 2800 - (wp->w_p_rl ? txtcol : 0) | |
| 2801 #endif | |
| 2802 ) | |
| 2803 { | |
| 2804 if (enc_utf8) | |
| 2805 { | |
| 2806 if (fill_fold >= 0x80) | |
| 2807 { | |
| 2808 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2809 ScreenLinesC[0][off + col] = 0; |
|
13204
a8a154cafc60
patch 8.0.1476: screen isn't always updated right away
Christian Brabandt <cb@256bit.org>
parents:
13150
diff
changeset
|
2810 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2811 } |
| 2812 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2813 { |
| 7 | 2814 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2815 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2816 } |
|
11265
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2817 col++; |
|
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2818 } |
|
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2819 else |
|
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2820 ScreenLines[off + col++] = fill_fold; |
| 7 | 2821 } |
| 2822 | |
| 2823 if (text != buf) | |
| 2824 vim_free(text); | |
| 2825 | |
| 2826 /* | |
| 2827 * 6. set highlighting for the Visual area an other text. | |
| 2828 * If all folded lines are in the Visual area, highlight the line. | |
| 2829 */ | |
| 2830 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2831 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2832 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2833 { |
| 2834 /* Visual is after curwin->w_cursor */ | |
| 2835 top = &curwin->w_cursor; | |
| 2836 bot = &VIsual; | |
| 2837 } | |
| 2838 else | |
| 2839 { | |
| 2840 /* Visual is before curwin->w_cursor */ | |
| 2841 top = &VIsual; | |
| 2842 bot = &curwin->w_cursor; | |
| 2843 } | |
| 2844 if (lnum >= top->lnum | |
| 2845 && lnume <= bot->lnum | |
| 2846 && (VIsual_mode != 'v' | |
| 2847 || ((lnum > top->lnum | |
| 2848 || (lnum == top->lnum | |
| 2849 && top->col == 0)) | |
| 2850 && (lnume < bot->lnum | |
| 2851 || (lnume == bot->lnum | |
| 2852 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2853 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2854 { |
| 2855 if (VIsual_mode == Ctrl_V) | |
| 2856 { | |
| 2857 /* Visual block mode: highlight the chars part of the block */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2858 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)wp->w_width) |
| 7 | 2859 { |
| 3040 | 2860 if (wp->w_old_cursor_lcol != MAXCOL |
| 2861 && wp->w_old_cursor_lcol + txtcol | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2862 < (colnr_T)wp->w_width) |
| 7 | 2863 len = wp->w_old_cursor_lcol; |
| 2864 else | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2865 len = wp->w_width - txtcol; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2866 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2867 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2868 } |
| 2869 } | |
| 2870 else | |
| 216 | 2871 { |
| 7 | 2872 /* Set all attributes of the text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2873 RL_MEMSET(txtcol, HL_ATTR(HLF_V), wp->w_width - txtcol); |
| 216 | 2874 } |
| 7 | 2875 } |
| 2876 } | |
| 2877 | |
| 743 | 2878 #ifdef FEAT_SYN_HL |
| 6685 | 2879 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2880 if (wp->w_p_cc_cols) | |
| 2881 { | |
| 2882 int i = 0; | |
| 2883 int j = wp->w_p_cc_cols[i]; | |
| 2884 int old_txtcol = txtcol; | |
| 2885 | |
| 2886 while (j > -1) | |
| 2887 { | |
| 2888 txtcol += j; | |
| 2889 if (wp->w_p_wrap) | |
| 2890 txtcol -= wp->w_skipcol; | |
| 2891 else | |
| 2892 txtcol -= wp->w_leftcol; | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2893 if (txtcol >= 0 && txtcol < wp->w_width) |
| 6685 | 2894 ScreenAttrs[off + txtcol] = hl_combine_attr( |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2895 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2896 txtcol = old_txtcol; |
| 2897 j = wp->w_p_cc_cols[++i]; | |
| 2898 } | |
| 2899 } | |
| 2900 | |
| 743 | 2901 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2902 if (wp->w_p_cuc) |
| 2903 { | |
| 2904 txtcol += wp->w_virtcol; | |
| 2905 if (wp->w_p_wrap) | |
| 2906 txtcol -= wp->w_skipcol; | |
| 2907 else | |
| 2908 txtcol -= wp->w_leftcol; | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2909 if (txtcol >= 0 && txtcol < wp->w_width) |
| 1725 | 2910 ScreenAttrs[off + txtcol] = hl_combine_attr( |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2911 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2912 } |
| 743 | 2913 #endif |
| 7 | 2914 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2915 screen_line(row + W_WINROW(wp), wp->w_wincol, (int)wp->w_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
2916 (int)wp->w_width, 0); |
| 7 | 2917 |
| 2918 /* | |
| 2919 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2920 * updated (saves a call to plines() later). | |
| 2921 */ | |
| 2922 if (wp == curwin | |
| 2923 && lnum <= curwin->w_cursor.lnum | |
| 2924 && lnume >= curwin->w_cursor.lnum) | |
| 2925 { | |
| 2926 curwin->w_cline_row = row; | |
| 2927 curwin->w_cline_height = 1; | |
| 2928 curwin->w_cline_folded = TRUE; | |
| 2929 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2930 } | |
| 2931 } | |
| 2932 | |
| 2933 /* | |
| 2934 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2935 */ | |
| 2936 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2937 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2938 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2939 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2940 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2941 int attr) |
| 7 | 2942 { |
| 216 | 2943 int i; |
| 2944 | |
| 7 | 2945 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2946 if (enc_utf8) | |
| 2947 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 216 | 2948 for (i = 0; i < len; ++i) |
| 2949 ScreenAttrs[off + i] = attr; | |
| 7 | 2950 } |
| 2951 | |
| 2952 /* | |
| 2953 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2954 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2955 */ |
| 2956 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2957 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2958 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2959 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2960 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2961 linenr_T lnum) /* current line number */ |
| 7 | 2962 { |
| 2963 int i = 0; | |
| 2964 int level; | |
| 2965 int first_level; | |
| 519 | 2966 int empty; |
| 6553 | 2967 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2968 |
| 2969 /* Init to all spaces. */ | |
| 6929 | 2970 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2971 |
| 2972 level = win_foldinfo.fi_level; | |
| 2973 if (level > 0) | |
| 2974 { | |
| 519 | 2975 /* If there is only one column put more info in it. */ |
| 6553 | 2976 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2977 |
| 7 | 2978 /* If the column is too narrow, we start at the lowest level that |
| 2979 * fits and use numbers to indicated the depth. */ | |
| 6553 | 2980 first_level = level - fdc - closed + 1 + empty; |
| 7 | 2981 if (first_level < 1) |
| 2982 first_level = 1; | |
| 2983 | |
| 6553 | 2984 for (i = 0; i + empty < fdc; ++i) |
| 7 | 2985 { |
| 2986 if (win_foldinfo.fi_lnum == lnum | |
| 2987 && first_level + i >= win_foldinfo.fi_low_level) | |
| 2988 p[i] = '-'; | |
| 2989 else if (first_level == 1) | |
| 2990 p[i] = '|'; | |
| 2991 else if (first_level + i <= 9) | |
| 2992 p[i] = '0' + first_level + i; | |
| 2993 else | |
| 2994 p[i] = '>'; | |
| 2995 if (first_level + i == level) | |
| 2996 break; | |
| 2997 } | |
| 2998 } | |
| 2999 if (closed) | |
| 6553 | 3000 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 3001 } |
| 3002 #endif /* FEAT_FOLDING */ | |
| 3003 | |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3004 #ifdef FEAT_TEXT_PROP |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3005 static textprop_T *current_text_props = NULL; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3006 static buf_T *current_buf = NULL; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3007 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3008 static int |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3009 text_prop_compare(const void *s1, const void *s2) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3010 { |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3011 int idx1, idx2; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3012 proptype_T *pt1, *pt2; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3013 colnr_T col1, col2; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3014 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3015 idx1 = *(int *)s1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3016 idx2 = *(int *)s2; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3017 pt1 = text_prop_type_by_id(current_buf, current_text_props[idx1].tp_type); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3018 pt2 = text_prop_type_by_id(current_buf, current_text_props[idx2].tp_type); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3019 if (pt1 == pt2) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3020 return 0; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3021 if (pt1 == NULL) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3022 return -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3023 if (pt2 == NULL) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3024 return 1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3025 if (pt1->pt_priority != pt2->pt_priority) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3026 return pt1->pt_priority > pt2->pt_priority ? 1 : -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3027 col1 = current_text_props[idx1].tp_col; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3028 col2 = current_text_props[idx2].tp_col; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3029 return col1 == col2 ? 0 : col1 > col2 ? 1 : -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3030 } |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3031 #endif |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3032 |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3033 #ifdef FEAT_SIGNS |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3034 /* |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3035 * Get information needed to display the sign in line 'lnum' in window 'wp'. |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3036 * If 'nrcol' is TRUE, the sign is going to be displayed in the number column. |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3037 * Otherwise the sign is going to be displayed in the sign column. |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3038 */ |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3039 static void |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3040 get_sign_display_info( |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3041 int nrcol, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3042 win_T *wp, |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3043 linenr_T lnum UNUSED, |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3044 sign_attrs_T *sattr, |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3045 int wcr_attr, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3046 int row, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3047 int startrow, |
|
17139
03fbad5d6279
patch 8.1.1569: cannot build with signs but without diff feature
Bram Moolenaar <Bram@vim.org>
parents:
17129
diff
changeset
|
3048 int filler_lines UNUSED, |
|
03fbad5d6279
patch 8.1.1569: cannot build with signs but without diff feature
Bram Moolenaar <Bram@vim.org>
parents:
17129
diff
changeset
|
3049 int filler_todo UNUSED, |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3050 int *c_extrap, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3051 int *c_finalp, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3052 char_u *extra, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3053 char_u **pp_extra, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3054 int *n_extrap, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3055 int *char_attrp) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3056 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3057 int text_sign; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3058 # ifdef FEAT_SIGN_ICONS |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3059 int icon_sign; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3060 # endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3061 |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3062 // Draw two cells with the sign value or blank. |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3063 *c_extrap = ' '; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3064 *c_finalp = NUL; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3065 if (nrcol) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3066 *n_extrap = number_width(wp) + 1; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3067 else |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3068 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3069 *char_attrp = hl_combine_attr(wcr_attr, HL_ATTR(HLF_SC)); |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3070 *n_extrap = 2; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3071 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3072 |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3073 if (row == startrow |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3074 #ifdef FEAT_DIFF |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3075 + filler_lines && filler_todo <= 0 |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3076 #endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3077 ) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3078 { |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3079 text_sign = (sattr->text != NULL) ? sattr->typenr : 0; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3080 # ifdef FEAT_SIGN_ICONS |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3081 icon_sign = (sattr->icon != NULL) ? sattr->typenr : 0; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3082 if (gui.in_use && icon_sign != 0) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3083 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3084 // Use the image in this position. |
|
17141
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3085 if (nrcol) |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3086 { |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3087 *c_extrap = NUL; |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3088 sprintf((char *)extra, "%-*c ", number_width(wp), SIGN_BYTE); |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3089 *pp_extra = extra; |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3090 *n_extrap = (int)STRLEN(*pp_extra); |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3091 } |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3092 else |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3093 *c_extrap = SIGN_BYTE; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3094 # ifdef FEAT_NETBEANS_INTG |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3095 if (netbeans_active() && (buf_signcount(wp->w_buffer, lnum) > 1)) |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3096 { |
|
17141
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3097 if (nrcol) |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3098 { |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3099 *c_extrap = NUL; |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3100 sprintf((char *)extra, "%-*c ", number_width(wp), |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3101 MULTISIGN_BYTE); |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3102 *pp_extra = extra; |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3103 *n_extrap = (int)STRLEN(*pp_extra); |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3104 } |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3105 else |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3106 *c_extrap = MULTISIGN_BYTE; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3107 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3108 # endif |
|
17141
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3109 *c_finalp = NUL; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3110 *char_attrp = icon_sign; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3111 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3112 else |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3113 # endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3114 if (text_sign != 0) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3115 { |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3116 *pp_extra = sattr->text; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3117 if (*pp_extra != NULL) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3118 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3119 if (nrcol) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3120 { |
|
17427
45c1dc353321
patch 8.1.1712: signs in number column cause text to be misaligned
Bram Moolenaar <Bram@vim.org>
parents:
17286
diff
changeset
|
3121 int n, width = number_width(wp) - 2; |
|
45c1dc353321
patch 8.1.1712: signs in number column cause text to be misaligned
Bram Moolenaar <Bram@vim.org>
parents:
17286
diff
changeset
|
3122 |
|
45c1dc353321
patch 8.1.1712: signs in number column cause text to be misaligned
Bram Moolenaar <Bram@vim.org>
parents:
17286
diff
changeset
|
3123 for (n = 0; n < width; n++) |
|
45c1dc353321
patch 8.1.1712: signs in number column cause text to be misaligned
Bram Moolenaar <Bram@vim.org>
parents:
17286
diff
changeset
|
3124 extra[n] = ' '; |
|
45c1dc353321
patch 8.1.1712: signs in number column cause text to be misaligned
Bram Moolenaar <Bram@vim.org>
parents:
17286
diff
changeset
|
3125 extra[n] = 0; |
|
45c1dc353321
patch 8.1.1712: signs in number column cause text to be misaligned
Bram Moolenaar <Bram@vim.org>
parents:
17286
diff
changeset
|
3126 STRCAT(extra, *pp_extra); |
|
45c1dc353321
patch 8.1.1712: signs in number column cause text to be misaligned
Bram Moolenaar <Bram@vim.org>
parents:
17286
diff
changeset
|
3127 STRCAT(extra, " "); |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3128 *pp_extra = extra; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3129 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3130 *c_extrap = NUL; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3131 *c_finalp = NUL; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3132 *n_extrap = (int)STRLEN(*pp_extra); |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3133 } |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3134 *char_attrp = sattr->texthl; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3135 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3136 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3137 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3138 #endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3139 |
| 7 | 3140 /* |
| 3141 * Display line "lnum" of window 'wp' on the screen. | |
| 3142 * Start at row "startrow", stop when "endrow" is reached. | |
| 3143 * wp->w_virtcol needs to be valid. | |
| 3144 * | |
| 3145 * Return the number of last row the line occupies. | |
| 3146 */ | |
| 3147 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3148 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3149 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3150 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3151 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3152 int endrow, |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3153 int nochange UNUSED, // not updating for changed text |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3154 int number_only) // only update the number column |
| 7 | 3155 { |
|
17229
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3156 int col = 0; // visual column on screen |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3157 unsigned off; // offset in ScreenLines/ScreenAttrs |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3158 int c = 0; // init for GCC |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3159 long vcol = 0; // virtual column (for tabs) |
| 6503 | 3160 #ifdef FEAT_LINEBREAK |
|
17229
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3161 long vcol_sbr = -1; // virtual column after showbreak |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3162 #endif |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3163 long vcol_prev = -1; // "vcol" of previous character |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3164 char_u *line; // current line |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3165 char_u *ptr; // current position in "line" |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3166 int row; // row in the window, excl w_winrow |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3167 int screen_row; // row on the screen, incl w_winrow |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3168 |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3169 char_u extra[21]; // "%ld " and 'fdc' must fit in here |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3170 int n_extra = 0; // number of extra chars |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3171 char_u *p_extra = NULL; // string of extra chars, plus NUL |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3172 char_u *p_extra_free = NULL; // p_extra needs to be freed |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3173 int c_extra = NUL; // extra chars, all the same |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3174 int c_final = NUL; // final char, mandatory if set |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3175 int extra_attr = 0; // attributes when n_extra != 0 |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3176 static char_u *at_end_str = (char_u *)""; // used for p_extra when |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3177 // displaying lcs_eol at end-of-line |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3178 int lcs_eol_one = lcs_eol; // lcs_eol until it's been used |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3179 int lcs_prec_todo = lcs_prec; // lcs_prec until it's been used |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3180 |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3181 // saved "extra" items for when draw_state becomes WL_LINE (again) |
| 7 | 3182 int saved_n_extra = 0; |
| 3183 char_u *saved_p_extra = NULL; | |
| 3184 int saved_c_extra = 0; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3185 int saved_c_final = 0; |
| 7 | 3186 int saved_char_attr = 0; |
| 3187 | |
| 3188 int n_attr = 0; /* chars with special attr */ | |
| 3189 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3190 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3191 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3192 | |
| 3193 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3194 | |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3195 int fromcol = -10; // start of inverting |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3196 int tocol = MAXCOL; // end of inverting |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3197 int fromcol_prev = -2; // start of inverting after cursor |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3198 int noinvcur = FALSE; // don't invert the cursor |
| 7 | 3199 pos_T *top, *bot; |
| 1813 | 3200 int lnum_in_visual_area = FALSE; |
| 7 | 3201 pos_T pos; |
| 3202 long v; | |
| 3203 | |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3204 int char_attr = 0; // attributes for next character |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3205 int attr_pri = FALSE; // char_attr has priority |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3206 int area_highlighting = FALSE; // Visual or incsearch highlighting |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3207 // in this line |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3208 int vi_attr = 0; // attributes for Visual and incsearch |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3209 // highlighting |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3210 int wcr_attr = 0; // attributes from 'wincolor' |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3211 int win_attr = 0; // background for whole window, except |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3212 // margins and "~" lines. |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3213 int area_attr = 0; // attributes desired by highlighting |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3214 int search_attr = 0; // attributes desired by 'hlsearch' |
| 7 | 3215 #ifdef FEAT_SYN_HL |
| 743 | 3216 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3217 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3218 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3219 int save_did_emsg; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3220 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3221 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3222 #endif |
|
17438
967e2ee9b656
patch 8.1.1717: last char in menu popup window highlighted
Bram Moolenaar <Bram@vim.org>
parents:
17427
diff
changeset
|
3223 int eol_hl_off = 0; /* 1 if highlighted char after EOL */ |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3224 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3225 int text_prop_count; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3226 int text_prop_next = 0; // next text property to use |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3227 textprop_T *text_props = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3228 int *text_prop_idxs = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3229 int text_props_active = 0; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3230 proptype_T *text_prop_type = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3231 int text_prop_attr = 0; |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
3232 int text_prop_combine = FALSE; |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3233 #endif |
| 743 | 3234 #ifdef FEAT_SPELL |
| 221 | 3235 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3236 # define SPWORDLEN 150 |
| 3237 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3238 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3239 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3240 starts */ |
| 221 | 3241 int spell_attr = 0; /* attributes desired by spelling */ |
| 3242 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3243 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3244 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3245 * there are no spell errors */ |
| 386 | 3246 static int cap_col = -1; /* column to check for Cap word */ |
| 3247 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3248 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3249 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3250 int extra_check = 0; // has extra highlighting |
| 7 | 3251 int multi_attr = 0; /* attributes desired by multibyte */ |
| 3252 int mb_l = 1; /* multi-byte byte length */ | |
| 3253 int mb_c = 0; /* decoded multi-byte character */ | |
| 3254 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3255 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
|
17145
26941c50baf3
patch 8.1.1572: compiler warnings with tiny build
Bram Moolenaar <Bram@vim.org>
parents:
17143
diff
changeset
|
3256 #if defined(FEAT_DIFF) || defined(FEAT_SIGNS) |
|
17139
03fbad5d6279
patch 8.1.1569: cannot build with signs but without diff feature
Bram Moolenaar <Bram@vim.org>
parents:
17129
diff
changeset
|
3257 int filler_lines = 0; /* nr of filler lines to be drawn */ |
|
03fbad5d6279
patch 8.1.1569: cannot build with signs but without diff feature
Bram Moolenaar <Bram@vim.org>
parents:
17129
diff
changeset
|
3258 int filler_todo = 0; /* nr of filler lines still to do + 1 */ |
|
17145
26941c50baf3
patch 8.1.1572: compiler warnings with tiny build
Bram Moolenaar <Bram@vim.org>
parents:
17143
diff
changeset
|
3259 #endif |
| 7 | 3260 #ifdef FEAT_DIFF |
| 534 | 3261 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3262 int change_start = MAXCOL; /* first col of changed area */ |
| 3263 int change_end = -1; /* last col of changed area */ | |
| 3264 #endif | |
| 3265 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3266 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3267 int need_showbreak = FALSE; /* overlong line, skipping first x |
|
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3268 chars */ |
| 7 | 3269 #endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3270 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
| 910 | 3271 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) |
|
17272
2342d5e500ec
patch 8.1.1635: warnings for unused variables in small version
Bram Moolenaar <Bram@vim.org>
parents:
17264
diff
changeset
|
3272 # define LINE_ATTR |
|
2342d5e500ec
patch 8.1.1635: warnings for unused variables in small version
Bram Moolenaar <Bram@vim.org>
parents:
17264
diff
changeset
|
3273 int line_attr = 0; /* attribute for the whole line */ |
|
2342d5e500ec
patch 8.1.1635: warnings for unused variables in small version
Bram Moolenaar <Bram@vim.org>
parents:
17264
diff
changeset
|
3274 #endif |
|
2342d5e500ec
patch 8.1.1635: warnings for unused variables in small version
Bram Moolenaar <Bram@vim.org>
parents:
17264
diff
changeset
|
3275 #ifdef FEAT_SIGNS |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3276 int sign_present = FALSE; |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3277 sign_attrs_T sattr; |
| 7 | 3278 #endif |
| 3279 #ifdef FEAT_ARABIC | |
| 3280 int prev_c = 0; /* previous Arabic character */ | |
| 3281 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3282 #endif | |
| 910 | 3283 #if defined(LINE_ATTR) |
| 867 | 3284 int did_line_attr = 0; |
| 3285 #endif | |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3286 #ifdef FEAT_TERMINAL |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3287 int get_term_attr = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3288 #endif |
| 7 | 3289 |
| 3290 /* draw_state: items that are drawn in sequence: */ | |
| 3291 #define WL_START 0 /* nothing done yet */ | |
| 3292 #ifdef FEAT_CMDWIN | |
| 3293 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3294 #else | |
| 3295 # define WL_CMDLINE WL_START | |
| 3296 #endif | |
| 3297 #ifdef FEAT_FOLDING | |
| 3298 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3299 #else | |
| 3300 # define WL_FOLD WL_CMDLINE | |
| 3301 #endif | |
| 3302 #ifdef FEAT_SIGNS | |
| 3303 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3304 #else | |
| 3305 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3306 #endif | |
| 3307 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3308 #ifdef FEAT_LINEBREAK |
| 3309 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3310 #else | |
| 3311 # define WL_BRI WL_NR | |
| 3312 #endif | |
| 7 | 3313 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3314 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3315 #else |
| 5995 | 3316 # define WL_SBR WL_BRI |
| 7 | 3317 #endif |
| 3318 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3319 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3320 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3321 int feedback_col = 0; |
| 3322 int feedback_old_attr = -1; | |
| 3323 #endif | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3324 int screen_line_flags = 0; |
| 7 | 3325 |
|
17498
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
3326 #if defined(FEAT_CONCEAL) || defined(FEAT_SEARCH_EXTRA) |
|
17492
523591cf1b70
patch 8.1.1744: build error without the conceal feature
Bram Moolenaar <Bram@vim.org>
parents:
17490
diff
changeset
|
3327 int match_conc = 0; // cchar for match functions |
|
17498
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
3328 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3329 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3330 int syntax_flags = 0; |
|
2392
0371401d9d33
Give each syntax item a sequence number, so that we know when it starts and
Bram Moolenaar <bram@vim.org>
parents:
2382
diff
changeset
|
3331 int syntax_seqnr = 0; |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
3332 int prev_syntax_id = 0; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3333 int conceal_attr = HL_ATTR(HLF_CONCEAL); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3334 int is_concealing = FALSE; |
|
17492
523591cf1b70
patch 8.1.1744: build error without the conceal feature
Bram Moolenaar <Bram@vim.org>
parents:
17490
diff
changeset
|
3335 int boguscols = 0; // nonexistent columns added to force |
|
523591cf1b70
patch 8.1.1744: build error without the conceal feature
Bram Moolenaar <Bram@vim.org>
parents:
17490
diff
changeset
|
3336 // wrapping |
|
523591cf1b70
patch 8.1.1744: build error without the conceal feature
Bram Moolenaar <Bram@vim.org>
parents:
17490
diff
changeset
|
3337 int vcol_off = 0; // offset for concealed characters |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
3338 int did_wcol = FALSE; |
| 6520 | 3339 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3340 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3341 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3342 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3343 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3344 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3345 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3346 col -= boguscols; \ |
| 6520 | 3347 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3348 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3349 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3350 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3351 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3352 #endif |
| 7 | 3353 |
| 3354 if (startrow > endrow) /* past the end already! */ | |
| 3355 return startrow; | |
| 3356 | |
| 3357 row = startrow; | |
| 3358 screen_row = row + W_WINROW(wp); | |
| 3359 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3360 if (!number_only) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3361 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3362 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3363 * To speed up the loop below, set extra_check when there is linebreak, |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3364 * trailing white space and/or syntax processing to be done. |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3365 */ |
| 7 | 3366 #ifdef FEAT_LINEBREAK |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3367 extra_check = wp->w_p_lbr; |
| 7 | 3368 #endif |
| 3369 #ifdef FEAT_SYN_HL | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3370 if (syntax_present(wp) && !wp->w_s->b_syn_error |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3371 # ifdef SYN_TIME_LIMIT |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3372 && !wp->w_s->b_syn_slow |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3373 # endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3374 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3375 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3376 /* Prepare for syntax highlighting in this line. When there is an |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3377 * error, stop syntax highlighting. */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3378 save_did_emsg = did_emsg; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3379 did_emsg = FALSE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3380 syntax_start(wp, lnum); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3381 if (did_emsg) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3382 wp->w_s->b_syn_error = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3383 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3384 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3385 did_emsg = save_did_emsg; |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3386 #ifdef SYN_TIME_LIMIT |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3387 if (!wp->w_s->b_syn_slow) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3388 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3389 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3390 has_syntax = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3391 extra_check = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3392 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3393 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3394 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3395 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3396 /* Check for columns to display for 'colorcolumn'. */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3397 color_cols = wp->w_p_cc_cols; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3398 if (color_cols != NULL) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3399 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3400 #endif |
| 3401 | |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3402 #ifdef FEAT_TERMINAL |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3403 if (term_show_buffer(wp->w_buffer)) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3404 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3405 extra_check = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3406 get_term_attr = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3407 win_attr = term_get_attr(wp->w_buffer, lnum, -1); |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3408 } |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3409 #endif |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3410 |
| 743 | 3411 #ifdef FEAT_SPELL |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3412 if (wp->w_p_spell |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3413 && *wp->w_s->b_p_spl != NUL |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3414 && wp->w_s->b_langp.ga_len > 0 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3415 && *(char **)(wp->w_s->b_langp.ga_data) != NULL) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3416 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3417 /* Prepare for spell checking. */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3418 has_spell = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3419 extra_check = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3420 |
|
14875
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
3421 /* Get the start of the next line, so that words that wrap to the |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
3422 * next line are found too: "et<line-break>al.". |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3423 * Trick: skip a few chars for C/shell/Vim comments */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3424 nextline[SPWORDLEN] = NUL; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3425 if (lnum < wp->w_buffer->b_ml.ml_line_count) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3426 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3427 line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3428 spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3429 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3430 |
|
14875
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
3431 /* When a word wrapped from the previous line the start of the |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
3432 * current line is valid. */ |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3433 if (lnum == checked_lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3434 cur_checked_col = checked_col; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3435 checked_lnum = 0; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3436 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3437 /* When there was a sentence end in the previous line may require a |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3438 * word starting with capital in this line. In line 1 always check |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3439 * the first word. */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3440 if (lnum != capcol_lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3441 cap_col = -1; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3442 if (lnum == 1) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3443 cap_col = 0; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3444 capcol_lnum = 0; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3445 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3446 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3447 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3448 /* |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3449 * handle Visual active in this window |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3450 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3451 if (VIsual_active && wp->w_buffer == curwin->w_buffer) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3452 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3453 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3454 { |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3455 // Visual is after curwin->w_cursor |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3456 top = &curwin->w_cursor; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3457 bot = &VIsual; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3458 } |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3459 else |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3460 { |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3461 // Visual is before curwin->w_cursor |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3462 top = &VIsual; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3463 bot = &curwin->w_cursor; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3464 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3465 lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum); |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3466 if (VIsual_mode == Ctrl_V) |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3467 { |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3468 // block mode |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3469 if (lnum_in_visual_area) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3470 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3471 fromcol = wp->w_old_cursor_fcol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3472 tocol = wp->w_old_cursor_lcol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3473 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3474 } |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3475 else |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3476 { |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3477 // non-block mode |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3478 if (lnum > top->lnum && lnum <= bot->lnum) |
| 7 | 3479 fromcol = 0; |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3480 else if (lnum == top->lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3481 { |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3482 if (VIsual_mode == 'V') // linewise |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3483 fromcol = 0; |
| 7 | 3484 else |
| 3485 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3486 getvvcol(wp, top, (colnr_T *)&fromcol, NULL, NULL); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3487 if (gchar_pos(top) == NUL) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3488 tocol = fromcol + 1; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3489 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3490 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3491 if (VIsual_mode != 'V' && lnum == bot->lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3492 { |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
3493 if (*p_sel == 'e' && bot->col == 0 && bot->coladd == 0) |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3494 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3495 fromcol = -10; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3496 tocol = MAXCOL; |
| 7 | 3497 } |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3498 else if (bot->col == MAXCOL) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3499 tocol = MAXCOL; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3500 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3501 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3502 pos = *bot; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3503 if (*p_sel == 'e') |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3504 getvvcol(wp, &pos, (colnr_T *)&tocol, NULL, NULL); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3505 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3506 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3507 getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3508 ++tocol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3509 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3510 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3511 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3512 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3513 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3514 /* Check if the character under the cursor should not be inverted */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3515 if (!highlight_match && lnum == curwin->w_cursor.lnum && wp == curwin |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
3516 #ifdef FEAT_GUI |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3517 && !gui.in_use |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3518 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3519 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3520 noinvcur = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3521 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3522 /* if inverting in this line set area_highlighting */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3523 if (fromcol >= 0) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3524 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3525 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3526 vi_attr = HL_ATTR(HLF_V); |
| 7 | 3527 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3528 if ((clip_star.available && !clip_star.owned |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3529 && clip_isautosel_star()) |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3530 || (clip_plus.available && !clip_plus.owned |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3531 && clip_isautosel_plus())) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3532 vi_attr = HL_ATTR(HLF_VNC); |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3533 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3534 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3535 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3536 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3537 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3538 * handle 'incsearch' and ":s///c" highlighting |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3539 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3540 else if (highlight_match |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3541 && wp == curwin |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3542 && lnum >= curwin->w_cursor.lnum |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3543 && lnum <= curwin->w_cursor.lnum + search_match_lines) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3544 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3545 if (lnum == curwin->w_cursor.lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3546 getvcol(curwin, &(curwin->w_cursor), |
|
15939
8013b532a1f7
patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
3547 (colnr_T *)&fromcol, NULL, NULL); |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3548 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3549 fromcol = 0; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3550 if (lnum == curwin->w_cursor.lnum + search_match_lines) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3551 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3552 pos.lnum = lnum; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3553 pos.col = search_match_endcol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3554 getvcol(curwin, &pos, (colnr_T *)&tocol, NULL, NULL); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3555 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3556 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3557 tocol = MAXCOL; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3558 /* do at least one character; happens when past end of line */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3559 if (fromcol == tocol) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3560 tocol = fromcol + 1; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3561 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3562 vi_attr = HL_ATTR(HLF_I); |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3563 } |
| 7 | 3564 } |
| 3565 | |
| 3566 #ifdef FEAT_DIFF | |
| 3567 filler_lines = diff_check(wp, lnum); | |
| 3568 if (filler_lines < 0) | |
| 3569 { | |
| 3570 if (filler_lines == -1) | |
| 3571 { | |
| 3572 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3573 diff_hlf = HLF_ADD; /* added line */ | |
| 3574 else if (change_start == 0) | |
| 3575 diff_hlf = HLF_TXD; /* changed text */ | |
| 3576 else | |
| 3577 diff_hlf = HLF_CHD; /* changed line */ | |
| 3578 } | |
| 3579 else | |
| 3580 diff_hlf = HLF_ADD; /* added line */ | |
| 3581 filler_lines = 0; | |
| 3582 area_highlighting = TRUE; | |
| 3583 } | |
| 3584 if (lnum == wp->w_topline) | |
| 3585 filler_lines = wp->w_topfill; | |
| 3586 filler_todo = filler_lines; | |
| 3587 #endif | |
| 3588 | |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3589 #ifdef FEAT_SIGNS |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3590 sign_present = buf_get_signattrs(wp->w_buffer, lnum, &sattr); |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3591 #endif |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3592 |
| 7 | 3593 #ifdef LINE_ATTR |
| 3594 # ifdef FEAT_SIGNS | |
| 3595 /* If this line has a sign with line highlighting set line_attr. */ | |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3596 if (sign_present) |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3597 line_attr = sattr.linehl; |
| 7 | 3598 # endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3599 # if defined(FEAT_QUICKFIX) |
| 7 | 3600 /* Highlight the current line in the quickfix window. */ |
| 644 | 3601 if (bt_quickfix(wp->w_buffer) && qf_current_entry(wp) == lnum) |
|
11516
80491a71c716
patch 8.0.0641: cannot set a separate highlighting for the quickfix line
Christian Brabandt <cb@256bit.org>
parents:
11420
diff
changeset
|
3602 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3603 # endif |
| 3604 if (line_attr != 0) | |
| 3605 area_highlighting = TRUE; | |
| 3606 #endif | |
| 3607 | |
| 3608 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3609 ptr = line; | |
| 3610 | |
| 743 | 3611 #ifdef FEAT_SPELL |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3612 if (has_spell && !number_only) |
| 348 | 3613 { |
| 386 | 3614 /* For checking first word with a capital skip white space. */ |
| 3615 if (cap_col == 0) | |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
3616 cap_col = getwhitecols(line); |
| 386 | 3617 |
| 348 | 3618 /* To be able to spell-check over line boundaries copy the end of the |
| 3619 * current line into nextline[]. Above the start of the next line was | |
| 3620 * copied to nextline[SPWORDLEN]. */ | |
| 3621 if (nextline[SPWORDLEN] == NUL) | |
| 3622 { | |
| 3623 /* No next line or it is empty. */ | |
| 3624 nextlinecol = MAXCOL; | |
| 3625 nextline_idx = 0; | |
| 3626 } | |
| 3627 else | |
| 3628 { | |
| 835 | 3629 v = (long)STRLEN(line); |
| 348 | 3630 if (v < SPWORDLEN) |
| 3631 { | |
| 3632 /* Short line, use it completely and append the start of the | |
| 3633 * next line. */ | |
| 3634 nextlinecol = 0; | |
| 3635 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3636 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3637 nextline_idx = v + 1; |
| 3638 } | |
| 3639 else | |
| 3640 { | |
| 3641 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3642 nextlinecol = v - SPWORDLEN; | |
| 3643 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3644 nextline_idx = SPWORDLEN + 1; | |
| 3645 } | |
| 3646 } | |
| 3647 } | |
| 3648 #endif | |
| 3649 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3650 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3651 { |
|
15715
52930462eec4
patch 8.1.0865: when 'listchars' only contains "nbsp:X" it does not work
Bram Moolenaar <Bram@vim.org>
parents:
15683
diff
changeset
|
3652 if (lcs_space || lcs_trail || lcs_nbsp) |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3653 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3654 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3655 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3656 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3657 trailcol = (colnr_T)STRLEN(ptr); |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
3658 while (trailcol > (colnr_T)0 && VIM_ISWHITE(ptr[trailcol - 1])) |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3659 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3660 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3661 } |
| 7 | 3662 } |
| 3663 | |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3664 wcr_attr = get_wcr_attr(wp); |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3665 if (wcr_attr != 0) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3666 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3667 win_attr = wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3668 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3669 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3670 #ifdef FEAT_TEXT_PROP |
|
17225
09fa437d33d8
patch 8.1.1612: cannot show an existing buffer in a popup window
Bram Moolenaar <Bram@vim.org>
parents:
17208
diff
changeset
|
3671 if (WIN_IS_POPUP(wp)) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3672 screen_line_flags |= SLF_POPUP; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3673 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3674 |
| 7 | 3675 /* |
| 3676 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3677 * first character to be displayed. | |
| 3678 */ | |
| 3679 if (wp->w_p_wrap) | |
| 3680 v = wp->w_skipcol; | |
| 3681 else | |
| 3682 v = wp->w_leftcol; | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3683 if (v > 0 && !number_only) |
| 7 | 3684 { |
| 3685 char_u *prev_ptr = ptr; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3686 |
| 7 | 3687 while (vcol < v && *ptr != NUL) |
| 3688 { | |
| 5995 | 3689 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3690 vcol += c; |
| 3691 prev_ptr = ptr; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3692 MB_PTR_ADV(ptr); |
| 7 | 3693 } |
| 3694 | |
| 1984 | 3695 /* When: |
| 3696 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3697 * - 'colorcolumn' is set, or |
| 1984 | 3698 * - 'virtualedit' is set, or |
| 3699 * - the visual mode is active, | |
| 3700 * the end of the line may be before the start of the displayed part. | |
| 3701 */ | |
| 3702 if (vcol < v && ( | |
| 5735 | 3703 #ifdef FEAT_SYN_HL |
| 3704 wp->w_p_cuc || draw_color_col || | |
| 3705 #endif | |
| 3706 virtual_active() || | |
| 3707 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 7 | 3708 vcol = v; |
| 3709 | |
| 3710 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3711 * that character but skip the first few screen characters. */ | |
| 3712 if (vcol > v) | |
| 3713 { | |
| 3714 vcol -= c; | |
| 3715 ptr = prev_ptr; | |
|
11010
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3716 /* If the character fits on the screen, don't need to skip it. |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3717 * Except for a TAB. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3718 if (( (*mb_ptr2cells)(ptr) >= c || *ptr == TAB) && col == 0) |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3719 n_skip = v - vcol; |
| 7 | 3720 } |
| 3721 | |
| 3722 /* | |
| 3723 * Adjust for when the inverted text is before the screen, | |
| 3724 * and when the start of the inverted text is before the screen. | |
| 3725 */ | |
| 3726 if (tocol <= vcol) | |
| 3727 fromcol = 0; | |
| 3728 else if (fromcol >= 0 && fromcol < vcol) | |
| 3729 fromcol = vcol; | |
| 3730 | |
| 3731 #ifdef FEAT_LINEBREAK | |
| 3732 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3733 if (wp->w_p_wrap) | |
| 3734 need_showbreak = TRUE; | |
| 3735 #endif | |
| 743 | 3736 #ifdef FEAT_SPELL |
| 499 | 3737 /* When spell checking a word we need to figure out the start of the |
| 3738 * word and if it's badly spelled or not. */ | |
| 3739 if (has_spell) | |
| 3740 { | |
| 3741 int len; | |
| 1536 | 3742 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3743 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3744 |
| 3745 pos = wp->w_cursor; | |
| 3746 wp->w_cursor.lnum = lnum; | |
| 1536 | 3747 wp->w_cursor.col = linecol; |
| 534 | 3748 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3749 |
| 3750 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3751 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3752 ptr = line + linecol; | |
| 3753 | |
| 530 | 3754 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3755 { |
| 3756 /* no bad word found at line start, don't check until end of a | |
| 3757 * word */ | |
| 534 | 3758 spell_hlf = HLF_COUNT; |
| 3572 | 3759 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3760 } |
| 3761 else | |
| 534 | 3762 { |
| 499 | 3763 /* bad word found, use attributes until end of word */ |
| 3764 word_end = wp->w_cursor.col + len + 1; | |
| 3765 | |
| 534 | 3766 /* Turn index into actual attributes. */ |
| 3767 if (spell_hlf != HLF_COUNT) | |
| 3768 spell_attr = highlight_attr[spell_hlf]; | |
| 3769 } | |
| 499 | 3770 wp->w_cursor = pos; |
| 501 | 3771 |
| 743 | 3772 # ifdef FEAT_SYN_HL |
| 501 | 3773 /* Need to restart syntax highlighting for this line. */ |
| 3774 if (has_syntax) | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3775 syntax_start(wp, lnum); |
| 743 | 3776 # endif |
| 499 | 3777 } |
| 3778 #endif | |
| 7 | 3779 } |
| 3780 | |
| 3781 /* | |
| 3782 * Correct highlighting for cursor that can't be disabled. | |
| 3783 * Avoids having to check this for each character. | |
| 3784 */ | |
| 3785 if (fromcol >= 0) | |
| 3786 { | |
| 3787 if (noinvcur) | |
| 3788 { | |
| 3789 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3790 { | |
| 3791 /* highlighting starts at cursor, let it start just after the | |
| 3792 * cursor */ | |
| 3793 fromcol_prev = fromcol; | |
| 3794 fromcol = -1; | |
| 3795 } | |
| 3796 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3797 /* restart highlighting after the cursor */ | |
| 3798 fromcol_prev = wp->w_virtcol; | |
| 3799 } | |
| 3800 if (fromcol >= tocol) | |
| 3801 fromcol = -1; | |
| 3802 } | |
| 3803 | |
| 3804 #ifdef FEAT_SEARCH_EXTRA | |
|
17490
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
3805 if (!number_only) |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
3806 { |
| 5979 | 3807 v = (long)(ptr - line); |
|
17490
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
3808 area_highlighting |= prepare_search_hl_line(wp, lnum, (colnr_T)v, |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
3809 &line, &search_hl, &search_attr); |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
3810 ptr = line + v; // "line" may have been updated |
| 7 | 3811 } |
| 3812 #endif | |
| 3813 | |
| 743 | 3814 #ifdef FEAT_SYN_HL |
|
15991
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3815 // Cursor line highlighting for 'cursorline' in the current window. |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3816 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3817 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3818 // Do not show the cursor line when Visual mode is active, because it's |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3819 // not clear what is selected then. Do update w_last_cursorline. |
|
18047
6650e3dff8d4
patch 8.1.2019: 'cursorline' always highlights the whole line
Bram Moolenaar <Bram@vim.org>
parents:
17940
diff
changeset
|
3820 if (!(wp == curwin && VIsual_active) && *wp->w_p_culopt != 'n') |
|
15991
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3821 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3822 line_attr = HL_ATTR(HLF_CUL); |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3823 area_highlighting = TRUE; |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3824 } |
|
15683
adc6442118b8
patch 8.1.0849: cursorline highlight is not always updated
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
3825 wp->w_last_cursorline = wp->w_cursor.lnum; |
| 743 | 3826 } |
| 3827 #endif | |
| 3828 | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3829 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3830 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3831 char_u *prop_start; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3832 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3833 text_prop_count = get_text_props(wp->w_buffer, lnum, |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3834 &prop_start, FALSE); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3835 if (text_prop_count > 0) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3836 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3837 // Make a copy of the properties, so that they are properly |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3838 // aligned. |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
3839 text_props = ALLOC_MULT(textprop_T, text_prop_count); |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3840 if (text_props != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3841 mch_memmove(text_props, prop_start, |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3842 text_prop_count * sizeof(textprop_T)); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3843 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3844 // Allocate an array for the indexes. |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
3845 text_prop_idxs = ALLOC_MULT(int, text_prop_count); |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3846 area_highlighting = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3847 extra_check = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3848 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3849 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3850 #endif |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3851 |
| 504 | 3852 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3853 col = 0; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3854 |
| 7 | 3855 #ifdef FEAT_RIGHTLEFT |
| 3856 if (wp->w_p_rl) | |
| 3857 { | |
| 3858 /* Rightleft window: process the text in the normal direction, but put | |
| 3859 * it in current_ScreenLine[] from right to left. Start at the | |
| 3860 * rightmost column of the window. */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3861 col = wp->w_width - 1; |
| 7 | 3862 off += col; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3863 screen_line_flags |= SLF_RIGHTLEFT; |
| 7 | 3864 } |
| 3865 #endif | |
| 3866 | |
| 3867 /* | |
| 3868 * Repeat for the whole displayed line. | |
| 3869 */ | |
| 3870 for (;;) | |
| 3871 { | |
|
17498
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
3872 #if defined(FEAT_CONCEAL) || defined(FEAT_SEARCH_EXTRA) |
|
17492
523591cf1b70
patch 8.1.1744: build error without the conceal feature
Bram Moolenaar <Bram@vim.org>
parents:
17490
diff
changeset
|
3873 int has_match_conc = 0; // match wants to conceal |
|
17498
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
3874 #endif |
| 6947 | 3875 #ifdef FEAT_CONCEAL |
|
16672
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
3876 int did_decrement_ptr = FALSE; |
| 6947 | 3877 #endif |
| 7 | 3878 /* Skip this quickly when working on the text. */ |
| 3879 if (draw_state != WL_LINE) | |
| 3880 { | |
| 3881 #ifdef FEAT_CMDWIN | |
| 3882 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3883 { | |
| 3884 draw_state = WL_CMDLINE; | |
| 3885 if (cmdwin_type != 0 && wp == curwin) | |
| 3886 { | |
| 3887 /* Draw the cmdline character. */ | |
| 3888 n_extra = 1; | |
| 1340 | 3889 c_extra = cmdwin_type; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3890 c_final = NUL; |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3891 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_AT)); |
| 7 | 3892 } |
| 3893 } | |
| 3894 #endif | |
| 3895 | |
| 3896 #ifdef FEAT_FOLDING | |
| 3897 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3898 { | |
| 6553 | 3899 int fdc = compute_foldcolumn(wp, 0); |
| 3900 | |
| 7 | 3901 draw_state = WL_FOLD; |
| 6553 | 3902 if (fdc > 0) |
| 7 | 3903 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3904 /* Draw the 'foldcolumn'. Allocate a buffer, "extra" may |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
3905 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3906 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3907 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3908 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3909 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3910 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3911 fill_foldcolumn(p_extra_free, wp, FALSE, lnum); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3912 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3913 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3914 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3915 c_extra = NUL; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3916 c_final = NUL; |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3917 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_FC)); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3918 } |
| 7 | 3919 } |
| 3920 } | |
| 3921 #endif | |
| 3922 | |
| 3923 #ifdef FEAT_SIGNS | |
| 3924 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3925 { | |
| 3926 draw_state = WL_SIGN; | |
| 3927 /* Show the sign column when there are any signs in this | |
| 3928 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3929 if (signcolumn_on(wp)) |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3930 get_sign_display_info(FALSE, wp, lnum, &sattr, wcr_attr, |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3931 row, startrow, filler_lines, filler_todo, &c_extra, |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3932 &c_final, extra, &p_extra, &n_extra, &char_attr); |
| 7 | 3933 } |
| 3934 #endif | |
| 3935 | |
| 3936 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3937 { | |
| 3938 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3939 /* Display the absolute or relative line number. After the |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3940 * first fill with blanks when the 'n' flag isn't in 'cpo' */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3941 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3942 && (row == startrow |
| 3943 #ifdef FEAT_DIFF | |
| 3944 + filler_lines | |
| 3945 #endif | |
| 3946 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3947 { | |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3948 #ifdef FEAT_SIGNS |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3949 // If 'signcolumn' is set to 'number' and a sign is present |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3950 // in 'lnum', then display the sign instead of the line |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3951 // number. |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3952 if ((*wp->w_p_scl == 'n' && *(wp->w_p_scl + 1) == 'u') |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3953 && sign_present) |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3954 get_sign_display_info(TRUE, wp, lnum, &sattr, wcr_attr, |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3955 row, startrow, filler_lines, filler_todo, |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3956 &c_extra, &c_final, extra, &p_extra, &n_extra, |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3957 &char_attr); |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3958 else |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3959 #endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3960 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3961 /* Draw the line number (empty space after wrapping). */ |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3962 if (row == startrow |
| 7 | 3963 #ifdef FEAT_DIFF |
| 3964 + filler_lines | |
| 3965 #endif | |
| 3966 ) | |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3967 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3968 long num; |
| 4065 | 3969 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3970 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3971 if (wp->w_p_nu && !wp->w_p_rnu) |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3972 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3973 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3974 else |
| 4065 | 3975 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3976 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3977 num = labs((long)get_cursor_rel_lnum(wp, lnum)); |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3978 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3979 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3980 /* 'number' + 'relativenumber' */ |
| 4065 | 3981 num = lnum; |
| 3982 fmt = "%-*ld "; | |
| 3983 } | |
| 3984 } | |
| 3985 | |
| 3986 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3987 number_width(wp), num); |
| 7 | 3988 if (wp->w_skipcol > 0) |
| 3989 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3990 *p_extra = '-'; | |
| 3991 #ifdef FEAT_RIGHTLEFT | |
| 3992 if (wp->w_p_rl) /* reverse line numbers */ | |
|
16137
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
3993 { |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
3994 char_u *p1, *p2; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
3995 int t; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
3996 |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
3997 // like rl_mirror(), but keep the space at the end |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
3998 p2 = skiptowhite(extra) - 1; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
3999 for (p1 = extra; p1 < p2; ++p1, --p2) |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4000 { |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4001 t = *p1; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4002 *p1 = *p2; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4003 *p2 = t; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4004 } |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4005 } |
| 7 | 4006 #endif |
| 4007 p_extra = extra; | |
| 4008 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4009 c_final = NUL; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4010 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4011 else |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4012 { |
| 7 | 4013 c_extra = ' '; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4014 c_final = NUL; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4015 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4016 n_extra = number_width(wp) + 1; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4017 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_N)); |
| 743 | 4018 #ifdef FEAT_SYN_HL |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4019 /* When 'cursorline' is set highlight the line number of |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4020 * the current line differently. |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4021 * TODO: Can we use CursorLine instead of CursorLineNr |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4022 * when CursorLineNr isn't set? */ |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4023 if ((wp->w_p_cul || wp->w_p_rnu) |
|
18047
6650e3dff8d4
patch 8.1.2019: 'cursorline' always highlights the whole line
Bram Moolenaar <Bram@vim.org>
parents:
17940
diff
changeset
|
4024 && *wp->w_p_culopt != 'l' |
| 4065 | 4025 && lnum == wp->w_cursor.lnum) |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
4026 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_CLN)); |
| 743 | 4027 #endif |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4028 } |
| 7 | 4029 } |
| 4030 } | |
| 4031 | |
| 5995 | 4032 #ifdef FEAT_LINEBREAK |
| 4033 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 4034 && n_extra == 0 && *p_sbr != NUL) | |
| 4035 /* draw indent after showbreak value */ | |
| 4036 draw_state = WL_BRI; | |
| 4037 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 4038 /* After the showbreak, draw the breakindent */ | |
| 4039 draw_state = WL_BRI - 1; | |
| 4040 | |
| 4041 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 4042 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 4043 { | |
| 4044 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4045 /* if need_showbreak is set, breakindent also applies */ |
|
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4046 if (wp->w_p_bri && n_extra == 0 |
|
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4047 && (row != startrow || need_showbreak) |
| 5995 | 4048 # ifdef FEAT_DIFF |
| 4049 && filler_lines == 0 | |
| 6834 | 4050 # endif |
| 5995 | 4051 ) |
| 4052 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4053 char_attr = 0; |
| 6834 | 4054 # ifdef FEAT_DIFF |
| 5995 | 4055 if (diff_hlf != (hlf_T)0) |
| 6106 | 4056 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4057 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 4058 # ifdef FEAT_SYN_HL |
|
18047
6650e3dff8d4
patch 8.1.2019: 'cursorline' always highlights the whole line
Bram Moolenaar <Bram@vim.org>
parents:
17940
diff
changeset
|
4059 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
|
6650e3dff8d4
patch 8.1.2019: 'cursorline' always highlights the whole line
Bram Moolenaar <Bram@vim.org>
parents:
17940
diff
changeset
|
4060 && *wp->w_p_culopt != 'n') |
| 6106 | 4061 char_attr = hl_combine_attr(char_attr, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4062 HL_ATTR(HLF_CUL)); |
| 6834 | 4063 # endif |
| 6106 | 4064 } |
| 6834 | 4065 # endif |
| 6028 | 4066 p_extra = NULL; |
| 5995 | 4067 c_extra = ' '; |
| 4068 n_extra = get_breakindent_win(wp, | |
| 4069 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 4070 /* Correct end of highlighted area for 'breakindent', | |
| 4071 * required when 'linebreak' is also set. */ | |
| 4072 if (tocol == vcol) | |
| 4073 tocol += n_extra; | |
| 4074 } | |
| 4075 } | |
| 4076 #endif | |
| 4077 | |
| 7 | 4078 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 4079 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 4080 { | |
| 4081 draw_state = WL_SBR; | |
| 4082 # ifdef FEAT_DIFF | |
| 4083 if (filler_todo > 0) | |
| 4084 { | |
| 4085 /* Draw "deleted" diff line(s). */ | |
| 4086 if (char2cells(fill_diff) > 1) | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4087 { |
| 7 | 4088 c_extra = '-'; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4089 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4090 } |
| 7 | 4091 else |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4092 { |
| 7 | 4093 c_extra = fill_diff; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4094 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4095 } |
| 7 | 4096 # ifdef FEAT_RIGHTLEFT |
| 4097 if (wp->w_p_rl) | |
| 4098 n_extra = col + 1; | |
| 4099 else | |
| 4100 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4101 n_extra = wp->w_width - col; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4102 char_attr = HL_ATTR(HLF_DED); |
| 7 | 4103 } |
| 4104 # endif | |
| 4105 # ifdef FEAT_LINEBREAK | |
| 4106 if (*p_sbr != NUL && need_showbreak) | |
| 4107 { | |
| 4108 /* Draw 'showbreak' at the start of each broken line. */ | |
| 4109 p_extra = p_sbr; | |
| 4110 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4111 c_final = NUL; |
| 7 | 4112 n_extra = (int)STRLEN(p_sbr); |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4113 char_attr = HL_ATTR(HLF_AT); |
| 7 | 4114 need_showbreak = FALSE; |
| 6503 | 4115 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 4116 /* Correct end of highlighted area for 'showbreak', |
| 4117 * required when 'linebreak' is also set. */ | |
| 4118 if (tocol == vcol) | |
| 4119 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4120 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4121 /* combine 'showbreak' with 'cursorline' */ |
|
18047
6650e3dff8d4
patch 8.1.2019: 'cursorline' always highlights the whole line
Bram Moolenaar <Bram@vim.org>
parents:
17940
diff
changeset
|
4122 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
|
6650e3dff8d4
patch 8.1.2019: 'cursorline' always highlights the whole line
Bram Moolenaar <Bram@vim.org>
parents:
17940
diff
changeset
|
4123 && *wp->w_p_culopt != 'n') |
| 6106 | 4124 char_attr = hl_combine_attr(char_attr, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4125 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4126 #endif |
| 7 | 4127 } |
| 4128 # endif | |
| 4129 } | |
| 4130 #endif | |
| 4131 | |
| 4132 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4133 { | |
| 4134 draw_state = WL_LINE; | |
| 4135 if (saved_n_extra) | |
| 4136 { | |
| 4137 /* Continue item from end of wrapped line. */ | |
| 4138 n_extra = saved_n_extra; | |
| 4139 c_extra = saved_c_extra; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4140 c_final = saved_c_final; |
| 7 | 4141 p_extra = saved_p_extra; |
| 4142 char_attr = saved_char_attr; | |
| 4143 } | |
| 4144 else | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4145 char_attr = win_attr; |
| 7 | 4146 } |
| 4147 } | |
| 4148 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4149 // When still displaying '$' of change command, stop at cursor. |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4150 // When only displaying the (relative) line number and that's done, |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4151 // stop here. |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4152 if ((dollar_vcol >= 0 && wp == curwin |
| 819 | 4153 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4154 #ifdef FEAT_DIFF |
| 4155 && filler_todo <= 0 | |
| 4156 #endif | |
| 4157 ) | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4158 || (number_only && draw_state > WL_NR)) |
| 7 | 4159 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4160 screen_line(screen_row, wp->w_wincol, col, -(int)wp->w_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4161 screen_line_flags); |
| 819 | 4162 /* Pretend we have finished updating the window. Except when |
| 4163 * 'cursorcolumn' is set. */ | |
| 4164 #ifdef FEAT_SYN_HL | |
| 4165 if (wp->w_p_cuc) | |
| 4166 row = wp->w_cline_row + wp->w_cline_height; | |
| 4167 else | |
| 4168 #endif | |
| 4169 row = wp->w_height; | |
| 7 | 4170 break; |
| 4171 } | |
| 4172 | |
|
15351
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4173 if (draw_state == WL_LINE && (area_highlighting |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4174 #ifdef FEAT_SPELL |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4175 || has_spell |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4176 #endif |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4177 )) |
| 7 | 4178 { |
| 4179 /* handle Visual or match highlighting in this line */ | |
| 4180 if (vcol == fromcol | |
| 4181 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4182 && (*mb_ptr2cells)(ptr) > 1) | |
| 4183 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4184 && vcol_prev < vcol /* not at margin */ |
| 7 | 4185 && vcol < tocol)) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4186 area_attr = vi_attr; /* start highlighting */ |
| 7 | 4187 else if (area_attr != 0 |
| 4188 && (vcol == tocol | |
| 4189 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4190 area_attr = 0; /* stop highlighting */ | |
| 4191 | |
| 4192 #ifdef FEAT_SEARCH_EXTRA | |
| 4193 if (!n_extra) | |
| 4194 { | |
| 4195 /* | |
|
17490
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
4196 * Check for start/end of 'hlsearch' and other matches. |
| 7 | 4197 * After end, check for start/end of next match. |
| 4198 * When another match, have to check for start again. | |
| 4199 */ | |
| 36 | 4200 v = (long)(ptr - line); |
|
17490
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
4201 search_attr = update_search_hl(wp, lnum, (colnr_T)v, &line, |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
4202 &search_hl, &has_match_conc, &match_conc, |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
4203 did_line_attr, lcs_eol_one); |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
4204 ptr = line + v; // "line" may have been changed |
| 7 | 4205 } |
| 4206 #endif | |
| 4207 | |
| 4208 #ifdef FEAT_DIFF | |
| 674 | 4209 if (diff_hlf != (hlf_T)0) |
| 7 | 4210 { |
| 1295 | 4211 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4212 && n_extra == 0) | |
| 7 | 4213 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4214 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4215 && n_extra == 0) | |
| 7 | 4216 diff_hlf = HLF_CHD; /* changed line */ |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4217 line_attr = HL_ATTR(diff_hlf); |
|
18047
6650e3dff8d4
patch 8.1.2019: 'cursorline' always highlights the whole line
Bram Moolenaar <Bram@vim.org>
parents:
17940
diff
changeset
|
4218 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
|
6650e3dff8d4
patch 8.1.2019: 'cursorline' always highlights the whole line
Bram Moolenaar <Bram@vim.org>
parents:
17940
diff
changeset
|
4219 && *wp->w_p_culopt != 'n') |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4220 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4221 } |
| 4222 #endif | |
| 4223 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4224 #ifdef FEAT_TEXT_PROP |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4225 if (text_props != NULL) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4226 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4227 int pi; |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4228 int bcol = (int)(ptr - line); |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4229 |
|
17143
ee090ecd70f6
patch 8.1.1571: textprop highlight starts too early if just after a tab
Bram Moolenaar <Bram@vim.org>
parents:
17141
diff
changeset
|
4230 if (n_extra > 0) |
|
ee090ecd70f6
patch 8.1.1571: textprop highlight starts too early if just after a tab
Bram Moolenaar <Bram@vim.org>
parents:
17141
diff
changeset
|
4231 --bcol; // still working on the previous char, e.g. Tab |
|
ee090ecd70f6
patch 8.1.1571: textprop highlight starts too early if just after a tab
Bram Moolenaar <Bram@vim.org>
parents:
17141
diff
changeset
|
4232 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4233 // Check if any active property ends. |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4234 for (pi = 0; pi < text_props_active; ++pi) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4235 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4236 int tpi = text_prop_idxs[pi]; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4237 |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4238 if (bcol >= text_props[tpi].tp_col - 1 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4239 + text_props[tpi].tp_len) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4240 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4241 if (pi + 1 < text_props_active) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4242 mch_memmove(text_prop_idxs + pi, |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4243 text_prop_idxs + pi + 1, |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4244 sizeof(int) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4245 * (text_props_active - (pi + 1))); |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4246 --text_props_active; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4247 --pi; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4248 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4249 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4250 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4251 // Add any text property that starts in this column. |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4252 while (text_prop_next < text_prop_count |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4253 && bcol >= text_props[text_prop_next].tp_col - 1) |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4254 text_prop_idxs[text_props_active++] = text_prop_next++; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4255 |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4256 text_prop_attr = 0; |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4257 text_prop_combine = FALSE; |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4258 if (text_props_active > 0) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4259 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4260 // Sort the properties on priority and/or starting last. |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4261 // Then combine the attributes, highest priority last. |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4262 current_text_props = text_props; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4263 current_buf = wp->w_buffer; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4264 qsort((void *)text_prop_idxs, (size_t)text_props_active, |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4265 sizeof(int), text_prop_compare); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4266 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4267 for (pi = 0; pi < text_props_active; ++pi) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4268 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4269 int tpi = text_prop_idxs[pi]; |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4270 proptype_T *pt = text_prop_type_by_id( |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4271 wp->w_buffer, text_props[tpi].tp_type); |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4272 |
|
17208
13d0753511fe
patch 8.1.1603: crash when using unknown highlighting in text property
Bram Moolenaar <Bram@vim.org>
parents:
17196
diff
changeset
|
4273 if (pt != NULL && pt->pt_hl_id > 0) |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4274 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4275 int pt_attr = syn_id2attr(pt->pt_hl_id); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4276 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4277 text_prop_type = pt; |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4278 text_prop_attr = |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4279 hl_combine_attr(text_prop_attr, pt_attr); |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4280 text_prop_combine = pt->pt_flags & PT_FLAG_COMBINE; |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4281 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4282 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4283 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4284 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4285 #endif |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4286 |
| 674 | 4287 /* Decide which of the highlight attributes to use. */ |
| 4288 attr_pri = TRUE; | |
| 6717 | 4289 #ifdef LINE_ATTR |
| 674 | 4290 if (area_attr != 0) |
| 6717 | 4291 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4292 else if (search_attr != 0) |
| 6717 | 4293 char_attr = hl_combine_attr(line_attr, search_attr); |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4294 # ifdef FEAT_TEXT_PROP |
|
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4295 else if (text_prop_type != NULL) |
|
16811
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4296 { |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4297 char_attr = hl_combine_attr( |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4298 line_attr != 0 ? line_attr : win_attr, text_prop_attr); |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4299 } |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4300 # endif |
| 674 | 4301 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) |
| 1842 | 4302 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4303 || vcol >= tocol)) | |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4304 // Use line_attr when not in the Visual or 'incsearch' area |
|
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4305 // (area_attr may be 0 when "noinvcur" is set). |
| 674 | 4306 char_attr = line_attr; |
| 6717 | 4307 #else |
| 4308 if (area_attr != 0) | |
| 4309 char_attr = area_attr; | |
| 4310 else if (search_attr != 0) | |
| 4311 char_attr = search_attr; | |
| 674 | 4312 #endif |
| 4313 else | |
| 4314 { | |
| 4315 attr_pri = FALSE; | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4316 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4317 if (text_prop_type != NULL) |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4318 { |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4319 if (text_prop_combine) |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4320 char_attr = hl_combine_attr( |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4321 syntax_attr, text_prop_attr); |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4322 else |
|
16811
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4323 char_attr = hl_combine_attr( |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4324 win_attr, text_prop_attr); |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4325 } |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4326 else |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4327 #endif |
| 674 | 4328 #ifdef FEAT_SYN_HL |
| 4329 if (has_syntax) | |
| 4330 char_attr = syntax_attr; | |
| 4331 else | |
| 4332 #endif | |
| 4333 char_attr = 0; | |
| 4334 } | |
| 7 | 4335 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4336 if (char_attr == 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4337 char_attr = win_attr; |
| 7 | 4338 |
| 4339 /* | |
| 4340 * Get the next character to put on the screen. | |
| 4341 */ | |
| 4342 /* | |
| 1340 | 4343 * The "p_extra" points to the extra stuff that is inserted to |
| 4344 * represent special characters (non-printable stuff) and other | |
| 4345 * things. When all characters are the same, c_extra is used. | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4346 * If c_final is set, it will compulsorily be used at the end. |
| 1340 | 4347 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past |
| 4348 * "p_extra[n_extra]". | |
| 7 | 4349 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4350 */ | |
| 4351 if (n_extra > 0) | |
| 4352 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4353 if (c_extra != NUL || (n_extra == 1 && c_final != NUL)) |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4354 { |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4355 c = (n_extra == 1 && c_final != NUL) ? c_final : c_extra; |
| 7 | 4356 mb_c = c; /* doesn't handle non-utf-8 multi-byte! */ |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4357 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4358 { |
| 4359 mb_utf8 = TRUE; | |
| 714 | 4360 u8cc[0] = 0; |
| 819 | 4361 c = 0xc0; |
| 7 | 4362 } |
| 4363 else | |
| 4364 mb_utf8 = FALSE; | |
| 4365 } | |
| 4366 else | |
| 4367 { | |
| 4368 c = *p_extra; | |
| 4369 if (has_mbyte) | |
| 4370 { | |
| 4371 mb_c = c; | |
| 4372 if (enc_utf8) | |
| 4373 { | |
| 4374 /* If the UTF-8 character is more than one byte: | |
| 4375 * Decode it into "mb_c". */ | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4376 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4377 mb_utf8 = FALSE; |
| 4378 if (mb_l > n_extra) | |
| 4379 mb_l = 1; | |
| 4380 else if (mb_l > 1) | |
| 4381 { | |
| 714 | 4382 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4383 mb_utf8 = TRUE; |
| 819 | 4384 c = 0xc0; |
| 7 | 4385 } |
| 4386 } | |
| 4387 else | |
| 4388 { | |
| 4389 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4390 mb_l = MB_BYTE2LEN(c); | |
| 4391 if (mb_l >= n_extra) | |
| 4392 mb_l = 1; | |
| 4393 else if (mb_l > 1) | |
| 4394 mb_c = (c << 8) + p_extra[1]; | |
| 4395 } | |
| 504 | 4396 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4397 mb_l = 1; | |
| 4398 | |
| 7 | 4399 /* If a double-width char doesn't fit display a '>' in the |
| 4400 * last column. */ | |
| 504 | 4401 if (( |
| 7 | 4402 # ifdef FEAT_RIGHTLEFT |
| 4403 wp->w_p_rl ? (col <= 0) : | |
| 4404 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4405 (col >= wp->w_width - 1)) |
| 7 | 4406 && (*mb_char2cells)(mb_c) == 2) |
| 4407 { | |
| 4408 c = '>'; | |
| 4409 mb_c = c; | |
| 4410 mb_l = 1; | |
| 4411 mb_utf8 = FALSE; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4412 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4413 /* put the pointer back to output the double-width |
| 4414 * character at the start of the next line. */ | |
| 4415 ++n_extra; | |
| 4416 --p_extra; | |
| 4417 } | |
| 4418 else | |
| 4419 { | |
| 4420 n_extra -= mb_l - 1; | |
| 4421 p_extra += mb_l - 1; | |
| 4422 } | |
| 4423 } | |
| 4424 ++p_extra; | |
| 4425 } | |
| 4426 --n_extra; | |
| 4427 } | |
| 4428 else | |
| 4429 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4430 #ifdef FEAT_LINEBREAK |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4431 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4432 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4433 |
| 6026 | 4434 if (p_extra_free != NULL) |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
4435 VIM_CLEAR(p_extra_free); |
| 7 | 4436 /* |
| 4437 * Get a character from the line itself. | |
| 4438 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4439 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4440 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4441 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4442 #endif |
| 7 | 4443 if (has_mbyte) |
| 4444 { | |
| 4445 mb_c = c; | |
| 4446 if (enc_utf8) | |
| 4447 { | |
| 4448 /* If the UTF-8 character is more than one byte: Decode it | |
| 4449 * into "mb_c". */ | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4450 mb_l = utfc_ptr2len(ptr); |
| 7 | 4451 mb_utf8 = FALSE; |
| 4452 if (mb_l > 1) | |
| 4453 { | |
| 714 | 4454 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4455 /* Overlong encoded ASCII or ASCII with composing char |
| 4456 * is displayed normally, except a NUL. */ | |
| 4457 if (mb_c < 0x80) | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4458 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4459 c = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4460 #ifdef FEAT_LINEBREAK |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4461 c0 = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4462 #endif |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4463 } |
| 7 | 4464 mb_utf8 = TRUE; |
| 507 | 4465 |
| 4466 /* At start of the line we can have a composing char. | |
| 4467 * Draw it as a space with a composing char. */ | |
| 4468 if (utf_iscomposing(mb_c)) | |
| 4469 { | |
| 1326 | 4470 int i; |
| 4471 | |
| 714 | 4472 for (i = Screen_mco - 1; i > 0; --i) |
| 4473 u8cc[i] = u8cc[i - 1]; | |
| 4474 u8cc[0] = mb_c; | |
| 507 | 4475 mb_c = ' '; |
| 4476 } | |
| 7 | 4477 } |
| 4478 | |
| 4479 if ((mb_l == 1 && c >= 0x80) | |
| 4480 || (mb_l >= 1 && mb_c == 0) | |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4481 || (mb_l > 1 && (!vim_isprintc(mb_c)))) |
| 7 | 4482 { |
| 4483 /* | |
| 4484 * Illegal UTF-8 byte: display as <xx>. | |
| 4485 * Non-BMP character : display as ? or fullwidth ?. | |
| 4486 */ | |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4487 transchar_hex(extra, mb_c); |
| 714 | 4488 # ifdef FEAT_RIGHTLEFT |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4489 if (wp->w_p_rl) /* reverse */ |
|
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4490 rl_mirror(extra); |
| 714 | 4491 # endif |
| 7 | 4492 p_extra = extra; |
| 4493 c = *p_extra; | |
| 4494 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4495 mb_utf8 = (c >= 0x80); | |
| 4496 n_extra = (int)STRLEN(p_extra); | |
| 4497 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4498 c_final = NUL; |
| 7 | 4499 if (area_attr == 0 && search_attr == 0) |
| 4500 { | |
| 4501 n_attr = n_extra + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4502 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4503 saved_attr2 = char_attr; /* save current attr */ |
| 4504 } | |
| 4505 } | |
| 4506 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4507 mb_l = 1; | |
| 4508 #ifdef FEAT_ARABIC | |
| 4509 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4510 { | |
| 4511 /* Do Arabic shaping. */ | |
| 714 | 4512 int pc, pc1, nc; |
| 4513 int pcc[MAX_MCO]; | |
| 7 | 4514 |
| 4515 /* The idea of what is the previous and next | |
| 4516 * character depends on 'rightleft'. */ | |
| 4517 if (wp->w_p_rl) | |
| 4518 { | |
| 4519 pc = prev_c; | |
| 4520 pc1 = prev_c1; | |
| 4521 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4522 prev_c1 = u8cc[0]; |
| 7 | 4523 } |
| 4524 else | |
| 4525 { | |
| 714 | 4526 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4527 nc = prev_c; |
| 714 | 4528 pc1 = pcc[0]; |
| 7 | 4529 } |
| 4530 prev_c = mb_c; | |
| 4531 | |
| 714 | 4532 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4533 } |
| 4534 else | |
| 4535 prev_c = mb_c; | |
| 4536 #endif | |
| 4537 } | |
| 4538 else /* enc_dbcs */ | |
| 4539 { | |
| 4540 mb_l = MB_BYTE2LEN(c); | |
| 4541 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4542 mb_l = 1; | |
| 4543 else if (mb_l > 1) | |
| 4544 { | |
| 4545 /* We assume a second byte below 32 is illegal. | |
| 4546 * Hopefully this is OK for all double-byte encodings! | |
| 4547 */ | |
| 4548 if (ptr[1] >= 32) | |
| 4549 mb_c = (c << 8) + ptr[1]; | |
| 4550 else | |
| 4551 { | |
| 4552 if (ptr[1] == NUL) | |
| 4553 { | |
| 4554 /* head byte at end of line */ | |
| 4555 mb_l = 1; | |
| 4556 transchar_nonprint(extra, c); | |
| 4557 } | |
| 4558 else | |
| 4559 { | |
| 4560 /* illegal tail byte */ | |
| 4561 mb_l = 2; | |
| 4562 STRCPY(extra, "XX"); | |
| 4563 } | |
| 4564 p_extra = extra; | |
| 4565 n_extra = (int)STRLEN(extra) - 1; | |
| 4566 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4567 c_final = NUL; |
| 7 | 4568 c = *p_extra++; |
| 4569 if (area_attr == 0 && search_attr == 0) | |
| 4570 { | |
| 4571 n_attr = n_extra + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4572 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4573 saved_attr2 = char_attr; /* save current attr */ |
| 4574 } | |
| 4575 mb_c = c; | |
| 4576 } | |
| 4577 } | |
| 4578 } | |
| 4579 /* If a double-width char doesn't fit display a '>' in the | |
| 4580 * last column; the character is displayed at the start of the | |
| 4581 * next line. */ | |
| 4582 if (( | |
| 4583 # ifdef FEAT_RIGHTLEFT | |
| 4584 wp->w_p_rl ? (col <= 0) : | |
| 4585 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4586 (col >= wp->w_width - 1)) |
| 7 | 4587 && (*mb_char2cells)(mb_c) == 2) |
| 4588 { | |
| 4589 c = '>'; | |
| 4590 mb_c = c; | |
| 4591 mb_utf8 = FALSE; | |
| 4592 mb_l = 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4593 multi_attr = HL_ATTR(HLF_AT); |
|
16672
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
4594 // Put pointer back so that the character will be |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
4595 // displayed at the start of the next line. |
| 7 | 4596 --ptr; |
|
16672
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
4597 #ifdef FEAT_CONCEAL |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
4598 did_decrement_ptr = TRUE; |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
4599 #endif |
| 7 | 4600 } |
| 4601 else if (*ptr != NUL) | |
| 4602 ptr += mb_l - 1; | |
| 4603 | |
| 4604 /* If a double-width char doesn't fit at the left side display | |
|
2509
6d6378ba18cb
Fix: An unprintable multi-byte character at the start of the screen line
Bram Moolenaar <bram@vim.org>
parents:
2428
diff
changeset
|
4605 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4606 * characters. */ |
|
2509
6d6378ba18cb
Fix: An unprintable multi-byte character at the start of the screen line
Bram Moolenaar <bram@vim.org>
parents:
2428
diff
changeset
|
4607 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4608 { |
| 4609 n_extra = 1; | |
| 3586 | 4610 c_extra = MB_FILLER_CHAR; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4611 c_final = NUL; |
| 7 | 4612 c = ' '; |
| 4613 if (area_attr == 0 && search_attr == 0) | |
| 4614 { | |
| 4615 n_attr = n_extra + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4616 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4617 saved_attr2 = char_attr; /* save current attr */ |
| 4618 } | |
| 4619 mb_c = c; | |
| 4620 mb_utf8 = FALSE; | |
| 4621 mb_l = 1; | |
| 4622 } | |
| 4623 | |
| 4624 } | |
| 4625 ++ptr; | |
| 4626 | |
| 4627 if (extra_check) | |
| 4628 { | |
| 743 | 4629 #ifdef FEAT_SPELL |
| 221 | 4630 int can_spell = TRUE; |
| 743 | 4631 #endif |
| 4632 | |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4633 #ifdef FEAT_TERMINAL |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4634 if (get_term_attr) |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4635 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4636 syntax_attr = term_get_attr(wp->w_buffer, lnum, vcol); |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4637 |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4638 if (!attr_pri) |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4639 char_attr = syntax_attr; |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4640 else |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4641 char_attr = hl_combine_attr(syntax_attr, char_attr); |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4642 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4643 #endif |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4644 |
| 743 | 4645 #ifdef FEAT_SYN_HL |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4646 // Get syntax attribute, unless still at the start of the line |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4647 // (double-wide char that doesn't fit). |
| 221 | 4648 v = (long)(ptr - line); |
| 4649 if (has_syntax && v > 0) | |
| 7 | 4650 { |
| 4651 /* Get the syntax attribute for the character. If there | |
| 4652 * is an error, disable syntax highlighting. */ | |
| 4653 save_did_emsg = did_emsg; | |
| 4654 did_emsg = FALSE; | |
| 4655 | |
| 221 | 4656 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4657 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4658 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4659 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4660 NULL, FALSE); |
| 7 | 4661 |
| 4662 if (did_emsg) | |
| 482 | 4663 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4664 wp->w_s->b_syn_error = TRUE; |
| 482 | 4665 has_syntax = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4666 syntax_attr = 0; |
| 482 | 4667 } |
| 7 | 4668 else |
| 4669 did_emsg = save_did_emsg; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4670 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4671 // combine syntax attribute with 'wincolor' |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4672 if (win_attr != 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4673 syntax_attr = hl_combine_attr(win_attr, syntax_attr); |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4674 |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4675 #ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4676 if (wp->w_s->b_syn_slow) |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4677 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4678 #endif |
| 7 | 4679 |
| 4680 /* Need to get the line again, a multi-line regexp may | |
| 4681 * have made it invalid. */ | |
| 4682 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4683 ptr = line + v; | |
| 4684 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4685 # ifdef FEAT_TEXT_PROP |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4686 // Text properties overrule syntax highlighting or combine. |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4687 if (text_prop_attr == 0 || text_prop_combine) |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4688 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4689 { |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4690 int comb_attr = syntax_attr; |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4691 # ifdef FEAT_TEXT_PROP |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4692 comb_attr = hl_combine_attr(text_prop_attr, comb_attr); |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4693 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4694 if (!attr_pri) |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4695 char_attr = comb_attr; |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4696 else |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4697 char_attr = hl_combine_attr(comb_attr, char_attr); |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4698 } |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4699 # ifdef FEAT_CONCEAL |
|
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4700 /* no concealing past the end of the line, it interferes |
|
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4701 * with line highlighting */ |
|
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4702 if (c == NUL) |
|
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4703 syntax_flags = 0; |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
4704 else |
|
2392
0371401d9d33
Give each syntax item a sequence number, so that we know when it starts and
Bram Moolenaar <bram@vim.org>
parents:
2382
diff
changeset
|
4705 syntax_flags = get_syntax_info(&syntax_seqnr); |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4706 # endif |
| 7 | 4707 } |
| 743 | 4708 #endif |
| 4709 | |
| 4710 #ifdef FEAT_SPELL | |
| 301 | 4711 /* Check spelling (unless at the end of the line). |
| 319 | 4712 * Only do this when there is no syntax highlighting, the |
| 4713 * @Spell cluster is not used or the current syntax item | |
| 4714 * contains the @Spell cluster. */ | |
| 348 | 4715 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4716 { |
| 230 | 4717 spell_attr = 0; |
| 743 | 4718 if (c != 0 && ( |
| 4719 # ifdef FEAT_SYN_HL | |
| 4720 !has_syntax || | |
| 4721 # endif | |
| 4722 can_spell)) | |
| 221 | 4723 { |
| 348 | 4724 char_u *prev_ptr, *p; |
| 4725 int len; | |
| 534 | 4726 hlf_T spell_hlf = HLF_COUNT; |
| 336 | 4727 if (has_mbyte) |
| 4728 { | |
| 4729 prev_ptr = ptr - mb_l; | |
| 4730 v -= mb_l - 1; | |
| 4731 } | |
| 4732 else | |
| 4733 prev_ptr = ptr - 1; | |
| 348 | 4734 |
| 4735 /* Use nextline[] if possible, it has the start of the | |
| 4736 * next line concatenated. */ | |
| 4737 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4738 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4739 else | |
| 4740 p = prev_ptr; | |
| 835 | 4741 cap_col -= (int)(prev_ptr - line); |
| 625 | 4742 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4743 nochange); | |
| 348 | 4744 word_end = v + len; |
| 301 | 4745 |
| 4746 /* In Insert mode only highlight a word that | |
| 4747 * doesn't touch the cursor. */ | |
| 534 | 4748 if (spell_hlf != HLF_COUNT |
| 301 | 4749 && (State & INSERT) != 0 |
| 4750 && wp->w_cursor.lnum == lnum | |
| 4751 && wp->w_cursor.col >= | |
| 4752 (colnr_T)(prev_ptr - line) | |
| 4753 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4754 { |
| 534 | 4755 spell_hlf = HLF_COUNT; |
| 301 | 4756 spell_redraw_lnum = lnum; |
| 221 | 4757 } |
| 348 | 4758 |
| 534 | 4759 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4760 && (p - nextline) + len > nextline_idx) |
| 4761 { | |
| 4762 /* Remember that the good word continues at the | |
| 4763 * start of the next line. */ | |
| 4764 checked_lnum = lnum + 1; | |
| 835 | 4765 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4766 } |
| 386 | 4767 |
| 534 | 4768 /* Turn index into actual attributes. */ |
| 4769 if (spell_hlf != HLF_COUNT) | |
| 4770 spell_attr = highlight_attr[spell_hlf]; | |
| 4771 | |
| 386 | 4772 if (cap_col > 0) |
| 4773 { | |
| 4774 if (p != prev_ptr | |
| 4775 && (p - nextline) + cap_col >= nextline_idx) | |
| 4776 { | |
| 4777 /* Remember that the word in the next line | |
| 4778 * must start with a capital. */ | |
| 4779 capcol_lnum = lnum + 1; | |
| 835 | 4780 cap_col = (int)((p - nextline) + cap_col |
| 4781 - nextline_idx); | |
| 386 | 4782 } |
| 4783 else | |
| 4784 /* Compute the actual column. */ | |
| 835 | 4785 cap_col += (int)(prev_ptr - line); |
| 386 | 4786 } |
| 221 | 4787 } |
| 4788 } | |
| 4789 if (spell_attr != 0) | |
| 348 | 4790 { |
| 674 | 4791 if (!attr_pri) |
| 348 | 4792 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4793 else | |
| 4794 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4795 } | |
| 7 | 4796 #endif |
| 4797 #ifdef FEAT_LINEBREAK | |
| 4798 /* | |
| 221 | 4799 * Found last space before word: check for line break. |
| 7 | 4800 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4801 if (wp->w_p_lbr && c0 == c |
|
11133
d8e830e32be9
patch 8.0.0454: compiler warnings for "always true" comparison
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4802 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4803 { |
| 6693 | 4804 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4805 char_u *p = ptr - (mb_off + 1); |
| 6681 | 4806 |
| 5995 | 4807 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4808 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4809 NULL) - 1; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4810 if (c == TAB && n_extra + col > wp->w_width) |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4811 # ifdef FEAT_VARTABS |
|
14198
9ca8c36869ce
patch 8.1.0116: display problem with 'vartabstop' and 'linebreak'
Christian Brabandt <cb@256bit.org>
parents:
14191
diff
changeset
|
4812 n_extra = tabstop_padding(vcol, wp->w_buffer->b_p_ts, |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4813 wp->w_buffer->b_p_vts_array) - 1; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4814 # else |
| 6371 | 4815 n_extra = (int)wp->w_buffer->b_p_ts |
| 4816 - vcol % (int)wp->w_buffer->b_p_ts - 1; | |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4817 # endif |
| 6371 | 4818 |
| 6693 | 4819 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4820 c_final = NUL; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4821 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4822 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4823 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4824 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4825 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4826 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4827 #endif |
| 6026 | 4828 if (!wp->w_p_list) |
| 4829 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4830 } |
| 7 | 4831 } |
| 4832 #endif | |
| 4833 | |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4834 // 'list': Change char 160 to lcs_nbsp and space to lcs_space. |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4835 // But not when the character is followed by a composing |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4836 // character (use mb_l to check that). |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4837 if (wp->w_p_list |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4838 && ((((c == 160 && mb_l == 1) |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4839 || (mb_utf8 |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4840 && ((mb_c == 160 && mb_l == 2) |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4841 || (mb_c == 0x202f && mb_l == 3)))) |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4842 && lcs_nbsp) |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4843 || (c == ' ' |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4844 && mb_l == 1 |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4845 && lcs_space |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4846 && ptr - line <= trailcol))) |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4847 { |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4848 c = (c == ' ') ? lcs_space : lcs_nbsp; |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4849 if (area_attr == 0 && search_attr == 0) |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4850 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4851 n_attr = 1; |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4852 extra_attr = HL_ATTR(HLF_8); |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4853 saved_attr2 = char_attr; /* save current attr */ |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4854 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4855 mb_c = c; |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4856 if (enc_utf8 && utf_char2len(c) > 1) |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4857 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4858 mb_utf8 = TRUE; |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4859 u8cc[0] = 0; |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4860 c = 0xc0; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4861 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4862 else |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4863 mb_utf8 = FALSE; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4864 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4865 |
| 7 | 4866 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4867 { | |
| 4868 c = lcs_trail; | |
| 674 | 4869 if (!attr_pri) |
| 7 | 4870 { |
| 4871 n_attr = 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4872 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4873 saved_attr2 = char_attr; /* save current attr */ |
| 4874 } | |
| 4875 mb_c = c; | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4876 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4877 { |
| 4878 mb_utf8 = TRUE; | |
| 714 | 4879 u8cc[0] = 0; |
| 819 | 4880 c = 0xc0; |
| 7 | 4881 } |
| 4882 else | |
| 4883 mb_utf8 = FALSE; | |
| 4884 } | |
| 4885 } | |
| 4886 | |
| 4887 /* | |
| 4888 * Handling of non-printable characters. | |
| 4889 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4890 if (!vim_isprintc(c)) |
| 7 | 4891 { |
| 4892 /* | |
| 4893 * when getting a character from the file, we may have to | |
| 4894 * turn it into something else on the way to putting it | |
| 4895 * into "ScreenLines". | |
| 4896 */ | |
| 4897 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4898 { | |
| 6026 | 4899 int tab_len = 0; |
| 6503 | 4900 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 4901 #ifdef FEAT_LINEBREAK | |
| 4902 /* only adjust the tab_len, when at the first column | |
| 4903 * after the showbreak value was drawn */ | |
| 4904 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 4905 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 4906 #endif | |
|
17742
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4907 // tab amount depends on current column |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4908 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4909 tab_len = tabstop_padding(vcol_adjusted, |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4910 wp->w_buffer->b_p_ts, |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4911 wp->w_buffer->b_p_vts_array) - 1; |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4912 #else |
| 6026 | 4913 tab_len = (int)wp->w_buffer->b_p_ts |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4914 - vcol_adjusted % (int)wp->w_buffer->b_p_ts - 1; |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4915 #endif |
| 6503 | 4916 |
| 6026 | 4917 #ifdef FEAT_LINEBREAK |
| 6100 | 4918 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 4919 #endif |
|
17742
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4920 // tab amount depends on current column |
| 6026 | 4921 n_extra = tab_len; |
| 4922 #ifdef FEAT_LINEBREAK | |
| 4923 else | |
| 4924 { | |
|
17742
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4925 char_u *p; |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
4926 int len; |
| 6026 | 4927 int i; |
| 4928 int saved_nextra = n_extra; | |
| 4929 | |
| 6172 | 4930 #ifdef FEAT_CONCEAL |
| 6627 | 4931 if (vcol_off > 0) |
|
17742
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4932 // there are characters to conceal |
| 6172 | 4933 tab_len += vcol_off; |
|
17742
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4934 // boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 6520 | 4935 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 |
| 4936 && n_extra > tab_len) | |
| 4937 tab_len += n_extra - tab_len; | |
| 4938 #endif | |
| 4939 | |
|
17742
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4940 // if n_extra > 0, it gives the number of chars, to |
|
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4941 // use for a tab, else we need to calculate the width |
|
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4942 // for a tab |
| 6026 | 4943 len = (tab_len * mb_char2len(lcs_tab2)); |
| 4944 if (n_extra > 0) | |
| 4945 len += n_extra - tab_len; | |
| 4946 c = lcs_tab1; | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16676
diff
changeset
|
4947 p = alloc(len + 1); |
| 6026 | 4948 vim_memset(p, ' ', len); |
| 4949 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4950 vim_free(p_extra_free); |
| 6026 | 4951 p_extra_free = p; |
| 4952 for (i = 0; i < tab_len; i++) | |
| 4953 { | |
|
17742
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4954 int lcs = lcs_tab2; |
|
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4955 |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4956 if (*p == NUL) |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4957 { |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4958 tab_len = i; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4959 break; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4960 } |
|
17742
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4961 |
|
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4962 // if lcs_tab3 is given, need to change the char |
|
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4963 // for tab |
|
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4964 if (lcs_tab3 && i == tab_len - 1) |
|
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4965 lcs = lcs_tab3; |
|
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4966 mb_char2bytes(lcs, p); |
|
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4967 p += mb_char2len(lcs); |
|
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4968 n_extra += mb_char2len(lcs) |
|
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4969 - (saved_nextra > 0 ? 1 : 0); |
| 6026 | 4970 } |
| 4971 p_extra = p_extra_free; | |
| 6172 | 4972 #ifdef FEAT_CONCEAL |
|
17742
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4973 // n_extra will be increased by FIX_FOX_BOGUSCOLS |
|
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4974 // macro below, so need to adjust for that here |
| 6627 | 4975 if (vcol_off > 0) |
| 6172 | 4976 n_extra -= vcol_off; |
| 4977 #endif | |
| 6026 | 4978 } |
| 4979 #endif | |
| 3984 | 4980 #ifdef FEAT_CONCEAL |
| 6627 | 4981 { |
| 4982 int vc_saved = vcol_off; | |
| 4983 | |
| 4984 /* Tab alignment should be identical regardless of | |
| 4985 * 'conceallevel' value. So tab compensates of all | |
| 4986 * previous concealed characters, and thus resets | |
| 4987 * vcol_off and boguscols accumulated so far in the | |
| 4988 * line. Note that the tab can be longer than | |
| 4989 * 'tabstop' when there are concealed characters. */ | |
| 4990 FIX_FOR_BOGUSCOLS; | |
| 4991 | |
| 4992 /* Make sure, the highlighting for the tab char will be | |
| 4993 * correctly set further below (effectively reverts the | |
| 4994 * FIX_FOR_BOGSUCOLS macro */ | |
| 4995 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 4996 && lcs_tab1) |
| 6627 | 4997 tab_len += vc_saved; |
| 4998 } | |
| 3984 | 4999 #endif |
| 7 | 5000 mb_utf8 = FALSE; /* don't draw as UTF-8 */ |
| 5001 if (wp->w_p_list) | |
| 5002 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5003 c = (n_extra == 0 && lcs_tab3) ? lcs_tab3 : lcs_tab1; |
| 6026 | 5004 #ifdef FEAT_LINEBREAK |
| 5005 if (wp->w_p_lbr) | |
| 5006 c_extra = NUL; /* using p_extra from above */ | |
| 5007 else | |
| 5008 #endif | |
| 5009 c_extra = lcs_tab2; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5010 c_final = lcs_tab3; |
| 6026 | 5011 n_attr = tab_len + 1; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5012 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5013 saved_attr2 = char_attr; /* save current attr */ |
| 5014 mb_c = c; | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
5015 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5016 { |
| 5017 mb_utf8 = TRUE; | |
| 714 | 5018 u8cc[0] = 0; |
| 819 | 5019 c = 0xc0; |
| 7 | 5020 } |
| 5021 } | |
| 5022 else | |
| 5023 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5024 c_final = NUL; |
| 7 | 5025 c_extra = ' '; |
| 5026 c = ' '; | |
| 5027 } | |
| 5028 } | |
| 36 | 5029 else if (c == NUL |
| 6799 | 5030 && (wp->w_p_list |
| 36 | 5031 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 5032 && tocol > vcol | |
| 5033 && VIsual_mode != Ctrl_V | |
| 5034 && ( | |
| 5035 # ifdef FEAT_RIGHTLEFT | |
| 5036 wp->w_p_rl ? (col >= 0) : | |
| 5037 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5038 (col < wp->w_width)) |
| 36 | 5039 && !(noinvcur |
| 1850 | 5040 && lnum == wp->w_cursor.lnum |
| 36 | 5041 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 5042 && lcs_eol_one > 0) |
| 7 | 5043 { |
| 36 | 5044 /* Display a '$' after the line or highlight an extra |
| 5045 * character if the line break is included. */ | |
| 7 | 5046 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 5047 /* For a diff line the highlighting continues after the | |
| 5048 * "$". */ | |
| 5049 if ( | |
| 5050 # ifdef FEAT_DIFF | |
| 534 | 5051 diff_hlf == (hlf_T)0 |
| 7 | 5052 # ifdef LINE_ATTR |
| 5053 && | |
| 5054 # endif | |
| 5055 # endif | |
| 5056 # ifdef LINE_ATTR | |
| 5057 line_attr == 0 | |
| 5058 # endif | |
| 5059 ) | |
| 5060 #endif | |
| 5061 { | |
| 5062 /* In virtualedit, visual selections may extend | |
| 5063 * beyond end of line. */ | |
| 5064 if (area_highlighting && virtual_active() | |
| 5065 && tocol != MAXCOL && vcol < tocol) | |
| 5066 n_extra = 0; | |
| 5067 else | |
| 5068 { | |
| 5069 p_extra = at_end_str; | |
| 5070 n_extra = 1; | |
| 5071 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5072 c_final = NUL; |
| 7 | 5073 } |
| 5074 } | |
| 6799 | 5075 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 5076 c = lcs_eol; |
| 5077 else | |
| 5078 c = ' '; | |
| 7 | 5079 lcs_eol_one = -1; |
| 5080 --ptr; /* put it back at the NUL */ | |
| 674 | 5081 if (!attr_pri) |
| 7 | 5082 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5083 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 5084 n_attr = 1; |
| 5085 } | |
| 5086 mb_c = c; | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
5087 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5088 { |
| 5089 mb_utf8 = TRUE; | |
| 714 | 5090 u8cc[0] = 0; |
| 819 | 5091 c = 0xc0; |
| 7 | 5092 } |
| 5093 else | |
| 5094 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5095 } | |
| 5096 else if (c != NUL) | |
| 5097 { | |
| 5098 p_extra = transchar(c); | |
| 6064 | 5099 if (n_extra == 0) |
| 5100 n_extra = byte2cells(c) - 1; | |
| 7 | 5101 #ifdef FEAT_RIGHTLEFT |
| 5102 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5103 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5104 #endif | |
| 5105 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5106 c_final = NUL; |
| 6026 | 5107 #ifdef FEAT_LINEBREAK |
| 5108 if (wp->w_p_lbr) | |
| 5109 { | |
| 5110 char_u *p; | |
| 5111 | |
| 5112 c = *p_extra; | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16676
diff
changeset
|
5113 p = alloc(n_extra + 1); |
| 6026 | 5114 vim_memset(p, ' ', n_extra); |
| 5115 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5116 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5117 vim_free(p_extra_free); |
| 6026 | 5118 p_extra_free = p_extra = p; |
| 5119 } | |
| 5120 else | |
| 5121 #endif | |
| 5122 { | |
| 5123 n_extra = byte2cells(c) - 1; | |
| 5124 c = *p_extra++; | |
| 5125 } | |
| 674 | 5126 if (!attr_pri) |
| 7 | 5127 { |
| 5128 n_attr = n_extra + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5129 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5130 saved_attr2 = char_attr; /* save current attr */ |
| 5131 } | |
| 5132 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5133 } | |
| 5134 else if (VIsual_active | |
| 5135 && (VIsual_mode == Ctrl_V | |
| 5136 || VIsual_mode == 'v') | |
| 5137 && virtual_active() | |
| 5138 && tocol != MAXCOL | |
| 5139 && vcol < tocol | |
| 5140 && ( | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5141 #ifdef FEAT_RIGHTLEFT |
| 7 | 5142 wp->w_p_rl ? (col >= 0) : |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5143 #endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5144 (col < wp->w_width))) |
| 7 | 5145 { |
| 5146 c = ' '; | |
| 5147 --ptr; /* put it back at the NUL */ | |
| 5148 } | |
| 910 | 5149 #if defined(LINE_ATTR) |
| 7 | 5150 else if (( |
| 5151 # ifdef FEAT_DIFF | |
| 910 | 5152 diff_hlf != (hlf_T)0 || |
| 7 | 5153 # endif |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5154 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5155 win_attr != 0 || |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5156 # endif |
| 7 | 5157 line_attr != 0 |
| 5158 ) && ( | |
| 5159 # ifdef FEAT_RIGHTLEFT | |
| 5160 wp->w_p_rl ? (col >= 0) : | |
| 5161 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5162 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5163 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5164 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5165 # endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5166 < wp->w_width))) |
| 7 | 5167 { |
| 5168 /* Highlight until the right side of the window */ | |
| 5169 c = ' '; | |
| 5170 --ptr; /* put it back at the NUL */ | |
| 867 | 5171 |
| 5172 /* Remember we do the char for line highlighting. */ | |
| 5173 ++did_line_attr; | |
| 5174 | |
| 5175 /* don't do search HL for the rest of the line */ | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5176 if (line_attr != 0 && char_attr == search_attr |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5177 && (did_line_attr > 1 |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5178 || (wp->w_p_list && lcs_eol > 0))) |
| 867 | 5179 char_attr = line_attr; |
| 7 | 5180 # ifdef FEAT_DIFF |
| 5181 if (diff_hlf == HLF_TXD) | |
| 5182 { | |
| 5183 diff_hlf = HLF_CHD; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5184 if (vi_attr == 0 || char_attr != vi_attr) |
| 6106 | 5185 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5186 char_attr = HL_ATTR(diff_hlf); |
|
18047
6650e3dff8d4
patch 8.1.2019: 'cursorline' always highlights the whole line
Bram Moolenaar <Bram@vim.org>
parents:
17940
diff
changeset
|
5187 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
|
6650e3dff8d4
patch 8.1.2019: 'cursorline' always highlights the whole line
Bram Moolenaar <Bram@vim.org>
parents:
17940
diff
changeset
|
5188 && *wp->w_p_culopt != 'n') |
| 6106 | 5189 char_attr = hl_combine_attr(char_attr, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5190 HL_ATTR(HLF_CUL)); |
| 6106 | 5191 } |
| 7 | 5192 } |
| 5193 # endif | |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5194 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5195 if (win_attr != 0) |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5196 { |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5197 char_attr = win_attr; |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5198 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5199 char_attr = hl_combine_attr(char_attr, |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5200 HL_ATTR(HLF_CUL)); |
|
17440
a5874fdc8f3a
patch 8.1.1718: popup menu highlighting does not look good
Bram Moolenaar <Bram@vim.org>
parents:
17438
diff
changeset
|
5201 else if (line_attr) |
|
a5874fdc8f3a
patch 8.1.1718: popup menu highlighting does not look good
Bram Moolenaar <Bram@vim.org>
parents:
17438
diff
changeset
|
5202 char_attr = hl_combine_attr(char_attr, line_attr); |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5203 } |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5204 # endif |
| 7 | 5205 } |
| 5206 #endif | |
| 5207 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5208 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5209 #ifdef FEAT_CONCEAL |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5210 if ( wp->w_p_cole > 0 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5211 && (wp != curwin || lnum != wp->w_cursor.lnum || |
|
16154
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
5212 conceal_cursor_line(wp)) |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
5213 && ((syntax_flags & HL_CONCEAL) != 0 || has_match_conc > 0) |
|
2400
e6f1424dd66a
Let 'v' flag in 'concealcursor' apply to all lines in the Visual area.
Bram Moolenaar <bram@vim.org>
parents:
2393
diff
changeset
|
5214 && !(lnum_in_visual_area |
|
e6f1424dd66a
Let 'v' flag in 'concealcursor' apply to all lines in the Visual area.
Bram Moolenaar <bram@vim.org>
parents:
2393
diff
changeset
|
5215 && vim_strchr(wp->w_p_cocu, 'v') == NULL)) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5216 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5217 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5218 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5219 && (syn_get_sub_char() != NUL || match_conc |
| 5220 || wp->w_p_cole == 1) | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5221 && wp->w_p_cole != 3) |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5222 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5223 /* First time at this concealed item: display one |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5224 * character. */ |
| 6947 | 5225 if (match_conc) |
| 5226 c = match_conc; | |
| 5227 else if (syn_get_sub_char() != NUL) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5228 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5229 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5230 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5231 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5232 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5233 |
|
2392
0371401d9d33
Give each syntax item a sequence number, so that we know when it starts and
Bram Moolenaar <bram@vim.org>
parents:
2382
diff
changeset
|
5234 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5235 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5236 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5237 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5238 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5239 if (wp->w_p_wrap && n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5240 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5241 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5242 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5243 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5244 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5245 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5246 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5247 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5248 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5249 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5250 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5251 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5252 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5253 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5254 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5255 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5256 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5257 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5258 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5259 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5260 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5261 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5262 mb_c = c; |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
5263 if (enc_utf8 && utf_char2len(c) > 1) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5264 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5265 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5266 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5267 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5268 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5269 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5270 mb_utf8 = FALSE; /* don't draw as UTF-8 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5271 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5272 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5273 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5274 prev_syntax_id = 0; |
|
2348
8878a9f8db87
Rename w_p_conceal to w_p_conc for consistency.
Bram Moolenaar <bram@vim.org>
parents:
2346
diff
changeset
|
5275 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5276 } |
|
16672
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5277 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5278 if (n_skip > 0 && did_decrement_ptr) |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5279 // not showing the '>', put pointer back to avoid getting stuck |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5280 ++ptr; |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5281 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5282 #endif // FEAT_CONCEAL |
| 7 | 5283 } |
| 5284 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5285 #ifdef FEAT_CONCEAL |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5286 /* In the cursor line and we may be concealing characters: correct |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5287 * the cursor column when we reach its position. */ |
|
2381
17bbb52ae218
Another conceal fix: cursor in wrong column when 'number' set.
Bram Moolenaar <bram@vim.org>
parents:
2380
diff
changeset
|
5288 if (!did_wcol && draw_state == WL_LINE |
|
17bbb52ae218
Another conceal fix: cursor in wrong column when 'number' set.
Bram Moolenaar <bram@vim.org>
parents:
2380
diff
changeset
|
5289 && wp == curwin && lnum == wp->w_cursor.lnum |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5290 && conceal_cursor_line(wp) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5291 && (int)wp->w_virtcol <= vcol + n_skip) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5292 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5293 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5294 if (wp->w_p_rl) |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5295 wp->w_wcol = wp->w_width - col + boguscols - 1; |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5296 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5297 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5298 wp->w_wcol = col - boguscols; |
|
2393
210a5605e126
Fix for cursor position in wrapped line with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
5299 wp->w_wrow = row; |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5300 did_wcol = TRUE; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5301 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5302 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5303 |
| 7 | 5304 /* Don't override visual selection highlighting. */ |
| 5305 if (n_attr > 0 | |
| 5306 && draw_state == WL_LINE | |
| 674 | 5307 && !attr_pri) |
| 7 | 5308 char_attr = extra_attr; |
| 5309 | |
| 42 | 5310 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5311 /* XIM don't send preedit_start and preedit_end, but they send |
| 5312 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5313 * im_is_preediting() here. */ | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12244
diff
changeset
|
5314 if (p_imst == IM_ON_THE_SPOT |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12244
diff
changeset
|
5315 && xic != NULL |
| 1850 | 5316 && lnum == wp->w_cursor.lnum |
| 7 | 5317 && (State & INSERT) |
| 5318 && !p_imdisable | |
| 5319 && im_is_preediting() | |
| 5320 && draw_state == WL_LINE) | |
| 5321 { | |
| 5322 colnr_T tcol; | |
| 5323 | |
| 5324 if (preedit_end_col == MAXCOL) | |
| 1850 | 5325 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5326 else |
| 5327 tcol = preedit_end_col; | |
| 5328 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5329 { | |
| 5330 if (feedback_old_attr < 0) | |
| 5331 { | |
| 5332 feedback_col = 0; | |
| 5333 feedback_old_attr = char_attr; | |
| 5334 } | |
| 5335 char_attr = im_get_feedback_attr(feedback_col); | |
| 5336 if (char_attr < 0) | |
| 5337 char_attr = feedback_old_attr; | |
| 5338 feedback_col++; | |
| 5339 } | |
| 5340 else if (feedback_old_attr >= 0) | |
| 5341 { | |
| 5342 char_attr = feedback_old_attr; | |
| 5343 feedback_old_attr = -1; | |
| 5344 feedback_col = 0; | |
| 5345 } | |
| 5346 } | |
| 5347 #endif | |
| 5348 /* | |
| 5349 * Handle the case where we are in column 0 but not on the first | |
| 5350 * character of the line and the user wants us to show us a | |
| 5351 * special character (via 'listchars' option "precedes:<char>". | |
| 5352 */ | |
| 5353 if (lcs_prec_todo != NUL | |
| 6276 | 5354 && wp->w_p_list |
| 7 | 5355 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5356 #ifdef FEAT_DIFF | |
| 5357 && filler_todo <= 0 | |
| 5358 #endif | |
| 5359 && draw_state > WL_NR | |
| 5360 && c != NUL) | |
| 5361 { | |
| 5362 c = lcs_prec; | |
| 5363 lcs_prec_todo = NUL; | |
| 3586 | 5364 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5365 { | |
| 5366 /* Double-width character being overwritten by the "precedes" | |
| 5367 * character, need to fill up half the character. */ | |
| 5368 c_extra = MB_FILLER_CHAR; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5369 c_final = NUL; |
| 3586 | 5370 n_extra = 1; |
| 5371 n_attr = 2; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5372 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5373 } |
| 7 | 5374 mb_c = c; |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
5375 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5376 { |
| 5377 mb_utf8 = TRUE; | |
| 714 | 5378 u8cc[0] = 0; |
| 819 | 5379 c = 0xc0; |
| 7 | 5380 } |
| 5381 else | |
| 5382 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 674 | 5383 if (!attr_pri) |
| 7 | 5384 { |
| 5385 saved_attr3 = char_attr; /* save current attr */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5386 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5387 n_attr3 = 1; |
| 5388 } | |
| 5389 } | |
| 5390 | |
| 5391 /* | |
| 867 | 5392 * At end of the text line or just after the last character. |
| 7 | 5393 */ |
|
17438
967e2ee9b656
patch 8.1.1717: last char in menu popup window highlighted
Bram Moolenaar <Bram@vim.org>
parents:
17427
diff
changeset
|
5394 if ((c == NUL |
| 910 | 5395 #if defined(LINE_ATTR) |
| 867 | 5396 || did_line_attr == 1 |
| 5397 #endif | |
|
17438
967e2ee9b656
patch 8.1.1717: last char in menu popup window highlighted
Bram Moolenaar <Bram@vim.org>
parents:
17427
diff
changeset
|
5398 ) && eol_hl_off == 0) |
| 867 | 5399 { |
| 5400 #ifdef FEAT_SEARCH_EXTRA | |
|
17490
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5401 // flag to indicate whether prevcol equals startcol of search_hl or |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5402 // one of the matches |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5403 int prevcol_hl_flag = get_prevcol_hl_flag(wp, &search_hl, |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5404 (long)(ptr - line) - (c == NUL)); |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5405 #endif |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5406 // Invert at least one char, used for Visual and empty line or |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5407 // highlight match at end of line. If it's beyond the last |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5408 // char on the screen, just overwrite that one (tricky!) Not |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5409 // needed when a '$' was displayed for 'list'. |
| 7 | 5410 if (lcs_eol == lcs_eol_one |
| 1850 | 5411 && ((area_attr != 0 && vcol == fromcol |
| 5412 && (VIsual_mode != Ctrl_V | |
| 5413 || lnum == VIsual.lnum | |
| 5414 || lnum == curwin->w_cursor.lnum) | |
| 5415 && c == NUL) | |
| 7 | 5416 #ifdef FEAT_SEARCH_EXTRA |
|
17490
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5417 // highlight 'hlsearch' match at end of line |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5418 || (prevcol_hl_flag |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5419 # ifdef FEAT_SYN_HL |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5420 && !(wp->w_p_cul && lnum == wp->w_cursor.lnum |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5421 && !(wp == curwin && VIsual_active)) |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5422 # endif |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5423 # ifdef FEAT_DIFF |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5424 && diff_hlf == (hlf_T)0 |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5425 # endif |
| 910 | 5426 # if defined(LINE_ATTR) |
| 867 | 5427 && did_line_attr <= 1 |
| 5428 # endif | |
| 5429 ) | |
| 7 | 5430 #endif |
| 5431 )) | |
| 5432 { | |
| 5433 int n = 0; | |
| 5434 | |
| 5435 #ifdef FEAT_RIGHTLEFT | |
| 5436 if (wp->w_p_rl) | |
| 5437 { | |
| 5438 if (col < 0) | |
| 5439 n = 1; | |
| 5440 } | |
| 5441 else | |
| 5442 #endif | |
| 5443 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5444 if (col >= wp->w_width) |
| 7 | 5445 n = -1; |
| 5446 } | |
| 5447 if (n != 0) | |
| 5448 { | |
| 5449 /* At the window boundary, highlight the last character | |
| 5450 * instead (better than nothing). */ | |
| 5451 off += n; | |
| 5452 col += n; | |
| 5453 } | |
| 5454 else | |
| 5455 { | |
| 5456 /* Add a blank character to highlight. */ | |
| 5457 ScreenLines[off] = ' '; | |
| 5458 if (enc_utf8) | |
| 5459 ScreenLinesUC[off] = 0; | |
| 5460 } | |
| 5461 #ifdef FEAT_SEARCH_EXTRA | |
| 5462 if (area_attr == 0) | |
| 5463 { | |
|
17490
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5464 // Use attributes from match with highest priority among |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5465 // 'search_hl' and the match list. |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5466 get_search_match_hl(wp, &search_hl, |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5467 (long)(ptr - line), &char_attr); |
| 7 | 5468 } |
| 5469 #endif | |
| 5470 ScreenAttrs[off] = char_attr; | |
| 5471 #ifdef FEAT_RIGHTLEFT | |
| 5472 if (wp->w_p_rl) | |
| 1437 | 5473 { |
| 7 | 5474 --col; |
| 1437 | 5475 --off; |
| 5476 } | |
| 7 | 5477 else |
| 5478 #endif | |
| 1437 | 5479 { |
| 7 | 5480 ++col; |
| 1437 | 5481 ++off; |
| 5482 } | |
| 743 | 5483 ++vcol; |
| 1437 | 5484 eol_hl_off = 1; |
| 743 | 5485 } |
| 867 | 5486 } |
| 5487 | |
| 5488 /* | |
| 5489 * At end of the text line. | |
| 5490 */ | |
| 5491 if (c == NUL) | |
| 5492 { | |
| 743 | 5493 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5494 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5495 if (wp->w_p_wrap) |
| 5496 v = wp->w_skipcol; | |
| 5497 else | |
| 5498 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5499 |
| 820 | 5500 /* check if line ends before left margin */ |
| 5501 if (vcol < v + col - win_col_off(wp)) | |
| 5502 vcol = v + col - win_col_off(wp); | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5503 #ifdef FEAT_CONCEAL |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5504 // Get rid of the boguscols now, we want to draw until the right |
|
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5505 // edge for 'cursorcolumn'. |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5506 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5507 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5508 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5509 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5510 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5511 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5512 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5513 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5514 && (int)wp->w_virtcol >= VCOL_HLC - eol_hl_off |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5515 && (int)wp->w_virtcol < |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5516 wp->w_width * (row - startrow + 1) + v |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5517 && lnum != wp->w_cursor.lnum) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5518 || draw_color_col |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5519 || win_attr != 0) |
| 743 | 5520 # ifdef FEAT_RIGHTLEFT |
| 5521 && !wp->w_p_rl | |
| 5522 # endif | |
| 5523 ) | |
| 5524 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5525 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5526 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5527 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5528 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5529 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5530 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5531 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5532 for (i = 0; color_cols[i] >= 0; ++i) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5533 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5534 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5535 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5536 while (col < wp->w_width) |
| 743 | 5537 { |
| 5538 ScreenLines[off] = ' '; | |
| 5539 if (enc_utf8) | |
| 5540 ScreenLinesUC[off] = 0; | |
| 5541 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5542 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5543 draw_color_col = advance_color_col(VCOL_HLC, |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5544 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5545 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5546 if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5547 ScreenAttrs[off++] = HL_ATTR(HLF_CUC); |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5548 else if (draw_color_col && VCOL_HLC == *color_cols) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5549 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5550 else |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5551 ScreenAttrs[off++] = win_attr; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5552 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5553 if (VCOL_HLC >= rightmost_vcol && win_attr == 0) |
| 743 | 5554 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5555 |
| 743 | 5556 ++vcol; |
| 5557 } | |
| 5558 } | |
| 5559 #endif | |
| 7 | 5560 |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5561 screen_line(screen_row, wp->w_wincol, col, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5562 (int)wp->w_width, screen_line_flags); |
| 7 | 5563 row++; |
| 5564 | |
| 5565 /* | |
| 5566 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5567 * updated (saves a call to plines() later). | |
| 5568 */ | |
| 5569 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5570 { | |
| 5571 curwin->w_cline_row = startrow; | |
| 5572 curwin->w_cline_height = row - startrow; | |
| 5573 #ifdef FEAT_FOLDING | |
| 5574 curwin->w_cline_folded = FALSE; | |
| 5575 #endif | |
| 5576 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5577 } | |
| 5578 | |
| 5579 break; | |
| 5580 } | |
| 5581 | |
|
16592
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5582 // Show "extends" character from 'listchars' if beyond the line end and |
|
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5583 // 'list' is set. |
|
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5584 if (lcs_ext != NUL |
|
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5585 && wp->w_p_list |
| 7 | 5586 && !wp->w_p_wrap |
| 5587 #ifdef FEAT_DIFF | |
| 5588 && filler_todo <= 0 | |
| 5589 #endif | |
| 5590 && ( | |
| 5591 #ifdef FEAT_RIGHTLEFT | |
| 5592 wp->w_p_rl ? col == 0 : | |
| 5593 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5594 col == wp->w_width - 1) |
| 7 | 5595 && (*ptr != NUL |
| 1555 | 5596 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5597 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5598 { | |
| 5599 c = lcs_ext; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5600 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5601 mb_c = c; |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
5602 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5603 { |
| 5604 mb_utf8 = TRUE; | |
| 714 | 5605 u8cc[0] = 0; |
| 819 | 5606 c = 0xc0; |
| 7 | 5607 } |
| 5608 else | |
| 5609 mb_utf8 = FALSE; | |
| 5610 } | |
| 5611 | |
| 743 | 5612 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5613 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5614 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5615 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5616 |
| 743 | 5617 /* Highlight the cursor column if 'cursorcolumn' is set. But don't |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5618 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5619 * Also highlight the 'colorcolumn' if it is different than |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5620 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5621 vcol_save_attr = -1; |
|
11585
18373179040e
patch 8.0.0675: 'colorcolumn' has a higher priority than 'hlsearch'
Christian Brabandt <cb@256bit.org>
parents:
11529
diff
changeset
|
5622 if (draw_state == WL_LINE && !lnum_in_visual_area |
|
18373179040e
patch 8.0.0675: 'colorcolumn' has a higher priority than 'hlsearch'
Christian Brabandt <cb@256bit.org>
parents:
11529
diff
changeset
|
5623 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5624 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5625 if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5626 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5627 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5628 vcol_save_attr = char_attr; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5629 char_attr = hl_combine_attr(char_attr, HL_ATTR(HLF_CUC)); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5630 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5631 else if (draw_color_col && VCOL_HLC == *color_cols) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5632 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5633 vcol_save_attr = char_attr; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5634 char_attr = hl_combine_attr(char_attr, HL_ATTR(HLF_MC)); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5635 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5636 } |
| 743 | 5637 #endif |
| 5638 | |
| 7 | 5639 /* |
| 5640 * Store character to be displayed. | |
| 5641 * Skip characters that are left of the screen for 'nowrap'. | |
| 5642 */ | |
| 5643 vcol_prev = vcol; | |
| 5644 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5645 { | |
| 5646 /* | |
| 5647 * Store the character. | |
| 5648 */ | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5649 #if defined(FEAT_RIGHTLEFT) |
| 7 | 5650 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) |
| 5651 { | |
| 5652 /* A double-wide character is: put first halve in left cell. */ | |
| 5653 --off; | |
| 5654 --col; | |
| 5655 } | |
| 5656 #endif | |
| 5657 ScreenLines[off] = c; | |
| 5658 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5659 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5660 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5661 ScreenLines[off] = 0x8e; |
| 7 | 5662 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5663 } |
| 7 | 5664 else if (enc_utf8) |
| 5665 { | |
| 5666 if (mb_utf8) | |
| 5667 { | |
| 1326 | 5668 int i; |
| 5669 | |
| 7 | 5670 ScreenLinesUC[off] = mb_c; |
| 819 | 5671 if ((c & 0xff) == 0) |
| 5672 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5673 for (i = 0; i < Screen_mco; ++i) |
| 5674 { | |
| 5675 ScreenLinesC[i][off] = u8cc[i]; | |
| 5676 if (u8cc[i] == 0) | |
| 5677 break; | |
| 5678 } | |
| 7 | 5679 } |
| 5680 else | |
| 5681 ScreenLinesUC[off] = 0; | |
| 5682 } | |
| 5683 if (multi_attr) | |
| 5684 { | |
| 5685 ScreenAttrs[off] = multi_attr; | |
| 5686 multi_attr = 0; | |
| 5687 } | |
| 5688 else | |
| 5689 ScreenAttrs[off] = char_attr; | |
| 5690 | |
| 5691 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5692 { | |
| 5693 /* Need to fill two screen columns. */ | |
| 5694 ++off; | |
| 5695 ++col; | |
| 5696 if (enc_utf8) | |
| 5697 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5698 ScreenLines[off] = 0; | |
| 5699 else | |
| 5700 /* DBCS: Put second byte in the second screen char. */ | |
| 5701 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5702 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5703 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5704 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5705 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5706 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5707 ++vcol; |
| 7 | 5708 /* When "tocol" is halfway a character, set it to the end of |
| 5709 * the character, otherwise highlighting won't stop. */ | |
| 5710 if (tocol == vcol) | |
| 5711 ++tocol; | |
| 5712 #ifdef FEAT_RIGHTLEFT | |
| 5713 if (wp->w_p_rl) | |
| 5714 { | |
| 5715 /* now it's time to backup one cell */ | |
| 5716 --off; | |
| 5717 --col; | |
| 5718 } | |
| 5719 #endif | |
| 5720 } | |
| 5721 #ifdef FEAT_RIGHTLEFT | |
| 5722 if (wp->w_p_rl) | |
| 5723 { | |
| 5724 --off; | |
| 5725 --col; | |
| 5726 } | |
| 5727 else | |
| 5728 #endif | |
| 5729 { | |
| 5730 ++off; | |
| 5731 ++col; | |
| 5732 } | |
| 5733 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5734 #ifdef FEAT_CONCEAL |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5735 else if (wp->w_p_cole > 0 && is_concealing) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5736 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5737 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5738 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5739 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5740 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5741 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5742 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5743 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5744 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5745 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5746 * Advance the column indicator to force the line |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5747 * drawing to wrap early. This will make the line |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5748 * take up the same screen space when parts are concealed, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5749 * so that cursor line computations aren't messed up. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5750 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5751 * To avoid the fictitious advance of 'col' causing |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5752 * trailing junk to be written out of the screen line |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5753 * we are building, 'boguscols' keeps track of the number |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5754 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5755 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5756 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5757 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5758 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5759 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5760 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5761 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5762 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5763 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5764 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5765 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5766 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5767 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5768 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5769 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5770 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5771 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5772 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5773 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5774 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5775 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5776 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5777 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5778 /* Need to fill two screen columns. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5779 # ifdef FEAT_RIGHTLEFT |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5780 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5781 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5782 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5783 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5784 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5785 else |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5786 # endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5787 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5788 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5789 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5790 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5791 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5792 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5793 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5794 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5795 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5796 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5797 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5798 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5799 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5800 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5801 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5802 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5803 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5804 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5805 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5806 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5807 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5808 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5809 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5810 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5811 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5812 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5813 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5814 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5815 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5816 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5817 #endif /* FEAT_CONCEAL */ |
| 7 | 5818 else |
| 5819 --n_skip; | |
| 5820 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5821 /* Only advance the "vcol" when after the 'number' or 'relativenumber' |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5822 * column. */ |
| 1849 | 5823 if (draw_state > WL_NR |
| 7 | 5824 #ifdef FEAT_DIFF |
| 5825 && filler_todo <= 0 | |
| 5826 #endif | |
| 5827 ) | |
| 5828 ++vcol; | |
| 5829 | |
| 743 | 5830 #ifdef FEAT_SYN_HL |
| 5831 if (vcol_save_attr >= 0) | |
| 5832 char_attr = vcol_save_attr; | |
| 5833 #endif | |
| 5834 | |
| 7 | 5835 /* restore attributes after "predeces" in 'listchars' */ |
| 5836 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5837 char_attr = saved_attr3; | |
| 5838 | |
| 5839 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5840 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5841 char_attr = saved_attr2; | |
| 5842 | |
| 5843 /* | |
| 5844 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5845 * so far. If there is no more to display it is caught above. |
| 7 | 5846 */ |
| 5847 if (( | |
| 5848 #ifdef FEAT_RIGHTLEFT | |
| 5849 wp->w_p_rl ? (col < 0) : | |
| 5850 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5851 (col >= wp->w_width)) |
| 7 | 5852 && (*ptr != NUL |
| 5853 #ifdef FEAT_DIFF | |
| 5854 || filler_todo > 0 | |
| 5855 #endif | |
| 2724 | 5856 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5857 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5858 ) | |
| 5859 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5860 #ifdef FEAT_CONCEAL |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5861 screen_line(screen_row, wp->w_wincol, col - boguscols, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5862 (int)wp->w_width, screen_line_flags); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5863 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5864 #else |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5865 screen_line(screen_row, wp->w_wincol, col, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5866 (int)wp->w_width, screen_line_flags); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5867 #endif |
| 7 | 5868 ++row; |
| 5869 ++screen_row; | |
| 5870 | |
| 5871 /* When not wrapping and finished diff lines, or when displayed | |
| 5872 * '$' and highlighting until last column, break here. */ | |
| 5873 if ((!wp->w_p_wrap | |
| 5874 #ifdef FEAT_DIFF | |
| 5875 && filler_todo <= 0 | |
| 5876 #endif | |
| 5877 ) || lcs_eol_one == -1) | |
| 5878 break; | |
| 5879 | |
| 5880 /* When the window is too narrow draw all "@" lines. */ | |
| 5881 if (draw_state != WL_LINE | |
| 5882 #ifdef FEAT_DIFF | |
| 5883 && filler_todo <= 0 | |
| 5884 #endif | |
| 5885 ) | |
| 5886 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
5887 win_draw_end(wp, '@', ' ', TRUE, row, wp->w_height, HLF_AT); |
| 7 | 5888 draw_vsep_win(wp, row); |
| 5889 row = endrow; | |
| 5890 } | |
| 5891 | |
| 5892 /* When line got too long for screen break here. */ | |
| 5893 if (row == endrow) | |
| 5894 { | |
| 5895 ++row; | |
| 5896 break; | |
| 5897 } | |
| 5898 | |
| 5899 if (screen_cur_row == screen_row - 1 | |
| 5900 #ifdef FEAT_DIFF | |
| 5901 && filler_todo <= 0 | |
| 5902 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5903 && wp->w_width == Columns) |
| 7 | 5904 { |
| 5905 /* Remember that the line wraps, used for modeless copy. */ | |
| 5906 LineWraps[screen_row - 1] = TRUE; | |
| 5907 | |
| 5908 /* | |
| 5909 * Special trick to make copy/paste of wrapped lines work with | |
| 5910 * xterm/screen: write an extra character beyond the end of | |
| 5911 * the line. This will work with all terminal types | |
| 5912 * (regardless of the xn,am settings). | |
| 5913 * Only do this on a fast tty. | |
| 5914 * Only do this if the cursor is on the current line | |
| 5915 * (something has been written in it). | |
| 5916 * Don't do this for the GUI. | |
| 5917 * Don't do this for double-width characters. | |
| 5918 * Don't do this for a window not at the right screen border. | |
| 5919 */ | |
| 5920 if (p_tf | |
| 5921 #ifdef FEAT_GUI | |
| 5922 && !gui.in_use | |
| 5923 #endif | |
| 5924 && !(has_mbyte | |
| 1378 | 5925 && ((*mb_off2cells)(LineOffset[screen_row], |
| 5926 LineOffset[screen_row] + screen_Columns) | |
| 5927 == 2 | |
| 7 | 5928 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 5929 + (int)Columns - 2, |
| 5930 LineOffset[screen_row] + screen_Columns) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5931 == 2))) |
| 7 | 5932 { |
| 5933 /* First make sure we are at the end of the screen line, | |
| 5934 * then output the same character again to let the | |
| 5935 * terminal know about the wrap. If the terminal doesn't | |
| 5936 * auto-wrap, we overwrite the character. */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5937 if (screen_cur_col != wp->w_width) |
| 7 | 5938 screen_char(LineOffset[screen_row - 1] |
| 5939 + (unsigned)Columns - 1, | |
| 5940 screen_row - 1, (int)(Columns - 1)); | |
| 5941 | |
| 5942 /* When there is a multi-byte character, just output a | |
| 5943 * space to keep it simple. */ | |
| 148 | 5944 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 5945 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 5946 out_char(' '); |
| 5947 else | |
| 5948 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 5949 + (Columns - 1)]); | |
| 5950 /* force a redraw of the first char on the next line */ | |
| 5951 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 5952 screen_start(); /* don't know where cursor is now */ | |
| 5953 } | |
| 5954 } | |
| 5955 | |
| 5956 col = 0; | |
| 5957 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5958 #ifdef FEAT_RIGHTLEFT | |
| 5959 if (wp->w_p_rl) | |
| 5960 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5961 col = wp->w_width - 1; /* col is not used if breaking! */ |
| 7 | 5962 off += col; |
| 5963 } | |
| 5964 #endif | |
| 5965 | |
| 5966 /* reset the drawing state for the start of a wrapped line */ | |
| 5967 draw_state = WL_START; | |
| 5968 saved_n_extra = n_extra; | |
| 5969 saved_p_extra = p_extra; | |
| 5970 saved_c_extra = c_extra; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5971 saved_c_final = c_final; |
| 7 | 5972 saved_char_attr = char_attr; |
| 5973 n_extra = 0; | |
| 5974 lcs_prec_todo = lcs_prec; | |
| 5975 #ifdef FEAT_LINEBREAK | |
| 5976 # ifdef FEAT_DIFF | |
| 5977 if (filler_todo <= 0) | |
| 5978 # endif | |
| 5979 need_showbreak = TRUE; | |
| 5980 #endif | |
| 5981 #ifdef FEAT_DIFF | |
| 5982 --filler_todo; | |
| 5983 /* When the filler lines are actually below the last line of the | |
| 5984 * file, don't draw the line itself, break here. */ | |
| 5985 if (filler_todo == 0 && wp->w_botfill) | |
| 5986 break; | |
| 5987 #endif | |
| 5988 } | |
| 5989 | |
| 5990 } /* for every character in the line */ | |
| 5991 | |
| 743 | 5992 #ifdef FEAT_SPELL |
| 386 | 5993 /* After an empty line check first word for capital. */ |
| 5994 if (*skipwhite(line) == NUL) | |
| 5995 { | |
| 5996 capcol_lnum = lnum + 1; | |
| 5997 cap_col = 0; | |
| 5998 } | |
| 5999 #endif | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6000 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6001 vim_free(text_props); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6002 vim_free(text_prop_idxs); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6003 #endif |
| 386 | 6004 |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
6005 vim_free(p_extra_free); |
| 7 | 6006 return row; |
| 6007 } | |
| 6008 | |
| 714 | 6009 /* |
| 6010 * Return if the composing characters at "off_from" and "off_to" differ. | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
6011 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 6012 */ |
| 6013 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6014 comp_char_differs(int off_from, int off_to) |
| 714 | 6015 { |
| 6016 int i; | |
| 6017 | |
| 6018 for (i = 0; i < Screen_mco; ++i) | |
| 6019 { | |
| 6020 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 6021 return TRUE; | |
| 6022 if (ScreenLinesC[i][off_from] == 0) | |
| 6023 break; | |
| 6024 } | |
| 6025 return FALSE; | |
| 6026 } | |
| 6027 | |
| 7 | 6028 /* |
| 6029 * Check whether the given character needs redrawing: | |
| 6030 * - the (first byte of the) character is different | |
| 6031 * - the attributes are different | |
| 6032 * - the character is multi-byte and the next byte is different | |
| 1616 | 6033 * - the character is two cells wide and the second cell differs. |
| 7 | 6034 */ |
| 6035 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6036 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 6037 { |
| 6038 if (cols > 0 | |
| 6039 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 6040 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6041 || (enc_dbcs != 0 | |
| 6042 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 6043 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 6044 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 6045 : (cols > 1 && ScreenLines[off_from + 1] | |
| 6046 != ScreenLines[off_to + 1]))) | |
| 6047 || (enc_utf8 | |
| 6048 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 6049 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 6050 && comp_char_differs(off_from, off_to)) |
| 3759 | 6051 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6052 && ScreenLines[off_from + 1] | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6053 != ScreenLines[off_to + 1]))))) |
| 7 | 6054 return TRUE; |
| 6055 return FALSE; | |
| 6056 } | |
| 6057 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6058 #if defined(FEAT_TERMINAL) || defined(PROTO) |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6059 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6060 * Return the index in ScreenLines[] for the current screen line. |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6061 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6062 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6063 screen_get_current_line_off() |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6064 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6065 return (int)(current_ScreenLine - ScreenLines); |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6066 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6067 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6068 |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6069 #ifdef FEAT_TEXT_PROP |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6070 /* |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6071 * Return TRUE if this position has a higher level popup or this cell is |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6072 * transparent in the current popup. |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6073 */ |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6074 static int |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6075 blocked_by_popup(int row, int col) |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6076 { |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6077 int off; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6078 |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6079 if (!popup_visible) |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6080 return FALSE; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6081 off = row * screen_Columns + col; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6082 return popup_mask[off] > screen_zindex || popup_transparent[off]; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6083 } |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6084 #endif |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6085 |
| 7 | 6086 /* |
| 6087 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6088 * have actually changed. Handle insert/delete character. | |
| 6089 * "coloff" gives the first column on the screen for this line. | |
| 6090 * "endcol" gives the columns where valid characters are. | |
| 6091 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6092 * needs to be cleared, negative otherwise. | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6093 * "flags" can have bits: |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6094 * SLF_POPUP popup window |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6095 * SLF_RIGHTLEFT rightleft window: |
| 7 | 6096 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" |
| 6097 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6098 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6099 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6100 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6101 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6102 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6103 int endcol, |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6104 int clear_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6105 int flags UNUSED) |
| 7 | 6106 { |
| 6107 unsigned off_from; | |
| 6108 unsigned off_to; | |
| 1378 | 6109 unsigned max_off_from; |
| 6110 unsigned max_off_to; | |
| 7 | 6111 int col = 0; |
| 6112 int hl; | |
| 6113 int force = FALSE; /* force update rest of the line */ | |
| 6114 int redraw_this /* bool: does character need redraw? */ | |
| 6115 #ifdef FEAT_GUI | |
| 6116 = TRUE /* For GUI when while-loop empty */ | |
| 6117 #endif | |
| 6118 ; | |
| 6119 int redraw_next; /* redraw_this for next character */ | |
| 6120 int clear_next = FALSE; | |
| 6121 int char_cells; /* 1: normal char */ | |
| 6122 /* 2: occupies two display cells */ | |
| 6123 # define CHAR_CELLS char_cells | |
| 6124 | |
| 3413 | 6125 /* Check for illegal row and col, just in case. */ |
| 6126 if (row >= Rows) | |
| 6127 row = Rows - 1; | |
| 6128 if (endcol > Columns) | |
| 6129 endcol = Columns; | |
| 6130 | |
| 7 | 6131 # ifdef FEAT_CLIPBOARD |
| 6132 clip_may_clear_selection(row, row); | |
| 6133 # endif | |
| 6134 | |
| 6135 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6136 off_to = LineOffset[row] + coloff; | |
| 1378 | 6137 max_off_from = off_from + screen_Columns; |
| 6138 max_off_to = LineOffset[row] + screen_Columns; | |
| 7 | 6139 |
| 6140 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6141 if (flags & SLF_RIGHTLEFT) |
| 7 | 6142 { |
| 6143 /* Clear rest first, because it's left of the text. */ | |
| 6144 if (clear_width > 0) | |
| 6145 { | |
| 6146 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6147 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6148 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6149 { |
| 6150 ++off_to; | |
| 6151 ++col; | |
| 6152 } | |
| 6153 if (col <= endcol) | |
| 6154 screen_fill(row, row + 1, col + coloff, | |
| 6155 endcol + coloff + 1, ' ', ' ', 0); | |
| 6156 } | |
| 6157 col = endcol + 1; | |
| 6158 off_to = LineOffset[row] + col + coloff; | |
| 6159 off_from += col; | |
| 6160 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6161 } | |
| 6162 #endif /* FEAT_RIGHTLEFT */ | |
| 6163 | |
| 6164 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6165 | |
| 6166 while (col < endcol) | |
| 6167 { | |
| 6168 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6169 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6170 else |
| 6171 char_cells = 1; | |
| 6172 | |
| 6173 redraw_this = redraw_next; | |
| 6174 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6175 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6176 | |
| 6177 #ifdef FEAT_GUI | |
| 6178 /* If the next character was bold, then redraw the current character to | |
| 6179 * remove any pixels that might have spilt over into us. This only | |
| 6180 * happens in the GUI. | |
| 6181 */ | |
| 6182 if (redraw_next && gui.in_use) | |
| 6183 { | |
| 6184 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6185 if (hl > HL_ALL) |
| 6186 hl = syn_attr2attr(hl); | |
| 6187 if (hl & HL_BOLD) | |
| 7 | 6188 redraw_this = TRUE; |
| 6189 } | |
| 6190 #endif | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
6191 #ifdef FEAT_TEXT_PROP |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6192 if (blocked_by_popup(row, col + coloff)) |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
6193 redraw_this = FALSE; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
6194 #endif |
| 7 | 6195 if (redraw_this) |
| 6196 { | |
| 6197 /* | |
| 6198 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6199 * Attributes for characters are stored at the position where the | |
| 6200 * cursor is when writing the highlighting code. The | |
| 6201 * start-highlighting code must be written with the cursor on the | |
| 6202 * first highlighted character. The stop-highlighting code must | |
| 6203 * be written with the cursor just after the last highlighted | |
| 6204 * character. | |
|
15034
6e4e0d43b20b
patch 8.1.0528: various typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
14877
diff
changeset
|
6205 * Overwriting a character doesn't remove its highlighting. Need |
| 7 | 6206 * to clear the rest of the line, and force redrawing it |
| 6207 * completely. | |
| 6208 */ | |
| 6209 if ( p_wiv | |
| 6210 && !force | |
| 6211 #ifdef FEAT_GUI | |
| 6212 && !gui.in_use | |
| 6213 #endif | |
| 6214 && ScreenAttrs[off_to] != 0 | |
| 6215 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6216 { | |
| 6217 /* | |
| 6218 * Need to remove highlighting attributes here. | |
| 6219 */ | |
| 6220 windgoto(row, col + coloff); | |
| 6221 out_str(T_CE); /* clear rest of this screen line */ | |
| 6222 screen_start(); /* don't know where cursor is now */ | |
| 6223 force = TRUE; /* force redraw of rest of the line */ | |
| 6224 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6225 | |
| 6226 /* | |
| 6227 * If the previous character was highlighted, need to stop | |
| 6228 * highlighting at this character. | |
| 6229 */ | |
| 6230 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6231 { | |
| 6232 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6233 term_windgoto(row, col + coloff); | |
| 6234 screen_stop_highlight(); | |
| 6235 } | |
| 6236 else | |
| 6237 screen_attr = 0; /* highlighting has stopped */ | |
| 6238 } | |
| 6239 if (enc_dbcs != 0) | |
| 6240 { | |
| 6241 /* Check if overwriting a double-byte with a single-byte or | |
| 6242 * the other way around requires another character to be | |
| 6243 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6244 * ScreenLinesUC[] is sufficient. */ | |
| 6245 if (char_cells == 1 | |
| 6246 && col + 1 < endcol | |
| 1378 | 6247 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6248 { |
| 6249 /* Writing a single-cell character over a double-cell | |
| 6250 * character: need to redraw the next cell. */ | |
| 6251 ScreenLines[off_to + 1] = 0; | |
| 6252 redraw_next = TRUE; | |
| 6253 } | |
| 6254 else if (char_cells == 2 | |
| 6255 && col + 2 < endcol | |
| 1378 | 6256 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6257 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6258 { |
| 6259 /* Writing the second half of a double-cell character over | |
| 6260 * a double-cell character: need to redraw the second | |
| 6261 * cell. */ | |
| 6262 ScreenLines[off_to + 2] = 0; | |
| 6263 redraw_next = TRUE; | |
| 6264 } | |
| 6265 | |
| 6266 if (enc_dbcs == DBCS_JPNU) | |
| 6267 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6268 } | |
| 6269 /* When writing a single-width character over a double-width | |
| 6270 * character and at the end of the redrawn text, need to clear out | |
| 6271 * the right halve of the old character. | |
| 6272 * Also required when writing the right halve of a double-width | |
| 6273 * char over the left halve of an existing one. */ | |
| 6274 if (has_mbyte && col + char_cells == endcol | |
| 6275 && ((char_cells == 1 | |
| 1378 | 6276 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6277 || (char_cells == 2 |
| 1378 | 6278 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6279 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6280 clear_next = TRUE; |
| 6281 | |
| 6282 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6283 if (enc_utf8) | |
| 6284 { | |
| 6285 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6286 if (ScreenLinesUC[off_from] != 0) | |
| 6287 { | |
| 714 | 6288 int i; |
| 6289 | |
| 6290 for (i = 0; i < Screen_mco; ++i) | |
| 6291 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6292 } |
| 6293 } | |
| 6294 if (char_cells == 2) | |
| 6295 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6296 | |
| 6297 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6298 /* The bold trick makes a single column of pixels appear in the |
| 6299 * next character. When a bold character is removed, the next | |
| 7 | 6300 * character should be redrawn too. This happens for our own GUI |
| 6301 * and for some xterms. */ | |
| 6302 if ( | |
| 6303 # ifdef FEAT_GUI | |
| 6304 gui.in_use | |
| 6305 # endif | |
| 6306 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6307 || | |
| 6308 # endif | |
| 6309 # ifdef UNIX | |
| 6310 term_is_xterm | |
| 6311 # endif | |
| 6312 ) | |
| 6313 { | |
| 6314 hl = ScreenAttrs[off_to]; | |
| 743 | 6315 if (hl > HL_ALL) |
| 6316 hl = syn_attr2attr(hl); | |
| 6317 if (hl & HL_BOLD) | |
| 7 | 6318 redraw_next = TRUE; |
| 6319 } | |
| 6320 #endif | |
| 6321 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6322 |
| 819 | 6323 /* For simplicity set the attributes of second half of a |
| 6324 * double-wide character equal to the first half. */ | |
| 6325 if (char_cells == 2) | |
| 6326 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6327 | |
| 7 | 6328 if (enc_dbcs != 0 && char_cells == 2) |
| 6329 screen_char_2(off_to, row, col + coloff); | |
| 6330 else | |
| 6331 screen_char(off_to, row, col + coloff); | |
| 6332 } | |
| 6333 else if ( p_wiv | |
| 6334 #ifdef FEAT_GUI | |
| 6335 && !gui.in_use | |
| 6336 #endif | |
| 6337 && col + coloff > 0) | |
| 6338 { | |
| 6339 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6340 { | |
| 6341 /* | |
| 6342 * Don't output stop-highlight when moving the cursor, it will | |
| 6343 * stop the highlighting when it should continue. | |
| 6344 */ | |
| 6345 screen_attr = 0; | |
| 6346 } | |
| 6347 else if (screen_attr != 0) | |
| 6348 screen_stop_highlight(); | |
| 6349 } | |
| 6350 | |
| 6351 off_to += CHAR_CELLS; | |
| 6352 off_from += CHAR_CELLS; | |
| 6353 col += CHAR_CELLS; | |
| 6354 } | |
| 6355 | |
| 6356 if (clear_next) | |
| 6357 { | |
| 6358 /* Clear the second half of a double-wide character of which the left | |
| 6359 * half was overwritten with a single-wide character. */ | |
| 6360 ScreenLines[off_to] = ' '; | |
| 6361 if (enc_utf8) | |
| 6362 ScreenLinesUC[off_to] = 0; | |
| 6363 screen_char(off_to, row, col + coloff); | |
| 6364 } | |
| 6365 | |
| 6366 if (clear_width > 0 | |
| 6367 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6368 && !(flags & SLF_RIGHTLEFT) |
| 7 | 6369 #endif |
| 6370 ) | |
| 6371 { | |
| 6372 #ifdef FEAT_GUI | |
| 6373 int startCol = col; | |
| 6374 #endif | |
| 6375 | |
| 6376 /* blank out the rest of the line */ | |
| 6377 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6378 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6379 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6380 { |
| 6381 ++off_to; | |
| 6382 ++col; | |
| 6383 } | |
| 6384 if (col < clear_width) | |
| 6385 { | |
| 6386 #ifdef FEAT_GUI | |
| 6387 /* | |
| 6388 * In the GUI, clearing the rest of the line may leave pixels | |
| 6389 * behind if the first character cleared was bold. Some bold | |
| 6390 * fonts spill over the left. In this case we redraw the previous | |
| 6391 * character too. If we didn't skip any blanks above, then we | |
| 6392 * only redraw if the character wasn't already redrawn anyway. | |
| 6393 */ | |
| 996 | 6394 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6395 { |
| 6396 hl = ScreenAttrs[off_to]; | |
| 6397 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6398 { |
| 6399 int prev_cells = 1; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6400 |
| 996 | 6401 if (enc_utf8) |
| 6402 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6403 * that its width is 2. */ | |
| 6404 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6405 else if (enc_dbcs != 0) | |
| 6406 { | |
| 6407 /* find previous character by counting from first | |
| 6408 * column and get its width. */ | |
| 6409 unsigned off = LineOffset[row]; | |
| 1378 | 6410 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6411 |
| 6412 while (off < off_to) | |
| 6413 { | |
| 1378 | 6414 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6415 off += prev_cells; |
| 6416 } | |
| 6417 } | |
| 6418 | |
| 6419 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6420 screen_char_2(off_to - prev_cells, row, | |
| 6421 col + coloff - prev_cells); | |
| 6422 else | |
| 6423 screen_char(off_to - prev_cells, row, | |
| 6424 col + coloff - prev_cells); | |
| 6425 } | |
| 7 | 6426 } |
| 6427 #endif | |
| 6428 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6429 ' ', ' ', 0); | |
| 6430 off_to += clear_width - col; | |
| 6431 col = clear_width; | |
| 6432 } | |
| 6433 } | |
| 6434 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6435 if (clear_width > 0 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6436 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6437 && !(flags & SLF_POPUP) // no separator for popup window |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6438 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6439 ) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6440 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6441 // For a window that has a right neighbor, draw the separator char |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6442 // right of the window contents. But not on top of a popup window. |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6443 if (coloff + col < Columns) |
| 7 | 6444 { |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6445 #ifdef FEAT_TEXT_PROP |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6446 if (!blocked_by_popup(row, col + coloff)) |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6447 #endif |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6448 { |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6449 int c; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6450 |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6451 c = fillchar_vsep(&hl); |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6452 if (ScreenLines[off_to] != (schar_T)c |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6453 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6454 != (c >= 0x80 ? c : 0)) |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6455 || ScreenAttrs[off_to] != hl) |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6456 { |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6457 ScreenLines[off_to] = c; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6458 ScreenAttrs[off_to] = hl; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6459 if (enc_utf8) |
| 7 | 6460 { |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6461 if (c >= 0x80) |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6462 { |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6463 ScreenLinesUC[off_to] = c; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6464 ScreenLinesC[0][off_to] = 0; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6465 } |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6466 else |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6467 ScreenLinesUC[off_to] = 0; |
| 7 | 6468 } |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6469 screen_char(off_to, row, col + coloff); |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6470 } |
| 7 | 6471 } |
| 6472 } | |
| 6473 else | |
| 6474 LineWraps[row] = FALSE; | |
| 6475 } | |
| 6476 } | |
| 6477 | |
| 474 | 6478 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6479 /* |
| 474 | 6480 * Mirror text "str" for right-left displaying. |
| 6481 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6482 */ |
| 474 | 6483 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6484 rl_mirror(char_u *str) |
| 7 | 6485 { |
| 6486 char_u *p1, *p2; | |
| 6487 int t; | |
| 6488 | |
| 6489 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6490 { | |
| 6491 t = *p1; | |
| 6492 *p1 = *p2; | |
| 6493 *p2 = t; | |
| 6494 } | |
| 6495 } | |
| 6496 #endif | |
| 6497 | |
| 6498 /* | |
| 6499 * mark all status lines for redraw; used after first :cd | |
| 6500 */ | |
| 6501 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6502 status_redraw_all(void) |
| 7 | 6503 { |
| 6504 win_T *wp; | |
| 6505 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6506 FOR_ALL_WINDOWS(wp) |
| 7 | 6507 if (wp->w_status_height) |
| 6508 { | |
| 6509 wp->w_redr_status = TRUE; | |
| 6510 redraw_later(VALID); | |
| 6511 } | |
| 6512 } | |
| 6513 | |
| 6514 /* | |
| 6515 * mark all status lines of the current buffer for redraw | |
| 6516 */ | |
| 6517 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6518 status_redraw_curbuf(void) |
| 7 | 6519 { |
| 6520 win_T *wp; | |
| 6521 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6522 FOR_ALL_WINDOWS(wp) |
| 7 | 6523 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6524 { | |
| 6525 wp->w_redr_status = TRUE; | |
| 6526 redraw_later(VALID); | |
| 6527 } | |
| 6528 } | |
| 6529 | |
| 6530 /* | |
| 6531 * Redraw all status lines that need to be redrawn. | |
| 6532 */ | |
| 6533 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6534 redraw_statuslines(void) |
| 7 | 6535 { |
| 6536 win_T *wp; | |
| 6537 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6538 FOR_ALL_WINDOWS(wp) |
| 7 | 6539 if (wp->w_redr_status) |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6540 win_redr_status(wp, FALSE); |
| 673 | 6541 if (redraw_tabline) |
| 677 | 6542 draw_tabline(); |
| 7 | 6543 } |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6544 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6545 #if defined(FEAT_WILDMENU) || defined(PROTO) |
| 7 | 6546 /* |
| 6547 * Redraw all status lines at the bottom of frame "frp". | |
| 6548 */ | |
| 6549 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6550 win_redraw_last_status(frame_T *frp) |
| 7 | 6551 { |
| 6552 if (frp->fr_layout == FR_LEAF) | |
| 6553 frp->fr_win->w_redr_status = TRUE; | |
| 6554 else if (frp->fr_layout == FR_ROW) | |
| 6555 { | |
|
15227
95678f27a704
patch 8.1.0623: iterating through window frames is repeated
Bram Moolenaar <Bram@vim.org>
parents:
15138
diff
changeset
|
6556 FOR_ALL_FRAMES(frp, frp->fr_child) |
| 7 | 6557 win_redraw_last_status(frp); |
| 6558 } | |
| 6559 else /* frp->fr_layout == FR_COL */ | |
| 6560 { | |
| 6561 frp = frp->fr_child; | |
| 6562 while (frp->fr_next != NULL) | |
| 6563 frp = frp->fr_next; | |
| 6564 win_redraw_last_status(frp); | |
| 6565 } | |
| 6566 } | |
| 6567 #endif | |
| 6568 | |
| 6569 /* | |
| 6570 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6571 */ | |
| 6572 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6573 draw_vsep_win(win_T *wp, int row) |
| 7 | 6574 { |
| 6575 int hl; | |
| 6576 int c; | |
| 6577 | |
| 6578 if (wp->w_vsep_width) | |
| 6579 { | |
| 6580 /* draw the vertical separator right of this window */ | |
| 6581 c = fillchar_vsep(&hl); | |
| 6582 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6583 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6584 c, ' ', hl); | |
| 6585 } | |
| 6586 } | |
| 6587 | |
| 6588 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6589 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6590 |
| 6591 /* | |
| 1378 | 6592 * Get the length of an item as it will be shown in the status line. |
| 7 | 6593 */ |
| 6594 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6595 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6596 { |
| 6597 int len = 0; | |
| 6598 | |
| 6599 #ifdef FEAT_MENU | |
| 6600 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6601 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6602 | |
| 6603 /* Check for menu separators - replace with '|'. */ | |
| 6604 if (emenu && menu_is_separator(s)) | |
| 6605 return 1; | |
| 6606 #endif | |
| 6607 | |
| 6608 while (*s != NUL) | |
| 6609 { | |
| 1685 | 6610 s += skip_status_match_char(xp, s); |
| 42 | 6611 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6612 MB_PTR_ADV(s); |
| 7 | 6613 } |
| 6614 | |
| 6615 return len; | |
| 6616 } | |
| 6617 | |
| 6618 /* | |
| 1685 | 6619 * Return the number of characters that should be skipped in a status match. |
| 277 | 6620 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6621 */ | |
| 6622 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6623 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6624 { |
| 1685 | 6625 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6626 #ifdef FEAT_MENU |
| 6627 || ((xp->xp_context == EXPAND_MENUS | |
| 6628 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6629 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6630 #endif | |
| 1685 | 6631 ) |
| 6632 { | |
| 6633 #ifndef BACKSLASH_IN_FILENAME | |
| 6634 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6635 return 2; | |
| 6636 #endif | |
| 6637 return 1; | |
| 6638 } | |
| 6639 return 0; | |
| 277 | 6640 } |
| 6641 | |
| 6642 /* | |
| 7 | 6643 * Show wildchar matches in the status line. |
| 6644 * Show at least the "match" item. | |
| 6645 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6646 * | |
| 6647 * If inversion is possible we use it. Else '=' characters are used. | |
| 6648 */ | |
| 6649 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6650 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6651 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6652 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6653 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6654 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6655 int showtail) |
| 7 | 6656 { |
| 6657 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6658 int row; | |
| 6659 char_u *buf; | |
| 6660 int len; | |
| 1378 | 6661 int clen; /* length in screen cells */ |
| 7 | 6662 int fillchar; |
| 6663 int attr; | |
| 6664 int i; | |
| 6665 int highlight = TRUE; | |
| 6666 char_u *selstart = NULL; | |
| 6667 int selstart_col = 0; | |
| 6668 char_u *selend = NULL; | |
| 6669 static int first_match = 0; | |
| 6670 int add_left = FALSE; | |
| 6671 char_u *s; | |
| 6672 #ifdef FEAT_MENU | |
| 6673 int emenu; | |
| 6674 #endif | |
| 6675 int l; | |
| 6676 | |
| 6677 if (matches == NULL) /* interrupted completion? */ | |
| 6678 return; | |
| 6679 | |
| 39 | 6680 if (has_mbyte) |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16676
diff
changeset
|
6681 buf = alloc(Columns * MB_MAXBYTES + 1); |
| 39 | 6682 else |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16676
diff
changeset
|
6683 buf = alloc(Columns + 1); |
| 7 | 6684 if (buf == NULL) |
| 6685 return; | |
| 6686 | |
| 6687 if (match == -1) /* don't show match but original text */ | |
| 6688 { | |
| 6689 match = 0; | |
| 6690 highlight = FALSE; | |
| 6691 } | |
| 6692 /* count 1 for the ending ">" */ | |
| 6693 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6694 if (match == 0) | |
| 6695 first_match = 0; | |
| 6696 else if (match < first_match) | |
| 6697 { | |
| 6698 /* jumping left, as far as we can go */ | |
| 6699 first_match = match; | |
| 6700 add_left = TRUE; | |
| 6701 } | |
| 6702 else | |
| 6703 { | |
| 6704 /* check if match fits on the screen */ | |
| 6705 for (i = first_match; i < match; ++i) | |
| 6706 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6707 if (first_match > 0) | |
| 6708 clen += 2; | |
| 6709 /* jumping right, put match at the left */ | |
| 6710 if ((long)clen > Columns) | |
| 6711 { | |
| 6712 first_match = match; | |
| 6713 /* if showing the last match, we can add some on the left */ | |
| 6714 clen = 2; | |
| 6715 for (i = match; i < num_matches; ++i) | |
| 6716 { | |
| 6717 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6718 if ((long)clen >= Columns) | |
| 6719 break; | |
| 6720 } | |
| 6721 if (i == num_matches) | |
| 6722 add_left = TRUE; | |
| 6723 } | |
| 6724 } | |
| 6725 if (add_left) | |
| 6726 while (first_match > 0) | |
| 6727 { | |
| 6728 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6729 if ((long)clen >= Columns) | |
| 6730 break; | |
| 6731 --first_match; | |
| 6732 } | |
| 6733 | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
6734 fillchar = fillchar_status(&attr, curwin); |
| 7 | 6735 |
| 6736 if (first_match == 0) | |
| 6737 { | |
| 6738 *buf = NUL; | |
| 6739 len = 0; | |
| 6740 } | |
| 6741 else | |
| 6742 { | |
| 6743 STRCPY(buf, "< "); | |
| 6744 len = 2; | |
| 6745 } | |
| 6746 clen = len; | |
| 6747 | |
| 6748 i = first_match; | |
| 6749 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6750 { | |
| 6751 if (i == match) | |
| 6752 { | |
| 6753 selstart = buf + len; | |
| 6754 selstart_col = clen; | |
| 6755 } | |
| 6756 | |
| 6757 s = L_MATCH(i); | |
| 6758 /* Check for menu separators - replace with '|' */ | |
| 6759 #ifdef FEAT_MENU | |
| 6760 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6761 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6762 if (emenu && menu_is_separator(s)) | |
| 6763 { | |
| 6764 STRCPY(buf + len, transchar('|')); | |
| 6765 l = (int)STRLEN(buf + len); | |
| 6766 len += l; | |
| 6767 clen += l; | |
| 6768 } | |
| 6769 else | |
| 6770 #endif | |
| 6771 for ( ; *s != NUL; ++s) | |
| 6772 { | |
| 1685 | 6773 s += skip_status_match_char(xp, s); |
| 7 | 6774 clen += ptr2cells(s); |
| 474 | 6775 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6776 { |
| 6777 STRNCPY(buf + len, s, l); | |
| 6778 s += l - 1; | |
| 6779 len += l; | |
| 6780 } | |
| 6781 else | |
| 6782 { | |
| 6783 STRCPY(buf + len, transchar_byte(*s)); | |
| 6784 len += (int)STRLEN(buf + len); | |
| 6785 } | |
| 6786 } | |
| 6787 if (i == match) | |
| 6788 selend = buf + len; | |
| 6789 | |
| 6790 *(buf + len++) = ' '; | |
| 6791 *(buf + len++) = ' '; | |
| 6792 clen += 2; | |
| 6793 if (++i == num_matches) | |
| 6794 break; | |
| 6795 } | |
| 6796 | |
| 6797 if (i != num_matches) | |
| 6798 { | |
| 6799 *(buf + len++) = '>'; | |
| 6800 ++clen; | |
| 6801 } | |
| 6802 | |
| 6803 buf[len] = NUL; | |
| 6804 | |
| 6805 row = cmdline_row - 1; | |
| 6806 if (row >= 0) | |
| 6807 { | |
| 6808 if (wild_menu_showing == 0) | |
| 6809 { | |
| 6810 if (msg_scrolled > 0) | |
| 6811 { | |
| 6812 /* Put the wildmenu just above the command line. If there is | |
| 6813 * no room, scroll the screen one line up. */ | |
| 6814 if (cmdline_row == Rows - 1) | |
| 6815 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
6816 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 6817 ++msg_scrolled; |
| 6818 } | |
| 6819 else | |
| 6820 { | |
| 6821 ++cmdline_row; | |
| 6822 ++row; | |
| 6823 } | |
| 6824 wild_menu_showing = WM_SCROLLED; | |
| 6825 } | |
| 6826 else | |
| 6827 { | |
| 6828 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6829 * Set 'winminheight' to zero to avoid that the window is | |
| 6830 * resized. */ | |
| 6831 if (lastwin->w_status_height == 0) | |
| 6832 { | |
| 6833 save_p_ls = p_ls; | |
| 6834 save_p_wmh = p_wmh; | |
| 6835 p_ls = 2; | |
| 6836 p_wmh = 0; | |
| 6837 last_status(FALSE); | |
| 6838 } | |
| 6839 wild_menu_showing = WM_SHOWN; | |
| 6840 } | |
| 6841 } | |
| 6842 | |
| 6843 screen_puts(buf, row, 0, attr); | |
| 6844 if (selstart != NULL && highlight) | |
| 6845 { | |
| 6846 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
6847 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 6848 } |
| 6849 | |
| 6850 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6851 } | |
| 6852 | |
| 6853 win_redraw_last_status(topframe); | |
| 6854 vim_free(buf); | |
| 6855 } | |
| 6856 #endif | |
| 6857 | |
| 6858 /* | |
| 6859 * Redraw the status line of window wp. | |
| 6860 * | |
| 6861 * If inversion is possible we use it. Else '=' characters are used. | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6862 * If "ignore_pum" is TRUE, also redraw statusline when the popup menu is |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6863 * displayed. |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6864 */ |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6865 static void |
|
14191
ec39f281e3e8
patch 8.1.0113: compiler warning for unused variable
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
6866 win_redr_status(win_T *wp, int ignore_pum UNUSED) |
| 7 | 6867 { |
| 6868 int row; | |
| 6869 char_u *p; | |
| 6870 int len; | |
| 6871 int fillchar; | |
| 6872 int attr; | |
| 6873 int this_ru_col; | |
| 1910 | 6874 static int busy = FALSE; |
| 6875 | |
| 6876 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6877 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6878 if (busy) | |
| 6879 return; | |
| 6880 busy = TRUE; | |
| 7 | 6881 |
| 6882 wp->w_redr_status = FALSE; | |
| 6883 if (wp->w_status_height == 0) | |
| 6884 { | |
| 6885 /* no status line, can only be last window */ | |
| 6886 redraw_cmdline = TRUE; | |
| 6887 } | |
| 540 | 6888 else if (!redrawing() |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6889 // don't update status line when popup menu is visible and may be |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6890 // drawn over it, unless it will be redrawn later |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17771
diff
changeset
|
6891 || (!ignore_pum && pum_visible())) |
| 7 | 6892 { |
| 6893 /* Don't redraw right now, do it later. */ | |
| 6894 wp->w_redr_status = TRUE; | |
| 6895 } | |
| 6896 #ifdef FEAT_STL_OPT | |
| 40 | 6897 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 6898 { |
| 6899 /* redraw custom status line */ | |
| 1983 | 6900 redraw_custom_statusline(wp); |
| 7 | 6901 } |
| 6902 #endif | |
| 6903 else | |
| 6904 { | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
6905 fillchar = fillchar_status(&attr, wp); |
| 7 | 6906 |
| 685 | 6907 get_trans_bufname(wp->w_buffer); |
| 7 | 6908 p = NameBuff; |
| 6909 len = (int)STRLEN(p); | |
| 6910 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
6911 if (bt_help(wp->w_buffer) |
| 7 | 6912 #ifdef FEAT_QUICKFIX |
| 6913 || wp->w_p_pvw | |
| 6914 #endif | |
| 6915 || bufIsChanged(wp->w_buffer) | |
| 6916 || wp->w_buffer->b_p_ro) | |
| 6917 *(p + len++) = ' '; | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
6918 if (bt_help(wp->w_buffer)) |
| 7 | 6919 { |
| 809 | 6920 STRCPY(p + len, _("[Help]")); |
| 7 | 6921 len += (int)STRLEN(p + len); |
| 6922 } | |
| 6923 #ifdef FEAT_QUICKFIX | |
| 6924 if (wp->w_p_pvw) | |
| 6925 { | |
| 6926 STRCPY(p + len, _("[Preview]")); | |
| 6927 len += (int)STRLEN(p + len); | |
| 6928 } | |
| 6929 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6930 if (bufIsChanged(wp->w_buffer) |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6931 #ifdef FEAT_TERMINAL |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6932 && !bt_terminal(wp->w_buffer) |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6933 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6934 ) |
| 7 | 6935 { |
| 6936 STRCPY(p + len, "[+]"); | |
| 6937 len += 3; | |
| 6938 } | |
| 6939 if (wp->w_buffer->b_p_ro) | |
| 6940 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
6941 STRCPY(p + len, _("[RO]")); |
|
10928
5b3e671ef6a2
patch 8.0.0353: if [RO] is translated it may be truncated
Christian Brabandt <cb@256bit.org>
parents:
10801
diff
changeset
|
6942 len += (int)STRLEN(p + len); |
| 7 | 6943 } |
| 6944 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6945 this_ru_col = ru_col - (Columns - wp->w_width); |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6946 if (this_ru_col < (wp->w_width + 1) / 2) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6947 this_ru_col = (wp->w_width + 1) / 2; |
| 7 | 6948 if (this_ru_col <= 1) |
| 6949 { | |
| 6950 p = (char_u *)"<"; /* No room for file name! */ | |
| 6951 len = 1; | |
| 6952 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6953 else if (has_mbyte) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6954 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6955 int clen = 0, i; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6956 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6957 /* Count total number of display cells. */ |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6958 clen = mb_string2cells(p, -1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6959 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6960 /* Find first character that will fit. |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6961 * Going from start to end is much faster for DBCS. */ |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6962 for (i = 0; p[i] != NUL && clen >= this_ru_col - 1; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6963 i += (*mb_ptr2len)(p + i)) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6964 clen -= (*mb_ptr2cells)(p + i); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6965 len = clen; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6966 if (i > 0) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6967 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6968 p = p + i - 1; |
| 7 | 6969 *p = '<'; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6970 ++len; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6971 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6972 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6973 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6974 else if (len > this_ru_col - 1) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6975 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6976 p += len - (this_ru_col - 1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6977 *p = '<'; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6978 len = this_ru_col - 1; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6979 } |
| 7 | 6980 |
| 6981 row = W_WINROW(wp) + wp->w_height; | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6982 screen_puts(p, row, wp->w_wincol, attr); |
|
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6983 screen_fill(row, row + 1, len + wp->w_wincol, |
|
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6984 this_ru_col + wp->w_wincol, fillchar, fillchar, attr); |
| 7 | 6985 |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6986 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 6987 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 6988 screen_puts(NameBuff, row, (int)(this_ru_col - STRLEN(NameBuff) | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6989 - 1 + wp->w_wincol), attr); |
| 7 | 6990 |
| 6991 #ifdef FEAT_CMDL_INFO | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
6992 win_redr_ruler(wp, TRUE, ignore_pum); |
| 7 | 6993 #endif |
| 6994 } | |
| 6995 | |
| 6996 /* | |
| 6997 * May need to draw the character below the vertical separator. | |
| 6998 */ | |
| 6999 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 7000 { | |
| 7001 if (stl_connected(wp)) | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
7002 fillchar = fillchar_status(&attr, wp); |
| 7 | 7003 else |
| 7004 fillchar = fillchar_vsep(&attr); | |
| 7005 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 7006 attr); | |
| 7007 } | |
| 1910 | 7008 busy = FALSE; |
| 7 | 7009 } |
| 7010 | |
| 680 | 7011 #ifdef FEAT_STL_OPT |
| 7012 /* | |
| 7013 * Redraw the status line according to 'statusline' and take care of any | |
| 7014 * errors encountered. | |
| 7015 */ | |
| 7016 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7017 redraw_custom_statusline(win_T *wp) |
| 680 | 7018 { |
| 1983 | 7019 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7020 int saved_did_emsg = did_emsg; |
| 1983 | 7021 |
| 7022 /* When called recursively return. This can happen when the statusline | |
| 7023 * contains an expression that triggers a redraw. */ | |
| 7024 if (entered) | |
| 7025 return; | |
| 7026 entered = TRUE; | |
| 680 | 7027 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7028 did_emsg = FALSE; |
| 680 | 7029 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7030 if (did_emsg) |
| 1983 | 7031 { |
| 7032 /* When there is an error disable the statusline, otherwise the | |
| 7033 * display is messed up with errors and a redraw triggers the problem | |
| 7034 * again and again. */ | |
| 680 | 7035 set_string_option_direct((char_u *)"statusline", -1, |
| 7036 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7037 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7038 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7039 did_emsg |= saved_did_emsg; |
| 1983 | 7040 entered = FALSE; |
| 680 | 7041 } |
| 7042 #endif | |
| 7043 | |
| 7 | 7044 /* |
| 7045 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7046 * line of the window right of it. If not, then it's a vertical separator. | |
| 7047 * Only call if (wp->w_vsep_width != 0). | |
| 7048 */ | |
| 7049 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7050 stl_connected(win_T *wp) |
| 7 | 7051 { |
| 7052 frame_T *fr; | |
| 7053 | |
| 7054 fr = wp->w_frame; | |
| 7055 while (fr->fr_parent != NULL) | |
| 7056 { | |
| 7057 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7058 { | |
| 7059 if (fr->fr_next != NULL) | |
| 7060 break; | |
| 7061 } | |
| 7062 else | |
| 7063 { | |
| 7064 if (fr->fr_next != NULL) | |
| 7065 return TRUE; | |
| 7066 } | |
| 7067 fr = fr->fr_parent; | |
| 7068 } | |
| 7069 return FALSE; | |
| 7070 } | |
| 7071 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7072 |
| 7 | 7073 /* |
| 7074 * Get the value to show for the language mappings, active 'keymap'. | |
| 7075 */ | |
| 7076 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7077 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7078 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7079 char_u *fmt, /* format string containing one %s item */ |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7080 char_u *buf, /* buffer for the result */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7081 int len) /* length of buffer */ |
| 7 | 7082 { |
| 7083 char_u *p; | |
| 7084 | |
| 7085 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7086 return FALSE; | |
| 7087 | |
| 7088 { | |
| 7089 #ifdef FEAT_EVAL | |
| 7090 buf_T *old_curbuf = curbuf; | |
| 7091 win_T *old_curwin = curwin; | |
| 7092 char_u *s; | |
| 7093 | |
| 7094 curbuf = wp->w_buffer; | |
| 7095 curwin = wp; | |
| 7096 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7097 ++emsg_skip; | |
| 714 | 7098 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7099 --emsg_skip; |
| 7100 curbuf = old_curbuf; | |
| 7101 curwin = old_curwin; | |
| 7102 if (p == NULL || *p == NUL) | |
| 7103 #endif | |
| 7104 { | |
| 7105 #ifdef FEAT_KEYMAP | |
| 7106 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7107 p = wp->w_buffer->b_p_keymap; | |
| 7108 else | |
| 7109 #endif | |
| 7110 p = (char_u *)"lang"; | |
| 7111 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7112 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7113 buf[0] = NUL; |
| 7114 #ifdef FEAT_EVAL | |
| 7115 vim_free(s); | |
| 7116 #endif | |
| 7117 } | |
| 7118 return buf[0] != NUL; | |
| 7119 } | |
| 7120 | |
| 7121 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7122 /* | |
| 677 | 7123 * Redraw the status line or ruler of window "wp". |
| 7124 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7125 */ |
| 7126 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7127 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7128 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7129 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7130 { |
| 5539 | 7131 static int entered = FALSE; |
| 7 | 7132 int attr; |
| 7133 int curattr; | |
| 7134 int row; | |
| 7135 int col = 0; | |
| 7136 int maxwidth; | |
| 7137 int width; | |
| 7138 int n; | |
| 7139 int len; | |
| 7140 int fillchar; | |
| 7141 char_u buf[MAXPATHL]; | |
| 1983 | 7142 char_u *stl; |
| 7 | 7143 char_u *p; |
| 681 | 7144 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7145 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7146 int use_sandbox = FALSE; |
| 2693 | 7147 win_T *ewp; |
| 7148 int p_crb_save; | |
| 7 | 7149 |
| 5539 | 7150 /* There is a tiny chance that this gets called recursively: When |
| 7151 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7152 * Avoid trouble by not allowing recursion. */ | |
| 7153 if (entered) | |
| 7154 return; | |
| 7155 entered = TRUE; | |
| 7156 | |
| 7 | 7157 /* setup environment for the task at hand */ |
| 677 | 7158 if (wp == NULL) |
| 7159 { | |
| 7160 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7161 stl = p_tal; |
| 677 | 7162 row = 0; |
| 707 | 7163 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7164 attr = HL_ATTR(HLF_TPF); |
| 677 | 7165 maxwidth = Columns; |
| 7166 # ifdef FEAT_EVAL | |
| 681 | 7167 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7168 # endif |
| 7169 } | |
| 40 | 7170 else |
| 677 | 7171 { |
| 7172 row = W_WINROW(wp) + wp->w_height; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
7173 fillchar = fillchar_status(&attr, wp); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7174 maxwidth = wp->w_width; |
| 677 | 7175 |
| 7176 if (draw_ruler) | |
| 7177 { | |
| 1983 | 7178 stl = p_ruf; |
| 677 | 7179 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7180 if (*stl == '%') |
| 7181 { | |
| 7182 if (*++stl == '-') | |
| 7183 stl++; | |
| 7184 if (atoi((char *)stl)) | |
| 7185 while (VIM_ISDIGIT(*stl)) | |
| 7186 stl++; | |
| 7187 if (*stl++ != '(') | |
| 7188 stl = p_ruf; | |
| 677 | 7189 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7190 col = ru_col - (Columns - wp->w_width); |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7191 if (col < (wp->w_width + 1) / 2) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7192 col = (wp->w_width + 1) / 2; |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7193 maxwidth = wp->w_width - col; |
| 677 | 7194 if (!wp->w_status_height) |
| 7195 { | |
| 7196 row = Rows - 1; | |
| 7197 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7198 fillchar = ' '; | |
| 7199 attr = 0; | |
| 7200 } | |
| 7201 | |
| 7202 # ifdef FEAT_EVAL | |
| 681 | 7203 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7204 # endif |
| 7205 } | |
| 7206 else | |
| 7207 { | |
| 7208 if (*wp->w_p_stl != NUL) | |
| 1983 | 7209 stl = wp->w_p_stl; |
| 677 | 7210 else |
| 1983 | 7211 stl = p_stl; |
| 677 | 7212 # ifdef FEAT_EVAL |
| 681 | 7213 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7214 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7215 # endif |
| 7216 } | |
| 7217 | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7218 col += wp->w_wincol; |
| 677 | 7219 } |
| 7220 | |
| 7 | 7221 if (maxwidth <= 0) |
| 5539 | 7222 goto theend; |
| 677 | 7223 |
| 2693 | 7224 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7225 * the cursor away and back. */ | |
| 7226 ewp = wp == NULL ? curwin : wp; | |
| 7227 p_crb_save = ewp->w_p_crb; | |
| 7228 ewp->w_p_crb = FALSE; | |
| 7229 | |
| 1983 | 7230 /* Make a copy, because the statusline may include a function call that |
| 7231 * might change the option value and free the memory. */ | |
| 7232 stl = vim_strsave(stl); | |
| 2693 | 7233 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7234 stl, use_sandbox, |
| 681 | 7235 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7236 vim_free(stl); |
| 2693 | 7237 ewp->w_p_crb = p_crb_save; |
| 2661 | 7238 |
| 7239 /* Make all characters printable. */ | |
| 7240 p = transstr(buf); | |
| 7241 if (p != NULL) | |
| 7242 { | |
| 7243 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7244 vim_free(p); | |
| 7245 } | |
| 7246 | |
| 7247 /* fill up with "fillchar" */ | |
| 835 | 7248 len = (int)STRLEN(buf); |
| 1883 | 7249 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7250 { |
| 7251 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7252 ++width; | |
| 7253 } | |
| 7254 buf[len] = NUL; | |
| 7255 | |
| 681 | 7256 /* |
| 7257 * Draw each snippet with the specified highlighting. | |
| 7258 */ | |
| 7 | 7259 curattr = attr; |
| 7260 p = buf; | |
| 681 | 7261 for (n = 0; hltab[n].start != NULL; n++) |
| 7262 { | |
| 7263 len = (int)(hltab[n].start - p); | |
| 7 | 7264 screen_puts_len(p, len, row, col, curattr); |
| 7265 col += vim_strnsize(p, len); | |
| 681 | 7266 p = hltab[n].start; |
| 7267 | |
| 7268 if (hltab[n].userhl == 0) | |
| 7 | 7269 curattr = attr; |
| 681 | 7270 else if (hltab[n].userhl < 0) |
| 7271 curattr = syn_id2attr(-hltab[n].userhl); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7272 #ifdef FEAT_TERMINAL |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7273 else if (wp != NULL && wp != curwin && bt_terminal(wp->w_buffer) |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7274 && wp->w_status_height != 0) |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7275 curattr = highlight_stltermnc[hltab[n].userhl - 1]; |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
11981
diff
changeset
|
7276 else if (wp != NULL && bt_terminal(wp->w_buffer) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
11981
diff
changeset
|
7277 && wp->w_status_height != 0) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
11981
diff
changeset
|
7278 curattr = highlight_stlterm[hltab[n].userhl - 1]; |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7279 #endif |
| 680 | 7280 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7281 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7282 else |
| 681 | 7283 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7284 } |
| 7285 screen_puts(p, row, col, curattr); | |
| 681 | 7286 |
| 7287 if (wp == NULL) | |
| 7288 { | |
| 7289 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7290 col = 0; | |
| 7291 len = 0; | |
| 7292 p = buf; | |
| 7293 fillchar = 0; | |
| 7294 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7295 { | |
| 7296 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7297 while (col < len) | |
| 7298 TabPageIdxs[col++] = fillchar; | |
| 7299 p = tabtab[n].start; | |
| 7300 fillchar = tabtab[n].userhl; | |
| 7301 } | |
| 7302 while (col < Columns) | |
| 7303 TabPageIdxs[col++] = fillchar; | |
| 7304 } | |
| 5539 | 7305 |
| 7306 theend: | |
| 7307 entered = FALSE; | |
| 7 | 7308 } |
| 7309 | |
| 7310 #endif /* FEAT_STL_OPT */ | |
| 7311 | |
| 7312 /* | |
| 7313 * Output a single character directly to the screen and update ScreenLines. | |
| 7314 */ | |
| 7315 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7316 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7317 { |
| 3549 | 7318 char_u buf[MB_MAXBYTES + 1]; |
| 7319 | |
| 7320 if (has_mbyte) | |
| 7321 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7322 else | |
| 7323 { | |
| 7324 buf[0] = c; | |
| 7325 buf[1] = NUL; | |
| 7326 } | |
| 7 | 7327 screen_puts(buf, row, col, attr); |
| 7328 } | |
| 7329 | |
| 7330 /* | |
| 7331 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7332 * Also return its attribute in *attrp; | |
| 7333 */ | |
| 7334 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7335 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7336 { |
| 7337 unsigned off; | |
| 7338 | |
| 7339 /* safety check */ | |
| 7340 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7341 { | |
| 7342 off = LineOffset[row] + col; | |
| 7343 *attrp = ScreenAttrs[off]; | |
| 7344 bytes[0] = ScreenLines[off]; | |
| 7345 bytes[1] = NUL; | |
| 7346 | |
| 7347 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7348 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7349 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7350 { | |
| 7351 bytes[0] = ScreenLines[off]; | |
| 7352 bytes[1] = ScreenLines2[off]; | |
| 7353 bytes[2] = NUL; | |
| 7354 } | |
| 7355 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7356 { | |
| 7357 bytes[1] = ScreenLines[off + 1]; | |
| 7358 bytes[2] = NUL; | |
| 7359 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7360 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7361 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7362 |
| 714 | 7363 /* |
| 7364 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7365 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7366 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7367 */ |
| 7368 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7369 screen_comp_differs(int off, int *u8cc) |
| 714 | 7370 { |
| 7371 int i; | |
| 7372 | |
| 7373 for (i = 0; i < Screen_mco; ++i) | |
| 7374 { | |
| 7375 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7376 return TRUE; | |
| 7377 if (u8cc[i] == 0) | |
| 7378 break; | |
| 7379 } | |
| 7380 return FALSE; | |
| 7381 } | |
| 7382 | |
| 7 | 7383 /* |
| 7384 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7385 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7386 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7387 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7388 */ | |
| 7389 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7390 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7391 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7392 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7393 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7394 int attr) |
| 7 | 7395 { |
| 7396 screen_puts_len(text, -1, row, col, attr); | |
| 7397 } | |
| 7398 | |
| 7399 /* | |
| 7400 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7401 * a NUL. | |
| 7402 */ | |
| 7403 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7404 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7405 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7406 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7407 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7408 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7409 int attr) |
| 7 | 7410 { |
| 7411 unsigned off; | |
| 7412 char_u *ptr = text; | |
| 5923 | 7413 int len = textlen; |
| 7 | 7414 int c; |
| 1378 | 7415 unsigned max_off; |
| 7 | 7416 int mbyte_blen = 1; |
| 7417 int mbyte_cells = 1; | |
| 7418 int u8c = 0; | |
| 714 | 7419 int u8cc[MAX_MCO]; |
| 7 | 7420 int clear_next_cell = FALSE; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7421 #ifdef FEAT_ARABIC |
| 7 | 7422 int prev_c = 0; /* previous Arabic character */ |
| 714 | 7423 int pc, nc, nc1; |
| 7424 int pcc[MAX_MCO]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7425 #endif |
| 1843 | 7426 int force_redraw_this; |
| 7427 int force_redraw_next = FALSE; | |
| 7428 int need_redraw; | |
| 7 | 7429 |
|
16914
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7430 // Safety check. The check for negative row and column is to fix issue |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7431 // #4102. TODO: find out why row/col could be negative. |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7432 if (ScreenLines == NULL |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7433 || row >= screen_Rows || row < 0 |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7434 || col >= screen_Columns || col < 0) |
| 7 | 7435 return; |
| 1843 | 7436 off = LineOffset[row] + col; |
| 7 | 7437 |
| 1668 | 7438 /* When drawing over the right halve of a double-wide char clear out the |
| 7439 * left halve. Only needed in a terminal. */ | |
| 1685 | 7440 if (has_mbyte && col > 0 && col < screen_Columns |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7441 #ifdef FEAT_GUI |
| 1668 | 7442 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7443 #endif |
| 1668 | 7444 && mb_fix_col(col, row) != col) |
| 1843 | 7445 { |
| 7446 ScreenLines[off - 1] = ' '; | |
| 7447 ScreenAttrs[off - 1] = 0; | |
| 7448 if (enc_utf8) | |
| 7449 { | |
| 7450 ScreenLinesUC[off - 1] = 0; | |
| 7451 ScreenLinesC[0][off - 1] = 0; | |
| 7452 } | |
| 7453 /* redraw the previous cell, make it empty */ | |
| 7454 screen_char(off - 1, row, col - 1); | |
| 7455 /* force the cell at "col" to be redrawn */ | |
| 7456 force_redraw_next = TRUE; | |
| 7457 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7458 |
| 1378 | 7459 max_off = LineOffset[row] + screen_Columns; |
| 1340 | 7460 while (col < screen_Columns |
| 7461 && (len < 0 || (int)(ptr - text) < len) | |
| 7462 && *ptr != NUL) | |
| 7 | 7463 { |
| 7464 c = *ptr; | |
| 7465 /* check if this is the first byte of a multibyte */ | |
| 7466 if (has_mbyte) | |
| 7467 { | |
| 7468 if (enc_utf8 && len > 0) | |
| 474 | 7469 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7470 else |
| 474 | 7471 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7472 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7473 mbyte_cells = 1; | |
| 7474 else if (enc_dbcs != 0) | |
| 7475 mbyte_cells = mbyte_blen; | |
| 7476 else /* enc_utf8 */ | |
| 7477 { | |
| 7478 if (len >= 0) | |
| 714 | 7479 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7480 (int)((text + len) - ptr)); |
| 7481 else | |
| 714 | 7482 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7483 mbyte_cells = utf_char2cells(u8c); |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7484 #ifdef FEAT_ARABIC |
| 7 | 7485 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) |
| 7486 { | |
| 7487 /* Do Arabic shaping. */ | |
| 7488 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7489 { | |
| 7490 /* Past end of string to be displayed. */ | |
| 7491 nc = NUL; | |
| 7492 nc1 = NUL; | |
| 7493 } | |
| 7494 else | |
| 714 | 7495 { |
| 1994 | 7496 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7497 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7498 nc1 = pcc[0]; |
| 7499 } | |
| 7 | 7500 pc = prev_c; |
| 7501 prev_c = u8c; | |
| 714 | 7502 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7503 } |
| 7504 else | |
| 7505 prev_c = u8c; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7506 #endif |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7507 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7508 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7509 /* Only 1 cell left, but character requires 2 cells: |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7510 * display a '>' in the last column to avoid wrapping. */ |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7511 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7512 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7513 } |
| 7 | 7514 } |
| 7515 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7516 |
| 1843 | 7517 force_redraw_this = force_redraw_next; |
| 7518 force_redraw_next = FALSE; | |
| 7519 | |
| 7520 need_redraw = ScreenLines[off] != c | |
| 7 | 7521 || (mbyte_cells == 2 |
| 7522 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7523 || (enc_dbcs == DBCS_JPNU | |
| 7524 && c == 0x8e | |
| 7525 && ScreenLines2[off] != ptr[1]) | |
| 7526 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7527 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7528 (u8char_T)(c < 0x80 && u8cc[0] == 0 ? 0 : u8c) |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7529 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7530 && screen_comp_differs(off, u8cc)))) |
| 7 | 7531 || ScreenAttrs[off] != attr |
| 1843 | 7532 || exmode_active; |
| 7533 | |
|
16998
2ec0f953ec3f
patch 8.1.1499: ruler not updated after popup window was removed
Bram Moolenaar <Bram@vim.org>
parents:
16994
diff
changeset
|
7534 if ((need_redraw || force_redraw_this) |
|
2ec0f953ec3f
patch 8.1.1499: ruler not updated after popup window was removed
Bram Moolenaar <Bram@vim.org>
parents:
16994
diff
changeset
|
7535 #ifdef FEAT_TEXT_PROP |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
7536 && !blocked_by_popup(row, col) |
|
16998
2ec0f953ec3f
patch 8.1.1499: ruler not updated after popup window was removed
Bram Moolenaar <Bram@vim.org>
parents:
16994
diff
changeset
|
7537 #endif |
|
2ec0f953ec3f
patch 8.1.1499: ruler not updated after popup window was removed
Bram Moolenaar <Bram@vim.org>
parents:
16994
diff
changeset
|
7538 ) |
| 7 | 7539 { |
| 7540 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7541 /* The bold trick makes a single row of pixels appear in the next | |
| 7542 * character. When a bold character is removed, the next | |
| 7543 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7544 * and for some xterms. */ |
| 7545 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7546 # ifdef FEAT_GUI |
| 7547 gui.in_use | |
| 7548 # endif | |
| 7549 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7550 || | |
| 7551 # endif | |
| 7552 # ifdef UNIX | |
| 7553 term_is_xterm | |
| 7554 # endif | |
| 1843 | 7555 )) |
| 7556 { | |
| 7557 int n = ScreenAttrs[off]; | |
| 7558 | |
| 7559 if (n > HL_ALL) | |
| 7560 n = syn_attr2attr(n); | |
| 7561 if (n & HL_BOLD) | |
| 7562 force_redraw_next = TRUE; | |
| 7 | 7563 } |
| 7564 #endif | |
| 7565 /* When at the end of the text and overwriting a two-cell | |
| 7566 * character with a one-cell character, need to clear the next | |
| 7567 * cell. Also when overwriting the left halve of a two-cell char | |
| 7568 * with the right halve of a two-cell char. Do this only once | |
| 7569 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7570 if (clear_next_cell) | |
| 7571 clear_next_cell = FALSE; | |
| 7572 else if (has_mbyte | |
| 7573 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7574 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7575 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7576 || (mbyte_cells == 2 |
| 1378 | 7577 && (*mb_off2cells)(off, max_off) == 1 |
| 7578 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7579 clear_next_cell = TRUE; |
| 7580 | |
| 7581 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7582 * it confuses mb_off2cells(). */ | |
| 7583 if (enc_dbcs | |
| 1378 | 7584 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7585 || (mbyte_cells == 2 |
| 1378 | 7586 && (*mb_off2cells)(off, max_off) == 1 |
| 7587 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7588 ScreenLines[off + mbyte_blen] = 0; |
| 7589 ScreenLines[off] = c; | |
| 7590 ScreenAttrs[off] = attr; | |
| 7591 if (enc_utf8) | |
| 7592 { | |
| 714 | 7593 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7594 ScreenLinesUC[off] = 0; |
| 7595 else | |
| 7596 { | |
| 714 | 7597 int i; |
| 7598 | |
| 7 | 7599 ScreenLinesUC[off] = u8c; |
| 714 | 7600 for (i = 0; i < Screen_mco; ++i) |
| 7601 { | |
| 7602 ScreenLinesC[i][off] = u8cc[i]; | |
| 7603 if (u8cc[i] == 0) | |
| 7604 break; | |
| 7605 } | |
| 7 | 7606 } |
| 7607 if (mbyte_cells == 2) | |
| 7608 { | |
| 7609 ScreenLines[off + 1] = 0; | |
| 7610 ScreenAttrs[off + 1] = attr; | |
| 7611 } | |
| 7612 screen_char(off, row, col); | |
| 7613 } | |
| 7614 else if (mbyte_cells == 2) | |
| 7615 { | |
| 7616 ScreenLines[off + 1] = ptr[1]; | |
| 7617 ScreenAttrs[off + 1] = attr; | |
| 7618 screen_char_2(off, row, col); | |
| 7619 } | |
| 7620 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7621 { | |
| 7622 ScreenLines2[off] = ptr[1]; | |
| 7623 screen_char(off, row, col); | |
| 7624 } | |
| 7625 else | |
| 7626 screen_char(off, row, col); | |
| 7627 } | |
| 7628 if (has_mbyte) | |
| 7629 { | |
| 7630 off += mbyte_cells; | |
| 7631 col += mbyte_cells; | |
| 7632 ptr += mbyte_blen; | |
| 7633 if (clear_next_cell) | |
| 5923 | 7634 { |
| 7635 /* This only happens at the end, display one space next. */ | |
| 7 | 7636 ptr = (char_u *)" "; |
| 5923 | 7637 len = -1; |
| 7638 } | |
| 7 | 7639 } |
| 7640 else | |
| 7641 { | |
| 7642 ++off; | |
| 7643 ++col; | |
| 7644 ++ptr; | |
| 7645 } | |
| 7646 } | |
| 1843 | 7647 |
| 7648 /* If we detected the next character needs to be redrawn, but the text | |
| 7649 * doesn't extend up to there, update the character here. */ | |
| 7650 if (force_redraw_next && col < screen_Columns) | |
| 7651 { | |
| 7652 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7653 screen_char_2(off, row, col); | |
| 7654 else | |
| 7655 screen_char(off, row, col); | |
| 7656 } | |
| 7 | 7657 } |
| 7658 | |
| 7659 #ifdef FEAT_SEARCH_EXTRA | |
| 7660 /* | |
| 1326 | 7661 * Prepare for 'hlsearch' highlighting. |
| 7 | 7662 */ |
| 7663 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7664 start_search_hl(void) |
| 7 | 7665 { |
| 7666 if (p_hls && !no_hlsearch) | |
| 7667 { | |
| 7668 last_pat_prog(&search_hl.rm); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7669 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7670 # ifdef FEAT_RELTIME |
| 7671 /* Set the time limit to 'redrawtime'. */ | |
| 7672 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7673 # endif | |
| 7 | 7674 } |
| 7675 } | |
| 7676 | |
| 7677 /* | |
| 1326 | 7678 * Clean up for 'hlsearch' highlighting. |
| 7 | 7679 */ |
| 7680 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7681 end_search_hl(void) |
| 7 | 7682 { |
| 7683 if (search_hl.rm.regprog != NULL) | |
| 7684 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7685 vim_regfree(search_hl.rm.regprog); |
| 7 | 7686 search_hl.rm.regprog = NULL; |
| 7687 } | |
| 7688 } | |
| 5985 | 7689 #endif |
| 5979 | 7690 |
| 7 | 7691 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7692 screen_start_highlight(int attr) |
| 7 | 7693 { |
| 7694 attrentry_T *aep = NULL; | |
| 7695 | |
| 7696 screen_attr = attr; | |
| 7697 if (full_screen | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15850
diff
changeset
|
7698 #ifdef MSWIN |
| 7 | 7699 && termcap_active |
| 7700 #endif | |
| 7701 ) | |
| 7702 { | |
| 7703 #ifdef FEAT_GUI | |
| 7704 if (gui.in_use) | |
| 7705 { | |
| 7706 char buf[20]; | |
| 7707 | |
| 681 | 7708 /* The GUI handles this internally. */ |
| 7709 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 7710 OUT_STR(buf); |
| 7711 } | |
| 7712 else | |
| 7713 #endif | |
| 7714 { | |
| 7715 if (attr > HL_ALL) /* special HL attr. */ | |
| 7716 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7717 if (IS_CTERM) |
| 7 | 7718 aep = syn_cterm_attr2entry(attr); |
| 7719 else | |
| 7720 aep = syn_term_attr2entry(attr); | |
| 7721 if (aep == NULL) /* did ":syntax clear" */ | |
| 7722 attr = 0; | |
| 7723 else | |
| 7724 attr = aep->ae_attr; | |
| 7725 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
7726 if ((attr & HL_BOLD) && *T_MD != NUL) /* bold */ |
| 7 | 7727 out_str(T_MD); |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7728 else if (aep != NULL && cterm_normal_fg_bold && ( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7729 #ifdef FEAT_TERMGUICOLORS |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7730 p_tgc && aep->ae_u.cterm.fg_rgb != CTERMCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7731 ? aep->ae_u.cterm.fg_rgb != INVALCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7732 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7733 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7734 t_colors > 1 && aep->ae_u.cterm.fg_color)) |
| 681 | 7735 /* If the Normal FG color has BOLD attribute and the new HL |
| 7736 * has a FG color defined, clear BOLD. */ | |
| 7737 out_str(T_ME); | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
7738 if ((attr & HL_STANDOUT) && *T_SO != NUL) /* standout */ |
| 7 | 7739 out_str(T_SO); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
7740 if ((attr & HL_UNDERCURL) && *T_UCS != NUL) /* undercurl */ |
|
12964
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
7741 out_str(T_UCS); |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
7742 if (((attr & HL_UNDERLINE) /* underline or undercurl */ |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
7743 || ((attr & HL_UNDERCURL) && *T_UCS == NUL)) |
|
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
7744 && *T_US != NUL) |
| 7 | 7745 out_str(T_US); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
7746 if ((attr & HL_ITALIC) && *T_CZH != NUL) /* italic */ |
| 7 | 7747 out_str(T_CZH); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
7748 if ((attr & HL_INVERSE) && *T_MR != NUL) /* inverse (reverse) */ |
| 7 | 7749 out_str(T_MR); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
7750 if ((attr & HL_STRIKETHROUGH) && *T_STS != NUL) /* strike */ |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7751 out_str(T_STS); |
| 7 | 7752 |
| 7753 /* | |
| 7754 * Output the color or start string after bold etc., in case the | |
| 7755 * bold etc. override the color setting. | |
| 7756 */ | |
| 7757 if (aep != NULL) | |
| 7758 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7759 #ifdef FEAT_TERMGUICOLORS |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7760 /* When 'termguicolors' is set but fg or bg is unset, |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7761 * fall back to the cterm colors. This helps for SpellBad, |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7762 * where the GUI uses a red undercurl. */ |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7763 if (p_tgc && aep->ae_u.cterm.fg_rgb != CTERMCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7764 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7765 if (aep->ae_u.cterm.fg_rgb != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7766 term_fg_rgb_color(aep->ae_u.cterm.fg_rgb); |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7767 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7768 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7769 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7770 if (t_colors > 1) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7771 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7772 if (aep->ae_u.cterm.fg_color) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7773 term_fg_color(aep->ae_u.cterm.fg_color - 1); |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7774 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7775 #ifdef FEAT_TERMGUICOLORS |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7776 if (p_tgc && aep->ae_u.cterm.bg_rgb != CTERMCOLOR) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7777 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7778 if (aep->ae_u.cterm.bg_rgb != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7779 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 7780 } |
| 7781 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7782 #endif |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7783 if (t_colors > 1) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7784 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7785 if (aep->ae_u.cterm.bg_color) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7786 term_bg_color(aep->ae_u.cterm.bg_color - 1); |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7787 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7788 |
|
13452
9b09f6e470e0
patch 8.0.1600: crash when setting t_Co to zero when 'termguicolors' is set
Christian Brabandt <cb@256bit.org>
parents:
13400
diff
changeset
|
7789 if (!IS_CTERM) |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7790 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7791 if (aep->ae_u.term.start != NULL) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7792 out_str(aep->ae_u.term.start); |
| 7 | 7793 } |
| 7794 } | |
| 7795 } | |
| 7796 } | |
| 7797 } | |
| 7798 | |
| 7799 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7800 screen_stop_highlight(void) |
| 7 | 7801 { |
| 7802 int do_ME = FALSE; /* output T_ME code */ | |
| 7803 | |
| 7804 if (screen_attr != 0 | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15850
diff
changeset
|
7805 #ifdef MSWIN |
| 7 | 7806 && termcap_active |
| 7807 #endif | |
| 7808 ) | |
| 7809 { | |
| 7810 #ifdef FEAT_GUI | |
| 7811 if (gui.in_use) | |
| 7812 { | |
| 7813 char buf[20]; | |
| 7814 | |
| 7815 /* use internal GUI code */ | |
| 7816 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 7817 OUT_STR(buf); | |
| 7818 } | |
| 7819 else | |
| 7820 #endif | |
| 7821 { | |
| 7822 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 7823 { | |
| 7824 attrentry_T *aep; | |
| 7825 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7826 if (IS_CTERM) |
| 7 | 7827 { |
| 7828 /* | |
| 7829 * Assume that t_me restores the original colors! | |
| 7830 */ | |
| 7831 aep = syn_cterm_attr2entry(screen_attr); | |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7832 if (aep != NULL && (( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7833 #ifdef FEAT_TERMGUICOLORS |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7834 p_tgc && aep->ae_u.cterm.fg_rgb != CTERMCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7835 ? aep->ae_u.cterm.fg_rgb != INVALCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7836 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7837 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7838 aep->ae_u.cterm.fg_color) || ( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7839 #ifdef FEAT_TERMGUICOLORS |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7840 p_tgc && aep->ae_u.cterm.bg_rgb != CTERMCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7841 ? aep->ae_u.cterm.bg_rgb != INVALCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7842 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7843 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7844 aep->ae_u.cterm.bg_color))) |
| 7 | 7845 do_ME = TRUE; |
| 7846 } | |
| 7847 else | |
| 7848 { | |
| 7849 aep = syn_term_attr2entry(screen_attr); | |
| 7850 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 7851 { | |
| 7852 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 7853 do_ME = TRUE; | |
| 7854 else | |
| 7855 out_str(aep->ae_u.term.stop); | |
| 7856 } | |
| 7857 } | |
| 7858 if (aep == NULL) /* did ":syntax clear" */ | |
| 7859 screen_attr = 0; | |
| 7860 else | |
| 7861 screen_attr = aep->ae_attr; | |
| 7862 } | |
| 7863 | |
| 7864 /* | |
| 7865 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 7866 * same sequence several times. | |
| 7867 */ | |
| 7868 if (screen_attr & HL_STANDOUT) | |
| 7869 { | |
| 7870 if (STRCMP(T_SE, T_ME) == 0) | |
| 7871 do_ME = TRUE; | |
| 7872 else | |
| 7873 out_str(T_SE); | |
| 7874 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
7875 if ((screen_attr & HL_UNDERCURL) && *T_UCE != NUL) |
|
12964
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
7876 { |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
7877 if (STRCMP(T_UCE, T_ME) == 0) |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
7878 do_ME = TRUE; |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
7879 else |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
7880 out_str(T_UCE); |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
7881 } |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
7882 if ((screen_attr & HL_UNDERLINE) |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
7883 || ((screen_attr & HL_UNDERCURL) && *T_UCE == NUL)) |
| 7 | 7884 { |
| 7885 if (STRCMP(T_UE, T_ME) == 0) | |
| 7886 do_ME = TRUE; | |
| 7887 else | |
| 7888 out_str(T_UE); | |
| 7889 } | |
| 7890 if (screen_attr & HL_ITALIC) | |
| 7891 { | |
| 7892 if (STRCMP(T_CZR, T_ME) == 0) | |
| 7893 do_ME = TRUE; | |
| 7894 else | |
| 7895 out_str(T_CZR); | |
| 7896 } | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7897 if (screen_attr & HL_STRIKETHROUGH) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7898 { |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7899 if (STRCMP(T_STE, T_ME) == 0) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7900 do_ME = TRUE; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7901 else |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7902 out_str(T_STE); |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7903 } |
| 7 | 7904 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) |
| 7905 out_str(T_ME); | |
| 7906 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7907 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7908 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7909 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7910 if (cterm_normal_fg_gui_color != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7911 term_fg_rgb_color(cterm_normal_fg_gui_color); |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7912 if (cterm_normal_bg_gui_color != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7913 term_bg_rgb_color(cterm_normal_bg_gui_color); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7914 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7915 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7916 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7917 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7918 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7919 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7920 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7921 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7922 term_fg_color(cterm_normal_fg_color - 1); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7923 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7924 term_bg_color(cterm_normal_bg_color - 1); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7925 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7926 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7927 } |
| 7 | 7928 } |
| 7929 } | |
| 7930 } | |
| 7931 screen_attr = 0; | |
| 7932 } | |
| 7933 | |
| 7934 /* | |
| 7935 * Reset the colors for a cterm. Used when leaving Vim. | |
| 7936 * The machine specific code may override this again. | |
| 7937 */ | |
| 7938 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7939 reset_cterm_colors(void) |
| 7 | 7940 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7941 if (IS_CTERM) |
| 7 | 7942 { |
| 7943 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7944 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7945 if (p_tgc ? (cterm_normal_fg_gui_color != INVALCOLOR |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7946 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7947 : (cterm_normal_fg_color > 0 || cterm_normal_bg_color > 0)) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7948 #else |
| 7 | 7949 if (cterm_normal_fg_color > 0 || cterm_normal_bg_color > 0) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7950 #endif |
| 7 | 7951 { |
| 7952 out_str(T_OP); | |
| 7953 screen_attr = -1; | |
| 7954 } | |
| 7955 if (cterm_normal_fg_bold) | |
| 7956 { | |
| 7957 out_str(T_ME); | |
| 7958 screen_attr = -1; | |
| 7959 } | |
| 7960 } | |
| 7961 } | |
| 7962 | |
| 7963 /* | |
| 7964 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 7965 * using the attributes from ScreenAttrs["off"]. | |
| 7966 */ | |
| 7967 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7968 screen_char(unsigned off, int row, int col) |
| 7 | 7969 { |
| 7970 int attr; | |
| 7971 | |
| 7972 /* Check for illegal values, just in case (could happen just after | |
| 7973 * resizing). */ | |
| 7974 if (row >= screen_Rows || col >= screen_Columns) | |
| 7975 return; | |
| 7976 | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7977 // Skip if under the popup menu. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7978 // Popup windows with zindex higher than POPUPMENU_ZINDEX go on top. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7979 if (pum_under_menu(row, col) |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17771
diff
changeset
|
7980 #ifdef FEAT_TEXT_PROP |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7981 && screen_zindex <= POPUPMENU_ZINDEX |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17771
diff
changeset
|
7982 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7983 ) |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
7984 return; |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7985 #ifdef FEAT_TEXT_PROP |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
7986 if (blocked_by_popup(row, col)) |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7987 return; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7988 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7989 |
| 6602 | 7990 /* Outputting a character in the last cell on the screen may scroll the |
| 7991 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 7992 * mark the character invalid (update it when scrolled up). */ | |
| 7993 if (*T_XN == NUL | |
| 7994 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 7995 #ifdef FEAT_RIGHTLEFT |
| 7996 /* account for first command-line character in rightleft mode */ | |
| 7997 && !cmdmsg_rl | |
| 7998 #endif | |
| 7999 ) | |
| 8000 { | |
| 8001 ScreenAttrs[off] = (sattr_T)-1; | |
| 8002 return; | |
| 8003 } | |
| 8004 | |
| 8005 /* | |
| 8006 * Stop highlighting first, so it's easier to move the cursor. | |
| 8007 */ | |
| 8008 if (screen_char_attr != 0) | |
| 8009 attr = screen_char_attr; | |
| 8010 else | |
| 8011 attr = ScreenAttrs[off]; | |
| 8012 if (screen_attr != attr) | |
| 8013 screen_stop_highlight(); | |
| 8014 | |
| 8015 windgoto(row, col); | |
| 8016 | |
| 8017 if (screen_attr != attr) | |
| 8018 screen_start_highlight(attr); | |
| 8019 | |
| 8020 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8021 { | |
| 8022 char_u buf[MB_MAXBYTES + 1]; | |
| 8023 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8024 if (utf_ambiguous_width(ScreenLinesUC[off])) |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8025 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8026 if (*p_ambw == 'd' |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8027 #ifdef FEAT_GUI |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8028 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8029 #endif |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8030 ) |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8031 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8032 /* Clear the two screen cells. If the character is actually |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8033 * single width it won't change the second cell. */ |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8034 out_str((char_u *)" "); |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8035 term_windgoto(row, col); |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8036 } |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8037 /* not sure where the cursor is after drawing the ambiguous width |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8038 * character */ |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8039 screen_cur_col = 9999; |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8040 } |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8041 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8042 ++screen_cur_col; |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8043 |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8044 /* Convert the UTF-8 character to bytes and write it. */ |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8045 buf[utfc_char2bytes(off, buf)] = NUL; |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8046 out_str(buf); |
| 7 | 8047 } |
| 8048 else | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8049 { |
| 7 | 8050 out_flush_check(); |
| 8051 out_char(ScreenLines[off]); | |
| 8052 /* double-byte character in single-width cell */ | |
| 8053 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8054 out_char(ScreenLines2[off]); | |
| 8055 } | |
| 8056 | |
| 8057 screen_cur_col++; | |
| 8058 } | |
| 8059 | |
| 8060 /* | |
| 8061 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8062 * on the screen at position 'row' and 'col'. | |
| 8063 * The attributes of the first byte is used for all. This is required to | |
| 8064 * output the two bytes of a double-byte character with nothing in between. | |
| 8065 */ | |
| 8066 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8067 screen_char_2(unsigned off, int row, int col) |
| 7 | 8068 { |
| 8069 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8070 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8071 return; | |
| 8072 | |
| 8073 /* Outputting the last character on the screen may scrollup the screen. | |
| 8074 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8075 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8076 { | |
| 8077 ScreenAttrs[off] = (sattr_T)-1; | |
| 8078 return; | |
| 8079 } | |
| 8080 | |
| 8081 /* Output the first byte normally (positions the cursor), then write the | |
| 8082 * second byte directly. */ | |
| 8083 screen_char(off, row, col); | |
| 8084 out_char(ScreenLines[off + 1]); | |
| 8085 ++screen_cur_col; | |
| 8086 } | |
| 8087 | |
| 8088 /* | |
| 8089 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8090 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8091 */ | |
| 8092 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8093 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8094 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8095 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8096 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8097 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8098 int invert) |
| 7 | 8099 { |
| 8100 int r, c; | |
| 8101 int off; | |
| 1378 | 8102 int max_off; |
| 7 | 8103 |
| 534 | 8104 /* Can't use ScreenLines unless initialized */ |
| 8105 if (ScreenLines == NULL) | |
| 8106 return; | |
| 8107 | |
| 7 | 8108 if (invert) |
| 8109 screen_char_attr = HL_INVERSE; | |
| 8110 for (r = row; r < row + height; ++r) | |
| 8111 { | |
| 8112 off = LineOffset[r]; | |
| 1378 | 8113 max_off = off + screen_Columns; |
| 7 | 8114 for (c = col; c < col + width; ++c) |
| 8115 { | |
| 1378 | 8116 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8117 { |
| 8118 screen_char_2(off + c, r, c); | |
| 8119 ++c; | |
| 8120 } | |
| 8121 else | |
| 8122 { | |
| 8123 screen_char(off + c, r, c); | |
| 1378 | 8124 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8125 ++c; |
| 8126 } | |
| 8127 } | |
| 8128 } | |
| 8129 screen_char_attr = 0; | |
| 8130 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
8131 |
| 7 | 8132 /* |
| 8133 * Redraw the characters for a vertically split window. | |
| 8134 */ | |
| 8135 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8136 redraw_block(int row, int end, win_T *wp) |
| 7 | 8137 { |
| 8138 int col; | |
| 8139 int width; | |
| 8140 | |
| 8141 # ifdef FEAT_CLIPBOARD | |
| 8142 clip_may_clear_selection(row, end - 1); | |
| 8143 # endif | |
| 8144 | |
| 8145 if (wp == NULL) | |
| 8146 { | |
| 8147 col = 0; | |
| 8148 width = Columns; | |
| 8149 } | |
| 8150 else | |
| 8151 { | |
| 8152 col = wp->w_wincol; | |
| 8153 width = wp->w_width; | |
| 8154 } | |
| 8155 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8156 } | |
| 8157 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8158 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8159 space_to_screenline(int off, int attr) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8160 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8161 ScreenLines[off] = ' '; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8162 ScreenAttrs[off] = attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8163 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8164 ScreenLinesUC[off] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8165 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8166 |
| 7 | 8167 /* |
| 8168 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8169 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8170 * Use attributes 'attr'. | |
| 8171 */ | |
| 8172 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8173 screen_fill( |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8174 int start_row, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8175 int end_row, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8176 int start_col, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8177 int end_col, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8178 int c1, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8179 int c2, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8180 int attr) |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8181 { |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8182 int row; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8183 int col; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8184 int off; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8185 int end_off; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8186 int did_delete; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8187 int c; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8188 int norm_term; |
| 7 | 8189 #if defined(FEAT_GUI) || defined(UNIX) |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8190 int force_next = FALSE; |
| 7 | 8191 #endif |
| 8192 | |
| 8193 if (end_row > screen_Rows) /* safety check */ | |
| 8194 end_row = screen_Rows; | |
| 8195 if (end_col > screen_Columns) /* safety check */ | |
| 8196 end_col = screen_Columns; | |
| 8197 if (ScreenLines == NULL | |
| 8198 || start_row >= end_row | |
| 8199 || start_col >= end_col) /* nothing to do */ | |
| 8200 return; | |
| 8201 | |
| 8202 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8203 norm_term = ( | |
| 8204 #ifdef FEAT_GUI | |
| 8205 !gui.in_use && | |
| 8206 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8207 !IS_CTERM); |
| 7 | 8208 for (row = start_row; row < end_row; ++row) |
| 8209 { | |
| 1668 | 8210 if (has_mbyte |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8211 #ifdef FEAT_GUI |
| 1668 | 8212 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8213 #endif |
| 1668 | 8214 ) |
| 8215 { | |
| 8216 /* When drawing over the right halve of a double-wide char clear | |
| 8217 * out the left halve. When drawing over the left halve of a | |
| 8218 * double wide-char clear out the right halve. Only needed in a | |
| 8219 * terminal. */ | |
| 1685 | 8220 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8221 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8222 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8223 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8224 } |
| 7 | 8225 /* |
| 8226 * Try to use delete-line termcap code, when no attributes or in a | |
| 8227 * "normal" terminal, where a bold/italic space is just a | |
| 8228 * space. | |
| 8229 */ | |
| 8230 did_delete = FALSE; | |
| 8231 if (c2 == ' ' | |
| 8232 && end_col == Columns | |
| 8233 && can_clear(T_CE) | |
| 8234 && (attr == 0 | |
| 8235 || (norm_term | |
| 8236 && attr <= HL_ALL | |
| 8237 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8238 { | |
| 8239 /* | |
| 8240 * check if we really need to clear something | |
| 8241 */ | |
| 8242 col = start_col; | |
| 8243 if (c1 != ' ') /* don't clear first char */ | |
| 8244 ++col; | |
| 8245 | |
| 8246 off = LineOffset[row] + col; | |
| 8247 end_off = LineOffset[row] + end_col; | |
| 8248 | |
| 8249 /* skip blanks (used often, keep it fast!) */ | |
| 8250 if (enc_utf8) | |
| 8251 while (off < end_off && ScreenLines[off] == ' ' | |
| 8252 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8253 ++off; | |
| 8254 else | |
| 8255 while (off < end_off && ScreenLines[off] == ' ' | |
| 8256 && ScreenAttrs[off] == 0) | |
| 8257 ++off; | |
| 8258 if (off < end_off) /* something to be cleared */ | |
| 8259 { | |
| 8260 col = off - LineOffset[row]; | |
| 8261 screen_stop_highlight(); | |
| 8262 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8263 out_str(T_CE); | |
| 8264 screen_start(); /* don't know where cursor is now */ | |
| 8265 col = end_col - col; | |
| 8266 while (col--) /* clear chars in ScreenLines */ | |
| 8267 { | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8268 space_to_screenline(off, 0); |
| 7 | 8269 ++off; |
| 8270 } | |
| 8271 } | |
| 8272 did_delete = TRUE; /* the chars are cleared now */ | |
| 8273 } | |
| 8274 | |
| 8275 off = LineOffset[row] + start_col; | |
| 8276 c = c1; | |
| 8277 for (col = start_col; col < end_col; ++col) | |
| 8278 { | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8279 if ((ScreenLines[off] != c |
| 714 | 8280 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8281 != (c >= 0x80 ? c : 0)) | |
| 7 | 8282 || ScreenAttrs[off] != attr |
| 8283 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8284 || force_next | |
| 8285 #endif | |
| 8286 ) | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8287 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8288 // Skip if under a(nother) popup. |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8289 && !blocked_by_popup(row, col) |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8290 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8291 ) |
| 7 | 8292 { |
| 8293 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8294 /* The bold trick may make a single row of pixels appear in | |
| 8295 * the next character. When a bold character is removed, the | |
| 8296 * next character should be redrawn too. This happens for our | |
| 8297 * own GUI and for some xterms. */ | |
| 8298 if ( | |
| 8299 # ifdef FEAT_GUI | |
| 8300 gui.in_use | |
| 8301 # endif | |
| 8302 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8303 || | |
| 8304 # endif | |
| 8305 # ifdef UNIX | |
| 8306 term_is_xterm | |
| 8307 # endif | |
| 8308 ) | |
| 8309 { | |
| 8310 if (ScreenLines[off] != ' ' | |
| 8311 && (ScreenAttrs[off] > HL_ALL | |
| 8312 || ScreenAttrs[off] & HL_BOLD)) | |
| 8313 force_next = TRUE; | |
| 8314 else | |
| 8315 force_next = FALSE; | |
| 8316 } | |
| 8317 #endif | |
| 8318 ScreenLines[off] = c; | |
| 8319 if (enc_utf8) | |
| 8320 { | |
| 8321 if (c >= 0x80) | |
| 8322 { | |
| 8323 ScreenLinesUC[off] = c; | |
| 714 | 8324 ScreenLinesC[0][off] = 0; |
| 7 | 8325 } |
| 8326 else | |
| 8327 ScreenLinesUC[off] = 0; | |
| 8328 } | |
| 8329 ScreenAttrs[off] = attr; | |
| 8330 if (!did_delete || c != ' ') | |
| 8331 screen_char(off, row, col); | |
| 8332 } | |
| 8333 ++off; | |
| 8334 if (col == start_col) | |
| 8335 { | |
| 8336 if (did_delete) | |
| 8337 break; | |
| 8338 c = c2; | |
| 8339 } | |
| 8340 } | |
| 8341 if (end_col == Columns) | |
| 8342 LineWraps[row] = FALSE; | |
| 8343 if (row == Rows - 1) /* overwritten the command line */ | |
| 8344 { | |
| 8345 redraw_cmdline = TRUE; | |
|
13666
57da3d873f20
patch 8.0.1705: when making a vertical split the mode message isn't updated
Christian Brabandt <cb@256bit.org>
parents:
13632
diff
changeset
|
8346 if (start_col == 0 && end_col == Columns |
|
57da3d873f20
patch 8.0.1705: when making a vertical split the mode message isn't updated
Christian Brabandt <cb@256bit.org>
parents:
13632
diff
changeset
|
8347 && c1 == ' ' && c2 == ' ' && attr == 0) |
| 7 | 8348 clear_cmdline = FALSE; /* command line has been cleared */ |
| 644 | 8349 if (start_col == 0) |
| 8350 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8351 } |
| 8352 } | |
| 8353 } | |
| 8354 | |
| 8355 /* | |
| 8356 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8357 * screen or the command line. | |
| 8358 */ | |
| 8359 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8360 check_for_delay(int check_msg_scroll) |
| 7 | 8361 { |
| 8362 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8363 && !did_wait_return | |
| 8364 && emsg_silent == 0) | |
| 8365 { | |
| 8366 out_flush(); | |
| 8367 ui_delay(1000L, TRUE); | |
| 8368 emsg_on_display = FALSE; | |
| 8369 if (check_msg_scroll) | |
| 8370 msg_scroll = FALSE; | |
| 8371 } | |
| 8372 } | |
| 8373 | |
| 8374 /* | |
|
16320
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8375 * Init TabPageIdxs[] to zero: Clicking outside of tabs has no effect. |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8376 */ |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8377 static void |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8378 clear_TabPageIdxs(void) |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8379 { |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8380 int scol; |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8381 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8382 for (scol = 0; scol < Columns; ++scol) |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8383 TabPageIdxs[scol] = 0; |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8384 } |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8385 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8386 /* |
| 7 | 8387 * screen_valid - allocate screen buffers if size changed |
| 3263 | 8388 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8389 * Returns TRUE if there is a valid screen to write to. |
| 8390 * Returns FALSE when starting up and screen not initialized yet. | |
| 8391 */ | |
| 8392 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8393 screen_valid(int doclear) |
| 7 | 8394 { |
| 3263 | 8395 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8396 return (ScreenLines != NULL); |
| 8397 } | |
| 8398 | |
| 8399 /* | |
| 8400 * Resize the shell to Rows and Columns. | |
| 8401 * Allocate ScreenLines[] and associated items. | |
| 8402 * | |
| 8403 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8404 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8405 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8406 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8407 * final size of the shell is needed. | |
| 8408 */ | |
| 8409 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8410 screenalloc(int doclear) |
| 7 | 8411 { |
| 8412 int new_row, old_row; | |
| 8413 #ifdef FEAT_GUI | |
| 8414 int old_Rows; | |
| 8415 #endif | |
| 8416 win_T *wp; | |
| 8417 int outofmem = FALSE; | |
| 8418 int len; | |
| 8419 schar_T *new_ScreenLines; | |
| 8420 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8421 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8422 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8423 int i; |
| 7 | 8424 sattr_T *new_ScreenAttrs; |
| 8425 unsigned *new_LineOffset; | |
| 8426 char_u *new_LineWraps; | |
| 681 | 8427 short *new_TabPageIdxs; |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8428 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8429 short *new_popup_mask; |
|
17034
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
8430 short *new_popup_mask_next; |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8431 char *new_popup_transparent; |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8432 #endif |
| 671 | 8433 tabpage_T *tp; |
| 7 | 8434 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8435 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8436 int retry_count = 0; |
| 8437 | |
| 8438 retry: | |
| 7 | 8439 /* |
| 8440 * Allocation of the screen buffers is done only when the size changes and | |
| 8441 * when Rows and Columns have been set and we have started doing full | |
| 8442 * screen stuff. | |
| 8443 */ | |
| 8444 if ((ScreenLines != NULL | |
| 8445 && Rows == screen_Rows | |
| 8446 && Columns == screen_Columns | |
| 8447 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8448 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8449 && p_mco == Screen_mco) |
| 7 | 8450 || Rows == 0 |
| 8451 || Columns == 0 | |
| 8452 || (!full_screen && ScreenLines == NULL)) | |
| 8453 return; | |
| 8454 | |
| 8455 /* | |
| 8456 * It's possible that we produce an out-of-memory message below, which | |
| 8457 * will cause this function to be called again. To break the loop, just | |
| 8458 * return here. | |
| 8459 */ | |
| 8460 if (entered) | |
| 8461 return; | |
| 8462 entered = TRUE; | |
| 8463 | |
| 911 | 8464 /* |
| 8465 * Note that the window sizes are updated before reallocating the arrays, | |
| 8466 * thus we must not redraw here! | |
| 8467 */ | |
| 8468 ++RedrawingDisabled; | |
| 8469 | |
| 7 | 8470 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8471 | |
| 8472 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8473 | |
| 8474 /* | |
| 8475 * We're changing the size of the screen. | |
| 8476 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8477 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8478 * lines (unless the screen is going to be cleared). | |
| 8479 * - Free the old arrays. | |
| 8480 * | |
| 8481 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8482 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8483 * size is wrong. | |
| 8484 */ | |
| 671 | 8485 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8486 win_free_lsize(wp); |
| 1946 | 8487 if (aucmd_win != NULL) |
| 8488 win_free_lsize(aucmd_win); | |
|
16882
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8489 #ifdef FEAT_TEXT_PROP |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8490 // global popup windows |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8491 for (wp = first_popupwin; wp != NULL; wp = wp->w_next) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8492 win_free_lsize(wp); |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8493 // tab-local popup windows |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8494 FOR_ALL_TABPAGES(tp) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8495 for (wp = tp->tp_first_popupwin; wp != NULL; wp = wp->w_next) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8496 win_free_lsize(wp); |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8497 #endif |
| 7 | 8498 |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
8499 new_ScreenLines = LALLOC_MULT(schar_T, (Rows + 1) * Columns); |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
8500 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8501 if (enc_utf8) |
| 8502 { | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
8503 new_ScreenLinesUC = LALLOC_MULT(u8char_T, (Rows + 1) * Columns); |
| 714 | 8504 for (i = 0; i < p_mco; ++i) |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
8505 new_ScreenLinesC[i] = LALLOC_CLEAR_MULT(u8char_T, |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
8506 (Rows + 1) * Columns); |
| 7 | 8507 } |
| 8508 if (enc_dbcs == DBCS_JPNU) | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
8509 new_ScreenLines2 = LALLOC_MULT(schar_T, (Rows + 1) * Columns); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
8510 new_ScreenAttrs = LALLOC_MULT(sattr_T, (Rows + 1) * Columns); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
8511 new_LineOffset = LALLOC_MULT(unsigned, Rows); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
8512 new_LineWraps = LALLOC_MULT(char_u, Rows); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
8513 new_TabPageIdxs = LALLOC_MULT(short, Columns); |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8514 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8515 new_popup_mask = LALLOC_MULT(short, Rows * Columns); |
|
17034
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
8516 new_popup_mask_next = LALLOC_MULT(short, Rows * Columns); |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8517 new_popup_transparent = LALLOC_MULT(char, Rows * Columns); |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8518 #endif |
| 7 | 8519 |
| 677 | 8520 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8521 { |
| 8522 if (win_alloc_lines(wp) == FAIL) | |
| 8523 { | |
| 8524 outofmem = TRUE; | |
| 1819 | 8525 goto give_up; |
| 8526 } | |
| 8527 } | |
| 1946 | 8528 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8529 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8530 outofmem = TRUE; |
|
16882
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8531 #ifdef FEAT_TEXT_PROP |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8532 // global popup windows |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8533 for (wp = first_popupwin; wp != NULL; wp = wp->w_next) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8534 if (win_alloc_lines(wp) == FAIL) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8535 { |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8536 outofmem = TRUE; |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8537 goto give_up; |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8538 } |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8539 // tab-local popup windows |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8540 FOR_ALL_TABPAGES(tp) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8541 for (wp = tp->tp_first_popupwin; wp != NULL; wp = wp->w_next) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8542 if (win_alloc_lines(wp) == FAIL) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8543 { |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8544 outofmem = TRUE; |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8545 goto give_up; |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8546 } |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8547 #endif |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8548 |
| 1819 | 8549 give_up: |
| 7 | 8550 |
| 714 | 8551 for (i = 0; i < p_mco; ++i) |
| 8552 if (new_ScreenLinesC[i] == NULL) | |
| 8553 break; | |
| 7 | 8554 if (new_ScreenLines == NULL |
| 714 | 8555 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8556 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8557 || new_ScreenAttrs == NULL | |
| 8558 || new_LineOffset == NULL | |
| 8559 || new_LineWraps == NULL | |
| 671 | 8560 || new_TabPageIdxs == NULL |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8561 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8562 || new_popup_mask == NULL |
|
17034
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
8563 || new_popup_mask_next == NULL |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8564 || new_popup_transparent == NULL |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8565 #endif |
| 7 | 8566 || outofmem) |
| 8567 { | |
| 944 | 8568 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8569 { |
| 8570 /* guess the size */ | |
| 8571 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8572 | |
| 8573 /* Remember we did this to avoid getting outofmem messages over | |
| 8574 * and over again. */ | |
| 944 | 8575 done_outofmem_msg = TRUE; |
| 534 | 8576 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8577 VIM_CLEAR(new_ScreenLines); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8578 VIM_CLEAR(new_ScreenLinesUC); |
| 714 | 8579 for (i = 0; i < p_mco; ++i) |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8580 VIM_CLEAR(new_ScreenLinesC[i]); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8581 VIM_CLEAR(new_ScreenLines2); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8582 VIM_CLEAR(new_ScreenAttrs); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8583 VIM_CLEAR(new_LineOffset); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8584 VIM_CLEAR(new_LineWraps); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8585 VIM_CLEAR(new_TabPageIdxs); |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8586 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8587 VIM_CLEAR(new_popup_mask); |
|
17034
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
8588 VIM_CLEAR(new_popup_mask_next); |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8589 VIM_CLEAR(new_popup_transparent); |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8590 #endif |
| 7 | 8591 } |
| 8592 else | |
| 8593 { | |
| 944 | 8594 done_outofmem_msg = FALSE; |
| 534 | 8595 |
| 7 | 8596 for (new_row = 0; new_row < Rows; ++new_row) |
| 8597 { | |
| 8598 new_LineOffset[new_row] = new_row * Columns; | |
| 8599 new_LineWraps[new_row] = FALSE; | |
| 8600 | |
| 8601 /* | |
| 8602 * If the screen is not going to be cleared, copy as much as | |
| 8603 * possible from the old screen to the new one and clear the rest | |
| 8604 * (used when resizing the window at the "--more--" prompt or when | |
| 8605 * executing an external command, for the GUI). | |
| 8606 */ | |
| 3263 | 8607 if (!doclear) |
| 7 | 8608 { |
| 8609 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 8610 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 8611 if (enc_utf8) | |
| 8612 { | |
| 8613 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 8614 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 8615 for (i = 0; i < p_mco; ++i) |
| 8616 (void)vim_memset(new_ScreenLinesC[i] | |
| 8617 + new_row * Columns, | |
| 7 | 8618 0, (size_t)Columns * sizeof(u8char_T)); |
| 8619 } | |
| 8620 if (enc_dbcs == DBCS_JPNU) | |
| 8621 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 8622 0, (size_t)Columns * sizeof(schar_T)); | |
| 8623 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 8624 0, (size_t)Columns * sizeof(sattr_T)); | |
| 8625 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 8626 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 8627 { |
| 8628 if (screen_Columns < Columns) | |
| 8629 len = screen_Columns; | |
| 8630 else | |
| 8631 len = Columns; | |
| 571 | 8632 /* When switching to utf-8 don't copy characters, they |
| 714 | 8633 * may be invalid now. Also when p_mco changes. */ |
| 8634 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 8635 && p_mco == Screen_mco) | |
| 26 | 8636 mch_memmove(new_ScreenLines + new_LineOffset[new_row], |
| 8637 ScreenLines + LineOffset[old_row], | |
| 8638 (size_t)len * sizeof(schar_T)); | |
| 714 | 8639 if (enc_utf8 && ScreenLinesUC != NULL |
| 8640 && p_mco == Screen_mco) | |
| 7 | 8641 { |
| 8642 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 8643 ScreenLinesUC + LineOffset[old_row], | |
| 8644 (size_t)len * sizeof(u8char_T)); | |
| 714 | 8645 for (i = 0; i < p_mco; ++i) |
| 8646 mch_memmove(new_ScreenLinesC[i] | |
| 8647 + new_LineOffset[new_row], | |
| 8648 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 8649 (size_t)len * sizeof(u8char_T)); |
| 8650 } | |
| 8651 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 8652 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 8653 ScreenLines2 + LineOffset[old_row], | |
| 8654 (size_t)len * sizeof(schar_T)); | |
| 8655 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 8656 ScreenAttrs + LineOffset[old_row], | |
| 8657 (size_t)len * sizeof(sattr_T)); | |
| 8658 } | |
| 8659 } | |
| 8660 } | |
| 8661 /* Use the last line of the screen for the current line. */ | |
| 8662 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
|
17696
03dcb660c4e8
patch 8.1.1845: may use NULL pointer when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
17628
diff
changeset
|
8663 |
|
03dcb660c4e8
patch 8.1.1845: may use NULL pointer when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
17628
diff
changeset
|
8664 #ifdef FEAT_TEXT_PROP |
|
03dcb660c4e8
patch 8.1.1845: may use NULL pointer when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
17628
diff
changeset
|
8665 vim_memset(new_popup_mask, 0, Rows * Columns * sizeof(short)); |
|
03dcb660c4e8
patch 8.1.1845: may use NULL pointer when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
17628
diff
changeset
|
8666 vim_memset(new_popup_transparent, 0, Rows * Columns * sizeof(char)); |
|
03dcb660c4e8
patch 8.1.1845: may use NULL pointer when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
17628
diff
changeset
|
8667 #endif |
| 7 | 8668 } |
| 8669 | |
| 356 | 8670 free_screenlines(); |
| 8671 | |
|
17696
03dcb660c4e8
patch 8.1.1845: may use NULL pointer when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
17628
diff
changeset
|
8672 // NOTE: this may result in all pointers to become NULL. |
| 7 | 8673 ScreenLines = new_ScreenLines; |
| 8674 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 8675 for (i = 0; i < p_mco; ++i) |
| 8676 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 8677 Screen_mco = p_mco; | |
| 7 | 8678 ScreenLines2 = new_ScreenLines2; |
| 8679 ScreenAttrs = new_ScreenAttrs; | |
| 8680 LineOffset = new_LineOffset; | |
| 8681 LineWraps = new_LineWraps; | |
| 671 | 8682 TabPageIdxs = new_TabPageIdxs; |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8683 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8684 popup_mask = new_popup_mask; |
|
17034
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
8685 popup_mask_next = new_popup_mask_next; |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8686 popup_transparent = new_popup_transparent; |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8687 popup_mask_refresh = TRUE; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8688 #endif |
| 7 | 8689 |
| 8690 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 8691 * size of ScreenLines[]. Set them before calling anything. */ | |
| 8692 #ifdef FEAT_GUI | |
| 8693 old_Rows = screen_Rows; | |
| 8694 #endif | |
| 8695 screen_Rows = Rows; | |
| 8696 screen_Columns = Columns; | |
| 8697 | |
| 8698 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 8699 if (doclear) |
| 7 | 8700 screenclear2(); |
| 8701 #ifdef FEAT_GUI | |
| 8702 else if (gui.in_use | |
| 8703 && !gui.starting | |
| 8704 && ScreenLines != NULL | |
| 8705 && old_Rows != Rows) | |
| 8706 { | |
| 8707 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 8708 /* | |
| 8709 * Adjust the position of the cursor, for when executing an external | |
| 8710 * command. | |
| 8711 */ | |
| 8712 if (msg_row >= Rows) /* Rows got smaller */ | |
| 8713 msg_row = Rows - 1; /* put cursor at last row */ | |
| 8714 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 8715 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 8716 if (msg_col >= Columns) /* Columns got smaller */ | |
| 8717 msg_col = Columns - 1; /* put cursor at last column */ | |
| 8718 } | |
| 8719 #endif | |
|
16320
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8720 clear_TabPageIdxs(); |
| 7 | 8721 |
| 8722 entered = FALSE; | |
| 911 | 8723 --RedrawingDisabled; |
| 766 | 8724 |
| 1824 | 8725 /* |
| 8726 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 8727 * in case applying autocommands always changes Rows or Columns. | |
| 8728 */ | |
| 8729 if (starting == 0 && ++retry_count <= 3) | |
| 8730 { | |
| 766 | 8731 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 8732 /* In rare cases, autocommands may have altered Rows or Columns, |
| 8733 * jump back to check if we need to allocate the screen again. */ | |
| 8734 goto retry; | |
| 8735 } | |
| 7 | 8736 } |
| 8737 | |
| 8738 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8739 free_screenlines(void) |
| 356 | 8740 { |
| 714 | 8741 int i; |
| 8742 | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8743 VIM_CLEAR(ScreenLinesUC); |
| 714 | 8744 for (i = 0; i < Screen_mco; ++i) |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8745 VIM_CLEAR(ScreenLinesC[i]); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8746 VIM_CLEAR(ScreenLines2); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8747 VIM_CLEAR(ScreenLines); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8748 VIM_CLEAR(ScreenAttrs); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8749 VIM_CLEAR(LineOffset); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8750 VIM_CLEAR(LineWraps); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8751 VIM_CLEAR(TabPageIdxs); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8752 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8753 VIM_CLEAR(popup_mask); |
|
17034
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
8754 VIM_CLEAR(popup_mask_next); |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8755 VIM_CLEAR(popup_transparent); |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8756 #endif |
| 356 | 8757 } |
| 8758 | |
| 8759 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8760 screenclear(void) |
| 7 | 8761 { |
| 8762 check_for_delay(FALSE); | |
| 8763 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 8764 screenclear2(); /* clear the screen */ | |
| 8765 } | |
| 8766 | |
| 8767 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8768 screenclear2(void) |
| 7 | 8769 { |
| 8770 int i; | |
| 8771 | |
| 8772 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 8773 #ifdef FEAT_GUI | |
| 8774 || (gui.in_use && gui.starting) | |
| 8775 #endif | |
| 8776 ) | |
| 8777 return; | |
| 8778 | |
| 8779 #ifdef FEAT_GUI | |
| 8780 if (!gui.in_use) | |
| 8781 #endif | |
| 8782 screen_attr = -1; /* force setting the Normal colors */ | |
| 8783 screen_stop_highlight(); /* don't want highlighting here */ | |
| 8784 | |
| 8785 #ifdef FEAT_CLIPBOARD | |
| 8786 /* disable selection without redrawing it */ | |
| 8787 clip_scroll_selection(9999); | |
| 8788 #endif | |
| 8789 | |
| 8790 /* blank out ScreenLines */ | |
| 8791 for (i = 0; i < Rows; ++i) | |
| 8792 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
8793 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 8794 LineWraps[i] = FALSE; |
| 8795 } | |
| 8796 | |
| 8797 if (can_clear(T_CL)) | |
| 8798 { | |
| 8799 out_str(T_CL); /* clear the display */ | |
| 8800 clear_cmdline = FALSE; | |
| 644 | 8801 mode_displayed = FALSE; |
| 7 | 8802 } |
| 8803 else | |
| 8804 { | |
| 8805 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 8806 for (i = 0; i < Rows; ++i) | |
| 8807 lineinvalid(LineOffset[i], (int)Columns); | |
| 8808 clear_cmdline = TRUE; | |
| 8809 } | |
| 8810 | |
| 8811 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 8812 | |
| 8813 win_rest_invalid(firstwin); | |
| 8814 redraw_cmdline = TRUE; | |
| 673 | 8815 redraw_tabline = TRUE; |
| 7 | 8816 if (must_redraw == CLEAR) /* no need to clear again */ |
| 8817 must_redraw = NOT_VALID; | |
| 8818 compute_cmdrow(); | |
| 8819 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 8820 msg_col = 0; | |
| 8821 screen_start(); /* don't know where cursor is now */ | |
| 8822 msg_scrolled = 0; /* can't scroll back */ | |
| 8823 msg_didany = FALSE; | |
| 8824 msg_didout = FALSE; | |
| 8825 } | |
| 8826 | |
| 8827 /* | |
| 8828 * Clear one line in ScreenLines. | |
| 8829 */ | |
| 8830 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
8831 lineclear(unsigned off, int width, int attr) |
| 7 | 8832 { |
| 8833 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 8834 if (enc_utf8) | |
| 8835 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 8836 (size_t)width * sizeof(u8char_T)); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
8837 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 8838 } |
| 8839 | |
| 8840 /* | |
| 8841 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 8842 * invalid value. | |
| 8843 */ | |
| 8844 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8845 lineinvalid(unsigned off, int width) |
| 7 | 8846 { |
| 8847 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 8848 } | |
| 8849 | |
| 8850 /* | |
| 8851 * Copy part of a Screenline for vertically split window "wp". | |
| 8852 */ | |
| 8853 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8854 linecopy(int to, int from, win_T *wp) |
| 7 | 8855 { |
| 8856 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 8857 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 8858 | |
| 8859 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 8860 wp->w_width * sizeof(schar_T)); | |
| 8861 if (enc_utf8) | |
| 8862 { | |
| 714 | 8863 int i; |
| 8864 | |
| 7 | 8865 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 8866 wp->w_width * sizeof(u8char_T)); | |
| 714 | 8867 for (i = 0; i < p_mco; ++i) |
| 8868 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 8869 wp->w_width * sizeof(u8char_T)); | |
| 7 | 8870 } |
| 8871 if (enc_dbcs == DBCS_JPNU) | |
| 8872 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 8873 wp->w_width * sizeof(schar_T)); | |
| 8874 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 8875 wp->w_width * sizeof(sattr_T)); | |
| 8876 } | |
| 8877 | |
| 8878 /* | |
| 8879 * Return TRUE if clearing with term string "p" would work. | |
| 8880 * It can't work when the string is empty or it won't set the right background. | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8881 * Don't clear to end-of-line when there are popups, it may cause flicker. |
| 7 | 8882 */ |
| 8883 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8884 can_clear(char_u *p) |
| 7 | 8885 { |
| 8886 return (*p != NUL && (t_colors <= 1 | |
| 8887 #ifdef FEAT_GUI | |
| 8888 || gui.in_use | |
| 8889 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8890 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8891 || (p_tgc && cterm_normal_bg_gui_color == INVALCOLOR) |
|
9320
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
8892 || (!p_tgc && cterm_normal_bg_color == 0) |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
8893 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
8894 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
8895 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8896 || *T_UT != NUL) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8897 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8898 && !(p == T_CE && popup_visible) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8899 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8900 ); |
| 7 | 8901 } |
| 8902 | |
| 8903 /* | |
| 8904 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 8905 * something directly to the screen (shell commands) or a terminal control | |
| 8906 * code. | |
| 8907 */ | |
| 8908 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8909 screen_start(void) |
| 7 | 8910 { |
| 8911 screen_cur_row = screen_cur_col = 9999; | |
| 8912 } | |
| 8913 | |
| 8914 /* | |
| 8915 * Move the cursor to position "row","col" in the screen. | |
| 8916 * This tries to find the most efficient way to move, minimizing the number of | |
| 8917 * characters sent to the terminal. | |
| 8918 */ | |
| 8919 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8920 windgoto(int row, int col) |
| 7 | 8921 { |
| 205 | 8922 sattr_T *p; |
| 7 | 8923 int i; |
| 8924 int plan; | |
| 8925 int cost; | |
| 8926 int wouldbe_col; | |
| 8927 int noinvcurs; | |
| 8928 char_u *bs; | |
| 8929 int goto_cost; | |
| 8930 int attr; | |
| 8931 | |
| 1213 | 8932 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 8933 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 8934 | |
| 8935 #define PLAN_LE 1 | |
| 8936 #define PLAN_CR 2 | |
| 8937 #define PLAN_NL 3 | |
| 8938 #define PLAN_WRITE 4 | |
| 8939 /* Can't use ScreenLines unless initialized */ | |
| 8940 if (ScreenLines == NULL) | |
| 8941 return; | |
| 8942 | |
| 8943 if (col != screen_cur_col || row != screen_cur_row) | |
| 8944 { | |
| 8945 /* Check for valid position. */ | |
| 8946 if (row < 0) /* window without text lines? */ | |
| 8947 row = 0; | |
| 8948 if (row >= screen_Rows) | |
| 8949 row = screen_Rows - 1; | |
| 8950 if (col >= screen_Columns) | |
| 8951 col = screen_Columns - 1; | |
| 8952 | |
| 8953 /* check if no cursor movement is allowed in highlight mode */ | |
| 8954 if (screen_attr && *T_MS == NUL) | |
| 8955 noinvcurs = HIGHL_COST; | |
| 8956 else | |
| 8957 noinvcurs = 0; | |
| 8958 goto_cost = GOTO_COST + noinvcurs; | |
| 8959 | |
| 8960 /* | |
| 8961 * Plan how to do the positioning: | |
| 8962 * 1. Use CR to move it to column 0, same row. | |
| 8963 * 2. Use T_LE to move it a few columns to the left. | |
| 8964 * 3. Use NL to move a few lines down, column 0. | |
| 8965 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 8966 * | |
| 8967 * Don't do this if the cursor went beyond the last column, the cursor | |
| 8968 * position is unknown then (some terminals wrap, some don't ) | |
| 8969 * | |
| 1213 | 8970 * First check if the highlighting attributes allow us to write |
| 7 | 8971 * characters to move the cursor to the right. |
| 8972 */ | |
| 8973 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 8974 { | |
| 8975 /* | |
| 8976 * If the cursor is in the same row, bigger col, we can use CR | |
| 8977 * or T_LE. | |
| 8978 */ | |
| 8979 bs = NULL; /* init for GCC */ | |
| 8980 attr = screen_attr; | |
| 8981 if (row == screen_cur_row && col < screen_cur_col) | |
| 8982 { | |
| 8983 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 8984 if (*T_LE) | |
| 8985 bs = T_LE; /* "cursor left" */ | |
| 8986 else | |
| 8987 bs = T_BC; /* "backspace character (old) */ | |
| 8988 if (*bs) | |
| 8989 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 8990 else | |
| 8991 cost = 999; | |
| 8992 if (col + 1 < cost) /* using CR is less characters */ | |
| 8993 { | |
| 8994 plan = PLAN_CR; | |
| 8995 wouldbe_col = 0; | |
| 8996 cost = 1; /* CR is just one character */ | |
| 8997 } | |
| 8998 else | |
| 8999 { | |
| 9000 plan = PLAN_LE; | |
| 9001 wouldbe_col = col; | |
| 9002 } | |
| 9003 if (noinvcurs) /* will stop highlighting */ | |
| 9004 { | |
| 9005 cost += noinvcurs; | |
| 9006 attr = 0; | |
| 9007 } | |
| 9008 } | |
| 9009 | |
| 9010 /* | |
| 9011 * If the cursor is above where we want to be, we can use CR LF. | |
| 9012 */ | |
| 9013 else if (row > screen_cur_row) | |
| 9014 { | |
| 9015 plan = PLAN_NL; | |
| 9016 wouldbe_col = 0; | |
| 9017 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9018 if (noinvcurs) /* will stop highlighting */ | |
| 9019 { | |
| 9020 cost += noinvcurs; | |
| 9021 attr = 0; | |
| 9022 } | |
| 9023 } | |
| 9024 | |
| 9025 /* | |
| 9026 * If the cursor is in the same row, smaller col, just use write. | |
| 9027 */ | |
| 9028 else | |
| 9029 { | |
| 9030 plan = PLAN_WRITE; | |
| 9031 wouldbe_col = screen_cur_col; | |
| 9032 cost = 0; | |
| 9033 } | |
| 9034 | |
| 9035 /* | |
| 9036 * Check if any characters that need to be written have the | |
| 9037 * correct attributes. Also avoid UTF-8 characters. | |
| 9038 */ | |
| 9039 i = col - wouldbe_col; | |
| 9040 if (i > 0) | |
| 9041 cost += i; | |
| 9042 if (cost < goto_cost && i > 0) | |
| 9043 { | |
| 9044 /* | |
| 9045 * Check if the attributes are correct without additionally | |
| 9046 * stopping highlighting. | |
| 9047 */ | |
| 9048 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9049 while (i && *p++ == attr) | |
| 9050 --i; | |
| 9051 if (i != 0) | |
| 9052 { | |
| 9053 /* | |
| 9054 * Try if it works when highlighting is stopped here. | |
| 9055 */ | |
| 9056 if (*--p == 0) | |
| 9057 { | |
| 9058 cost += noinvcurs; | |
| 9059 while (i && *p++ == 0) | |
| 9060 --i; | |
| 9061 } | |
| 9062 if (i != 0) | |
| 9063 cost = 999; /* different attributes, don't do it */ | |
| 9064 } | |
| 9065 if (enc_utf8) | |
| 9066 { | |
| 9067 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9068 for (i = wouldbe_col; i < col; ++i) | |
| 9069 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9070 { | |
| 9071 cost = 999; | |
| 9072 break; | |
| 9073 } | |
| 9074 } | |
| 9075 } | |
| 9076 | |
| 9077 /* | |
| 9078 * We can do it without term_windgoto()! | |
| 9079 */ | |
| 9080 if (cost < goto_cost) | |
| 9081 { | |
| 9082 if (plan == PLAN_LE) | |
| 9083 { | |
| 9084 if (noinvcurs) | |
| 9085 screen_stop_highlight(); | |
| 9086 while (screen_cur_col > col) | |
| 9087 { | |
| 9088 out_str(bs); | |
| 9089 --screen_cur_col; | |
| 9090 } | |
| 9091 } | |
| 9092 else if (plan == PLAN_CR) | |
| 9093 { | |
| 9094 if (noinvcurs) | |
| 9095 screen_stop_highlight(); | |
| 9096 out_char('\r'); | |
| 9097 screen_cur_col = 0; | |
| 9098 } | |
| 9099 else if (plan == PLAN_NL) | |
| 9100 { | |
| 9101 if (noinvcurs) | |
| 9102 screen_stop_highlight(); | |
| 9103 while (screen_cur_row < row) | |
| 9104 { | |
| 9105 out_char('\n'); | |
| 9106 ++screen_cur_row; | |
| 9107 } | |
| 9108 screen_cur_col = 0; | |
| 9109 } | |
| 9110 | |
| 9111 i = col - screen_cur_col; | |
| 9112 if (i > 0) | |
| 9113 { | |
| 9114 /* | |
| 9115 * Use cursor-right if it's one character only. Avoids | |
| 9116 * removing a line of pixels from the last bold char, when | |
| 9117 * using the bold trick in the GUI. | |
| 9118 */ | |
| 9119 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9120 { | |
| 9121 while (i-- > 0) | |
| 9122 out_char(*T_ND); | |
| 9123 } | |
| 9124 else | |
| 9125 { | |
| 9126 int off; | |
| 9127 | |
| 9128 off = LineOffset[row] + screen_cur_col; | |
| 9129 while (i-- > 0) | |
| 9130 { | |
| 9131 if (ScreenAttrs[off] != screen_attr) | |
| 9132 screen_stop_highlight(); | |
| 9133 out_flush_check(); | |
| 9134 out_char(ScreenLines[off]); | |
| 9135 if (enc_dbcs == DBCS_JPNU | |
| 9136 && ScreenLines[off] == 0x8e) | |
| 9137 out_char(ScreenLines2[off]); | |
| 9138 ++off; | |
| 9139 } | |
| 9140 } | |
| 9141 } | |
| 9142 } | |
| 9143 } | |
| 9144 else | |
| 9145 cost = 999; | |
| 9146 | |
| 9147 if (cost >= goto_cost) | |
| 9148 { | |
| 9149 if (noinvcurs) | |
| 9150 screen_stop_highlight(); | |
| 5995 | 9151 if (row == screen_cur_row && (col > screen_cur_col) |
| 9152 && *T_CRI != NUL) | |
| 7 | 9153 term_cursor_right(col - screen_cur_col); |
| 9154 else | |
| 9155 term_windgoto(row, col); | |
| 9156 } | |
| 9157 screen_cur_row = row; | |
| 9158 screen_cur_col = col; | |
| 9159 } | |
| 9160 } | |
| 9161 | |
| 9162 /* | |
| 9163 * Set cursor to its position in the current window. | |
| 9164 */ | |
| 9165 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9166 setcursor(void) |
| 7 | 9167 { |
|
13400
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9168 setcursor_mayforce(FALSE); |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9169 } |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9170 |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9171 /* |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9172 * Set cursor to its position in the current window. |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9173 * When "force" is TRUE also when not redrawing. |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9174 */ |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9175 void |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9176 setcursor_mayforce(int force) |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9177 { |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9178 if (force || redrawing()) |
| 7 | 9179 { |
| 9180 validate_cursor(); | |
| 9181 windgoto(W_WINROW(curwin) + curwin->w_wrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
9182 curwin->w_wincol + ( |
| 7 | 9183 #ifdef FEAT_RIGHTLEFT |
| 1545 | 9184 /* With 'rightleft' set and the cursor on a double-wide |
| 9185 * character, position it on the leftmost column. */ | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9186 curwin->w_p_rl ? ((int)curwin->w_width - curwin->w_wcol |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9187 - ((has_mbyte |
| 1545 | 9188 && (*mb_ptr2cells)(ml_get_cursor()) == 2 |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9189 && vim_isprintc(gchar_cursor())) ? 2 : 1)) : |
| 7 | 9190 #endif |
| 9191 curwin->w_wcol)); | |
| 9192 } | |
| 9193 } | |
| 9194 | |
| 9195 | |
| 9196 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9197 * Insert 'line_count' lines at 'row' in window 'wp'. |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9198 * If 'invalid' is TRUE the wp->w_lines[].wl_lnum is invalidated. |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9199 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9200 * scrolling. |
| 9201 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9202 */ | |
| 9203 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9204 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9205 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9206 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9207 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9208 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9209 int mayclear) |
| 7 | 9210 { |
| 9211 int did_delete; | |
| 9212 int nextrow; | |
| 9213 int lastrow; | |
| 9214 int retval; | |
| 9215 | |
| 9216 if (invalid) | |
| 9217 wp->w_lines_valid = 0; | |
| 9218 | |
| 9219 if (wp->w_height < 5) | |
| 9220 return FAIL; | |
| 9221 | |
| 9222 if (line_count > wp->w_height - row) | |
| 9223 line_count = wp->w_height - row; | |
| 9224 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9225 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9226 if (retval != MAYBE) |
| 9227 return retval; | |
| 9228 | |
| 9229 /* | |
| 9230 * If there is a next window or a status line, we first try to delete the | |
| 9231 * lines at the bottom to avoid messing what is after the window. | |
|
17628
6146b10714de
patch 8.1.1811: popup window color cannot be set to "Normal"
Bram Moolenaar <Bram@vim.org>
parents:
17551
diff
changeset
|
9232 * If this fails and there are following windows, don't do anything to |
|
6146b10714de
patch 8.1.1811: popup window color cannot be set to "Normal"
Bram Moolenaar <Bram@vim.org>
parents:
17551
diff
changeset
|
9233 * avoid messing up those windows, better just redraw. |
| 7 | 9234 */ |
| 9235 did_delete = FALSE; | |
| 9236 if (wp->w_next != NULL || wp->w_status_height) | |
| 9237 { | |
| 9238 if (screen_del_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9239 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9240 did_delete = TRUE; |
| 9241 else if (wp->w_next) | |
| 9242 return FAIL; | |
| 9243 } | |
| 9244 /* | |
| 9245 * if no lines deleted, blank the lines that will end up below the window | |
| 9246 */ | |
| 9247 if (!did_delete) | |
| 9248 { | |
| 9249 wp->w_redr_status = TRUE; | |
| 9250 redraw_cmdline = TRUE; | |
|
12529
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
9251 nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height; |
| 7 | 9252 lastrow = nextrow + line_count; |
| 9253 if (lastrow > Rows) | |
| 9254 lastrow = Rows; | |
| 9255 screen_fill(nextrow - line_count, lastrow - line_count, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
9256 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9257 ' ', ' ', 0); |
| 9258 } | |
| 9259 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9260 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9261 == FAIL) |
| 9262 { | |
|
17628
6146b10714de
patch 8.1.1811: popup window color cannot be set to "Normal"
Bram Moolenaar <Bram@vim.org>
parents:
17551
diff
changeset
|
9263 // deletion will have messed up other windows |
| 7 | 9264 if (did_delete) |
| 9265 { | |
| 9266 wp->w_redr_status = TRUE; | |
| 9267 win_rest_invalid(W_NEXT(wp)); | |
| 9268 } | |
| 9269 return FAIL; | |
| 9270 } | |
| 9271 | |
| 9272 return OK; | |
| 9273 } | |
| 9274 | |
| 9275 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9276 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9277 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9278 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9279 * scrolling | |
| 9280 * Return OK for success, FAIL if the lines are not deleted. | |
| 9281 */ | |
| 9282 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9283 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9284 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9285 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9286 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9287 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9288 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9289 int clear_attr) /* for clearing lines */ |
| 7 | 9290 { |
| 9291 int retval; | |
| 9292 | |
| 9293 if (invalid) | |
| 9294 wp->w_lines_valid = 0; | |
| 9295 | |
| 9296 if (line_count > wp->w_height - row) | |
| 9297 line_count = wp->w_height - row; | |
| 9298 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9299 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9300 if (retval != MAYBE) |
| 9301 return retval; | |
| 9302 | |
| 9303 if (screen_del_lines(0, W_WINROW(wp) + row, line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9304 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9305 return FAIL; |
| 9306 | |
| 9307 /* | |
| 9308 * If there are windows or status lines below, try to put them at the | |
| 9309 * correct place. If we can't do that, they have to be redrawn. | |
| 9310 */ | |
| 9311 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9312 { | |
| 9313 if (screen_ins_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9314 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9315 { |
| 9316 wp->w_redr_status = TRUE; | |
| 9317 win_rest_invalid(wp->w_next); | |
| 9318 } | |
| 9319 } | |
| 9320 /* | |
| 9321 * If this is the last window and there is no status line, redraw the | |
| 9322 * command line later. | |
| 9323 */ | |
| 9324 else | |
| 9325 redraw_cmdline = TRUE; | |
| 9326 return OK; | |
| 9327 } | |
| 9328 | |
| 9329 /* | |
| 9330 * Common code for win_ins_lines() and win_del_lines(). | |
| 9331 * Returns OK or FAIL when the work has been done. | |
| 9332 * Returns MAYBE when not finished yet. | |
| 9333 */ | |
| 9334 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9335 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9336 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9337 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9338 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9339 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9340 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9341 int clear_attr) |
| 7 | 9342 { |
| 9343 int retval; | |
| 9344 | |
| 9345 if (!redrawing() || line_count <= 0) | |
| 9346 return FAIL; | |
| 9347 | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9348 // When inserting lines would result in loss of command output, just redraw |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9349 // the lines. |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9350 if (no_win_do_lines_ins && !del) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9351 return FAIL; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9352 |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9353 // only a few lines left: redraw is faster |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9354 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) |
| 7 | 9355 { |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9356 if (!no_win_do_lines_ins) |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9357 screenclear(); // will set wp->w_lines_valid to 0 |
| 7 | 9358 return FAIL; |
| 9359 } | |
| 9360 | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9361 #ifdef FEAT_TEXT_PROP |
|
17034
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
9362 // this doesn't work when there are popups visible |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9363 if (popup_visible) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9364 return FAIL; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9365 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9366 |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9367 // Delete all remaining lines |
| 7 | 9368 if (row + line_count >= wp->w_height) |
| 9369 { | |
| 9370 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
9371 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9372 ' ', ' ', 0); |
| 9373 return OK; | |
| 9374 } | |
| 9375 | |
| 9376 /* | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9377 * When scrolling, the message on the command line should be cleared, |
| 7 | 9378 * otherwise it will stay there forever. |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9379 * Don't do this when avoiding to insert lines. |
| 7 | 9380 */ |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9381 if (!no_win_do_lines_ins) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9382 clear_cmdline = TRUE; |
| 7 | 9383 |
| 9384 /* | |
| 9385 * If the terminal can set a scroll region, use that. | |
| 9386 * Always do this in a vertically split window. This will redraw from | |
| 9387 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9388 * win_line(). | |
| 9389 * Don't use a scroll region when we are going to redraw the text, writing | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
9390 * a character in the lower right corner of the scroll region may cause a |
|
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
9391 * scroll-up . |
| 7 | 9392 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9393 if (scroll_region || wp->w_width != Columns) |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9394 { |
| 7 | 9395 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9396 scroll_region_set(wp, row); | |
| 9397 if (del) | |
| 9398 retval = screen_del_lines(W_WINROW(wp) + row, 0, line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9399 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 9400 else |
| 9401 retval = screen_ins_lines(W_WINROW(wp) + row, 0, line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9402 wp->w_height - row, clear_attr, wp); |
| 7 | 9403 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9404 scroll_region_reset(); | |
| 9405 return retval; | |
| 9406 } | |
| 9407 | |
| 9408 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9409 return FAIL; | |
| 9410 | |
| 9411 return MAYBE; | |
| 9412 } | |
| 9413 | |
| 9414 /* | |
| 9415 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9416 */ | |
| 9417 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9418 win_rest_invalid(win_T *wp) |
| 7 | 9419 { |
| 9420 while (wp != NULL) | |
| 9421 { | |
| 9422 redraw_win_later(wp, NOT_VALID); | |
| 9423 wp->w_redr_status = TRUE; | |
| 9424 wp = wp->w_next; | |
| 9425 } | |
| 9426 redraw_cmdline = TRUE; | |
| 9427 } | |
| 9428 | |
| 9429 /* | |
| 9430 * The rest of the routines in this file perform screen manipulations. The | |
| 9431 * given operation is performed physically on the screen. The corresponding | |
| 9432 * change is also made to the internal screen image. In this way, the editor | |
| 9433 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9434 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9435 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9436 * screen changes, and in the meantime, everything still works. | |
| 9437 */ | |
| 9438 | |
| 9439 /* | |
| 9440 * types for inserting or deleting lines | |
| 9441 */ | |
| 9442 #define USE_T_CAL 1 | |
| 9443 #define USE_T_CDL 2 | |
| 9444 #define USE_T_AL 3 | |
| 9445 #define USE_T_CE 4 | |
| 9446 #define USE_T_DL 5 | |
| 9447 #define USE_T_SR 6 | |
| 9448 #define USE_NL 7 | |
| 9449 #define USE_T_CD 8 | |
| 9450 #define USE_REDRAW 9 | |
| 9451 | |
| 9452 /* | |
| 9453 * insert lines on the screen and update ScreenLines[] | |
| 9454 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9455 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9456 * 'row' and 'end' are relative to the start of the region. | |
| 9457 * | |
| 9458 * return FAIL for failure, OK for success. | |
| 9459 */ | |
| 446 | 9460 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9461 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9462 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9463 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9464 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9465 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9466 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9467 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9468 { |
| 9469 int i; | |
| 9470 int j; | |
| 9471 unsigned temp; | |
| 9472 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9473 int cursor_col = 0; |
| 7 | 9474 int type; |
| 9475 int result_empty; | |
| 9476 int can_ce = can_clear(T_CE); | |
| 9477 | |
| 9478 /* | |
| 9479 * FAIL if | |
| 9480 * - there is no valid screen | |
| 9481 * - the screen has to be redrawn completely | |
| 9482 * - the line count is less than one | |
| 9483 * - the line count is more than 'ttyscroll' | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9484 * - redrawing for a callback and there is a modeless selection |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9485 * - there is a popup window |
| 7 | 9486 */ |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9487 if (!screen_valid(TRUE) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9488 || line_count <= 0 || line_count > p_ttyscroll |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9489 #ifdef FEAT_CLIPBOARD |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9490 || (clip_star.state != SELECT_CLEARED |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9491 && redrawing_for_callback > 0) |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9492 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9493 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9494 || popup_visible |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9495 #endif |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9496 ) |
| 7 | 9497 return FAIL; |
| 9498 | |
| 9499 /* | |
| 9500 * There are seven ways to insert lines: | |
| 9501 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9502 * characters from ScreenLines[]. | |
| 9503 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9504 * the insert is just empty lines | |
| 9505 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9506 * present or line_count > 1. It looks better if we do all the inserts | |
| 9507 * at once. | |
| 9508 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9509 * insert is just empty lines and T_CE is not present or line_count > | |
| 9510 * 1. | |
| 9511 * 4. Use T_AL (insert line) if it exists. | |
| 9512 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9513 * just empty lines. | |
| 9514 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9515 * just empty lines. | |
| 9516 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9517 * the 'da' flag is not set or we have clear line capability. | |
| 9518 * 8. redraw the characters from ScreenLines[]. | |
| 9519 * | |
| 9520 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9521 * the scrollbar for the window. It does have insert line, use that if it | |
| 9522 * exists. | |
| 9523 */ | |
| 9524 result_empty = (row + line_count >= end); | |
| 9525 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 9526 type = USE_REDRAW; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9527 else if (can_clear(T_CD) && result_empty) |
| 7 | 9528 type = USE_T_CD; |
| 9529 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9530 type = USE_T_CAL; | |
| 9531 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9532 type = USE_T_CDL; | |
| 9533 else if (*T_AL != NUL) | |
| 9534 type = USE_T_AL; | |
| 9535 else if (can_ce && result_empty) | |
| 9536 type = USE_T_CE; | |
| 9537 else if (*T_DL != NUL && result_empty) | |
| 9538 type = USE_T_DL; | |
| 9539 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9540 type = USE_T_SR; | |
| 9541 else | |
| 9542 return FAIL; | |
| 9543 | |
| 9544 /* | |
| 9545 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9546 * care of t_db if necessary. | |
| 9547 */ | |
| 9548 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9549 type == USE_T_CE || type == USE_T_DL) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9550 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 9551 |
| 9552 /* | |
| 9553 * If text is retained below the screen, first clear or delete as many | |
| 9554 * lines at the bottom of the window as are about to be inserted so that | |
| 9555 * the deleted lines won't later surface during a screen_del_lines. | |
| 9556 */ | |
| 9557 if (*T_DB) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9558 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 9559 |
| 9560 #ifdef FEAT_CLIPBOARD | |
| 9561 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9562 * or not the full width of the screen. */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9563 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 9564 clip_clear_selection(&clip_star); |
| 7 | 9565 else |
| 9566 clip_scroll_selection(-line_count); | |
| 9567 #endif | |
| 9568 | |
| 9569 #ifdef FEAT_GUI | |
| 9570 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9571 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9572 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 9573 #endif |
| 9574 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9575 if (wp != NULL && wp->w_wincol != 0 && *T_CSV != NUL && *T_CCS == NUL) |
|
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9576 cursor_col = wp->w_wincol; |
|
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9577 |
| 7 | 9578 if (*T_CCS != NUL) /* cursor relative to region */ |
| 9579 cursor_row = row; | |
| 9580 else | |
| 9581 cursor_row = row + off; | |
| 9582 | |
| 9583 /* | |
| 9584 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9585 * Clear the inserted lines in ScreenLines[]. | |
| 9586 */ | |
| 9587 row += off; | |
| 9588 end += off; | |
| 9589 for (i = 0; i < line_count; ++i) | |
| 9590 { | |
| 9591 if (wp != NULL && wp->w_width != Columns) | |
| 9592 { | |
| 9593 /* need to copy part of a line */ | |
| 9594 j = end - 1 - i; | |
| 9595 while ((j -= line_count) >= row) | |
| 9596 linecopy(j + line_count, j, wp); | |
| 9597 j += line_count; | |
| 9598 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9599 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9600 clear_attr); |
| 7 | 9601 else |
| 9602 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9603 LineWraps[j] = FALSE; | |
| 9604 } | |
| 9605 else | |
| 9606 { | |
| 9607 j = end - 1 - i; | |
| 9608 temp = LineOffset[j]; | |
| 9609 while ((j -= line_count) >= row) | |
| 9610 { | |
| 9611 LineOffset[j + line_count] = LineOffset[j]; | |
| 9612 LineWraps[j + line_count] = LineWraps[j]; | |
| 9613 } | |
| 9614 LineOffset[j + line_count] = temp; | |
| 9615 LineWraps[j + line_count] = FALSE; | |
| 9616 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9617 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 9618 else |
| 9619 lineinvalid(temp, (int)Columns); | |
| 9620 } | |
| 9621 } | |
| 9622 | |
| 9623 screen_stop_highlight(); | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9624 windgoto(cursor_row, cursor_col); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9625 if (clear_attr != 0) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9626 screen_start_highlight(clear_attr); |
| 7 | 9627 |
| 9628 /* redraw the characters */ | |
| 9629 if (type == USE_REDRAW) | |
| 9630 redraw_block(row, end, wp); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9631 else if (type == USE_T_CAL) |
| 7 | 9632 { |
| 9633 term_append_lines(line_count); | |
| 9634 screen_start(); /* don't know where cursor is now */ | |
| 9635 } | |
| 9636 else | |
| 9637 { | |
| 9638 for (i = 0; i < line_count; i++) | |
| 9639 { | |
| 9640 if (type == USE_T_AL) | |
| 9641 { | |
| 9642 if (i && cursor_row != 0) | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9643 windgoto(cursor_row, cursor_col); |
| 7 | 9644 out_str(T_AL); |
| 9645 } | |
| 9646 else /* type == USE_T_SR */ | |
| 9647 out_str(T_SR); | |
| 9648 screen_start(); /* don't know where cursor is now */ | |
| 9649 } | |
| 9650 } | |
| 9651 | |
| 9652 /* | |
| 9653 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 9654 * have been scrolled down into the region. | |
| 9655 */ | |
| 9656 if (type == USE_T_SR && *T_DA) | |
| 9657 { | |
| 9658 for (i = 0; i < line_count; ++i) | |
| 9659 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9660 windgoto(off + i, cursor_col); |
| 7 | 9661 out_str(T_CE); |
| 9662 screen_start(); /* don't know where cursor is now */ | |
| 9663 } | |
| 9664 } | |
| 9665 | |
| 9666 #ifdef FEAT_GUI | |
| 9667 gui_can_update_cursor(); | |
| 9668 if (gui.in_use) | |
| 9669 out_flush(); /* always flush after a scroll */ | |
| 9670 #endif | |
| 9671 return OK; | |
| 9672 } | |
| 9673 | |
| 9674 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9675 * Delete lines on the screen and update ScreenLines[]. |
|
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9676 * "end" is the line after the scrolled part. Normally it is Rows. |
|
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9677 * When scrolling region used "off" is the offset from the top for the region. |
|
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9678 * "row" and "end" are relative to the start of the region. |
| 7 | 9679 * |
| 9680 * Return OK for success, FAIL if the lines are not deleted. | |
| 9681 */ | |
| 9682 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9683 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9684 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9685 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9686 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9687 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9688 int force, /* even when line_count > p_ttyscroll */ |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9689 int clear_attr, /* used for clearing lines */ |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9690 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 9691 { |
| 9692 int j; | |
| 9693 int i; | |
| 9694 unsigned temp; | |
| 9695 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9696 int cursor_col = 0; |
| 7 | 9697 int cursor_end; |
| 9698 int result_empty; /* result is empty until end of region */ | |
| 9699 int can_delete; /* deleting line codes can be used */ | |
| 9700 int type; | |
| 9701 | |
| 9702 /* | |
| 9703 * FAIL if | |
| 9704 * - there is no valid screen | |
| 9705 * - the screen has to be redrawn completely | |
| 9706 * - the line count is less than one | |
| 9707 * - the line count is more than 'ttyscroll' | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9708 * - redrawing for a callback and there is a modeless selection |
| 7 | 9709 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9710 if (!screen_valid(TRUE) || line_count <= 0 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9711 || (!force && line_count > p_ttyscroll) |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9712 #ifdef FEAT_CLIPBOARD |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9713 || (clip_star.state != SELECT_CLEARED |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9714 && redrawing_for_callback > 0) |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9715 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9716 ) |
| 7 | 9717 return FAIL; |
| 9718 | |
| 9719 /* | |
| 9720 * Check if the rest of the current region will become empty. | |
| 9721 */ | |
| 9722 result_empty = row + line_count >= end; | |
| 9723 | |
| 9724 /* | |
| 9725 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 9726 * available. | |
| 9727 */ | |
| 9728 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 9729 | |
| 9730 /* | |
| 9731 * There are six ways to delete lines: | |
| 9732 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9733 * characters from ScreenLines[]. | |
| 9734 * 1. Use T_CD if it exists and the result is empty. | |
| 9735 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 9736 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 9737 * none of the other ways work. | |
| 9738 * 4. Use T_CE (erase line) if the result is empty. | |
| 9739 * 5. Use T_DL (delete line) if it exists. | |
| 9740 * 6. redraw the characters from ScreenLines[]. | |
| 9741 */ | |
| 9742 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 9743 type = USE_REDRAW; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9744 else if (can_clear(T_CD) && result_empty) |
| 7 | 9745 type = USE_T_CD; |
| 9746 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 9747 /* | |
| 9748 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 9749 * its internal termcap... this works okay for tests which test *T_DB != | |
| 9750 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 9751 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 9752 * the trick... | |
| 9753 * Anyway, this hack will hopefully go away with the next OS release. | |
| 9754 * (Olaf Seibert) | |
| 9755 */ | |
| 9756 else if (row == 0 && T_DB == empty_option | |
| 9757 && (line_count == 1 || *T_CDL == NUL)) | |
| 9758 #else | |
| 9759 else if (row == 0 && ( | |
| 9760 #ifndef AMIGA | |
| 9761 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 9762 * up, so use delete-line command */ | |
| 9763 line_count == 1 || | |
| 9764 #endif | |
| 9765 *T_CDL == NUL)) | |
| 9766 #endif | |
| 9767 type = USE_NL; | |
| 9768 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 9769 type = USE_T_CDL; | |
| 9770 else if (can_clear(T_CE) && result_empty | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9771 && (wp == NULL || wp->w_width == Columns)) |
| 7 | 9772 type = USE_T_CE; |
| 9773 else if (*T_DL != NUL && can_delete) | |
| 9774 type = USE_T_DL; | |
| 9775 else if (*T_CDL != NUL && can_delete) | |
| 9776 type = USE_T_CDL; | |
| 9777 else | |
| 9778 return FAIL; | |
| 9779 | |
| 9780 #ifdef FEAT_CLIPBOARD | |
| 9781 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 9782 * not the full width of the screen. */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9783 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 9784 clip_clear_selection(&clip_star); |
| 7 | 9785 else |
| 9786 clip_scroll_selection(line_count); | |
| 9787 #endif | |
| 9788 | |
| 9789 #ifdef FEAT_GUI | |
| 9790 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9791 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9792 gui_dont_update_cursor(gui.cursor_row >= row + off |
|
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9793 && gui.cursor_row < end + off); |
| 7 | 9794 #endif |
| 9795 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9796 if (wp != NULL && wp->w_wincol != 0 && *T_CSV != NUL && *T_CCS == NUL) |
|
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9797 cursor_col = wp->w_wincol; |
|
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9798 |
| 7 | 9799 if (*T_CCS != NUL) /* cursor relative to region */ |
| 9800 { | |
| 9801 cursor_row = row; | |
| 9802 cursor_end = end; | |
| 9803 } | |
| 9804 else | |
| 9805 { | |
| 9806 cursor_row = row + off; | |
| 9807 cursor_end = end + off; | |
| 9808 } | |
| 9809 | |
| 9810 /* | |
| 9811 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 9812 * Clear the inserted lines in ScreenLines[]. | |
| 9813 */ | |
| 9814 row += off; | |
| 9815 end += off; | |
| 9816 for (i = 0; i < line_count; ++i) | |
| 9817 { | |
| 9818 if (wp != NULL && wp->w_width != Columns) | |
| 9819 { | |
| 9820 /* need to copy part of a line */ | |
| 9821 j = row + i; | |
| 9822 while ((j += line_count) <= end - 1) | |
| 9823 linecopy(j - line_count, j, wp); | |
| 9824 j -= line_count; | |
| 9825 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9826 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9827 clear_attr); |
| 7 | 9828 else |
| 9829 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9830 LineWraps[j] = FALSE; | |
| 9831 } | |
| 9832 else | |
| 9833 { | |
| 9834 /* whole width, moving the line pointers is faster */ | |
| 9835 j = row + i; | |
| 9836 temp = LineOffset[j]; | |
| 9837 while ((j += line_count) <= end - 1) | |
| 9838 { | |
| 9839 LineOffset[j - line_count] = LineOffset[j]; | |
| 9840 LineWraps[j - line_count] = LineWraps[j]; | |
| 9841 } | |
| 9842 LineOffset[j - line_count] = temp; | |
| 9843 LineWraps[j - line_count] = FALSE; | |
| 9844 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9845 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 9846 else |
| 9847 lineinvalid(temp, (int)Columns); | |
| 9848 } | |
| 9849 } | |
| 9850 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9851 if (screen_attr != clear_attr) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9852 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9853 if (clear_attr != 0) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9854 screen_start_highlight(clear_attr); |
| 7 | 9855 |
| 9856 /* redraw the characters */ | |
| 9857 if (type == USE_REDRAW) | |
| 9858 redraw_block(row, end, wp); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9859 else if (type == USE_T_CD) /* delete the lines */ |
| 7 | 9860 { |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9861 windgoto(cursor_row, cursor_col); |
| 7 | 9862 out_str(T_CD); |
| 9863 screen_start(); /* don't know where cursor is now */ | |
| 9864 } | |
| 9865 else if (type == USE_T_CDL) | |
| 9866 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9867 windgoto(cursor_row, cursor_col); |
| 7 | 9868 term_delete_lines(line_count); |
| 9869 screen_start(); /* don't know where cursor is now */ | |
| 9870 } | |
| 9871 /* | |
| 9872 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 9873 * the whole screen (scroll region) up by outputting newlines on the | |
| 9874 * last line. | |
| 9875 */ | |
| 9876 else if (type == USE_NL) | |
| 9877 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9878 windgoto(cursor_end - 1, cursor_col); |
| 7 | 9879 for (i = line_count; --i >= 0; ) |
| 9880 out_char('\n'); /* cursor will remain on same line */ | |
| 9881 } | |
| 9882 else | |
| 9883 { | |
| 9884 for (i = line_count; --i >= 0; ) | |
| 9885 { | |
| 9886 if (type == USE_T_DL) | |
| 9887 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9888 windgoto(cursor_row, cursor_col); |
| 7 | 9889 out_str(T_DL); /* delete a line */ |
| 9890 } | |
| 9891 else /* type == USE_T_CE */ | |
| 9892 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9893 windgoto(cursor_row + i, cursor_col); |
| 7 | 9894 out_str(T_CE); /* erase a line */ |
| 9895 } | |
| 9896 screen_start(); /* don't know where cursor is now */ | |
| 9897 } | |
| 9898 } | |
| 9899 | |
| 9900 /* | |
| 9901 * If the 'db' flag is set, we need to clear the lines that have been | |
| 9902 * scrolled up at the bottom of the region. | |
| 9903 */ | |
| 9904 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 9905 { | |
| 9906 for (i = line_count; i > 0; --i) | |
| 9907 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9908 windgoto(cursor_end - i, cursor_col); |
| 7 | 9909 out_str(T_CE); /* erase a line */ |
| 9910 screen_start(); /* don't know where cursor is now */ | |
| 9911 } | |
| 9912 } | |
| 9913 | |
| 9914 #ifdef FEAT_GUI | |
| 9915 gui_can_update_cursor(); | |
| 9916 if (gui.in_use) | |
| 9917 out_flush(); /* always flush after a scroll */ | |
| 9918 #endif | |
| 9919 | |
| 9920 return OK; | |
| 9921 } | |
| 9922 | |
| 9923 /* | |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9924 * Return TRUE when postponing displaying the mode message: when not redrawing |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9925 * or inside a mapping. |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9926 */ |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9927 int |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9928 skip_showmode() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9929 { |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9930 // Call char_avail() only when we are going to show something, because it |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9931 // takes a bit of time. redrawing() may also call char_avail_avail(). |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9932 if (global_busy |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9933 || msg_silent != 0 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9934 || !redrawing() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9935 || (char_avail() && !KeyTyped)) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9936 { |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
9937 redraw_mode = TRUE; // show mode later |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9938 return TRUE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9939 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9940 return FALSE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9941 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9942 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9943 /* |
|
13308
ae312df8d0ab
patch 8.0.1528: dead code found
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
9944 * Show the current mode and ruler. |
| 7 | 9945 * |
| 9946 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 9947 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 9948 * cleared only if a mode is shown. | |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
9949 * If redraw_mode is TRUE show or clear the mode. |
| 7 | 9950 * Return the length of the message (0 if no message). |
| 9951 */ | |
| 9952 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9953 showmode(void) |
| 7 | 9954 { |
| 9955 int need_clear; | |
| 9956 int length = 0; | |
| 9957 int do_mode; | |
| 9958 int attr; | |
| 9959 int nwr_save; | |
| 9960 int sub_attr; | |
| 9961 | |
| 642 | 9962 do_mode = ((p_smd && msg_silent == 0) |
| 9963 && ((State & INSERT) | |
|
14093
a9d94f10ecef
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Christian Brabandt <cb@256bit.org>
parents:
14089
diff
changeset
|
9964 || restart_edit != NUL |
| 5735 | 9965 || VIsual_active)); |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
9966 if (do_mode || reg_recording != 0) |
| 7 | 9967 { |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9968 if (skip_showmode()) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9969 return 0; // show mode later |
| 7 | 9970 |
| 9971 nwr_save = need_wait_return; | |
| 9972 | |
| 9973 /* wait a bit before overwriting an important message */ | |
| 9974 check_for_delay(FALSE); | |
| 9975 | |
| 9976 /* if the cmdline is more than one line high, erase top lines */ | |
| 9977 need_clear = clear_cmdline; | |
| 9978 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 9979 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 9980 | |
| 9981 /* Position on the last line in the window, column 0 */ | |
| 9982 msg_pos_mode(); | |
| 9983 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
9984 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 9985 if (do_mode) |
| 9986 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
9987 msg_puts_attr("--", attr); |
| 7 | 9988 #if defined(FEAT_XIM) |
| 2520 | 9989 if ( |
| 9990 # ifdef FEAT_GUI_GTK | |
| 9991 preedit_get_status() | |
| 1668 | 9992 # else |
| 9993 im_get_status() | |
| 2520 | 9994 # endif |
| 1668 | 9995 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
9996 # ifdef FEAT_GUI_GTK /* most of the time, it's not XIM being used */ |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
9997 msg_puts_attr(" IM", attr); |
| 7 | 9998 # else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
9999 msg_puts_attr(" XIM", attr); |
| 7 | 10000 # endif |
| 10001 #endif | |
| 10002 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10003 if (gui.in_use) | |
| 10004 { | |
| 10005 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10006 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10007 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10008 if (enc_utf8) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10009 msg_puts_attr(" \355\225\234\352\270\200", attr); |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10010 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10011 msg_puts_attr(" \307\321\261\333", attr); |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10012 } |
| 7 | 10013 } |
| 10014 #endif | |
| 5946 | 10015 /* CTRL-X in Insert mode */ |
| 10016 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10017 { |
| 10018 /* These messages can get long, avoid a wrap in a narrow | |
| 10019 * window. Prefer showing edit_submode_extra. */ | |
| 10020 length = (Rows - msg_row) * Columns - 3; | |
| 10021 if (edit_submode_extra != NULL) | |
| 10022 length -= vim_strsize(edit_submode_extra); | |
| 10023 if (length > 0) | |
| 10024 { | |
| 10025 if (edit_submode_pre != NULL) | |
| 10026 length -= vim_strsize(edit_submode_pre); | |
| 10027 if (length - vim_strsize(edit_submode) > 0) | |
| 10028 { | |
| 10029 if (edit_submode_pre != NULL) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10030 msg_puts_attr((char *)edit_submode_pre, attr); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10031 msg_puts_attr((char *)edit_submode, attr); |
| 7 | 10032 } |
| 10033 if (edit_submode_extra != NULL) | |
| 10034 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10035 msg_puts_attr(" ", attr); /* add a space in between */ |
| 7 | 10036 if ((int)edit_submode_highl < (int)HLF_COUNT) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10037 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10038 else |
| 10039 sub_attr = attr; | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10040 msg_puts_attr((char *)edit_submode_extra, sub_attr); |
| 7 | 10041 } |
| 10042 } | |
| 10043 } | |
| 10044 else | |
| 10045 { | |
| 10046 if (State & VREPLACE_FLAG) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10047 msg_puts_attr(_(" VREPLACE"), attr); |
|
14424
0a69e6e708f9
patch 8.1.0226: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
14218
diff
changeset
|
10048 else if (State & REPLACE_FLAG) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10049 msg_puts_attr(_(" REPLACE"), attr); |
| 7 | 10050 else if (State & INSERT) |
| 10051 { | |
| 10052 #ifdef FEAT_RIGHTLEFT | |
| 10053 if (p_ri) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10054 msg_puts_attr(_(" REVERSE"), attr); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10055 #endif |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10056 msg_puts_attr(_(" INSERT"), attr); |
| 7 | 10057 } |
|
14093
a9d94f10ecef
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Christian Brabandt <cb@256bit.org>
parents:
14089
diff
changeset
|
10058 else if (restart_edit == 'I' || restart_edit == 'A') |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10059 msg_puts_attr(_(" (insert)"), attr); |
| 7 | 10060 else if (restart_edit == 'R') |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10061 msg_puts_attr(_(" (replace)"), attr); |
| 7 | 10062 else if (restart_edit == 'V') |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10063 msg_puts_attr(_(" (vreplace)"), attr); |
| 7 | 10064 #ifdef FEAT_RIGHTLEFT |
| 10065 if (p_hkmap) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10066 msg_puts_attr(_(" Hebrew"), attr); |
| 7 | 10067 #endif |
| 10068 #ifdef FEAT_KEYMAP | |
| 10069 if (State & LANGMAP) | |
| 10070 { | |
| 10071 # ifdef FEAT_ARABIC | |
| 10072 if (curwin->w_p_arab) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10073 msg_puts_attr(_(" Arabic"), attr); |
| 7 | 10074 else |
| 10075 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10076 if (get_keymap_str(curwin, (char_u *)" (%s)", |
|
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10077 NameBuff, MAXPATHL)) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10078 msg_puts_attr((char *)NameBuff, attr); |
| 7 | 10079 } |
| 10080 #endif | |
| 10081 if ((State & INSERT) && p_paste) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10082 msg_puts_attr(_(" (paste)"), attr); |
| 7 | 10083 |
| 10084 if (VIsual_active) | |
| 10085 { | |
| 10086 char *p; | |
| 10087 | |
| 10088 /* Don't concatenate separate words to avoid translation | |
| 10089 * problems. */ | |
| 10090 switch ((VIsual_select ? 4 : 0) | |
| 10091 + (VIsual_mode == Ctrl_V) * 2 | |
| 10092 + (VIsual_mode == 'V')) | |
| 10093 { | |
| 10094 case 0: p = N_(" VISUAL"); break; | |
| 10095 case 1: p = N_(" VISUAL LINE"); break; | |
| 10096 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10097 case 4: p = N_(" SELECT"); break; | |
| 10098 case 5: p = N_(" SELECT LINE"); break; | |
| 10099 default: p = N_(" SELECT BLOCK"); break; | |
| 10100 } | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10101 msg_puts_attr(_(p), attr); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10102 } |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10103 msg_puts_attr(" --", attr); |
| 7 | 10104 } |
| 644 | 10105 |
| 7 | 10106 need_clear = TRUE; |
| 10107 } | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10108 if (reg_recording != 0 |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17771
diff
changeset
|
10109 && edit_submode == NULL) // otherwise it gets too long |
| 7 | 10110 { |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10111 recording_mode(attr); |
| 7 | 10112 need_clear = TRUE; |
| 10113 } | |
| 644 | 10114 |
| 10115 mode_displayed = TRUE; | |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10116 if (need_clear || clear_cmdline || redraw_mode) |
| 7 | 10117 msg_clr_eos(); |
| 10118 msg_didout = FALSE; /* overwrite this message */ | |
| 10119 length = msg_col; | |
| 10120 msg_col = 0; | |
| 10121 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10122 } | |
| 10123 else if (clear_cmdline && msg_silent == 0) | |
| 10124 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10125 msg_clr_cmdline(); | |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10126 else if (redraw_mode) |
|
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10127 { |
|
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10128 msg_pos_mode(); |
|
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10129 msg_clr_eos(); |
|
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10130 } |
| 7 | 10131 |
| 10132 #ifdef FEAT_CMDL_INFO | |
| 10133 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10134 if (VIsual_active) | |
| 10135 clear_showcmd(); | |
| 10136 | |
| 10137 /* If the last window has no status line, the ruler is after the mode | |
| 10138 * message and must be redrawn */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10139 if (redrawing() && lastwin->w_status_height == 0) |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10140 win_redr_ruler(lastwin, TRUE, FALSE); |
| 7 | 10141 #endif |
| 10142 redraw_cmdline = FALSE; | |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10143 redraw_mode = FALSE; |
| 7 | 10144 clear_cmdline = FALSE; |
| 10145 | |
| 10146 return length; | |
| 10147 } | |
| 10148 | |
| 10149 /* | |
| 10150 * Position for a mode message. | |
| 10151 */ | |
| 10152 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10153 msg_pos_mode(void) |
| 7 | 10154 { |
| 10155 msg_col = 0; | |
| 10156 msg_row = Rows - 1; | |
| 10157 } | |
| 10158 | |
| 10159 /* | |
| 10160 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10161 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10162 * Caller should check "mode_displayed". |
| 7 | 10163 */ |
| 10164 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10165 unshowmode(int force) |
| 7 | 10166 { |
| 10167 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10168 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10169 */ |
| 10170 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10171 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10172 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10173 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10174 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10175 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10176 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10177 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10178 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10179 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10180 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10181 { |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10182 int save_msg_row = msg_row; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10183 int save_msg_col = msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10184 |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10185 msg_pos_mode(); |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10186 if (reg_recording != 0) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10187 recording_mode(HL_ATTR(HLF_CM)); |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10188 msg_clr_eos(); |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10189 |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10190 msg_col = save_msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10191 msg_row = save_msg_row; |
| 7 | 10192 } |
| 10193 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10194 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10195 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10196 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10197 msg_puts_attr(_("recording"), attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10198 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10199 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10200 char s[4]; |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10201 |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10202 sprintf(s, " @%c", reg_recording); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10203 msg_puts_attr(s, attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10204 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10205 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10206 |
| 667 | 10207 /* |
| 10208 * Draw the tab pages line at the top of the Vim window. | |
| 10209 */ | |
|
15396
325e4a8ba1b6
patch 8.1.0706: tabline is not always redrawn
Bram Moolenaar <Bram@vim.org>
parents:
15384
diff
changeset
|
10210 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10211 draw_tabline(void) |
| 667 | 10212 { |
| 10213 int tabcount = 0; | |
| 10214 tabpage_T *tp; | |
| 10215 int tabwidth; | |
| 10216 int col = 0; | |
| 673 | 10217 int scol = 0; |
| 667 | 10218 int attr; |
| 10219 win_T *wp; | |
| 671 | 10220 win_T *cwp; |
| 10221 int wincount; | |
| 10222 int modified; | |
| 667 | 10223 int c; |
| 10224 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10225 int attr_sel = HL_ATTR(HLF_TPS); |
|
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10226 int attr_nosel = HL_ATTR(HLF_TP); |
|
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10227 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10228 char_u *p; |
| 677 | 10229 int room; |
| 10230 int use_sep_chars = (t_colors < 8 | |
| 10231 #ifdef FEAT_GUI | |
| 10232 && !gui.in_use | |
| 10233 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10234 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10235 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10236 #endif |
| 677 | 10237 ); |
| 673 | 10238 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10239 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10240 return; |
| 673 | 10241 redraw_tabline = FALSE; |
| 667 | 10242 |
| 685 | 10243 #ifdef FEAT_GUI_TABLINE |
| 798 | 10244 /* Take care of a GUI tabline. */ |
| 685 | 10245 if (gui_use_tabline()) |
| 10246 { | |
| 10247 gui_update_tabline(); | |
| 10248 return; | |
| 10249 } | |
| 10250 #endif | |
| 10251 | |
| 10252 if (tabline_height() < 1) | |
| 667 | 10253 return; |
| 10254 | |
| 677 | 10255 #if defined(FEAT_STL_OPT) |
|
16320
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
10256 clear_TabPageIdxs(); |
| 681 | 10257 |
| 677 | 10258 /* Use the 'tabline' option if it's set. */ |
| 10259 if (*p_tal != NUL) | |
| 10260 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10261 int saved_did_emsg = did_emsg; |
| 680 | 10262 |
| 10263 /* Check for an error. If there is one we would loop in redrawing the | |
| 10264 * screen. Avoid that by making 'tabline' empty. */ | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10265 did_emsg = FALSE; |
| 677 | 10266 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10267 if (did_emsg) |
| 680 | 10268 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10269 (char_u *)"", OPT_FREE, SID_ERROR); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10270 did_emsg |= saved_did_emsg; |
| 680 | 10271 } |
| 10272 else | |
| 10273 #endif | |
| 10274 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10275 FOR_ALL_TABPAGES(tp) |
| 680 | 10276 ++tabcount; |
| 10277 | |
| 10278 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10279 if (tabwidth < 6) | |
| 10280 tabwidth = 6; | |
| 10281 | |
| 10282 attr = attr_nosel; | |
| 10283 tabcount = 0; | |
| 699 | 10284 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10285 tp = tp->tp_next) | |
| 680 | 10286 { |
| 10287 scol = col; | |
| 10288 | |
| 10289 if (tp->tp_topframe == topframe) | |
| 10290 attr = attr_sel; | |
| 10291 if (use_sep_chars && col > 0) | |
| 10292 screen_putchar('|', 0, col++, attr); | |
| 10293 | |
| 10294 if (tp->tp_topframe != topframe) | |
| 10295 attr = attr_nosel; | |
| 10296 | |
| 10297 screen_putchar(' ', 0, col++, attr); | |
| 10298 | |
| 10299 if (tp == curtab) | |
| 10300 { | |
| 10301 cwp = curwin; | |
| 10302 wp = firstwin; | |
| 10303 } | |
| 10304 else | |
| 10305 { | |
| 10306 cwp = tp->tp_curwin; | |
| 10307 wp = tp->tp_firstwin; | |
| 10308 } | |
| 10309 | |
| 10310 modified = FALSE; | |
| 10311 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10312 if (bufIsChanged(wp->w_buffer)) | |
| 10313 modified = TRUE; | |
| 10314 if (modified || wincount > 1) | |
| 10315 { | |
| 10316 if (wincount > 1) | |
| 10317 { | |
| 10318 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10319 len = (int)STRLEN(NameBuff); |
| 699 | 10320 if (col + len >= Columns - 3) |
| 10321 break; | |
| 680 | 10322 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10323 #if defined(FEAT_SYN_HL) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10324 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10325 #else |
| 6106 | 10326 attr |
| 680 | 10327 #endif |
| 10328 ); | |
| 10329 col += len; | |
| 10330 } | |
| 10331 if (modified) | |
| 10332 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10333 screen_putchar(' ', 0, col++, attr); | |
| 10334 } | |
| 10335 | |
| 10336 room = scol - col + tabwidth - 1; | |
| 10337 if (room > 0) | |
| 10338 { | |
| 685 | 10339 /* Get buffer name in NameBuff[] */ |
| 10340 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10341 shorten_dir(NameBuff); |
| 680 | 10342 len = vim_strsize(NameBuff); |
| 10343 p = NameBuff; | |
| 10344 if (has_mbyte) | |
| 10345 while (len > room) | |
| 10346 { | |
| 10347 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10348 MB_PTR_ADV(p); |
| 680 | 10349 } |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
10350 else if (len > room) |
| 677 | 10351 { |
| 680 | 10352 p += len - room; |
| 10353 len = room; | |
| 677 | 10354 } |
| 699 | 10355 if (len > Columns - col - 1) |
| 10356 len = Columns - col - 1; | |
| 680 | 10357 |
| 835 | 10358 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10359 col += len; |
| 10360 } | |
| 10361 screen_putchar(' ', 0, col++, attr); | |
| 10362 | |
| 10363 /* Store the tab page number in TabPageIdxs[], so that | |
| 10364 * jump_to_mouse() knows where each one is. */ | |
| 10365 ++tabcount; | |
| 10366 while (scol < col) | |
| 10367 TabPageIdxs[scol++] = tabcount; | |
| 10368 } | |
| 10369 | |
| 10370 if (use_sep_chars) | |
| 10371 c = '_'; | |
| 10372 else | |
| 10373 c = ' '; | |
| 10374 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10375 |
| 10376 /* Put an "X" for closing the current tab if there are several. */ | |
| 10377 if (first_tabpage->tp_next != NULL) | |
| 10378 { | |
| 10379 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10380 TabPageIdxs[Columns - 1] = -999; | |
| 10381 } | |
| 10382 } | |
| 834 | 10383 |
| 10384 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10385 * set. */ | |
| 10386 redraw_tabline = FALSE; | |
| 667 | 10387 } |
| 685 | 10388 |
| 10389 /* | |
| 10390 * Get buffer name for "buf" into NameBuff[]. | |
| 10391 * Takes care of special buffer names and translates special characters. | |
| 10392 */ | |
| 10393 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10394 get_trans_bufname(buf_T *buf) |
| 685 | 10395 { |
| 10396 if (buf_spname(buf) != NULL) | |
| 3839 | 10397 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10398 else |
| 10399 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10400 trans_characters(NameBuff, MAXPATHL); | |
| 10401 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10402 |
| 7 | 10403 /* |
| 10404 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10405 */ | |
| 10406 static int | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10407 fillchar_status(int *attr, win_T *wp) |
| 7 | 10408 { |
| 10409 int fill; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10410 |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10411 #ifdef FEAT_TERMINAL |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10412 if (bt_terminal(wp->w_buffer)) |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10413 { |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10414 if (wp == curwin) |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10415 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10416 *attr = HL_ATTR(HLF_ST); |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10417 fill = fill_stl; |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10418 } |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10419 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10420 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10421 *attr = HL_ATTR(HLF_STNC); |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10422 fill = fill_stlnc; |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10423 } |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10424 } |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10425 else |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10426 #endif |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10427 if (wp == curwin) |
| 7 | 10428 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10429 *attr = HL_ATTR(HLF_S); |
| 7 | 10430 fill = fill_stl; |
| 10431 } | |
| 10432 else | |
| 10433 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10434 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10435 fill = fill_stlnc; |
| 10436 } | |
| 10437 /* Use fill when there is highlighting, and highlighting of current | |
| 10438 * window differs, or the fillchars differ, or this is not the | |
| 10439 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10440 if (*attr != 0 && ((HL_ATTR(HLF_S) != HL_ATTR(HLF_SNC) |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10441 || wp != curwin || ONE_WINDOW) |
| 7 | 10442 || (fill_stl != fill_stlnc))) |
| 10443 return fill; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10444 if (wp == curwin) |
| 7 | 10445 return '^'; |
| 10446 return '='; | |
| 10447 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10448 |
| 7 | 10449 /* |
| 10450 * Get the character to use in a separator between vertically split windows. | |
| 10451 * Get its attributes in "*attr". | |
| 10452 */ | |
| 10453 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10454 fillchar_vsep(int *attr) |
| 7 | 10455 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10456 *attr = HL_ATTR(HLF_C); |
| 7 | 10457 if (*attr == 0 && fill_vert == ' ') |
| 10458 return '|'; | |
| 10459 else | |
| 10460 return fill_vert; | |
| 10461 } | |
| 10462 | |
| 10463 /* | |
| 10464 * Return TRUE if redrawing should currently be done. | |
| 10465 */ | |
| 10466 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10467 redrawing(void) |
| 7 | 10468 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10469 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10470 if (disable_redraw_for_testing) |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10471 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10472 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10473 #endif |
|
14673
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10474 return ((!RedrawingDisabled |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10475 #ifdef FEAT_EVAL |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10476 || ignore_redraw_flag_for_testing |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10477 #endif |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10478 ) && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 7 | 10479 } |
| 10480 | |
| 10481 /* | |
| 10482 * Return TRUE if printing messages should currently be done. | |
| 10483 */ | |
| 10484 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10485 messaging(void) |
| 7 | 10486 { |
| 10487 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10488 } | |
| 10489 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10490 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10491 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10492 * Draw the window toolbar. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10493 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10494 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10495 redraw_win_toolbar(win_T *wp) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10496 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10497 vimmenu_T *menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10498 int item_idx = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10499 int item_count = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10500 int col = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10501 int next_col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10502 int off = (int)(current_ScreenLine - ScreenLines); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10503 int fill_attr = syn_name2attr((char_u *)"ToolbarLine"); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10504 int button_attr = syn_name2attr((char_u *)"ToolbarButton"); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10505 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10506 vim_free(wp->w_winbar_items); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10507 for (menu = wp->w_winbar->children; menu != NULL; menu = menu->next) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10508 ++item_count; |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
10509 wp->w_winbar_items = ALLOC_CLEAR_MULT(winbar_item_T, item_count + 1); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10510 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10511 /* TODO: use fewer spaces if there is not enough room */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10512 for (menu = wp->w_winbar->children; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10513 menu != NULL && col < wp->w_width; menu = menu->next) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10514 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10515 space_to_screenline(off + col, fill_attr); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10516 if (++col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10517 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10518 if (col > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10519 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10520 space_to_screenline(off + col, fill_attr); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10521 if (++col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10522 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10523 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10524 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10525 wp->w_winbar_items[item_idx].wb_startcol = col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10526 space_to_screenline(off + col, button_attr); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10527 if (++col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10528 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10529 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10530 next_col = text_to_screenline(wp, menu->name, col); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10531 while (col < next_col) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10532 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10533 ScreenAttrs[off + col] = button_attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10534 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10535 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10536 wp->w_winbar_items[item_idx].wb_endcol = col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10537 wp->w_winbar_items[item_idx].wb_menu = menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10538 ++item_idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10539 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10540 if (col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10541 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10542 space_to_screenline(off + col, button_attr); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10543 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10544 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10545 while (col < wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10546 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10547 space_to_screenline(off + col, fill_attr); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10548 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10549 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10550 wp->w_winbar_items[item_idx].wb_menu = NULL; /* end marker */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10551 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10552 screen_line(wp->w_winrow, wp->w_wincol, (int)wp->w_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
10553 (int)wp->w_width, 0); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10554 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10555 #endif |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10556 |
| 7 | 10557 /* |
| 10558 * Show current status info in ruler and various other places | |
| 10559 * If always is FALSE, only show ruler if position has changed. | |
| 10560 */ | |
| 10561 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10562 showruler(int always) |
| 7 | 10563 { |
| 10564 if (!always && !redrawing()) | |
| 10565 return; | |
| 574 | 10566 if (pum_visible()) |
| 10567 { | |
| 10568 /* Don't redraw right now, do it later. */ | |
| 10569 curwin->w_redr_status = TRUE; | |
| 10570 return; | |
| 10571 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10572 #if defined(FEAT_STL_OPT) |
| 40 | 10573 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 1983 | 10574 redraw_custom_statusline(curwin); |
| 7 | 10575 else |
| 10576 #endif | |
| 10577 #ifdef FEAT_CMDL_INFO | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10578 win_redr_ruler(curwin, always, FALSE); |
| 7 | 10579 #endif |
| 10580 | |
| 10581 #ifdef FEAT_TITLE | |
| 10582 if (need_maketitle | |
| 10583 # ifdef FEAT_STL_OPT | |
| 10584 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10585 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10586 # endif | |
| 10587 ) | |
| 10588 maketitle(); | |
| 10589 #endif | |
| 1588 | 10590 /* Redraw the tab pages line if needed. */ |
| 10591 if (redraw_tabline) | |
| 10592 draw_tabline(); | |
| 7 | 10593 } |
| 10594 | |
| 10595 #ifdef FEAT_CMDL_INFO | |
| 10596 static void | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10597 win_redr_ruler(win_T *wp, int always, int ignore_pum) |
| 7 | 10598 { |
| 1869 | 10599 #define RULER_BUF_LEN 70 |
| 10600 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10601 int row; |
| 10602 int fillchar; | |
| 10603 int attr; | |
| 10604 int empty_line = FALSE; | |
| 10605 colnr_T virtcol; | |
| 10606 int i; | |
| 1869 | 10607 size_t len; |
| 7 | 10608 int o; |
| 10609 int this_ru_col; | |
| 10610 int off = 0; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
10611 int width; |
| 7 | 10612 |
| 10613 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10614 if (!p_ru) | |
| 10615 return; | |
| 10616 | |
| 10617 /* | |
| 10618 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10619 * after deleting lines, before cursor.lnum is corrected. | |
| 10620 */ | |
| 10621 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10622 return; | |
| 10623 | |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17771
diff
changeset
|
10624 // Don't draw the ruler while doing insert-completion, it might overwrite |
|
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17771
diff
changeset
|
10625 // the (long) mode message. |
| 7 | 10626 if (wp == lastwin && lastwin->w_status_height == 0) |
| 10627 if (edit_submode != NULL) | |
| 10628 return; | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10629 // Don't draw the ruler when the popup menu is visible, it may overlap. |
|
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10630 // Except when the popup menu will be redrawn anyway. |
|
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10631 if (!ignore_pum && pum_visible()) |
| 540 | 10632 return; |
| 7 | 10633 |
| 10634 #ifdef FEAT_STL_OPT | |
| 10635 if (*p_ruf) | |
| 10636 { | |
| 680 | 10637 int save_called_emsg = called_emsg; |
| 10638 | |
| 10639 called_emsg = FALSE; | |
| 7 | 10640 win_redr_custom(wp, TRUE); |
| 680 | 10641 if (called_emsg) |
| 10642 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 10643 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 10644 called_emsg |= save_called_emsg; |
| 7 | 10645 return; |
| 10646 } | |
| 10647 #endif | |
| 10648 | |
| 10649 /* | |
| 10650 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 10651 */ | |
| 10652 if (!(State & INSERT) | |
| 10653 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 10654 empty_line = TRUE; | |
| 10655 | |
| 10656 /* | |
| 10657 * Only draw the ruler when something changed. | |
| 10658 */ | |
| 10659 validate_virtcol_win(wp); | |
| 10660 if ( redraw_cmdline | |
| 10661 || always | |
| 10662 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 10663 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 10664 || wp->w_virtcol != wp->w_ru_virtcol | |
| 10665 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 10666 || wp->w_topline != wp->w_ru_topline | |
| 10667 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 10668 #ifdef FEAT_DIFF | |
| 10669 || wp->w_topfill != wp->w_ru_topfill | |
| 10670 #endif | |
| 10671 || empty_line != wp->w_ru_empty) | |
| 10672 { | |
| 10673 cursor_off(); | |
| 10674 if (wp->w_status_height) | |
| 10675 { | |
| 10676 row = W_WINROW(wp) + wp->w_height; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10677 fillchar = fillchar_status(&attr, wp); |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
10678 off = wp->w_wincol; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10679 width = wp->w_width; |
| 7 | 10680 } |
| 10681 else | |
| 10682 { | |
| 10683 row = Rows - 1; | |
| 10684 fillchar = ' '; | |
| 10685 attr = 0; | |
| 10686 width = Columns; | |
| 10687 off = 0; | |
| 10688 } | |
| 10689 | |
| 10690 /* In list mode virtcol needs to be recomputed */ | |
| 10691 virtcol = wp->w_virtcol; | |
| 10692 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 10693 { | |
| 10694 wp->w_p_list = FALSE; | |
| 10695 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 10696 wp->w_p_list = TRUE; | |
| 10697 } | |
| 10698 | |
| 10699 /* | |
| 10700 * Some sprintfs return the length, some return a pointer. | |
| 10701 * To avoid portability problems we use strlen() here. | |
| 10702 */ | |
| 1869 | 10703 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 10704 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 10705 ? 0L | |
| 10706 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 10707 len = STRLEN(buffer); |
| 10708 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 10709 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 10710 (int)virtcol + 1); | |
| 10711 | |
| 10712 /* | |
| 10713 * Add a "50%" if there is room for it. | |
| 10714 * On the last line, don't print in the last column (scrolls the | |
| 10715 * screen up on some terminals). | |
| 10716 */ | |
| 10717 i = (int)STRLEN(buffer); | |
| 1869 | 10718 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 10719 o = i + vim_strsize(buffer + i + 1); |
| 10720 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 10721 ++o; | |
| 10722 this_ru_col = ru_col - (Columns - width); | |
| 10723 if (this_ru_col < 0) | |
| 10724 this_ru_col = 0; | |
| 10725 /* Never use more than half the window/screen width, leave the other | |
| 10726 * half for the filename. */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10727 if (this_ru_col < (width + 1) / 2) |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10728 this_ru_col = (width + 1) / 2; |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10729 if (this_ru_col + o < width) |
| 7 | 10730 { |
| 6466 | 10731 /* need at least 3 chars left for get_rel_pos() + NUL */ |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10732 while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) |
| 7 | 10733 { |
| 10734 if (has_mbyte) | |
| 10735 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 10736 else | |
| 10737 buffer[i++] = fillchar; | |
| 10738 ++o; | |
| 10739 } | |
| 1869 | 10740 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 10741 } |
| 10742 /* Truncate at window boundary. */ | |
| 10743 if (has_mbyte) | |
| 10744 { | |
| 10745 o = 0; | |
| 474 | 10746 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 10747 { |
| 10748 o += (*mb_ptr2cells)(buffer + i); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10749 if (this_ru_col + o > width) |
| 7 | 10750 { |
| 10751 buffer[i] = NUL; | |
| 10752 break; | |
| 10753 } | |
| 10754 } | |
| 10755 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
10756 else if (this_ru_col + (int)STRLEN(buffer) > width) |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10757 buffer[width - this_ru_col] = NUL; |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10758 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10759 screen_puts(buffer, row, this_ru_col + off, attr); |
| 7 | 10760 i = redraw_cmdline; |
| 10761 screen_fill(row, row + 1, | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10762 this_ru_col + off + (int)STRLEN(buffer), |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10763 (int)(off + width), |
| 7 | 10764 fillchar, fillchar, attr); |
| 10765 /* don't redraw the cmdline because of showing the ruler */ | |
| 10766 redraw_cmdline = i; | |
| 10767 wp->w_ru_cursor = wp->w_cursor; | |
| 10768 wp->w_ru_virtcol = wp->w_virtcol; | |
| 10769 wp->w_ru_empty = empty_line; | |
| 10770 wp->w_ru_topline = wp->w_topline; | |
| 10771 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 10772 #ifdef FEAT_DIFF | |
| 10773 wp->w_ru_topfill = wp->w_topfill; | |
| 10774 #endif | |
| 10775 } | |
| 10776 } | |
| 10777 #endif | |
| 13 | 10778 |
|
17940
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10779 /* |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10780 * Compute columns for ruler and shown command. 'sc_col' is also used to |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10781 * decide what the maximum length of a message on the status line can be. |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10782 * If there is a status line for the last window, 'sc_col' is independent |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10783 * of 'ru_col'. |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10784 */ |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10785 |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10786 #define COL_RULER 17 // columns needed by standard ruler |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10787 |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10788 void |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10789 comp_col(void) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10790 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10791 #if defined(FEAT_CMDL_INFO) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10792 int last_has_status = (p_ls == 2 || (p_ls == 1 && !ONE_WINDOW)); |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10793 |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10794 sc_col = 0; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10795 ru_col = 0; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10796 if (p_ru) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10797 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10798 # ifdef FEAT_STL_OPT |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10799 ru_col = (ru_wid ? ru_wid : COL_RULER) + 1; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10800 # else |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10801 ru_col = COL_RULER + 1; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10802 # endif |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10803 // no last status line, adjust sc_col |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10804 if (!last_has_status) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10805 sc_col = ru_col; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10806 } |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10807 if (p_sc) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10808 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10809 sc_col += SHOWCMD_COLS; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10810 if (!p_ru || last_has_status) // no need for separating space |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10811 ++sc_col; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10812 } |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10813 sc_col = Columns - sc_col; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10814 ru_col = Columns - ru_col; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10815 if (sc_col <= 0) // screen too narrow, will become a mess |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10816 sc_col = 1; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10817 if (ru_col <= 0) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10818 ru_col = 1; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10819 #else |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10820 sc_col = Columns; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10821 ru_col = Columns; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10822 #endif |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10823 #ifdef FEAT_EVAL |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10824 set_vim_var_nr(VV_ECHOSPACE, sc_col - 1); |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10825 #endif |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10826 } |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10827 |
| 13 | 10828 #if defined(FEAT_LINEBREAK) || defined(PROTO) |
| 10829 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
10830 * Return the width of the 'number' and 'relativenumber' column. |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
10831 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 10832 * Otherwise it depends on 'numberwidth' and the line count. |
| 10833 */ | |
| 10834 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10835 number_width(win_T *wp) |
| 13 | 10836 { |
| 10837 int n; | |
| 10838 linenr_T lnum; | |
| 10839 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10840 if (wp->w_p_rnu && !wp->w_p_nu) |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10841 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10842 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10843 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10844 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10845 lnum = wp->w_buffer->b_ml.ml_line_count; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
10846 |
| 6679 | 10847 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 10848 return wp->w_nrwidth_width; |
| 10849 wp->w_nrwidth_line_count = lnum; | |
| 10850 | |
| 10851 n = 0; | |
| 10852 do | |
| 10853 { | |
| 856 | 10854 lnum /= 10; |
| 10855 ++n; | |
| 13 | 10856 } while (lnum > 0); |
| 10857 | |
| 10858 /* 'numberwidth' gives the minimal width plus one */ | |
| 10859 if (n < wp->w_p_nuw - 1) | |
| 10860 n = wp->w_p_nuw - 1; | |
| 10861 | |
|
17247
cbd0432cf8ff
patch 8.1.1623: display wrong with signs in narrow number column
Bram Moolenaar <Bram@vim.org>
parents:
17229
diff
changeset
|
10862 # ifdef FEAT_SIGNS |
|
cbd0432cf8ff
patch 8.1.1623: display wrong with signs in narrow number column
Bram Moolenaar <Bram@vim.org>
parents:
17229
diff
changeset
|
10863 // If 'signcolumn' is set to 'number' and there is a sign to display, then |
|
cbd0432cf8ff
patch 8.1.1623: display wrong with signs in narrow number column
Bram Moolenaar <Bram@vim.org>
parents:
17229
diff
changeset
|
10864 // the minimal width for the number column is 2. |
|
cbd0432cf8ff
patch 8.1.1623: display wrong with signs in narrow number column
Bram Moolenaar <Bram@vim.org>
parents:
17229
diff
changeset
|
10865 if (n < 2 && (wp->w_buffer->b_signlist != NULL) |
|
cbd0432cf8ff
patch 8.1.1623: display wrong with signs in narrow number column
Bram Moolenaar <Bram@vim.org>
parents:
17229
diff
changeset
|
10866 && (*wp->w_p_scl == 'n' && *(wp->w_p_scl + 1) == 'u')) |
|
cbd0432cf8ff
patch 8.1.1623: display wrong with signs in narrow number column
Bram Moolenaar <Bram@vim.org>
parents:
17229
diff
changeset
|
10867 n = 2; |
|
cbd0432cf8ff
patch 8.1.1623: display wrong with signs in narrow number column
Bram Moolenaar <Bram@vim.org>
parents:
17229
diff
changeset
|
10868 # endif |
|
cbd0432cf8ff
patch 8.1.1623: display wrong with signs in narrow number column
Bram Moolenaar <Bram@vim.org>
parents:
17229
diff
changeset
|
10869 |
| 13 | 10870 wp->w_nrwidth_width = n; |
| 6679 | 10871 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 10872 return n; |
| 10873 } | |
| 10874 #endif | |
| 3986 | 10875 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
10876 #if defined(FEAT_EVAL) || defined(PROTO) |
| 3986 | 10877 /* |
| 10878 * Return the current cursor column. This is the actual position on the | |
| 10879 * screen. First column is 0. | |
| 10880 */ | |
| 10881 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10882 screen_screencol(void) |
| 3986 | 10883 { |
| 10884 return screen_cur_col; | |
| 10885 } | |
| 10886 | |
| 10887 /* | |
| 10888 * Return the current cursor row. This is the actual position on the screen. | |
| 10889 * First row is 0. | |
| 10890 */ | |
| 10891 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10892 screen_screenrow(void) |
| 3986 | 10893 { |
| 10894 return screen_cur_row; | |
| 10895 } | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
10896 #endif |
|
17940
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10897 |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10898 /* |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10899 * Handle setting 'listchars' or 'fillchars'. |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10900 * Returns error message, NULL if it's OK. |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10901 */ |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10902 char * |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10903 set_chars_option(char_u **varp) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10904 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10905 int round, i, len, entries; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10906 char_u *p, *s; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10907 int c1 = 0, c2 = 0, c3 = 0; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10908 struct charstab |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10909 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10910 int *cp; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10911 char *name; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10912 }; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10913 static struct charstab filltab[] = |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10914 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10915 {&fill_stl, "stl"}, |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10916 {&fill_stlnc, "stlnc"}, |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10917 {&fill_vert, "vert"}, |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10918 {&fill_fold, "fold"}, |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10919 {&fill_diff, "diff"}, |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10920 }; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10921 static struct charstab lcstab[] = |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10922 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10923 {&lcs_eol, "eol"}, |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10924 {&lcs_ext, "extends"}, |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10925 {&lcs_nbsp, "nbsp"}, |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10926 {&lcs_prec, "precedes"}, |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10927 {&lcs_space, "space"}, |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10928 {&lcs_tab2, "tab"}, |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10929 {&lcs_trail, "trail"}, |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10930 #ifdef FEAT_CONCEAL |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10931 {&lcs_conceal, "conceal"}, |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10932 #else |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10933 {NULL, "conceal"}, |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10934 #endif |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10935 }; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10936 struct charstab *tab; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10937 |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10938 if (varp == &p_lcs) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10939 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10940 tab = lcstab; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10941 entries = sizeof(lcstab) / sizeof(struct charstab); |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10942 } |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10943 else |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10944 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10945 tab = filltab; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10946 entries = sizeof(filltab) / sizeof(struct charstab); |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10947 } |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10948 |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10949 // first round: check for valid value, second round: assign values |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10950 for (round = 0; round <= 1; ++round) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10951 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10952 if (round > 0) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10953 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10954 // After checking that the value is valid: set defaults: space for |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10955 // 'fillchars', NUL for 'listchars' |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10956 for (i = 0; i < entries; ++i) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10957 if (tab[i].cp != NULL) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10958 *(tab[i].cp) = (varp == &p_lcs ? NUL : ' '); |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10959 |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10960 if (varp == &p_lcs) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10961 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10962 lcs_tab1 = NUL; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10963 lcs_tab3 = NUL; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10964 } |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10965 else |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10966 fill_diff = '-'; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10967 } |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10968 p = *varp; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10969 while (*p) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10970 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10971 for (i = 0; i < entries; ++i) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10972 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10973 len = (int)STRLEN(tab[i].name); |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10974 if (STRNCMP(p, tab[i].name, len) == 0 |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10975 && p[len] == ':' |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10976 && p[len + 1] != NUL) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10977 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10978 c2 = c3 = 0; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10979 s = p + len + 1; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10980 c1 = mb_ptr2char_adv(&s); |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10981 if (mb_char2cells(c1) > 1) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10982 continue; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10983 if (tab[i].cp == &lcs_tab2) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10984 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10985 if (*s == NUL) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10986 continue; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10987 c2 = mb_ptr2char_adv(&s); |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10988 if (mb_char2cells(c2) > 1) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10989 continue; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10990 if (!(*s == ',' || *s == NUL)) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10991 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10992 c3 = mb_ptr2char_adv(&s); |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10993 if (mb_char2cells(c3) > 1) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10994 continue; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10995 } |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10996 } |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10997 |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10998 if (*s == ',' || *s == NUL) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
10999 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11000 if (round) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11001 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11002 if (tab[i].cp == &lcs_tab2) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11003 { |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11004 lcs_tab1 = c1; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11005 lcs_tab2 = c2; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11006 lcs_tab3 = c3; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11007 } |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11008 else if (tab[i].cp != NULL) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11009 *(tab[i].cp) = c1; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11010 |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11011 } |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11012 p = s; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11013 break; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11014 } |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11015 } |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11016 } |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11017 |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11018 if (i == entries) |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11019 return e_invarg; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11020 if (*p == ',') |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11021 ++p; |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11022 } |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11023 } |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11024 |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11025 return NULL; // no error |
|
079e10a49ea1
patch 8.1.1966: some code in options.c fits better elsewhere
Bram Moolenaar <Bram@vim.org>
parents:
17851
diff
changeset
|
11026 } |