Mercurial > vim
annotate src/screen.c @ 17771:4bd21046902b v8.1.1882
patch 8.1.1882: cannot specify properties of the info popup window
commit https://github.com/vim/vim/commit/62a0cb443c3184f24a6dac73d3505f9056cf6056
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Aug 18 16:35:23 2019 +0200
patch 8.1.1882: cannot specify properties of the info popup window
Problem: Cannot specify properties of the info popup window.
Solution: Add the 'completepopup' option. Default to PmenuSel highlight.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 18 Aug 2019 16:45:03 +0200 |
| parents | a51ccadd0dca |
| children | 59f8948b7590 |
| 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 |
| 7 | 570 if (must_redraw) |
| 571 { | |
| 572 if (type < must_redraw) /* use maximal type */ | |
| 573 type = must_redraw; | |
| 1331 | 574 |
| 575 /* must_redraw is reset here, so that when we run into some weird | |
| 576 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 577 * scrolling), or update_topline() in win_update() will cause a | |
| 578 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 579 must_redraw = 0; |
| 580 } | |
| 581 | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
582 /* 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
|
583 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
|
584 #ifdef FEAT_TERMINAL |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
585 && !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
|
586 #endif |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
587 ) |
| 7 | 588 type = NOT_VALID; |
| 589 | |
| 2008 | 590 /* Postpone the redrawing when it's not needed and when being called |
| 591 * recursively. */ | |
| 592 if (!redrawing() || updating_screen) | |
| 7 | 593 { |
| 594 redraw_later(type); /* remember type for next time */ | |
| 595 must_redraw = type; | |
| 596 if (type > INVERTED_ALL) | |
| 597 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
|
598 return FAIL; |
| 7 | 599 } |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
600 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
|
601 |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
602 #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
|
603 // 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
|
604 // 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
|
605 may_update_popup_mask(type); |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
606 #endif |
| 7 | 607 |
| 608 #ifdef FEAT_SYN_HL | |
| 609 ++display_tick; /* let syntax code know we're in a next round of | |
| 610 * display updating */ | |
| 611 #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
|
612 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
|
613 ++no_win_do_lines_ins; |
| 7 | 614 |
| 615 /* | |
| 616 * if the screen was scrolled up when displaying a message, scroll it down | |
| 617 */ | |
| 618 if (msg_scrolled) | |
| 619 { | |
| 620 clear_cmdline = TRUE; | |
| 621 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 622 type = CLEAR; | |
| 623 else if (type != CLEAR) | |
| 624 { | |
| 625 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
|
626 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
|
627 == FAIL) |
| 7 | 628 type = CLEAR; |
| 629 FOR_ALL_WINDOWS(wp) | |
| 630 { | |
|
16910
6a99709c6ae3
patch 8.1.1456: WinBar not redrawn after scrolling one line
Bram Moolenaar <Bram@vim.org>
parents:
16904
diff
changeset
|
631 if (wp->w_winrow < msg_scrolled) |
| 7 | 632 { |
| 633 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 634 && wp->w_redr_type < REDRAW_TOP | |
| 635 && wp->w_lines_valid > 0 | |
| 636 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 637 { | |
| 638 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 639 wp->w_redr_type = REDRAW_TOP; | |
| 640 } | |
| 641 else | |
| 642 { | |
| 643 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
|
644 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
|
645 <= msg_scrolled) |
| 7 | 646 wp->w_redr_status = TRUE; |
| 647 } | |
| 648 } | |
| 649 } | |
|
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
|
650 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
|
651 redraw_cmdline = TRUE; |
| 673 | 652 redraw_tabline = TRUE; |
| 7 | 653 } |
| 654 msg_scrolled = 0; | |
| 655 need_wait_return = FALSE; | |
| 656 } | |
| 657 | |
| 658 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 659 compute_cmdrow(); | |
| 660 | |
| 661 /* Check for changed highlighting */ | |
| 662 if (need_highlight_changed) | |
| 663 highlight_changed(); | |
| 664 | |
| 665 if (type == CLEAR) /* first clear screen */ | |
| 666 { | |
| 667 screenclear(); /* will reset clear_cmdline */ | |
| 668 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
|
669 /* 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
|
670 must_redraw = 0; |
| 7 | 671 } |
| 672 | |
| 673 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 674 check_for_delay(FALSE); | |
| 675 | |
| 13 | 676 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
677 /* 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
|
678 * changes. */ |
| 13 | 679 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
680 && 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
|
681 ? number_width(curwin) : 0)) |
| 13 | 682 curwin->w_redr_type = NOT_VALID; |
| 683 #endif | |
| 684 | |
| 7 | 685 /* |
| 686 * Only start redrawing if there is really something to do. | |
| 687 */ | |
| 688 if (type == INVERTED) | |
| 689 update_curswant(); | |
| 690 if (curwin->w_redr_type < type | |
| 691 && !((type == VALID | |
| 692 && curwin->w_lines[0].wl_valid | |
| 693 #ifdef FEAT_DIFF | |
| 694 && curwin->w_topfill == curwin->w_old_topfill | |
| 695 && curwin->w_botfill == curwin->w_old_botfill | |
| 696 #endif | |
| 697 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 698 || (type == INVERTED | |
| 1043 | 699 && VIsual_active |
| 7 | 700 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 701 && curwin->w_old_visual_mode == VIsual_mode | |
| 702 && (curwin->w_valid & VALID_VIRTCOL) | |
| 703 && curwin->w_old_curswant == curwin->w_curswant) | |
| 704 )) | |
| 705 curwin->w_redr_type = type; | |
| 706 | |
| 849 | 707 /* Redraw the tab pages line if needed. */ |
| 708 if (redraw_tabline || type >= NOT_VALID) | |
| 709 draw_tabline(); | |
| 710 | |
| 7 | 711 #ifdef FEAT_SYN_HL |
| 712 /* | |
| 713 * Correct stored syntax highlighting info for changes in each displayed | |
| 714 * buffer. Each buffer must only be done once. | |
| 715 */ | |
| 716 FOR_ALL_WINDOWS(wp) | |
| 717 { | |
| 718 if (wp->w_buffer->b_mod_set) | |
| 719 { | |
| 720 win_T *wwp; | |
| 721 | |
| 722 /* Check if we already did this buffer. */ | |
| 723 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 724 if (wwp->w_buffer == wp->w_buffer) | |
| 725 break; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
726 if (wwp == wp && syntax_present(wp)) |
| 7 | 727 syn_stack_apply_changes(wp->w_buffer); |
| 728 } | |
| 729 } | |
| 730 #endif | |
| 731 | |
| 732 /* | |
| 733 * Go from top to bottom through the windows, redrawing the ones that need | |
| 734 * it. | |
| 735 */ | |
| 736 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 737 did_one = FALSE; | |
| 738 #endif | |
| 739 #ifdef FEAT_SEARCH_EXTRA | |
| 740 search_hl.rm.regprog = NULL; | |
| 741 #endif | |
| 742 FOR_ALL_WINDOWS(wp) | |
| 743 { | |
| 744 if (wp->w_redr_type != 0) | |
| 745 { | |
| 746 cursor_off(); | |
| 747 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 748 if (!did_one) | |
| 749 { | |
| 750 did_one = TRUE; | |
| 751 # ifdef FEAT_SEARCH_EXTRA | |
| 752 start_search_hl(); | |
| 753 # endif | |
| 754 # ifdef FEAT_CLIPBOARD | |
| 755 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 756 if (clip_star.available && clip_isautosel_star()) |
| 757 clip_update_selection(&clip_star); | |
| 758 if (clip_plus.available && clip_isautosel_plus()) | |
| 759 clip_update_selection(&clip_plus); | |
| 7 | 760 # endif |
| 761 #ifdef FEAT_GUI | |
| 762 /* Remove the cursor before starting to do anything, because | |
| 763 * scrolling may make it difficult to redraw the text under | |
| 764 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
765 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
|
766 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
767 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
768 gui_cursor_row = gui.cursor_row; |
| 7 | 769 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
770 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
771 } |
| 7 | 772 #endif |
| 773 } | |
| 774 #endif | |
| 775 win_update(wp); | |
| 776 } | |
| 777 | |
| 778 /* redraw status line after the window to minimize cursor movement */ | |
| 779 if (wp->w_redr_status) | |
| 780 { | |
| 781 cursor_off(); | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
782 win_redr_status(wp, TRUE); // any popup menu will be redrawn below |
| 7 | 783 } |
| 784 } | |
| 785 #if defined(FEAT_SEARCH_EXTRA) | |
| 786 end_search_hl(); | |
| 787 #endif | |
| 4107 | 788 #ifdef FEAT_INS_EXPAND |
| 789 /* 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
|
790 pum_may_redraw(); |
| 4107 | 791 #endif |
| 7 | 792 |
| 793 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 794 * 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
|
795 FOR_ALL_WINDOWS(wp) |
| 7 | 796 wp->w_buffer->b_mod_set = FALSE; |
| 797 | |
|
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
|
798 #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
|
799 // 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
|
800 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
|
801 #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
|
802 |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
803 after_updating_screen(TRUE); |
| 7 | 804 |
| 805 /* Clear or redraw the command line. Done last, because scrolling may | |
| 806 * 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
|
807 if (clear_cmdline || redraw_cmdline || redraw_mode) |
| 7 | 808 showmode(); |
| 809 | |
|
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
|
810 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
|
811 --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
|
812 |
| 7 | 813 /* 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
|
814 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
815 maybe_intro_message(); |
| 7 | 816 did_intro = TRUE; |
| 817 | |
| 818 #ifdef FEAT_GUI | |
| 819 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 820 * done. */ | |
| 821 if (gui.in_use) | |
| 822 { | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
823 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
|
824 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
825 mch_disable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
826 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
|
827 mch_enable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
828 |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
829 /* 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
|
830 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
831 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
832 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
833 gui.col = mb_fix_col(gui.col, gui.row); |
| 7 | 834 gui_update_cursor(FALSE, FALSE); |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
835 gui_may_flush(); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
836 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
837 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
838 } |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
839 else |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
840 out_flush(); |
| 7 | 841 gui_update_scrollbars(FALSE); |
| 842 } | |
| 843 #endif | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
844 return OK; |
| 7 | 845 } |
| 846 | |
|
15947
4aaf68cbed32
patch 8.1.0979: compiler warning for unused functions
Bram Moolenaar <Bram@vim.org>
parents:
15939
diff
changeset
|
847 #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
|
848 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
849 * 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
|
850 * 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
|
851 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
852 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
853 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
854 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
855 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
856 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
857 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
858 /* 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
|
859 * 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
|
860 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
861 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
862 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
863 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
864 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
865 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
866 #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
|
867 // 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
|
868 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
|
869 #endif |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
870 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
871 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
872 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
873 * 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
|
874 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
876 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
877 { |
|
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
|
878 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
|
879 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
880 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
881 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
882 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
883 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
884 |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
885 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
|
886 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
887 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
888 /* 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
|
889 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
890 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
891 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
892 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
|
893 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
894 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
895 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
896 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
897 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
898 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
899 #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
|
900 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
901 * 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
|
902 * 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
|
903 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
904 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
905 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
|
906 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
907 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
|
908 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
909 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
|
910 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
|
911 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
|
912 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
|
913 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
|
914 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
|
915 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
|
916 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
917 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
918 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
|
919 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
920 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
|
921 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
|
922 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
923 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
924 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
925 * 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
|
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 void |
|
13876
156ebdcb8ef5
patch 8.0.1809: various typos
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
928 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
|
929 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
930 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
|
931 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
932 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
|
933 /* 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
|
934 * 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
|
935 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
|
936 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
937 } |
| 7 | 938 #endif |
| 939 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
940 #if defined(FEAT_NETBEANS_INTG) || defined(PROTO) |
| 7 | 941 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
942 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 943 { |
| 944 win_T *wp; | |
| 945 int doit = FALSE; | |
| 946 | |
| 947 # ifdef FEAT_FOLDING | |
| 948 win_foldinfo.fi_level = 0; | |
| 949 # endif | |
| 950 | |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
951 // 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
|
952 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
|
953 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
954 // check if it resulted in the need to redraw a window |
| 7 | 955 FOR_ALL_WINDOWS(wp) |
| 956 if (wp->w_redr_type != 0) | |
| 957 doit = TRUE; | |
| 958 | |
| 3250 | 959 /* 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
|
960 * 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
|
961 */ |
| 3250 | 962 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
|
963 || 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
|
964 || msg_scrolled |
| 3250 | 965 #ifdef FEAT_GUI |
| 966 || gui.starting | |
| 967 #endif | |
| 968 || starting) | |
| 7 | 969 return; |
| 970 | |
| 971 /* update all windows that need updating */ | |
| 972 update_prepare(); | |
| 973 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
974 FOR_ALL_WINDOWS(wp) |
| 7 | 975 { |
| 976 if (wp->w_redr_type != 0) | |
| 977 win_update(wp); | |
| 978 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
|
979 win_redr_status(wp, FALSE); |
| 7 | 980 } |
| 981 | |
| 982 update_finish(); | |
| 983 } | |
| 984 #endif | |
| 985 | |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
986 /* |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
987 * 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
|
988 * 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
|
989 */ |
|
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
|
990 int |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
991 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
|
992 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
993 int wcr_attr = 0; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
994 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
995 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
|
996 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
|
997 #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
|
998 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
|
999 { |
|
4bd21046902b
patch 8.1.1882: cannot specify properties of the info popup window
Bram Moolenaar <Bram@vim.org>
parents:
17742
diff
changeset
|
1000 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
|
1001 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
|
1002 else |
|
4bd21046902b
patch 8.1.1882: cannot specify properties of the info popup window
Bram Moolenaar <Bram@vim.org>
parents:
17742
diff
changeset
|
1003 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
|
1004 } |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1005 #endif |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1006 return wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1007 } |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1008 |
| 7 | 1009 #if defined(FEAT_GUI) || defined(PROTO) |
| 1010 /* | |
| 1011 * Update a single window, its status line and maybe the command line msg. | |
| 1012 * Used for the GUI scrollbar. | |
| 1013 */ | |
| 1014 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1015 updateWindow(win_T *wp) |
| 7 | 1016 { |
| 2008 | 1017 /* return if already busy updating */ |
| 1018 if (updating_screen) | |
| 1019 return; | |
| 1020 | |
| 7 | 1021 update_prepare(); |
| 1022 | |
| 1023 #ifdef FEAT_CLIPBOARD | |
| 1024 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1025 if (clip_star.available && clip_isautosel_star()) |
| 1026 clip_update_selection(&clip_star); | |
| 1027 if (clip_plus.available && clip_isautosel_plus()) | |
| 1028 clip_update_selection(&clip_plus); | |
| 7 | 1029 #endif |
| 670 | 1030 |
| 7 | 1031 win_update(wp); |
| 670 | 1032 |
| 1033 /* When the screen was cleared redraw the tab pages line. */ | |
| 673 | 1034 if (redraw_tabline) |
| 677 | 1035 draw_tabline(); |
| 670 | 1036 |
| 7 | 1037 if (wp->w_redr_status |
| 1038 # ifdef FEAT_CMDL_INFO | |
| 1039 || p_ru | |
| 1040 # endif | |
| 1041 # ifdef FEAT_STL_OPT | |
| 40 | 1042 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1043 # endif |
| 1044 ) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
1045 win_redr_status(wp, FALSE); |
| 7 | 1046 |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1047 #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
|
1048 // 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
|
1049 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
|
1050 #endif |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1051 |
| 7 | 1052 update_finish(); |
| 1053 } | |
| 1054 #endif | |
| 1055 | |
| 1056 /* | |
| 1057 * Update a single window. | |
| 1058 * | |
| 1059 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1060 * screen or scrolling lines). | |
| 1061 * | |
| 1062 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1063 * implies the one below it. | |
| 1064 * NOT_VALID redraw the whole window | |
| 743 | 1065 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1066 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1067 * INVERTED redraw the changed part of the Visual area | |
| 1068 * INVERTED_ALL redraw the whole Visual area | |
| 1069 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1070 * 2. update lines at the top when scrolled down | |
| 1071 * 3. redraw changed text: | |
| 301 | 1072 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1073 * b_mod_top and b_mod_bot. |
| 1074 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1075 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1076 * - continue redrawing when syntax status is invalid. | |
| 1077 * 4. if scrolled up, update lines at the bottom. | |
| 1078 * This results in three areas that may need updating: | |
| 1079 * top: from first row to top_end (when scrolled down) | |
| 1080 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1081 * bot: from bot_start to last row (when scrolled up) | |
| 1082 */ | |
| 1083 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1084 win_update(win_T *wp) |
| 7 | 1085 { |
| 1086 buf_T *buf = wp->w_buffer; | |
| 1087 int type; | |
| 1088 int top_end = 0; /* Below last row of the top area that needs | |
| 1089 updating. 0 when no top area updating. */ | |
| 1090 int mid_start = 999;/* first row of the mid area that needs | |
| 1091 updating. 999 when no mid area updating. */ | |
| 1092 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1093 updating. 0 when no mid area updating. */ | |
| 1094 int bot_start = 999;/* first row of the bot area that needs | |
| 1095 updating. 999 when no bot area updating */ | |
| 1096 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1097 w_topline got smaller a bit */ | |
| 1098 #ifdef FEAT_SEARCH_EXTRA | |
|
17498
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
1099 int top_to_mod = FALSE; // redraw above mod_top |
| 7 | 1100 #endif |
| 1101 | |
| 1102 int row; /* current window row to display */ | |
| 1103 linenr_T lnum; /* current buffer lnum to display */ | |
| 1104 int idx; /* current index in w_lines[] */ | |
| 1105 int srow; /* starting row of the current line */ | |
| 1106 | |
| 1107 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1108 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1109 int i; | |
| 1110 long j; | |
| 1111 static int recursive = FALSE; /* being called recursively */ | |
| 1112 int old_botline = wp->w_botline; | |
| 1113 #ifdef FEAT_FOLDING | |
| 1114 long fold_count; | |
| 1115 #endif | |
| 1116 #ifdef FEAT_SYN_HL | |
| 1117 /* remember what happened to the previous line, to know if | |
| 1118 * check_visual_highlight() can be used */ | |
| 1119 #define DID_NONE 1 /* didn't update a line */ | |
| 1120 #define DID_LINE 2 /* updated a normal line */ | |
| 1121 #define DID_FOLD 3 /* updated a folded line */ | |
| 1122 int did_update = DID_NONE; | |
| 1123 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1124 #endif | |
| 1125 linenr_T mod_top = 0; | |
| 1126 linenr_T mod_bot = 0; | |
| 1127 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1128 int save_got_int; | |
| 1129 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1130 #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
|
1131 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
|
1132 #endif |
| 7 | 1133 |
| 1134 type = wp->w_redr_type; | |
| 1135 | |
| 1136 if (type == NOT_VALID) | |
| 1137 { | |
| 1138 wp->w_redr_status = TRUE; | |
| 1139 wp->w_lines_valid = 0; | |
| 1140 } | |
| 1141 | |
| 1142 /* 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
|
1143 if (wp->w_height + WINBAR_HEIGHT(wp) == 0) |
| 7 | 1144 { |
| 1145 wp->w_redr_type = 0; | |
| 1146 return; | |
| 1147 } | |
| 1148 | |
| 1149 /* Window is zero-width: Only need to draw the separator. */ | |
| 1150 if (wp->w_width == 0) | |
| 1151 { | |
| 1152 /* draw the vertical separator right of this window */ | |
| 1153 draw_vsep_win(wp, 0); | |
| 1154 wp->w_redr_type = 0; | |
| 1155 return; | |
| 1156 } | |
| 1157 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1158 #ifdef FEAT_TERMINAL |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1159 // 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
|
1160 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
|
1161 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1162 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
|
1163 # 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
|
1164 /* 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
|
1165 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
|
1166 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
|
1167 # endif |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1168 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
|
1169 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1170 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1171 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1172 |
| 7 | 1173 #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
|
1174 init_search_hl(wp, &search_hl); |
| 7 | 1175 #endif |
| 1176 | |
| 13 | 1177 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1178 /* 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
|
1179 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1180 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1181 if (wp->w_nrwidth != i) |
| 13 | 1182 { |
| 1183 type = NOT_VALID; | |
| 677 | 1184 wp->w_nrwidth = i; |
| 13 | 1185 } |
| 1186 else | |
| 1187 #endif | |
| 1188 | |
| 7 | 1189 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1190 { | |
| 1191 /* | |
| 1192 * When there are both inserted/deleted lines and specific lines to be | |
| 1193 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1194 * everything (only happens when redrawing is off for while). | |
| 1195 */ | |
| 1196 type = NOT_VALID; | |
| 1197 } | |
| 1198 else | |
| 1199 { | |
| 1200 /* | |
| 1201 * Set mod_top to the first line that needs displaying because of | |
| 1202 * changes. Set mod_bot to the first line after the changes. | |
| 1203 */ | |
| 1204 mod_top = wp->w_redraw_top; | |
| 1205 if (wp->w_redraw_bot != 0) | |
| 1206 mod_bot = wp->w_redraw_bot + 1; | |
| 1207 else | |
| 1208 mod_bot = 0; | |
| 1209 if (buf->b_mod_set) | |
| 1210 { | |
| 1211 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1212 { | |
| 1213 mod_top = buf->b_mod_top; | |
| 1214 #ifdef FEAT_SYN_HL | |
| 1215 /* Need to redraw lines above the change that may be included | |
| 1216 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1217 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1218 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1219 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1220 if (mod_top < 1) |
| 1221 mod_top = 1; | |
| 1222 } | |
| 1223 #endif | |
| 1224 } | |
| 1225 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1226 mod_bot = buf->b_mod_bot; | |
| 1227 | |
| 1228 #ifdef FEAT_SEARCH_EXTRA | |
|
17498
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
1229 // 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
|
1230 // 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
|
1231 // 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
|
1232 // lines above the change. |
|
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
1233 // Same for a match pattern. |
| 699 | 1234 if (search_hl.rm.regprog != NULL |
| 1235 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1236 top_to_mod = TRUE; |
| 699 | 1237 else |
| 1326 | 1238 { |
|
17498
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
1239 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
|
1240 |
| 1326 | 1241 while (cur != NULL) |
| 1242 { | |
| 1243 if (cur->match.regprog != NULL | |
| 1244 && re_multiline(cur->match.regprog)) | |
| 699 | 1245 { |
| 1246 top_to_mod = TRUE; | |
| 1247 break; | |
| 1248 } | |
| 1326 | 1249 cur = cur->next; |
| 1250 } | |
| 1251 } | |
| 7 | 1252 #endif |
| 1253 } | |
| 1254 #ifdef FEAT_FOLDING | |
| 1255 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1256 { | |
| 1257 linenr_T lnumt, lnumb; | |
| 1258 | |
| 1259 /* | |
| 1260 * A change in a line can cause lines above it to become folded or | |
| 1261 * unfolded. Find the top most buffer line that may be affected. | |
| 1262 * If the line was previously folded and displayed, get the first | |
| 1263 * line of that fold. If the line is folded now, get the first | |
| 1264 * folded line. Use the minimum of these two. | |
| 1265 */ | |
| 1266 | |
| 1267 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1268 * the line below it. If there is no valid entry, use w_topline. | |
| 1269 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1270 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1271 lnumt = wp->w_topline; | |
| 1272 lnumb = MAXLNUM; | |
| 1273 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1274 if (wp->w_lines[i].wl_valid) | |
| 1275 { | |
| 1276 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1277 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1278 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1279 { | |
| 1280 lnumb = wp->w_lines[i].wl_lnum; | |
| 1281 /* When there is a fold column it might need updating | |
| 1282 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1283 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1284 ++lnumb; |
| 1285 } | |
| 1286 } | |
| 1287 | |
| 1288 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1289 if (mod_top > lnumt) | |
| 1290 mod_top = lnumt; | |
| 1291 | |
| 1292 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1293 --mod_bot; | |
| 1294 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1295 ++mod_bot; | |
| 1296 if (mod_bot < lnumb) | |
| 1297 mod_bot = lnumb; | |
| 1298 } | |
| 1299 #endif | |
| 1300 | |
| 1301 /* When a change starts above w_topline and the end is below | |
| 1302 * w_topline, start redrawing at w_topline. | |
| 36 | 1303 * If the end of the change is above w_topline: do like no change was |
| 1304 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1305 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1306 { | |
| 1307 if (mod_bot > wp->w_topline) | |
| 1308 mod_top = wp->w_topline; | |
| 1309 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1310 else if (syntax_present(wp)) |
| 7 | 1311 top_end = 1; |
| 1312 #endif | |
| 1313 } | |
| 36 | 1314 |
| 1315 /* When line numbers are displayed need to redraw all lines below | |
| 1316 * inserted/deleted lines. */ | |
| 1317 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1318 mod_bot = MAXLNUM; | |
| 7 | 1319 } |
|
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
|
1320 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
|
1321 wp->w_redraw_bot = 0; |
| 7 | 1322 |
| 1323 /* | |
| 1324 * When only displaying the lines at the top, set top_end. Used when | |
| 1325 * window has scrolled down for msg_scrolled. | |
| 1326 */ | |
| 1327 if (type == REDRAW_TOP) | |
| 1328 { | |
| 1329 j = 0; | |
| 1330 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1331 { | |
| 1332 j += wp->w_lines[i].wl_size; | |
| 1333 if (j >= wp->w_upd_rows) | |
| 1334 { | |
| 1335 top_end = j; | |
| 1336 break; | |
| 1337 } | |
| 1338 } | |
| 1339 if (top_end == 0) | |
| 1340 /* not found (cannot happen?): redraw everything */ | |
| 1341 type = NOT_VALID; | |
| 1342 else | |
| 1343 /* top area defined, the rest is VALID */ | |
| 1344 type = VALID; | |
| 1345 } | |
| 1346 | |
| 1378 | 1347 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1348 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1349 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1350 * called. */ | |
| 1351 if (screen_cleared) | |
| 1352 screen_cleared = MAYBE; | |
| 1353 | |
| 7 | 1354 /* |
| 1355 * If there are no changes on the screen that require a complete redraw, | |
| 1356 * handle three cases: | |
| 1357 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1358 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1359 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1360 * w_lines[] that needs updating. | |
| 1361 */ | |
| 743 | 1362 if ((type == VALID || type == SOME_VALID |
| 1363 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1364 #ifdef FEAT_DIFF |
| 1365 && !wp->w_botfill && !wp->w_old_botfill | |
| 1366 #endif | |
| 1367 ) | |
| 1368 { | |
| 1369 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1370 { | |
| 1371 /* | |
| 1372 * w_topline is the first changed line, the scrolling will be done | |
| 1373 * further down. | |
| 1374 */ | |
| 1375 } | |
| 1376 else if (wp->w_lines[0].wl_valid | |
| 1377 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1378 #ifdef FEAT_DIFF | |
| 1379 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1380 && wp->w_topfill > wp->w_old_topfill) | |
| 1381 #endif | |
| 1382 )) | |
| 1383 { | |
| 1384 /* | |
| 1385 * New topline is above old topline: May scroll down. | |
| 1386 */ | |
| 1387 #ifdef FEAT_FOLDING | |
| 1388 if (hasAnyFolding(wp)) | |
| 1389 { | |
| 1390 linenr_T ln; | |
| 1391 | |
| 1392 /* count the number of lines we are off, counting a sequence | |
| 1393 * of folded lines as one */ | |
| 1394 j = 0; | |
| 1395 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1396 { | |
| 1397 ++j; | |
| 1398 if (j >= wp->w_height - 2) | |
| 1399 break; | |
| 1400 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1401 } | |
| 1402 } | |
| 1403 else | |
| 1404 #endif | |
| 1405 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1406 if (j < wp->w_height - 2) /* not too far off */ | |
| 1407 { | |
| 1408 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1409 #ifdef FEAT_DIFF | |
| 1410 /* insert extra lines for previously invisible filler lines */ | |
| 1411 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1412 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1413 - wp->w_old_topfill; | |
| 1414 #endif | |
| 1415 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1416 { | |
| 1417 /* | |
| 1418 * Try to insert the correct number of lines. | |
| 1419 * If not the last window, delete the lines at the bottom. | |
| 1420 * win_ins_lines may fail when the terminal can't do it. | |
| 1421 */ | |
| 1422 if (i > 0) | |
| 1423 check_for_delay(FALSE); | |
| 1424 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1425 { | |
| 1426 if (wp->w_lines_valid != 0) | |
| 1427 { | |
| 1428 /* Need to update rows that are new, stop at the | |
| 1429 * first one that scrolled down. */ | |
| 1430 top_end = i; | |
| 1431 scrolled_down = TRUE; | |
| 1432 | |
| 1433 /* Move the entries that were scrolled, disable | |
| 1434 * the entries for the lines to be redrawn. */ | |
| 1435 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1436 wp->w_lines_valid = wp->w_height; | |
| 1437 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1438 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1439 while (idx >= 0) | |
| 1440 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1441 } | |
| 1442 } | |
| 1443 else | |
| 1444 mid_start = 0; /* redraw all lines */ | |
| 1445 } | |
| 1446 else | |
| 1447 mid_start = 0; /* redraw all lines */ | |
| 1448 } | |
| 1449 else | |
| 1450 mid_start = 0; /* redraw all lines */ | |
| 1451 } | |
| 1452 else | |
| 1453 { | |
| 1454 /* | |
| 1455 * New topline is at or below old topline: May scroll up. | |
| 1456 * When topline didn't change, find first entry in w_lines[] that | |
| 1457 * needs updating. | |
| 1458 */ | |
| 1459 | |
| 1460 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1461 j = -1; | |
| 1462 row = 0; | |
| 1463 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1464 { | |
| 1465 if (wp->w_lines[i].wl_valid | |
| 1466 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1467 { | |
| 1468 j = i; | |
| 1469 break; | |
| 1470 } | |
| 1471 row += wp->w_lines[i].wl_size; | |
| 1472 } | |
| 1473 if (j == -1) | |
| 1474 { | |
| 1475 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1476 * lines */ | |
| 1477 mid_start = 0; | |
| 1478 } | |
| 1479 else | |
| 1480 { | |
| 1481 /* | |
| 1482 * Try to delete the correct number of lines. | |
| 1483 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1484 */ | |
| 1485 #ifdef FEAT_DIFF | |
| 1486 /* If the topline didn't change, delete old filler lines, | |
| 1487 * otherwise delete filler lines of the new topline... */ | |
| 1488 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1489 row += wp->w_old_topfill; | |
| 1490 else | |
| 1491 row += diff_check_fill(wp, wp->w_topline); | |
| 1492 /* ... but don't delete new filler lines. */ | |
| 1493 row -= wp->w_topfill; | |
| 1494 #endif | |
| 1495 if (row > 0) | |
| 1496 { | |
| 1497 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
|
1498 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
|
1499 == OK) |
| 7 | 1500 bot_start = wp->w_height - row; |
| 1501 else | |
| 1502 mid_start = 0; /* redraw all lines */ | |
| 1503 } | |
| 1504 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1505 { | |
| 1506 /* | |
| 1507 * Skip the lines (below the deleted lines) that are still | |
| 1508 * valid and don't need redrawing. Copy their info | |
| 1509 * upwards, to compensate for the deleted lines. Set | |
| 1510 * bot_start to the first row that needs redrawing. | |
| 1511 */ | |
| 1512 bot_start = 0; | |
| 1513 idx = 0; | |
| 1514 for (;;) | |
| 1515 { | |
| 1516 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1517 /* stop at line that didn't fit, unless it is still | |
| 1518 * valid (no lines deleted) */ | |
| 1519 if (row > 0 && bot_start + row | |
| 1520 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1521 { | |
| 1522 wp->w_lines_valid = idx + 1; | |
| 1523 break; | |
| 1524 } | |
| 1525 bot_start += wp->w_lines[idx++].wl_size; | |
| 1526 | |
| 1527 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1528 if (++j >= wp->w_lines_valid) | |
| 1529 { | |
| 1530 wp->w_lines_valid = idx; | |
| 1531 break; | |
| 1532 } | |
| 1533 } | |
| 1534 #ifdef FEAT_DIFF | |
| 1535 /* Correct the first entry for filler lines at the top | |
| 1536 * when it won't get updated below. */ | |
| 1537 if (wp->w_p_diff && bot_start > 0) | |
| 1538 wp->w_lines[0].wl_size = | |
| 1539 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1540 + wp->w_topfill; | |
| 1541 #endif | |
| 1542 } | |
| 1543 } | |
| 1544 } | |
| 1545 | |
| 1546 /* When starting redraw in the first line, redraw all lines. When | |
| 1547 * there is only one window it's probably faster to clear the screen | |
| 1548 * first. */ | |
| 1549 if (mid_start == 0) | |
| 1550 { | |
| 1551 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
|
1552 if (ONE_WINDOW && !WIN_IS_POPUP(wp)) |
| 981 | 1553 { |
| 1331 | 1554 /* Clear the screen when it was not done by win_del_lines() or |
| 1555 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1556 * then. */ | |
| 1557 if (screen_cleared != TRUE) | |
| 1558 screenclear(); | |
| 981 | 1559 /* The screen was cleared, redraw the tab pages line. */ |
| 1560 if (redraw_tabline) | |
| 1561 draw_tabline(); | |
| 1562 } | |
| 7 | 1563 } |
| 1331 | 1564 |
| 1565 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1566 * cleared (only happens for the first window) or when screenclear() | |
| 1567 * was called directly above, "must_redraw" will have been set to | |
| 1568 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1569 if (screen_cleared == TRUE) | |
| 1570 must_redraw = 0; | |
| 7 | 1571 } |
| 1572 else | |
| 1573 { | |
| 1574 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1575 mid_start = 0; | |
| 1576 mid_end = wp->w_height; | |
| 1577 } | |
| 1578 | |
| 743 | 1579 if (type == SOME_VALID) |
| 1580 { | |
| 1581 /* SOME_VALID: redraw all lines. */ | |
| 1582 mid_start = 0; | |
| 1583 mid_end = wp->w_height; | |
| 1584 type = NOT_VALID; | |
| 1585 } | |
| 1586 | |
| 7 | 1587 /* check if we are updating or removing the inverted part */ |
| 1588 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1589 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1590 { | |
| 1591 linenr_T from, to; | |
| 1592 | |
| 1593 if (VIsual_active) | |
| 1594 { | |
| 1595 if (VIsual_active | |
| 1596 && (VIsual_mode != wp->w_old_visual_mode | |
| 1597 || type == INVERTED_ALL)) | |
| 1598 { | |
| 1599 /* | |
| 1600 * If the type of Visual selection changed, redraw the whole | |
| 1601 * selection. Also when the ownership of the X selection is | |
| 1602 * gained or lost. | |
| 1603 */ | |
| 1604 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1605 { | |
| 1606 from = curwin->w_cursor.lnum; | |
| 1607 to = VIsual.lnum; | |
| 1608 } | |
| 1609 else | |
| 1610 { | |
| 1611 from = VIsual.lnum; | |
| 1612 to = curwin->w_cursor.lnum; | |
| 1613 } | |
| 1614 /* redraw more when the cursor moved as well */ | |
| 1615 if (wp->w_old_cursor_lnum < from) | |
| 1616 from = wp->w_old_cursor_lnum; | |
| 1617 if (wp->w_old_cursor_lnum > to) | |
| 1618 to = wp->w_old_cursor_lnum; | |
| 1619 if (wp->w_old_visual_lnum < from) | |
| 1620 from = wp->w_old_visual_lnum; | |
| 1621 if (wp->w_old_visual_lnum > to) | |
| 1622 to = wp->w_old_visual_lnum; | |
| 1623 } | |
| 1624 else | |
| 1625 { | |
| 1626 /* | |
| 1627 * Find the line numbers that need to be updated: The lines | |
| 1628 * between the old cursor position and the current cursor | |
| 1629 * position. Also check if the Visual position changed. | |
| 1630 */ | |
| 1631 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1632 { | |
| 1633 from = curwin->w_cursor.lnum; | |
| 1634 to = wp->w_old_cursor_lnum; | |
| 1635 } | |
| 1636 else | |
| 1637 { | |
| 1638 from = wp->w_old_cursor_lnum; | |
| 1639 to = curwin->w_cursor.lnum; | |
| 1640 if (from == 0) /* Visual mode just started */ | |
| 1641 from = to; | |
| 1642 } | |
| 1643 | |
| 422 | 1644 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1645 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1646 { |
| 1647 if (wp->w_old_visual_lnum < from | |
| 1648 && wp->w_old_visual_lnum != 0) | |
| 1649 from = wp->w_old_visual_lnum; | |
| 1650 if (wp->w_old_visual_lnum > to) | |
| 1651 to = wp->w_old_visual_lnum; | |
| 1652 if (VIsual.lnum < from) | |
| 1653 from = VIsual.lnum; | |
| 1654 if (VIsual.lnum > to) | |
| 1655 to = VIsual.lnum; | |
| 1656 } | |
| 1657 } | |
| 1658 | |
| 1659 /* | |
| 1660 * If in block mode and changed column or curwin->w_curswant: | |
| 1661 * update all lines. | |
| 1662 * First compute the actual start and end column. | |
| 1663 */ | |
| 1664 if (VIsual_mode == Ctrl_V) | |
| 1665 { | |
| 6266 | 1666 colnr_T fromc, toc; |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
1667 #if defined(FEAT_LINEBREAK) |
| 6266 | 1668 int save_ve_flags = ve_flags; |
| 1669 | |
| 1670 if (curwin->w_p_lbr) | |
| 1671 ve_flags = VE_ALL; | |
| 1672 #endif | |
| 7 | 1673 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
|
1674 #if defined(FEAT_LINEBREAK) |
| 6266 | 1675 ve_flags = save_ve_flags; |
| 1676 #endif | |
| 7 | 1677 ++toc; |
| 1678 if (curwin->w_curswant == MAXCOL) | |
| 1679 toc = MAXCOL; | |
| 1680 | |
| 1681 if (fromc != wp->w_old_cursor_fcol | |
| 1682 || toc != wp->w_old_cursor_lcol) | |
| 1683 { | |
| 1684 if (from > VIsual.lnum) | |
| 1685 from = VIsual.lnum; | |
| 1686 if (to < VIsual.lnum) | |
| 1687 to = VIsual.lnum; | |
| 1688 } | |
| 1689 wp->w_old_cursor_fcol = fromc; | |
| 1690 wp->w_old_cursor_lcol = toc; | |
| 1691 } | |
| 1692 } | |
| 1693 else | |
| 1694 { | |
| 1695 /* Use the line numbers of the old Visual area. */ | |
| 1696 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1697 { | |
| 1698 from = wp->w_old_cursor_lnum; | |
| 1699 to = wp->w_old_visual_lnum; | |
| 1700 } | |
| 1701 else | |
| 1702 { | |
| 1703 from = wp->w_old_visual_lnum; | |
| 1704 to = wp->w_old_cursor_lnum; | |
| 1705 } | |
| 1706 } | |
| 1707 | |
| 1708 /* | |
| 1709 * There is no need to update lines above the top of the window. | |
| 1710 */ | |
| 1711 if (from < wp->w_topline) | |
| 1712 from = wp->w_topline; | |
| 1713 | |
| 1714 /* | |
| 1715 * If we know the value of w_botline, use it to restrict the update to | |
| 1716 * the lines that are visible in the window. | |
| 1717 */ | |
| 1718 if (wp->w_valid & VALID_BOTLINE) | |
| 1719 { | |
| 1720 if (from >= wp->w_botline) | |
| 1721 from = wp->w_botline - 1; | |
| 1722 if (to >= wp->w_botline) | |
| 1723 to = wp->w_botline - 1; | |
| 1724 } | |
| 1725 | |
| 1726 /* | |
| 1727 * Find the minimal part to be updated. | |
| 1728 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1729 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1730 * top_end; need to redraw from top_end to the "to" line. | |
| 1731 * A middle mouse click with a Visual selection may change the text | |
| 1732 * above the Visual area and reset wl_valid, do count these for | |
| 1733 * mid_end (in srow). | |
| 1734 */ | |
| 1735 if (mid_start > 0) | |
| 1736 { | |
| 1737 lnum = wp->w_topline; | |
| 1738 idx = 0; | |
| 1739 srow = 0; | |
| 1740 if (scrolled_down) | |
| 1741 mid_start = top_end; | |
| 1742 else | |
| 1743 mid_start = 0; | |
| 1744 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1745 { | |
| 1746 if (wp->w_lines[idx].wl_valid) | |
| 1747 mid_start += wp->w_lines[idx].wl_size; | |
| 1748 else if (!scrolled_down) | |
| 1749 srow += wp->w_lines[idx].wl_size; | |
| 1750 ++idx; | |
| 1751 # ifdef FEAT_FOLDING | |
| 1752 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1753 lnum = wp->w_lines[idx].wl_lnum; | |
| 1754 else | |
| 1755 # endif | |
| 1756 ++lnum; | |
| 1757 } | |
| 1758 srow += mid_start; | |
| 1759 mid_end = wp->w_height; | |
| 1760 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1761 { | |
| 1762 if (wp->w_lines[idx].wl_valid | |
| 1763 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1764 { | |
| 1765 /* Only update until first row of this line */ | |
| 1766 mid_end = srow; | |
| 1767 break; | |
| 1768 } | |
| 1769 srow += wp->w_lines[idx].wl_size; | |
| 1770 } | |
| 1771 } | |
| 1772 } | |
| 1773 | |
| 1774 if (VIsual_active && buf == curwin->w_buffer) | |
| 1775 { | |
| 1776 wp->w_old_visual_mode = VIsual_mode; | |
| 1777 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1778 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1779 wp->w_old_visual_col = VIsual.col; |
| 7 | 1780 wp->w_old_curswant = curwin->w_curswant; |
| 1781 } | |
| 1782 else | |
| 1783 { | |
| 1784 wp->w_old_visual_mode = 0; | |
| 1785 wp->w_old_cursor_lnum = 0; | |
| 1786 wp->w_old_visual_lnum = 0; | |
| 422 | 1787 wp->w_old_visual_col = 0; |
| 7 | 1788 } |
| 1789 | |
| 1790 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1791 /* reset got_int, otherwise regexp won't work */ | |
| 1792 save_got_int = got_int; | |
| 1793 got_int = 0; | |
| 1794 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1795 #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
|
1796 /* 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
|
1797 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
|
1798 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
|
1799 #endif |
| 7 | 1800 #ifdef FEAT_FOLDING |
| 1801 win_foldinfo.fi_level = 0; | |
| 1802 #endif | |
| 1803 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1804 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1805 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1806 * 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
|
1807 * 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
|
1808 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1809 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
|
1810 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
|
1811 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1812 |
| 7 | 1813 /* |
| 1814 * Update all the window rows. | |
| 1815 */ | |
| 1816 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1817 row = 0; | |
| 1818 srow = 0; | |
| 1819 lnum = wp->w_topline; /* first line shown in window */ | |
| 1820 for (;;) | |
| 1821 { | |
| 1822 /* stop updating when reached the end of the window (check for _past_ | |
| 1823 * the end of the window is at the end of the loop) */ | |
| 1824 if (row == wp->w_height) | |
| 1825 { | |
| 1826 didline = TRUE; | |
| 1827 break; | |
| 1828 } | |
| 1829 | |
| 1830 /* stop updating when hit the end of the file */ | |
| 1831 if (lnum > buf->b_ml.ml_line_count) | |
| 1832 { | |
| 1833 eof = TRUE; | |
| 1834 break; | |
| 1835 } | |
| 1836 | |
| 1837 /* Remember the starting row of the line that is going to be dealt | |
| 1838 * with. It is used further down when the line doesn't fit. */ | |
| 1839 srow = row; | |
| 1840 | |
| 1841 /* | |
| 1842 * Update a line when it is in an area that needs updating, when it | |
| 1843 * 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
|
1844 * "bot_start" may be halfway a wrapped line after using |
| 7 | 1845 * win_del_lines(), check if the current line includes it. |
| 1846 * When syntax folding is being used, the saved syntax states will | |
| 1847 * already have been updated, we can't see where the syntax state is | |
| 1848 * the same again, just update until the end of the window. | |
| 1849 */ | |
| 1850 if (row < top_end | |
| 1851 || (row >= mid_start && row < mid_end) | |
| 1852 #ifdef FEAT_SEARCH_EXTRA | |
| 1853 || top_to_mod | |
| 1854 #endif | |
| 1855 || idx >= wp->w_lines_valid | |
| 1856 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1857 || (mod_top != 0 | |
| 1858 && (lnum == mod_top | |
| 1859 || (lnum >= mod_top | |
| 1860 && (lnum < mod_bot | |
| 1861 #ifdef FEAT_SYN_HL | |
| 1862 || did_update == DID_FOLD | |
| 1863 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1864 && syntax_present(wp) |
| 7 | 1865 && ( |
| 1866 # ifdef FEAT_FOLDING | |
| 1867 (foldmethodIsSyntax(wp) | |
| 1868 && hasAnyFolding(wp)) || | |
| 1869 # endif | |
| 1870 syntax_check_changed(lnum))) | |
| 1871 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1872 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1873 /* match in fixed position might need redraw |
| 1874 * if lines were inserted or deleted */ | |
| 1875 || (wp->w_match_head != NULL | |
| 1876 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1877 #endif |
| 7 | 1878 ))))) |
| 1879 { | |
| 1880 #ifdef FEAT_SEARCH_EXTRA | |
| 1881 if (lnum == mod_top) | |
| 1882 top_to_mod = FALSE; | |
| 1883 #endif | |
| 1884 | |
| 1885 /* | |
| 1886 * When at start of changed lines: May scroll following lines | |
| 1887 * up or down to minimize redrawing. | |
| 1888 * Don't do this when the change continues until the end. | |
| 3318 | 1889 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1890 */ |
| 1891 if (lnum == mod_top | |
| 1892 && mod_bot != MAXLNUM | |
| 3318 | 1893 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1894 { |
| 1895 int old_rows = 0; | |
| 1896 int new_rows = 0; | |
| 1897 int xtra_rows; | |
| 1898 linenr_T l; | |
| 1899 | |
| 1900 /* Count the old number of window rows, using w_lines[], which | |
| 1901 * should still contain the sizes for the lines as they are | |
| 1902 * currently displayed. */ | |
| 1903 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1904 { | |
| 1905 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1906 * lines are part of the changed area. */ | |
| 1907 if (wp->w_lines[i].wl_valid | |
| 1908 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1909 break; | |
| 1910 old_rows += wp->w_lines[i].wl_size; | |
| 1911 #ifdef FEAT_FOLDING | |
| 1912 if (wp->w_lines[i].wl_valid | |
| 1913 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1914 { | |
| 1915 /* Must have found the last valid entry above mod_bot. | |
| 1916 * Add following invalid entries. */ | |
| 1917 ++i; | |
| 1918 while (i < wp->w_lines_valid | |
| 1919 && !wp->w_lines[i].wl_valid) | |
| 1920 old_rows += wp->w_lines[i++].wl_size; | |
| 1921 break; | |
| 1922 } | |
| 1923 #endif | |
| 1924 } | |
| 1925 | |
| 1926 if (i >= wp->w_lines_valid) | |
| 1927 { | |
| 1928 /* We can't find a valid line below the changed lines, | |
| 1929 * need to redraw until the end of the window. | |
| 1930 * Inserting/deleting lines has no use. */ | |
| 1931 bot_start = 0; | |
| 1932 } | |
| 1933 else | |
| 1934 { | |
| 1935 /* Able to count old number of rows: Count new window | |
| 1936 * rows, and may insert/delete lines */ | |
| 1937 j = idx; | |
| 1938 for (l = lnum; l < mod_bot; ++l) | |
| 1939 { | |
| 1940 #ifdef FEAT_FOLDING | |
| 1941 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1942 ++new_rows; | |
| 1943 else | |
| 1944 #endif | |
| 1945 #ifdef FEAT_DIFF | |
| 1946 if (l == wp->w_topline) | |
| 1947 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1948 + wp->w_topfill; | |
| 1949 else | |
| 1950 #endif | |
| 1951 new_rows += plines_win(wp, l, TRUE); | |
| 1952 ++j; | |
| 1953 if (new_rows > wp->w_height - row - 2) | |
| 1954 { | |
| 1955 /* it's getting too much, must redraw the rest */ | |
| 1956 new_rows = 9999; | |
| 1957 break; | |
| 1958 } | |
| 1959 } | |
| 1960 xtra_rows = new_rows - old_rows; | |
| 1961 if (xtra_rows < 0) | |
| 1962 { | |
| 1963 /* May scroll text up. If there is not enough | |
| 1964 * remaining text or scrolling fails, must redraw the | |
| 1965 * rest. If scrolling works, must redraw the text | |
| 1966 * below the scrolled text. */ | |
| 1967 if (row - xtra_rows >= wp->w_height - 2) | |
| 1968 mod_bot = MAXLNUM; | |
| 1969 else | |
| 1970 { | |
| 1971 check_for_delay(FALSE); | |
| 1972 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
|
1973 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 1974 mod_bot = MAXLNUM; |
| 1975 else | |
| 1976 bot_start = wp->w_height + xtra_rows; | |
| 1977 } | |
| 1978 } | |
| 1979 else if (xtra_rows > 0) | |
| 1980 { | |
| 1981 /* May scroll text down. If there is not enough | |
| 1982 * remaining text of scrolling fails, must redraw the | |
| 1983 * rest. */ | |
| 1984 if (row + xtra_rows >= wp->w_height - 2) | |
| 1985 mod_bot = MAXLNUM; | |
| 1986 else | |
| 1987 { | |
| 1988 check_for_delay(FALSE); | |
| 1989 if (win_ins_lines(wp, row + old_rows, | |
| 1990 xtra_rows, FALSE, FALSE) == FAIL) | |
| 1991 mod_bot = MAXLNUM; | |
| 1992 else if (top_end > row + old_rows) | |
| 1993 /* Scrolled the part at the top that requires | |
| 1994 * updating down. */ | |
| 1995 top_end += xtra_rows; | |
| 1996 } | |
| 1997 } | |
| 1998 | |
| 1999 /* When not updating the rest, may need to move w_lines[] | |
| 2000 * entries. */ | |
| 2001 if (mod_bot != MAXLNUM && i != j) | |
| 2002 { | |
| 2003 if (j < i) | |
| 2004 { | |
| 2005 int x = row + new_rows; | |
| 2006 | |
| 2007 /* move entries in w_lines[] upwards */ | |
| 2008 for (;;) | |
| 2009 { | |
| 2010 /* stop at last valid entry in w_lines[] */ | |
| 2011 if (i >= wp->w_lines_valid) | |
| 2012 { | |
| 2013 wp->w_lines_valid = j; | |
| 2014 break; | |
| 2015 } | |
| 2016 wp->w_lines[j] = wp->w_lines[i]; | |
| 2017 /* stop at a line that won't fit */ | |
| 2018 if (x + (int)wp->w_lines[j].wl_size | |
| 2019 > wp->w_height) | |
| 2020 { | |
| 2021 wp->w_lines_valid = j + 1; | |
| 2022 break; | |
| 2023 } | |
| 2024 x += wp->w_lines[j++].wl_size; | |
| 2025 ++i; | |
| 2026 } | |
| 2027 if (bot_start > x) | |
| 2028 bot_start = x; | |
| 2029 } | |
| 2030 else /* j > i */ | |
| 2031 { | |
| 2032 /* move entries in w_lines[] downwards */ | |
| 2033 j -= i; | |
| 2034 wp->w_lines_valid += j; | |
| 2035 if (wp->w_lines_valid > wp->w_height) | |
| 2036 wp->w_lines_valid = wp->w_height; | |
| 2037 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2038 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2039 | |
| 2040 /* The w_lines[] entries for inserted lines are | |
| 2041 * now invalid, but wl_size may be used above. | |
| 2042 * Reset to zero. */ | |
| 2043 while (i >= idx) | |
| 2044 { | |
| 2045 wp->w_lines[i].wl_size = 0; | |
| 2046 wp->w_lines[i--].wl_valid = FALSE; | |
| 2047 } | |
| 2048 } | |
| 2049 } | |
| 2050 } | |
| 2051 } | |
| 2052 | |
| 2053 #ifdef FEAT_FOLDING | |
| 2054 /* | |
| 2055 * When lines are folded, display one line for all of them. | |
| 2056 * Otherwise, display normally (can be several display lines when | |
| 2057 * 'wrap' is on). | |
| 2058 */ | |
| 2059 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2060 if (fold_count != 0) | |
| 2061 { | |
| 2062 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2063 ++row; | |
| 2064 --fold_count; | |
| 2065 wp->w_lines[idx].wl_folded = TRUE; | |
| 2066 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2067 # ifdef FEAT_SYN_HL | |
| 2068 did_update = DID_FOLD; | |
| 2069 # endif | |
| 2070 } | |
| 2071 else | |
| 2072 #endif | |
| 2073 if (idx < wp->w_lines_valid | |
| 2074 && wp->w_lines[idx].wl_valid | |
| 2075 && wp->w_lines[idx].wl_lnum == lnum | |
| 2076 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2077 && !(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
|
2078 && !WIN_IS_POPUP(wp) |
| 7 | 2079 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2080 #ifdef FEAT_DIFF | |
| 2081 && diff_check_fill(wp, lnum) == 0 | |
| 2082 #endif | |
| 2083 ) | |
| 2084 { | |
| 2085 /* This line is not going to fit. Don't draw anything here, | |
| 2086 * will draw "@ " lines below. */ | |
| 2087 row = wp->w_height + 1; | |
| 2088 } | |
| 2089 else | |
| 2090 { | |
| 2091 #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
|
2092 prepare_search_hl(wp, &search_hl, lnum); |
| 7 | 2093 #endif |
| 2094 #ifdef FEAT_SYN_HL | |
| 2095 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2096 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
|
2097 && syntax_present(wp)) |
| 7 | 2098 syntax_end_parsing(syntax_last_parsed + 1); |
| 2099 #endif | |
| 2100 | |
| 2101 /* | |
| 2102 * Display one line. | |
| 2103 */ | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2104 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
|
2105 mod_top == 0, FALSE); |
| 7 | 2106 |
| 2107 #ifdef FEAT_FOLDING | |
| 2108 wp->w_lines[idx].wl_folded = FALSE; | |
| 2109 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2110 #endif | |
| 2111 #ifdef FEAT_SYN_HL | |
| 2112 did_update = DID_LINE; | |
| 2113 syntax_last_parsed = lnum; | |
| 2114 #endif | |
| 2115 } | |
| 2116 | |
| 2117 wp->w_lines[idx].wl_lnum = lnum; | |
| 2118 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
|
2119 |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2120 /* 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
|
2121 * 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
|
2122 * 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
|
2123 if (row > wp->w_height || row + wp->w_winrow >= Rows) |
| 7 | 2124 { |
| 2125 /* we may need the size of that too long line later on */ | |
| 3318 | 2126 if (dollar_vcol == -1) |
| 7 | 2127 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2128 ++idx; | |
| 2129 break; | |
| 2130 } | |
| 3318 | 2131 if (dollar_vcol == -1) |
| 7 | 2132 wp->w_lines[idx].wl_size = row - srow; |
| 2133 ++idx; | |
| 2134 #ifdef FEAT_FOLDING | |
| 2135 lnum += fold_count + 1; | |
| 2136 #else | |
| 2137 ++lnum; | |
| 2138 #endif | |
| 2139 } | |
| 2140 else | |
| 2141 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2142 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
|
2143 { |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2144 #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
|
2145 // '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
|
2146 // 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
|
2147 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
|
2148 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
|
2149 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
|
2150 else |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2151 #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
|
2152 (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
|
2153 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2154 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2155 // This line does not need to be drawn, advance to the next one. |
| 7 | 2156 row += wp->w_lines[idx++].wl_size; |
| 2157 if (row > wp->w_height) /* past end of screen */ | |
| 2158 break; | |
| 2159 #ifdef FEAT_FOLDING | |
| 2160 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2161 #else | |
| 2162 ++lnum; | |
| 2163 #endif | |
| 2164 #ifdef FEAT_SYN_HL | |
| 2165 did_update = DID_NONE; | |
| 2166 #endif | |
| 2167 } | |
| 2168 | |
| 2169 if (lnum > buf->b_ml.ml_line_count) | |
| 2170 { | |
| 2171 eof = TRUE; | |
| 2172 break; | |
| 2173 } | |
| 2174 } | |
| 2175 /* | |
| 2176 * End of loop over all window lines. | |
| 2177 */ | |
| 2178 | |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2179 #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
|
2180 /* 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
|
2181 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
|
2182 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2183 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
|
2184 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2185 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
|
2186 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
|
2187 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
|
2188 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
|
2189 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
|
2190 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2191 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
|
2192 else |
|
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_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
|
2194 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2195 #endif |
| 7 | 2196 |
| 2197 if (idx > wp->w_lines_valid) | |
| 2198 wp->w_lines_valid = idx; | |
| 2199 | |
| 2200 #ifdef FEAT_SYN_HL | |
| 2201 /* | |
| 2202 * Let the syntax stuff know we stop parsing here. | |
| 2203 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2204 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2205 syntax_end_parsing(syntax_last_parsed + 1); |
| 2206 #endif | |
| 2207 | |
| 2208 /* | |
| 2209 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2210 * line we were working on, then the line didn't fit. | |
| 2211 */ | |
| 2212 wp->w_empty_rows = 0; | |
| 2213 #ifdef FEAT_DIFF | |
| 2214 wp->w_filler_rows = 0; | |
| 2215 #endif | |
| 2216 if (!eof && !didline) | |
| 2217 { | |
| 2218 if (lnum == wp->w_topline) | |
| 2219 { | |
| 2220 /* | |
| 2221 * Single line that does not fit! | |
| 2222 * Don't overwrite it, it can be edited. | |
| 2223 */ | |
| 2224 wp->w_botline = lnum + 1; | |
| 2225 } | |
| 2226 #ifdef FEAT_DIFF | |
| 2227 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2228 { | |
| 2229 /* Window ends in filler lines. */ | |
| 2230 wp->w_botline = lnum; | |
| 2231 wp->w_filler_rows = wp->w_height - srow; | |
| 2232 } | |
| 2233 #endif | |
|
16839
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2234 #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
|
2235 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
|
2236 { |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2237 // 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
|
2238 wp->w_botline = lnum; |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2239 } |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2240 #endif |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2241 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
|
2242 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2243 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
|
2244 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2245 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2246 * 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
|
2247 */ |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2248 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
|
2249 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2250 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
|
2251 (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
|
2252 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2253 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2254 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2255 } |
| 7 | 2256 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2257 { | |
| 2258 /* | |
| 2259 * Last line isn't finished: Display "@@@" at the end. | |
| 2260 */ | |
| 2261 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2262 W_WINROW(wp) + wp->w_height, | |
| 2263 (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
|
2264 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2265 set_empty_rows(wp, srow); |
| 2266 wp->w_botline = lnum; | |
| 2267 } | |
| 2268 else | |
| 2269 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2270 win_draw_end(wp, '@', ' ', TRUE, srow, wp->w_height, HLF_AT); |
| 7 | 2271 wp->w_botline = lnum; |
| 2272 } | |
| 2273 } | |
| 2274 else | |
| 2275 { | |
| 2276 draw_vsep_win(wp, row); | |
| 2277 if (eof) /* we hit the end of the file */ | |
| 2278 { | |
| 2279 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2280 #ifdef FEAT_DIFF | |
| 2281 j = diff_check_fill(wp, wp->w_botline); | |
| 2282 if (j > 0 && !wp->w_botfill) | |
| 2283 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2284 // Display filler lines at the end of the file. |
| 7 | 2285 if (char2cells(fill_diff) > 1) |
| 2286 i = '-'; | |
| 2287 else | |
| 2288 i = fill_diff; | |
| 2289 if (row + j > wp->w_height) | |
| 2290 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
|
2291 win_draw_end(wp, i, i, TRUE, row, row + (int)j, HLF_DED); |
| 7 | 2292 row += j; |
| 2293 } | |
| 2294 #endif | |
| 2295 } | |
| 3318 | 2296 else if (dollar_vcol == -1) |
| 7 | 2297 wp->w_botline = lnum; |
| 2298 | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2299 // 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
|
2300 // 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
|
2301 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
|
2302 ' ', FALSE, row, wp->w_height, HLF_EOB); |
| 7 | 2303 } |
| 2304 | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2305 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2306 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2307 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2308 |
| 7 | 2309 /* Reset the type of redrawing required, the window has been updated. */ |
| 2310 wp->w_redr_type = 0; | |
| 2311 #ifdef FEAT_DIFF | |
| 2312 wp->w_old_topfill = wp->w_topfill; | |
| 2313 wp->w_old_botfill = wp->w_botfill; | |
| 2314 #endif | |
| 2315 | |
| 3318 | 2316 if (dollar_vcol == -1) |
| 7 | 2317 { |
| 2318 /* | |
| 2319 * There is a trick with w_botline. If we invalidate it on each | |
| 2320 * change that might modify it, this will cause a lot of expensive | |
| 2321 * calls to plines() in update_topline() each time. Therefore the | |
| 2322 * value of w_botline is often approximated, and this value is used to | |
| 2323 * compute the value of w_topline. If the value of w_botline was | |
| 2324 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2325 * the visible part of the text). If it's not, we need to redraw | |
| 2326 * again. Mostly this just means scrolling up a few lines, so it | |
| 2327 * doesn't look too bad. Only do this for the current window (where | |
| 2328 * changes are relevant). | |
| 2329 */ | |
| 2330 wp->w_valid |= VALID_BOTLINE; | |
| 2331 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2332 { | |
| 2333 recursive = TRUE; | |
| 2334 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2335 update_topline(); /* may invalidate w_botline again */ | |
| 2336 if (must_redraw != 0) | |
| 2337 { | |
| 2338 /* Don't update for changes in buffer again. */ | |
| 2339 i = curbuf->b_mod_set; | |
| 2340 curbuf->b_mod_set = FALSE; | |
| 2341 win_update(curwin); | |
| 2342 must_redraw = 0; | |
| 2343 curbuf->b_mod_set = i; | |
| 2344 } | |
| 2345 recursive = FALSE; | |
| 2346 } | |
| 2347 } | |
| 2348 | |
| 2349 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2350 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2351 if (!got_int) | |
| 2352 got_int = save_got_int; | |
| 2353 #endif | |
| 2354 } | |
| 2355 | |
| 2356 /* | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2357 * 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
|
2358 * 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
|
2359 */ |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2360 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
|
2361 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
|
2362 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
|
2363 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
|
2364 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
|
2365 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
|
2366 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
|
2367 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
|
2368 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
|
2369 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
|
2370 { |
|
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 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
|
2372 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2373 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
|
2374 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
|
2375 #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
|
2376 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
|
2377 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2378 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
|
2379 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
|
2380 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
|
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 else |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2383 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2384 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
|
2385 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
|
2386 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
|
2387 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
|
2388 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2389 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2390 /* |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2391 * 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
|
2392 * 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
|
2393 * When "draw_margin" is TRUE then draw the sign, fold and number columns. |
| 7 | 2394 */ |
| 2395 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2396 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2397 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2398 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2399 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
|
2400 int draw_margin, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2401 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2402 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2403 hlf_T hl) |
| 7 | 2404 { |
| 2405 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
|
2406 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
|
2407 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
|
2408 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
2409 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
|
2410 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2411 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
|
2412 { |
| 6553 | 2413 #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
|
2414 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
|
2415 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2416 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
|
2417 // 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
|
2418 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
|
2419 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
|
2420 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2421 #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
|
2422 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
|
2423 // 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
|
2424 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
|
2425 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
|
2426 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2427 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
|
2428 && 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
|
2429 // 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
|
2430 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
|
2431 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
|
2432 } |
| 7 | 2433 |
| 2434 #ifdef FEAT_RIGHTLEFT | |
| 2435 if (wp->w_p_rl) | |
| 2436 { | |
| 2437 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
|
2438 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
|
2439 c2, c2, attr); |
| 7 | 2440 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
|
2441 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
|
2442 c1, c2, attr); |
| 7 | 2443 } |
| 2444 else | |
| 2445 #endif | |
| 2446 { | |
| 2447 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
|
2448 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
|
2449 c1, c2, attr); |
| 7 | 2450 } |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2451 |
| 7 | 2452 set_empty_rows(wp, row); |
| 2453 } | |
| 2454 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2455 #ifdef FEAT_SYN_HL |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2456 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2457 * 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
|
2458 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2459 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2460 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
|
2461 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2462 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2463 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2464 return (**color_cols >= 0); |
|
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 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2467 |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2468 #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
|
2469 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2470 * 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
|
2471 * 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
|
2472 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2473 static int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2474 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
|
2475 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2476 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
|
2477 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2478 if (has_mbyte) |
|
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 cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2481 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
|
2482 int i; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2483 int idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2484 int c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2485 char_u *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2486 # ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2487 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
|
2488 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
|
2489 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2490 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2491 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2492 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
|
2493 idx = off; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2494 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2495 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2496 idx = off + col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2497 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2498 /* 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
|
2499 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
|
2500 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2501 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
|
2502 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
|
2503 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
|
2504 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2505 - (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
|
2506 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2507 ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2508 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2509 ScreenLines[idx] = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2510 if (enc_utf8) |
|
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 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
|
2513 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
|
2514 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2515 ScreenLinesUC[idx] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2516 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2517 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2518 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2519 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2520 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2521 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2522 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2523 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
|
2524 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2525 /* Do Arabic shaping. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2526 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
|
2527 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
|
2528 int firstbyte = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2529 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2530 /* 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
|
2531 * 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
|
2532 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
|
2533 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2534 pc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2535 pc1 = prev_c1; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2536 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
|
2537 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
|
2538 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2539 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2540 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2541 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
|
2542 nc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2543 pc1 = pcc[0]; |
|
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 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2546 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2547 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
|
2548 pc, pc1, nc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2549 ScreenLines[idx] = firstbyte; |
|
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 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2552 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2553 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2554 /* 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
|
2555 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
|
2556 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
|
2557 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2558 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
|
2559 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
|
2560 break; |
|
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 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2563 if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2564 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
|
2565 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2566 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
|
2567 /* 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
|
2568 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
|
2569 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
|
2570 /* double-width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2571 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
|
2572 col += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2573 idx += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2574 p += c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2575 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2576 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2577 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2578 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2579 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
|
2580 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2581 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
|
2582 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
|
2583 if (len > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2584 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2585 #ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2586 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
|
2587 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
|
2588 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2589 #endif |
|
15939
8013b532a1f7
patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
2590 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
|
2591 col += len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2592 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2593 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2594 return col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2595 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2596 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2597 |
| 7 | 2598 #ifdef FEAT_FOLDING |
| 2599 /* | |
| 6553 | 2600 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2601 * space is available for window "wp", minus "col". | |
| 2602 */ | |
| 2603 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2604 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2605 { |
| 2606 int fdc = wp->w_p_fdc; | |
| 2607 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
|
2608 int wwidth = wp->w_width; |
| 6553 | 2609 |
| 2610 if (fdc > wwidth - (col + wmw)) | |
| 2611 fdc = wwidth - (col + wmw); | |
| 2612 return fdc; | |
| 2613 } | |
| 2614 | |
| 2615 /* | |
| 7 | 2616 * Display one folded line. |
| 2617 */ | |
| 2618 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2619 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2620 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2621 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2622 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2623 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2624 int row) |
| 7 | 2625 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2626 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2627 pos_T *top, *bot; |
| 2628 linenr_T lnume = lnum + fold_count - 1; | |
| 2629 int len; | |
| 29 | 2630 char_u *text; |
| 7 | 2631 int fdc; |
| 2632 int col; | |
| 2633 int txtcol; | |
| 2634 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2635 int ri; |
| 7 | 2636 |
| 2637 /* Build the fold line: | |
| 2638 * 1. Add the cmdwin_type for the command-line window | |
| 2639 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2640 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2641 * 4. Compose the text |
| 2642 * 5. Add the text | |
| 2643 * 6. set highlighting for the Visual area an other text | |
| 2644 */ | |
| 2645 col = 0; | |
| 2646 | |
| 2647 /* | |
| 2648 * 1. Add the cmdwin_type for the command-line window | |
| 2649 * Ignores 'rightleft', this window is never right-left. | |
| 2650 */ | |
| 2651 #ifdef FEAT_CMDWIN | |
| 2652 if (cmdwin_type != 0 && wp == curwin) | |
| 2653 { | |
| 2654 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
|
2655 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2656 if (enc_utf8) |
| 2657 ScreenLinesUC[off] = 0; | |
| 2658 ++col; | |
| 2659 } | |
| 2660 #endif | |
| 2661 | |
| 2662 /* | |
| 2663 * 2. Add the 'foldcolumn' | |
| 6553 | 2664 * Reduce the width when there is not enough space. |
| 7 | 2665 */ |
| 6553 | 2666 fdc = compute_foldcolumn(wp, col); |
| 7 | 2667 if (fdc > 0) |
| 2668 { | |
| 2669 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2670 #ifdef FEAT_RIGHTLEFT | |
| 2671 if (wp->w_p_rl) | |
| 2672 { | |
| 2673 int i; | |
| 2674 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2675 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
|
2676 HL_ATTR(HLF_FC)); |
| 7 | 2677 /* reverse the fold column */ |
| 2678 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
|
2679 ScreenLines[off + wp->w_width - i - 1 - col] = buf[i]; |
| 7 | 2680 } |
| 2681 else | |
| 2682 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2683 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2684 col += fdc; |
| 2685 } | |
| 2686 | |
| 2687 #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
|
2688 # 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
|
2689 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2690 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
|
2691 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
|
2692 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
|
2693 else \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2694 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
|
2695 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
|
2696 } while (0) |
| 7 | 2697 #else |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2698 # 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
|
2699 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2700 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
|
2701 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
|
2702 } while (0) |
| 7 | 2703 #endif |
| 2704 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2705 /* 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
|
2706 * text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2707 RL_MEMSET(col, HL_ATTR(HLF_FL), wp->w_width - col); |
| 7 | 2708 |
| 2709 #ifdef FEAT_SIGNS | |
| 2710 /* 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
|
2711 if (signcolumn_on(wp)) |
| 7 | 2712 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2713 len = wp->w_width - col; |
| 7 | 2714 if (len > 0) |
| 2715 { | |
| 2716 if (len > 2) | |
| 2717 len = 2; | |
| 2718 # ifdef FEAT_RIGHTLEFT | |
| 2719 if (wp->w_p_rl) | |
| 2720 /* 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
|
2721 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
|
2722 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2723 else |
| 2724 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2725 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2726 col += len; |
| 2727 } | |
| 2728 } | |
| 2729 #endif | |
| 2730 | |
| 2731 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2732 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2733 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2734 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2735 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2736 len = wp->w_width - col; |
| 7 | 2737 if (len > 0) |
| 2738 { | |
| 13 | 2739 int w = number_width(wp); |
| 5905 | 2740 long num; |
| 2741 char *fmt = "%*ld "; | |
| 13 | 2742 |
| 2743 if (len > w + 1) | |
| 2744 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2745 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2746 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
|
2747 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2748 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2749 else |
| 4065 | 2750 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2751 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2752 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
|
2753 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
|
2754 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2755 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2756 * line number */ |
| 4065 | 2757 num = lnum; |
| 2758 fmt = "%-*ld "; | |
| 2759 } | |
| 2760 } | |
| 2761 | |
| 2762 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2763 #ifdef FEAT_RIGHTLEFT |
| 2764 if (wp->w_p_rl) | |
| 2765 /* 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
|
2766 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
|
2767 HL_ATTR(HLF_FL)); |
| 7 | 2768 else |
| 2769 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2770 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2771 col += len; |
| 2772 } | |
| 2773 } | |
| 2774 | |
| 2775 /* | |
| 2776 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2777 */ | |
| 29 | 2778 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2779 |
| 2780 txtcol = col; /* remember where text starts */ | |
| 2781 | |
| 2782 /* | |
| 2783 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2784 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2785 * in columns number-col - window-width. | |
| 2786 */ | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2787 col = text_to_screenline(wp, text, col); |
| 7 | 2788 |
| 2789 /* Fill the rest of the line with the fold filler */ | |
| 2790 #ifdef FEAT_RIGHTLEFT | |
| 2791 if (wp->w_p_rl) | |
| 2792 col -= txtcol; | |
| 2793 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2794 while (col < wp->w_width |
| 7 | 2795 #ifdef FEAT_RIGHTLEFT |
| 2796 - (wp->w_p_rl ? txtcol : 0) | |
| 2797 #endif | |
| 2798 ) | |
| 2799 { | |
| 2800 if (enc_utf8) | |
| 2801 { | |
| 2802 if (fill_fold >= 0x80) | |
| 2803 { | |
| 2804 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2805 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
|
2806 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2807 } |
| 2808 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2809 { |
| 7 | 2810 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2811 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2812 } |
|
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
|
2813 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
|
2814 } |
|
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
|
2815 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
|
2816 ScreenLines[off + col++] = fill_fold; |
| 7 | 2817 } |
| 2818 | |
| 2819 if (text != buf) | |
| 2820 vim_free(text); | |
| 2821 | |
| 2822 /* | |
| 2823 * 6. set highlighting for the Visual area an other text. | |
| 2824 * If all folded lines are in the Visual area, highlight the line. | |
| 2825 */ | |
| 2826 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2827 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2828 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2829 { |
| 2830 /* Visual is after curwin->w_cursor */ | |
| 2831 top = &curwin->w_cursor; | |
| 2832 bot = &VIsual; | |
| 2833 } | |
| 2834 else | |
| 2835 { | |
| 2836 /* Visual is before curwin->w_cursor */ | |
| 2837 top = &VIsual; | |
| 2838 bot = &curwin->w_cursor; | |
| 2839 } | |
| 2840 if (lnum >= top->lnum | |
| 2841 && lnume <= bot->lnum | |
| 2842 && (VIsual_mode != 'v' | |
| 2843 || ((lnum > top->lnum | |
| 2844 || (lnum == top->lnum | |
| 2845 && top->col == 0)) | |
| 2846 && (lnume < bot->lnum | |
| 2847 || (lnume == bot->lnum | |
| 2848 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2849 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2850 { |
| 2851 if (VIsual_mode == Ctrl_V) | |
| 2852 { | |
| 2853 /* 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
|
2854 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)wp->w_width) |
| 7 | 2855 { |
| 3040 | 2856 if (wp->w_old_cursor_lcol != MAXCOL |
| 2857 && 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
|
2858 < (colnr_T)wp->w_width) |
| 7 | 2859 len = wp->w_old_cursor_lcol; |
| 2860 else | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2861 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
|
2862 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2863 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2864 } |
| 2865 } | |
| 2866 else | |
| 216 | 2867 { |
| 7 | 2868 /* 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
|
2869 RL_MEMSET(txtcol, HL_ATTR(HLF_V), wp->w_width - txtcol); |
| 216 | 2870 } |
| 7 | 2871 } |
| 2872 } | |
| 2873 | |
| 743 | 2874 #ifdef FEAT_SYN_HL |
| 6685 | 2875 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2876 if (wp->w_p_cc_cols) | |
| 2877 { | |
| 2878 int i = 0; | |
| 2879 int j = wp->w_p_cc_cols[i]; | |
| 2880 int old_txtcol = txtcol; | |
| 2881 | |
| 2882 while (j > -1) | |
| 2883 { | |
| 2884 txtcol += j; | |
| 2885 if (wp->w_p_wrap) | |
| 2886 txtcol -= wp->w_skipcol; | |
| 2887 else | |
| 2888 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
|
2889 if (txtcol >= 0 && txtcol < wp->w_width) |
| 6685 | 2890 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
|
2891 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2892 txtcol = old_txtcol; |
| 2893 j = wp->w_p_cc_cols[++i]; | |
| 2894 } | |
| 2895 } | |
| 2896 | |
| 743 | 2897 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2898 if (wp->w_p_cuc) |
| 2899 { | |
| 2900 txtcol += wp->w_virtcol; | |
| 2901 if (wp->w_p_wrap) | |
| 2902 txtcol -= wp->w_skipcol; | |
| 2903 else | |
| 2904 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
|
2905 if (txtcol >= 0 && txtcol < wp->w_width) |
| 1725 | 2906 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
|
2907 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2908 } |
| 743 | 2909 #endif |
| 7 | 2910 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2911 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
|
2912 (int)wp->w_width, 0); |
| 7 | 2913 |
| 2914 /* | |
| 2915 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2916 * updated (saves a call to plines() later). | |
| 2917 */ | |
| 2918 if (wp == curwin | |
| 2919 && lnum <= curwin->w_cursor.lnum | |
| 2920 && lnume >= curwin->w_cursor.lnum) | |
| 2921 { | |
| 2922 curwin->w_cline_row = row; | |
| 2923 curwin->w_cline_height = 1; | |
| 2924 curwin->w_cline_folded = TRUE; | |
| 2925 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2926 } | |
| 2927 } | |
| 2928 | |
| 2929 /* | |
| 2930 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2931 */ | |
| 2932 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2933 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2934 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2935 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2936 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2937 int attr) |
| 7 | 2938 { |
| 216 | 2939 int i; |
| 2940 | |
| 7 | 2941 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2942 if (enc_utf8) | |
| 2943 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 216 | 2944 for (i = 0; i < len; ++i) |
| 2945 ScreenAttrs[off + i] = attr; | |
| 7 | 2946 } |
| 2947 | |
| 2948 /* | |
| 2949 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2950 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2951 */ |
| 2952 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2953 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2954 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2955 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2956 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2957 linenr_T lnum) /* current line number */ |
| 7 | 2958 { |
| 2959 int i = 0; | |
| 2960 int level; | |
| 2961 int first_level; | |
| 519 | 2962 int empty; |
| 6553 | 2963 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2964 |
| 2965 /* Init to all spaces. */ | |
| 6929 | 2966 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2967 |
| 2968 level = win_foldinfo.fi_level; | |
| 2969 if (level > 0) | |
| 2970 { | |
| 519 | 2971 /* If there is only one column put more info in it. */ |
| 6553 | 2972 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2973 |
| 7 | 2974 /* If the column is too narrow, we start at the lowest level that |
| 2975 * fits and use numbers to indicated the depth. */ | |
| 6553 | 2976 first_level = level - fdc - closed + 1 + empty; |
| 7 | 2977 if (first_level < 1) |
| 2978 first_level = 1; | |
| 2979 | |
| 6553 | 2980 for (i = 0; i + empty < fdc; ++i) |
| 7 | 2981 { |
| 2982 if (win_foldinfo.fi_lnum == lnum | |
| 2983 && first_level + i >= win_foldinfo.fi_low_level) | |
| 2984 p[i] = '-'; | |
| 2985 else if (first_level == 1) | |
| 2986 p[i] = '|'; | |
| 2987 else if (first_level + i <= 9) | |
| 2988 p[i] = '0' + first_level + i; | |
| 2989 else | |
| 2990 p[i] = '>'; | |
| 2991 if (first_level + i == level) | |
| 2992 break; | |
| 2993 } | |
| 2994 } | |
| 2995 if (closed) | |
| 6553 | 2996 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 2997 } |
| 2998 #endif /* FEAT_FOLDING */ | |
| 2999 | |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3000 #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
|
3001 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
|
3002 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
|
3003 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3004 static int |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3005 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
|
3006 { |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3007 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
|
3008 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
|
3009 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
|
3010 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3011 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
|
3012 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
|
3013 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
|
3014 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
|
3015 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
|
3016 return 0; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3017 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
|
3018 return -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3019 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
|
3020 return 1; |
|
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->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
|
3022 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
|
3023 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
|
3024 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
|
3025 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
|
3026 } |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3027 #endif |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3028 |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3029 #ifdef FEAT_SIGNS |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3030 /* |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3031 * 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
|
3032 * 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
|
3033 * 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
|
3034 */ |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3035 static void |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3036 get_sign_display_info( |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3037 int nrcol, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3038 win_T *wp, |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3039 linenr_T lnum UNUSED, |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3040 sign_attrs_T *sattr, |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3041 int wcr_attr, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3042 int row, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3043 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
|
3044 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
|
3045 int filler_todo UNUSED, |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3046 int *c_extrap, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3047 int *c_finalp, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3048 char_u *extra, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3049 char_u **pp_extra, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3050 int *n_extrap, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3051 int *char_attrp) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3052 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3053 int text_sign; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3054 # ifdef FEAT_SIGN_ICONS |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3055 int icon_sign; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3056 # endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3057 |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3058 // 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
|
3059 *c_extrap = ' '; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3060 *c_finalp = NUL; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3061 if (nrcol) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3062 *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
|
3063 else |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3064 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3065 *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
|
3066 *n_extrap = 2; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3067 } |
|
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 if (row == startrow |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3070 #ifdef FEAT_DIFF |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3071 + filler_lines && filler_todo <= 0 |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3072 #endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3073 ) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3074 { |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3075 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
|
3076 # ifdef FEAT_SIGN_ICONS |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3077 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
|
3078 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
|
3079 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3080 // 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
|
3081 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
|
3082 { |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3083 *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
|
3084 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
|
3085 *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
|
3086 *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
|
3087 } |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3088 else |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3089 *c_extrap = SIGN_BYTE; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3090 # ifdef FEAT_NETBEANS_INTG |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3091 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
|
3092 { |
|
17141
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3093 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
|
3094 { |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3095 *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
|
3096 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
|
3097 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
|
3098 *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
|
3099 *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
|
3100 } |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3101 else |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3102 *c_extrap = MULTISIGN_BYTE; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3103 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3104 # 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
|
3105 *c_finalp = NUL; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3106 *char_attrp = icon_sign; |
|
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 else |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3109 # endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3110 if (text_sign != 0) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3111 { |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3112 *pp_extra = sattr->text; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3113 if (*pp_extra != NULL) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3114 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3115 if (nrcol) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3116 { |
|
17427
45c1dc353321
patch 8.1.1712: signs in number column cause text to be misaligned
Bram Moolenaar <Bram@vim.org>
parents:
17286
diff
changeset
|
3117 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
|
3118 |
|
45c1dc353321
patch 8.1.1712: signs in number column cause text to be misaligned
Bram Moolenaar <Bram@vim.org>
parents:
17286
diff
changeset
|
3119 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
|
3120 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
|
3121 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
|
3122 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
|
3123 STRCAT(extra, " "); |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3124 *pp_extra = extra; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3125 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3126 *c_extrap = NUL; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3127 *c_finalp = NUL; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3128 *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
|
3129 } |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3130 *char_attrp = sattr->texthl; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3131 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3132 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3133 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3134 #endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3135 |
| 7 | 3136 /* |
| 3137 * Display line "lnum" of window 'wp' on the screen. | |
| 3138 * Start at row "startrow", stop when "endrow" is reached. | |
| 3139 * wp->w_virtcol needs to be valid. | |
| 3140 * | |
| 3141 * Return the number of last row the line occupies. | |
| 3142 */ | |
| 3143 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3144 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3145 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3146 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3147 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3148 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
|
3149 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
|
3150 int number_only) // only update the number column |
| 7 | 3151 { |
|
17229
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3152 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
|
3153 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
|
3154 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
|
3155 long vcol = 0; // virtual column (for tabs) |
| 6503 | 3156 #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
|
3157 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
|
3158 #endif |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3159 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
|
3160 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
|
3161 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
|
3162 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
|
3163 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
|
3164 |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3165 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
|
3166 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
|
3167 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
|
3168 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
|
3169 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
|
3170 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
|
3171 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
|
3172 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
|
3173 // 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
|
3174 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
|
3175 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
|
3176 |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3177 // saved "extra" items for when draw_state becomes WL_LINE (again) |
| 7 | 3178 int saved_n_extra = 0; |
| 3179 char_u *saved_p_extra = NULL; | |
| 3180 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
|
3181 int saved_c_final = 0; |
| 7 | 3182 int saved_char_attr = 0; |
| 3183 | |
| 3184 int n_attr = 0; /* chars with special attr */ | |
| 3185 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3186 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3187 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3188 | |
| 3189 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3190 | |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3191 int fromcol = -10; // start of inverting |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3192 int tocol = MAXCOL; // end of inverting |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3193 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
|
3194 int noinvcur = FALSE; // don't invert the cursor |
| 7 | 3195 pos_T *top, *bot; |
| 1813 | 3196 int lnum_in_visual_area = FALSE; |
| 7 | 3197 pos_T pos; |
| 3198 long v; | |
| 3199 | |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3200 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
|
3201 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
|
3202 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
|
3203 // 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
|
3204 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
|
3205 // highlighting |
|
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 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
|
3207 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
|
3208 // 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
|
3209 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
|
3210 int search_attr = 0; // attributes desired by 'hlsearch' |
| 7 | 3211 #ifdef FEAT_SYN_HL |
| 743 | 3212 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3213 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3214 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3215 int save_did_emsg; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3216 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3217 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3218 #endif |
|
17438
967e2ee9b656
patch 8.1.1717: last char in menu popup window highlighted
Bram Moolenaar <Bram@vim.org>
parents:
17427
diff
changeset
|
3219 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
|
3220 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3221 int text_prop_count; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3222 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
|
3223 textprop_T *text_props = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3224 int *text_prop_idxs = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3225 int text_props_active = 0; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3226 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
|
3227 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
|
3228 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
|
3229 #endif |
| 743 | 3230 #ifdef FEAT_SPELL |
| 221 | 3231 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3232 # define SPWORDLEN 150 |
| 3233 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3234 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3235 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3236 starts */ |
| 221 | 3237 int spell_attr = 0; /* attributes desired by spelling */ |
| 3238 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3239 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3240 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3241 * there are no spell errors */ |
| 386 | 3242 static int cap_col = -1; /* column to check for Cap word */ |
| 3243 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3244 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3245 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3246 int extra_check = 0; // has extra highlighting |
| 7 | 3247 int multi_attr = 0; /* attributes desired by multibyte */ |
| 3248 int mb_l = 1; /* multi-byte byte length */ | |
| 3249 int mb_c = 0; /* decoded multi-byte character */ | |
| 3250 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3251 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
|
3252 #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
|
3253 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
|
3254 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
|
3255 #endif |
| 7 | 3256 #ifdef FEAT_DIFF |
| 534 | 3257 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3258 int change_start = MAXCOL; /* first col of changed area */ |
| 3259 int change_end = -1; /* last col of changed area */ | |
| 3260 #endif | |
| 3261 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3262 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3263 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
|
3264 chars */ |
| 7 | 3265 #endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3266 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
| 910 | 3267 || 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
|
3268 # define LINE_ATTR |
|
2342d5e500ec
patch 8.1.1635: warnings for unused variables in small version
Bram Moolenaar <Bram@vim.org>
parents:
17264
diff
changeset
|
3269 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
|
3270 #endif |
|
2342d5e500ec
patch 8.1.1635: warnings for unused variables in small version
Bram Moolenaar <Bram@vim.org>
parents:
17264
diff
changeset
|
3271 #ifdef FEAT_SIGNS |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3272 int sign_present = FALSE; |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3273 sign_attrs_T sattr; |
| 7 | 3274 #endif |
| 3275 #ifdef FEAT_ARABIC | |
| 3276 int prev_c = 0; /* previous Arabic character */ | |
| 3277 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3278 #endif | |
| 910 | 3279 #if defined(LINE_ATTR) |
| 867 | 3280 int did_line_attr = 0; |
| 3281 #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
|
3282 #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
|
3283 int get_term_attr = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3284 #endif |
| 7 | 3285 |
| 3286 /* draw_state: items that are drawn in sequence: */ | |
| 3287 #define WL_START 0 /* nothing done yet */ | |
| 3288 #ifdef FEAT_CMDWIN | |
| 3289 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3290 #else | |
| 3291 # define WL_CMDLINE WL_START | |
| 3292 #endif | |
| 3293 #ifdef FEAT_FOLDING | |
| 3294 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3295 #else | |
| 3296 # define WL_FOLD WL_CMDLINE | |
| 3297 #endif | |
| 3298 #ifdef FEAT_SIGNS | |
| 3299 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3300 #else | |
| 3301 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3302 #endif | |
| 3303 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3304 #ifdef FEAT_LINEBREAK |
| 3305 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3306 #else | |
| 3307 # define WL_BRI WL_NR | |
| 3308 #endif | |
| 7 | 3309 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3310 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3311 #else |
| 5995 | 3312 # define WL_SBR WL_BRI |
| 7 | 3313 #endif |
| 3314 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3315 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3316 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3317 int feedback_col = 0; |
| 3318 int feedback_old_attr = -1; | |
| 3319 #endif | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3320 int screen_line_flags = 0; |
| 7 | 3321 |
|
17498
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
3322 #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
|
3323 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
|
3324 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3325 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3326 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
|
3327 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
|
3328 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
|
3329 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
|
3330 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
|
3331 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
|
3332 // wrapping |
|
523591cf1b70
patch 8.1.1744: build error without the conceal feature
Bram Moolenaar <Bram@vim.org>
parents:
17490
diff
changeset
|
3333 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
|
3334 int did_wcol = FALSE; |
| 6520 | 3335 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3336 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3337 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3338 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3339 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3340 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3341 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3342 col -= boguscols; \ |
| 6520 | 3343 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3344 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3345 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3346 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3347 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3348 #endif |
| 7 | 3349 |
| 3350 if (startrow > endrow) /* past the end already! */ | |
| 3351 return startrow; | |
| 3352 | |
| 3353 row = startrow; | |
| 3354 screen_row = row + W_WINROW(wp); | |
| 3355 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3356 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
|
3357 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3358 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3359 * 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
|
3360 * 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
|
3361 */ |
| 7 | 3362 #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
|
3363 extra_check = wp->w_p_lbr; |
| 7 | 3364 #endif |
| 3365 #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
|
3366 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
|
3367 # 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
|
3368 && !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
|
3369 # endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3370 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3371 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3372 /* 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
|
3373 * 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
|
3374 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
|
3375 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
|
3376 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
|
3377 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
|
3378 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
|
3379 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3380 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3381 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
|
3382 #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
|
3383 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
|
3384 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3385 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3386 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
|
3387 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
|
3388 } |
|
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 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3391 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3392 /* 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
|
3393 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
|
3394 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
|
3395 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3396 #endif |
| 3397 | |
|
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
|
3398 #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
|
3399 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
|
3400 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3401 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
|
3402 get_term_attr = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3403 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
|
3404 } |
|
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
|
3405 #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
|
3406 |
| 743 | 3407 #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
|
3408 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
|
3409 && *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
|
3410 && 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
|
3411 && *(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
|
3412 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3413 /* 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
|
3414 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
|
3415 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
|
3416 |
|
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
|
3417 /* 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
|
3418 * 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
|
3419 * 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
|
3420 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
|
3421 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
|
3422 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3423 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
|
3424 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
|
3425 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3426 |
|
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
|
3427 /* 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
|
3428 * 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
|
3429 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
|
3430 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
|
3431 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
|
3432 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3433 /* 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
|
3434 * 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
|
3435 * 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
|
3436 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
|
3437 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
|
3438 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
|
3439 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
|
3440 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
|
3441 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3442 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3443 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3444 /* |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3445 * 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
|
3446 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3447 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
|
3448 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3449 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
|
3450 { |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3451 // 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
|
3452 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
|
3453 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
|
3454 } |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3455 else |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3456 { |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3457 // 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
|
3458 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
|
3459 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
|
3460 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3461 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
|
3462 if (VIsual_mode == Ctrl_V) |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3463 { |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3464 // 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
|
3465 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
|
3466 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3467 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
|
3468 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
|
3469 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3470 } |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3471 else |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3472 { |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3473 // 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
|
3474 if (lnum > top->lnum && lnum <= bot->lnum) |
| 7 | 3475 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
|
3476 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
|
3477 { |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3478 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
|
3479 fromcol = 0; |
| 7 | 3480 else |
| 3481 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3482 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
|
3483 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
|
3484 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
|
3485 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3486 } |
|
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 (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
|
3488 { |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
3489 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
|
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 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
|
3492 tocol = MAXCOL; |
| 7 | 3493 } |
|
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 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
|
3495 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
|
3496 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3497 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3498 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
|
3499 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
|
3500 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
|
3501 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3502 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3503 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
|
3504 ++tocol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3505 } |
|
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 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3508 } |
|
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 /* 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
|
3511 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
|
3512 #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
|
3513 && !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
|
3514 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3515 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3516 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
|
3517 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3518 /* 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
|
3519 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
|
3520 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3521 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3522 vi_attr = HL_ATTR(HLF_V); |
| 7 | 3523 #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
|
3524 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
|
3525 && 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
|
3526 || (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
|
3527 && clip_isautosel_plus())) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3528 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
|
3529 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3530 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3531 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3532 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3533 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3534 * 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
|
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 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
|
3537 && 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
|
3538 && 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
|
3539 && 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
|
3540 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3541 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
|
3542 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
|
3543 (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
|
3544 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3545 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
|
3546 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
|
3547 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3548 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
|
3549 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
|
3550 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
|
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 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3553 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
|
3554 /* 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
|
3555 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
|
3556 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
|
3557 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3558 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
|
3559 } |
| 7 | 3560 } |
| 3561 | |
| 3562 #ifdef FEAT_DIFF | |
| 3563 filler_lines = diff_check(wp, lnum); | |
| 3564 if (filler_lines < 0) | |
| 3565 { | |
| 3566 if (filler_lines == -1) | |
| 3567 { | |
| 3568 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3569 diff_hlf = HLF_ADD; /* added line */ | |
| 3570 else if (change_start == 0) | |
| 3571 diff_hlf = HLF_TXD; /* changed text */ | |
| 3572 else | |
| 3573 diff_hlf = HLF_CHD; /* changed line */ | |
| 3574 } | |
| 3575 else | |
| 3576 diff_hlf = HLF_ADD; /* added line */ | |
| 3577 filler_lines = 0; | |
| 3578 area_highlighting = TRUE; | |
| 3579 } | |
| 3580 if (lnum == wp->w_topline) | |
| 3581 filler_lines = wp->w_topfill; | |
| 3582 filler_todo = filler_lines; | |
| 3583 #endif | |
| 3584 | |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3585 #ifdef FEAT_SIGNS |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3586 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
|
3587 #endif |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3588 |
| 7 | 3589 #ifdef LINE_ATTR |
| 3590 # ifdef FEAT_SIGNS | |
| 3591 /* 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
|
3592 if (sign_present) |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3593 line_attr = sattr.linehl; |
| 7 | 3594 # endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3595 # if defined(FEAT_QUICKFIX) |
| 7 | 3596 /* Highlight the current line in the quickfix window. */ |
| 644 | 3597 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
|
3598 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3599 # endif |
| 3600 if (line_attr != 0) | |
| 3601 area_highlighting = TRUE; | |
| 3602 #endif | |
| 3603 | |
| 3604 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3605 ptr = line; | |
| 3606 | |
| 743 | 3607 #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
|
3608 if (has_spell && !number_only) |
| 348 | 3609 { |
| 386 | 3610 /* For checking first word with a capital skip white space. */ |
| 3611 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
|
3612 cap_col = getwhitecols(line); |
| 386 | 3613 |
| 348 | 3614 /* To be able to spell-check over line boundaries copy the end of the |
| 3615 * current line into nextline[]. Above the start of the next line was | |
| 3616 * copied to nextline[SPWORDLEN]. */ | |
| 3617 if (nextline[SPWORDLEN] == NUL) | |
| 3618 { | |
| 3619 /* No next line or it is empty. */ | |
| 3620 nextlinecol = MAXCOL; | |
| 3621 nextline_idx = 0; | |
| 3622 } | |
| 3623 else | |
| 3624 { | |
| 835 | 3625 v = (long)STRLEN(line); |
| 348 | 3626 if (v < SPWORDLEN) |
| 3627 { | |
| 3628 /* Short line, use it completely and append the start of the | |
| 3629 * next line. */ | |
| 3630 nextlinecol = 0; | |
| 3631 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3632 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3633 nextline_idx = v + 1; |
| 3634 } | |
| 3635 else | |
| 3636 { | |
| 3637 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3638 nextlinecol = v - SPWORDLEN; | |
| 3639 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3640 nextline_idx = SPWORDLEN + 1; | |
| 3641 } | |
| 3642 } | |
| 3643 } | |
| 3644 #endif | |
| 3645 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3646 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3647 { |
|
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
|
3648 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
|
3649 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3650 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3651 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3652 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3653 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
|
3654 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
|
3655 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3656 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3657 } |
| 7 | 3658 } |
| 3659 | |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3660 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
|
3661 if (wcr_attr != 0) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3662 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3663 win_attr = wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3664 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3665 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3666 #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
|
3667 if (WIN_IS_POPUP(wp)) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3668 screen_line_flags |= SLF_POPUP; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3669 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3670 |
| 7 | 3671 /* |
| 3672 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3673 * first character to be displayed. | |
| 3674 */ | |
| 3675 if (wp->w_p_wrap) | |
| 3676 v = wp->w_skipcol; | |
| 3677 else | |
| 3678 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
|
3679 if (v > 0 && !number_only) |
| 7 | 3680 { |
| 3681 char_u *prev_ptr = ptr; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3682 |
| 7 | 3683 while (vcol < v && *ptr != NUL) |
| 3684 { | |
| 5995 | 3685 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3686 vcol += c; |
| 3687 prev_ptr = ptr; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3688 MB_PTR_ADV(ptr); |
| 7 | 3689 } |
| 3690 | |
| 1984 | 3691 /* When: |
| 3692 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3693 * - 'colorcolumn' is set, or |
| 1984 | 3694 * - 'virtualedit' is set, or |
| 3695 * - the visual mode is active, | |
| 3696 * the end of the line may be before the start of the displayed part. | |
| 3697 */ | |
| 3698 if (vcol < v && ( | |
| 5735 | 3699 #ifdef FEAT_SYN_HL |
| 3700 wp->w_p_cuc || draw_color_col || | |
| 3701 #endif | |
| 3702 virtual_active() || | |
| 3703 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 7 | 3704 vcol = v; |
| 3705 | |
| 3706 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3707 * that character but skip the first few screen characters. */ | |
| 3708 if (vcol > v) | |
| 3709 { | |
| 3710 vcol -= c; | |
| 3711 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
|
3712 /* 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
|
3713 * Except for a TAB. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3714 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
|
3715 n_skip = v - vcol; |
| 7 | 3716 } |
| 3717 | |
| 3718 /* | |
| 3719 * Adjust for when the inverted text is before the screen, | |
| 3720 * and when the start of the inverted text is before the screen. | |
| 3721 */ | |
| 3722 if (tocol <= vcol) | |
| 3723 fromcol = 0; | |
| 3724 else if (fromcol >= 0 && fromcol < vcol) | |
| 3725 fromcol = vcol; | |
| 3726 | |
| 3727 #ifdef FEAT_LINEBREAK | |
| 3728 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3729 if (wp->w_p_wrap) | |
| 3730 need_showbreak = TRUE; | |
| 3731 #endif | |
| 743 | 3732 #ifdef FEAT_SPELL |
| 499 | 3733 /* When spell checking a word we need to figure out the start of the |
| 3734 * word and if it's badly spelled or not. */ | |
| 3735 if (has_spell) | |
| 3736 { | |
| 3737 int len; | |
| 1536 | 3738 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3739 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3740 |
| 3741 pos = wp->w_cursor; | |
| 3742 wp->w_cursor.lnum = lnum; | |
| 1536 | 3743 wp->w_cursor.col = linecol; |
| 534 | 3744 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3745 |
| 3746 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3747 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3748 ptr = line + linecol; | |
| 3749 | |
| 530 | 3750 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3751 { |
| 3752 /* no bad word found at line start, don't check until end of a | |
| 3753 * word */ | |
| 534 | 3754 spell_hlf = HLF_COUNT; |
| 3572 | 3755 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3756 } |
| 3757 else | |
| 534 | 3758 { |
| 499 | 3759 /* bad word found, use attributes until end of word */ |
| 3760 word_end = wp->w_cursor.col + len + 1; | |
| 3761 | |
| 534 | 3762 /* Turn index into actual attributes. */ |
| 3763 if (spell_hlf != HLF_COUNT) | |
| 3764 spell_attr = highlight_attr[spell_hlf]; | |
| 3765 } | |
| 499 | 3766 wp->w_cursor = pos; |
| 501 | 3767 |
| 743 | 3768 # ifdef FEAT_SYN_HL |
| 501 | 3769 /* Need to restart syntax highlighting for this line. */ |
| 3770 if (has_syntax) | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3771 syntax_start(wp, lnum); |
| 743 | 3772 # endif |
| 499 | 3773 } |
| 3774 #endif | |
| 7 | 3775 } |
| 3776 | |
| 3777 /* | |
| 3778 * Correct highlighting for cursor that can't be disabled. | |
| 3779 * Avoids having to check this for each character. | |
| 3780 */ | |
| 3781 if (fromcol >= 0) | |
| 3782 { | |
| 3783 if (noinvcur) | |
| 3784 { | |
| 3785 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3786 { | |
| 3787 /* highlighting starts at cursor, let it start just after the | |
| 3788 * cursor */ | |
| 3789 fromcol_prev = fromcol; | |
| 3790 fromcol = -1; | |
| 3791 } | |
| 3792 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3793 /* restart highlighting after the cursor */ | |
| 3794 fromcol_prev = wp->w_virtcol; | |
| 3795 } | |
| 3796 if (fromcol >= tocol) | |
| 3797 fromcol = -1; | |
| 3798 } | |
| 3799 | |
| 3800 #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
|
3801 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
|
3802 { |
| 5979 | 3803 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
|
3804 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
|
3805 &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
|
3806 ptr = line + v; // "line" may have been updated |
| 7 | 3807 } |
| 3808 #endif | |
| 3809 | |
| 743 | 3810 #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
|
3811 // 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
|
3812 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
|
3813 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3814 // 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
|
3815 // not clear what is selected then. Do update w_last_cursorline. |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3816 if (!(wp == curwin && VIsual_active)) |
|
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 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
|
3819 area_highlighting = TRUE; |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3820 } |
|
15683
adc6442118b8
patch 8.1.0849: cursorline highlight is not always updated
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
3821 wp->w_last_cursorline = wp->w_cursor.lnum; |
| 743 | 3822 } |
| 3823 #endif | |
| 3824 | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3825 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3826 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3827 char_u *prop_start; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3828 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3829 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
|
3830 &prop_start, FALSE); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3831 if (text_prop_count > 0) |
|
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 // 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
|
3834 // 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
|
3835 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
|
3836 if (text_props != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3837 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
|
3838 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
|
3839 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3840 // 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
|
3841 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
|
3842 area_highlighting = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3843 extra_check = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3844 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3845 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3846 #endif |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3847 |
| 504 | 3848 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3849 col = 0; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3850 |
| 7 | 3851 #ifdef FEAT_RIGHTLEFT |
| 3852 if (wp->w_p_rl) | |
| 3853 { | |
| 3854 /* Rightleft window: process the text in the normal direction, but put | |
| 3855 * it in current_ScreenLine[] from right to left. Start at the | |
| 3856 * 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
|
3857 col = wp->w_width - 1; |
| 7 | 3858 off += col; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3859 screen_line_flags |= SLF_RIGHTLEFT; |
| 7 | 3860 } |
| 3861 #endif | |
| 3862 | |
| 3863 /* | |
| 3864 * Repeat for the whole displayed line. | |
| 3865 */ | |
| 3866 for (;;) | |
| 3867 { | |
|
17498
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
3868 #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
|
3869 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
|
3870 #endif |
| 6947 | 3871 #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
|
3872 int did_decrement_ptr = FALSE; |
| 6947 | 3873 #endif |
| 7 | 3874 /* Skip this quickly when working on the text. */ |
| 3875 if (draw_state != WL_LINE) | |
| 3876 { | |
| 3877 #ifdef FEAT_CMDWIN | |
| 3878 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3879 { | |
| 3880 draw_state = WL_CMDLINE; | |
| 3881 if (cmdwin_type != 0 && wp == curwin) | |
| 3882 { | |
| 3883 /* Draw the cmdline character. */ | |
| 3884 n_extra = 1; | |
| 1340 | 3885 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
|
3886 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
|
3887 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_AT)); |
| 7 | 3888 } |
| 3889 } | |
| 3890 #endif | |
| 3891 | |
| 3892 #ifdef FEAT_FOLDING | |
| 3893 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3894 { | |
| 6553 | 3895 int fdc = compute_foldcolumn(wp, 0); |
| 3896 | |
| 7 | 3897 draw_state = WL_FOLD; |
| 6553 | 3898 if (fdc > 0) |
| 7 | 3899 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3900 /* 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
|
3901 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3902 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3903 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3904 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3905 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3906 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3907 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
|
3908 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3909 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3910 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3911 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
|
3912 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
|
3913 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
|
3914 } |
| 7 | 3915 } |
| 3916 } | |
| 3917 #endif | |
| 3918 | |
| 3919 #ifdef FEAT_SIGNS | |
| 3920 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3921 { | |
| 3922 draw_state = WL_SIGN; | |
| 3923 /* Show the sign column when there are any signs in this | |
| 3924 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3925 if (signcolumn_on(wp)) |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3926 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
|
3927 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
|
3928 &c_final, extra, &p_extra, &n_extra, &char_attr); |
| 7 | 3929 } |
| 3930 #endif | |
| 3931 | |
| 3932 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3933 { | |
| 3934 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3935 /* 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
|
3936 * 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
|
3937 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3938 && (row == startrow |
| 3939 #ifdef FEAT_DIFF | |
| 3940 + filler_lines | |
| 3941 #endif | |
| 3942 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3943 { | |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3944 #ifdef FEAT_SIGNS |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3945 // 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
|
3946 // 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
|
3947 // number. |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3948 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
|
3949 && sign_present) |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3950 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
|
3951 row, startrow, filler_lines, filler_todo, |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3952 &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
|
3953 &char_attr); |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3954 else |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3955 #endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3956 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3957 /* 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
|
3958 if (row == startrow |
| 7 | 3959 #ifdef FEAT_DIFF |
| 3960 + filler_lines | |
| 3961 #endif | |
| 3962 ) | |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3963 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3964 long num; |
| 4065 | 3965 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3966 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3967 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
|
3968 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3969 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3970 else |
| 4065 | 3971 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3972 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3973 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
|
3974 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3975 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3976 /* 'number' + 'relativenumber' */ |
| 4065 | 3977 num = lnum; |
| 3978 fmt = "%-*ld "; | |
| 3979 } | |
| 3980 } | |
| 3981 | |
| 3982 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3983 number_width(wp), num); |
| 7 | 3984 if (wp->w_skipcol > 0) |
| 3985 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3986 *p_extra = '-'; | |
| 3987 #ifdef FEAT_RIGHTLEFT | |
| 3988 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
|
3989 { |
|
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
|
3990 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
|
3991 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
|
3992 |
|
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 // 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
|
3994 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
|
3995 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
|
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 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
|
3998 *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
|
3999 *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
|
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 } |
| 7 | 4002 #endif |
| 4003 p_extra = extra; | |
| 4004 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
|
4005 c_final = NUL; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4006 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4007 else |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4008 { |
| 7 | 4009 c_extra = ' '; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4010 c_final = NUL; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4011 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4012 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
|
4013 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_N)); |
| 743 | 4014 #ifdef FEAT_SYN_HL |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4015 /* 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
|
4016 * the current line differently. |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4017 * 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
|
4018 * when CursorLineNr isn't set? */ |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4019 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 4020 && 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
|
4021 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_CLN)); |
| 743 | 4022 #endif |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4023 } |
| 7 | 4024 } |
| 4025 } | |
| 4026 | |
| 5995 | 4027 #ifdef FEAT_LINEBREAK |
| 4028 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 4029 && n_extra == 0 && *p_sbr != NUL) | |
| 4030 /* draw indent after showbreak value */ | |
| 4031 draw_state = WL_BRI; | |
| 4032 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 4033 /* After the showbreak, draw the breakindent */ | |
| 4034 draw_state = WL_BRI - 1; | |
| 4035 | |
| 4036 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 4037 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 4038 { | |
| 4039 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4040 /* 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
|
4041 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
|
4042 && (row != startrow || need_showbreak) |
| 5995 | 4043 # ifdef FEAT_DIFF |
| 4044 && filler_lines == 0 | |
| 6834 | 4045 # endif |
| 5995 | 4046 ) |
| 4047 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4048 char_attr = 0; |
| 6834 | 4049 # ifdef FEAT_DIFF |
| 5995 | 4050 if (diff_hlf != (hlf_T)0) |
| 6106 | 4051 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4052 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 4053 # ifdef FEAT_SYN_HL |
| 6106 | 4054 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4055 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
|
4056 HL_ATTR(HLF_CUL)); |
| 6834 | 4057 # endif |
| 6106 | 4058 } |
| 6834 | 4059 # endif |
| 6028 | 4060 p_extra = NULL; |
| 5995 | 4061 c_extra = ' '; |
| 4062 n_extra = get_breakindent_win(wp, | |
| 4063 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 4064 /* Correct end of highlighted area for 'breakindent', | |
| 4065 * required when 'linebreak' is also set. */ | |
| 4066 if (tocol == vcol) | |
| 4067 tocol += n_extra; | |
| 4068 } | |
| 4069 } | |
| 4070 #endif | |
| 4071 | |
| 7 | 4072 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 4073 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 4074 { | |
| 4075 draw_state = WL_SBR; | |
| 4076 # ifdef FEAT_DIFF | |
| 4077 if (filler_todo > 0) | |
| 4078 { | |
| 4079 /* Draw "deleted" diff line(s). */ | |
| 4080 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
|
4081 { |
| 7 | 4082 c_extra = '-'; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4083 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4084 } |
| 7 | 4085 else |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4086 { |
| 7 | 4087 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
|
4088 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4089 } |
| 7 | 4090 # ifdef FEAT_RIGHTLEFT |
| 4091 if (wp->w_p_rl) | |
| 4092 n_extra = col + 1; | |
| 4093 else | |
| 4094 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4095 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
|
4096 char_attr = HL_ATTR(HLF_DED); |
| 7 | 4097 } |
| 4098 # endif | |
| 4099 # ifdef FEAT_LINEBREAK | |
| 4100 if (*p_sbr != NUL && need_showbreak) | |
| 4101 { | |
| 4102 /* Draw 'showbreak' at the start of each broken line. */ | |
| 4103 p_extra = p_sbr; | |
| 4104 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
|
4105 c_final = NUL; |
| 7 | 4106 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
|
4107 char_attr = HL_ATTR(HLF_AT); |
| 7 | 4108 need_showbreak = FALSE; |
| 6503 | 4109 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 4110 /* Correct end of highlighted area for 'showbreak', |
| 4111 * required when 'linebreak' is also set. */ | |
| 4112 if (tocol == vcol) | |
| 4113 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4114 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4115 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4116 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 4117 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
|
4118 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4119 #endif |
| 7 | 4120 } |
| 4121 # endif | |
| 4122 } | |
| 4123 #endif | |
| 4124 | |
| 4125 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4126 { | |
| 4127 draw_state = WL_LINE; | |
| 4128 if (saved_n_extra) | |
| 4129 { | |
| 4130 /* Continue item from end of wrapped line. */ | |
| 4131 n_extra = saved_n_extra; | |
| 4132 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
|
4133 c_final = saved_c_final; |
| 7 | 4134 p_extra = saved_p_extra; |
| 4135 char_attr = saved_char_attr; | |
| 4136 } | |
| 4137 else | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4138 char_attr = win_attr; |
| 7 | 4139 } |
| 4140 } | |
| 4141 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4142 // 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
|
4143 // 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
|
4144 // 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
|
4145 if ((dollar_vcol >= 0 && wp == curwin |
| 819 | 4146 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4147 #ifdef FEAT_DIFF |
| 4148 && filler_todo <= 0 | |
| 4149 #endif | |
| 4150 ) | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4151 || (number_only && draw_state > WL_NR)) |
| 7 | 4152 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4153 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
|
4154 screen_line_flags); |
| 819 | 4155 /* Pretend we have finished updating the window. Except when |
| 4156 * 'cursorcolumn' is set. */ | |
| 4157 #ifdef FEAT_SYN_HL | |
| 4158 if (wp->w_p_cuc) | |
| 4159 row = wp->w_cline_row + wp->w_cline_height; | |
| 4160 else | |
| 4161 #endif | |
| 4162 row = wp->w_height; | |
| 7 | 4163 break; |
| 4164 } | |
| 4165 | |
|
15351
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4166 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
|
4167 #ifdef FEAT_SPELL |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4168 || has_spell |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4169 #endif |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4170 )) |
| 7 | 4171 { |
| 4172 /* handle Visual or match highlighting in this line */ | |
| 4173 if (vcol == fromcol | |
| 4174 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4175 && (*mb_ptr2cells)(ptr) > 1) | |
| 4176 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4177 && vcol_prev < vcol /* not at margin */ |
| 7 | 4178 && vcol < tocol)) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4179 area_attr = vi_attr; /* start highlighting */ |
| 7 | 4180 else if (area_attr != 0 |
| 4181 && (vcol == tocol | |
| 4182 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4183 area_attr = 0; /* stop highlighting */ | |
| 4184 | |
| 4185 #ifdef FEAT_SEARCH_EXTRA | |
| 4186 if (!n_extra) | |
| 4187 { | |
| 4188 /* | |
|
17490
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
4189 * Check for start/end of 'hlsearch' and other matches. |
| 7 | 4190 * After end, check for start/end of next match. |
| 4191 * When another match, have to check for start again. | |
| 4192 */ | |
| 36 | 4193 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
|
4194 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
|
4195 &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
|
4196 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
|
4197 ptr = line + v; // "line" may have been changed |
| 7 | 4198 } |
| 4199 #endif | |
| 4200 | |
| 4201 #ifdef FEAT_DIFF | |
| 674 | 4202 if (diff_hlf != (hlf_T)0) |
| 7 | 4203 { |
| 1295 | 4204 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4205 && n_extra == 0) | |
| 7 | 4206 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4207 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4208 && n_extra == 0) | |
| 7 | 4209 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
|
4210 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4211 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4212 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4213 } |
| 4214 #endif | |
| 4215 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4216 #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
|
4217 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
|
4218 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4219 int pi; |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4220 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
|
4221 |
|
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
|
4222 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
|
4223 --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
|
4224 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4225 // 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
|
4226 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
|
4227 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4228 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
|
4229 |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4230 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
|
4231 + 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
|
4232 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4233 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
|
4234 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
|
4235 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
|
4236 sizeof(int) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4237 * (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
|
4238 --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
|
4239 --pi; |
|
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 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4242 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4243 // 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
|
4244 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
|
4245 && 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
|
4246 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
|
4247 |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4248 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
|
4249 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
|
4250 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
|
4251 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4252 // 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
|
4253 // 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
|
4254 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
|
4255 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
|
4256 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
|
4257 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
|
4258 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4259 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
|
4260 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4261 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
|
4262 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
|
4263 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
|
4264 |
|
17208
13d0753511fe
patch 8.1.1603: crash when using unknown highlighting in text property
Bram Moolenaar <Bram@vim.org>
parents:
17196
diff
changeset
|
4265 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
|
4266 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4267 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
|
4268 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4269 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
|
4270 text_prop_attr = |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4271 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
|
4272 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
|
4273 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4274 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4275 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4276 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4277 #endif |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4278 |
| 674 | 4279 /* Decide which of the highlight attributes to use. */ |
| 4280 attr_pri = TRUE; | |
| 6717 | 4281 #ifdef LINE_ATTR |
| 674 | 4282 if (area_attr != 0) |
| 6717 | 4283 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4284 else if (search_attr != 0) |
| 6717 | 4285 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
|
4286 # ifdef FEAT_TEXT_PROP |
|
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4287 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
|
4288 { |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4289 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
|
4290 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
|
4291 } |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4292 # endif |
| 674 | 4293 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) |
| 1842 | 4294 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4295 || vcol >= tocol)) | |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4296 // 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
|
4297 // (area_attr may be 0 when "noinvcur" is set). |
| 674 | 4298 char_attr = line_attr; |
| 6717 | 4299 #else |
| 4300 if (area_attr != 0) | |
| 4301 char_attr = area_attr; | |
| 4302 else if (search_attr != 0) | |
| 4303 char_attr = search_attr; | |
| 674 | 4304 #endif |
| 4305 else | |
| 4306 { | |
| 4307 attr_pri = FALSE; | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4308 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4309 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
|
4310 { |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4311 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
|
4312 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
|
4313 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
|
4314 else |
|
16811
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4315 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
|
4316 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
|
4317 } |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4318 else |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4319 #endif |
| 674 | 4320 #ifdef FEAT_SYN_HL |
| 4321 if (has_syntax) | |
| 4322 char_attr = syntax_attr; | |
| 4323 else | |
| 4324 #endif | |
| 4325 char_attr = 0; | |
| 4326 } | |
| 7 | 4327 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4328 if (char_attr == 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4329 char_attr = win_attr; |
| 7 | 4330 |
| 4331 /* | |
| 4332 * Get the next character to put on the screen. | |
| 4333 */ | |
| 4334 /* | |
| 1340 | 4335 * The "p_extra" points to the extra stuff that is inserted to |
| 4336 * represent special characters (non-printable stuff) and other | |
| 4337 * 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
|
4338 * If c_final is set, it will compulsorily be used at the end. |
| 1340 | 4339 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past |
| 4340 * "p_extra[n_extra]". | |
| 7 | 4341 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4342 */ | |
| 4343 if (n_extra > 0) | |
| 4344 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4345 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
|
4346 { |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4347 c = (n_extra == 1 && c_final != NUL) ? c_final : c_extra; |
| 7 | 4348 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
|
4349 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4350 { |
| 4351 mb_utf8 = TRUE; | |
| 714 | 4352 u8cc[0] = 0; |
| 819 | 4353 c = 0xc0; |
| 7 | 4354 } |
| 4355 else | |
| 4356 mb_utf8 = FALSE; | |
| 4357 } | |
| 4358 else | |
| 4359 { | |
| 4360 c = *p_extra; | |
| 4361 if (has_mbyte) | |
| 4362 { | |
| 4363 mb_c = c; | |
| 4364 if (enc_utf8) | |
| 4365 { | |
| 4366 /* If the UTF-8 character is more than one byte: | |
| 4367 * 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
|
4368 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4369 mb_utf8 = FALSE; |
| 4370 if (mb_l > n_extra) | |
| 4371 mb_l = 1; | |
| 4372 else if (mb_l > 1) | |
| 4373 { | |
| 714 | 4374 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4375 mb_utf8 = TRUE; |
| 819 | 4376 c = 0xc0; |
| 7 | 4377 } |
| 4378 } | |
| 4379 else | |
| 4380 { | |
| 4381 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4382 mb_l = MB_BYTE2LEN(c); | |
| 4383 if (mb_l >= n_extra) | |
| 4384 mb_l = 1; | |
| 4385 else if (mb_l > 1) | |
| 4386 mb_c = (c << 8) + p_extra[1]; | |
| 4387 } | |
| 504 | 4388 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4389 mb_l = 1; | |
| 4390 | |
| 7 | 4391 /* If a double-width char doesn't fit display a '>' in the |
| 4392 * last column. */ | |
| 504 | 4393 if (( |
| 7 | 4394 # ifdef FEAT_RIGHTLEFT |
| 4395 wp->w_p_rl ? (col <= 0) : | |
| 4396 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4397 (col >= wp->w_width - 1)) |
| 7 | 4398 && (*mb_char2cells)(mb_c) == 2) |
| 4399 { | |
| 4400 c = '>'; | |
| 4401 mb_c = c; | |
| 4402 mb_l = 1; | |
| 4403 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
|
4404 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4405 /* put the pointer back to output the double-width |
| 4406 * character at the start of the next line. */ | |
| 4407 ++n_extra; | |
| 4408 --p_extra; | |
| 4409 } | |
| 4410 else | |
| 4411 { | |
| 4412 n_extra -= mb_l - 1; | |
| 4413 p_extra += mb_l - 1; | |
| 4414 } | |
| 4415 } | |
| 4416 ++p_extra; | |
| 4417 } | |
| 4418 --n_extra; | |
| 4419 } | |
| 4420 else | |
| 4421 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4422 #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
|
4423 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4424 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4425 |
| 6026 | 4426 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
|
4427 VIM_CLEAR(p_extra_free); |
| 7 | 4428 /* |
| 4429 * Get a character from the line itself. | |
| 4430 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4431 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4432 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4433 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4434 #endif |
| 7 | 4435 if (has_mbyte) |
| 4436 { | |
| 4437 mb_c = c; | |
| 4438 if (enc_utf8) | |
| 4439 { | |
| 4440 /* If the UTF-8 character is more than one byte: Decode it | |
| 4441 * 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
|
4442 mb_l = utfc_ptr2len(ptr); |
| 7 | 4443 mb_utf8 = FALSE; |
| 4444 if (mb_l > 1) | |
| 4445 { | |
| 714 | 4446 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4447 /* Overlong encoded ASCII or ASCII with composing char |
| 4448 * is displayed normally, except a NUL. */ | |
| 4449 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
|
4450 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4451 c = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4452 #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
|
4453 c0 = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4454 #endif |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4455 } |
| 7 | 4456 mb_utf8 = TRUE; |
| 507 | 4457 |
| 4458 /* At start of the line we can have a composing char. | |
| 4459 * Draw it as a space with a composing char. */ | |
| 4460 if (utf_iscomposing(mb_c)) | |
| 4461 { | |
| 1326 | 4462 int i; |
| 4463 | |
| 714 | 4464 for (i = Screen_mco - 1; i > 0; --i) |
| 4465 u8cc[i] = u8cc[i - 1]; | |
| 4466 u8cc[0] = mb_c; | |
| 507 | 4467 mb_c = ' '; |
| 4468 } | |
| 7 | 4469 } |
| 4470 | |
| 4471 if ((mb_l == 1 && c >= 0x80) | |
| 4472 || (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
|
4473 || (mb_l > 1 && (!vim_isprintc(mb_c)))) |
| 7 | 4474 { |
| 4475 /* | |
| 4476 * Illegal UTF-8 byte: display as <xx>. | |
| 4477 * Non-BMP character : display as ? or fullwidth ?. | |
| 4478 */ | |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4479 transchar_hex(extra, mb_c); |
| 714 | 4480 # ifdef FEAT_RIGHTLEFT |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4481 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
|
4482 rl_mirror(extra); |
| 714 | 4483 # endif |
| 7 | 4484 p_extra = extra; |
| 4485 c = *p_extra; | |
| 4486 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4487 mb_utf8 = (c >= 0x80); | |
| 4488 n_extra = (int)STRLEN(p_extra); | |
| 4489 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
|
4490 c_final = NUL; |
| 7 | 4491 if (area_attr == 0 && search_attr == 0) |
| 4492 { | |
| 4493 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
|
4494 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4495 saved_attr2 = char_attr; /* save current attr */ |
| 4496 } | |
| 4497 } | |
| 4498 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4499 mb_l = 1; | |
| 4500 #ifdef FEAT_ARABIC | |
| 4501 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4502 { | |
| 4503 /* Do Arabic shaping. */ | |
| 714 | 4504 int pc, pc1, nc; |
| 4505 int pcc[MAX_MCO]; | |
| 7 | 4506 |
| 4507 /* The idea of what is the previous and next | |
| 4508 * character depends on 'rightleft'. */ | |
| 4509 if (wp->w_p_rl) | |
| 4510 { | |
| 4511 pc = prev_c; | |
| 4512 pc1 = prev_c1; | |
| 4513 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4514 prev_c1 = u8cc[0]; |
| 7 | 4515 } |
| 4516 else | |
| 4517 { | |
| 714 | 4518 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4519 nc = prev_c; |
| 714 | 4520 pc1 = pcc[0]; |
| 7 | 4521 } |
| 4522 prev_c = mb_c; | |
| 4523 | |
| 714 | 4524 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4525 } |
| 4526 else | |
| 4527 prev_c = mb_c; | |
| 4528 #endif | |
| 4529 } | |
| 4530 else /* enc_dbcs */ | |
| 4531 { | |
| 4532 mb_l = MB_BYTE2LEN(c); | |
| 4533 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4534 mb_l = 1; | |
| 4535 else if (mb_l > 1) | |
| 4536 { | |
| 4537 /* We assume a second byte below 32 is illegal. | |
| 4538 * Hopefully this is OK for all double-byte encodings! | |
| 4539 */ | |
| 4540 if (ptr[1] >= 32) | |
| 4541 mb_c = (c << 8) + ptr[1]; | |
| 4542 else | |
| 4543 { | |
| 4544 if (ptr[1] == NUL) | |
| 4545 { | |
| 4546 /* head byte at end of line */ | |
| 4547 mb_l = 1; | |
| 4548 transchar_nonprint(extra, c); | |
| 4549 } | |
| 4550 else | |
| 4551 { | |
| 4552 /* illegal tail byte */ | |
| 4553 mb_l = 2; | |
| 4554 STRCPY(extra, "XX"); | |
| 4555 } | |
| 4556 p_extra = extra; | |
| 4557 n_extra = (int)STRLEN(extra) - 1; | |
| 4558 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
|
4559 c_final = NUL; |
| 7 | 4560 c = *p_extra++; |
| 4561 if (area_attr == 0 && search_attr == 0) | |
| 4562 { | |
| 4563 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
|
4564 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4565 saved_attr2 = char_attr; /* save current attr */ |
| 4566 } | |
| 4567 mb_c = c; | |
| 4568 } | |
| 4569 } | |
| 4570 } | |
| 4571 /* If a double-width char doesn't fit display a '>' in the | |
| 4572 * last column; the character is displayed at the start of the | |
| 4573 * next line. */ | |
| 4574 if (( | |
| 4575 # ifdef FEAT_RIGHTLEFT | |
| 4576 wp->w_p_rl ? (col <= 0) : | |
| 4577 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4578 (col >= wp->w_width - 1)) |
| 7 | 4579 && (*mb_char2cells)(mb_c) == 2) |
| 4580 { | |
| 4581 c = '>'; | |
| 4582 mb_c = c; | |
| 4583 mb_utf8 = FALSE; | |
| 4584 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
|
4585 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
|
4586 // 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
|
4587 // displayed at the start of the next line. |
| 7 | 4588 --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
|
4589 #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
|
4590 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
|
4591 #endif |
| 7 | 4592 } |
| 4593 else if (*ptr != NUL) | |
| 4594 ptr += mb_l - 1; | |
| 4595 | |
| 4596 /* 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
|
4597 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4598 * 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
|
4599 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4600 { |
| 4601 n_extra = 1; | |
| 3586 | 4602 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
|
4603 c_final = NUL; |
| 7 | 4604 c = ' '; |
| 4605 if (area_attr == 0 && search_attr == 0) | |
| 4606 { | |
| 4607 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
|
4608 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4609 saved_attr2 = char_attr; /* save current attr */ |
| 4610 } | |
| 4611 mb_c = c; | |
| 4612 mb_utf8 = FALSE; | |
| 4613 mb_l = 1; | |
| 4614 } | |
| 4615 | |
| 4616 } | |
| 4617 ++ptr; | |
| 4618 | |
| 4619 if (extra_check) | |
| 4620 { | |
| 743 | 4621 #ifdef FEAT_SPELL |
| 221 | 4622 int can_spell = TRUE; |
| 743 | 4623 #endif |
| 4624 | |
|
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
|
4625 #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
|
4626 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
|
4627 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4628 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
|
4629 |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4630 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
|
4631 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
|
4632 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
|
4633 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
|
4634 } |
|
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 #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
|
4636 |
| 743 | 4637 #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
|
4638 // 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
|
4639 // (double-wide char that doesn't fit). |
| 221 | 4640 v = (long)(ptr - line); |
| 4641 if (has_syntax && v > 0) | |
| 7 | 4642 { |
| 4643 /* Get the syntax attribute for the character. If there | |
| 4644 * is an error, disable syntax highlighting. */ | |
| 4645 save_did_emsg = did_emsg; | |
| 4646 did_emsg = FALSE; | |
| 4647 | |
| 221 | 4648 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4649 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4650 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4651 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4652 NULL, FALSE); |
| 7 | 4653 |
| 4654 if (did_emsg) | |
| 482 | 4655 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4656 wp->w_s->b_syn_error = TRUE; |
| 482 | 4657 has_syntax = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4658 syntax_attr = 0; |
| 482 | 4659 } |
| 7 | 4660 else |
| 4661 did_emsg = save_did_emsg; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4662 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4663 // combine syntax attribute with 'wincolor' |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4664 if (win_attr != 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4665 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
|
4666 |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4667 #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
|
4668 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
|
4669 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4670 #endif |
| 7 | 4671 |
| 4672 /* Need to get the line again, a multi-line regexp may | |
| 4673 * have made it invalid. */ | |
| 4674 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4675 ptr = line + v; | |
| 4676 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4677 # 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
|
4678 // 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
|
4679 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
|
4680 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4681 { |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4682 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
|
4683 # 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
|
4684 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
|
4685 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4686 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
|
4687 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
|
4688 else |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4689 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
|
4690 } |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4691 # 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
|
4692 /* 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
|
4693 * 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
|
4694 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
|
4695 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
|
4696 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
|
4697 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
|
4698 # endif |
| 7 | 4699 } |
| 743 | 4700 #endif |
| 4701 | |
| 4702 #ifdef FEAT_SPELL | |
| 301 | 4703 /* Check spelling (unless at the end of the line). |
| 319 | 4704 * Only do this when there is no syntax highlighting, the |
| 4705 * @Spell cluster is not used or the current syntax item | |
| 4706 * contains the @Spell cluster. */ | |
| 348 | 4707 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4708 { |
| 230 | 4709 spell_attr = 0; |
| 743 | 4710 if (c != 0 && ( |
| 4711 # ifdef FEAT_SYN_HL | |
| 4712 !has_syntax || | |
| 4713 # endif | |
| 4714 can_spell)) | |
| 221 | 4715 { |
| 348 | 4716 char_u *prev_ptr, *p; |
| 4717 int len; | |
| 534 | 4718 hlf_T spell_hlf = HLF_COUNT; |
| 336 | 4719 if (has_mbyte) |
| 4720 { | |
| 4721 prev_ptr = ptr - mb_l; | |
| 4722 v -= mb_l - 1; | |
| 4723 } | |
| 4724 else | |
| 4725 prev_ptr = ptr - 1; | |
| 348 | 4726 |
| 4727 /* Use nextline[] if possible, it has the start of the | |
| 4728 * next line concatenated. */ | |
| 4729 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4730 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4731 else | |
| 4732 p = prev_ptr; | |
| 835 | 4733 cap_col -= (int)(prev_ptr - line); |
| 625 | 4734 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4735 nochange); | |
| 348 | 4736 word_end = v + len; |
| 301 | 4737 |
| 4738 /* In Insert mode only highlight a word that | |
| 4739 * doesn't touch the cursor. */ | |
| 534 | 4740 if (spell_hlf != HLF_COUNT |
| 301 | 4741 && (State & INSERT) != 0 |
| 4742 && wp->w_cursor.lnum == lnum | |
| 4743 && wp->w_cursor.col >= | |
| 4744 (colnr_T)(prev_ptr - line) | |
| 4745 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4746 { |
| 534 | 4747 spell_hlf = HLF_COUNT; |
| 301 | 4748 spell_redraw_lnum = lnum; |
| 221 | 4749 } |
| 348 | 4750 |
| 534 | 4751 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4752 && (p - nextline) + len > nextline_idx) |
| 4753 { | |
| 4754 /* Remember that the good word continues at the | |
| 4755 * start of the next line. */ | |
| 4756 checked_lnum = lnum + 1; | |
| 835 | 4757 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4758 } |
| 386 | 4759 |
| 534 | 4760 /* Turn index into actual attributes. */ |
| 4761 if (spell_hlf != HLF_COUNT) | |
| 4762 spell_attr = highlight_attr[spell_hlf]; | |
| 4763 | |
| 386 | 4764 if (cap_col > 0) |
| 4765 { | |
| 4766 if (p != prev_ptr | |
| 4767 && (p - nextline) + cap_col >= nextline_idx) | |
| 4768 { | |
| 4769 /* Remember that the word in the next line | |
| 4770 * must start with a capital. */ | |
| 4771 capcol_lnum = lnum + 1; | |
| 835 | 4772 cap_col = (int)((p - nextline) + cap_col |
| 4773 - nextline_idx); | |
| 386 | 4774 } |
| 4775 else | |
| 4776 /* Compute the actual column. */ | |
| 835 | 4777 cap_col += (int)(prev_ptr - line); |
| 386 | 4778 } |
| 221 | 4779 } |
| 4780 } | |
| 4781 if (spell_attr != 0) | |
| 348 | 4782 { |
| 674 | 4783 if (!attr_pri) |
| 348 | 4784 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4785 else | |
| 4786 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4787 } | |
| 7 | 4788 #endif |
| 4789 #ifdef FEAT_LINEBREAK | |
| 4790 /* | |
| 221 | 4791 * Found last space before word: check for line break. |
| 7 | 4792 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4793 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
|
4794 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4795 { |
| 6693 | 4796 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
|
4797 char_u *p = ptr - (mb_off + 1); |
| 6681 | 4798 |
| 5995 | 4799 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4800 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4801 NULL) - 1; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4802 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
|
4803 # ifdef FEAT_VARTABS |
|
14198
9ca8c36869ce
patch 8.1.0116: display problem with 'vartabstop' and 'linebreak'
Christian Brabandt <cb@256bit.org>
parents:
14191
diff
changeset
|
4804 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
|
4805 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
|
4806 # else |
| 6371 | 4807 n_extra = (int)wp->w_buffer->b_p_ts |
| 4808 - 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
|
4809 # endif |
| 6371 | 4810 |
| 6693 | 4811 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
|
4812 c_final = NUL; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4813 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4814 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4815 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4816 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4817 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4818 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4819 #endif |
| 6026 | 4820 if (!wp->w_p_list) |
| 4821 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4822 } |
| 7 | 4823 } |
| 4824 #endif | |
| 4825 | |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4826 // '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
|
4827 // 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
|
4828 // 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
|
4829 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
|
4830 && ((((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
|
4831 || (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
|
4832 && ((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
|
4833 || (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
|
4834 && 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
|
4835 || (c == ' ' |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4836 && 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
|
4837 && 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
|
4838 && 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
|
4839 { |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4840 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
|
4841 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
|
4842 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4843 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
|
4844 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
|
4845 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
|
4846 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4847 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
|
4848 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
|
4849 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4850 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
|
4851 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
|
4852 c = 0xc0; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4853 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4854 else |
|
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_utf8 = FALSE; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4856 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4857 |
| 7 | 4858 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4859 { | |
| 4860 c = lcs_trail; | |
| 674 | 4861 if (!attr_pri) |
| 7 | 4862 { |
| 4863 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
|
4864 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4865 saved_attr2 = char_attr; /* save current attr */ |
| 4866 } | |
| 4867 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
|
4868 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4869 { |
| 4870 mb_utf8 = TRUE; | |
| 714 | 4871 u8cc[0] = 0; |
| 819 | 4872 c = 0xc0; |
| 7 | 4873 } |
| 4874 else | |
| 4875 mb_utf8 = FALSE; | |
| 4876 } | |
| 4877 } | |
| 4878 | |
| 4879 /* | |
| 4880 * Handling of non-printable characters. | |
| 4881 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4882 if (!vim_isprintc(c)) |
| 7 | 4883 { |
| 4884 /* | |
| 4885 * when getting a character from the file, we may have to | |
| 4886 * turn it into something else on the way to putting it | |
| 4887 * into "ScreenLines". | |
| 4888 */ | |
| 4889 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4890 { | |
| 6026 | 4891 int tab_len = 0; |
| 6503 | 4892 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 4893 #ifdef FEAT_LINEBREAK | |
| 4894 /* only adjust the tab_len, when at the first column | |
| 4895 * after the showbreak value was drawn */ | |
| 4896 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 4897 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 4898 #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
|
4899 // 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
|
4900 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4901 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
|
4902 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
|
4903 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
|
4904 #else |
| 6026 | 4905 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
|
4906 - 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
|
4907 #endif |
| 6503 | 4908 |
| 6026 | 4909 #ifdef FEAT_LINEBREAK |
| 6100 | 4910 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 4911 #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
|
4912 // tab amount depends on current column |
| 6026 | 4913 n_extra = tab_len; |
| 4914 #ifdef FEAT_LINEBREAK | |
| 4915 else | |
| 4916 { | |
|
17742
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4917 char_u *p; |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
4918 int len; |
| 6026 | 4919 int i; |
| 4920 int saved_nextra = n_extra; | |
| 4921 | |
| 6172 | 4922 #ifdef FEAT_CONCEAL |
| 6627 | 4923 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
|
4924 // there are characters to conceal |
| 6172 | 4925 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
|
4926 // boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 6520 | 4927 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 |
| 4928 && n_extra > tab_len) | |
| 4929 tab_len += n_extra - tab_len; | |
| 4930 #endif | |
| 4931 | |
|
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 // 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
|
4933 // 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
|
4934 // for a tab |
| 6026 | 4935 len = (tab_len * mb_char2len(lcs_tab2)); |
| 4936 if (n_extra > 0) | |
| 4937 len += n_extra - tab_len; | |
| 4938 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
|
4939 p = alloc(len + 1); |
| 6026 | 4940 vim_memset(p, ' ', len); |
| 4941 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4942 vim_free(p_extra_free); |
| 6026 | 4943 p_extra_free = p; |
| 4944 for (i = 0; i < tab_len; i++) | |
| 4945 { | |
|
17742
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4946 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
|
4947 |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4948 if (*p == NUL) |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4949 { |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4950 tab_len = i; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4951 break; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4952 } |
|
17742
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4953 |
|
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4954 // 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
|
4955 // 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
|
4956 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
|
4957 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
|
4958 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
|
4959 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
|
4960 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
|
4961 - (saved_nextra > 0 ? 1 : 0); |
| 6026 | 4962 } |
| 4963 p_extra = p_extra_free; | |
| 6172 | 4964 #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
|
4965 // 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
|
4966 // macro below, so need to adjust for that here |
| 6627 | 4967 if (vcol_off > 0) |
| 6172 | 4968 n_extra -= vcol_off; |
| 4969 #endif | |
| 6026 | 4970 } |
| 4971 #endif | |
| 3984 | 4972 #ifdef FEAT_CONCEAL |
| 6627 | 4973 { |
| 4974 int vc_saved = vcol_off; | |
| 4975 | |
| 4976 /* Tab alignment should be identical regardless of | |
| 4977 * 'conceallevel' value. So tab compensates of all | |
| 4978 * previous concealed characters, and thus resets | |
| 4979 * vcol_off and boguscols accumulated so far in the | |
| 4980 * line. Note that the tab can be longer than | |
| 4981 * 'tabstop' when there are concealed characters. */ | |
| 4982 FIX_FOR_BOGUSCOLS; | |
| 4983 | |
| 4984 /* Make sure, the highlighting for the tab char will be | |
| 4985 * correctly set further below (effectively reverts the | |
| 4986 * FIX_FOR_BOGSUCOLS macro */ | |
| 4987 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 4988 && lcs_tab1) |
| 6627 | 4989 tab_len += vc_saved; |
| 4990 } | |
| 3984 | 4991 #endif |
| 7 | 4992 mb_utf8 = FALSE; /* don't draw as UTF-8 */ |
| 4993 if (wp->w_p_list) | |
| 4994 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4995 c = (n_extra == 0 && lcs_tab3) ? lcs_tab3 : lcs_tab1; |
| 6026 | 4996 #ifdef FEAT_LINEBREAK |
| 4997 if (wp->w_p_lbr) | |
| 4998 c_extra = NUL; /* using p_extra from above */ | |
| 4999 else | |
| 5000 #endif | |
| 5001 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
|
5002 c_final = lcs_tab3; |
| 6026 | 5003 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
|
5004 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5005 saved_attr2 = char_attr; /* save current attr */ |
| 5006 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
|
5007 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5008 { |
| 5009 mb_utf8 = TRUE; | |
| 714 | 5010 u8cc[0] = 0; |
| 819 | 5011 c = 0xc0; |
| 7 | 5012 } |
| 5013 } | |
| 5014 else | |
| 5015 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5016 c_final = NUL; |
| 7 | 5017 c_extra = ' '; |
| 5018 c = ' '; | |
| 5019 } | |
| 5020 } | |
| 36 | 5021 else if (c == NUL |
| 6799 | 5022 && (wp->w_p_list |
| 36 | 5023 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 5024 && tocol > vcol | |
| 5025 && VIsual_mode != Ctrl_V | |
| 5026 && ( | |
| 5027 # ifdef FEAT_RIGHTLEFT | |
| 5028 wp->w_p_rl ? (col >= 0) : | |
| 5029 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5030 (col < wp->w_width)) |
| 36 | 5031 && !(noinvcur |
| 1850 | 5032 && lnum == wp->w_cursor.lnum |
| 36 | 5033 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 5034 && lcs_eol_one > 0) |
| 7 | 5035 { |
| 36 | 5036 /* Display a '$' after the line or highlight an extra |
| 5037 * character if the line break is included. */ | |
| 7 | 5038 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 5039 /* For a diff line the highlighting continues after the | |
| 5040 * "$". */ | |
| 5041 if ( | |
| 5042 # ifdef FEAT_DIFF | |
| 534 | 5043 diff_hlf == (hlf_T)0 |
| 7 | 5044 # ifdef LINE_ATTR |
| 5045 && | |
| 5046 # endif | |
| 5047 # endif | |
| 5048 # ifdef LINE_ATTR | |
| 5049 line_attr == 0 | |
| 5050 # endif | |
| 5051 ) | |
| 5052 #endif | |
| 5053 { | |
| 5054 /* In virtualedit, visual selections may extend | |
| 5055 * beyond end of line. */ | |
| 5056 if (area_highlighting && virtual_active() | |
| 5057 && tocol != MAXCOL && vcol < tocol) | |
| 5058 n_extra = 0; | |
| 5059 else | |
| 5060 { | |
| 5061 p_extra = at_end_str; | |
| 5062 n_extra = 1; | |
| 5063 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
|
5064 c_final = NUL; |
| 7 | 5065 } |
| 5066 } | |
| 6799 | 5067 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 5068 c = lcs_eol; |
| 5069 else | |
| 5070 c = ' '; | |
| 7 | 5071 lcs_eol_one = -1; |
| 5072 --ptr; /* put it back at the NUL */ | |
| 674 | 5073 if (!attr_pri) |
| 7 | 5074 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5075 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 5076 n_attr = 1; |
| 5077 } | |
| 5078 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
|
5079 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5080 { |
| 5081 mb_utf8 = TRUE; | |
| 714 | 5082 u8cc[0] = 0; |
| 819 | 5083 c = 0xc0; |
| 7 | 5084 } |
| 5085 else | |
| 5086 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5087 } | |
| 5088 else if (c != NUL) | |
| 5089 { | |
| 5090 p_extra = transchar(c); | |
| 6064 | 5091 if (n_extra == 0) |
| 5092 n_extra = byte2cells(c) - 1; | |
| 7 | 5093 #ifdef FEAT_RIGHTLEFT |
| 5094 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5095 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5096 #endif | |
| 5097 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
|
5098 c_final = NUL; |
| 6026 | 5099 #ifdef FEAT_LINEBREAK |
| 5100 if (wp->w_p_lbr) | |
| 5101 { | |
| 5102 char_u *p; | |
| 5103 | |
| 5104 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
|
5105 p = alloc(n_extra + 1); |
| 6026 | 5106 vim_memset(p, ' ', n_extra); |
| 5107 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5108 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5109 vim_free(p_extra_free); |
| 6026 | 5110 p_extra_free = p_extra = p; |
| 5111 } | |
| 5112 else | |
| 5113 #endif | |
| 5114 { | |
| 5115 n_extra = byte2cells(c) - 1; | |
| 5116 c = *p_extra++; | |
| 5117 } | |
| 674 | 5118 if (!attr_pri) |
| 7 | 5119 { |
| 5120 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
|
5121 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5122 saved_attr2 = char_attr; /* save current attr */ |
| 5123 } | |
| 5124 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5125 } | |
| 5126 else if (VIsual_active | |
| 5127 && (VIsual_mode == Ctrl_V | |
| 5128 || VIsual_mode == 'v') | |
| 5129 && virtual_active() | |
| 5130 && tocol != MAXCOL | |
| 5131 && vcol < tocol | |
| 5132 && ( | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5133 #ifdef FEAT_RIGHTLEFT |
| 7 | 5134 wp->w_p_rl ? (col >= 0) : |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5135 #endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5136 (col < wp->w_width))) |
| 7 | 5137 { |
| 5138 c = ' '; | |
| 5139 --ptr; /* put it back at the NUL */ | |
| 5140 } | |
| 910 | 5141 #if defined(LINE_ATTR) |
| 7 | 5142 else if (( |
| 5143 # ifdef FEAT_DIFF | |
| 910 | 5144 diff_hlf != (hlf_T)0 || |
| 7 | 5145 # endif |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5146 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5147 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
|
5148 # endif |
| 7 | 5149 line_attr != 0 |
| 5150 ) && ( | |
| 5151 # ifdef FEAT_RIGHTLEFT | |
| 5152 wp->w_p_rl ? (col >= 0) : | |
| 5153 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5154 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5155 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5156 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5157 # endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5158 < wp->w_width))) |
| 7 | 5159 { |
| 5160 /* Highlight until the right side of the window */ | |
| 5161 c = ' '; | |
| 5162 --ptr; /* put it back at the NUL */ | |
| 867 | 5163 |
| 5164 /* Remember we do the char for line highlighting. */ | |
| 5165 ++did_line_attr; | |
| 5166 | |
| 5167 /* 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
|
5168 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
|
5169 && (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
|
5170 || (wp->w_p_list && lcs_eol > 0))) |
| 867 | 5171 char_attr = line_attr; |
| 7 | 5172 # ifdef FEAT_DIFF |
| 5173 if (diff_hlf == HLF_TXD) | |
| 5174 { | |
| 5175 diff_hlf = HLF_CHD; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5176 if (vi_attr == 0 || char_attr != vi_attr) |
| 6106 | 5177 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5178 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5179 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5180 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
|
5181 HL_ATTR(HLF_CUL)); |
| 6106 | 5182 } |
| 7 | 5183 } |
| 5184 # endif | |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5185 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5186 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
|
5187 { |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5188 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
|
5189 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
|
5190 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
|
5191 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
|
5192 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
|
5193 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
|
5194 } |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5195 # endif |
| 7 | 5196 } |
| 5197 #endif | |
| 5198 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5199 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5200 #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
|
5201 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
|
5202 && (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
|
5203 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
|
5204 && ((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
|
5205 && !(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
|
5206 && 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
|
5207 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5208 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5209 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5210 && (syn_get_sub_char() != NUL || match_conc |
| 5211 || 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
|
5212 && 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
|
5213 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5214 /* 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
|
5215 * character. */ |
| 6947 | 5216 if (match_conc) |
| 5217 c = match_conc; | |
| 5218 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
|
5219 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5220 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5221 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5222 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5223 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5224 |
|
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
|
5225 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5226 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5227 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5228 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5229 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5230 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
|
5231 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5232 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5233 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5234 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5235 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5236 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5237 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5238 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5239 # endif |
|
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 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5242 col += n_extra; |
|
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 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5245 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5246 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5247 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5248 else if (n_skip == 0) |
|
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 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5251 n_skip = 1; |
|
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 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
|
5254 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
|
5255 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5256 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5257 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5258 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5259 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5260 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5261 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
|
5262 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5263 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5264 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5265 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
|
5266 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5267 } |
|
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
|
5268 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5269 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
|
5270 // 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
|
5271 ++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
|
5272 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5273 #endif // FEAT_CONCEAL |
| 7 | 5274 } |
| 5275 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5276 #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
|
5277 /* 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
|
5278 * 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
|
5279 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
|
5280 && 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
|
5281 && 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
|
5282 && (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
|
5283 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5284 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5285 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
|
5286 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
|
5287 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5288 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5289 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
|
5290 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
|
5291 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
|
5292 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5293 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5294 |
| 7 | 5295 /* Don't override visual selection highlighting. */ |
| 5296 if (n_attr > 0 | |
| 5297 && draw_state == WL_LINE | |
| 674 | 5298 && !attr_pri) |
| 7 | 5299 char_attr = extra_attr; |
| 5300 | |
| 42 | 5301 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5302 /* XIM don't send preedit_start and preedit_end, but they send |
| 5303 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5304 * 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
|
5305 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
|
5306 && xic != NULL |
| 1850 | 5307 && lnum == wp->w_cursor.lnum |
| 7 | 5308 && (State & INSERT) |
| 5309 && !p_imdisable | |
| 5310 && im_is_preediting() | |
| 5311 && draw_state == WL_LINE) | |
| 5312 { | |
| 5313 colnr_T tcol; | |
| 5314 | |
| 5315 if (preedit_end_col == MAXCOL) | |
| 1850 | 5316 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5317 else |
| 5318 tcol = preedit_end_col; | |
| 5319 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5320 { | |
| 5321 if (feedback_old_attr < 0) | |
| 5322 { | |
| 5323 feedback_col = 0; | |
| 5324 feedback_old_attr = char_attr; | |
| 5325 } | |
| 5326 char_attr = im_get_feedback_attr(feedback_col); | |
| 5327 if (char_attr < 0) | |
| 5328 char_attr = feedback_old_attr; | |
| 5329 feedback_col++; | |
| 5330 } | |
| 5331 else if (feedback_old_attr >= 0) | |
| 5332 { | |
| 5333 char_attr = feedback_old_attr; | |
| 5334 feedback_old_attr = -1; | |
| 5335 feedback_col = 0; | |
| 5336 } | |
| 5337 } | |
| 5338 #endif | |
| 5339 /* | |
| 5340 * Handle the case where we are in column 0 but not on the first | |
| 5341 * character of the line and the user wants us to show us a | |
| 5342 * special character (via 'listchars' option "precedes:<char>". | |
| 5343 */ | |
| 5344 if (lcs_prec_todo != NUL | |
| 6276 | 5345 && wp->w_p_list |
| 7 | 5346 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5347 #ifdef FEAT_DIFF | |
| 5348 && filler_todo <= 0 | |
| 5349 #endif | |
| 5350 && draw_state > WL_NR | |
| 5351 && c != NUL) | |
| 5352 { | |
| 5353 c = lcs_prec; | |
| 5354 lcs_prec_todo = NUL; | |
| 3586 | 5355 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5356 { | |
| 5357 /* Double-width character being overwritten by the "precedes" | |
| 5358 * character, need to fill up half the character. */ | |
| 5359 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
|
5360 c_final = NUL; |
| 3586 | 5361 n_extra = 1; |
| 5362 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
|
5363 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5364 } |
| 7 | 5365 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
|
5366 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5367 { |
| 5368 mb_utf8 = TRUE; | |
| 714 | 5369 u8cc[0] = 0; |
| 819 | 5370 c = 0xc0; |
| 7 | 5371 } |
| 5372 else | |
| 5373 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 674 | 5374 if (!attr_pri) |
| 7 | 5375 { |
| 5376 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
|
5377 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5378 n_attr3 = 1; |
| 5379 } | |
| 5380 } | |
| 5381 | |
| 5382 /* | |
| 867 | 5383 * At end of the text line or just after the last character. |
| 7 | 5384 */ |
|
17438
967e2ee9b656
patch 8.1.1717: last char in menu popup window highlighted
Bram Moolenaar <Bram@vim.org>
parents:
17427
diff
changeset
|
5385 if ((c == NUL |
| 910 | 5386 #if defined(LINE_ATTR) |
| 867 | 5387 || did_line_attr == 1 |
| 5388 #endif | |
|
17438
967e2ee9b656
patch 8.1.1717: last char in menu popup window highlighted
Bram Moolenaar <Bram@vim.org>
parents:
17427
diff
changeset
|
5389 ) && eol_hl_off == 0) |
| 867 | 5390 { |
| 5391 #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
|
5392 // 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
|
5393 // 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
|
5394 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
|
5395 (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
|
5396 #endif |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5397 // 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
|
5398 // 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
|
5399 // 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
|
5400 // needed when a '$' was displayed for 'list'. |
| 7 | 5401 if (lcs_eol == lcs_eol_one |
| 1850 | 5402 && ((area_attr != 0 && vcol == fromcol |
| 5403 && (VIsual_mode != Ctrl_V | |
| 5404 || lnum == VIsual.lnum | |
| 5405 || lnum == curwin->w_cursor.lnum) | |
| 5406 && c == NUL) | |
| 7 | 5407 #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
|
5408 // 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
|
5409 || (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
|
5410 # 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
|
5411 && !(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
|
5412 && !(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
|
5413 # endif |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5414 # 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
|
5415 && 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
|
5416 # endif |
| 910 | 5417 # if defined(LINE_ATTR) |
| 867 | 5418 && did_line_attr <= 1 |
| 5419 # endif | |
| 5420 ) | |
| 7 | 5421 #endif |
| 5422 )) | |
| 5423 { | |
| 5424 int n = 0; | |
| 5425 | |
| 5426 #ifdef FEAT_RIGHTLEFT | |
| 5427 if (wp->w_p_rl) | |
| 5428 { | |
| 5429 if (col < 0) | |
| 5430 n = 1; | |
| 5431 } | |
| 5432 else | |
| 5433 #endif | |
| 5434 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5435 if (col >= wp->w_width) |
| 7 | 5436 n = -1; |
| 5437 } | |
| 5438 if (n != 0) | |
| 5439 { | |
| 5440 /* At the window boundary, highlight the last character | |
| 5441 * instead (better than nothing). */ | |
| 5442 off += n; | |
| 5443 col += n; | |
| 5444 } | |
| 5445 else | |
| 5446 { | |
| 5447 /* Add a blank character to highlight. */ | |
| 5448 ScreenLines[off] = ' '; | |
| 5449 if (enc_utf8) | |
| 5450 ScreenLinesUC[off] = 0; | |
| 5451 } | |
| 5452 #ifdef FEAT_SEARCH_EXTRA | |
| 5453 if (area_attr == 0) | |
| 5454 { | |
|
17490
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5455 // 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
|
5456 // '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
|
5457 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
|
5458 (long)(ptr - line), &char_attr); |
| 7 | 5459 } |
| 5460 #endif | |
| 5461 ScreenAttrs[off] = char_attr; | |
| 5462 #ifdef FEAT_RIGHTLEFT | |
| 5463 if (wp->w_p_rl) | |
| 1437 | 5464 { |
| 7 | 5465 --col; |
| 1437 | 5466 --off; |
| 5467 } | |
| 7 | 5468 else |
| 5469 #endif | |
| 1437 | 5470 { |
| 7 | 5471 ++col; |
| 1437 | 5472 ++off; |
| 5473 } | |
| 743 | 5474 ++vcol; |
| 1437 | 5475 eol_hl_off = 1; |
| 743 | 5476 } |
| 867 | 5477 } |
| 5478 | |
| 5479 /* | |
| 5480 * At end of the text line. | |
| 5481 */ | |
| 5482 if (c == NUL) | |
| 5483 { | |
| 743 | 5484 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5485 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5486 if (wp->w_p_wrap) |
| 5487 v = wp->w_skipcol; | |
| 5488 else | |
| 5489 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5490 |
| 820 | 5491 /* check if line ends before left margin */ |
| 5492 if (vcol < v + col - win_col_off(wp)) | |
| 5493 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
|
5494 #ifdef FEAT_CONCEAL |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5495 // 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
|
5496 // edge for 'cursorcolumn'. |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5497 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5498 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5499 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5500 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5501 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5502 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
|
5503 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5504 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5505 && (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
|
5506 && (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
|
5507 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
|
5508 && lnum != wp->w_cursor.lnum) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5509 || draw_color_col |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5510 || win_attr != 0) |
| 743 | 5511 # ifdef FEAT_RIGHTLEFT |
| 5512 && !wp->w_p_rl | |
| 5513 # endif | |
| 5514 ) | |
| 5515 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5516 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5517 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5518 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5519 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5520 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5521 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5522 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5523 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
|
5524 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5525 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5526 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5527 while (col < wp->w_width) |
| 743 | 5528 { |
| 5529 ScreenLines[off] = ' '; | |
| 5530 if (enc_utf8) | |
| 5531 ScreenLinesUC[off] = 0; | |
| 5532 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5533 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5534 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
|
5535 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5536 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5537 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
|
5538 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
|
5539 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
|
5540 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5541 else |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5542 ScreenAttrs[off++] = win_attr; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5543 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5544 if (VCOL_HLC >= rightmost_vcol && win_attr == 0) |
| 743 | 5545 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5546 |
| 743 | 5547 ++vcol; |
| 5548 } | |
| 5549 } | |
| 5550 #endif | |
| 7 | 5551 |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5552 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
|
5553 (int)wp->w_width, screen_line_flags); |
| 7 | 5554 row++; |
| 5555 | |
| 5556 /* | |
| 5557 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5558 * updated (saves a call to plines() later). | |
| 5559 */ | |
| 5560 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5561 { | |
| 5562 curwin->w_cline_row = startrow; | |
| 5563 curwin->w_cline_height = row - startrow; | |
| 5564 #ifdef FEAT_FOLDING | |
| 5565 curwin->w_cline_folded = FALSE; | |
| 5566 #endif | |
| 5567 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5568 } | |
| 5569 | |
| 5570 break; | |
| 5571 } | |
| 5572 | |
|
16592
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5573 // 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
|
5574 // '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
|
5575 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
|
5576 && wp->w_p_list |
| 7 | 5577 && !wp->w_p_wrap |
| 5578 #ifdef FEAT_DIFF | |
| 5579 && filler_todo <= 0 | |
| 5580 #endif | |
| 5581 && ( | |
| 5582 #ifdef FEAT_RIGHTLEFT | |
| 5583 wp->w_p_rl ? col == 0 : | |
| 5584 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5585 col == wp->w_width - 1) |
| 7 | 5586 && (*ptr != NUL |
| 1555 | 5587 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5588 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5589 { | |
| 5590 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
|
5591 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5592 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
|
5593 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5594 { |
| 5595 mb_utf8 = TRUE; | |
| 714 | 5596 u8cc[0] = 0; |
| 819 | 5597 c = 0xc0; |
| 7 | 5598 } |
| 5599 else | |
| 5600 mb_utf8 = FALSE; | |
| 5601 } | |
| 5602 | |
| 743 | 5603 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5604 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5605 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5606 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
|
5607 |
| 743 | 5608 /* 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
|
5609 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5610 * 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
|
5611 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5612 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
|
5613 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
|
5614 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5615 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5616 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
|
5617 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5618 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5619 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
|
5620 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
|
5621 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5622 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
|
5623 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5624 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
|
5625 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
|
5626 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5627 } |
| 743 | 5628 #endif |
| 5629 | |
| 7 | 5630 /* |
| 5631 * Store character to be displayed. | |
| 5632 * Skip characters that are left of the screen for 'nowrap'. | |
| 5633 */ | |
| 5634 vcol_prev = vcol; | |
| 5635 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5636 { | |
| 5637 /* | |
| 5638 * Store the character. | |
| 5639 */ | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5640 #if defined(FEAT_RIGHTLEFT) |
| 7 | 5641 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) |
| 5642 { | |
| 5643 /* A double-wide character is: put first halve in left cell. */ | |
| 5644 --off; | |
| 5645 --col; | |
| 5646 } | |
| 5647 #endif | |
| 5648 ScreenLines[off] = c; | |
| 5649 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5650 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5651 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5652 ScreenLines[off] = 0x8e; |
| 7 | 5653 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5654 } |
| 7 | 5655 else if (enc_utf8) |
| 5656 { | |
| 5657 if (mb_utf8) | |
| 5658 { | |
| 1326 | 5659 int i; |
| 5660 | |
| 7 | 5661 ScreenLinesUC[off] = mb_c; |
| 819 | 5662 if ((c & 0xff) == 0) |
| 5663 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5664 for (i = 0; i < Screen_mco; ++i) |
| 5665 { | |
| 5666 ScreenLinesC[i][off] = u8cc[i]; | |
| 5667 if (u8cc[i] == 0) | |
| 5668 break; | |
| 5669 } | |
| 7 | 5670 } |
| 5671 else | |
| 5672 ScreenLinesUC[off] = 0; | |
| 5673 } | |
| 5674 if (multi_attr) | |
| 5675 { | |
| 5676 ScreenAttrs[off] = multi_attr; | |
| 5677 multi_attr = 0; | |
| 5678 } | |
| 5679 else | |
| 5680 ScreenAttrs[off] = char_attr; | |
| 5681 | |
| 5682 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5683 { | |
| 5684 /* Need to fill two screen columns. */ | |
| 5685 ++off; | |
| 5686 ++col; | |
| 5687 if (enc_utf8) | |
| 5688 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5689 ScreenLines[off] = 0; | |
| 5690 else | |
| 5691 /* DBCS: Put second byte in the second screen char. */ | |
| 5692 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5693 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5694 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5695 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5696 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5697 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5698 ++vcol; |
| 7 | 5699 /* When "tocol" is halfway a character, set it to the end of |
| 5700 * the character, otherwise highlighting won't stop. */ | |
| 5701 if (tocol == vcol) | |
| 5702 ++tocol; | |
| 5703 #ifdef FEAT_RIGHTLEFT | |
| 5704 if (wp->w_p_rl) | |
| 5705 { | |
| 5706 /* now it's time to backup one cell */ | |
| 5707 --off; | |
| 5708 --col; | |
| 5709 } | |
| 5710 #endif | |
| 5711 } | |
| 5712 #ifdef FEAT_RIGHTLEFT | |
| 5713 if (wp->w_p_rl) | |
| 5714 { | |
| 5715 --off; | |
| 5716 --col; | |
| 5717 } | |
| 5718 else | |
| 5719 #endif | |
| 5720 { | |
| 5721 ++off; | |
| 5722 ++col; | |
| 5723 } | |
| 5724 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5725 #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
|
5726 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
|
5727 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5728 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5729 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5730 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5731 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5732 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5733 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5734 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5735 * Special voodoo required if 'wrap' is on. |
|
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 * 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
|
5738 * 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
|
5739 * 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
|
5740 * 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
|
5741 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5742 * 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
|
5743 * 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
|
5744 * 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
|
5745 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5746 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5747 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5748 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5749 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5750 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5751 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5752 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5753 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5754 boguscols -= n_extra; |
|
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 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5757 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5758 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5759 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5760 boguscols += n_extra; |
|
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 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5763 n_attr = 0; |
|
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 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5766 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5767 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
|
5768 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5769 /* Need to fill two screen columns. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5770 # ifdef FEAT_RIGHTLEFT |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5771 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5772 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5773 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5774 --col; |
|
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 else |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5777 # endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5778 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5779 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5780 ++col; |
|
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 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5783 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5784 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5785 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5786 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5787 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5788 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5789 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5790 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5791 # endif |
|
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 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5794 ++col; |
|
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 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5797 else |
|
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 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5800 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5801 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5802 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5803 n_attr = 0; |
|
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 |
|
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 #endif /* FEAT_CONCEAL */ |
| 7 | 5809 else |
| 5810 --n_skip; | |
| 5811 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5812 /* 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
|
5813 * column. */ |
| 1849 | 5814 if (draw_state > WL_NR |
| 7 | 5815 #ifdef FEAT_DIFF |
| 5816 && filler_todo <= 0 | |
| 5817 #endif | |
| 5818 ) | |
| 5819 ++vcol; | |
| 5820 | |
| 743 | 5821 #ifdef FEAT_SYN_HL |
| 5822 if (vcol_save_attr >= 0) | |
| 5823 char_attr = vcol_save_attr; | |
| 5824 #endif | |
| 5825 | |
| 7 | 5826 /* restore attributes after "predeces" in 'listchars' */ |
| 5827 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5828 char_attr = saved_attr3; | |
| 5829 | |
| 5830 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5831 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5832 char_attr = saved_attr2; | |
| 5833 | |
| 5834 /* | |
| 5835 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5836 * so far. If there is no more to display it is caught above. |
| 7 | 5837 */ |
| 5838 if (( | |
| 5839 #ifdef FEAT_RIGHTLEFT | |
| 5840 wp->w_p_rl ? (col < 0) : | |
| 5841 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5842 (col >= wp->w_width)) |
| 7 | 5843 && (*ptr != NUL |
| 5844 #ifdef FEAT_DIFF | |
| 5845 || filler_todo > 0 | |
| 5846 #endif | |
| 2724 | 5847 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5848 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5849 ) | |
| 5850 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5851 #ifdef FEAT_CONCEAL |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5852 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
|
5853 (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
|
5854 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5855 #else |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5856 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
|
5857 (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
|
5858 #endif |
| 7 | 5859 ++row; |
| 5860 ++screen_row; | |
| 5861 | |
| 5862 /* When not wrapping and finished diff lines, or when displayed | |
| 5863 * '$' and highlighting until last column, break here. */ | |
| 5864 if ((!wp->w_p_wrap | |
| 5865 #ifdef FEAT_DIFF | |
| 5866 && filler_todo <= 0 | |
| 5867 #endif | |
| 5868 ) || lcs_eol_one == -1) | |
| 5869 break; | |
| 5870 | |
| 5871 /* When the window is too narrow draw all "@" lines. */ | |
| 5872 if (draw_state != WL_LINE | |
| 5873 #ifdef FEAT_DIFF | |
| 5874 && filler_todo <= 0 | |
| 5875 #endif | |
| 5876 ) | |
| 5877 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
5878 win_draw_end(wp, '@', ' ', TRUE, row, wp->w_height, HLF_AT); |
| 7 | 5879 draw_vsep_win(wp, row); |
| 5880 row = endrow; | |
| 5881 } | |
| 5882 | |
| 5883 /* When line got too long for screen break here. */ | |
| 5884 if (row == endrow) | |
| 5885 { | |
| 5886 ++row; | |
| 5887 break; | |
| 5888 } | |
| 5889 | |
| 5890 if (screen_cur_row == screen_row - 1 | |
| 5891 #ifdef FEAT_DIFF | |
| 5892 && filler_todo <= 0 | |
| 5893 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5894 && wp->w_width == Columns) |
| 7 | 5895 { |
| 5896 /* Remember that the line wraps, used for modeless copy. */ | |
| 5897 LineWraps[screen_row - 1] = TRUE; | |
| 5898 | |
| 5899 /* | |
| 5900 * Special trick to make copy/paste of wrapped lines work with | |
| 5901 * xterm/screen: write an extra character beyond the end of | |
| 5902 * the line. This will work with all terminal types | |
| 5903 * (regardless of the xn,am settings). | |
| 5904 * Only do this on a fast tty. | |
| 5905 * Only do this if the cursor is on the current line | |
| 5906 * (something has been written in it). | |
| 5907 * Don't do this for the GUI. | |
| 5908 * Don't do this for double-width characters. | |
| 5909 * Don't do this for a window not at the right screen border. | |
| 5910 */ | |
| 5911 if (p_tf | |
| 5912 #ifdef FEAT_GUI | |
| 5913 && !gui.in_use | |
| 5914 #endif | |
| 5915 && !(has_mbyte | |
| 1378 | 5916 && ((*mb_off2cells)(LineOffset[screen_row], |
| 5917 LineOffset[screen_row] + screen_Columns) | |
| 5918 == 2 | |
| 7 | 5919 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 5920 + (int)Columns - 2, |
| 5921 LineOffset[screen_row] + screen_Columns) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5922 == 2))) |
| 7 | 5923 { |
| 5924 /* First make sure we are at the end of the screen line, | |
| 5925 * then output the same character again to let the | |
| 5926 * terminal know about the wrap. If the terminal doesn't | |
| 5927 * 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
|
5928 if (screen_cur_col != wp->w_width) |
| 7 | 5929 screen_char(LineOffset[screen_row - 1] |
| 5930 + (unsigned)Columns - 1, | |
| 5931 screen_row - 1, (int)(Columns - 1)); | |
| 5932 | |
| 5933 /* When there is a multi-byte character, just output a | |
| 5934 * space to keep it simple. */ | |
| 148 | 5935 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 5936 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 5937 out_char(' '); |
| 5938 else | |
| 5939 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 5940 + (Columns - 1)]); | |
| 5941 /* force a redraw of the first char on the next line */ | |
| 5942 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 5943 screen_start(); /* don't know where cursor is now */ | |
| 5944 } | |
| 5945 } | |
| 5946 | |
| 5947 col = 0; | |
| 5948 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5949 #ifdef FEAT_RIGHTLEFT | |
| 5950 if (wp->w_p_rl) | |
| 5951 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5952 col = wp->w_width - 1; /* col is not used if breaking! */ |
| 7 | 5953 off += col; |
| 5954 } | |
| 5955 #endif | |
| 5956 | |
| 5957 /* reset the drawing state for the start of a wrapped line */ | |
| 5958 draw_state = WL_START; | |
| 5959 saved_n_extra = n_extra; | |
| 5960 saved_p_extra = p_extra; | |
| 5961 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
|
5962 saved_c_final = c_final; |
| 7 | 5963 saved_char_attr = char_attr; |
| 5964 n_extra = 0; | |
| 5965 lcs_prec_todo = lcs_prec; | |
| 5966 #ifdef FEAT_LINEBREAK | |
| 5967 # ifdef FEAT_DIFF | |
| 5968 if (filler_todo <= 0) | |
| 5969 # endif | |
| 5970 need_showbreak = TRUE; | |
| 5971 #endif | |
| 5972 #ifdef FEAT_DIFF | |
| 5973 --filler_todo; | |
| 5974 /* When the filler lines are actually below the last line of the | |
| 5975 * file, don't draw the line itself, break here. */ | |
| 5976 if (filler_todo == 0 && wp->w_botfill) | |
| 5977 break; | |
| 5978 #endif | |
| 5979 } | |
| 5980 | |
| 5981 } /* for every character in the line */ | |
| 5982 | |
| 743 | 5983 #ifdef FEAT_SPELL |
| 386 | 5984 /* After an empty line check first word for capital. */ |
| 5985 if (*skipwhite(line) == NUL) | |
| 5986 { | |
| 5987 capcol_lnum = lnum + 1; | |
| 5988 cap_col = 0; | |
| 5989 } | |
| 5990 #endif | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
5991 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
5992 vim_free(text_props); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
5993 vim_free(text_prop_idxs); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
5994 #endif |
| 386 | 5995 |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5996 vim_free(p_extra_free); |
| 7 | 5997 return row; |
| 5998 } | |
| 5999 | |
| 714 | 6000 /* |
| 6001 * 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
|
6002 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 6003 */ |
| 6004 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6005 comp_char_differs(int off_from, int off_to) |
| 714 | 6006 { |
| 6007 int i; | |
| 6008 | |
| 6009 for (i = 0; i < Screen_mco; ++i) | |
| 6010 { | |
| 6011 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 6012 return TRUE; | |
| 6013 if (ScreenLinesC[i][off_from] == 0) | |
| 6014 break; | |
| 6015 } | |
| 6016 return FALSE; | |
| 6017 } | |
| 6018 | |
| 7 | 6019 /* |
| 6020 * Check whether the given character needs redrawing: | |
| 6021 * - the (first byte of the) character is different | |
| 6022 * - the attributes are different | |
| 6023 * - the character is multi-byte and the next byte is different | |
| 1616 | 6024 * - the character is two cells wide and the second cell differs. |
| 7 | 6025 */ |
| 6026 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6027 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 6028 { |
| 6029 if (cols > 0 | |
| 6030 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 6031 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6032 || (enc_dbcs != 0 | |
| 6033 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 6034 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 6035 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 6036 : (cols > 1 && ScreenLines[off_from + 1] | |
| 6037 != ScreenLines[off_to + 1]))) | |
| 6038 || (enc_utf8 | |
| 6039 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 6040 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 6041 && comp_char_differs(off_from, off_to)) |
| 3759 | 6042 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6043 && ScreenLines[off_from + 1] | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6044 != ScreenLines[off_to + 1]))))) |
| 7 | 6045 return TRUE; |
| 6046 return FALSE; | |
| 6047 } | |
| 6048 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6049 #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
|
6050 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6051 * 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
|
6052 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6053 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6054 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
|
6055 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6056 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
|
6057 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6058 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6059 |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6060 #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
|
6061 /* |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6062 * 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
|
6063 * 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
|
6064 */ |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6065 static int |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6066 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
|
6067 { |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6068 int off; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6069 |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6070 if (!popup_visible) |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6071 return FALSE; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6072 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
|
6073 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
|
6074 } |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6075 #endif |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6076 |
| 7 | 6077 /* |
| 6078 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6079 * have actually changed. Handle insert/delete character. | |
| 6080 * "coloff" gives the first column on the screen for this line. | |
| 6081 * "endcol" gives the columns where valid characters are. | |
| 6082 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6083 * 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
|
6084 * "flags" can have bits: |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6085 * SLF_POPUP popup window |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6086 * SLF_RIGHTLEFT rightleft window: |
| 7 | 6087 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" |
| 6088 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6089 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6090 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6091 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6092 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6093 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6094 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
|
6095 int clear_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6096 int flags UNUSED) |
| 7 | 6097 { |
| 6098 unsigned off_from; | |
| 6099 unsigned off_to; | |
| 1378 | 6100 unsigned max_off_from; |
| 6101 unsigned max_off_to; | |
| 7 | 6102 int col = 0; |
| 6103 int hl; | |
| 6104 int force = FALSE; /* force update rest of the line */ | |
| 6105 int redraw_this /* bool: does character need redraw? */ | |
| 6106 #ifdef FEAT_GUI | |
| 6107 = TRUE /* For GUI when while-loop empty */ | |
| 6108 #endif | |
| 6109 ; | |
| 6110 int redraw_next; /* redraw_this for next character */ | |
| 6111 int clear_next = FALSE; | |
| 6112 int char_cells; /* 1: normal char */ | |
| 6113 /* 2: occupies two display cells */ | |
| 6114 # define CHAR_CELLS char_cells | |
| 6115 | |
| 3413 | 6116 /* Check for illegal row and col, just in case. */ |
| 6117 if (row >= Rows) | |
| 6118 row = Rows - 1; | |
| 6119 if (endcol > Columns) | |
| 6120 endcol = Columns; | |
| 6121 | |
| 7 | 6122 # ifdef FEAT_CLIPBOARD |
| 6123 clip_may_clear_selection(row, row); | |
| 6124 # endif | |
| 6125 | |
| 6126 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6127 off_to = LineOffset[row] + coloff; | |
| 1378 | 6128 max_off_from = off_from + screen_Columns; |
| 6129 max_off_to = LineOffset[row] + screen_Columns; | |
| 7 | 6130 |
| 6131 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6132 if (flags & SLF_RIGHTLEFT) |
| 7 | 6133 { |
| 6134 /* Clear rest first, because it's left of the text. */ | |
| 6135 if (clear_width > 0) | |
| 6136 { | |
| 6137 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6138 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6139 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6140 { |
| 6141 ++off_to; | |
| 6142 ++col; | |
| 6143 } | |
| 6144 if (col <= endcol) | |
| 6145 screen_fill(row, row + 1, col + coloff, | |
| 6146 endcol + coloff + 1, ' ', ' ', 0); | |
| 6147 } | |
| 6148 col = endcol + 1; | |
| 6149 off_to = LineOffset[row] + col + coloff; | |
| 6150 off_from += col; | |
| 6151 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6152 } | |
| 6153 #endif /* FEAT_RIGHTLEFT */ | |
| 6154 | |
| 6155 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6156 | |
| 6157 while (col < endcol) | |
| 6158 { | |
| 6159 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6160 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6161 else |
| 6162 char_cells = 1; | |
| 6163 | |
| 6164 redraw_this = redraw_next; | |
| 6165 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6166 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6167 | |
| 6168 #ifdef FEAT_GUI | |
| 6169 /* If the next character was bold, then redraw the current character to | |
| 6170 * remove any pixels that might have spilt over into us. This only | |
| 6171 * happens in the GUI. | |
| 6172 */ | |
| 6173 if (redraw_next && gui.in_use) | |
| 6174 { | |
| 6175 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6176 if (hl > HL_ALL) |
| 6177 hl = syn_attr2attr(hl); | |
| 6178 if (hl & HL_BOLD) | |
| 7 | 6179 redraw_this = TRUE; |
| 6180 } | |
| 6181 #endif | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
6182 #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
|
6183 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
|
6184 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
|
6185 #endif |
| 7 | 6186 if (redraw_this) |
| 6187 { | |
| 6188 /* | |
| 6189 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6190 * Attributes for characters are stored at the position where the | |
| 6191 * cursor is when writing the highlighting code. The | |
| 6192 * start-highlighting code must be written with the cursor on the | |
| 6193 * first highlighted character. The stop-highlighting code must | |
| 6194 * be written with the cursor just after the last highlighted | |
| 6195 * character. | |
|
15034
6e4e0d43b20b
patch 8.1.0528: various typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
14877
diff
changeset
|
6196 * Overwriting a character doesn't remove its highlighting. Need |
| 7 | 6197 * to clear the rest of the line, and force redrawing it |
| 6198 * completely. | |
| 6199 */ | |
| 6200 if ( p_wiv | |
| 6201 && !force | |
| 6202 #ifdef FEAT_GUI | |
| 6203 && !gui.in_use | |
| 6204 #endif | |
| 6205 && ScreenAttrs[off_to] != 0 | |
| 6206 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6207 { | |
| 6208 /* | |
| 6209 * Need to remove highlighting attributes here. | |
| 6210 */ | |
| 6211 windgoto(row, col + coloff); | |
| 6212 out_str(T_CE); /* clear rest of this screen line */ | |
| 6213 screen_start(); /* don't know where cursor is now */ | |
| 6214 force = TRUE; /* force redraw of rest of the line */ | |
| 6215 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6216 | |
| 6217 /* | |
| 6218 * If the previous character was highlighted, need to stop | |
| 6219 * highlighting at this character. | |
| 6220 */ | |
| 6221 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6222 { | |
| 6223 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6224 term_windgoto(row, col + coloff); | |
| 6225 screen_stop_highlight(); | |
| 6226 } | |
| 6227 else | |
| 6228 screen_attr = 0; /* highlighting has stopped */ | |
| 6229 } | |
| 6230 if (enc_dbcs != 0) | |
| 6231 { | |
| 6232 /* Check if overwriting a double-byte with a single-byte or | |
| 6233 * the other way around requires another character to be | |
| 6234 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6235 * ScreenLinesUC[] is sufficient. */ | |
| 6236 if (char_cells == 1 | |
| 6237 && col + 1 < endcol | |
| 1378 | 6238 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6239 { |
| 6240 /* Writing a single-cell character over a double-cell | |
| 6241 * character: need to redraw the next cell. */ | |
| 6242 ScreenLines[off_to + 1] = 0; | |
| 6243 redraw_next = TRUE; | |
| 6244 } | |
| 6245 else if (char_cells == 2 | |
| 6246 && col + 2 < endcol | |
| 1378 | 6247 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6248 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6249 { |
| 6250 /* Writing the second half of a double-cell character over | |
| 6251 * a double-cell character: need to redraw the second | |
| 6252 * cell. */ | |
| 6253 ScreenLines[off_to + 2] = 0; | |
| 6254 redraw_next = TRUE; | |
| 6255 } | |
| 6256 | |
| 6257 if (enc_dbcs == DBCS_JPNU) | |
| 6258 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6259 } | |
| 6260 /* When writing a single-width character over a double-width | |
| 6261 * character and at the end of the redrawn text, need to clear out | |
| 6262 * the right halve of the old character. | |
| 6263 * Also required when writing the right halve of a double-width | |
| 6264 * char over the left halve of an existing one. */ | |
| 6265 if (has_mbyte && col + char_cells == endcol | |
| 6266 && ((char_cells == 1 | |
| 1378 | 6267 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6268 || (char_cells == 2 |
| 1378 | 6269 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6270 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6271 clear_next = TRUE; |
| 6272 | |
| 6273 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6274 if (enc_utf8) | |
| 6275 { | |
| 6276 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6277 if (ScreenLinesUC[off_from] != 0) | |
| 6278 { | |
| 714 | 6279 int i; |
| 6280 | |
| 6281 for (i = 0; i < Screen_mco; ++i) | |
| 6282 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6283 } |
| 6284 } | |
| 6285 if (char_cells == 2) | |
| 6286 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6287 | |
| 6288 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6289 /* The bold trick makes a single column of pixels appear in the |
| 6290 * next character. When a bold character is removed, the next | |
| 7 | 6291 * character should be redrawn too. This happens for our own GUI |
| 6292 * and for some xterms. */ | |
| 6293 if ( | |
| 6294 # ifdef FEAT_GUI | |
| 6295 gui.in_use | |
| 6296 # endif | |
| 6297 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6298 || | |
| 6299 # endif | |
| 6300 # ifdef UNIX | |
| 6301 term_is_xterm | |
| 6302 # endif | |
| 6303 ) | |
| 6304 { | |
| 6305 hl = ScreenAttrs[off_to]; | |
| 743 | 6306 if (hl > HL_ALL) |
| 6307 hl = syn_attr2attr(hl); | |
| 6308 if (hl & HL_BOLD) | |
| 7 | 6309 redraw_next = TRUE; |
| 6310 } | |
| 6311 #endif | |
| 6312 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6313 |
| 819 | 6314 /* For simplicity set the attributes of second half of a |
| 6315 * double-wide character equal to the first half. */ | |
| 6316 if (char_cells == 2) | |
| 6317 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6318 | |
| 7 | 6319 if (enc_dbcs != 0 && char_cells == 2) |
| 6320 screen_char_2(off_to, row, col + coloff); | |
| 6321 else | |
| 6322 screen_char(off_to, row, col + coloff); | |
| 6323 } | |
| 6324 else if ( p_wiv | |
| 6325 #ifdef FEAT_GUI | |
| 6326 && !gui.in_use | |
| 6327 #endif | |
| 6328 && col + coloff > 0) | |
| 6329 { | |
| 6330 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6331 { | |
| 6332 /* | |
| 6333 * Don't output stop-highlight when moving the cursor, it will | |
| 6334 * stop the highlighting when it should continue. | |
| 6335 */ | |
| 6336 screen_attr = 0; | |
| 6337 } | |
| 6338 else if (screen_attr != 0) | |
| 6339 screen_stop_highlight(); | |
| 6340 } | |
| 6341 | |
| 6342 off_to += CHAR_CELLS; | |
| 6343 off_from += CHAR_CELLS; | |
| 6344 col += CHAR_CELLS; | |
| 6345 } | |
| 6346 | |
| 6347 if (clear_next) | |
| 6348 { | |
| 6349 /* Clear the second half of a double-wide character of which the left | |
| 6350 * half was overwritten with a single-wide character. */ | |
| 6351 ScreenLines[off_to] = ' '; | |
| 6352 if (enc_utf8) | |
| 6353 ScreenLinesUC[off_to] = 0; | |
| 6354 screen_char(off_to, row, col + coloff); | |
| 6355 } | |
| 6356 | |
| 6357 if (clear_width > 0 | |
| 6358 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6359 && !(flags & SLF_RIGHTLEFT) |
| 7 | 6360 #endif |
| 6361 ) | |
| 6362 { | |
| 6363 #ifdef FEAT_GUI | |
| 6364 int startCol = col; | |
| 6365 #endif | |
| 6366 | |
| 6367 /* blank out the rest of the line */ | |
| 6368 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6369 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6370 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6371 { |
| 6372 ++off_to; | |
| 6373 ++col; | |
| 6374 } | |
| 6375 if (col < clear_width) | |
| 6376 { | |
| 6377 #ifdef FEAT_GUI | |
| 6378 /* | |
| 6379 * In the GUI, clearing the rest of the line may leave pixels | |
| 6380 * behind if the first character cleared was bold. Some bold | |
| 6381 * fonts spill over the left. In this case we redraw the previous | |
| 6382 * character too. If we didn't skip any blanks above, then we | |
| 6383 * only redraw if the character wasn't already redrawn anyway. | |
| 6384 */ | |
| 996 | 6385 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6386 { |
| 6387 hl = ScreenAttrs[off_to]; | |
| 6388 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6389 { |
| 6390 int prev_cells = 1; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6391 |
| 996 | 6392 if (enc_utf8) |
| 6393 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6394 * that its width is 2. */ | |
| 6395 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6396 else if (enc_dbcs != 0) | |
| 6397 { | |
| 6398 /* find previous character by counting from first | |
| 6399 * column and get its width. */ | |
| 6400 unsigned off = LineOffset[row]; | |
| 1378 | 6401 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6402 |
| 6403 while (off < off_to) | |
| 6404 { | |
| 1378 | 6405 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6406 off += prev_cells; |
| 6407 } | |
| 6408 } | |
| 6409 | |
| 6410 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6411 screen_char_2(off_to - prev_cells, row, | |
| 6412 col + coloff - prev_cells); | |
| 6413 else | |
| 6414 screen_char(off_to - prev_cells, row, | |
| 6415 col + coloff - prev_cells); | |
| 6416 } | |
| 7 | 6417 } |
| 6418 #endif | |
| 6419 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6420 ' ', ' ', 0); | |
| 6421 off_to += clear_width - col; | |
| 6422 col = clear_width; | |
| 6423 } | |
| 6424 } | |
| 6425 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6426 if (clear_width > 0 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6427 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6428 && !(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
|
6429 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6430 ) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6431 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6432 // 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
|
6433 // 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
|
6434 if (coloff + col < Columns) |
| 7 | 6435 { |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6436 #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
|
6437 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
|
6438 #endif |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6439 { |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6440 int c; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6441 |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6442 c = fillchar_vsep(&hl); |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6443 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
|
6444 || (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
|
6445 != (c >= 0x80 ? c : 0)) |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6446 || ScreenAttrs[off_to] != hl) |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6447 { |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6448 ScreenLines[off_to] = c; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6449 ScreenAttrs[off_to] = hl; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6450 if (enc_utf8) |
| 7 | 6451 { |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6452 if (c >= 0x80) |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6453 { |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6454 ScreenLinesUC[off_to] = c; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6455 ScreenLinesC[0][off_to] = 0; |
|
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 else |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6458 ScreenLinesUC[off_to] = 0; |
| 7 | 6459 } |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6460 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
|
6461 } |
| 7 | 6462 } |
| 6463 } | |
| 6464 else | |
| 6465 LineWraps[row] = FALSE; | |
| 6466 } | |
| 6467 } | |
| 6468 | |
| 474 | 6469 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6470 /* |
| 474 | 6471 * Mirror text "str" for right-left displaying. |
| 6472 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6473 */ |
| 474 | 6474 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6475 rl_mirror(char_u *str) |
| 7 | 6476 { |
| 6477 char_u *p1, *p2; | |
| 6478 int t; | |
| 6479 | |
| 6480 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6481 { | |
| 6482 t = *p1; | |
| 6483 *p1 = *p2; | |
| 6484 *p2 = t; | |
| 6485 } | |
| 6486 } | |
| 6487 #endif | |
| 6488 | |
| 6489 /* | |
| 6490 * mark all status lines for redraw; used after first :cd | |
| 6491 */ | |
| 6492 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6493 status_redraw_all(void) |
| 7 | 6494 { |
| 6495 win_T *wp; | |
| 6496 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6497 FOR_ALL_WINDOWS(wp) |
| 7 | 6498 if (wp->w_status_height) |
| 6499 { | |
| 6500 wp->w_redr_status = TRUE; | |
| 6501 redraw_later(VALID); | |
| 6502 } | |
| 6503 } | |
| 6504 | |
| 6505 /* | |
| 6506 * mark all status lines of the current buffer for redraw | |
| 6507 */ | |
| 6508 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6509 status_redraw_curbuf(void) |
| 7 | 6510 { |
| 6511 win_T *wp; | |
| 6512 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6513 FOR_ALL_WINDOWS(wp) |
| 7 | 6514 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6515 { | |
| 6516 wp->w_redr_status = TRUE; | |
| 6517 redraw_later(VALID); | |
| 6518 } | |
| 6519 } | |
| 6520 | |
| 6521 /* | |
| 6522 * Redraw all status lines that need to be redrawn. | |
| 6523 */ | |
| 6524 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6525 redraw_statuslines(void) |
| 7 | 6526 { |
| 6527 win_T *wp; | |
| 6528 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6529 FOR_ALL_WINDOWS(wp) |
| 7 | 6530 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
|
6531 win_redr_status(wp, FALSE); |
| 673 | 6532 if (redraw_tabline) |
| 677 | 6533 draw_tabline(); |
| 7 | 6534 } |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6535 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6536 #if defined(FEAT_WILDMENU) || defined(PROTO) |
| 7 | 6537 /* |
| 6538 * Redraw all status lines at the bottom of frame "frp". | |
| 6539 */ | |
| 6540 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6541 win_redraw_last_status(frame_T *frp) |
| 7 | 6542 { |
| 6543 if (frp->fr_layout == FR_LEAF) | |
| 6544 frp->fr_win->w_redr_status = TRUE; | |
| 6545 else if (frp->fr_layout == FR_ROW) | |
| 6546 { | |
|
15227
95678f27a704
patch 8.1.0623: iterating through window frames is repeated
Bram Moolenaar <Bram@vim.org>
parents:
15138
diff
changeset
|
6547 FOR_ALL_FRAMES(frp, frp->fr_child) |
| 7 | 6548 win_redraw_last_status(frp); |
| 6549 } | |
| 6550 else /* frp->fr_layout == FR_COL */ | |
| 6551 { | |
| 6552 frp = frp->fr_child; | |
| 6553 while (frp->fr_next != NULL) | |
| 6554 frp = frp->fr_next; | |
| 6555 win_redraw_last_status(frp); | |
| 6556 } | |
| 6557 } | |
| 6558 #endif | |
| 6559 | |
| 6560 /* | |
| 6561 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6562 */ | |
| 6563 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6564 draw_vsep_win(win_T *wp, int row) |
| 7 | 6565 { |
| 6566 int hl; | |
| 6567 int c; | |
| 6568 | |
| 6569 if (wp->w_vsep_width) | |
| 6570 { | |
| 6571 /* draw the vertical separator right of this window */ | |
| 6572 c = fillchar_vsep(&hl); | |
| 6573 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6574 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6575 c, ' ', hl); | |
| 6576 } | |
| 6577 } | |
| 6578 | |
| 6579 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6580 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6581 |
| 6582 /* | |
| 1378 | 6583 * Get the length of an item as it will be shown in the status line. |
| 7 | 6584 */ |
| 6585 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6586 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6587 { |
| 6588 int len = 0; | |
| 6589 | |
| 6590 #ifdef FEAT_MENU | |
| 6591 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6592 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6593 | |
| 6594 /* Check for menu separators - replace with '|'. */ | |
| 6595 if (emenu && menu_is_separator(s)) | |
| 6596 return 1; | |
| 6597 #endif | |
| 6598 | |
| 6599 while (*s != NUL) | |
| 6600 { | |
| 1685 | 6601 s += skip_status_match_char(xp, s); |
| 42 | 6602 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6603 MB_PTR_ADV(s); |
| 7 | 6604 } |
| 6605 | |
| 6606 return len; | |
| 6607 } | |
| 6608 | |
| 6609 /* | |
| 1685 | 6610 * Return the number of characters that should be skipped in a status match. |
| 277 | 6611 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6612 */ | |
| 6613 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6614 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6615 { |
| 1685 | 6616 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6617 #ifdef FEAT_MENU |
| 6618 || ((xp->xp_context == EXPAND_MENUS | |
| 6619 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6620 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6621 #endif | |
| 1685 | 6622 ) |
| 6623 { | |
| 6624 #ifndef BACKSLASH_IN_FILENAME | |
| 6625 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6626 return 2; | |
| 6627 #endif | |
| 6628 return 1; | |
| 6629 } | |
| 6630 return 0; | |
| 277 | 6631 } |
| 6632 | |
| 6633 /* | |
| 7 | 6634 * Show wildchar matches in the status line. |
| 6635 * Show at least the "match" item. | |
| 6636 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6637 * | |
| 6638 * If inversion is possible we use it. Else '=' characters are used. | |
| 6639 */ | |
| 6640 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6641 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6642 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6643 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6644 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6645 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6646 int showtail) |
| 7 | 6647 { |
| 6648 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6649 int row; | |
| 6650 char_u *buf; | |
| 6651 int len; | |
| 1378 | 6652 int clen; /* length in screen cells */ |
| 7 | 6653 int fillchar; |
| 6654 int attr; | |
| 6655 int i; | |
| 6656 int highlight = TRUE; | |
| 6657 char_u *selstart = NULL; | |
| 6658 int selstart_col = 0; | |
| 6659 char_u *selend = NULL; | |
| 6660 static int first_match = 0; | |
| 6661 int add_left = FALSE; | |
| 6662 char_u *s; | |
| 6663 #ifdef FEAT_MENU | |
| 6664 int emenu; | |
| 6665 #endif | |
| 6666 int l; | |
| 6667 | |
| 6668 if (matches == NULL) /* interrupted completion? */ | |
| 6669 return; | |
| 6670 | |
| 39 | 6671 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
|
6672 buf = alloc(Columns * MB_MAXBYTES + 1); |
| 39 | 6673 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
|
6674 buf = alloc(Columns + 1); |
| 7 | 6675 if (buf == NULL) |
| 6676 return; | |
| 6677 | |
| 6678 if (match == -1) /* don't show match but original text */ | |
| 6679 { | |
| 6680 match = 0; | |
| 6681 highlight = FALSE; | |
| 6682 } | |
| 6683 /* count 1 for the ending ">" */ | |
| 6684 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6685 if (match == 0) | |
| 6686 first_match = 0; | |
| 6687 else if (match < first_match) | |
| 6688 { | |
| 6689 /* jumping left, as far as we can go */ | |
| 6690 first_match = match; | |
| 6691 add_left = TRUE; | |
| 6692 } | |
| 6693 else | |
| 6694 { | |
| 6695 /* check if match fits on the screen */ | |
| 6696 for (i = first_match; i < match; ++i) | |
| 6697 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6698 if (first_match > 0) | |
| 6699 clen += 2; | |
| 6700 /* jumping right, put match at the left */ | |
| 6701 if ((long)clen > Columns) | |
| 6702 { | |
| 6703 first_match = match; | |
| 6704 /* if showing the last match, we can add some on the left */ | |
| 6705 clen = 2; | |
| 6706 for (i = match; i < num_matches; ++i) | |
| 6707 { | |
| 6708 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6709 if ((long)clen >= Columns) | |
| 6710 break; | |
| 6711 } | |
| 6712 if (i == num_matches) | |
| 6713 add_left = TRUE; | |
| 6714 } | |
| 6715 } | |
| 6716 if (add_left) | |
| 6717 while (first_match > 0) | |
| 6718 { | |
| 6719 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6720 if ((long)clen >= Columns) | |
| 6721 break; | |
| 6722 --first_match; | |
| 6723 } | |
| 6724 | |
|
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
|
6725 fillchar = fillchar_status(&attr, curwin); |
| 7 | 6726 |
| 6727 if (first_match == 0) | |
| 6728 { | |
| 6729 *buf = NUL; | |
| 6730 len = 0; | |
| 6731 } | |
| 6732 else | |
| 6733 { | |
| 6734 STRCPY(buf, "< "); | |
| 6735 len = 2; | |
| 6736 } | |
| 6737 clen = len; | |
| 6738 | |
| 6739 i = first_match; | |
| 6740 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6741 { | |
| 6742 if (i == match) | |
| 6743 { | |
| 6744 selstart = buf + len; | |
| 6745 selstart_col = clen; | |
| 6746 } | |
| 6747 | |
| 6748 s = L_MATCH(i); | |
| 6749 /* Check for menu separators - replace with '|' */ | |
| 6750 #ifdef FEAT_MENU | |
| 6751 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6752 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6753 if (emenu && menu_is_separator(s)) | |
| 6754 { | |
| 6755 STRCPY(buf + len, transchar('|')); | |
| 6756 l = (int)STRLEN(buf + len); | |
| 6757 len += l; | |
| 6758 clen += l; | |
| 6759 } | |
| 6760 else | |
| 6761 #endif | |
| 6762 for ( ; *s != NUL; ++s) | |
| 6763 { | |
| 1685 | 6764 s += skip_status_match_char(xp, s); |
| 7 | 6765 clen += ptr2cells(s); |
| 474 | 6766 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6767 { |
| 6768 STRNCPY(buf + len, s, l); | |
| 6769 s += l - 1; | |
| 6770 len += l; | |
| 6771 } | |
| 6772 else | |
| 6773 { | |
| 6774 STRCPY(buf + len, transchar_byte(*s)); | |
| 6775 len += (int)STRLEN(buf + len); | |
| 6776 } | |
| 6777 } | |
| 6778 if (i == match) | |
| 6779 selend = buf + len; | |
| 6780 | |
| 6781 *(buf + len++) = ' '; | |
| 6782 *(buf + len++) = ' '; | |
| 6783 clen += 2; | |
| 6784 if (++i == num_matches) | |
| 6785 break; | |
| 6786 } | |
| 6787 | |
| 6788 if (i != num_matches) | |
| 6789 { | |
| 6790 *(buf + len++) = '>'; | |
| 6791 ++clen; | |
| 6792 } | |
| 6793 | |
| 6794 buf[len] = NUL; | |
| 6795 | |
| 6796 row = cmdline_row - 1; | |
| 6797 if (row >= 0) | |
| 6798 { | |
| 6799 if (wild_menu_showing == 0) | |
| 6800 { | |
| 6801 if (msg_scrolled > 0) | |
| 6802 { | |
| 6803 /* Put the wildmenu just above the command line. If there is | |
| 6804 * no room, scroll the screen one line up. */ | |
| 6805 if (cmdline_row == Rows - 1) | |
| 6806 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
6807 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 6808 ++msg_scrolled; |
| 6809 } | |
| 6810 else | |
| 6811 { | |
| 6812 ++cmdline_row; | |
| 6813 ++row; | |
| 6814 } | |
| 6815 wild_menu_showing = WM_SCROLLED; | |
| 6816 } | |
| 6817 else | |
| 6818 { | |
| 6819 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6820 * Set 'winminheight' to zero to avoid that the window is | |
| 6821 * resized. */ | |
| 6822 if (lastwin->w_status_height == 0) | |
| 6823 { | |
| 6824 save_p_ls = p_ls; | |
| 6825 save_p_wmh = p_wmh; | |
| 6826 p_ls = 2; | |
| 6827 p_wmh = 0; | |
| 6828 last_status(FALSE); | |
| 6829 } | |
| 6830 wild_menu_showing = WM_SHOWN; | |
| 6831 } | |
| 6832 } | |
| 6833 | |
| 6834 screen_puts(buf, row, 0, attr); | |
| 6835 if (selstart != NULL && highlight) | |
| 6836 { | |
| 6837 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
6838 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 6839 } |
| 6840 | |
| 6841 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6842 } | |
| 6843 | |
| 6844 win_redraw_last_status(topframe); | |
| 6845 vim_free(buf); | |
| 6846 } | |
| 6847 #endif | |
| 6848 | |
| 6849 /* | |
| 6850 * Redraw the status line of window wp. | |
| 6851 * | |
| 6852 * 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
|
6853 * 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
|
6854 * displayed. |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6855 */ |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6856 static void |
|
14191
ec39f281e3e8
patch 8.1.0113: compiler warning for unused variable
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
6857 win_redr_status(win_T *wp, int ignore_pum UNUSED) |
| 7 | 6858 { |
| 6859 int row; | |
| 6860 char_u *p; | |
| 6861 int len; | |
| 6862 int fillchar; | |
| 6863 int attr; | |
| 6864 int this_ru_col; | |
| 1910 | 6865 static int busy = FALSE; |
| 6866 | |
| 6867 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6868 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6869 if (busy) | |
| 6870 return; | |
| 6871 busy = TRUE; | |
| 7 | 6872 |
| 6873 wp->w_redr_status = FALSE; | |
| 6874 if (wp->w_status_height == 0) | |
| 6875 { | |
| 6876 /* no status line, can only be last window */ | |
| 6877 redraw_cmdline = TRUE; | |
| 6878 } | |
| 540 | 6879 else if (!redrawing() |
| 6880 #ifdef FEAT_INS_EXPAND | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6881 // 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
|
6882 // drawn over it, unless it will be redrawn later |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6883 || (!ignore_pum && pum_visible()) |
| 540 | 6884 #endif |
| 6885 ) | |
| 7 | 6886 { |
| 6887 /* Don't redraw right now, do it later. */ | |
| 6888 wp->w_redr_status = TRUE; | |
| 6889 } | |
| 6890 #ifdef FEAT_STL_OPT | |
| 40 | 6891 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 6892 { |
| 6893 /* redraw custom status line */ | |
| 1983 | 6894 redraw_custom_statusline(wp); |
| 7 | 6895 } |
| 6896 #endif | |
| 6897 else | |
| 6898 { | |
|
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
|
6899 fillchar = fillchar_status(&attr, wp); |
| 7 | 6900 |
| 685 | 6901 get_trans_bufname(wp->w_buffer); |
| 7 | 6902 p = NameBuff; |
| 6903 len = (int)STRLEN(p); | |
| 6904 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
6905 if (bt_help(wp->w_buffer) |
| 7 | 6906 #ifdef FEAT_QUICKFIX |
| 6907 || wp->w_p_pvw | |
| 6908 #endif | |
| 6909 || bufIsChanged(wp->w_buffer) | |
| 6910 || wp->w_buffer->b_p_ro) | |
| 6911 *(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
|
6912 if (bt_help(wp->w_buffer)) |
| 7 | 6913 { |
| 809 | 6914 STRCPY(p + len, _("[Help]")); |
| 7 | 6915 len += (int)STRLEN(p + len); |
| 6916 } | |
| 6917 #ifdef FEAT_QUICKFIX | |
| 6918 if (wp->w_p_pvw) | |
| 6919 { | |
| 6920 STRCPY(p + len, _("[Preview]")); | |
| 6921 len += (int)STRLEN(p + len); | |
| 6922 } | |
| 6923 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6924 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
|
6925 #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
|
6926 && !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
|
6927 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6928 ) |
| 7 | 6929 { |
| 6930 STRCPY(p + len, "[+]"); | |
| 6931 len += 3; | |
| 6932 } | |
| 6933 if (wp->w_buffer->b_p_ro) | |
| 6934 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
6935 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
|
6936 len += (int)STRLEN(p + len); |
| 7 | 6937 } |
| 6938 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6939 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
|
6940 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
|
6941 this_ru_col = (wp->w_width + 1) / 2; |
| 7 | 6942 if (this_ru_col <= 1) |
| 6943 { | |
| 6944 p = (char_u *)"<"; /* No room for file name! */ | |
| 6945 len = 1; | |
| 6946 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6947 else if (has_mbyte) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6948 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6949 int clen = 0, i; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6950 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6951 /* Count total number of display cells. */ |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6952 clen = mb_string2cells(p, -1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6953 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6954 /* Find first character that will fit. |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6955 * 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
|
6956 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
|
6957 i += (*mb_ptr2len)(p + i)) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6958 clen -= (*mb_ptr2cells)(p + i); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6959 len = clen; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6960 if (i > 0) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6961 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6962 p = p + i - 1; |
| 7 | 6963 *p = '<'; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6964 ++len; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6965 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6966 |
|
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 else if (len > this_ru_col - 1) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6969 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6970 p += len - (this_ru_col - 1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6971 *p = '<'; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6972 len = this_ru_col - 1; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6973 } |
| 7 | 6974 |
| 6975 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
|
6976 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
|
6977 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
|
6978 this_ru_col + wp->w_wincol, fillchar, fillchar, attr); |
| 7 | 6979 |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6980 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 6981 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 6982 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
|
6983 - 1 + wp->w_wincol), attr); |
| 7 | 6984 |
| 6985 #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
|
6986 win_redr_ruler(wp, TRUE, ignore_pum); |
| 7 | 6987 #endif |
| 6988 } | |
| 6989 | |
| 6990 /* | |
| 6991 * May need to draw the character below the vertical separator. | |
| 6992 */ | |
| 6993 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 6994 { | |
| 6995 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
|
6996 fillchar = fillchar_status(&attr, wp); |
| 7 | 6997 else |
| 6998 fillchar = fillchar_vsep(&attr); | |
| 6999 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 7000 attr); | |
| 7001 } | |
| 1910 | 7002 busy = FALSE; |
| 7 | 7003 } |
| 7004 | |
| 680 | 7005 #ifdef FEAT_STL_OPT |
| 7006 /* | |
| 7007 * Redraw the status line according to 'statusline' and take care of any | |
| 7008 * errors encountered. | |
| 7009 */ | |
| 7010 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7011 redraw_custom_statusline(win_T *wp) |
| 680 | 7012 { |
| 1983 | 7013 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7014 int saved_did_emsg = did_emsg; |
| 1983 | 7015 |
| 7016 /* When called recursively return. This can happen when the statusline | |
| 7017 * contains an expression that triggers a redraw. */ | |
| 7018 if (entered) | |
| 7019 return; | |
| 7020 entered = TRUE; | |
| 680 | 7021 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7022 did_emsg = FALSE; |
| 680 | 7023 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7024 if (did_emsg) |
| 1983 | 7025 { |
| 7026 /* When there is an error disable the statusline, otherwise the | |
| 7027 * display is messed up with errors and a redraw triggers the problem | |
| 7028 * again and again. */ | |
| 680 | 7029 set_string_option_direct((char_u *)"statusline", -1, |
| 7030 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7031 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7032 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7033 did_emsg |= saved_did_emsg; |
| 1983 | 7034 entered = FALSE; |
| 680 | 7035 } |
| 7036 #endif | |
| 7037 | |
| 7 | 7038 /* |
| 7039 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7040 * line of the window right of it. If not, then it's a vertical separator. | |
| 7041 * Only call if (wp->w_vsep_width != 0). | |
| 7042 */ | |
| 7043 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7044 stl_connected(win_T *wp) |
| 7 | 7045 { |
| 7046 frame_T *fr; | |
| 7047 | |
| 7048 fr = wp->w_frame; | |
| 7049 while (fr->fr_parent != NULL) | |
| 7050 { | |
| 7051 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7052 { | |
| 7053 if (fr->fr_next != NULL) | |
| 7054 break; | |
| 7055 } | |
| 7056 else | |
| 7057 { | |
| 7058 if (fr->fr_next != NULL) | |
| 7059 return TRUE; | |
| 7060 } | |
| 7061 fr = fr->fr_parent; | |
| 7062 } | |
| 7063 return FALSE; | |
| 7064 } | |
| 7065 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7066 |
| 7 | 7067 /* |
| 7068 * Get the value to show for the language mappings, active 'keymap'. | |
| 7069 */ | |
| 7070 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7071 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7072 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7073 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
|
7074 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
|
7075 int len) /* length of buffer */ |
| 7 | 7076 { |
| 7077 char_u *p; | |
| 7078 | |
| 7079 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7080 return FALSE; | |
| 7081 | |
| 7082 { | |
| 7083 #ifdef FEAT_EVAL | |
| 7084 buf_T *old_curbuf = curbuf; | |
| 7085 win_T *old_curwin = curwin; | |
| 7086 char_u *s; | |
| 7087 | |
| 7088 curbuf = wp->w_buffer; | |
| 7089 curwin = wp; | |
| 7090 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7091 ++emsg_skip; | |
| 714 | 7092 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7093 --emsg_skip; |
| 7094 curbuf = old_curbuf; | |
| 7095 curwin = old_curwin; | |
| 7096 if (p == NULL || *p == NUL) | |
| 7097 #endif | |
| 7098 { | |
| 7099 #ifdef FEAT_KEYMAP | |
| 7100 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7101 p = wp->w_buffer->b_p_keymap; | |
| 7102 else | |
| 7103 #endif | |
| 7104 p = (char_u *)"lang"; | |
| 7105 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7106 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7107 buf[0] = NUL; |
| 7108 #ifdef FEAT_EVAL | |
| 7109 vim_free(s); | |
| 7110 #endif | |
| 7111 } | |
| 7112 return buf[0] != NUL; | |
| 7113 } | |
| 7114 | |
| 7115 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7116 /* | |
| 677 | 7117 * Redraw the status line or ruler of window "wp". |
| 7118 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7119 */ |
| 7120 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7121 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7122 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7123 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7124 { |
| 5539 | 7125 static int entered = FALSE; |
| 7 | 7126 int attr; |
| 7127 int curattr; | |
| 7128 int row; | |
| 7129 int col = 0; | |
| 7130 int maxwidth; | |
| 7131 int width; | |
| 7132 int n; | |
| 7133 int len; | |
| 7134 int fillchar; | |
| 7135 char_u buf[MAXPATHL]; | |
| 1983 | 7136 char_u *stl; |
| 7 | 7137 char_u *p; |
| 681 | 7138 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7139 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7140 int use_sandbox = FALSE; |
| 2693 | 7141 win_T *ewp; |
| 7142 int p_crb_save; | |
| 7 | 7143 |
| 5539 | 7144 /* There is a tiny chance that this gets called recursively: When |
| 7145 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7146 * Avoid trouble by not allowing recursion. */ | |
| 7147 if (entered) | |
| 7148 return; | |
| 7149 entered = TRUE; | |
| 7150 | |
| 7 | 7151 /* setup environment for the task at hand */ |
| 677 | 7152 if (wp == NULL) |
| 7153 { | |
| 7154 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7155 stl = p_tal; |
| 677 | 7156 row = 0; |
| 707 | 7157 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7158 attr = HL_ATTR(HLF_TPF); |
| 677 | 7159 maxwidth = Columns; |
| 7160 # ifdef FEAT_EVAL | |
| 681 | 7161 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7162 # endif |
| 7163 } | |
| 40 | 7164 else |
| 677 | 7165 { |
| 7166 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
|
7167 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
|
7168 maxwidth = wp->w_width; |
| 677 | 7169 |
| 7170 if (draw_ruler) | |
| 7171 { | |
| 1983 | 7172 stl = p_ruf; |
| 677 | 7173 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7174 if (*stl == '%') |
| 7175 { | |
| 7176 if (*++stl == '-') | |
| 7177 stl++; | |
| 7178 if (atoi((char *)stl)) | |
| 7179 while (VIM_ISDIGIT(*stl)) | |
| 7180 stl++; | |
| 7181 if (*stl++ != '(') | |
| 7182 stl = p_ruf; | |
| 677 | 7183 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7184 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
|
7185 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
|
7186 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
|
7187 maxwidth = wp->w_width - col; |
| 677 | 7188 if (!wp->w_status_height) |
| 7189 { | |
| 7190 row = Rows - 1; | |
| 7191 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7192 fillchar = ' '; | |
| 7193 attr = 0; | |
| 7194 } | |
| 7195 | |
| 7196 # ifdef FEAT_EVAL | |
| 681 | 7197 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7198 # endif |
| 7199 } | |
| 7200 else | |
| 7201 { | |
| 7202 if (*wp->w_p_stl != NUL) | |
| 1983 | 7203 stl = wp->w_p_stl; |
| 677 | 7204 else |
| 1983 | 7205 stl = p_stl; |
| 677 | 7206 # ifdef FEAT_EVAL |
| 681 | 7207 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7208 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7209 # endif |
| 7210 } | |
| 7211 | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7212 col += wp->w_wincol; |
| 677 | 7213 } |
| 7214 | |
| 7 | 7215 if (maxwidth <= 0) |
| 5539 | 7216 goto theend; |
| 677 | 7217 |
| 2693 | 7218 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7219 * the cursor away and back. */ | |
| 7220 ewp = wp == NULL ? curwin : wp; | |
| 7221 p_crb_save = ewp->w_p_crb; | |
| 7222 ewp->w_p_crb = FALSE; | |
| 7223 | |
| 1983 | 7224 /* Make a copy, because the statusline may include a function call that |
| 7225 * might change the option value and free the memory. */ | |
| 7226 stl = vim_strsave(stl); | |
| 2693 | 7227 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7228 stl, use_sandbox, |
| 681 | 7229 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7230 vim_free(stl); |
| 2693 | 7231 ewp->w_p_crb = p_crb_save; |
| 2661 | 7232 |
| 7233 /* Make all characters printable. */ | |
| 7234 p = transstr(buf); | |
| 7235 if (p != NULL) | |
| 7236 { | |
| 7237 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7238 vim_free(p); | |
| 7239 } | |
| 7240 | |
| 7241 /* fill up with "fillchar" */ | |
| 835 | 7242 len = (int)STRLEN(buf); |
| 1883 | 7243 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7244 { |
| 7245 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7246 ++width; | |
| 7247 } | |
| 7248 buf[len] = NUL; | |
| 7249 | |
| 681 | 7250 /* |
| 7251 * Draw each snippet with the specified highlighting. | |
| 7252 */ | |
| 7 | 7253 curattr = attr; |
| 7254 p = buf; | |
| 681 | 7255 for (n = 0; hltab[n].start != NULL; n++) |
| 7256 { | |
| 7257 len = (int)(hltab[n].start - p); | |
| 7 | 7258 screen_puts_len(p, len, row, col, curattr); |
| 7259 col += vim_strnsize(p, len); | |
| 681 | 7260 p = hltab[n].start; |
| 7261 | |
| 7262 if (hltab[n].userhl == 0) | |
| 7 | 7263 curattr = attr; |
| 681 | 7264 else if (hltab[n].userhl < 0) |
| 7265 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
|
7266 #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
|
7267 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
|
7268 && 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
|
7269 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
|
7270 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
|
7271 && 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
|
7272 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
|
7273 #endif |
| 680 | 7274 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7275 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7276 else |
| 681 | 7277 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7278 } |
| 7279 screen_puts(p, row, col, curattr); | |
| 681 | 7280 |
| 7281 if (wp == NULL) | |
| 7282 { | |
| 7283 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7284 col = 0; | |
| 7285 len = 0; | |
| 7286 p = buf; | |
| 7287 fillchar = 0; | |
| 7288 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7289 { | |
| 7290 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7291 while (col < len) | |
| 7292 TabPageIdxs[col++] = fillchar; | |
| 7293 p = tabtab[n].start; | |
| 7294 fillchar = tabtab[n].userhl; | |
| 7295 } | |
| 7296 while (col < Columns) | |
| 7297 TabPageIdxs[col++] = fillchar; | |
| 7298 } | |
| 5539 | 7299 |
| 7300 theend: | |
| 7301 entered = FALSE; | |
| 7 | 7302 } |
| 7303 | |
| 7304 #endif /* FEAT_STL_OPT */ | |
| 7305 | |
| 7306 /* | |
| 7307 * Output a single character directly to the screen and update ScreenLines. | |
| 7308 */ | |
| 7309 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7310 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7311 { |
| 3549 | 7312 char_u buf[MB_MAXBYTES + 1]; |
| 7313 | |
| 7314 if (has_mbyte) | |
| 7315 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7316 else | |
| 7317 { | |
| 7318 buf[0] = c; | |
| 7319 buf[1] = NUL; | |
| 7320 } | |
| 7 | 7321 screen_puts(buf, row, col, attr); |
| 7322 } | |
| 7323 | |
| 7324 /* | |
| 7325 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7326 * Also return its attribute in *attrp; | |
| 7327 */ | |
| 7328 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7329 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7330 { |
| 7331 unsigned off; | |
| 7332 | |
| 7333 /* safety check */ | |
| 7334 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7335 { | |
| 7336 off = LineOffset[row] + col; | |
| 7337 *attrp = ScreenAttrs[off]; | |
| 7338 bytes[0] = ScreenLines[off]; | |
| 7339 bytes[1] = NUL; | |
| 7340 | |
| 7341 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7342 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7343 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7344 { | |
| 7345 bytes[0] = ScreenLines[off]; | |
| 7346 bytes[1] = ScreenLines2[off]; | |
| 7347 bytes[2] = NUL; | |
| 7348 } | |
| 7349 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7350 { | |
| 7351 bytes[1] = ScreenLines[off + 1]; | |
| 7352 bytes[2] = NUL; | |
| 7353 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7354 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7355 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7356 |
| 714 | 7357 /* |
| 7358 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7359 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7360 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7361 */ |
| 7362 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7363 screen_comp_differs(int off, int *u8cc) |
| 714 | 7364 { |
| 7365 int i; | |
| 7366 | |
| 7367 for (i = 0; i < Screen_mco; ++i) | |
| 7368 { | |
| 7369 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7370 return TRUE; | |
| 7371 if (u8cc[i] == 0) | |
| 7372 break; | |
| 7373 } | |
| 7374 return FALSE; | |
| 7375 } | |
| 7376 | |
| 7 | 7377 /* |
| 7378 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7379 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7380 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7381 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7382 */ | |
| 7383 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7384 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7385 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7386 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7387 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7388 int attr) |
| 7 | 7389 { |
| 7390 screen_puts_len(text, -1, row, col, attr); | |
| 7391 } | |
| 7392 | |
| 7393 /* | |
| 7394 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7395 * a NUL. | |
| 7396 */ | |
| 7397 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7398 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7399 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7400 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7401 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7402 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7403 int attr) |
| 7 | 7404 { |
| 7405 unsigned off; | |
| 7406 char_u *ptr = text; | |
| 5923 | 7407 int len = textlen; |
| 7 | 7408 int c; |
| 1378 | 7409 unsigned max_off; |
| 7 | 7410 int mbyte_blen = 1; |
| 7411 int mbyte_cells = 1; | |
| 7412 int u8c = 0; | |
| 714 | 7413 int u8cc[MAX_MCO]; |
| 7 | 7414 int clear_next_cell = FALSE; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7415 #ifdef FEAT_ARABIC |
| 7 | 7416 int prev_c = 0; /* previous Arabic character */ |
| 714 | 7417 int pc, nc, nc1; |
| 7418 int pcc[MAX_MCO]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7419 #endif |
| 1843 | 7420 int force_redraw_this; |
| 7421 int force_redraw_next = FALSE; | |
| 7422 int need_redraw; | |
| 7 | 7423 |
|
16914
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7424 // 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
|
7425 // #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
|
7426 if (ScreenLines == NULL |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7427 || row >= screen_Rows || row < 0 |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7428 || col >= screen_Columns || col < 0) |
| 7 | 7429 return; |
| 1843 | 7430 off = LineOffset[row] + col; |
| 7 | 7431 |
| 1668 | 7432 /* When drawing over the right halve of a double-wide char clear out the |
| 7433 * left halve. Only needed in a terminal. */ | |
| 1685 | 7434 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
|
7435 #ifdef FEAT_GUI |
| 1668 | 7436 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7437 #endif |
| 1668 | 7438 && mb_fix_col(col, row) != col) |
| 1843 | 7439 { |
| 7440 ScreenLines[off - 1] = ' '; | |
| 7441 ScreenAttrs[off - 1] = 0; | |
| 7442 if (enc_utf8) | |
| 7443 { | |
| 7444 ScreenLinesUC[off - 1] = 0; | |
| 7445 ScreenLinesC[0][off - 1] = 0; | |
| 7446 } | |
| 7447 /* redraw the previous cell, make it empty */ | |
| 7448 screen_char(off - 1, row, col - 1); | |
| 7449 /* force the cell at "col" to be redrawn */ | |
| 7450 force_redraw_next = TRUE; | |
| 7451 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7452 |
| 1378 | 7453 max_off = LineOffset[row] + screen_Columns; |
| 1340 | 7454 while (col < screen_Columns |
| 7455 && (len < 0 || (int)(ptr - text) < len) | |
| 7456 && *ptr != NUL) | |
| 7 | 7457 { |
| 7458 c = *ptr; | |
| 7459 /* check if this is the first byte of a multibyte */ | |
| 7460 if (has_mbyte) | |
| 7461 { | |
| 7462 if (enc_utf8 && len > 0) | |
| 474 | 7463 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7464 else |
| 474 | 7465 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7466 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7467 mbyte_cells = 1; | |
| 7468 else if (enc_dbcs != 0) | |
| 7469 mbyte_cells = mbyte_blen; | |
| 7470 else /* enc_utf8 */ | |
| 7471 { | |
| 7472 if (len >= 0) | |
| 714 | 7473 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7474 (int)((text + len) - ptr)); |
| 7475 else | |
| 714 | 7476 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7477 mbyte_cells = utf_char2cells(u8c); |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7478 #ifdef FEAT_ARABIC |
| 7 | 7479 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) |
| 7480 { | |
| 7481 /* Do Arabic shaping. */ | |
| 7482 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7483 { | |
| 7484 /* Past end of string to be displayed. */ | |
| 7485 nc = NUL; | |
| 7486 nc1 = NUL; | |
| 7487 } | |
| 7488 else | |
| 714 | 7489 { |
| 1994 | 7490 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7491 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7492 nc1 = pcc[0]; |
| 7493 } | |
| 7 | 7494 pc = prev_c; |
| 7495 prev_c = u8c; | |
| 714 | 7496 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7497 } |
| 7498 else | |
| 7499 prev_c = u8c; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7500 #endif |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7501 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7502 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7503 /* 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
|
7504 * 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
|
7505 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7506 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7507 } |
| 7 | 7508 } |
| 7509 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7510 |
| 1843 | 7511 force_redraw_this = force_redraw_next; |
| 7512 force_redraw_next = FALSE; | |
| 7513 | |
| 7514 need_redraw = ScreenLines[off] != c | |
| 7 | 7515 || (mbyte_cells == 2 |
| 7516 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7517 || (enc_dbcs == DBCS_JPNU | |
| 7518 && c == 0x8e | |
| 7519 && ScreenLines2[off] != ptr[1]) | |
| 7520 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7521 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7522 (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
|
7523 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7524 && screen_comp_differs(off, u8cc)))) |
| 7 | 7525 || ScreenAttrs[off] != attr |
| 1843 | 7526 || exmode_active; |
| 7527 | |
|
16998
2ec0f953ec3f
patch 8.1.1499: ruler not updated after popup window was removed
Bram Moolenaar <Bram@vim.org>
parents:
16994
diff
changeset
|
7528 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
|
7529 #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
|
7530 && !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
|
7531 #endif |
|
2ec0f953ec3f
patch 8.1.1499: ruler not updated after popup window was removed
Bram Moolenaar <Bram@vim.org>
parents:
16994
diff
changeset
|
7532 ) |
| 7 | 7533 { |
| 7534 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7535 /* The bold trick makes a single row of pixels appear in the next | |
| 7536 * character. When a bold character is removed, the next | |
| 7537 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7538 * and for some xterms. */ |
| 7539 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7540 # ifdef FEAT_GUI |
| 7541 gui.in_use | |
| 7542 # endif | |
| 7543 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7544 || | |
| 7545 # endif | |
| 7546 # ifdef UNIX | |
| 7547 term_is_xterm | |
| 7548 # endif | |
| 1843 | 7549 )) |
| 7550 { | |
| 7551 int n = ScreenAttrs[off]; | |
| 7552 | |
| 7553 if (n > HL_ALL) | |
| 7554 n = syn_attr2attr(n); | |
| 7555 if (n & HL_BOLD) | |
| 7556 force_redraw_next = TRUE; | |
| 7 | 7557 } |
| 7558 #endif | |
| 7559 /* When at the end of the text and overwriting a two-cell | |
| 7560 * character with a one-cell character, need to clear the next | |
| 7561 * cell. Also when overwriting the left halve of a two-cell char | |
| 7562 * with the right halve of a two-cell char. Do this only once | |
| 7563 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7564 if (clear_next_cell) | |
| 7565 clear_next_cell = FALSE; | |
| 7566 else if (has_mbyte | |
| 7567 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7568 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7569 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7570 || (mbyte_cells == 2 |
| 1378 | 7571 && (*mb_off2cells)(off, max_off) == 1 |
| 7572 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7573 clear_next_cell = TRUE; |
| 7574 | |
| 7575 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7576 * it confuses mb_off2cells(). */ | |
| 7577 if (enc_dbcs | |
| 1378 | 7578 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7579 || (mbyte_cells == 2 |
| 1378 | 7580 && (*mb_off2cells)(off, max_off) == 1 |
| 7581 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7582 ScreenLines[off + mbyte_blen] = 0; |
| 7583 ScreenLines[off] = c; | |
| 7584 ScreenAttrs[off] = attr; | |
| 7585 if (enc_utf8) | |
| 7586 { | |
| 714 | 7587 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7588 ScreenLinesUC[off] = 0; |
| 7589 else | |
| 7590 { | |
| 714 | 7591 int i; |
| 7592 | |
| 7 | 7593 ScreenLinesUC[off] = u8c; |
| 714 | 7594 for (i = 0; i < Screen_mco; ++i) |
| 7595 { | |
| 7596 ScreenLinesC[i][off] = u8cc[i]; | |
| 7597 if (u8cc[i] == 0) | |
| 7598 break; | |
| 7599 } | |
| 7 | 7600 } |
| 7601 if (mbyte_cells == 2) | |
| 7602 { | |
| 7603 ScreenLines[off + 1] = 0; | |
| 7604 ScreenAttrs[off + 1] = attr; | |
| 7605 } | |
| 7606 screen_char(off, row, col); | |
| 7607 } | |
| 7608 else if (mbyte_cells == 2) | |
| 7609 { | |
| 7610 ScreenLines[off + 1] = ptr[1]; | |
| 7611 ScreenAttrs[off + 1] = attr; | |
| 7612 screen_char_2(off, row, col); | |
| 7613 } | |
| 7614 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7615 { | |
| 7616 ScreenLines2[off] = ptr[1]; | |
| 7617 screen_char(off, row, col); | |
| 7618 } | |
| 7619 else | |
| 7620 screen_char(off, row, col); | |
| 7621 } | |
| 7622 if (has_mbyte) | |
| 7623 { | |
| 7624 off += mbyte_cells; | |
| 7625 col += mbyte_cells; | |
| 7626 ptr += mbyte_blen; | |
| 7627 if (clear_next_cell) | |
| 5923 | 7628 { |
| 7629 /* This only happens at the end, display one space next. */ | |
| 7 | 7630 ptr = (char_u *)" "; |
| 5923 | 7631 len = -1; |
| 7632 } | |
| 7 | 7633 } |
| 7634 else | |
| 7635 { | |
| 7636 ++off; | |
| 7637 ++col; | |
| 7638 ++ptr; | |
| 7639 } | |
| 7640 } | |
| 1843 | 7641 |
| 7642 /* If we detected the next character needs to be redrawn, but the text | |
| 7643 * doesn't extend up to there, update the character here. */ | |
| 7644 if (force_redraw_next && col < screen_Columns) | |
| 7645 { | |
| 7646 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7647 screen_char_2(off, row, col); | |
| 7648 else | |
| 7649 screen_char(off, row, col); | |
| 7650 } | |
| 7 | 7651 } |
| 7652 | |
| 7653 #ifdef FEAT_SEARCH_EXTRA | |
| 7654 /* | |
| 1326 | 7655 * Prepare for 'hlsearch' highlighting. |
| 7 | 7656 */ |
| 7657 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7658 start_search_hl(void) |
| 7 | 7659 { |
| 7660 if (p_hls && !no_hlsearch) | |
| 7661 { | |
| 7662 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
|
7663 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7664 # ifdef FEAT_RELTIME |
| 7665 /* Set the time limit to 'redrawtime'. */ | |
| 7666 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7667 # endif | |
| 7 | 7668 } |
| 7669 } | |
| 7670 | |
| 7671 /* | |
| 1326 | 7672 * Clean up for 'hlsearch' highlighting. |
| 7 | 7673 */ |
| 7674 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7675 end_search_hl(void) |
| 7 | 7676 { |
| 7677 if (search_hl.rm.regprog != NULL) | |
| 7678 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7679 vim_regfree(search_hl.rm.regprog); |
| 7 | 7680 search_hl.rm.regprog = NULL; |
| 7681 } | |
| 7682 } | |
| 5985 | 7683 #endif |
| 5979 | 7684 |
| 7 | 7685 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7686 screen_start_highlight(int attr) |
| 7 | 7687 { |
| 7688 attrentry_T *aep = NULL; | |
| 7689 | |
| 7690 screen_attr = attr; | |
| 7691 if (full_screen | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15850
diff
changeset
|
7692 #ifdef MSWIN |
| 7 | 7693 && termcap_active |
| 7694 #endif | |
| 7695 ) | |
| 7696 { | |
| 7697 #ifdef FEAT_GUI | |
| 7698 if (gui.in_use) | |
| 7699 { | |
| 7700 char buf[20]; | |
| 7701 | |
| 681 | 7702 /* The GUI handles this internally. */ |
| 7703 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 7704 OUT_STR(buf); |
| 7705 } | |
| 7706 else | |
| 7707 #endif | |
| 7708 { | |
| 7709 if (attr > HL_ALL) /* special HL attr. */ | |
| 7710 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7711 if (IS_CTERM) |
| 7 | 7712 aep = syn_cterm_attr2entry(attr); |
| 7713 else | |
| 7714 aep = syn_term_attr2entry(attr); | |
| 7715 if (aep == NULL) /* did ":syntax clear" */ | |
| 7716 attr = 0; | |
| 7717 else | |
| 7718 attr = aep->ae_attr; | |
| 7719 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
7720 if ((attr & HL_BOLD) && *T_MD != NUL) /* bold */ |
| 7 | 7721 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
|
7722 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
|
7723 #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
|
7724 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
|
7725 ? 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
|
7726 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7727 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7728 t_colors > 1 && aep->ae_u.cterm.fg_color)) |
| 681 | 7729 /* If the Normal FG color has BOLD attribute and the new HL |
| 7730 * has a FG color defined, clear BOLD. */ | |
| 7731 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
|
7732 if ((attr & HL_STANDOUT) && *T_SO != NUL) /* standout */ |
| 7 | 7733 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
|
7734 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
|
7735 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
|
7736 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
|
7737 || ((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
|
7738 && *T_US != NUL) |
| 7 | 7739 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
|
7740 if ((attr & HL_ITALIC) && *T_CZH != NUL) /* italic */ |
| 7 | 7741 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
|
7742 if ((attr & HL_INVERSE) && *T_MR != NUL) /* inverse (reverse) */ |
| 7 | 7743 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
|
7744 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
|
7745 out_str(T_STS); |
| 7 | 7746 |
| 7747 /* | |
| 7748 * Output the color or start string after bold etc., in case the | |
| 7749 * bold etc. override the color setting. | |
| 7750 */ | |
| 7751 if (aep != NULL) | |
| 7752 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7753 #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
|
7754 /* 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
|
7755 * 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
|
7756 * 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
|
7757 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
|
7758 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7759 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
|
7760 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
|
7761 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7762 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7763 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7764 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
|
7765 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7766 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
|
7767 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
|
7768 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7769 #ifdef FEAT_TERMGUICOLORS |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7770 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
|
7771 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7772 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
|
7773 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 7774 } |
| 7775 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7776 #endif |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7777 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
|
7778 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7779 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
|
7780 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
|
7781 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7782 |
|
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
|
7783 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
|
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.term.start != NULL) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7786 out_str(aep->ae_u.term.start); |
| 7 | 7787 } |
| 7788 } | |
| 7789 } | |
| 7790 } | |
| 7791 } | |
| 7792 | |
| 7793 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7794 screen_stop_highlight(void) |
| 7 | 7795 { |
| 7796 int do_ME = FALSE; /* output T_ME code */ | |
| 7797 | |
| 7798 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
|
7799 #ifdef MSWIN |
| 7 | 7800 && termcap_active |
| 7801 #endif | |
| 7802 ) | |
| 7803 { | |
| 7804 #ifdef FEAT_GUI | |
| 7805 if (gui.in_use) | |
| 7806 { | |
| 7807 char buf[20]; | |
| 7808 | |
| 7809 /* use internal GUI code */ | |
| 7810 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 7811 OUT_STR(buf); | |
| 7812 } | |
| 7813 else | |
| 7814 #endif | |
| 7815 { | |
| 7816 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 7817 { | |
| 7818 attrentry_T *aep; | |
| 7819 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7820 if (IS_CTERM) |
| 7 | 7821 { |
| 7822 /* | |
| 7823 * Assume that t_me restores the original colors! | |
| 7824 */ | |
| 7825 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
|
7826 if (aep != NULL && (( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7827 #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
|
7828 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
|
7829 ? 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
|
7830 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7831 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7832 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
|
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.bg_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.bg_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.bg_color))) |
| 7 | 7839 do_ME = TRUE; |
| 7840 } | |
| 7841 else | |
| 7842 { | |
| 7843 aep = syn_term_attr2entry(screen_attr); | |
| 7844 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 7845 { | |
| 7846 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 7847 do_ME = TRUE; | |
| 7848 else | |
| 7849 out_str(aep->ae_u.term.stop); | |
| 7850 } | |
| 7851 } | |
| 7852 if (aep == NULL) /* did ":syntax clear" */ | |
| 7853 screen_attr = 0; | |
| 7854 else | |
| 7855 screen_attr = aep->ae_attr; | |
| 7856 } | |
| 7857 | |
| 7858 /* | |
| 7859 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 7860 * same sequence several times. | |
| 7861 */ | |
| 7862 if (screen_attr & HL_STANDOUT) | |
| 7863 { | |
| 7864 if (STRCMP(T_SE, T_ME) == 0) | |
| 7865 do_ME = TRUE; | |
| 7866 else | |
| 7867 out_str(T_SE); | |
| 7868 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
7869 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
|
7870 { |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
7871 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
|
7872 do_ME = TRUE; |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
7873 else |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
7874 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
|
7875 } |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
7876 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
|
7877 || ((screen_attr & HL_UNDERCURL) && *T_UCE == NUL)) |
| 7 | 7878 { |
| 7879 if (STRCMP(T_UE, T_ME) == 0) | |
| 7880 do_ME = TRUE; | |
| 7881 else | |
| 7882 out_str(T_UE); | |
| 7883 } | |
| 7884 if (screen_attr & HL_ITALIC) | |
| 7885 { | |
| 7886 if (STRCMP(T_CZR, T_ME) == 0) | |
| 7887 do_ME = TRUE; | |
| 7888 else | |
| 7889 out_str(T_CZR); | |
| 7890 } | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7891 if (screen_attr & HL_STRIKETHROUGH) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7892 { |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7893 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
|
7894 do_ME = TRUE; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7895 else |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7896 out_str(T_STE); |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7897 } |
| 7 | 7898 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) |
| 7899 out_str(T_ME); | |
| 7900 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7901 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7902 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7903 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7904 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
|
7905 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
|
7906 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
|
7907 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
|
7908 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7909 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7910 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7911 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7912 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7913 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7914 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7915 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7916 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
|
7917 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7918 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
|
7919 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7920 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7921 } |
| 7 | 7922 } |
| 7923 } | |
| 7924 } | |
| 7925 screen_attr = 0; | |
| 7926 } | |
| 7927 | |
| 7928 /* | |
| 7929 * Reset the colors for a cterm. Used when leaving Vim. | |
| 7930 * The machine specific code may override this again. | |
| 7931 */ | |
| 7932 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7933 reset_cterm_colors(void) |
| 7 | 7934 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7935 if (IS_CTERM) |
| 7 | 7936 { |
| 7937 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7938 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7939 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
|
7940 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7941 : (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
|
7942 #else |
| 7 | 7943 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
|
7944 #endif |
| 7 | 7945 { |
| 7946 out_str(T_OP); | |
| 7947 screen_attr = -1; | |
| 7948 } | |
| 7949 if (cterm_normal_fg_bold) | |
| 7950 { | |
| 7951 out_str(T_ME); | |
| 7952 screen_attr = -1; | |
| 7953 } | |
| 7954 } | |
| 7955 } | |
| 7956 | |
| 7957 /* | |
| 7958 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 7959 * using the attributes from ScreenAttrs["off"]. | |
| 7960 */ | |
| 7961 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7962 screen_char(unsigned off, int row, int col) |
| 7 | 7963 { |
| 7964 int attr; | |
| 7965 | |
| 7966 /* Check for illegal values, just in case (could happen just after | |
| 7967 * resizing). */ | |
| 7968 if (row >= screen_Rows || col >= screen_Columns) | |
| 7969 return; | |
| 7970 | |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
7971 #ifdef FEAT_INS_EXPAND |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7972 // 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
|
7973 // 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
|
7974 if (pum_under_menu(row, col) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7975 # 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
|
7976 && screen_zindex <= POPUPMENU_ZINDEX |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7977 # endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7978 ) |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
7979 return; |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
7980 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7981 #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
|
7982 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
|
7983 return; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7984 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7985 |
| 6602 | 7986 /* Outputting a character in the last cell on the screen may scroll the |
| 7987 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 7988 * mark the character invalid (update it when scrolled up). */ | |
| 7989 if (*T_XN == NUL | |
| 7990 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 7991 #ifdef FEAT_RIGHTLEFT |
| 7992 /* account for first command-line character in rightleft mode */ | |
| 7993 && !cmdmsg_rl | |
| 7994 #endif | |
| 7995 ) | |
| 7996 { | |
| 7997 ScreenAttrs[off] = (sattr_T)-1; | |
| 7998 return; | |
| 7999 } | |
| 8000 | |
| 8001 /* | |
| 8002 * Stop highlighting first, so it's easier to move the cursor. | |
| 8003 */ | |
| 8004 if (screen_char_attr != 0) | |
| 8005 attr = screen_char_attr; | |
| 8006 else | |
| 8007 attr = ScreenAttrs[off]; | |
| 8008 if (screen_attr != attr) | |
| 8009 screen_stop_highlight(); | |
| 8010 | |
| 8011 windgoto(row, col); | |
| 8012 | |
| 8013 if (screen_attr != attr) | |
| 8014 screen_start_highlight(attr); | |
| 8015 | |
| 8016 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8017 { | |
| 8018 char_u buf[MB_MAXBYTES + 1]; | |
| 8019 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8020 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
|
8021 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8022 if (*p_ambw == 'd' |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8023 #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
|
8024 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8025 #endif |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8026 ) |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8027 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8028 /* 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
|
8029 * 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
|
8030 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
|
8031 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
|
8032 } |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8033 /* 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
|
8034 * character */ |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8035 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
|
8036 } |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8037 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8038 ++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
|
8039 |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8040 /* 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
|
8041 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
|
8042 out_str(buf); |
| 7 | 8043 } |
| 8044 else | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8045 { |
| 7 | 8046 out_flush_check(); |
| 8047 out_char(ScreenLines[off]); | |
| 8048 /* double-byte character in single-width cell */ | |
| 8049 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8050 out_char(ScreenLines2[off]); | |
| 8051 } | |
| 8052 | |
| 8053 screen_cur_col++; | |
| 8054 } | |
| 8055 | |
| 8056 /* | |
| 8057 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8058 * on the screen at position 'row' and 'col'. | |
| 8059 * The attributes of the first byte is used for all. This is required to | |
| 8060 * output the two bytes of a double-byte character with nothing in between. | |
| 8061 */ | |
| 8062 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8063 screen_char_2(unsigned off, int row, int col) |
| 7 | 8064 { |
| 8065 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8066 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8067 return; | |
| 8068 | |
| 8069 /* Outputting the last character on the screen may scrollup the screen. | |
| 8070 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8071 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8072 { | |
| 8073 ScreenAttrs[off] = (sattr_T)-1; | |
| 8074 return; | |
| 8075 } | |
| 8076 | |
| 8077 /* Output the first byte normally (positions the cursor), then write the | |
| 8078 * second byte directly. */ | |
| 8079 screen_char(off, row, col); | |
| 8080 out_char(ScreenLines[off + 1]); | |
| 8081 ++screen_cur_col; | |
| 8082 } | |
| 8083 | |
| 8084 /* | |
| 8085 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8086 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8087 */ | |
| 8088 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8089 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8090 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8091 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8092 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8093 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8094 int invert) |
| 7 | 8095 { |
| 8096 int r, c; | |
| 8097 int off; | |
| 1378 | 8098 int max_off; |
| 7 | 8099 |
| 534 | 8100 /* Can't use ScreenLines unless initialized */ |
| 8101 if (ScreenLines == NULL) | |
| 8102 return; | |
| 8103 | |
| 7 | 8104 if (invert) |
| 8105 screen_char_attr = HL_INVERSE; | |
| 8106 for (r = row; r < row + height; ++r) | |
| 8107 { | |
| 8108 off = LineOffset[r]; | |
| 1378 | 8109 max_off = off + screen_Columns; |
| 7 | 8110 for (c = col; c < col + width; ++c) |
| 8111 { | |
| 1378 | 8112 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8113 { |
| 8114 screen_char_2(off + c, r, c); | |
| 8115 ++c; | |
| 8116 } | |
| 8117 else | |
| 8118 { | |
| 8119 screen_char(off + c, r, c); | |
| 1378 | 8120 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8121 ++c; |
| 8122 } | |
| 8123 } | |
| 8124 } | |
| 8125 screen_char_attr = 0; | |
| 8126 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
8127 |
| 7 | 8128 /* |
| 8129 * Redraw the characters for a vertically split window. | |
| 8130 */ | |
| 8131 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8132 redraw_block(int row, int end, win_T *wp) |
| 7 | 8133 { |
| 8134 int col; | |
| 8135 int width; | |
| 8136 | |
| 8137 # ifdef FEAT_CLIPBOARD | |
| 8138 clip_may_clear_selection(row, end - 1); | |
| 8139 # endif | |
| 8140 | |
| 8141 if (wp == NULL) | |
| 8142 { | |
| 8143 col = 0; | |
| 8144 width = Columns; | |
| 8145 } | |
| 8146 else | |
| 8147 { | |
| 8148 col = wp->w_wincol; | |
| 8149 width = wp->w_width; | |
| 8150 } | |
| 8151 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8152 } | |
| 8153 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8154 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8155 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
|
8156 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8157 ScreenLines[off] = ' '; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8158 ScreenAttrs[off] = attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8159 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8160 ScreenLinesUC[off] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8161 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8162 |
| 7 | 8163 /* |
| 8164 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8165 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8166 * Use attributes 'attr'. | |
| 8167 */ | |
| 8168 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8169 screen_fill( |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8170 int start_row, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8171 int end_row, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8172 int start_col, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8173 int end_col, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8174 int c1, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8175 int c2, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8176 int attr) |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8177 { |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8178 int row; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8179 int col; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8180 int off; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8181 int end_off; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8182 int did_delete; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8183 int c; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8184 int norm_term; |
| 7 | 8185 #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
|
8186 int force_next = FALSE; |
| 7 | 8187 #endif |
| 8188 | |
| 8189 if (end_row > screen_Rows) /* safety check */ | |
| 8190 end_row = screen_Rows; | |
| 8191 if (end_col > screen_Columns) /* safety check */ | |
| 8192 end_col = screen_Columns; | |
| 8193 if (ScreenLines == NULL | |
| 8194 || start_row >= end_row | |
| 8195 || start_col >= end_col) /* nothing to do */ | |
| 8196 return; | |
| 8197 | |
| 8198 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8199 norm_term = ( | |
| 8200 #ifdef FEAT_GUI | |
| 8201 !gui.in_use && | |
| 8202 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8203 !IS_CTERM); |
| 7 | 8204 for (row = start_row; row < end_row; ++row) |
| 8205 { | |
| 1668 | 8206 if (has_mbyte |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8207 #ifdef FEAT_GUI |
| 1668 | 8208 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8209 #endif |
| 1668 | 8210 ) |
| 8211 { | |
| 8212 /* When drawing over the right halve of a double-wide char clear | |
| 8213 * out the left halve. When drawing over the left halve of a | |
| 8214 * double wide-char clear out the right halve. Only needed in a | |
| 8215 * terminal. */ | |
| 1685 | 8216 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8217 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8218 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8219 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8220 } |
| 7 | 8221 /* |
| 8222 * Try to use delete-line termcap code, when no attributes or in a | |
| 8223 * "normal" terminal, where a bold/italic space is just a | |
| 8224 * space. | |
| 8225 */ | |
| 8226 did_delete = FALSE; | |
| 8227 if (c2 == ' ' | |
| 8228 && end_col == Columns | |
| 8229 && can_clear(T_CE) | |
| 8230 && (attr == 0 | |
| 8231 || (norm_term | |
| 8232 && attr <= HL_ALL | |
| 8233 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8234 { | |
| 8235 /* | |
| 8236 * check if we really need to clear something | |
| 8237 */ | |
| 8238 col = start_col; | |
| 8239 if (c1 != ' ') /* don't clear first char */ | |
| 8240 ++col; | |
| 8241 | |
| 8242 off = LineOffset[row] + col; | |
| 8243 end_off = LineOffset[row] + end_col; | |
| 8244 | |
| 8245 /* skip blanks (used often, keep it fast!) */ | |
| 8246 if (enc_utf8) | |
| 8247 while (off < end_off && ScreenLines[off] == ' ' | |
| 8248 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8249 ++off; | |
| 8250 else | |
| 8251 while (off < end_off && ScreenLines[off] == ' ' | |
| 8252 && ScreenAttrs[off] == 0) | |
| 8253 ++off; | |
| 8254 if (off < end_off) /* something to be cleared */ | |
| 8255 { | |
| 8256 col = off - LineOffset[row]; | |
| 8257 screen_stop_highlight(); | |
| 8258 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8259 out_str(T_CE); | |
| 8260 screen_start(); /* don't know where cursor is now */ | |
| 8261 col = end_col - col; | |
| 8262 while (col--) /* clear chars in ScreenLines */ | |
| 8263 { | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8264 space_to_screenline(off, 0); |
| 7 | 8265 ++off; |
| 8266 } | |
| 8267 } | |
| 8268 did_delete = TRUE; /* the chars are cleared now */ | |
| 8269 } | |
| 8270 | |
| 8271 off = LineOffset[row] + start_col; | |
| 8272 c = c1; | |
| 8273 for (col = start_col; col < end_col; ++col) | |
| 8274 { | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8275 if ((ScreenLines[off] != c |
| 714 | 8276 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8277 != (c >= 0x80 ? c : 0)) | |
| 7 | 8278 || ScreenAttrs[off] != attr |
| 8279 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8280 || force_next | |
| 8281 #endif | |
| 8282 ) | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8283 #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
|
8284 // 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
|
8285 && !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
|
8286 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8287 ) |
| 7 | 8288 { |
| 8289 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8290 /* The bold trick may make a single row of pixels appear in | |
| 8291 * the next character. When a bold character is removed, the | |
| 8292 * next character should be redrawn too. This happens for our | |
| 8293 * own GUI and for some xterms. */ | |
| 8294 if ( | |
| 8295 # ifdef FEAT_GUI | |
| 8296 gui.in_use | |
| 8297 # endif | |
| 8298 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8299 || | |
| 8300 # endif | |
| 8301 # ifdef UNIX | |
| 8302 term_is_xterm | |
| 8303 # endif | |
| 8304 ) | |
| 8305 { | |
| 8306 if (ScreenLines[off] != ' ' | |
| 8307 && (ScreenAttrs[off] > HL_ALL | |
| 8308 || ScreenAttrs[off] & HL_BOLD)) | |
| 8309 force_next = TRUE; | |
| 8310 else | |
| 8311 force_next = FALSE; | |
| 8312 } | |
| 8313 #endif | |
| 8314 ScreenLines[off] = c; | |
| 8315 if (enc_utf8) | |
| 8316 { | |
| 8317 if (c >= 0x80) | |
| 8318 { | |
| 8319 ScreenLinesUC[off] = c; | |
| 714 | 8320 ScreenLinesC[0][off] = 0; |
| 7 | 8321 } |
| 8322 else | |
| 8323 ScreenLinesUC[off] = 0; | |
| 8324 } | |
| 8325 ScreenAttrs[off] = attr; | |
| 8326 if (!did_delete || c != ' ') | |
| 8327 screen_char(off, row, col); | |
| 8328 } | |
| 8329 ++off; | |
| 8330 if (col == start_col) | |
| 8331 { | |
| 8332 if (did_delete) | |
| 8333 break; | |
| 8334 c = c2; | |
| 8335 } | |
| 8336 } | |
| 8337 if (end_col == Columns) | |
| 8338 LineWraps[row] = FALSE; | |
| 8339 if (row == Rows - 1) /* overwritten the command line */ | |
| 8340 { | |
| 8341 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
|
8342 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
|
8343 && c1 == ' ' && c2 == ' ' && attr == 0) |
| 7 | 8344 clear_cmdline = FALSE; /* command line has been cleared */ |
| 644 | 8345 if (start_col == 0) |
| 8346 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8347 } |
| 8348 } | |
| 8349 } | |
| 8350 | |
| 8351 /* | |
| 8352 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8353 * screen or the command line. | |
| 8354 */ | |
| 8355 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8356 check_for_delay(int check_msg_scroll) |
| 7 | 8357 { |
| 8358 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8359 && !did_wait_return | |
| 8360 && emsg_silent == 0) | |
| 8361 { | |
| 8362 out_flush(); | |
| 8363 ui_delay(1000L, TRUE); | |
| 8364 emsg_on_display = FALSE; | |
| 8365 if (check_msg_scroll) | |
| 8366 msg_scroll = FALSE; | |
| 8367 } | |
| 8368 } | |
| 8369 | |
| 8370 /* | |
|
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
|
8371 * 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
|
8372 */ |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8373 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
|
8374 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
|
8375 { |
|
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 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
|
8377 |
|
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 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
|
8379 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
|
8380 } |
|
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 /* |
| 7 | 8383 * screen_valid - allocate screen buffers if size changed |
| 3263 | 8384 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8385 * Returns TRUE if there is a valid screen to write to. |
| 8386 * Returns FALSE when starting up and screen not initialized yet. | |
| 8387 */ | |
| 8388 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8389 screen_valid(int doclear) |
| 7 | 8390 { |
| 3263 | 8391 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8392 return (ScreenLines != NULL); |
| 8393 } | |
| 8394 | |
| 8395 /* | |
| 8396 * Resize the shell to Rows and Columns. | |
| 8397 * Allocate ScreenLines[] and associated items. | |
| 8398 * | |
| 8399 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8400 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8401 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8402 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8403 * final size of the shell is needed. | |
| 8404 */ | |
| 8405 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8406 screenalloc(int doclear) |
| 7 | 8407 { |
| 8408 int new_row, old_row; | |
| 8409 #ifdef FEAT_GUI | |
| 8410 int old_Rows; | |
| 8411 #endif | |
| 8412 win_T *wp; | |
| 8413 int outofmem = FALSE; | |
| 8414 int len; | |
| 8415 schar_T *new_ScreenLines; | |
| 8416 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8417 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8418 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8419 int i; |
| 7 | 8420 sattr_T *new_ScreenAttrs; |
| 8421 unsigned *new_LineOffset; | |
| 8422 char_u *new_LineWraps; | |
| 681 | 8423 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
|
8424 #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
|
8425 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
|
8426 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
|
8427 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
|
8428 #endif |
| 671 | 8429 tabpage_T *tp; |
| 7 | 8430 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8431 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8432 int retry_count = 0; |
| 8433 | |
| 8434 retry: | |
| 7 | 8435 /* |
| 8436 * Allocation of the screen buffers is done only when the size changes and | |
| 8437 * when Rows and Columns have been set and we have started doing full | |
| 8438 * screen stuff. | |
| 8439 */ | |
| 8440 if ((ScreenLines != NULL | |
| 8441 && Rows == screen_Rows | |
| 8442 && Columns == screen_Columns | |
| 8443 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8444 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8445 && p_mco == Screen_mco) |
| 7 | 8446 || Rows == 0 |
| 8447 || Columns == 0 | |
| 8448 || (!full_screen && ScreenLines == NULL)) | |
| 8449 return; | |
| 8450 | |
| 8451 /* | |
| 8452 * It's possible that we produce an out-of-memory message below, which | |
| 8453 * will cause this function to be called again. To break the loop, just | |
| 8454 * return here. | |
| 8455 */ | |
| 8456 if (entered) | |
| 8457 return; | |
| 8458 entered = TRUE; | |
| 8459 | |
| 911 | 8460 /* |
| 8461 * Note that the window sizes are updated before reallocating the arrays, | |
| 8462 * thus we must not redraw here! | |
| 8463 */ | |
| 8464 ++RedrawingDisabled; | |
| 8465 | |
| 7 | 8466 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8467 | |
| 8468 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8469 | |
| 8470 /* | |
| 8471 * We're changing the size of the screen. | |
| 8472 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8473 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8474 * lines (unless the screen is going to be cleared). | |
| 8475 * - Free the old arrays. | |
| 8476 * | |
| 8477 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8478 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8479 * size is wrong. | |
| 8480 */ | |
| 671 | 8481 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8482 win_free_lsize(wp); |
| 1946 | 8483 if (aucmd_win != NULL) |
| 8484 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
|
8485 #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
|
8486 // 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
|
8487 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
|
8488 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
|
8489 // 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
|
8490 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
|
8491 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
|
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 #endif |
| 7 | 8494 |
|
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
|
8495 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
|
8496 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8497 if (enc_utf8) |
| 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_ScreenLinesUC = LALLOC_MULT(u8char_T, (Rows + 1) * Columns); |
| 714 | 8500 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
|
8501 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
|
8502 (Rows + 1) * Columns); |
| 7 | 8503 } |
| 8504 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
|
8505 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
|
8506 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
|
8507 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
|
8508 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
|
8509 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
|
8510 #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
|
8511 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
|
8512 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
|
8513 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
|
8514 #endif |
| 7 | 8515 |
| 677 | 8516 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8517 { |
| 8518 if (win_alloc_lines(wp) == FAIL) | |
| 8519 { | |
| 8520 outofmem = TRUE; | |
| 1819 | 8521 goto give_up; |
| 8522 } | |
| 8523 } | |
| 1946 | 8524 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8525 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8526 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
|
8527 #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
|
8528 // 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
|
8529 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
|
8530 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
|
8531 { |
|
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 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
|
8533 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
|
8534 } |
|
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 // 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
|
8536 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
|
8537 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
|
8538 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
|
8539 { |
|
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 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
|
8541 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
|
8542 } |
|
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 #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
|
8544 |
| 1819 | 8545 give_up: |
| 7 | 8546 |
| 714 | 8547 for (i = 0; i < p_mco; ++i) |
| 8548 if (new_ScreenLinesC[i] == NULL) | |
| 8549 break; | |
| 7 | 8550 if (new_ScreenLines == NULL |
| 714 | 8551 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8552 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8553 || new_ScreenAttrs == NULL | |
| 8554 || new_LineOffset == NULL | |
| 8555 || new_LineWraps == NULL | |
| 671 | 8556 || 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
|
8557 #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
|
8558 || 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
|
8559 || 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
|
8560 || 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
|
8561 #endif |
| 7 | 8562 || outofmem) |
| 8563 { | |
| 944 | 8564 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8565 { |
| 8566 /* guess the size */ | |
| 8567 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8568 | |
| 8569 /* Remember we did this to avoid getting outofmem messages over | |
| 8570 * and over again. */ | |
| 944 | 8571 done_outofmem_msg = TRUE; |
| 534 | 8572 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8573 VIM_CLEAR(new_ScreenLines); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8574 VIM_CLEAR(new_ScreenLinesUC); |
| 714 | 8575 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
|
8576 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
|
8577 VIM_CLEAR(new_ScreenLines2); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8578 VIM_CLEAR(new_ScreenAttrs); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8579 VIM_CLEAR(new_LineOffset); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8580 VIM_CLEAR(new_LineWraps); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8581 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
|
8582 #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
|
8583 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
|
8584 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
|
8585 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
|
8586 #endif |
| 7 | 8587 } |
| 8588 else | |
| 8589 { | |
| 944 | 8590 done_outofmem_msg = FALSE; |
| 534 | 8591 |
| 7 | 8592 for (new_row = 0; new_row < Rows; ++new_row) |
| 8593 { | |
| 8594 new_LineOffset[new_row] = new_row * Columns; | |
| 8595 new_LineWraps[new_row] = FALSE; | |
| 8596 | |
| 8597 /* | |
| 8598 * If the screen is not going to be cleared, copy as much as | |
| 8599 * possible from the old screen to the new one and clear the rest | |
| 8600 * (used when resizing the window at the "--more--" prompt or when | |
| 8601 * executing an external command, for the GUI). | |
| 8602 */ | |
| 3263 | 8603 if (!doclear) |
| 7 | 8604 { |
| 8605 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 8606 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 8607 if (enc_utf8) | |
| 8608 { | |
| 8609 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 8610 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 8611 for (i = 0; i < p_mco; ++i) |
| 8612 (void)vim_memset(new_ScreenLinesC[i] | |
| 8613 + new_row * Columns, | |
| 7 | 8614 0, (size_t)Columns * sizeof(u8char_T)); |
| 8615 } | |
| 8616 if (enc_dbcs == DBCS_JPNU) | |
| 8617 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 8618 0, (size_t)Columns * sizeof(schar_T)); | |
| 8619 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 8620 0, (size_t)Columns * sizeof(sattr_T)); | |
| 8621 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 8622 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 8623 { |
| 8624 if (screen_Columns < Columns) | |
| 8625 len = screen_Columns; | |
| 8626 else | |
| 8627 len = Columns; | |
| 571 | 8628 /* When switching to utf-8 don't copy characters, they |
| 714 | 8629 * may be invalid now. Also when p_mco changes. */ |
| 8630 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 8631 && p_mco == Screen_mco) | |
| 26 | 8632 mch_memmove(new_ScreenLines + new_LineOffset[new_row], |
| 8633 ScreenLines + LineOffset[old_row], | |
| 8634 (size_t)len * sizeof(schar_T)); | |
| 714 | 8635 if (enc_utf8 && ScreenLinesUC != NULL |
| 8636 && p_mco == Screen_mco) | |
| 7 | 8637 { |
| 8638 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 8639 ScreenLinesUC + LineOffset[old_row], | |
| 8640 (size_t)len * sizeof(u8char_T)); | |
| 714 | 8641 for (i = 0; i < p_mco; ++i) |
| 8642 mch_memmove(new_ScreenLinesC[i] | |
| 8643 + new_LineOffset[new_row], | |
| 8644 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 8645 (size_t)len * sizeof(u8char_T)); |
| 8646 } | |
| 8647 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 8648 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 8649 ScreenLines2 + LineOffset[old_row], | |
| 8650 (size_t)len * sizeof(schar_T)); | |
| 8651 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 8652 ScreenAttrs + LineOffset[old_row], | |
| 8653 (size_t)len * sizeof(sattr_T)); | |
| 8654 } | |
| 8655 } | |
| 8656 } | |
| 8657 /* Use the last line of the screen for the current line. */ | |
| 8658 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
|
8659 |
|
03dcb660c4e8
patch 8.1.1845: may use NULL pointer when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
17628
diff
changeset
|
8660 #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
|
8661 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
|
8662 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
|
8663 #endif |
| 7 | 8664 } |
| 8665 | |
| 356 | 8666 free_screenlines(); |
| 8667 | |
|
17696
03dcb660c4e8
patch 8.1.1845: may use NULL pointer when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
17628
diff
changeset
|
8668 // NOTE: this may result in all pointers to become NULL. |
| 7 | 8669 ScreenLines = new_ScreenLines; |
| 8670 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 8671 for (i = 0; i < p_mco; ++i) |
| 8672 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 8673 Screen_mco = p_mco; | |
| 7 | 8674 ScreenLines2 = new_ScreenLines2; |
| 8675 ScreenAttrs = new_ScreenAttrs; | |
| 8676 LineOffset = new_LineOffset; | |
| 8677 LineWraps = new_LineWraps; | |
| 671 | 8678 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
|
8679 #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
|
8680 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
|
8681 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
|
8682 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
|
8683 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
|
8684 #endif |
| 7 | 8685 |
| 8686 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 8687 * size of ScreenLines[]. Set them before calling anything. */ | |
| 8688 #ifdef FEAT_GUI | |
| 8689 old_Rows = screen_Rows; | |
| 8690 #endif | |
| 8691 screen_Rows = Rows; | |
| 8692 screen_Columns = Columns; | |
| 8693 | |
| 8694 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 8695 if (doclear) |
| 7 | 8696 screenclear2(); |
| 8697 #ifdef FEAT_GUI | |
| 8698 else if (gui.in_use | |
| 8699 && !gui.starting | |
| 8700 && ScreenLines != NULL | |
| 8701 && old_Rows != Rows) | |
| 8702 { | |
| 8703 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 8704 /* | |
| 8705 * Adjust the position of the cursor, for when executing an external | |
| 8706 * command. | |
| 8707 */ | |
| 8708 if (msg_row >= Rows) /* Rows got smaller */ | |
| 8709 msg_row = Rows - 1; /* put cursor at last row */ | |
| 8710 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 8711 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 8712 if (msg_col >= Columns) /* Columns got smaller */ | |
| 8713 msg_col = Columns - 1; /* put cursor at last column */ | |
| 8714 } | |
| 8715 #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
|
8716 clear_TabPageIdxs(); |
| 7 | 8717 |
| 8718 entered = FALSE; | |
| 911 | 8719 --RedrawingDisabled; |
| 766 | 8720 |
| 1824 | 8721 /* |
| 8722 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 8723 * in case applying autocommands always changes Rows or Columns. | |
| 8724 */ | |
| 8725 if (starting == 0 && ++retry_count <= 3) | |
| 8726 { | |
| 766 | 8727 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 8728 /* In rare cases, autocommands may have altered Rows or Columns, |
| 8729 * jump back to check if we need to allocate the screen again. */ | |
| 8730 goto retry; | |
| 8731 } | |
| 7 | 8732 } |
| 8733 | |
| 8734 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8735 free_screenlines(void) |
| 356 | 8736 { |
| 714 | 8737 int i; |
| 8738 | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8739 VIM_CLEAR(ScreenLinesUC); |
| 714 | 8740 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
|
8741 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
|
8742 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
|
8743 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
|
8744 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
|
8745 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
|
8746 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
|
8747 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
|
8748 #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
|
8749 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
|
8750 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
|
8751 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
|
8752 #endif |
| 356 | 8753 } |
| 8754 | |
| 8755 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8756 screenclear(void) |
| 7 | 8757 { |
| 8758 check_for_delay(FALSE); | |
| 8759 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 8760 screenclear2(); /* clear the screen */ | |
| 8761 } | |
| 8762 | |
| 8763 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8764 screenclear2(void) |
| 7 | 8765 { |
| 8766 int i; | |
| 8767 | |
| 8768 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 8769 #ifdef FEAT_GUI | |
| 8770 || (gui.in_use && gui.starting) | |
| 8771 #endif | |
| 8772 ) | |
| 8773 return; | |
| 8774 | |
| 8775 #ifdef FEAT_GUI | |
| 8776 if (!gui.in_use) | |
| 8777 #endif | |
| 8778 screen_attr = -1; /* force setting the Normal colors */ | |
| 8779 screen_stop_highlight(); /* don't want highlighting here */ | |
| 8780 | |
| 8781 #ifdef FEAT_CLIPBOARD | |
| 8782 /* disable selection without redrawing it */ | |
| 8783 clip_scroll_selection(9999); | |
| 8784 #endif | |
| 8785 | |
| 8786 /* blank out ScreenLines */ | |
| 8787 for (i = 0; i < Rows; ++i) | |
| 8788 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
8789 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 8790 LineWraps[i] = FALSE; |
| 8791 } | |
| 8792 | |
| 8793 if (can_clear(T_CL)) | |
| 8794 { | |
| 8795 out_str(T_CL); /* clear the display */ | |
| 8796 clear_cmdline = FALSE; | |
| 644 | 8797 mode_displayed = FALSE; |
| 7 | 8798 } |
| 8799 else | |
| 8800 { | |
| 8801 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 8802 for (i = 0; i < Rows; ++i) | |
| 8803 lineinvalid(LineOffset[i], (int)Columns); | |
| 8804 clear_cmdline = TRUE; | |
| 8805 } | |
| 8806 | |
| 8807 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 8808 | |
| 8809 win_rest_invalid(firstwin); | |
| 8810 redraw_cmdline = TRUE; | |
| 673 | 8811 redraw_tabline = TRUE; |
| 7 | 8812 if (must_redraw == CLEAR) /* no need to clear again */ |
| 8813 must_redraw = NOT_VALID; | |
| 8814 compute_cmdrow(); | |
| 8815 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 8816 msg_col = 0; | |
| 8817 screen_start(); /* don't know where cursor is now */ | |
| 8818 msg_scrolled = 0; /* can't scroll back */ | |
| 8819 msg_didany = FALSE; | |
| 8820 msg_didout = FALSE; | |
| 8821 } | |
| 8822 | |
| 8823 /* | |
| 8824 * Clear one line in ScreenLines. | |
| 8825 */ | |
| 8826 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
8827 lineclear(unsigned off, int width, int attr) |
| 7 | 8828 { |
| 8829 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 8830 if (enc_utf8) | |
| 8831 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 8832 (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
|
8833 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 8834 } |
| 8835 | |
| 8836 /* | |
| 8837 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 8838 * invalid value. | |
| 8839 */ | |
| 8840 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8841 lineinvalid(unsigned off, int width) |
| 7 | 8842 { |
| 8843 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 8844 } | |
| 8845 | |
| 8846 /* | |
| 8847 * Copy part of a Screenline for vertically split window "wp". | |
| 8848 */ | |
| 8849 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8850 linecopy(int to, int from, win_T *wp) |
| 7 | 8851 { |
| 8852 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 8853 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 8854 | |
| 8855 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 8856 wp->w_width * sizeof(schar_T)); | |
| 8857 if (enc_utf8) | |
| 8858 { | |
| 714 | 8859 int i; |
| 8860 | |
| 7 | 8861 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 8862 wp->w_width * sizeof(u8char_T)); | |
| 714 | 8863 for (i = 0; i < p_mco; ++i) |
| 8864 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 8865 wp->w_width * sizeof(u8char_T)); | |
| 7 | 8866 } |
| 8867 if (enc_dbcs == DBCS_JPNU) | |
| 8868 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 8869 wp->w_width * sizeof(schar_T)); | |
| 8870 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 8871 wp->w_width * sizeof(sattr_T)); | |
| 8872 } | |
| 8873 | |
| 8874 /* | |
| 8875 * Return TRUE if clearing with term string "p" would work. | |
| 8876 * 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
|
8877 * Don't clear to end-of-line when there are popups, it may cause flicker. |
| 7 | 8878 */ |
| 8879 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8880 can_clear(char_u *p) |
| 7 | 8881 { |
| 8882 return (*p != NUL && (t_colors <= 1 | |
| 8883 #ifdef FEAT_GUI | |
| 8884 || gui.in_use | |
| 8885 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8886 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8887 || (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
|
8888 || (!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
|
8889 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
8890 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
8891 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8892 || *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
|
8893 #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
|
8894 && !(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
|
8895 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8896 ); |
| 7 | 8897 } |
| 8898 | |
| 8899 /* | |
| 8900 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 8901 * something directly to the screen (shell commands) or a terminal control | |
| 8902 * code. | |
| 8903 */ | |
| 8904 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8905 screen_start(void) |
| 7 | 8906 { |
| 8907 screen_cur_row = screen_cur_col = 9999; | |
| 8908 } | |
| 8909 | |
| 8910 /* | |
| 8911 * Move the cursor to position "row","col" in the screen. | |
| 8912 * This tries to find the most efficient way to move, minimizing the number of | |
| 8913 * characters sent to the terminal. | |
| 8914 */ | |
| 8915 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8916 windgoto(int row, int col) |
| 7 | 8917 { |
| 205 | 8918 sattr_T *p; |
| 7 | 8919 int i; |
| 8920 int plan; | |
| 8921 int cost; | |
| 8922 int wouldbe_col; | |
| 8923 int noinvcurs; | |
| 8924 char_u *bs; | |
| 8925 int goto_cost; | |
| 8926 int attr; | |
| 8927 | |
| 1213 | 8928 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 8929 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 8930 | |
| 8931 #define PLAN_LE 1 | |
| 8932 #define PLAN_CR 2 | |
| 8933 #define PLAN_NL 3 | |
| 8934 #define PLAN_WRITE 4 | |
| 8935 /* Can't use ScreenLines unless initialized */ | |
| 8936 if (ScreenLines == NULL) | |
| 8937 return; | |
| 8938 | |
| 8939 if (col != screen_cur_col || row != screen_cur_row) | |
| 8940 { | |
| 8941 /* Check for valid position. */ | |
| 8942 if (row < 0) /* window without text lines? */ | |
| 8943 row = 0; | |
| 8944 if (row >= screen_Rows) | |
| 8945 row = screen_Rows - 1; | |
| 8946 if (col >= screen_Columns) | |
| 8947 col = screen_Columns - 1; | |
| 8948 | |
| 8949 /* check if no cursor movement is allowed in highlight mode */ | |
| 8950 if (screen_attr && *T_MS == NUL) | |
| 8951 noinvcurs = HIGHL_COST; | |
| 8952 else | |
| 8953 noinvcurs = 0; | |
| 8954 goto_cost = GOTO_COST + noinvcurs; | |
| 8955 | |
| 8956 /* | |
| 8957 * Plan how to do the positioning: | |
| 8958 * 1. Use CR to move it to column 0, same row. | |
| 8959 * 2. Use T_LE to move it a few columns to the left. | |
| 8960 * 3. Use NL to move a few lines down, column 0. | |
| 8961 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 8962 * | |
| 8963 * Don't do this if the cursor went beyond the last column, the cursor | |
| 8964 * position is unknown then (some terminals wrap, some don't ) | |
| 8965 * | |
| 1213 | 8966 * First check if the highlighting attributes allow us to write |
| 7 | 8967 * characters to move the cursor to the right. |
| 8968 */ | |
| 8969 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 8970 { | |
| 8971 /* | |
| 8972 * If the cursor is in the same row, bigger col, we can use CR | |
| 8973 * or T_LE. | |
| 8974 */ | |
| 8975 bs = NULL; /* init for GCC */ | |
| 8976 attr = screen_attr; | |
| 8977 if (row == screen_cur_row && col < screen_cur_col) | |
| 8978 { | |
| 8979 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 8980 if (*T_LE) | |
| 8981 bs = T_LE; /* "cursor left" */ | |
| 8982 else | |
| 8983 bs = T_BC; /* "backspace character (old) */ | |
| 8984 if (*bs) | |
| 8985 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 8986 else | |
| 8987 cost = 999; | |
| 8988 if (col + 1 < cost) /* using CR is less characters */ | |
| 8989 { | |
| 8990 plan = PLAN_CR; | |
| 8991 wouldbe_col = 0; | |
| 8992 cost = 1; /* CR is just one character */ | |
| 8993 } | |
| 8994 else | |
| 8995 { | |
| 8996 plan = PLAN_LE; | |
| 8997 wouldbe_col = col; | |
| 8998 } | |
| 8999 if (noinvcurs) /* will stop highlighting */ | |
| 9000 { | |
| 9001 cost += noinvcurs; | |
| 9002 attr = 0; | |
| 9003 } | |
| 9004 } | |
| 9005 | |
| 9006 /* | |
| 9007 * If the cursor is above where we want to be, we can use CR LF. | |
| 9008 */ | |
| 9009 else if (row > screen_cur_row) | |
| 9010 { | |
| 9011 plan = PLAN_NL; | |
| 9012 wouldbe_col = 0; | |
| 9013 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9014 if (noinvcurs) /* will stop highlighting */ | |
| 9015 { | |
| 9016 cost += noinvcurs; | |
| 9017 attr = 0; | |
| 9018 } | |
| 9019 } | |
| 9020 | |
| 9021 /* | |
| 9022 * If the cursor is in the same row, smaller col, just use write. | |
| 9023 */ | |
| 9024 else | |
| 9025 { | |
| 9026 plan = PLAN_WRITE; | |
| 9027 wouldbe_col = screen_cur_col; | |
| 9028 cost = 0; | |
| 9029 } | |
| 9030 | |
| 9031 /* | |
| 9032 * Check if any characters that need to be written have the | |
| 9033 * correct attributes. Also avoid UTF-8 characters. | |
| 9034 */ | |
| 9035 i = col - wouldbe_col; | |
| 9036 if (i > 0) | |
| 9037 cost += i; | |
| 9038 if (cost < goto_cost && i > 0) | |
| 9039 { | |
| 9040 /* | |
| 9041 * Check if the attributes are correct without additionally | |
| 9042 * stopping highlighting. | |
| 9043 */ | |
| 9044 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9045 while (i && *p++ == attr) | |
| 9046 --i; | |
| 9047 if (i != 0) | |
| 9048 { | |
| 9049 /* | |
| 9050 * Try if it works when highlighting is stopped here. | |
| 9051 */ | |
| 9052 if (*--p == 0) | |
| 9053 { | |
| 9054 cost += noinvcurs; | |
| 9055 while (i && *p++ == 0) | |
| 9056 --i; | |
| 9057 } | |
| 9058 if (i != 0) | |
| 9059 cost = 999; /* different attributes, don't do it */ | |
| 9060 } | |
| 9061 if (enc_utf8) | |
| 9062 { | |
| 9063 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9064 for (i = wouldbe_col; i < col; ++i) | |
| 9065 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9066 { | |
| 9067 cost = 999; | |
| 9068 break; | |
| 9069 } | |
| 9070 } | |
| 9071 } | |
| 9072 | |
| 9073 /* | |
| 9074 * We can do it without term_windgoto()! | |
| 9075 */ | |
| 9076 if (cost < goto_cost) | |
| 9077 { | |
| 9078 if (plan == PLAN_LE) | |
| 9079 { | |
| 9080 if (noinvcurs) | |
| 9081 screen_stop_highlight(); | |
| 9082 while (screen_cur_col > col) | |
| 9083 { | |
| 9084 out_str(bs); | |
| 9085 --screen_cur_col; | |
| 9086 } | |
| 9087 } | |
| 9088 else if (plan == PLAN_CR) | |
| 9089 { | |
| 9090 if (noinvcurs) | |
| 9091 screen_stop_highlight(); | |
| 9092 out_char('\r'); | |
| 9093 screen_cur_col = 0; | |
| 9094 } | |
| 9095 else if (plan == PLAN_NL) | |
| 9096 { | |
| 9097 if (noinvcurs) | |
| 9098 screen_stop_highlight(); | |
| 9099 while (screen_cur_row < row) | |
| 9100 { | |
| 9101 out_char('\n'); | |
| 9102 ++screen_cur_row; | |
| 9103 } | |
| 9104 screen_cur_col = 0; | |
| 9105 } | |
| 9106 | |
| 9107 i = col - screen_cur_col; | |
| 9108 if (i > 0) | |
| 9109 { | |
| 9110 /* | |
| 9111 * Use cursor-right if it's one character only. Avoids | |
| 9112 * removing a line of pixels from the last bold char, when | |
| 9113 * using the bold trick in the GUI. | |
| 9114 */ | |
| 9115 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9116 { | |
| 9117 while (i-- > 0) | |
| 9118 out_char(*T_ND); | |
| 9119 } | |
| 9120 else | |
| 9121 { | |
| 9122 int off; | |
| 9123 | |
| 9124 off = LineOffset[row] + screen_cur_col; | |
| 9125 while (i-- > 0) | |
| 9126 { | |
| 9127 if (ScreenAttrs[off] != screen_attr) | |
| 9128 screen_stop_highlight(); | |
| 9129 out_flush_check(); | |
| 9130 out_char(ScreenLines[off]); | |
| 9131 if (enc_dbcs == DBCS_JPNU | |
| 9132 && ScreenLines[off] == 0x8e) | |
| 9133 out_char(ScreenLines2[off]); | |
| 9134 ++off; | |
| 9135 } | |
| 9136 } | |
| 9137 } | |
| 9138 } | |
| 9139 } | |
| 9140 else | |
| 9141 cost = 999; | |
| 9142 | |
| 9143 if (cost >= goto_cost) | |
| 9144 { | |
| 9145 if (noinvcurs) | |
| 9146 screen_stop_highlight(); | |
| 5995 | 9147 if (row == screen_cur_row && (col > screen_cur_col) |
| 9148 && *T_CRI != NUL) | |
| 7 | 9149 term_cursor_right(col - screen_cur_col); |
| 9150 else | |
| 9151 term_windgoto(row, col); | |
| 9152 } | |
| 9153 screen_cur_row = row; | |
| 9154 screen_cur_col = col; | |
| 9155 } | |
| 9156 } | |
| 9157 | |
| 9158 /* | |
| 9159 * Set cursor to its position in the current window. | |
| 9160 */ | |
| 9161 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9162 setcursor(void) |
| 7 | 9163 { |
|
13400
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9164 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
|
9165 } |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9166 |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9167 /* |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9168 * 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
|
9169 * 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
|
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 void |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9172 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
|
9173 { |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9174 if (force || redrawing()) |
| 7 | 9175 { |
| 9176 validate_cursor(); | |
| 9177 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
|
9178 curwin->w_wincol + ( |
| 7 | 9179 #ifdef FEAT_RIGHTLEFT |
| 1545 | 9180 /* With 'rightleft' set and the cursor on a double-wide |
| 9181 * 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
|
9182 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
|
9183 - ((has_mbyte |
| 1545 | 9184 && (*mb_ptr2cells)(ml_get_cursor()) == 2 |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9185 && vim_isprintc(gchar_cursor())) ? 2 : 1)) : |
| 7 | 9186 #endif |
| 9187 curwin->w_wcol)); | |
| 9188 } | |
| 9189 } | |
| 9190 | |
| 9191 | |
| 9192 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9193 * 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
|
9194 * 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
|
9195 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9196 * scrolling. |
| 9197 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9198 */ | |
| 9199 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9200 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9201 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9202 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9203 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9204 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9205 int mayclear) |
| 7 | 9206 { |
| 9207 int did_delete; | |
| 9208 int nextrow; | |
| 9209 int lastrow; | |
| 9210 int retval; | |
| 9211 | |
| 9212 if (invalid) | |
| 9213 wp->w_lines_valid = 0; | |
| 9214 | |
| 9215 if (wp->w_height < 5) | |
| 9216 return FAIL; | |
| 9217 | |
| 9218 if (line_count > wp->w_height - row) | |
| 9219 line_count = wp->w_height - row; | |
| 9220 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9221 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9222 if (retval != MAYBE) |
| 9223 return retval; | |
| 9224 | |
| 9225 /* | |
| 9226 * If there is a next window or a status line, we first try to delete the | |
| 9227 * 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
|
9228 * 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
|
9229 * avoid messing up those windows, better just redraw. |
| 7 | 9230 */ |
| 9231 did_delete = FALSE; | |
| 9232 if (wp->w_next != NULL || wp->w_status_height) | |
| 9233 { | |
| 9234 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
|
9235 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9236 did_delete = TRUE; |
| 9237 else if (wp->w_next) | |
| 9238 return FAIL; | |
| 9239 } | |
| 9240 /* | |
| 9241 * if no lines deleted, blank the lines that will end up below the window | |
| 9242 */ | |
| 9243 if (!did_delete) | |
| 9244 { | |
| 9245 wp->w_redr_status = TRUE; | |
| 9246 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
|
9247 nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height; |
| 7 | 9248 lastrow = nextrow + line_count; |
| 9249 if (lastrow > Rows) | |
| 9250 lastrow = Rows; | |
| 9251 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
|
9252 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9253 ' ', ' ', 0); |
| 9254 } | |
| 9255 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9256 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9257 == FAIL) |
| 9258 { | |
|
17628
6146b10714de
patch 8.1.1811: popup window color cannot be set to "Normal"
Bram Moolenaar <Bram@vim.org>
parents:
17551
diff
changeset
|
9259 // deletion will have messed up other windows |
| 7 | 9260 if (did_delete) |
| 9261 { | |
| 9262 wp->w_redr_status = TRUE; | |
| 9263 win_rest_invalid(W_NEXT(wp)); | |
| 9264 } | |
| 9265 return FAIL; | |
| 9266 } | |
| 9267 | |
| 9268 return OK; | |
| 9269 } | |
| 9270 | |
| 9271 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9272 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9273 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9274 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9275 * scrolling | |
| 9276 * Return OK for success, FAIL if the lines are not deleted. | |
| 9277 */ | |
| 9278 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9279 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9280 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9281 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9282 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9283 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9284 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9285 int clear_attr) /* for clearing lines */ |
| 7 | 9286 { |
| 9287 int retval; | |
| 9288 | |
| 9289 if (invalid) | |
| 9290 wp->w_lines_valid = 0; | |
| 9291 | |
| 9292 if (line_count > wp->w_height - row) | |
| 9293 line_count = wp->w_height - row; | |
| 9294 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9295 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9296 if (retval != MAYBE) |
| 9297 return retval; | |
| 9298 | |
| 9299 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
|
9300 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9301 return FAIL; |
| 9302 | |
| 9303 /* | |
| 9304 * If there are windows or status lines below, try to put them at the | |
| 9305 * correct place. If we can't do that, they have to be redrawn. | |
| 9306 */ | |
| 9307 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9308 { | |
| 9309 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
|
9310 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9311 { |
| 9312 wp->w_redr_status = TRUE; | |
| 9313 win_rest_invalid(wp->w_next); | |
| 9314 } | |
| 9315 } | |
| 9316 /* | |
| 9317 * If this is the last window and there is no status line, redraw the | |
| 9318 * command line later. | |
| 9319 */ | |
| 9320 else | |
| 9321 redraw_cmdline = TRUE; | |
| 9322 return OK; | |
| 9323 } | |
| 9324 | |
| 9325 /* | |
| 9326 * Common code for win_ins_lines() and win_del_lines(). | |
| 9327 * Returns OK or FAIL when the work has been done. | |
| 9328 * Returns MAYBE when not finished yet. | |
| 9329 */ | |
| 9330 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9331 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9332 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9333 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9334 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9335 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9336 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9337 int clear_attr) |
| 7 | 9338 { |
| 9339 int retval; | |
| 9340 | |
| 9341 if (!redrawing() || line_count <= 0) | |
| 9342 return FAIL; | |
| 9343 | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9344 // 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
|
9345 // 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
|
9346 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
|
9347 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
|
9348 |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9349 // 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
|
9350 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) |
| 7 | 9351 { |
|
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
|
9352 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
|
9353 screenclear(); // will set wp->w_lines_valid to 0 |
| 7 | 9354 return FAIL; |
| 9355 } | |
| 9356 | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9357 #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
|
9358 // 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
|
9359 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
|
9360 return FAIL; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9361 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9362 |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9363 // Delete all remaining lines |
| 7 | 9364 if (row + line_count >= wp->w_height) |
| 9365 { | |
| 9366 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
|
9367 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9368 ' ', ' ', 0); |
| 9369 return OK; | |
| 9370 } | |
| 9371 | |
| 9372 /* | |
|
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
|
9373 * When scrolling, the message on the command line should be cleared, |
| 7 | 9374 * 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
|
9375 * Don't do this when avoiding to insert lines. |
| 7 | 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 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
|
9378 clear_cmdline = TRUE; |
| 7 | 9379 |
| 9380 /* | |
| 9381 * If the terminal can set a scroll region, use that. | |
| 9382 * Always do this in a vertically split window. This will redraw from | |
| 9383 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9384 * win_line(). | |
| 9385 * 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
|
9386 * 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
|
9387 * scroll-up . |
| 7 | 9388 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9389 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
|
9390 { |
| 7 | 9391 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9392 scroll_region_set(wp, row); | |
| 9393 if (del) | |
| 9394 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
|
9395 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 9396 else |
| 9397 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
|
9398 wp->w_height - row, clear_attr, wp); |
| 7 | 9399 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9400 scroll_region_reset(); | |
| 9401 return retval; | |
| 9402 } | |
| 9403 | |
| 9404 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9405 return FAIL; | |
| 9406 | |
| 9407 return MAYBE; | |
| 9408 } | |
| 9409 | |
| 9410 /* | |
| 9411 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9412 */ | |
| 9413 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9414 win_rest_invalid(win_T *wp) |
| 7 | 9415 { |
| 9416 while (wp != NULL) | |
| 9417 { | |
| 9418 redraw_win_later(wp, NOT_VALID); | |
| 9419 wp->w_redr_status = TRUE; | |
| 9420 wp = wp->w_next; | |
| 9421 } | |
| 9422 redraw_cmdline = TRUE; | |
| 9423 } | |
| 9424 | |
| 9425 /* | |
| 9426 * The rest of the routines in this file perform screen manipulations. The | |
| 9427 * given operation is performed physically on the screen. The corresponding | |
| 9428 * change is also made to the internal screen image. In this way, the editor | |
| 9429 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9430 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9431 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9432 * screen changes, and in the meantime, everything still works. | |
| 9433 */ | |
| 9434 | |
| 9435 /* | |
| 9436 * types for inserting or deleting lines | |
| 9437 */ | |
| 9438 #define USE_T_CAL 1 | |
| 9439 #define USE_T_CDL 2 | |
| 9440 #define USE_T_AL 3 | |
| 9441 #define USE_T_CE 4 | |
| 9442 #define USE_T_DL 5 | |
| 9443 #define USE_T_SR 6 | |
| 9444 #define USE_NL 7 | |
| 9445 #define USE_T_CD 8 | |
| 9446 #define USE_REDRAW 9 | |
| 9447 | |
| 9448 /* | |
| 9449 * insert lines on the screen and update ScreenLines[] | |
| 9450 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9451 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9452 * 'row' and 'end' are relative to the start of the region. | |
| 9453 * | |
| 9454 * return FAIL for failure, OK for success. | |
| 9455 */ | |
| 446 | 9456 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9457 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9458 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9459 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9460 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9461 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9462 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9463 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9464 { |
| 9465 int i; | |
| 9466 int j; | |
| 9467 unsigned temp; | |
| 9468 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9469 int cursor_col = 0; |
| 7 | 9470 int type; |
| 9471 int result_empty; | |
| 9472 int can_ce = can_clear(T_CE); | |
| 9473 | |
| 9474 /* | |
| 9475 * FAIL if | |
| 9476 * - there is no valid screen | |
| 9477 * - the screen has to be redrawn completely | |
| 9478 * - the line count is less than one | |
| 9479 * - 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
|
9480 * - 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
|
9481 * - there is a popup window |
| 7 | 9482 */ |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9483 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
|
9484 || 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
|
9485 #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
|
9486 || (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
|
9487 && 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
|
9488 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9489 #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
|
9490 || popup_visible |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9491 #endif |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9492 ) |
| 7 | 9493 return FAIL; |
| 9494 | |
| 9495 /* | |
| 9496 * There are seven ways to insert lines: | |
| 9497 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9498 * characters from ScreenLines[]. | |
| 9499 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9500 * the insert is just empty lines | |
| 9501 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9502 * present or line_count > 1. It looks better if we do all the inserts | |
| 9503 * at once. | |
| 9504 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9505 * insert is just empty lines and T_CE is not present or line_count > | |
| 9506 * 1. | |
| 9507 * 4. Use T_AL (insert line) if it exists. | |
| 9508 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9509 * just empty lines. | |
| 9510 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9511 * just empty lines. | |
| 9512 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9513 * the 'da' flag is not set or we have clear line capability. | |
| 9514 * 8. redraw the characters from ScreenLines[]. | |
| 9515 * | |
| 9516 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9517 * the scrollbar for the window. It does have insert line, use that if it | |
| 9518 * exists. | |
| 9519 */ | |
| 9520 result_empty = (row + line_count >= end); | |
| 9521 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 9522 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
|
9523 else if (can_clear(T_CD) && result_empty) |
| 7 | 9524 type = USE_T_CD; |
| 9525 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9526 type = USE_T_CAL; | |
| 9527 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9528 type = USE_T_CDL; | |
| 9529 else if (*T_AL != NUL) | |
| 9530 type = USE_T_AL; | |
| 9531 else if (can_ce && result_empty) | |
| 9532 type = USE_T_CE; | |
| 9533 else if (*T_DL != NUL && result_empty) | |
| 9534 type = USE_T_DL; | |
| 9535 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9536 type = USE_T_SR; | |
| 9537 else | |
| 9538 return FAIL; | |
| 9539 | |
| 9540 /* | |
| 9541 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9542 * care of t_db if necessary. | |
| 9543 */ | |
| 9544 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9545 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
|
9546 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 9547 |
| 9548 /* | |
| 9549 * If text is retained below the screen, first clear or delete as many | |
| 9550 * lines at the bottom of the window as are about to be inserted so that | |
| 9551 * the deleted lines won't later surface during a screen_del_lines. | |
| 9552 */ | |
| 9553 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
|
9554 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 9555 |
| 9556 #ifdef FEAT_CLIPBOARD | |
| 9557 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9558 * 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
|
9559 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 9560 clip_clear_selection(&clip_star); |
| 7 | 9561 else |
| 9562 clip_scroll_selection(-line_count); | |
| 9563 #endif | |
| 9564 | |
| 9565 #ifdef FEAT_GUI | |
| 9566 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9567 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9568 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 9569 #endif |
| 9570 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9571 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
|
9572 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
|
9573 |
| 7 | 9574 if (*T_CCS != NUL) /* cursor relative to region */ |
| 9575 cursor_row = row; | |
| 9576 else | |
| 9577 cursor_row = row + off; | |
| 9578 | |
| 9579 /* | |
| 9580 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9581 * Clear the inserted lines in ScreenLines[]. | |
| 9582 */ | |
| 9583 row += off; | |
| 9584 end += off; | |
| 9585 for (i = 0; i < line_count; ++i) | |
| 9586 { | |
| 9587 if (wp != NULL && wp->w_width != Columns) | |
| 9588 { | |
| 9589 /* need to copy part of a line */ | |
| 9590 j = end - 1 - i; | |
| 9591 while ((j -= line_count) >= row) | |
| 9592 linecopy(j + line_count, j, wp); | |
| 9593 j += line_count; | |
| 9594 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
|
9595 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
|
9596 clear_attr); |
| 7 | 9597 else |
| 9598 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9599 LineWraps[j] = FALSE; | |
| 9600 } | |
| 9601 else | |
| 9602 { | |
| 9603 j = end - 1 - i; | |
| 9604 temp = LineOffset[j]; | |
| 9605 while ((j -= line_count) >= row) | |
| 9606 { | |
| 9607 LineOffset[j + line_count] = LineOffset[j]; | |
| 9608 LineWraps[j + line_count] = LineWraps[j]; | |
| 9609 } | |
| 9610 LineOffset[j + line_count] = temp; | |
| 9611 LineWraps[j + line_count] = FALSE; | |
| 9612 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
|
9613 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 9614 else |
| 9615 lineinvalid(temp, (int)Columns); | |
| 9616 } | |
| 9617 } | |
| 9618 | |
| 9619 screen_stop_highlight(); | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9620 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
|
9621 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
|
9622 screen_start_highlight(clear_attr); |
| 7 | 9623 |
| 9624 /* redraw the characters */ | |
| 9625 if (type == USE_REDRAW) | |
| 9626 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
|
9627 else if (type == USE_T_CAL) |
| 7 | 9628 { |
| 9629 term_append_lines(line_count); | |
| 9630 screen_start(); /* don't know where cursor is now */ | |
| 9631 } | |
| 9632 else | |
| 9633 { | |
| 9634 for (i = 0; i < line_count; i++) | |
| 9635 { | |
| 9636 if (type == USE_T_AL) | |
| 9637 { | |
| 9638 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
|
9639 windgoto(cursor_row, cursor_col); |
| 7 | 9640 out_str(T_AL); |
| 9641 } | |
| 9642 else /* type == USE_T_SR */ | |
| 9643 out_str(T_SR); | |
| 9644 screen_start(); /* don't know where cursor is now */ | |
| 9645 } | |
| 9646 } | |
| 9647 | |
| 9648 /* | |
| 9649 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 9650 * have been scrolled down into the region. | |
| 9651 */ | |
| 9652 if (type == USE_T_SR && *T_DA) | |
| 9653 { | |
| 9654 for (i = 0; i < line_count; ++i) | |
| 9655 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9656 windgoto(off + i, cursor_col); |
| 7 | 9657 out_str(T_CE); |
| 9658 screen_start(); /* don't know where cursor is now */ | |
| 9659 } | |
| 9660 } | |
| 9661 | |
| 9662 #ifdef FEAT_GUI | |
| 9663 gui_can_update_cursor(); | |
| 9664 if (gui.in_use) | |
| 9665 out_flush(); /* always flush after a scroll */ | |
| 9666 #endif | |
| 9667 return OK; | |
| 9668 } | |
| 9669 | |
| 9670 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9671 * 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
|
9672 * "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
|
9673 * 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
|
9674 * "row" and "end" are relative to the start of the region. |
| 7 | 9675 * |
| 9676 * Return OK for success, FAIL if the lines are not deleted. | |
| 9677 */ | |
| 9678 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9679 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9680 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9681 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9682 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9683 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9684 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
|
9685 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
|
9686 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 9687 { |
| 9688 int j; | |
| 9689 int i; | |
| 9690 unsigned temp; | |
| 9691 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9692 int cursor_col = 0; |
| 7 | 9693 int cursor_end; |
| 9694 int result_empty; /* result is empty until end of region */ | |
| 9695 int can_delete; /* deleting line codes can be used */ | |
| 9696 int type; | |
| 9697 | |
| 9698 /* | |
| 9699 * FAIL if | |
| 9700 * - there is no valid screen | |
| 9701 * - the screen has to be redrawn completely | |
| 9702 * - the line count is less than one | |
| 9703 * - 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
|
9704 * - redrawing for a callback and there is a modeless selection |
| 7 | 9705 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9706 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
|
9707 || (!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
|
9708 #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
|
9709 || (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
|
9710 && 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
|
9711 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9712 ) |
| 7 | 9713 return FAIL; |
| 9714 | |
| 9715 /* | |
| 9716 * Check if the rest of the current region will become empty. | |
| 9717 */ | |
| 9718 result_empty = row + line_count >= end; | |
| 9719 | |
| 9720 /* | |
| 9721 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 9722 * available. | |
| 9723 */ | |
| 9724 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 9725 | |
| 9726 /* | |
| 9727 * There are six ways to delete lines: | |
| 9728 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9729 * characters from ScreenLines[]. | |
| 9730 * 1. Use T_CD if it exists and the result is empty. | |
| 9731 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 9732 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 9733 * none of the other ways work. | |
| 9734 * 4. Use T_CE (erase line) if the result is empty. | |
| 9735 * 5. Use T_DL (delete line) if it exists. | |
| 9736 * 6. redraw the characters from ScreenLines[]. | |
| 9737 */ | |
| 9738 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 9739 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
|
9740 else if (can_clear(T_CD) && result_empty) |
| 7 | 9741 type = USE_T_CD; |
| 9742 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 9743 /* | |
| 9744 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 9745 * its internal termcap... this works okay for tests which test *T_DB != | |
| 9746 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 9747 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 9748 * the trick... | |
| 9749 * Anyway, this hack will hopefully go away with the next OS release. | |
| 9750 * (Olaf Seibert) | |
| 9751 */ | |
| 9752 else if (row == 0 && T_DB == empty_option | |
| 9753 && (line_count == 1 || *T_CDL == NUL)) | |
| 9754 #else | |
| 9755 else if (row == 0 && ( | |
| 9756 #ifndef AMIGA | |
| 9757 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 9758 * up, so use delete-line command */ | |
| 9759 line_count == 1 || | |
| 9760 #endif | |
| 9761 *T_CDL == NUL)) | |
| 9762 #endif | |
| 9763 type = USE_NL; | |
| 9764 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 9765 type = USE_T_CDL; | |
| 9766 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
|
9767 && (wp == NULL || wp->w_width == Columns)) |
| 7 | 9768 type = USE_T_CE; |
| 9769 else if (*T_DL != NUL && can_delete) | |
| 9770 type = USE_T_DL; | |
| 9771 else if (*T_CDL != NUL && can_delete) | |
| 9772 type = USE_T_CDL; | |
| 9773 else | |
| 9774 return FAIL; | |
| 9775 | |
| 9776 #ifdef FEAT_CLIPBOARD | |
| 9777 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 9778 * 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
|
9779 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 9780 clip_clear_selection(&clip_star); |
| 7 | 9781 else |
| 9782 clip_scroll_selection(line_count); | |
| 9783 #endif | |
| 9784 | |
| 9785 #ifdef FEAT_GUI | |
| 9786 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9787 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9788 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
|
9789 && gui.cursor_row < end + off); |
| 7 | 9790 #endif |
| 9791 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9792 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
|
9793 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
|
9794 |
| 7 | 9795 if (*T_CCS != NUL) /* cursor relative to region */ |
| 9796 { | |
| 9797 cursor_row = row; | |
| 9798 cursor_end = end; | |
| 9799 } | |
| 9800 else | |
| 9801 { | |
| 9802 cursor_row = row + off; | |
| 9803 cursor_end = end + off; | |
| 9804 } | |
| 9805 | |
| 9806 /* | |
| 9807 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 9808 * Clear the inserted lines in ScreenLines[]. | |
| 9809 */ | |
| 9810 row += off; | |
| 9811 end += off; | |
| 9812 for (i = 0; i < line_count; ++i) | |
| 9813 { | |
| 9814 if (wp != NULL && wp->w_width != Columns) | |
| 9815 { | |
| 9816 /* need to copy part of a line */ | |
| 9817 j = row + i; | |
| 9818 while ((j += line_count) <= end - 1) | |
| 9819 linecopy(j - line_count, j, wp); | |
| 9820 j -= line_count; | |
| 9821 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
|
9822 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
|
9823 clear_attr); |
| 7 | 9824 else |
| 9825 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9826 LineWraps[j] = FALSE; | |
| 9827 } | |
| 9828 else | |
| 9829 { | |
| 9830 /* whole width, moving the line pointers is faster */ | |
| 9831 j = row + i; | |
| 9832 temp = LineOffset[j]; | |
| 9833 while ((j += line_count) <= end - 1) | |
| 9834 { | |
| 9835 LineOffset[j - line_count] = LineOffset[j]; | |
| 9836 LineWraps[j - line_count] = LineWraps[j]; | |
| 9837 } | |
| 9838 LineOffset[j - line_count] = temp; | |
| 9839 LineWraps[j - line_count] = FALSE; | |
| 9840 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
|
9841 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 9842 else |
| 9843 lineinvalid(temp, (int)Columns); | |
| 9844 } | |
| 9845 } | |
| 9846 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9847 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
|
9848 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9849 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
|
9850 screen_start_highlight(clear_attr); |
| 7 | 9851 |
| 9852 /* redraw the characters */ | |
| 9853 if (type == USE_REDRAW) | |
| 9854 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
|
9855 else if (type == USE_T_CD) /* delete the lines */ |
| 7 | 9856 { |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9857 windgoto(cursor_row, cursor_col); |
| 7 | 9858 out_str(T_CD); |
| 9859 screen_start(); /* don't know where cursor is now */ | |
| 9860 } | |
| 9861 else if (type == USE_T_CDL) | |
| 9862 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9863 windgoto(cursor_row, cursor_col); |
| 7 | 9864 term_delete_lines(line_count); |
| 9865 screen_start(); /* don't know where cursor is now */ | |
| 9866 } | |
| 9867 /* | |
| 9868 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 9869 * the whole screen (scroll region) up by outputting newlines on the | |
| 9870 * last line. | |
| 9871 */ | |
| 9872 else if (type == USE_NL) | |
| 9873 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9874 windgoto(cursor_end - 1, cursor_col); |
| 7 | 9875 for (i = line_count; --i >= 0; ) |
| 9876 out_char('\n'); /* cursor will remain on same line */ | |
| 9877 } | |
| 9878 else | |
| 9879 { | |
| 9880 for (i = line_count; --i >= 0; ) | |
| 9881 { | |
| 9882 if (type == USE_T_DL) | |
| 9883 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9884 windgoto(cursor_row, cursor_col); |
| 7 | 9885 out_str(T_DL); /* delete a line */ |
| 9886 } | |
| 9887 else /* type == USE_T_CE */ | |
| 9888 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9889 windgoto(cursor_row + i, cursor_col); |
| 7 | 9890 out_str(T_CE); /* erase a line */ |
| 9891 } | |
| 9892 screen_start(); /* don't know where cursor is now */ | |
| 9893 } | |
| 9894 } | |
| 9895 | |
| 9896 /* | |
| 9897 * If the 'db' flag is set, we need to clear the lines that have been | |
| 9898 * scrolled up at the bottom of the region. | |
| 9899 */ | |
| 9900 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 9901 { | |
| 9902 for (i = line_count; i > 0; --i) | |
| 9903 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9904 windgoto(cursor_end - i, cursor_col); |
| 7 | 9905 out_str(T_CE); /* erase a line */ |
| 9906 screen_start(); /* don't know where cursor is now */ | |
| 9907 } | |
| 9908 } | |
| 9909 | |
| 9910 #ifdef FEAT_GUI | |
| 9911 gui_can_update_cursor(); | |
| 9912 if (gui.in_use) | |
| 9913 out_flush(); /* always flush after a scroll */ | |
| 9914 #endif | |
| 9915 | |
| 9916 return OK; | |
| 9917 } | |
| 9918 | |
| 9919 /* | |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9920 * 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
|
9921 * 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
|
9922 */ |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9923 int |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9924 skip_showmode() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9925 { |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9926 // 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
|
9927 // 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
|
9928 if (global_busy |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9929 || msg_silent != 0 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9930 || !redrawing() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9931 || (char_avail() && !KeyTyped)) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9932 { |
|
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
|
9933 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
|
9934 return TRUE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9935 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9936 return FALSE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9937 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9938 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9939 /* |
|
13308
ae312df8d0ab
patch 8.0.1528: dead code found
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
9940 * Show the current mode and ruler. |
| 7 | 9941 * |
| 9942 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 9943 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 9944 * 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
|
9945 * If redraw_mode is TRUE show or clear the mode. |
| 7 | 9946 * Return the length of the message (0 if no message). |
| 9947 */ | |
| 9948 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9949 showmode(void) |
| 7 | 9950 { |
| 9951 int need_clear; | |
| 9952 int length = 0; | |
| 9953 int do_mode; | |
| 9954 int attr; | |
| 9955 int nwr_save; | |
| 9956 #ifdef FEAT_INS_EXPAND | |
| 9957 int sub_attr; | |
| 9958 #endif | |
| 9959 | |
| 642 | 9960 do_mode = ((p_smd && msg_silent == 0) |
| 9961 && ((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
|
9962 || restart_edit != NUL |
| 5735 | 9963 || 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
|
9964 if (do_mode || reg_recording != 0) |
| 7 | 9965 { |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9966 if (skip_showmode()) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9967 return 0; // show mode later |
| 7 | 9968 |
| 9969 nwr_save = need_wait_return; | |
| 9970 | |
| 9971 /* wait a bit before overwriting an important message */ | |
| 9972 check_for_delay(FALSE); | |
| 9973 | |
| 9974 /* if the cmdline is more than one line high, erase top lines */ | |
| 9975 need_clear = clear_cmdline; | |
| 9976 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 9977 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 9978 | |
| 9979 /* Position on the last line in the window, column 0 */ | |
| 9980 msg_pos_mode(); | |
| 9981 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
9982 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 9983 if (do_mode) |
| 9984 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
9985 msg_puts_attr("--", attr); |
| 7 | 9986 #if defined(FEAT_XIM) |
| 2520 | 9987 if ( |
| 9988 # ifdef FEAT_GUI_GTK | |
| 9989 preedit_get_status() | |
| 1668 | 9990 # else |
| 9991 im_get_status() | |
| 2520 | 9992 # endif |
| 1668 | 9993 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
9994 # 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
|
9995 msg_puts_attr(" IM", attr); |
| 7 | 9996 # else |
|
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(" XIM", attr); |
| 7 | 9998 # endif |
| 9999 #endif | |
| 10000 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10001 if (gui.in_use) | |
| 10002 { | |
| 10003 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10004 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10005 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10006 if (enc_utf8) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10007 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
|
10008 else |
|
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(" \307\321\261\333", attr); |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10010 } |
| 7 | 10011 } |
| 10012 #endif | |
| 10013 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10014 /* CTRL-X in Insert mode */ |
| 10015 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10016 { |
| 10017 /* These messages can get long, avoid a wrap in a narrow | |
| 10018 * window. Prefer showing edit_submode_extra. */ | |
| 10019 length = (Rows - msg_row) * Columns - 3; | |
| 10020 if (edit_submode_extra != NULL) | |
| 10021 length -= vim_strsize(edit_submode_extra); | |
| 10022 if (length > 0) | |
| 10023 { | |
| 10024 if (edit_submode_pre != NULL) | |
| 10025 length -= vim_strsize(edit_submode_pre); | |
| 10026 if (length - vim_strsize(edit_submode) > 0) | |
| 10027 { | |
| 10028 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
|
10029 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
|
10030 msg_puts_attr((char *)edit_submode, attr); |
| 7 | 10031 } |
| 10032 if (edit_submode_extra != NULL) | |
| 10033 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10034 msg_puts_attr(" ", attr); /* add a space in between */ |
| 7 | 10035 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
|
10036 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10037 else |
| 10038 sub_attr = attr; | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10039 msg_puts_attr((char *)edit_submode_extra, sub_attr); |
| 7 | 10040 } |
| 10041 } | |
| 10042 } | |
| 10043 else | |
| 10044 #endif | |
| 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 |
| 7 | 10109 #ifdef FEAT_INS_EXPAND |
| 10110 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10111 #endif | |
| 10112 ) | |
| 10113 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10114 recording_mode(attr); |
| 7 | 10115 need_clear = TRUE; |
| 10116 } | |
| 644 | 10117 |
| 10118 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
|
10119 if (need_clear || clear_cmdline || redraw_mode) |
| 7 | 10120 msg_clr_eos(); |
| 10121 msg_didout = FALSE; /* overwrite this message */ | |
| 10122 length = msg_col; | |
| 10123 msg_col = 0; | |
| 10124 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10125 } | |
| 10126 else if (clear_cmdline && msg_silent == 0) | |
| 10127 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10128 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
|
10129 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
|
10130 { |
|
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
|
10131 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
|
10132 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
|
10133 } |
| 7 | 10134 |
| 10135 #ifdef FEAT_CMDL_INFO | |
| 10136 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10137 if (VIsual_active) | |
| 10138 clear_showcmd(); | |
| 10139 | |
| 10140 /* If the last window has no status line, the ruler is after the mode | |
| 10141 * 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
|
10142 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
|
10143 win_redr_ruler(lastwin, TRUE, FALSE); |
| 7 | 10144 #endif |
| 10145 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
|
10146 redraw_mode = FALSE; |
| 7 | 10147 clear_cmdline = FALSE; |
| 10148 | |
| 10149 return length; | |
| 10150 } | |
| 10151 | |
| 10152 /* | |
| 10153 * Position for a mode message. | |
| 10154 */ | |
| 10155 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10156 msg_pos_mode(void) |
| 7 | 10157 { |
| 10158 msg_col = 0; | |
| 10159 msg_row = Rows - 1; | |
| 10160 } | |
| 10161 | |
| 10162 /* | |
| 10163 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10164 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10165 * Caller should check "mode_displayed". |
| 7 | 10166 */ |
| 10167 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10168 unshowmode(int force) |
| 7 | 10169 { |
| 10170 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10171 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10172 */ |
| 10173 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10174 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10175 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10176 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10177 } |
|
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 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10180 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10181 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10182 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10183 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10184 { |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10185 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
|
10186 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
|
10187 |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10188 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
|
10189 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
|
10190 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
|
10191 msg_clr_eos(); |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10192 |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10193 msg_col = save_msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10194 msg_row = save_msg_row; |
| 7 | 10195 } |
| 10196 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10197 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10198 recording_mode(int attr) |
|
7233
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 msg_puts_attr(_("recording"), attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10201 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10202 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10203 char s[4]; |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10204 |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10205 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
|
10206 msg_puts_attr(s, attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10207 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10208 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10209 |
| 667 | 10210 /* |
| 10211 * Draw the tab pages line at the top of the Vim window. | |
| 10212 */ | |
|
15396
325e4a8ba1b6
patch 8.1.0706: tabline is not always redrawn
Bram Moolenaar <Bram@vim.org>
parents:
15384
diff
changeset
|
10213 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10214 draw_tabline(void) |
| 667 | 10215 { |
| 10216 int tabcount = 0; | |
| 10217 tabpage_T *tp; | |
| 10218 int tabwidth; | |
| 10219 int col = 0; | |
| 673 | 10220 int scol = 0; |
| 667 | 10221 int attr; |
| 10222 win_T *wp; | |
| 671 | 10223 win_T *cwp; |
| 10224 int wincount; | |
| 10225 int modified; | |
| 667 | 10226 int c; |
| 10227 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10228 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
|
10229 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
|
10230 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10231 char_u *p; |
| 677 | 10232 int room; |
| 10233 int use_sep_chars = (t_colors < 8 | |
| 10234 #ifdef FEAT_GUI | |
| 10235 && !gui.in_use | |
| 10236 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10237 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10238 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10239 #endif |
| 677 | 10240 ); |
| 673 | 10241 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10242 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10243 return; |
| 673 | 10244 redraw_tabline = FALSE; |
| 667 | 10245 |
| 685 | 10246 #ifdef FEAT_GUI_TABLINE |
| 798 | 10247 /* Take care of a GUI tabline. */ |
| 685 | 10248 if (gui_use_tabline()) |
| 10249 { | |
| 10250 gui_update_tabline(); | |
| 10251 return; | |
| 10252 } | |
| 10253 #endif | |
| 10254 | |
| 10255 if (tabline_height() < 1) | |
| 667 | 10256 return; |
| 10257 | |
| 677 | 10258 #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
|
10259 clear_TabPageIdxs(); |
| 681 | 10260 |
| 677 | 10261 /* Use the 'tabline' option if it's set. */ |
| 10262 if (*p_tal != NUL) | |
| 10263 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10264 int saved_did_emsg = did_emsg; |
| 680 | 10265 |
| 10266 /* Check for an error. If there is one we would loop in redrawing the | |
| 10267 * 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
|
10268 did_emsg = FALSE; |
| 677 | 10269 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10270 if (did_emsg) |
| 680 | 10271 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10272 (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
|
10273 did_emsg |= saved_did_emsg; |
| 680 | 10274 } |
| 10275 else | |
| 10276 #endif | |
| 10277 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10278 FOR_ALL_TABPAGES(tp) |
| 680 | 10279 ++tabcount; |
| 10280 | |
| 10281 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10282 if (tabwidth < 6) | |
| 10283 tabwidth = 6; | |
| 10284 | |
| 10285 attr = attr_nosel; | |
| 10286 tabcount = 0; | |
| 699 | 10287 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10288 tp = tp->tp_next) | |
| 680 | 10289 { |
| 10290 scol = col; | |
| 10291 | |
| 10292 if (tp->tp_topframe == topframe) | |
| 10293 attr = attr_sel; | |
| 10294 if (use_sep_chars && col > 0) | |
| 10295 screen_putchar('|', 0, col++, attr); | |
| 10296 | |
| 10297 if (tp->tp_topframe != topframe) | |
| 10298 attr = attr_nosel; | |
| 10299 | |
| 10300 screen_putchar(' ', 0, col++, attr); | |
| 10301 | |
| 10302 if (tp == curtab) | |
| 10303 { | |
| 10304 cwp = curwin; | |
| 10305 wp = firstwin; | |
| 10306 } | |
| 10307 else | |
| 10308 { | |
| 10309 cwp = tp->tp_curwin; | |
| 10310 wp = tp->tp_firstwin; | |
| 10311 } | |
| 10312 | |
| 10313 modified = FALSE; | |
| 10314 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10315 if (bufIsChanged(wp->w_buffer)) | |
| 10316 modified = TRUE; | |
| 10317 if (modified || wincount > 1) | |
| 10318 { | |
| 10319 if (wincount > 1) | |
| 10320 { | |
| 10321 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10322 len = (int)STRLEN(NameBuff); |
| 699 | 10323 if (col + len >= Columns - 3) |
| 10324 break; | |
| 680 | 10325 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10326 #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
|
10327 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10328 #else |
| 6106 | 10329 attr |
| 680 | 10330 #endif |
| 10331 ); | |
| 10332 col += len; | |
| 10333 } | |
| 10334 if (modified) | |
| 10335 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10336 screen_putchar(' ', 0, col++, attr); | |
| 10337 } | |
| 10338 | |
| 10339 room = scol - col + tabwidth - 1; | |
| 10340 if (room > 0) | |
| 10341 { | |
| 685 | 10342 /* Get buffer name in NameBuff[] */ |
| 10343 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10344 shorten_dir(NameBuff); |
| 680 | 10345 len = vim_strsize(NameBuff); |
| 10346 p = NameBuff; | |
| 10347 if (has_mbyte) | |
| 10348 while (len > room) | |
| 10349 { | |
| 10350 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10351 MB_PTR_ADV(p); |
| 680 | 10352 } |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
10353 else if (len > room) |
| 677 | 10354 { |
| 680 | 10355 p += len - room; |
| 10356 len = room; | |
| 677 | 10357 } |
| 699 | 10358 if (len > Columns - col - 1) |
| 10359 len = Columns - col - 1; | |
| 680 | 10360 |
| 835 | 10361 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10362 col += len; |
| 10363 } | |
| 10364 screen_putchar(' ', 0, col++, attr); | |
| 10365 | |
| 10366 /* Store the tab page number in TabPageIdxs[], so that | |
| 10367 * jump_to_mouse() knows where each one is. */ | |
| 10368 ++tabcount; | |
| 10369 while (scol < col) | |
| 10370 TabPageIdxs[scol++] = tabcount; | |
| 10371 } | |
| 10372 | |
| 10373 if (use_sep_chars) | |
| 10374 c = '_'; | |
| 10375 else | |
| 10376 c = ' '; | |
| 10377 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10378 |
| 10379 /* Put an "X" for closing the current tab if there are several. */ | |
| 10380 if (first_tabpage->tp_next != NULL) | |
| 10381 { | |
| 10382 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10383 TabPageIdxs[Columns - 1] = -999; | |
| 10384 } | |
| 10385 } | |
| 834 | 10386 |
| 10387 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10388 * set. */ | |
| 10389 redraw_tabline = FALSE; | |
| 667 | 10390 } |
| 685 | 10391 |
| 10392 /* | |
| 10393 * Get buffer name for "buf" into NameBuff[]. | |
| 10394 * Takes care of special buffer names and translates special characters. | |
| 10395 */ | |
| 10396 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10397 get_trans_bufname(buf_T *buf) |
| 685 | 10398 { |
| 10399 if (buf_spname(buf) != NULL) | |
| 3839 | 10400 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10401 else |
| 10402 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10403 trans_characters(NameBuff, MAXPATHL); | |
| 10404 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10405 |
| 7 | 10406 /* |
| 10407 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10408 */ | |
| 10409 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
|
10410 fillchar_status(int *attr, win_T *wp) |
| 7 | 10411 { |
| 10412 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
|
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 #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
|
10415 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
|
10416 { |
|
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 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
|
10418 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10419 *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
|
10420 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
|
10421 } |
|
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 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10423 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10424 *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
|
10425 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
|
10426 } |
|
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
|
10427 } |
|
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
|
10428 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
|
10429 #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
|
10430 if (wp == curwin) |
| 7 | 10431 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10432 *attr = HL_ATTR(HLF_S); |
| 7 | 10433 fill = fill_stl; |
| 10434 } | |
| 10435 else | |
| 10436 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10437 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10438 fill = fill_stlnc; |
| 10439 } | |
| 10440 /* Use fill when there is highlighting, and highlighting of current | |
| 10441 * window differs, or the fillchars differ, or this is not the | |
| 10442 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10443 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
|
10444 || wp != curwin || ONE_WINDOW) |
| 7 | 10445 || (fill_stl != fill_stlnc))) |
| 10446 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
|
10447 if (wp == curwin) |
| 7 | 10448 return '^'; |
| 10449 return '='; | |
| 10450 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10451 |
| 7 | 10452 /* |
| 10453 * Get the character to use in a separator between vertically split windows. | |
| 10454 * Get its attributes in "*attr". | |
| 10455 */ | |
| 10456 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10457 fillchar_vsep(int *attr) |
| 7 | 10458 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10459 *attr = HL_ATTR(HLF_C); |
| 7 | 10460 if (*attr == 0 && fill_vert == ' ') |
| 10461 return '|'; | |
| 10462 else | |
| 10463 return fill_vert; | |
| 10464 } | |
| 10465 | |
| 10466 /* | |
| 10467 * Return TRUE if redrawing should currently be done. | |
| 10468 */ | |
| 10469 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10470 redrawing(void) |
| 7 | 10471 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10472 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10473 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
|
10474 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10475 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10476 #endif |
|
14673
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10477 return ((!RedrawingDisabled |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10478 #ifdef FEAT_EVAL |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10479 || 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
|
10480 #endif |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10481 ) && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 7 | 10482 } |
| 10483 | |
| 10484 /* | |
| 10485 * Return TRUE if printing messages should currently be done. | |
| 10486 */ | |
| 10487 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10488 messaging(void) |
| 7 | 10489 { |
| 10490 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10491 } | |
| 10492 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10493 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10494 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10495 * 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
|
10496 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10497 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10498 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
|
10499 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10500 vimmenu_T *menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10501 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
|
10502 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
|
10503 int col = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10504 int next_col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10505 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
|
10506 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
|
10507 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
|
10508 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10509 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
|
10510 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
|
10511 ++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
|
10512 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
|
10513 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10514 /* 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
|
10515 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
|
10516 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
|
10517 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10518 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
|
10519 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
|
10520 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10521 if (col > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10522 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10523 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
|
10524 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
|
10525 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10526 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10527 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10528 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
|
10529 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
|
10530 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
|
10531 break; |
|
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 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
|
10534 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
|
10535 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10536 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
|
10537 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10538 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10539 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
|
10540 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
|
10541 ++item_idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10542 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10543 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
|
10544 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10545 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
|
10546 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10547 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10548 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
|
10549 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10550 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
|
10551 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10552 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10553 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
|
10554 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10555 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
|
10556 (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
|
10557 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10558 #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
|
10559 |
| 7 | 10560 /* |
| 10561 * Show current status info in ruler and various other places | |
| 10562 * If always is FALSE, only show ruler if position has changed. | |
| 10563 */ | |
| 10564 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10565 showruler(int always) |
| 7 | 10566 { |
| 10567 if (!always && !redrawing()) | |
| 10568 return; | |
| 574 | 10569 #ifdef FEAT_INS_EXPAND |
| 10570 if (pum_visible()) | |
| 10571 { | |
| 10572 /* Don't redraw right now, do it later. */ | |
| 10573 curwin->w_redr_status = TRUE; | |
| 10574 return; | |
| 10575 } | |
| 10576 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10577 #if defined(FEAT_STL_OPT) |
| 40 | 10578 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 1983 | 10579 redraw_custom_statusline(curwin); |
| 7 | 10580 else |
| 10581 #endif | |
| 10582 #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
|
10583 win_redr_ruler(curwin, always, FALSE); |
| 7 | 10584 #endif |
| 10585 | |
| 10586 #ifdef FEAT_TITLE | |
| 10587 if (need_maketitle | |
| 10588 # ifdef FEAT_STL_OPT | |
| 10589 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10590 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10591 # endif | |
| 10592 ) | |
| 10593 maketitle(); | |
| 10594 #endif | |
| 1588 | 10595 /* Redraw the tab pages line if needed. */ |
| 10596 if (redraw_tabline) | |
| 10597 draw_tabline(); | |
| 7 | 10598 } |
| 10599 | |
| 10600 #ifdef FEAT_CMDL_INFO | |
| 10601 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
|
10602 win_redr_ruler(win_T *wp, int always, int ignore_pum) |
| 7 | 10603 { |
| 1869 | 10604 #define RULER_BUF_LEN 70 |
| 10605 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10606 int row; |
| 10607 int fillchar; | |
| 10608 int attr; | |
| 10609 int empty_line = FALSE; | |
| 10610 colnr_T virtcol; | |
| 10611 int i; | |
| 1869 | 10612 size_t len; |
| 7 | 10613 int o; |
| 10614 int this_ru_col; | |
| 10615 int off = 0; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
10616 int width; |
| 7 | 10617 |
| 10618 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10619 if (!p_ru) | |
| 10620 return; | |
| 10621 | |
| 10622 /* | |
| 10623 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10624 * after deleting lines, before cursor.lnum is corrected. | |
| 10625 */ | |
| 10626 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10627 return; | |
| 10628 | |
| 10629 #ifdef FEAT_INS_EXPAND | |
| 10630 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 10631 * the (long) mode message. */ | |
| 10632 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 10633 if (edit_submode != NULL) | |
| 10634 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
|
10635 // 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
|
10636 // 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
|
10637 if (!ignore_pum && pum_visible()) |
| 540 | 10638 return; |
| 7 | 10639 #endif |
| 10640 | |
| 10641 #ifdef FEAT_STL_OPT | |
| 10642 if (*p_ruf) | |
| 10643 { | |
| 680 | 10644 int save_called_emsg = called_emsg; |
| 10645 | |
| 10646 called_emsg = FALSE; | |
| 7 | 10647 win_redr_custom(wp, TRUE); |
| 680 | 10648 if (called_emsg) |
| 10649 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 10650 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 10651 called_emsg |= save_called_emsg; |
| 7 | 10652 return; |
| 10653 } | |
| 10654 #endif | |
| 10655 | |
| 10656 /* | |
| 10657 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 10658 */ | |
| 10659 if (!(State & INSERT) | |
| 10660 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 10661 empty_line = TRUE; | |
| 10662 | |
| 10663 /* | |
| 10664 * Only draw the ruler when something changed. | |
| 10665 */ | |
| 10666 validate_virtcol_win(wp); | |
| 10667 if ( redraw_cmdline | |
| 10668 || always | |
| 10669 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 10670 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 10671 || wp->w_virtcol != wp->w_ru_virtcol | |
| 10672 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 10673 || wp->w_topline != wp->w_ru_topline | |
| 10674 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 10675 #ifdef FEAT_DIFF | |
| 10676 || wp->w_topfill != wp->w_ru_topfill | |
| 10677 #endif | |
| 10678 || empty_line != wp->w_ru_empty) | |
| 10679 { | |
| 10680 cursor_off(); | |
| 10681 if (wp->w_status_height) | |
| 10682 { | |
| 10683 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
|
10684 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
|
10685 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
|
10686 width = wp->w_width; |
| 7 | 10687 } |
| 10688 else | |
| 10689 { | |
| 10690 row = Rows - 1; | |
| 10691 fillchar = ' '; | |
| 10692 attr = 0; | |
| 10693 width = Columns; | |
| 10694 off = 0; | |
| 10695 } | |
| 10696 | |
| 10697 /* In list mode virtcol needs to be recomputed */ | |
| 10698 virtcol = wp->w_virtcol; | |
| 10699 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 10700 { | |
| 10701 wp->w_p_list = FALSE; | |
| 10702 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 10703 wp->w_p_list = TRUE; | |
| 10704 } | |
| 10705 | |
| 10706 /* | |
| 10707 * Some sprintfs return the length, some return a pointer. | |
| 10708 * To avoid portability problems we use strlen() here. | |
| 10709 */ | |
| 1869 | 10710 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 10711 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 10712 ? 0L | |
| 10713 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 10714 len = STRLEN(buffer); |
| 10715 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 10716 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 10717 (int)virtcol + 1); | |
| 10718 | |
| 10719 /* | |
| 10720 * Add a "50%" if there is room for it. | |
| 10721 * On the last line, don't print in the last column (scrolls the | |
| 10722 * screen up on some terminals). | |
| 10723 */ | |
| 10724 i = (int)STRLEN(buffer); | |
| 1869 | 10725 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 10726 o = i + vim_strsize(buffer + i + 1); |
| 10727 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 10728 ++o; | |
| 10729 this_ru_col = ru_col - (Columns - width); | |
| 10730 if (this_ru_col < 0) | |
| 10731 this_ru_col = 0; | |
| 10732 /* Never use more than half the window/screen width, leave the other | |
| 10733 * 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
|
10734 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
|
10735 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
|
10736 if (this_ru_col + o < width) |
| 7 | 10737 { |
| 6466 | 10738 /* 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
|
10739 while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) |
| 7 | 10740 { |
| 10741 if (has_mbyte) | |
| 10742 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 10743 else | |
| 10744 buffer[i++] = fillchar; | |
| 10745 ++o; | |
| 10746 } | |
| 1869 | 10747 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 10748 } |
| 10749 /* Truncate at window boundary. */ | |
| 10750 if (has_mbyte) | |
| 10751 { | |
| 10752 o = 0; | |
| 474 | 10753 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 10754 { |
| 10755 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
|
10756 if (this_ru_col + o > width) |
| 7 | 10757 { |
| 10758 buffer[i] = NUL; | |
| 10759 break; | |
| 10760 } | |
| 10761 } | |
| 10762 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
10763 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
|
10764 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
|
10765 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10766 screen_puts(buffer, row, this_ru_col + off, attr); |
| 7 | 10767 i = redraw_cmdline; |
| 10768 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
|
10769 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
|
10770 (int)(off + width), |
| 7 | 10771 fillchar, fillchar, attr); |
| 10772 /* don't redraw the cmdline because of showing the ruler */ | |
| 10773 redraw_cmdline = i; | |
| 10774 wp->w_ru_cursor = wp->w_cursor; | |
| 10775 wp->w_ru_virtcol = wp->w_virtcol; | |
| 10776 wp->w_ru_empty = empty_line; | |
| 10777 wp->w_ru_topline = wp->w_topline; | |
| 10778 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 10779 #ifdef FEAT_DIFF | |
| 10780 wp->w_ru_topfill = wp->w_topfill; | |
| 10781 #endif | |
| 10782 } | |
| 10783 } | |
| 10784 #endif | |
| 13 | 10785 |
| 10786 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 10787 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
10788 * 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
|
10789 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 10790 * Otherwise it depends on 'numberwidth' and the line count. |
| 10791 */ | |
| 10792 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10793 number_width(win_T *wp) |
| 13 | 10794 { |
| 10795 int n; | |
| 10796 linenr_T lnum; | |
| 10797 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10798 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
|
10799 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10800 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10801 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10802 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10803 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
|
10804 |
| 6679 | 10805 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 10806 return wp->w_nrwidth_width; |
| 10807 wp->w_nrwidth_line_count = lnum; | |
| 10808 | |
| 10809 n = 0; | |
| 10810 do | |
| 10811 { | |
| 856 | 10812 lnum /= 10; |
| 10813 ++n; | |
| 13 | 10814 } while (lnum > 0); |
| 10815 | |
| 10816 /* 'numberwidth' gives the minimal width plus one */ | |
| 10817 if (n < wp->w_p_nuw - 1) | |
| 10818 n = wp->w_p_nuw - 1; | |
| 10819 | |
|
17247
cbd0432cf8ff
patch 8.1.1623: display wrong with signs in narrow number column
Bram Moolenaar <Bram@vim.org>
parents:
17229
diff
changeset
|
10820 # 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
|
10821 // 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
|
10822 // 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
|
10823 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
|
10824 && (*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
|
10825 n = 2; |
|
cbd0432cf8ff
patch 8.1.1623: display wrong with signs in narrow number column
Bram Moolenaar <Bram@vim.org>
parents:
17229
diff
changeset
|
10826 # endif |
|
cbd0432cf8ff
patch 8.1.1623: display wrong with signs in narrow number column
Bram Moolenaar <Bram@vim.org>
parents:
17229
diff
changeset
|
10827 |
| 13 | 10828 wp->w_nrwidth_width = n; |
| 6679 | 10829 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 10830 return n; |
| 10831 } | |
| 10832 #endif | |
| 3986 | 10833 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
10834 #if defined(FEAT_EVAL) || defined(PROTO) |
| 3986 | 10835 /* |
| 10836 * Return the current cursor column. This is the actual position on the | |
| 10837 * screen. First column is 0. | |
| 10838 */ | |
| 10839 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10840 screen_screencol(void) |
| 3986 | 10841 { |
| 10842 return screen_cur_col; | |
| 10843 } | |
| 10844 | |
| 10845 /* | |
| 10846 * Return the current cursor row. This is the actual position on the screen. | |
| 10847 * First row is 0. | |
| 10848 */ | |
| 10849 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10850 screen_screenrow(void) |
| 3986 | 10851 { |
| 10852 return screen_cur_row; | |
| 10853 } | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
10854 #endif |