Mercurial > vim
annotate src/screen.c @ 17809:59f8948b7590 v8.1.1901
patch 8.1.1901: the +insert_expand feature is not always available
Commit: https://github.com/vim/vim/commit/e2c453d38f6512ac4cff7cd26aa7780b4e2534d7
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Aug 21 14:37:09 2019 +0200
patch 8.1.1901: the +insert_expand feature is not always available
Problem: The +insert_expand feature is not always available.
Solution: Graduate the +insert_expand feature.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 21 Aug 2019 14:45:04 +0200 |
| parents | 4bd21046902b |
| children | ba63a184e6b6 |
| 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 /* 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
|
789 pum_may_redraw(); |
| 7 | 790 |
| 791 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 792 * 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
|
793 FOR_ALL_WINDOWS(wp) |
| 7 | 794 wp->w_buffer->b_mod_set = FALSE; |
| 795 | |
|
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
|
796 #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
|
797 // 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
|
798 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
|
799 #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
|
800 |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
801 after_updating_screen(TRUE); |
| 7 | 802 |
| 803 /* Clear or redraw the command line. Done last, because scrolling may | |
| 804 * 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
|
805 if (clear_cmdline || redraw_cmdline || redraw_mode) |
| 7 | 806 showmode(); |
| 807 | |
|
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
|
808 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
|
809 --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
|
810 |
| 7 | 811 /* 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
|
812 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
813 maybe_intro_message(); |
| 7 | 814 did_intro = TRUE; |
| 815 | |
| 816 #ifdef FEAT_GUI | |
| 817 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 818 * done. */ | |
| 819 if (gui.in_use) | |
| 820 { | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
821 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
|
822 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
823 mch_disable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
824 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
|
825 mch_enable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
826 |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
827 /* 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
|
828 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
829 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
830 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
831 gui.col = mb_fix_col(gui.col, gui.row); |
| 7 | 832 gui_update_cursor(FALSE, FALSE); |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
833 gui_may_flush(); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
834 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
835 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
836 } |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
837 else |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
838 out_flush(); |
| 7 | 839 gui_update_scrollbars(FALSE); |
| 840 } | |
| 841 #endif | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
842 return OK; |
| 7 | 843 } |
| 844 | |
|
15947
4aaf68cbed32
patch 8.1.0979: compiler warning for unused functions
Bram Moolenaar <Bram@vim.org>
parents:
15939
diff
changeset
|
845 #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
|
846 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
847 * 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
|
848 * 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
|
849 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
850 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
851 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
852 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
853 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
854 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
855 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
856 /* 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
|
857 * 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
|
858 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
859 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
860 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
861 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
862 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
863 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
864 #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
|
865 // 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
|
866 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
|
867 #endif |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
868 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
869 |
|
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 * 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
|
872 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
873 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
874 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 { |
|
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
|
876 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
|
877 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
878 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
879 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
880 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
881 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
882 |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
883 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
|
884 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
885 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
886 /* 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
|
887 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
888 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
889 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
890 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
|
891 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
892 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
893 # endif |
|
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 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
897 #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
|
898 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
899 * 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
|
900 * 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
|
901 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
902 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
903 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
|
904 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
905 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
|
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 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
|
908 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
|
909 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
|
910 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
|
911 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
|
912 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
|
913 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
|
914 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
915 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
916 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
|
917 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
918 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
|
919 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
|
920 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
921 |
|
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 * 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
|
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 void |
|
13876
156ebdcb8ef5
patch 8.0.1809: various typos
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
926 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
|
927 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
928 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
|
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 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
|
931 /* 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
|
932 * 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
|
933 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
|
934 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
935 } |
| 7 | 936 #endif |
| 937 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
938 #if defined(FEAT_NETBEANS_INTG) || defined(PROTO) |
| 7 | 939 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
940 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 941 { |
| 942 win_T *wp; | |
| 943 int doit = FALSE; | |
| 944 | |
| 945 # ifdef FEAT_FOLDING | |
| 946 win_foldinfo.fi_level = 0; | |
| 947 # endif | |
| 948 | |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
949 // 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
|
950 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
|
951 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
952 // check if it resulted in the need to redraw a window |
| 7 | 953 FOR_ALL_WINDOWS(wp) |
| 954 if (wp->w_redr_type != 0) | |
| 955 doit = TRUE; | |
| 956 | |
| 3250 | 957 /* 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
|
958 * 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
|
959 */ |
| 3250 | 960 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
|
961 || 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
|
962 || msg_scrolled |
| 3250 | 963 #ifdef FEAT_GUI |
| 964 || gui.starting | |
| 965 #endif | |
| 966 || starting) | |
| 7 | 967 return; |
| 968 | |
| 969 /* update all windows that need updating */ | |
| 970 update_prepare(); | |
| 971 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
972 FOR_ALL_WINDOWS(wp) |
| 7 | 973 { |
| 974 if (wp->w_redr_type != 0) | |
| 975 win_update(wp); | |
| 976 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
|
977 win_redr_status(wp, FALSE); |
| 7 | 978 } |
| 979 | |
| 980 update_finish(); | |
| 981 } | |
| 982 #endif | |
| 983 | |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
984 /* |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
985 * 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
|
986 * 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
|
987 */ |
|
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
|
988 int |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
989 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
|
990 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
991 int wcr_attr = 0; |
|
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 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
|
994 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
|
995 #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
|
996 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
|
997 { |
|
4bd21046902b
patch 8.1.1882: cannot specify properties of the info popup window
Bram Moolenaar <Bram@vim.org>
parents:
17742
diff
changeset
|
998 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
|
999 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
|
1000 else |
|
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_PNI); // Pmenu |
|
4bd21046902b
patch 8.1.1882: cannot specify properties of the info popup window
Bram Moolenaar <Bram@vim.org>
parents:
17742
diff
changeset
|
1002 } |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1003 #endif |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1004 return wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1005 } |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1006 |
| 7 | 1007 #if defined(FEAT_GUI) || defined(PROTO) |
| 1008 /* | |
| 1009 * Update a single window, its status line and maybe the command line msg. | |
| 1010 * Used for the GUI scrollbar. | |
| 1011 */ | |
| 1012 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1013 updateWindow(win_T *wp) |
| 7 | 1014 { |
| 2008 | 1015 /* return if already busy updating */ |
| 1016 if (updating_screen) | |
| 1017 return; | |
| 1018 | |
| 7 | 1019 update_prepare(); |
| 1020 | |
| 1021 #ifdef FEAT_CLIPBOARD | |
| 1022 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1023 if (clip_star.available && clip_isautosel_star()) |
| 1024 clip_update_selection(&clip_star); | |
| 1025 if (clip_plus.available && clip_isautosel_plus()) | |
| 1026 clip_update_selection(&clip_plus); | |
| 7 | 1027 #endif |
| 670 | 1028 |
| 7 | 1029 win_update(wp); |
| 670 | 1030 |
| 1031 /* When the screen was cleared redraw the tab pages line. */ | |
| 673 | 1032 if (redraw_tabline) |
| 677 | 1033 draw_tabline(); |
| 670 | 1034 |
| 7 | 1035 if (wp->w_redr_status |
| 1036 # ifdef FEAT_CMDL_INFO | |
| 1037 || p_ru | |
| 1038 # endif | |
| 1039 # ifdef FEAT_STL_OPT | |
| 40 | 1040 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1041 # endif |
| 1042 ) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
1043 win_redr_status(wp, FALSE); |
| 7 | 1044 |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1045 #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
|
1046 // 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
|
1047 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
|
1048 #endif |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1049 |
| 7 | 1050 update_finish(); |
| 1051 } | |
| 1052 #endif | |
| 1053 | |
| 1054 /* | |
| 1055 * Update a single window. | |
| 1056 * | |
| 1057 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1058 * screen or scrolling lines). | |
| 1059 * | |
| 1060 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1061 * implies the one below it. | |
| 1062 * NOT_VALID redraw the whole window | |
| 743 | 1063 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1064 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1065 * INVERTED redraw the changed part of the Visual area | |
| 1066 * INVERTED_ALL redraw the whole Visual area | |
| 1067 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1068 * 2. update lines at the top when scrolled down | |
| 1069 * 3. redraw changed text: | |
| 301 | 1070 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1071 * b_mod_top and b_mod_bot. |
| 1072 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1073 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1074 * - continue redrawing when syntax status is invalid. | |
| 1075 * 4. if scrolled up, update lines at the bottom. | |
| 1076 * This results in three areas that may need updating: | |
| 1077 * top: from first row to top_end (when scrolled down) | |
| 1078 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1079 * bot: from bot_start to last row (when scrolled up) | |
| 1080 */ | |
| 1081 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1082 win_update(win_T *wp) |
| 7 | 1083 { |
| 1084 buf_T *buf = wp->w_buffer; | |
| 1085 int type; | |
| 1086 int top_end = 0; /* Below last row of the top area that needs | |
| 1087 updating. 0 when no top area updating. */ | |
| 1088 int mid_start = 999;/* first row of the mid area that needs | |
| 1089 updating. 999 when no mid area updating. */ | |
| 1090 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1091 updating. 0 when no mid area updating. */ | |
| 1092 int bot_start = 999;/* first row of the bot area that needs | |
| 1093 updating. 999 when no bot area updating */ | |
| 1094 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1095 w_topline got smaller a bit */ | |
| 1096 #ifdef FEAT_SEARCH_EXTRA | |
|
17498
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
1097 int top_to_mod = FALSE; // redraw above mod_top |
| 7 | 1098 #endif |
| 1099 | |
| 1100 int row; /* current window row to display */ | |
| 1101 linenr_T lnum; /* current buffer lnum to display */ | |
| 1102 int idx; /* current index in w_lines[] */ | |
| 1103 int srow; /* starting row of the current line */ | |
| 1104 | |
| 1105 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1106 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1107 int i; | |
| 1108 long j; | |
| 1109 static int recursive = FALSE; /* being called recursively */ | |
| 1110 int old_botline = wp->w_botline; | |
| 1111 #ifdef FEAT_FOLDING | |
| 1112 long fold_count; | |
| 1113 #endif | |
| 1114 #ifdef FEAT_SYN_HL | |
| 1115 /* remember what happened to the previous line, to know if | |
| 1116 * check_visual_highlight() can be used */ | |
| 1117 #define DID_NONE 1 /* didn't update a line */ | |
| 1118 #define DID_LINE 2 /* updated a normal line */ | |
| 1119 #define DID_FOLD 3 /* updated a folded line */ | |
| 1120 int did_update = DID_NONE; | |
| 1121 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1122 #endif | |
| 1123 linenr_T mod_top = 0; | |
| 1124 linenr_T mod_bot = 0; | |
| 1125 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1126 int save_got_int; | |
| 1127 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1128 #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
|
1129 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
|
1130 #endif |
| 7 | 1131 |
| 1132 type = wp->w_redr_type; | |
| 1133 | |
| 1134 if (type == NOT_VALID) | |
| 1135 { | |
| 1136 wp->w_redr_status = TRUE; | |
| 1137 wp->w_lines_valid = 0; | |
| 1138 } | |
| 1139 | |
| 1140 /* 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
|
1141 if (wp->w_height + WINBAR_HEIGHT(wp) == 0) |
| 7 | 1142 { |
| 1143 wp->w_redr_type = 0; | |
| 1144 return; | |
| 1145 } | |
| 1146 | |
| 1147 /* Window is zero-width: Only need to draw the separator. */ | |
| 1148 if (wp->w_width == 0) | |
| 1149 { | |
| 1150 /* draw the vertical separator right of this window */ | |
| 1151 draw_vsep_win(wp, 0); | |
| 1152 wp->w_redr_type = 0; | |
| 1153 return; | |
| 1154 } | |
| 1155 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1156 #ifdef FEAT_TERMINAL |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1157 // 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
|
1158 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
|
1159 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1160 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
|
1161 # 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
|
1162 /* 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
|
1163 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
|
1164 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
|
1165 # endif |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1166 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
|
1167 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1168 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1169 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1170 |
| 7 | 1171 #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
|
1172 init_search_hl(wp, &search_hl); |
| 7 | 1173 #endif |
| 1174 | |
| 13 | 1175 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1176 /* 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
|
1177 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1178 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1179 if (wp->w_nrwidth != i) |
| 13 | 1180 { |
| 1181 type = NOT_VALID; | |
| 677 | 1182 wp->w_nrwidth = i; |
| 13 | 1183 } |
| 1184 else | |
| 1185 #endif | |
| 1186 | |
| 7 | 1187 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1188 { | |
| 1189 /* | |
| 1190 * When there are both inserted/deleted lines and specific lines to be | |
| 1191 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1192 * everything (only happens when redrawing is off for while). | |
| 1193 */ | |
| 1194 type = NOT_VALID; | |
| 1195 } | |
| 1196 else | |
| 1197 { | |
| 1198 /* | |
| 1199 * Set mod_top to the first line that needs displaying because of | |
| 1200 * changes. Set mod_bot to the first line after the changes. | |
| 1201 */ | |
| 1202 mod_top = wp->w_redraw_top; | |
| 1203 if (wp->w_redraw_bot != 0) | |
| 1204 mod_bot = wp->w_redraw_bot + 1; | |
| 1205 else | |
| 1206 mod_bot = 0; | |
| 1207 if (buf->b_mod_set) | |
| 1208 { | |
| 1209 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1210 { | |
| 1211 mod_top = buf->b_mod_top; | |
| 1212 #ifdef FEAT_SYN_HL | |
| 1213 /* Need to redraw lines above the change that may be included | |
| 1214 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1215 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1216 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1217 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1218 if (mod_top < 1) |
| 1219 mod_top = 1; | |
| 1220 } | |
| 1221 #endif | |
| 1222 } | |
| 1223 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1224 mod_bot = buf->b_mod_bot; | |
| 1225 | |
| 1226 #ifdef FEAT_SEARCH_EXTRA | |
|
17498
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
1227 // 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
|
1228 // 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
|
1229 // 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
|
1230 // lines above the change. |
|
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
1231 // Same for a match pattern. |
| 699 | 1232 if (search_hl.rm.regprog != NULL |
| 1233 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1234 top_to_mod = TRUE; |
| 699 | 1235 else |
| 1326 | 1236 { |
|
17498
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
1237 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
|
1238 |
| 1326 | 1239 while (cur != NULL) |
| 1240 { | |
| 1241 if (cur->match.regprog != NULL | |
| 1242 && re_multiline(cur->match.regprog)) | |
| 699 | 1243 { |
| 1244 top_to_mod = TRUE; | |
| 1245 break; | |
| 1246 } | |
| 1326 | 1247 cur = cur->next; |
| 1248 } | |
| 1249 } | |
| 7 | 1250 #endif |
| 1251 } | |
| 1252 #ifdef FEAT_FOLDING | |
| 1253 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1254 { | |
| 1255 linenr_T lnumt, lnumb; | |
| 1256 | |
| 1257 /* | |
| 1258 * A change in a line can cause lines above it to become folded or | |
| 1259 * unfolded. Find the top most buffer line that may be affected. | |
| 1260 * If the line was previously folded and displayed, get the first | |
| 1261 * line of that fold. If the line is folded now, get the first | |
| 1262 * folded line. Use the minimum of these two. | |
| 1263 */ | |
| 1264 | |
| 1265 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1266 * the line below it. If there is no valid entry, use w_topline. | |
| 1267 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1268 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1269 lnumt = wp->w_topline; | |
| 1270 lnumb = MAXLNUM; | |
| 1271 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1272 if (wp->w_lines[i].wl_valid) | |
| 1273 { | |
| 1274 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1275 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1276 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1277 { | |
| 1278 lnumb = wp->w_lines[i].wl_lnum; | |
| 1279 /* When there is a fold column it might need updating | |
| 1280 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1281 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1282 ++lnumb; |
| 1283 } | |
| 1284 } | |
| 1285 | |
| 1286 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1287 if (mod_top > lnumt) | |
| 1288 mod_top = lnumt; | |
| 1289 | |
| 1290 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1291 --mod_bot; | |
| 1292 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1293 ++mod_bot; | |
| 1294 if (mod_bot < lnumb) | |
| 1295 mod_bot = lnumb; | |
| 1296 } | |
| 1297 #endif | |
| 1298 | |
| 1299 /* When a change starts above w_topline and the end is below | |
| 1300 * w_topline, start redrawing at w_topline. | |
| 36 | 1301 * If the end of the change is above w_topline: do like no change was |
| 1302 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1303 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1304 { | |
| 1305 if (mod_bot > wp->w_topline) | |
| 1306 mod_top = wp->w_topline; | |
| 1307 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1308 else if (syntax_present(wp)) |
| 7 | 1309 top_end = 1; |
| 1310 #endif | |
| 1311 } | |
| 36 | 1312 |
| 1313 /* When line numbers are displayed need to redraw all lines below | |
| 1314 * inserted/deleted lines. */ | |
| 1315 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1316 mod_bot = MAXLNUM; | |
| 7 | 1317 } |
|
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
|
1318 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
|
1319 wp->w_redraw_bot = 0; |
| 7 | 1320 |
| 1321 /* | |
| 1322 * When only displaying the lines at the top, set top_end. Used when | |
| 1323 * window has scrolled down for msg_scrolled. | |
| 1324 */ | |
| 1325 if (type == REDRAW_TOP) | |
| 1326 { | |
| 1327 j = 0; | |
| 1328 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1329 { | |
| 1330 j += wp->w_lines[i].wl_size; | |
| 1331 if (j >= wp->w_upd_rows) | |
| 1332 { | |
| 1333 top_end = j; | |
| 1334 break; | |
| 1335 } | |
| 1336 } | |
| 1337 if (top_end == 0) | |
| 1338 /* not found (cannot happen?): redraw everything */ | |
| 1339 type = NOT_VALID; | |
| 1340 else | |
| 1341 /* top area defined, the rest is VALID */ | |
| 1342 type = VALID; | |
| 1343 } | |
| 1344 | |
| 1378 | 1345 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1346 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1347 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1348 * called. */ | |
| 1349 if (screen_cleared) | |
| 1350 screen_cleared = MAYBE; | |
| 1351 | |
| 7 | 1352 /* |
| 1353 * If there are no changes on the screen that require a complete redraw, | |
| 1354 * handle three cases: | |
| 1355 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1356 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1357 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1358 * w_lines[] that needs updating. | |
| 1359 */ | |
| 743 | 1360 if ((type == VALID || type == SOME_VALID |
| 1361 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1362 #ifdef FEAT_DIFF |
| 1363 && !wp->w_botfill && !wp->w_old_botfill | |
| 1364 #endif | |
| 1365 ) | |
| 1366 { | |
| 1367 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1368 { | |
| 1369 /* | |
| 1370 * w_topline is the first changed line, the scrolling will be done | |
| 1371 * further down. | |
| 1372 */ | |
| 1373 } | |
| 1374 else if (wp->w_lines[0].wl_valid | |
| 1375 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1376 #ifdef FEAT_DIFF | |
| 1377 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1378 && wp->w_topfill > wp->w_old_topfill) | |
| 1379 #endif | |
| 1380 )) | |
| 1381 { | |
| 1382 /* | |
| 1383 * New topline is above old topline: May scroll down. | |
| 1384 */ | |
| 1385 #ifdef FEAT_FOLDING | |
| 1386 if (hasAnyFolding(wp)) | |
| 1387 { | |
| 1388 linenr_T ln; | |
| 1389 | |
| 1390 /* count the number of lines we are off, counting a sequence | |
| 1391 * of folded lines as one */ | |
| 1392 j = 0; | |
| 1393 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1394 { | |
| 1395 ++j; | |
| 1396 if (j >= wp->w_height - 2) | |
| 1397 break; | |
| 1398 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1399 } | |
| 1400 } | |
| 1401 else | |
| 1402 #endif | |
| 1403 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1404 if (j < wp->w_height - 2) /* not too far off */ | |
| 1405 { | |
| 1406 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1407 #ifdef FEAT_DIFF | |
| 1408 /* insert extra lines for previously invisible filler lines */ | |
| 1409 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1410 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1411 - wp->w_old_topfill; | |
| 1412 #endif | |
| 1413 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1414 { | |
| 1415 /* | |
| 1416 * Try to insert the correct number of lines. | |
| 1417 * If not the last window, delete the lines at the bottom. | |
| 1418 * win_ins_lines may fail when the terminal can't do it. | |
| 1419 */ | |
| 1420 if (i > 0) | |
| 1421 check_for_delay(FALSE); | |
| 1422 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1423 { | |
| 1424 if (wp->w_lines_valid != 0) | |
| 1425 { | |
| 1426 /* Need to update rows that are new, stop at the | |
| 1427 * first one that scrolled down. */ | |
| 1428 top_end = i; | |
| 1429 scrolled_down = TRUE; | |
| 1430 | |
| 1431 /* Move the entries that were scrolled, disable | |
| 1432 * the entries for the lines to be redrawn. */ | |
| 1433 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1434 wp->w_lines_valid = wp->w_height; | |
| 1435 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1436 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1437 while (idx >= 0) | |
| 1438 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1439 } | |
| 1440 } | |
| 1441 else | |
| 1442 mid_start = 0; /* redraw all lines */ | |
| 1443 } | |
| 1444 else | |
| 1445 mid_start = 0; /* redraw all lines */ | |
| 1446 } | |
| 1447 else | |
| 1448 mid_start = 0; /* redraw all lines */ | |
| 1449 } | |
| 1450 else | |
| 1451 { | |
| 1452 /* | |
| 1453 * New topline is at or below old topline: May scroll up. | |
| 1454 * When topline didn't change, find first entry in w_lines[] that | |
| 1455 * needs updating. | |
| 1456 */ | |
| 1457 | |
| 1458 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1459 j = -1; | |
| 1460 row = 0; | |
| 1461 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1462 { | |
| 1463 if (wp->w_lines[i].wl_valid | |
| 1464 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1465 { | |
| 1466 j = i; | |
| 1467 break; | |
| 1468 } | |
| 1469 row += wp->w_lines[i].wl_size; | |
| 1470 } | |
| 1471 if (j == -1) | |
| 1472 { | |
| 1473 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1474 * lines */ | |
| 1475 mid_start = 0; | |
| 1476 } | |
| 1477 else | |
| 1478 { | |
| 1479 /* | |
| 1480 * Try to delete the correct number of lines. | |
| 1481 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1482 */ | |
| 1483 #ifdef FEAT_DIFF | |
| 1484 /* If the topline didn't change, delete old filler lines, | |
| 1485 * otherwise delete filler lines of the new topline... */ | |
| 1486 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1487 row += wp->w_old_topfill; | |
| 1488 else | |
| 1489 row += diff_check_fill(wp, wp->w_topline); | |
| 1490 /* ... but don't delete new filler lines. */ | |
| 1491 row -= wp->w_topfill; | |
| 1492 #endif | |
| 1493 if (row > 0) | |
| 1494 { | |
| 1495 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
|
1496 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
|
1497 == OK) |
| 7 | 1498 bot_start = wp->w_height - row; |
| 1499 else | |
| 1500 mid_start = 0; /* redraw all lines */ | |
| 1501 } | |
| 1502 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1503 { | |
| 1504 /* | |
| 1505 * Skip the lines (below the deleted lines) that are still | |
| 1506 * valid and don't need redrawing. Copy their info | |
| 1507 * upwards, to compensate for the deleted lines. Set | |
| 1508 * bot_start to the first row that needs redrawing. | |
| 1509 */ | |
| 1510 bot_start = 0; | |
| 1511 idx = 0; | |
| 1512 for (;;) | |
| 1513 { | |
| 1514 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1515 /* stop at line that didn't fit, unless it is still | |
| 1516 * valid (no lines deleted) */ | |
| 1517 if (row > 0 && bot_start + row | |
| 1518 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1519 { | |
| 1520 wp->w_lines_valid = idx + 1; | |
| 1521 break; | |
| 1522 } | |
| 1523 bot_start += wp->w_lines[idx++].wl_size; | |
| 1524 | |
| 1525 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1526 if (++j >= wp->w_lines_valid) | |
| 1527 { | |
| 1528 wp->w_lines_valid = idx; | |
| 1529 break; | |
| 1530 } | |
| 1531 } | |
| 1532 #ifdef FEAT_DIFF | |
| 1533 /* Correct the first entry for filler lines at the top | |
| 1534 * when it won't get updated below. */ | |
| 1535 if (wp->w_p_diff && bot_start > 0) | |
| 1536 wp->w_lines[0].wl_size = | |
| 1537 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1538 + wp->w_topfill; | |
| 1539 #endif | |
| 1540 } | |
| 1541 } | |
| 1542 } | |
| 1543 | |
| 1544 /* When starting redraw in the first line, redraw all lines. When | |
| 1545 * there is only one window it's probably faster to clear the screen | |
| 1546 * first. */ | |
| 1547 if (mid_start == 0) | |
| 1548 { | |
| 1549 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
|
1550 if (ONE_WINDOW && !WIN_IS_POPUP(wp)) |
| 981 | 1551 { |
| 1331 | 1552 /* Clear the screen when it was not done by win_del_lines() or |
| 1553 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1554 * then. */ | |
| 1555 if (screen_cleared != TRUE) | |
| 1556 screenclear(); | |
| 981 | 1557 /* The screen was cleared, redraw the tab pages line. */ |
| 1558 if (redraw_tabline) | |
| 1559 draw_tabline(); | |
| 1560 } | |
| 7 | 1561 } |
| 1331 | 1562 |
| 1563 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1564 * cleared (only happens for the first window) or when screenclear() | |
| 1565 * was called directly above, "must_redraw" will have been set to | |
| 1566 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1567 if (screen_cleared == TRUE) | |
| 1568 must_redraw = 0; | |
| 7 | 1569 } |
| 1570 else | |
| 1571 { | |
| 1572 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1573 mid_start = 0; | |
| 1574 mid_end = wp->w_height; | |
| 1575 } | |
| 1576 | |
| 743 | 1577 if (type == SOME_VALID) |
| 1578 { | |
| 1579 /* SOME_VALID: redraw all lines. */ | |
| 1580 mid_start = 0; | |
| 1581 mid_end = wp->w_height; | |
| 1582 type = NOT_VALID; | |
| 1583 } | |
| 1584 | |
| 7 | 1585 /* check if we are updating or removing the inverted part */ |
| 1586 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1587 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1588 { | |
| 1589 linenr_T from, to; | |
| 1590 | |
| 1591 if (VIsual_active) | |
| 1592 { | |
| 1593 if (VIsual_active | |
| 1594 && (VIsual_mode != wp->w_old_visual_mode | |
| 1595 || type == INVERTED_ALL)) | |
| 1596 { | |
| 1597 /* | |
| 1598 * If the type of Visual selection changed, redraw the whole | |
| 1599 * selection. Also when the ownership of the X selection is | |
| 1600 * gained or lost. | |
| 1601 */ | |
| 1602 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1603 { | |
| 1604 from = curwin->w_cursor.lnum; | |
| 1605 to = VIsual.lnum; | |
| 1606 } | |
| 1607 else | |
| 1608 { | |
| 1609 from = VIsual.lnum; | |
| 1610 to = curwin->w_cursor.lnum; | |
| 1611 } | |
| 1612 /* redraw more when the cursor moved as well */ | |
| 1613 if (wp->w_old_cursor_lnum < from) | |
| 1614 from = wp->w_old_cursor_lnum; | |
| 1615 if (wp->w_old_cursor_lnum > to) | |
| 1616 to = wp->w_old_cursor_lnum; | |
| 1617 if (wp->w_old_visual_lnum < from) | |
| 1618 from = wp->w_old_visual_lnum; | |
| 1619 if (wp->w_old_visual_lnum > to) | |
| 1620 to = wp->w_old_visual_lnum; | |
| 1621 } | |
| 1622 else | |
| 1623 { | |
| 1624 /* | |
| 1625 * Find the line numbers that need to be updated: The lines | |
| 1626 * between the old cursor position and the current cursor | |
| 1627 * position. Also check if the Visual position changed. | |
| 1628 */ | |
| 1629 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1630 { | |
| 1631 from = curwin->w_cursor.lnum; | |
| 1632 to = wp->w_old_cursor_lnum; | |
| 1633 } | |
| 1634 else | |
| 1635 { | |
| 1636 from = wp->w_old_cursor_lnum; | |
| 1637 to = curwin->w_cursor.lnum; | |
| 1638 if (from == 0) /* Visual mode just started */ | |
| 1639 from = to; | |
| 1640 } | |
| 1641 | |
| 422 | 1642 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1643 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1644 { |
| 1645 if (wp->w_old_visual_lnum < from | |
| 1646 && wp->w_old_visual_lnum != 0) | |
| 1647 from = wp->w_old_visual_lnum; | |
| 1648 if (wp->w_old_visual_lnum > to) | |
| 1649 to = wp->w_old_visual_lnum; | |
| 1650 if (VIsual.lnum < from) | |
| 1651 from = VIsual.lnum; | |
| 1652 if (VIsual.lnum > to) | |
| 1653 to = VIsual.lnum; | |
| 1654 } | |
| 1655 } | |
| 1656 | |
| 1657 /* | |
| 1658 * If in block mode and changed column or curwin->w_curswant: | |
| 1659 * update all lines. | |
| 1660 * First compute the actual start and end column. | |
| 1661 */ | |
| 1662 if (VIsual_mode == Ctrl_V) | |
| 1663 { | |
| 6266 | 1664 colnr_T fromc, toc; |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
1665 #if defined(FEAT_LINEBREAK) |
| 6266 | 1666 int save_ve_flags = ve_flags; |
| 1667 | |
| 1668 if (curwin->w_p_lbr) | |
| 1669 ve_flags = VE_ALL; | |
| 1670 #endif | |
| 7 | 1671 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
|
1672 #if defined(FEAT_LINEBREAK) |
| 6266 | 1673 ve_flags = save_ve_flags; |
| 1674 #endif | |
| 7 | 1675 ++toc; |
| 1676 if (curwin->w_curswant == MAXCOL) | |
| 1677 toc = MAXCOL; | |
| 1678 | |
| 1679 if (fromc != wp->w_old_cursor_fcol | |
| 1680 || toc != wp->w_old_cursor_lcol) | |
| 1681 { | |
| 1682 if (from > VIsual.lnum) | |
| 1683 from = VIsual.lnum; | |
| 1684 if (to < VIsual.lnum) | |
| 1685 to = VIsual.lnum; | |
| 1686 } | |
| 1687 wp->w_old_cursor_fcol = fromc; | |
| 1688 wp->w_old_cursor_lcol = toc; | |
| 1689 } | |
| 1690 } | |
| 1691 else | |
| 1692 { | |
| 1693 /* Use the line numbers of the old Visual area. */ | |
| 1694 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1695 { | |
| 1696 from = wp->w_old_cursor_lnum; | |
| 1697 to = wp->w_old_visual_lnum; | |
| 1698 } | |
| 1699 else | |
| 1700 { | |
| 1701 from = wp->w_old_visual_lnum; | |
| 1702 to = wp->w_old_cursor_lnum; | |
| 1703 } | |
| 1704 } | |
| 1705 | |
| 1706 /* | |
| 1707 * There is no need to update lines above the top of the window. | |
| 1708 */ | |
| 1709 if (from < wp->w_topline) | |
| 1710 from = wp->w_topline; | |
| 1711 | |
| 1712 /* | |
| 1713 * If we know the value of w_botline, use it to restrict the update to | |
| 1714 * the lines that are visible in the window. | |
| 1715 */ | |
| 1716 if (wp->w_valid & VALID_BOTLINE) | |
| 1717 { | |
| 1718 if (from >= wp->w_botline) | |
| 1719 from = wp->w_botline - 1; | |
| 1720 if (to >= wp->w_botline) | |
| 1721 to = wp->w_botline - 1; | |
| 1722 } | |
| 1723 | |
| 1724 /* | |
| 1725 * Find the minimal part to be updated. | |
| 1726 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1727 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1728 * top_end; need to redraw from top_end to the "to" line. | |
| 1729 * A middle mouse click with a Visual selection may change the text | |
| 1730 * above the Visual area and reset wl_valid, do count these for | |
| 1731 * mid_end (in srow). | |
| 1732 */ | |
| 1733 if (mid_start > 0) | |
| 1734 { | |
| 1735 lnum = wp->w_topline; | |
| 1736 idx = 0; | |
| 1737 srow = 0; | |
| 1738 if (scrolled_down) | |
| 1739 mid_start = top_end; | |
| 1740 else | |
| 1741 mid_start = 0; | |
| 1742 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1743 { | |
| 1744 if (wp->w_lines[idx].wl_valid) | |
| 1745 mid_start += wp->w_lines[idx].wl_size; | |
| 1746 else if (!scrolled_down) | |
| 1747 srow += wp->w_lines[idx].wl_size; | |
| 1748 ++idx; | |
| 1749 # ifdef FEAT_FOLDING | |
| 1750 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1751 lnum = wp->w_lines[idx].wl_lnum; | |
| 1752 else | |
| 1753 # endif | |
| 1754 ++lnum; | |
| 1755 } | |
| 1756 srow += mid_start; | |
| 1757 mid_end = wp->w_height; | |
| 1758 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1759 { | |
| 1760 if (wp->w_lines[idx].wl_valid | |
| 1761 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1762 { | |
| 1763 /* Only update until first row of this line */ | |
| 1764 mid_end = srow; | |
| 1765 break; | |
| 1766 } | |
| 1767 srow += wp->w_lines[idx].wl_size; | |
| 1768 } | |
| 1769 } | |
| 1770 } | |
| 1771 | |
| 1772 if (VIsual_active && buf == curwin->w_buffer) | |
| 1773 { | |
| 1774 wp->w_old_visual_mode = VIsual_mode; | |
| 1775 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1776 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1777 wp->w_old_visual_col = VIsual.col; |
| 7 | 1778 wp->w_old_curswant = curwin->w_curswant; |
| 1779 } | |
| 1780 else | |
| 1781 { | |
| 1782 wp->w_old_visual_mode = 0; | |
| 1783 wp->w_old_cursor_lnum = 0; | |
| 1784 wp->w_old_visual_lnum = 0; | |
| 422 | 1785 wp->w_old_visual_col = 0; |
| 7 | 1786 } |
| 1787 | |
| 1788 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1789 /* reset got_int, otherwise regexp won't work */ | |
| 1790 save_got_int = got_int; | |
| 1791 got_int = 0; | |
| 1792 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1793 #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
|
1794 /* 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
|
1795 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
|
1796 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
|
1797 #endif |
| 7 | 1798 #ifdef FEAT_FOLDING |
| 1799 win_foldinfo.fi_level = 0; | |
| 1800 #endif | |
| 1801 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1802 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1803 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1804 * 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
|
1805 * 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
|
1806 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1807 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
|
1808 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
|
1809 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1810 |
| 7 | 1811 /* |
| 1812 * Update all the window rows. | |
| 1813 */ | |
| 1814 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1815 row = 0; | |
| 1816 srow = 0; | |
| 1817 lnum = wp->w_topline; /* first line shown in window */ | |
| 1818 for (;;) | |
| 1819 { | |
| 1820 /* stop updating when reached the end of the window (check for _past_ | |
| 1821 * the end of the window is at the end of the loop) */ | |
| 1822 if (row == wp->w_height) | |
| 1823 { | |
| 1824 didline = TRUE; | |
| 1825 break; | |
| 1826 } | |
| 1827 | |
| 1828 /* stop updating when hit the end of the file */ | |
| 1829 if (lnum > buf->b_ml.ml_line_count) | |
| 1830 { | |
| 1831 eof = TRUE; | |
| 1832 break; | |
| 1833 } | |
| 1834 | |
| 1835 /* Remember the starting row of the line that is going to be dealt | |
| 1836 * with. It is used further down when the line doesn't fit. */ | |
| 1837 srow = row; | |
| 1838 | |
| 1839 /* | |
| 1840 * Update a line when it is in an area that needs updating, when it | |
| 1841 * 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
|
1842 * "bot_start" may be halfway a wrapped line after using |
| 7 | 1843 * win_del_lines(), check if the current line includes it. |
| 1844 * When syntax folding is being used, the saved syntax states will | |
| 1845 * already have been updated, we can't see where the syntax state is | |
| 1846 * the same again, just update until the end of the window. | |
| 1847 */ | |
| 1848 if (row < top_end | |
| 1849 || (row >= mid_start && row < mid_end) | |
| 1850 #ifdef FEAT_SEARCH_EXTRA | |
| 1851 || top_to_mod | |
| 1852 #endif | |
| 1853 || idx >= wp->w_lines_valid | |
| 1854 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1855 || (mod_top != 0 | |
| 1856 && (lnum == mod_top | |
| 1857 || (lnum >= mod_top | |
| 1858 && (lnum < mod_bot | |
| 1859 #ifdef FEAT_SYN_HL | |
| 1860 || did_update == DID_FOLD | |
| 1861 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1862 && syntax_present(wp) |
| 7 | 1863 && ( |
| 1864 # ifdef FEAT_FOLDING | |
| 1865 (foldmethodIsSyntax(wp) | |
| 1866 && hasAnyFolding(wp)) || | |
| 1867 # endif | |
| 1868 syntax_check_changed(lnum))) | |
| 1869 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1870 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1871 /* match in fixed position might need redraw |
| 1872 * if lines were inserted or deleted */ | |
| 1873 || (wp->w_match_head != NULL | |
| 1874 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1875 #endif |
| 7 | 1876 ))))) |
| 1877 { | |
| 1878 #ifdef FEAT_SEARCH_EXTRA | |
| 1879 if (lnum == mod_top) | |
| 1880 top_to_mod = FALSE; | |
| 1881 #endif | |
| 1882 | |
| 1883 /* | |
| 1884 * When at start of changed lines: May scroll following lines | |
| 1885 * up or down to minimize redrawing. | |
| 1886 * Don't do this when the change continues until the end. | |
| 3318 | 1887 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1888 */ |
| 1889 if (lnum == mod_top | |
| 1890 && mod_bot != MAXLNUM | |
| 3318 | 1891 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1892 { |
| 1893 int old_rows = 0; | |
| 1894 int new_rows = 0; | |
| 1895 int xtra_rows; | |
| 1896 linenr_T l; | |
| 1897 | |
| 1898 /* Count the old number of window rows, using w_lines[], which | |
| 1899 * should still contain the sizes for the lines as they are | |
| 1900 * currently displayed. */ | |
| 1901 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1902 { | |
| 1903 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1904 * lines are part of the changed area. */ | |
| 1905 if (wp->w_lines[i].wl_valid | |
| 1906 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1907 break; | |
| 1908 old_rows += wp->w_lines[i].wl_size; | |
| 1909 #ifdef FEAT_FOLDING | |
| 1910 if (wp->w_lines[i].wl_valid | |
| 1911 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1912 { | |
| 1913 /* Must have found the last valid entry above mod_bot. | |
| 1914 * Add following invalid entries. */ | |
| 1915 ++i; | |
| 1916 while (i < wp->w_lines_valid | |
| 1917 && !wp->w_lines[i].wl_valid) | |
| 1918 old_rows += wp->w_lines[i++].wl_size; | |
| 1919 break; | |
| 1920 } | |
| 1921 #endif | |
| 1922 } | |
| 1923 | |
| 1924 if (i >= wp->w_lines_valid) | |
| 1925 { | |
| 1926 /* We can't find a valid line below the changed lines, | |
| 1927 * need to redraw until the end of the window. | |
| 1928 * Inserting/deleting lines has no use. */ | |
| 1929 bot_start = 0; | |
| 1930 } | |
| 1931 else | |
| 1932 { | |
| 1933 /* Able to count old number of rows: Count new window | |
| 1934 * rows, and may insert/delete lines */ | |
| 1935 j = idx; | |
| 1936 for (l = lnum; l < mod_bot; ++l) | |
| 1937 { | |
| 1938 #ifdef FEAT_FOLDING | |
| 1939 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1940 ++new_rows; | |
| 1941 else | |
| 1942 #endif | |
| 1943 #ifdef FEAT_DIFF | |
| 1944 if (l == wp->w_topline) | |
| 1945 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1946 + wp->w_topfill; | |
| 1947 else | |
| 1948 #endif | |
| 1949 new_rows += plines_win(wp, l, TRUE); | |
| 1950 ++j; | |
| 1951 if (new_rows > wp->w_height - row - 2) | |
| 1952 { | |
| 1953 /* it's getting too much, must redraw the rest */ | |
| 1954 new_rows = 9999; | |
| 1955 break; | |
| 1956 } | |
| 1957 } | |
| 1958 xtra_rows = new_rows - old_rows; | |
| 1959 if (xtra_rows < 0) | |
| 1960 { | |
| 1961 /* May scroll text up. If there is not enough | |
| 1962 * remaining text or scrolling fails, must redraw the | |
| 1963 * rest. If scrolling works, must redraw the text | |
| 1964 * below the scrolled text. */ | |
| 1965 if (row - xtra_rows >= wp->w_height - 2) | |
| 1966 mod_bot = MAXLNUM; | |
| 1967 else | |
| 1968 { | |
| 1969 check_for_delay(FALSE); | |
| 1970 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
|
1971 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 1972 mod_bot = MAXLNUM; |
| 1973 else | |
| 1974 bot_start = wp->w_height + xtra_rows; | |
| 1975 } | |
| 1976 } | |
| 1977 else if (xtra_rows > 0) | |
| 1978 { | |
| 1979 /* May scroll text down. If there is not enough | |
| 1980 * remaining text of scrolling fails, must redraw the | |
| 1981 * rest. */ | |
| 1982 if (row + xtra_rows >= wp->w_height - 2) | |
| 1983 mod_bot = MAXLNUM; | |
| 1984 else | |
| 1985 { | |
| 1986 check_for_delay(FALSE); | |
| 1987 if (win_ins_lines(wp, row + old_rows, | |
| 1988 xtra_rows, FALSE, FALSE) == FAIL) | |
| 1989 mod_bot = MAXLNUM; | |
| 1990 else if (top_end > row + old_rows) | |
| 1991 /* Scrolled the part at the top that requires | |
| 1992 * updating down. */ | |
| 1993 top_end += xtra_rows; | |
| 1994 } | |
| 1995 } | |
| 1996 | |
| 1997 /* When not updating the rest, may need to move w_lines[] | |
| 1998 * entries. */ | |
| 1999 if (mod_bot != MAXLNUM && i != j) | |
| 2000 { | |
| 2001 if (j < i) | |
| 2002 { | |
| 2003 int x = row + new_rows; | |
| 2004 | |
| 2005 /* move entries in w_lines[] upwards */ | |
| 2006 for (;;) | |
| 2007 { | |
| 2008 /* stop at last valid entry in w_lines[] */ | |
| 2009 if (i >= wp->w_lines_valid) | |
| 2010 { | |
| 2011 wp->w_lines_valid = j; | |
| 2012 break; | |
| 2013 } | |
| 2014 wp->w_lines[j] = wp->w_lines[i]; | |
| 2015 /* stop at a line that won't fit */ | |
| 2016 if (x + (int)wp->w_lines[j].wl_size | |
| 2017 > wp->w_height) | |
| 2018 { | |
| 2019 wp->w_lines_valid = j + 1; | |
| 2020 break; | |
| 2021 } | |
| 2022 x += wp->w_lines[j++].wl_size; | |
| 2023 ++i; | |
| 2024 } | |
| 2025 if (bot_start > x) | |
| 2026 bot_start = x; | |
| 2027 } | |
| 2028 else /* j > i */ | |
| 2029 { | |
| 2030 /* move entries in w_lines[] downwards */ | |
| 2031 j -= i; | |
| 2032 wp->w_lines_valid += j; | |
| 2033 if (wp->w_lines_valid > wp->w_height) | |
| 2034 wp->w_lines_valid = wp->w_height; | |
| 2035 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2036 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2037 | |
| 2038 /* The w_lines[] entries for inserted lines are | |
| 2039 * now invalid, but wl_size may be used above. | |
| 2040 * Reset to zero. */ | |
| 2041 while (i >= idx) | |
| 2042 { | |
| 2043 wp->w_lines[i].wl_size = 0; | |
| 2044 wp->w_lines[i--].wl_valid = FALSE; | |
| 2045 } | |
| 2046 } | |
| 2047 } | |
| 2048 } | |
| 2049 } | |
| 2050 | |
| 2051 #ifdef FEAT_FOLDING | |
| 2052 /* | |
| 2053 * When lines are folded, display one line for all of them. | |
| 2054 * Otherwise, display normally (can be several display lines when | |
| 2055 * 'wrap' is on). | |
| 2056 */ | |
| 2057 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2058 if (fold_count != 0) | |
| 2059 { | |
| 2060 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2061 ++row; | |
| 2062 --fold_count; | |
| 2063 wp->w_lines[idx].wl_folded = TRUE; | |
| 2064 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2065 # ifdef FEAT_SYN_HL | |
| 2066 did_update = DID_FOLD; | |
| 2067 # endif | |
| 2068 } | |
| 2069 else | |
| 2070 #endif | |
| 2071 if (idx < wp->w_lines_valid | |
| 2072 && wp->w_lines[idx].wl_valid | |
| 2073 && wp->w_lines[idx].wl_lnum == lnum | |
| 2074 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2075 && !(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
|
2076 && !WIN_IS_POPUP(wp) |
| 7 | 2077 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2078 #ifdef FEAT_DIFF | |
| 2079 && diff_check_fill(wp, lnum) == 0 | |
| 2080 #endif | |
| 2081 ) | |
| 2082 { | |
| 2083 /* This line is not going to fit. Don't draw anything here, | |
| 2084 * will draw "@ " lines below. */ | |
| 2085 row = wp->w_height + 1; | |
| 2086 } | |
| 2087 else | |
| 2088 { | |
| 2089 #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
|
2090 prepare_search_hl(wp, &search_hl, lnum); |
| 7 | 2091 #endif |
| 2092 #ifdef FEAT_SYN_HL | |
| 2093 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2094 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
|
2095 && syntax_present(wp)) |
| 7 | 2096 syntax_end_parsing(syntax_last_parsed + 1); |
| 2097 #endif | |
| 2098 | |
| 2099 /* | |
| 2100 * Display one line. | |
| 2101 */ | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2102 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
|
2103 mod_top == 0, FALSE); |
| 7 | 2104 |
| 2105 #ifdef FEAT_FOLDING | |
| 2106 wp->w_lines[idx].wl_folded = FALSE; | |
| 2107 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2108 #endif | |
| 2109 #ifdef FEAT_SYN_HL | |
| 2110 did_update = DID_LINE; | |
| 2111 syntax_last_parsed = lnum; | |
| 2112 #endif | |
| 2113 } | |
| 2114 | |
| 2115 wp->w_lines[idx].wl_lnum = lnum; | |
| 2116 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
|
2117 |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2118 /* 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
|
2119 * 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
|
2120 * 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
|
2121 if (row > wp->w_height || row + wp->w_winrow >= Rows) |
| 7 | 2122 { |
| 2123 /* we may need the size of that too long line later on */ | |
| 3318 | 2124 if (dollar_vcol == -1) |
| 7 | 2125 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2126 ++idx; | |
| 2127 break; | |
| 2128 } | |
| 3318 | 2129 if (dollar_vcol == -1) |
| 7 | 2130 wp->w_lines[idx].wl_size = row - srow; |
| 2131 ++idx; | |
| 2132 #ifdef FEAT_FOLDING | |
| 2133 lnum += fold_count + 1; | |
| 2134 #else | |
| 2135 ++lnum; | |
| 2136 #endif | |
| 2137 } | |
| 2138 else | |
| 2139 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2140 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
|
2141 { |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2142 #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
|
2143 // '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
|
2144 // 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
|
2145 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
|
2146 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
|
2147 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
|
2148 else |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2149 #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
|
2150 (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
|
2151 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2152 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2153 // This line does not need to be drawn, advance to the next one. |
| 7 | 2154 row += wp->w_lines[idx++].wl_size; |
| 2155 if (row > wp->w_height) /* past end of screen */ | |
| 2156 break; | |
| 2157 #ifdef FEAT_FOLDING | |
| 2158 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2159 #else | |
| 2160 ++lnum; | |
| 2161 #endif | |
| 2162 #ifdef FEAT_SYN_HL | |
| 2163 did_update = DID_NONE; | |
| 2164 #endif | |
| 2165 } | |
| 2166 | |
| 2167 if (lnum > buf->b_ml.ml_line_count) | |
| 2168 { | |
| 2169 eof = TRUE; | |
| 2170 break; | |
| 2171 } | |
| 2172 } | |
| 2173 /* | |
| 2174 * End of loop over all window lines. | |
| 2175 */ | |
| 2176 | |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2177 #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
|
2178 /* 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
|
2179 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
|
2180 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2181 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
|
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 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
|
2184 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
|
2185 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
|
2186 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
|
2187 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
|
2188 else |
|
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 - 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
|
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_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
|
2192 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2193 #endif |
| 7 | 2194 |
| 2195 if (idx > wp->w_lines_valid) | |
| 2196 wp->w_lines_valid = idx; | |
| 2197 | |
| 2198 #ifdef FEAT_SYN_HL | |
| 2199 /* | |
| 2200 * Let the syntax stuff know we stop parsing here. | |
| 2201 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2202 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2203 syntax_end_parsing(syntax_last_parsed + 1); |
| 2204 #endif | |
| 2205 | |
| 2206 /* | |
| 2207 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2208 * line we were working on, then the line didn't fit. | |
| 2209 */ | |
| 2210 wp->w_empty_rows = 0; | |
| 2211 #ifdef FEAT_DIFF | |
| 2212 wp->w_filler_rows = 0; | |
| 2213 #endif | |
| 2214 if (!eof && !didline) | |
| 2215 { | |
| 2216 if (lnum == wp->w_topline) | |
| 2217 { | |
| 2218 /* | |
| 2219 * Single line that does not fit! | |
| 2220 * Don't overwrite it, it can be edited. | |
| 2221 */ | |
| 2222 wp->w_botline = lnum + 1; | |
| 2223 } | |
| 2224 #ifdef FEAT_DIFF | |
| 2225 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2226 { | |
| 2227 /* Window ends in filler lines. */ | |
| 2228 wp->w_botline = lnum; | |
| 2229 wp->w_filler_rows = wp->w_height - srow; | |
| 2230 } | |
| 2231 #endif | |
|
16839
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2232 #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
|
2233 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
|
2234 { |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2235 // 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
|
2236 wp->w_botline = lnum; |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2237 } |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2238 #endif |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2239 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
|
2240 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2241 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
|
2242 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2243 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2244 * 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
|
2245 */ |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2246 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
|
2247 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2248 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
|
2249 (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
|
2250 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2251 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2252 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2253 } |
| 7 | 2254 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2255 { | |
| 2256 /* | |
| 2257 * Last line isn't finished: Display "@@@" at the end. | |
| 2258 */ | |
| 2259 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2260 W_WINROW(wp) + wp->w_height, | |
| 2261 (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
|
2262 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2263 set_empty_rows(wp, srow); |
| 2264 wp->w_botline = lnum; | |
| 2265 } | |
| 2266 else | |
| 2267 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2268 win_draw_end(wp, '@', ' ', TRUE, srow, wp->w_height, HLF_AT); |
| 7 | 2269 wp->w_botline = lnum; |
| 2270 } | |
| 2271 } | |
| 2272 else | |
| 2273 { | |
| 2274 draw_vsep_win(wp, row); | |
| 2275 if (eof) /* we hit the end of the file */ | |
| 2276 { | |
| 2277 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2278 #ifdef FEAT_DIFF | |
| 2279 j = diff_check_fill(wp, wp->w_botline); | |
| 2280 if (j > 0 && !wp->w_botfill) | |
| 2281 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2282 // Display filler lines at the end of the file. |
| 7 | 2283 if (char2cells(fill_diff) > 1) |
| 2284 i = '-'; | |
| 2285 else | |
| 2286 i = fill_diff; | |
| 2287 if (row + j > wp->w_height) | |
| 2288 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
|
2289 win_draw_end(wp, i, i, TRUE, row, row + (int)j, HLF_DED); |
| 7 | 2290 row += j; |
| 2291 } | |
| 2292 #endif | |
| 2293 } | |
| 3318 | 2294 else if (dollar_vcol == -1) |
| 7 | 2295 wp->w_botline = lnum; |
| 2296 | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2297 // 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
|
2298 // 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
|
2299 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
|
2300 ' ', FALSE, row, wp->w_height, HLF_EOB); |
| 7 | 2301 } |
| 2302 | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2303 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2304 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2305 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2306 |
| 7 | 2307 /* Reset the type of redrawing required, the window has been updated. */ |
| 2308 wp->w_redr_type = 0; | |
| 2309 #ifdef FEAT_DIFF | |
| 2310 wp->w_old_topfill = wp->w_topfill; | |
| 2311 wp->w_old_botfill = wp->w_botfill; | |
| 2312 #endif | |
| 2313 | |
| 3318 | 2314 if (dollar_vcol == -1) |
| 7 | 2315 { |
| 2316 /* | |
| 2317 * There is a trick with w_botline. If we invalidate it on each | |
| 2318 * change that might modify it, this will cause a lot of expensive | |
| 2319 * calls to plines() in update_topline() each time. Therefore the | |
| 2320 * value of w_botline is often approximated, and this value is used to | |
| 2321 * compute the value of w_topline. If the value of w_botline was | |
| 2322 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2323 * the visible part of the text). If it's not, we need to redraw | |
| 2324 * again. Mostly this just means scrolling up a few lines, so it | |
| 2325 * doesn't look too bad. Only do this for the current window (where | |
| 2326 * changes are relevant). | |
| 2327 */ | |
| 2328 wp->w_valid |= VALID_BOTLINE; | |
| 2329 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2330 { | |
| 2331 recursive = TRUE; | |
| 2332 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2333 update_topline(); /* may invalidate w_botline again */ | |
| 2334 if (must_redraw != 0) | |
| 2335 { | |
| 2336 /* Don't update for changes in buffer again. */ | |
| 2337 i = curbuf->b_mod_set; | |
| 2338 curbuf->b_mod_set = FALSE; | |
| 2339 win_update(curwin); | |
| 2340 must_redraw = 0; | |
| 2341 curbuf->b_mod_set = i; | |
| 2342 } | |
| 2343 recursive = FALSE; | |
| 2344 } | |
| 2345 } | |
| 2346 | |
| 2347 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2348 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2349 if (!got_int) | |
| 2350 got_int = save_got_int; | |
| 2351 #endif | |
| 2352 } | |
| 2353 | |
| 2354 /* | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2355 * 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
|
2356 * 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
|
2357 */ |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2358 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
|
2359 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
|
2360 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
|
2361 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
|
2362 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
|
2363 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
|
2364 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
|
2365 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
|
2366 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
|
2367 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
|
2368 { |
|
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 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
|
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 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
|
2372 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
|
2373 #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
|
2374 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
|
2375 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2376 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
|
2377 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
|
2378 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
|
2379 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2380 else |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2381 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2382 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2383 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
|
2384 c1, c2, attr); |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2385 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
|
2386 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2387 |
|
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 * 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
|
2390 * 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
|
2391 * When "draw_margin" is TRUE then draw the sign, fold and number columns. |
| 7 | 2392 */ |
| 2393 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2394 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2395 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2396 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2397 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
|
2398 int draw_margin, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2399 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2400 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2401 hlf_T hl) |
| 7 | 2402 { |
| 2403 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
|
2404 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
|
2405 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
|
2406 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
2407 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
|
2408 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2409 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
|
2410 { |
| 6553 | 2411 #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
|
2412 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
|
2413 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2414 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
|
2415 // 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
|
2416 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
|
2417 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
|
2418 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2419 #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
|
2420 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
|
2421 // 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
|
2422 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
|
2423 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
|
2424 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2425 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
|
2426 && 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
|
2427 // 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
|
2428 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
|
2429 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
|
2430 } |
| 7 | 2431 |
| 2432 #ifdef FEAT_RIGHTLEFT | |
| 2433 if (wp->w_p_rl) | |
| 2434 { | |
| 2435 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
|
2436 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
|
2437 c2, c2, attr); |
| 7 | 2438 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
|
2439 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
|
2440 c1, c2, attr); |
| 7 | 2441 } |
| 2442 else | |
| 2443 #endif | |
| 2444 { | |
| 2445 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
|
2446 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
|
2447 c1, c2, attr); |
| 7 | 2448 } |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2449 |
| 7 | 2450 set_empty_rows(wp, row); |
| 2451 } | |
| 2452 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2453 #ifdef FEAT_SYN_HL |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2454 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2455 * 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
|
2456 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2457 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2458 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
|
2459 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2460 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2461 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2462 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2463 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2464 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2465 |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2466 #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
|
2467 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2468 * 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
|
2469 * 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
|
2470 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2471 static int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2472 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
|
2473 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2474 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
|
2475 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2476 if (has_mbyte) |
|
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 int cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2479 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
|
2480 int i; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2481 int idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2482 int c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2483 char_u *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2484 # ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2485 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
|
2486 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
|
2487 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2488 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2489 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2490 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
|
2491 idx = off; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2492 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2493 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2494 idx = off + col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2495 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2496 /* 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
|
2497 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
|
2498 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2499 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
|
2500 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
|
2501 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
|
2502 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2503 - (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
|
2504 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2505 ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2506 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2507 ScreenLines[idx] = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2508 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2509 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2510 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
|
2511 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
|
2512 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2513 ScreenLinesUC[idx] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2514 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2515 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2516 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2517 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2518 else |
|
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 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2521 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
|
2522 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2523 /* Do Arabic shaping. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2524 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
|
2525 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
|
2526 int firstbyte = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2527 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2528 /* 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
|
2529 * 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
|
2530 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
|
2531 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2532 pc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2533 pc1 = prev_c1; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2534 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
|
2535 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
|
2536 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2537 else |
|
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 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
|
2540 nc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2541 pc1 = pcc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2542 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2543 prev_c = u8c; |
|
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 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
|
2546 pc, pc1, nc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2547 ScreenLines[idx] = firstbyte; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2548 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2549 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2550 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2551 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2552 /* 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
|
2553 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
|
2554 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
|
2555 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2556 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
|
2557 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
|
2558 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2559 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2560 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2561 if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2562 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
|
2563 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2564 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
|
2565 /* 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
|
2566 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
|
2567 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
|
2568 /* double-width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2569 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
|
2570 col += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2571 idx += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2572 p += c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2573 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2574 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2575 else |
|
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 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
|
2578 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2579 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
|
2580 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
|
2581 if (len > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2582 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2583 #ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2584 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
|
2585 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
|
2586 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2587 #endif |
|
15939
8013b532a1f7
patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
2588 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
|
2589 col += len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2590 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2591 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2592 return col; |
|
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 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2595 |
| 7 | 2596 #ifdef FEAT_FOLDING |
| 2597 /* | |
| 6553 | 2598 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2599 * space is available for window "wp", minus "col". | |
| 2600 */ | |
| 2601 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2602 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2603 { |
| 2604 int fdc = wp->w_p_fdc; | |
| 2605 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
|
2606 int wwidth = wp->w_width; |
| 6553 | 2607 |
| 2608 if (fdc > wwidth - (col + wmw)) | |
| 2609 fdc = wwidth - (col + wmw); | |
| 2610 return fdc; | |
| 2611 } | |
| 2612 | |
| 2613 /* | |
| 7 | 2614 * Display one folded line. |
| 2615 */ | |
| 2616 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2617 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2618 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2619 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2620 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2621 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2622 int row) |
| 7 | 2623 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2624 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2625 pos_T *top, *bot; |
| 2626 linenr_T lnume = lnum + fold_count - 1; | |
| 2627 int len; | |
| 29 | 2628 char_u *text; |
| 7 | 2629 int fdc; |
| 2630 int col; | |
| 2631 int txtcol; | |
| 2632 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2633 int ri; |
| 7 | 2634 |
| 2635 /* Build the fold line: | |
| 2636 * 1. Add the cmdwin_type for the command-line window | |
| 2637 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2638 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2639 * 4. Compose the text |
| 2640 * 5. Add the text | |
| 2641 * 6. set highlighting for the Visual area an other text | |
| 2642 */ | |
| 2643 col = 0; | |
| 2644 | |
| 2645 /* | |
| 2646 * 1. Add the cmdwin_type for the command-line window | |
| 2647 * Ignores 'rightleft', this window is never right-left. | |
| 2648 */ | |
| 2649 #ifdef FEAT_CMDWIN | |
| 2650 if (cmdwin_type != 0 && wp == curwin) | |
| 2651 { | |
| 2652 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
|
2653 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2654 if (enc_utf8) |
| 2655 ScreenLinesUC[off] = 0; | |
| 2656 ++col; | |
| 2657 } | |
| 2658 #endif | |
| 2659 | |
| 2660 /* | |
| 2661 * 2. Add the 'foldcolumn' | |
| 6553 | 2662 * Reduce the width when there is not enough space. |
| 7 | 2663 */ |
| 6553 | 2664 fdc = compute_foldcolumn(wp, col); |
| 7 | 2665 if (fdc > 0) |
| 2666 { | |
| 2667 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2668 #ifdef FEAT_RIGHTLEFT | |
| 2669 if (wp->w_p_rl) | |
| 2670 { | |
| 2671 int i; | |
| 2672 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2673 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
|
2674 HL_ATTR(HLF_FC)); |
| 7 | 2675 /* reverse the fold column */ |
| 2676 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
|
2677 ScreenLines[off + wp->w_width - i - 1 - col] = buf[i]; |
| 7 | 2678 } |
| 2679 else | |
| 2680 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2681 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2682 col += fdc; |
| 2683 } | |
| 2684 | |
| 2685 #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
|
2686 # 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
|
2687 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2688 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
|
2689 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
|
2690 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
|
2691 else \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2692 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
|
2693 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
|
2694 } while (0) |
| 7 | 2695 #else |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2696 # 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
|
2697 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2698 for (ri = 0; ri < l; ++ri) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2699 ScreenAttrs[off + (p) + ri] = v; \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2700 } while (0) |
| 7 | 2701 #endif |
| 2702 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2703 /* 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
|
2704 * text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2705 RL_MEMSET(col, HL_ATTR(HLF_FL), wp->w_width - col); |
| 7 | 2706 |
| 2707 #ifdef FEAT_SIGNS | |
| 2708 /* 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
|
2709 if (signcolumn_on(wp)) |
| 7 | 2710 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2711 len = wp->w_width - col; |
| 7 | 2712 if (len > 0) |
| 2713 { | |
| 2714 if (len > 2) | |
| 2715 len = 2; | |
| 2716 # ifdef FEAT_RIGHTLEFT | |
| 2717 if (wp->w_p_rl) | |
| 2718 /* 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
|
2719 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
|
2720 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2721 else |
| 2722 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2723 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2724 col += len; |
| 2725 } | |
| 2726 } | |
| 2727 #endif | |
| 2728 | |
| 2729 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2730 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2731 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2732 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2733 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2734 len = wp->w_width - col; |
| 7 | 2735 if (len > 0) |
| 2736 { | |
| 13 | 2737 int w = number_width(wp); |
| 5905 | 2738 long num; |
| 2739 char *fmt = "%*ld "; | |
| 13 | 2740 |
| 2741 if (len > w + 1) | |
| 2742 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2743 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2744 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
|
2745 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2746 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2747 else |
| 4065 | 2748 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2749 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2750 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
|
2751 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
|
2752 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2753 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2754 * line number */ |
| 4065 | 2755 num = lnum; |
| 2756 fmt = "%-*ld "; | |
| 2757 } | |
| 2758 } | |
| 2759 | |
| 2760 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2761 #ifdef FEAT_RIGHTLEFT |
| 2762 if (wp->w_p_rl) | |
| 2763 /* 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
|
2764 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
|
2765 HL_ATTR(HLF_FL)); |
| 7 | 2766 else |
| 2767 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2768 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2769 col += len; |
| 2770 } | |
| 2771 } | |
| 2772 | |
| 2773 /* | |
| 2774 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2775 */ | |
| 29 | 2776 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2777 |
| 2778 txtcol = col; /* remember where text starts */ | |
| 2779 | |
| 2780 /* | |
| 2781 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2782 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2783 * in columns number-col - window-width. | |
| 2784 */ | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2785 col = text_to_screenline(wp, text, col); |
| 7 | 2786 |
| 2787 /* Fill the rest of the line with the fold filler */ | |
| 2788 #ifdef FEAT_RIGHTLEFT | |
| 2789 if (wp->w_p_rl) | |
| 2790 col -= txtcol; | |
| 2791 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2792 while (col < wp->w_width |
| 7 | 2793 #ifdef FEAT_RIGHTLEFT |
| 2794 - (wp->w_p_rl ? txtcol : 0) | |
| 2795 #endif | |
| 2796 ) | |
| 2797 { | |
| 2798 if (enc_utf8) | |
| 2799 { | |
| 2800 if (fill_fold >= 0x80) | |
| 2801 { | |
| 2802 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2803 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
|
2804 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2805 } |
| 2806 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2807 { |
| 7 | 2808 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2809 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2810 } |
|
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
|
2811 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
|
2812 } |
|
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 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
|
2814 ScreenLines[off + col++] = fill_fold; |
| 7 | 2815 } |
| 2816 | |
| 2817 if (text != buf) | |
| 2818 vim_free(text); | |
| 2819 | |
| 2820 /* | |
| 2821 * 6. set highlighting for the Visual area an other text. | |
| 2822 * If all folded lines are in the Visual area, highlight the line. | |
| 2823 */ | |
| 2824 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2825 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2826 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2827 { |
| 2828 /* Visual is after curwin->w_cursor */ | |
| 2829 top = &curwin->w_cursor; | |
| 2830 bot = &VIsual; | |
| 2831 } | |
| 2832 else | |
| 2833 { | |
| 2834 /* Visual is before curwin->w_cursor */ | |
| 2835 top = &VIsual; | |
| 2836 bot = &curwin->w_cursor; | |
| 2837 } | |
| 2838 if (lnum >= top->lnum | |
| 2839 && lnume <= bot->lnum | |
| 2840 && (VIsual_mode != 'v' | |
| 2841 || ((lnum > top->lnum | |
| 2842 || (lnum == top->lnum | |
| 2843 && top->col == 0)) | |
| 2844 && (lnume < bot->lnum | |
| 2845 || (lnume == bot->lnum | |
| 2846 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2847 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2848 { |
| 2849 if (VIsual_mode == Ctrl_V) | |
| 2850 { | |
| 2851 /* 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
|
2852 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)wp->w_width) |
| 7 | 2853 { |
| 3040 | 2854 if (wp->w_old_cursor_lcol != MAXCOL |
| 2855 && 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
|
2856 < (colnr_T)wp->w_width) |
| 7 | 2857 len = wp->w_old_cursor_lcol; |
| 2858 else | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2859 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
|
2860 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2861 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2862 } |
| 2863 } | |
| 2864 else | |
| 216 | 2865 { |
| 7 | 2866 /* 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
|
2867 RL_MEMSET(txtcol, HL_ATTR(HLF_V), wp->w_width - txtcol); |
| 216 | 2868 } |
| 7 | 2869 } |
| 2870 } | |
| 2871 | |
| 743 | 2872 #ifdef FEAT_SYN_HL |
| 6685 | 2873 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2874 if (wp->w_p_cc_cols) | |
| 2875 { | |
| 2876 int i = 0; | |
| 2877 int j = wp->w_p_cc_cols[i]; | |
| 2878 int old_txtcol = txtcol; | |
| 2879 | |
| 2880 while (j > -1) | |
| 2881 { | |
| 2882 txtcol += j; | |
| 2883 if (wp->w_p_wrap) | |
| 2884 txtcol -= wp->w_skipcol; | |
| 2885 else | |
| 2886 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
|
2887 if (txtcol >= 0 && txtcol < wp->w_width) |
| 6685 | 2888 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
|
2889 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2890 txtcol = old_txtcol; |
| 2891 j = wp->w_p_cc_cols[++i]; | |
| 2892 } | |
| 2893 } | |
| 2894 | |
| 743 | 2895 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2896 if (wp->w_p_cuc) |
| 2897 { | |
| 2898 txtcol += wp->w_virtcol; | |
| 2899 if (wp->w_p_wrap) | |
| 2900 txtcol -= wp->w_skipcol; | |
| 2901 else | |
| 2902 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
|
2903 if (txtcol >= 0 && txtcol < wp->w_width) |
| 1725 | 2904 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
|
2905 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2906 } |
| 743 | 2907 #endif |
| 7 | 2908 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2909 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
|
2910 (int)wp->w_width, 0); |
| 7 | 2911 |
| 2912 /* | |
| 2913 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2914 * updated (saves a call to plines() later). | |
| 2915 */ | |
| 2916 if (wp == curwin | |
| 2917 && lnum <= curwin->w_cursor.lnum | |
| 2918 && lnume >= curwin->w_cursor.lnum) | |
| 2919 { | |
| 2920 curwin->w_cline_row = row; | |
| 2921 curwin->w_cline_height = 1; | |
| 2922 curwin->w_cline_folded = TRUE; | |
| 2923 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2924 } | |
| 2925 } | |
| 2926 | |
| 2927 /* | |
| 2928 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2929 */ | |
| 2930 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2931 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2932 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2933 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2934 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2935 int attr) |
| 7 | 2936 { |
| 216 | 2937 int i; |
| 2938 | |
| 7 | 2939 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2940 if (enc_utf8) | |
| 2941 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 216 | 2942 for (i = 0; i < len; ++i) |
| 2943 ScreenAttrs[off + i] = attr; | |
| 7 | 2944 } |
| 2945 | |
| 2946 /* | |
| 2947 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2948 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2949 */ |
| 2950 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2951 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2952 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2953 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2954 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2955 linenr_T lnum) /* current line number */ |
| 7 | 2956 { |
| 2957 int i = 0; | |
| 2958 int level; | |
| 2959 int first_level; | |
| 519 | 2960 int empty; |
| 6553 | 2961 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2962 |
| 2963 /* Init to all spaces. */ | |
| 6929 | 2964 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2965 |
| 2966 level = win_foldinfo.fi_level; | |
| 2967 if (level > 0) | |
| 2968 { | |
| 519 | 2969 /* If there is only one column put more info in it. */ |
| 6553 | 2970 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2971 |
| 7 | 2972 /* If the column is too narrow, we start at the lowest level that |
| 2973 * fits and use numbers to indicated the depth. */ | |
| 6553 | 2974 first_level = level - fdc - closed + 1 + empty; |
| 7 | 2975 if (first_level < 1) |
| 2976 first_level = 1; | |
| 2977 | |
| 6553 | 2978 for (i = 0; i + empty < fdc; ++i) |
| 7 | 2979 { |
| 2980 if (win_foldinfo.fi_lnum == lnum | |
| 2981 && first_level + i >= win_foldinfo.fi_low_level) | |
| 2982 p[i] = '-'; | |
| 2983 else if (first_level == 1) | |
| 2984 p[i] = '|'; | |
| 2985 else if (first_level + i <= 9) | |
| 2986 p[i] = '0' + first_level + i; | |
| 2987 else | |
| 2988 p[i] = '>'; | |
| 2989 if (first_level + i == level) | |
| 2990 break; | |
| 2991 } | |
| 2992 } | |
| 2993 if (closed) | |
| 6553 | 2994 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 2995 } |
| 2996 #endif /* FEAT_FOLDING */ | |
| 2997 | |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2998 #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
|
2999 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
|
3000 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
|
3001 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3002 static int |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3003 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
|
3004 { |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3005 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
|
3006 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
|
3007 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
|
3008 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3009 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
|
3010 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
|
3011 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
|
3012 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
|
3013 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
|
3014 return 0; |
|
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 == NULL) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3016 return -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3017 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
|
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 (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
|
3020 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
|
3021 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
|
3022 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
|
3023 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
|
3024 } |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3025 #endif |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3026 |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3027 #ifdef FEAT_SIGNS |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3028 /* |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3029 * 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
|
3030 * 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
|
3031 * 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
|
3032 */ |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3033 static void |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3034 get_sign_display_info( |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3035 int nrcol, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3036 win_T *wp, |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3037 linenr_T lnum UNUSED, |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3038 sign_attrs_T *sattr, |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3039 int wcr_attr, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3040 int row, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3041 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
|
3042 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
|
3043 int filler_todo UNUSED, |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3044 int *c_extrap, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3045 int *c_finalp, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3046 char_u *extra, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3047 char_u **pp_extra, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3048 int *n_extrap, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3049 int *char_attrp) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3050 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3051 int text_sign; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3052 # ifdef FEAT_SIGN_ICONS |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3053 int icon_sign; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3054 # endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3055 |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3056 // 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
|
3057 *c_extrap = ' '; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3058 *c_finalp = NUL; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3059 if (nrcol) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3060 *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
|
3061 else |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3062 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3063 *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
|
3064 *n_extrap = 2; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3065 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3066 |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3067 if (row == startrow |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3068 #ifdef FEAT_DIFF |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3069 + filler_lines && filler_todo <= 0 |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3070 #endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3071 ) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3072 { |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3073 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
|
3074 # ifdef FEAT_SIGN_ICONS |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3075 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
|
3076 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
|
3077 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3078 // 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
|
3079 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
|
3080 { |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3081 *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
|
3082 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
|
3083 *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
|
3084 *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
|
3085 } |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3086 else |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3087 *c_extrap = SIGN_BYTE; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3088 # ifdef FEAT_NETBEANS_INTG |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3089 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
|
3090 { |
|
17141
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3091 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
|
3092 { |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3093 *c_extrap = NUL; |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3094 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
|
3095 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
|
3096 *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
|
3097 *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
|
3098 } |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3099 else |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3100 *c_extrap = MULTISIGN_BYTE; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3101 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3102 # 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
|
3103 *c_finalp = NUL; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3104 *char_attrp = icon_sign; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3105 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3106 else |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3107 # endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3108 if (text_sign != 0) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3109 { |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3110 *pp_extra = sattr->text; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3111 if (*pp_extra != NULL) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3112 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3113 if (nrcol) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3114 { |
|
17427
45c1dc353321
patch 8.1.1712: signs in number column cause text to be misaligned
Bram Moolenaar <Bram@vim.org>
parents:
17286
diff
changeset
|
3115 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
|
3116 |
|
45c1dc353321
patch 8.1.1712: signs in number column cause text to be misaligned
Bram Moolenaar <Bram@vim.org>
parents:
17286
diff
changeset
|
3117 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
|
3118 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
|
3119 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
|
3120 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
|
3121 STRCAT(extra, " "); |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3122 *pp_extra = extra; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3123 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3124 *c_extrap = NUL; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3125 *c_finalp = NUL; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3126 *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
|
3127 } |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3128 *char_attrp = sattr->texthl; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3129 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3130 } |
|
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 #endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3133 |
| 7 | 3134 /* |
| 3135 * Display line "lnum" of window 'wp' on the screen. | |
| 3136 * Start at row "startrow", stop when "endrow" is reached. | |
| 3137 * wp->w_virtcol needs to be valid. | |
| 3138 * | |
| 3139 * Return the number of last row the line occupies. | |
| 3140 */ | |
| 3141 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3142 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3143 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3144 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3145 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3146 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
|
3147 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
|
3148 int number_only) // only update the number column |
| 7 | 3149 { |
|
17229
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3150 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
|
3151 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
|
3152 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
|
3153 long vcol = 0; // virtual column (for tabs) |
| 6503 | 3154 #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
|
3155 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
|
3156 #endif |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3157 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
|
3158 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
|
3159 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
|
3160 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
|
3161 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
|
3162 |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3163 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
|
3164 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
|
3165 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
|
3166 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
|
3167 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
|
3168 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
|
3169 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
|
3170 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
|
3171 // 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
|
3172 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
|
3173 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
|
3174 |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3175 // saved "extra" items for when draw_state becomes WL_LINE (again) |
| 7 | 3176 int saved_n_extra = 0; |
| 3177 char_u *saved_p_extra = NULL; | |
| 3178 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
|
3179 int saved_c_final = 0; |
| 7 | 3180 int saved_char_attr = 0; |
| 3181 | |
| 3182 int n_attr = 0; /* chars with special attr */ | |
| 3183 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3184 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3185 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3186 | |
| 3187 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3188 | |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3189 int fromcol = -10; // start of inverting |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3190 int tocol = MAXCOL; // end of inverting |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3191 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
|
3192 int noinvcur = FALSE; // don't invert the cursor |
| 7 | 3193 pos_T *top, *bot; |
| 1813 | 3194 int lnum_in_visual_area = FALSE; |
| 7 | 3195 pos_T pos; |
| 3196 long v; | |
| 3197 | |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3198 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
|
3199 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
|
3200 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
|
3201 // 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
|
3202 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
|
3203 // highlighting |
|
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 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
|
3205 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
|
3206 // 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
|
3207 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
|
3208 int search_attr = 0; // attributes desired by 'hlsearch' |
| 7 | 3209 #ifdef FEAT_SYN_HL |
| 743 | 3210 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3211 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3212 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3213 int save_did_emsg; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3214 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3215 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3216 #endif |
|
17438
967e2ee9b656
patch 8.1.1717: last char in menu popup window highlighted
Bram Moolenaar <Bram@vim.org>
parents:
17427
diff
changeset
|
3217 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
|
3218 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3219 int text_prop_count; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3220 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
|
3221 textprop_T *text_props = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3222 int *text_prop_idxs = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3223 int text_props_active = 0; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3224 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
|
3225 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
|
3226 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
|
3227 #endif |
| 743 | 3228 #ifdef FEAT_SPELL |
| 221 | 3229 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3230 # define SPWORDLEN 150 |
| 3231 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3232 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3233 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3234 starts */ |
| 221 | 3235 int spell_attr = 0; /* attributes desired by spelling */ |
| 3236 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3237 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3238 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3239 * there are no spell errors */ |
| 386 | 3240 static int cap_col = -1; /* column to check for Cap word */ |
| 3241 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3242 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3243 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3244 int extra_check = 0; // has extra highlighting |
| 7 | 3245 int multi_attr = 0; /* attributes desired by multibyte */ |
| 3246 int mb_l = 1; /* multi-byte byte length */ | |
| 3247 int mb_c = 0; /* decoded multi-byte character */ | |
| 3248 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3249 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
|
3250 #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
|
3251 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
|
3252 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
|
3253 #endif |
| 7 | 3254 #ifdef FEAT_DIFF |
| 534 | 3255 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3256 int change_start = MAXCOL; /* first col of changed area */ |
| 3257 int change_end = -1; /* last col of changed area */ | |
| 3258 #endif | |
| 3259 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3260 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3261 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
|
3262 chars */ |
| 7 | 3263 #endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3264 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
| 910 | 3265 || 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
|
3266 # define LINE_ATTR |
|
2342d5e500ec
patch 8.1.1635: warnings for unused variables in small version
Bram Moolenaar <Bram@vim.org>
parents:
17264
diff
changeset
|
3267 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
|
3268 #endif |
|
2342d5e500ec
patch 8.1.1635: warnings for unused variables in small version
Bram Moolenaar <Bram@vim.org>
parents:
17264
diff
changeset
|
3269 #ifdef FEAT_SIGNS |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3270 int sign_present = FALSE; |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3271 sign_attrs_T sattr; |
| 7 | 3272 #endif |
| 3273 #ifdef FEAT_ARABIC | |
| 3274 int prev_c = 0; /* previous Arabic character */ | |
| 3275 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3276 #endif | |
| 910 | 3277 #if defined(LINE_ATTR) |
| 867 | 3278 int did_line_attr = 0; |
| 3279 #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
|
3280 #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
|
3281 int get_term_attr = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3282 #endif |
| 7 | 3283 |
| 3284 /* draw_state: items that are drawn in sequence: */ | |
| 3285 #define WL_START 0 /* nothing done yet */ | |
| 3286 #ifdef FEAT_CMDWIN | |
| 3287 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3288 #else | |
| 3289 # define WL_CMDLINE WL_START | |
| 3290 #endif | |
| 3291 #ifdef FEAT_FOLDING | |
| 3292 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3293 #else | |
| 3294 # define WL_FOLD WL_CMDLINE | |
| 3295 #endif | |
| 3296 #ifdef FEAT_SIGNS | |
| 3297 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3298 #else | |
| 3299 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3300 #endif | |
| 3301 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3302 #ifdef FEAT_LINEBREAK |
| 3303 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3304 #else | |
| 3305 # define WL_BRI WL_NR | |
| 3306 #endif | |
| 7 | 3307 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3308 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3309 #else |
| 5995 | 3310 # define WL_SBR WL_BRI |
| 7 | 3311 #endif |
| 3312 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3313 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3314 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3315 int feedback_col = 0; |
| 3316 int feedback_old_attr = -1; | |
| 3317 #endif | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3318 int screen_line_flags = 0; |
| 7 | 3319 |
|
17498
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
3320 #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
|
3321 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
|
3322 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3323 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3324 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
|
3325 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
|
3326 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
|
3327 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
|
3328 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
|
3329 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
|
3330 // wrapping |
|
523591cf1b70
patch 8.1.1744: build error without the conceal feature
Bram Moolenaar <Bram@vim.org>
parents:
17490
diff
changeset
|
3331 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
|
3332 int did_wcol = FALSE; |
| 6520 | 3333 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3334 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3335 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3336 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3337 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3338 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3339 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3340 col -= boguscols; \ |
| 6520 | 3341 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3342 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3343 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3344 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3345 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3346 #endif |
| 7 | 3347 |
| 3348 if (startrow > endrow) /* past the end already! */ | |
| 3349 return startrow; | |
| 3350 | |
| 3351 row = startrow; | |
| 3352 screen_row = row + W_WINROW(wp); | |
| 3353 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3354 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
|
3355 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3356 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3357 * 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
|
3358 * 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
|
3359 */ |
| 7 | 3360 #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
|
3361 extra_check = wp->w_p_lbr; |
| 7 | 3362 #endif |
| 3363 #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
|
3364 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
|
3365 # 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
|
3366 && !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
|
3367 # endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3368 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3369 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3370 /* 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
|
3371 * 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
|
3372 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
|
3373 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
|
3374 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
|
3375 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
|
3376 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
|
3377 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3378 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3379 did_emsg = 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
|
3380 #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
|
3381 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
|
3382 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3383 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3384 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
|
3385 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
|
3386 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3387 } |
|
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 /* 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
|
3391 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
|
3392 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
|
3393 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3394 #endif |
| 3395 | |
|
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
|
3396 #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
|
3397 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
|
3398 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3399 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
|
3400 get_term_attr = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3401 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
|
3402 } |
|
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
|
3403 #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
|
3404 |
| 743 | 3405 #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
|
3406 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
|
3407 && *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
|
3408 && 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
|
3409 && *(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
|
3410 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3411 /* 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
|
3412 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
|
3413 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
|
3414 |
|
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
|
3415 /* 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
|
3416 * 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
|
3417 * 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
|
3418 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
|
3419 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
|
3420 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3421 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
|
3422 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
|
3423 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3424 |
|
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
|
3425 /* 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
|
3426 * 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
|
3427 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
|
3428 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
|
3429 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
|
3430 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3431 /* 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
|
3432 * 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
|
3433 * 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
|
3434 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
|
3435 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
|
3436 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
|
3437 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
|
3438 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
|
3439 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3440 #endif |
|
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 /* |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3443 * 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
|
3444 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3445 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
|
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 (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
|
3448 { |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3449 // 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
|
3450 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
|
3451 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
|
3452 } |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3453 else |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3454 { |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3455 // 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
|
3456 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
|
3457 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
|
3458 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3459 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
|
3460 if (VIsual_mode == Ctrl_V) |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3461 { |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3462 // 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
|
3463 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
|
3464 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3465 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
|
3466 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
|
3467 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3468 } |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3469 else |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3470 { |
|
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3471 // 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
|
3472 if (lnum > top->lnum && lnum <= bot->lnum) |
| 7 | 3473 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
|
3474 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
|
3475 { |
|
17286
a513b81d3689
patch 8.1.1642: may use uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
17272
diff
changeset
|
3476 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
|
3477 fromcol = 0; |
| 7 | 3478 else |
| 3479 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3480 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
|
3481 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
|
3482 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
|
3483 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3484 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3485 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
|
3486 { |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
3487 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
|
3488 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3489 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
|
3490 tocol = MAXCOL; |
| 7 | 3491 } |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3492 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
|
3493 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
|
3494 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3495 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3496 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
|
3497 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
|
3498 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
|
3499 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3500 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3501 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
|
3502 ++tocol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3503 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3504 } |
|
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 /* 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
|
3509 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
|
3510 #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
|
3511 && !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
|
3512 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3513 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3514 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
|
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 /* 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
|
3517 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
|
3518 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3519 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3520 vi_attr = HL_ATTR(HLF_V); |
| 7 | 3521 #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
|
3522 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
|
3523 && 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
|
3524 || (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
|
3525 && clip_isautosel_plus())) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3526 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
|
3527 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3528 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3529 } |
|
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 * 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
|
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 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
|
3535 && 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
|
3536 && 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
|
3537 && 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
|
3538 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3539 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
|
3540 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
|
3541 (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
|
3542 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3543 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
|
3544 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
|
3545 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3546 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
|
3547 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
|
3548 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
|
3549 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3550 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3551 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
|
3552 /* 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
|
3553 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
|
3554 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
|
3555 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3556 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
|
3557 } |
| 7 | 3558 } |
| 3559 | |
| 3560 #ifdef FEAT_DIFF | |
| 3561 filler_lines = diff_check(wp, lnum); | |
| 3562 if (filler_lines < 0) | |
| 3563 { | |
| 3564 if (filler_lines == -1) | |
| 3565 { | |
| 3566 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3567 diff_hlf = HLF_ADD; /* added line */ | |
| 3568 else if (change_start == 0) | |
| 3569 diff_hlf = HLF_TXD; /* changed text */ | |
| 3570 else | |
| 3571 diff_hlf = HLF_CHD; /* changed line */ | |
| 3572 } | |
| 3573 else | |
| 3574 diff_hlf = HLF_ADD; /* added line */ | |
| 3575 filler_lines = 0; | |
| 3576 area_highlighting = TRUE; | |
| 3577 } | |
| 3578 if (lnum == wp->w_topline) | |
| 3579 filler_lines = wp->w_topfill; | |
| 3580 filler_todo = filler_lines; | |
| 3581 #endif | |
| 3582 | |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3583 #ifdef FEAT_SIGNS |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3584 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
|
3585 #endif |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3586 |
| 7 | 3587 #ifdef LINE_ATTR |
| 3588 # ifdef FEAT_SIGNS | |
| 3589 /* 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
|
3590 if (sign_present) |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3591 line_attr = sattr.linehl; |
| 7 | 3592 # endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3593 # if defined(FEAT_QUICKFIX) |
| 7 | 3594 /* Highlight the current line in the quickfix window. */ |
| 644 | 3595 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
|
3596 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3597 # endif |
| 3598 if (line_attr != 0) | |
| 3599 area_highlighting = TRUE; | |
| 3600 #endif | |
| 3601 | |
| 3602 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3603 ptr = line; | |
| 3604 | |
| 743 | 3605 #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
|
3606 if (has_spell && !number_only) |
| 348 | 3607 { |
| 386 | 3608 /* For checking first word with a capital skip white space. */ |
| 3609 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
|
3610 cap_col = getwhitecols(line); |
| 386 | 3611 |
| 348 | 3612 /* To be able to spell-check over line boundaries copy the end of the |
| 3613 * current line into nextline[]. Above the start of the next line was | |
| 3614 * copied to nextline[SPWORDLEN]. */ | |
| 3615 if (nextline[SPWORDLEN] == NUL) | |
| 3616 { | |
| 3617 /* No next line or it is empty. */ | |
| 3618 nextlinecol = MAXCOL; | |
| 3619 nextline_idx = 0; | |
| 3620 } | |
| 3621 else | |
| 3622 { | |
| 835 | 3623 v = (long)STRLEN(line); |
| 348 | 3624 if (v < SPWORDLEN) |
| 3625 { | |
| 3626 /* Short line, use it completely and append the start of the | |
| 3627 * next line. */ | |
| 3628 nextlinecol = 0; | |
| 3629 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3630 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3631 nextline_idx = v + 1; |
| 3632 } | |
| 3633 else | |
| 3634 { | |
| 3635 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3636 nextlinecol = v - SPWORDLEN; | |
| 3637 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3638 nextline_idx = SPWORDLEN + 1; | |
| 3639 } | |
| 3640 } | |
| 3641 } | |
| 3642 #endif | |
| 3643 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3644 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3645 { |
|
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
|
3646 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
|
3647 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3648 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3649 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3650 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3651 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
|
3652 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
|
3653 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3654 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3655 } |
| 7 | 3656 } |
| 3657 | |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3658 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
|
3659 if (wcr_attr != 0) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3660 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3661 win_attr = wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3662 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3663 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3664 #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
|
3665 if (WIN_IS_POPUP(wp)) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3666 screen_line_flags |= SLF_POPUP; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3667 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3668 |
| 7 | 3669 /* |
| 3670 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3671 * first character to be displayed. | |
| 3672 */ | |
| 3673 if (wp->w_p_wrap) | |
| 3674 v = wp->w_skipcol; | |
| 3675 else | |
| 3676 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
|
3677 if (v > 0 && !number_only) |
| 7 | 3678 { |
| 3679 char_u *prev_ptr = ptr; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3680 |
| 7 | 3681 while (vcol < v && *ptr != NUL) |
| 3682 { | |
| 5995 | 3683 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3684 vcol += c; |
| 3685 prev_ptr = ptr; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3686 MB_PTR_ADV(ptr); |
| 7 | 3687 } |
| 3688 | |
| 1984 | 3689 /* When: |
| 3690 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3691 * - 'colorcolumn' is set, or |
| 1984 | 3692 * - 'virtualedit' is set, or |
| 3693 * - the visual mode is active, | |
| 3694 * the end of the line may be before the start of the displayed part. | |
| 3695 */ | |
| 3696 if (vcol < v && ( | |
| 5735 | 3697 #ifdef FEAT_SYN_HL |
| 3698 wp->w_p_cuc || draw_color_col || | |
| 3699 #endif | |
| 3700 virtual_active() || | |
| 3701 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 7 | 3702 vcol = v; |
| 3703 | |
| 3704 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3705 * that character but skip the first few screen characters. */ | |
| 3706 if (vcol > v) | |
| 3707 { | |
| 3708 vcol -= c; | |
| 3709 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
|
3710 /* 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
|
3711 * Except for a TAB. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3712 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
|
3713 n_skip = v - vcol; |
| 7 | 3714 } |
| 3715 | |
| 3716 /* | |
| 3717 * Adjust for when the inverted text is before the screen, | |
| 3718 * and when the start of the inverted text is before the screen. | |
| 3719 */ | |
| 3720 if (tocol <= vcol) | |
| 3721 fromcol = 0; | |
| 3722 else if (fromcol >= 0 && fromcol < vcol) | |
| 3723 fromcol = vcol; | |
| 3724 | |
| 3725 #ifdef FEAT_LINEBREAK | |
| 3726 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3727 if (wp->w_p_wrap) | |
| 3728 need_showbreak = TRUE; | |
| 3729 #endif | |
| 743 | 3730 #ifdef FEAT_SPELL |
| 499 | 3731 /* When spell checking a word we need to figure out the start of the |
| 3732 * word and if it's badly spelled or not. */ | |
| 3733 if (has_spell) | |
| 3734 { | |
| 3735 int len; | |
| 1536 | 3736 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3737 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3738 |
| 3739 pos = wp->w_cursor; | |
| 3740 wp->w_cursor.lnum = lnum; | |
| 1536 | 3741 wp->w_cursor.col = linecol; |
| 534 | 3742 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3743 |
| 3744 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3745 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3746 ptr = line + linecol; | |
| 3747 | |
| 530 | 3748 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3749 { |
| 3750 /* no bad word found at line start, don't check until end of a | |
| 3751 * word */ | |
| 534 | 3752 spell_hlf = HLF_COUNT; |
| 3572 | 3753 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3754 } |
| 3755 else | |
| 534 | 3756 { |
| 499 | 3757 /* bad word found, use attributes until end of word */ |
| 3758 word_end = wp->w_cursor.col + len + 1; | |
| 3759 | |
| 534 | 3760 /* Turn index into actual attributes. */ |
| 3761 if (spell_hlf != HLF_COUNT) | |
| 3762 spell_attr = highlight_attr[spell_hlf]; | |
| 3763 } | |
| 499 | 3764 wp->w_cursor = pos; |
| 501 | 3765 |
| 743 | 3766 # ifdef FEAT_SYN_HL |
| 501 | 3767 /* Need to restart syntax highlighting for this line. */ |
| 3768 if (has_syntax) | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3769 syntax_start(wp, lnum); |
| 743 | 3770 # endif |
| 499 | 3771 } |
| 3772 #endif | |
| 7 | 3773 } |
| 3774 | |
| 3775 /* | |
| 3776 * Correct highlighting for cursor that can't be disabled. | |
| 3777 * Avoids having to check this for each character. | |
| 3778 */ | |
| 3779 if (fromcol >= 0) | |
| 3780 { | |
| 3781 if (noinvcur) | |
| 3782 { | |
| 3783 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3784 { | |
| 3785 /* highlighting starts at cursor, let it start just after the | |
| 3786 * cursor */ | |
| 3787 fromcol_prev = fromcol; | |
| 3788 fromcol = -1; | |
| 3789 } | |
| 3790 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3791 /* restart highlighting after the cursor */ | |
| 3792 fromcol_prev = wp->w_virtcol; | |
| 3793 } | |
| 3794 if (fromcol >= tocol) | |
| 3795 fromcol = -1; | |
| 3796 } | |
| 3797 | |
| 3798 #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
|
3799 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
|
3800 { |
| 5979 | 3801 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
|
3802 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
|
3803 &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
|
3804 ptr = line + v; // "line" may have been updated |
| 7 | 3805 } |
| 3806 #endif | |
| 3807 | |
| 743 | 3808 #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
|
3809 // 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
|
3810 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
|
3811 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3812 // 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
|
3813 // 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
|
3814 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
|
3815 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3816 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
|
3817 area_highlighting = TRUE; |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3818 } |
|
15683
adc6442118b8
patch 8.1.0849: cursorline highlight is not always updated
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
3819 wp->w_last_cursorline = wp->w_cursor.lnum; |
| 743 | 3820 } |
| 3821 #endif | |
| 3822 | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3823 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3824 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3825 char_u *prop_start; |
|
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 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
|
3828 &prop_start, FALSE); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3829 if (text_prop_count > 0) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3830 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3831 // 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
|
3832 // 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
|
3833 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
|
3834 if (text_props != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3835 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
|
3836 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
|
3837 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3838 // 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
|
3839 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
|
3840 area_highlighting = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3841 extra_check = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3842 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3843 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3844 #endif |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3845 |
| 504 | 3846 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3847 col = 0; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3848 |
| 7 | 3849 #ifdef FEAT_RIGHTLEFT |
| 3850 if (wp->w_p_rl) | |
| 3851 { | |
| 3852 /* Rightleft window: process the text in the normal direction, but put | |
| 3853 * it in current_ScreenLine[] from right to left. Start at the | |
| 3854 * 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
|
3855 col = wp->w_width - 1; |
| 7 | 3856 off += col; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3857 screen_line_flags |= SLF_RIGHTLEFT; |
| 7 | 3858 } |
| 3859 #endif | |
| 3860 | |
| 3861 /* | |
| 3862 * Repeat for the whole displayed line. | |
| 3863 */ | |
| 3864 for (;;) | |
| 3865 { | |
|
17498
a31c27cbc0d6
patch 8.1.1747: compiler warning for unused variables
Bram Moolenaar <Bram@vim.org>
parents:
17492
diff
changeset
|
3866 #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
|
3867 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
|
3868 #endif |
| 6947 | 3869 #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
|
3870 int did_decrement_ptr = FALSE; |
| 6947 | 3871 #endif |
| 7 | 3872 /* Skip this quickly when working on the text. */ |
| 3873 if (draw_state != WL_LINE) | |
| 3874 { | |
| 3875 #ifdef FEAT_CMDWIN | |
| 3876 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3877 { | |
| 3878 draw_state = WL_CMDLINE; | |
| 3879 if (cmdwin_type != 0 && wp == curwin) | |
| 3880 { | |
| 3881 /* Draw the cmdline character. */ | |
| 3882 n_extra = 1; | |
| 1340 | 3883 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
|
3884 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
|
3885 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_AT)); |
| 7 | 3886 } |
| 3887 } | |
| 3888 #endif | |
| 3889 | |
| 3890 #ifdef FEAT_FOLDING | |
| 3891 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3892 { | |
| 6553 | 3893 int fdc = compute_foldcolumn(wp, 0); |
| 3894 | |
| 7 | 3895 draw_state = WL_FOLD; |
| 6553 | 3896 if (fdc > 0) |
| 7 | 3897 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3898 /* 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
|
3899 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3900 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3901 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3902 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3903 if (p_extra_free != NULL) |
|
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 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
|
3906 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3907 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3908 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3909 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
|
3910 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
|
3911 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
|
3912 } |
| 7 | 3913 } |
| 3914 } | |
| 3915 #endif | |
| 3916 | |
| 3917 #ifdef FEAT_SIGNS | |
| 3918 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3919 { | |
| 3920 draw_state = WL_SIGN; | |
| 3921 /* Show the sign column when there are any signs in this | |
| 3922 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3923 if (signcolumn_on(wp)) |
|
17264
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3924 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
|
3925 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
|
3926 &c_final, extra, &p_extra, &n_extra, &char_attr); |
| 7 | 3927 } |
| 3928 #endif | |
| 3929 | |
| 3930 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3931 { | |
| 3932 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3933 /* 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
|
3934 * 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
|
3935 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3936 && (row == startrow |
| 3937 #ifdef FEAT_DIFF | |
| 3938 + filler_lines | |
| 3939 #endif | |
| 3940 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3941 { | |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3942 #ifdef FEAT_SIGNS |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3943 // 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
|
3944 // 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
|
3945 // number. |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3946 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
|
3947 && sign_present) |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3948 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
|
3949 row, startrow, filler_lines, filler_todo, |
|
82b5d981fe59
patch 8.1.1631: displaying signs is inefficient
Bram Moolenaar <Bram@vim.org>
parents:
17247
diff
changeset
|
3950 &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
|
3951 &char_attr); |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3952 else |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3953 #endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3954 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3955 /* 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
|
3956 if (row == startrow |
| 7 | 3957 #ifdef FEAT_DIFF |
| 3958 + filler_lines | |
| 3959 #endif | |
| 3960 ) | |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3961 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3962 long num; |
| 4065 | 3963 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3964 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3965 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
|
3966 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3967 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3968 else |
| 4065 | 3969 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3970 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3971 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
|
3972 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3973 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3974 /* 'number' + 'relativenumber' */ |
| 4065 | 3975 num = lnum; |
| 3976 fmt = "%-*ld "; | |
| 3977 } | |
| 3978 } | |
| 3979 | |
| 3980 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3981 number_width(wp), num); |
| 7 | 3982 if (wp->w_skipcol > 0) |
| 3983 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3984 *p_extra = '-'; | |
| 3985 #ifdef FEAT_RIGHTLEFT | |
| 3986 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
|
3987 { |
|
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
|
3988 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
|
3989 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
|
3990 |
|
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 // 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
|
3992 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
|
3993 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
|
3994 { |
|
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 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
|
3996 *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
|
3997 *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
|
3998 } |
|
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 } |
| 7 | 4000 #endif |
| 4001 p_extra = extra; | |
| 4002 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
|
4003 c_final = NUL; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4004 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4005 else |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4006 { |
| 7 | 4007 c_extra = ' '; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4008 c_final = NUL; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4009 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4010 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
|
4011 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_N)); |
| 743 | 4012 #ifdef FEAT_SYN_HL |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4013 /* 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
|
4014 * the current line differently. |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4015 * 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
|
4016 * when CursorLineNr isn't set? */ |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4017 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 4018 && 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
|
4019 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_CLN)); |
| 743 | 4020 #endif |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4021 } |
| 7 | 4022 } |
| 4023 } | |
| 4024 | |
| 5995 | 4025 #ifdef FEAT_LINEBREAK |
| 4026 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 4027 && n_extra == 0 && *p_sbr != NUL) | |
| 4028 /* draw indent after showbreak value */ | |
| 4029 draw_state = WL_BRI; | |
| 4030 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 4031 /* After the showbreak, draw the breakindent */ | |
| 4032 draw_state = WL_BRI - 1; | |
| 4033 | |
| 4034 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 4035 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 4036 { | |
| 4037 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4038 /* 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
|
4039 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
|
4040 && (row != startrow || need_showbreak) |
| 5995 | 4041 # ifdef FEAT_DIFF |
| 4042 && filler_lines == 0 | |
| 6834 | 4043 # endif |
| 5995 | 4044 ) |
| 4045 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4046 char_attr = 0; |
| 6834 | 4047 # ifdef FEAT_DIFF |
| 5995 | 4048 if (diff_hlf != (hlf_T)0) |
| 6106 | 4049 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4050 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 4051 # ifdef FEAT_SYN_HL |
| 6106 | 4052 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4053 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
|
4054 HL_ATTR(HLF_CUL)); |
| 6834 | 4055 # endif |
| 6106 | 4056 } |
| 6834 | 4057 # endif |
| 6028 | 4058 p_extra = NULL; |
| 5995 | 4059 c_extra = ' '; |
| 4060 n_extra = get_breakindent_win(wp, | |
| 4061 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 4062 /* Correct end of highlighted area for 'breakindent', | |
| 4063 * required when 'linebreak' is also set. */ | |
| 4064 if (tocol == vcol) | |
| 4065 tocol += n_extra; | |
| 4066 } | |
| 4067 } | |
| 4068 #endif | |
| 4069 | |
| 7 | 4070 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 4071 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 4072 { | |
| 4073 draw_state = WL_SBR; | |
| 4074 # ifdef FEAT_DIFF | |
| 4075 if (filler_todo > 0) | |
| 4076 { | |
| 4077 /* Draw "deleted" diff line(s). */ | |
| 4078 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
|
4079 { |
| 7 | 4080 c_extra = '-'; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4081 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4082 } |
| 7 | 4083 else |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4084 { |
| 7 | 4085 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
|
4086 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4087 } |
| 7 | 4088 # ifdef FEAT_RIGHTLEFT |
| 4089 if (wp->w_p_rl) | |
| 4090 n_extra = col + 1; | |
| 4091 else | |
| 4092 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4093 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
|
4094 char_attr = HL_ATTR(HLF_DED); |
| 7 | 4095 } |
| 4096 # endif | |
| 4097 # ifdef FEAT_LINEBREAK | |
| 4098 if (*p_sbr != NUL && need_showbreak) | |
| 4099 { | |
| 4100 /* Draw 'showbreak' at the start of each broken line. */ | |
| 4101 p_extra = p_sbr; | |
| 4102 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
|
4103 c_final = NUL; |
| 7 | 4104 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
|
4105 char_attr = HL_ATTR(HLF_AT); |
| 7 | 4106 need_showbreak = FALSE; |
| 6503 | 4107 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 4108 /* Correct end of highlighted area for 'showbreak', |
| 4109 * required when 'linebreak' is also set. */ | |
| 4110 if (tocol == vcol) | |
| 4111 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4112 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4113 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4114 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 4115 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
|
4116 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4117 #endif |
| 7 | 4118 } |
| 4119 # endif | |
| 4120 } | |
| 4121 #endif | |
| 4122 | |
| 4123 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4124 { | |
| 4125 draw_state = WL_LINE; | |
| 4126 if (saved_n_extra) | |
| 4127 { | |
| 4128 /* Continue item from end of wrapped line. */ | |
| 4129 n_extra = saved_n_extra; | |
| 4130 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
|
4131 c_final = saved_c_final; |
| 7 | 4132 p_extra = saved_p_extra; |
| 4133 char_attr = saved_char_attr; | |
| 4134 } | |
| 4135 else | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4136 char_attr = win_attr; |
| 7 | 4137 } |
| 4138 } | |
| 4139 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4140 // 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
|
4141 // 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
|
4142 // 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
|
4143 if ((dollar_vcol >= 0 && wp == curwin |
| 819 | 4144 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4145 #ifdef FEAT_DIFF |
| 4146 && filler_todo <= 0 | |
| 4147 #endif | |
| 4148 ) | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4149 || (number_only && draw_state > WL_NR)) |
| 7 | 4150 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4151 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
|
4152 screen_line_flags); |
| 819 | 4153 /* Pretend we have finished updating the window. Except when |
| 4154 * 'cursorcolumn' is set. */ | |
| 4155 #ifdef FEAT_SYN_HL | |
| 4156 if (wp->w_p_cuc) | |
| 4157 row = wp->w_cline_row + wp->w_cline_height; | |
| 4158 else | |
| 4159 #endif | |
| 4160 row = wp->w_height; | |
| 7 | 4161 break; |
| 4162 } | |
| 4163 | |
|
15351
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4164 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
|
4165 #ifdef FEAT_SPELL |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4166 || has_spell |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4167 #endif |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4168 )) |
| 7 | 4169 { |
| 4170 /* handle Visual or match highlighting in this line */ | |
| 4171 if (vcol == fromcol | |
| 4172 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4173 && (*mb_ptr2cells)(ptr) > 1) | |
| 4174 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4175 && vcol_prev < vcol /* not at margin */ |
| 7 | 4176 && vcol < tocol)) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4177 area_attr = vi_attr; /* start highlighting */ |
| 7 | 4178 else if (area_attr != 0 |
| 4179 && (vcol == tocol | |
| 4180 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4181 area_attr = 0; /* stop highlighting */ | |
| 4182 | |
| 4183 #ifdef FEAT_SEARCH_EXTRA | |
| 4184 if (!n_extra) | |
| 4185 { | |
| 4186 /* | |
|
17490
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
4187 * Check for start/end of 'hlsearch' and other matches. |
| 7 | 4188 * After end, check for start/end of next match. |
| 4189 * When another match, have to check for start again. | |
| 4190 */ | |
| 36 | 4191 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
|
4192 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
|
4193 &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
|
4194 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
|
4195 ptr = line + v; // "line" may have been changed |
| 7 | 4196 } |
| 4197 #endif | |
| 4198 | |
| 4199 #ifdef FEAT_DIFF | |
| 674 | 4200 if (diff_hlf != (hlf_T)0) |
| 7 | 4201 { |
| 1295 | 4202 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4203 && n_extra == 0) | |
| 7 | 4204 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4205 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4206 && n_extra == 0) | |
| 7 | 4207 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
|
4208 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4209 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
|
4210 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4211 } |
| 4212 #endif | |
| 4213 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4214 #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
|
4215 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
|
4216 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4217 int pi; |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4218 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
|
4219 |
|
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
|
4220 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
|
4221 --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
|
4222 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4223 // 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
|
4224 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
|
4225 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4226 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
|
4227 |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4228 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
|
4229 + 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
|
4230 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4231 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
|
4232 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
|
4233 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
|
4234 sizeof(int) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4235 * (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
|
4236 --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
|
4237 --pi; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4238 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4239 } |
|
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 // 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
|
4242 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
|
4243 && 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
|
4244 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
|
4245 |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4246 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
|
4247 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
|
4248 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
|
4249 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4250 // 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
|
4251 // 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
|
4252 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
|
4253 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
|
4254 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
|
4255 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
|
4256 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4257 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
|
4258 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4259 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
|
4260 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
|
4261 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
|
4262 |
|
17208
13d0753511fe
patch 8.1.1603: crash when using unknown highlighting in text property
Bram Moolenaar <Bram@vim.org>
parents:
17196
diff
changeset
|
4263 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
|
4264 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4265 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
|
4266 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4267 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
|
4268 text_prop_attr = |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4269 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
|
4270 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
|
4271 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4272 } |
|
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 #endif |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4276 |
| 674 | 4277 /* Decide which of the highlight attributes to use. */ |
| 4278 attr_pri = TRUE; | |
| 6717 | 4279 #ifdef LINE_ATTR |
| 674 | 4280 if (area_attr != 0) |
| 6717 | 4281 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4282 else if (search_attr != 0) |
| 6717 | 4283 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
|
4284 # ifdef FEAT_TEXT_PROP |
|
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4285 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
|
4286 { |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4287 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
|
4288 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
|
4289 } |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4290 # endif |
| 674 | 4291 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) |
| 1842 | 4292 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4293 || vcol >= tocol)) | |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4294 // 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
|
4295 // (area_attr may be 0 when "noinvcur" is set). |
| 674 | 4296 char_attr = line_attr; |
| 6717 | 4297 #else |
| 4298 if (area_attr != 0) | |
| 4299 char_attr = area_attr; | |
| 4300 else if (search_attr != 0) | |
| 4301 char_attr = search_attr; | |
| 674 | 4302 #endif |
| 4303 else | |
| 4304 { | |
| 4305 attr_pri = FALSE; | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4306 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4307 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
|
4308 { |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4309 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
|
4310 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
|
4311 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
|
4312 else |
|
16811
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4313 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
|
4314 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
|
4315 } |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4316 else |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4317 #endif |
| 674 | 4318 #ifdef FEAT_SYN_HL |
| 4319 if (has_syntax) | |
| 4320 char_attr = syntax_attr; | |
| 4321 else | |
| 4322 #endif | |
| 4323 char_attr = 0; | |
| 4324 } | |
| 7 | 4325 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4326 if (char_attr == 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4327 char_attr = win_attr; |
| 7 | 4328 |
| 4329 /* | |
| 4330 * Get the next character to put on the screen. | |
| 4331 */ | |
| 4332 /* | |
| 1340 | 4333 * The "p_extra" points to the extra stuff that is inserted to |
| 4334 * represent special characters (non-printable stuff) and other | |
| 4335 * 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
|
4336 * If c_final is set, it will compulsorily be used at the end. |
| 1340 | 4337 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past |
| 4338 * "p_extra[n_extra]". | |
| 7 | 4339 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4340 */ | |
| 4341 if (n_extra > 0) | |
| 4342 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4343 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
|
4344 { |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4345 c = (n_extra == 1 && c_final != NUL) ? c_final : c_extra; |
| 7 | 4346 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
|
4347 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4348 { |
| 4349 mb_utf8 = TRUE; | |
| 714 | 4350 u8cc[0] = 0; |
| 819 | 4351 c = 0xc0; |
| 7 | 4352 } |
| 4353 else | |
| 4354 mb_utf8 = FALSE; | |
| 4355 } | |
| 4356 else | |
| 4357 { | |
| 4358 c = *p_extra; | |
| 4359 if (has_mbyte) | |
| 4360 { | |
| 4361 mb_c = c; | |
| 4362 if (enc_utf8) | |
| 4363 { | |
| 4364 /* If the UTF-8 character is more than one byte: | |
| 4365 * 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
|
4366 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4367 mb_utf8 = FALSE; |
| 4368 if (mb_l > n_extra) | |
| 4369 mb_l = 1; | |
| 4370 else if (mb_l > 1) | |
| 4371 { | |
| 714 | 4372 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4373 mb_utf8 = TRUE; |
| 819 | 4374 c = 0xc0; |
| 7 | 4375 } |
| 4376 } | |
| 4377 else | |
| 4378 { | |
| 4379 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4380 mb_l = MB_BYTE2LEN(c); | |
| 4381 if (mb_l >= n_extra) | |
| 4382 mb_l = 1; | |
| 4383 else if (mb_l > 1) | |
| 4384 mb_c = (c << 8) + p_extra[1]; | |
| 4385 } | |
| 504 | 4386 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4387 mb_l = 1; | |
| 4388 | |
| 7 | 4389 /* If a double-width char doesn't fit display a '>' in the |
| 4390 * last column. */ | |
| 504 | 4391 if (( |
| 7 | 4392 # ifdef FEAT_RIGHTLEFT |
| 4393 wp->w_p_rl ? (col <= 0) : | |
| 4394 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4395 (col >= wp->w_width - 1)) |
| 7 | 4396 && (*mb_char2cells)(mb_c) == 2) |
| 4397 { | |
| 4398 c = '>'; | |
| 4399 mb_c = c; | |
| 4400 mb_l = 1; | |
| 4401 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
|
4402 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4403 /* put the pointer back to output the double-width |
| 4404 * character at the start of the next line. */ | |
| 4405 ++n_extra; | |
| 4406 --p_extra; | |
| 4407 } | |
| 4408 else | |
| 4409 { | |
| 4410 n_extra -= mb_l - 1; | |
| 4411 p_extra += mb_l - 1; | |
| 4412 } | |
| 4413 } | |
| 4414 ++p_extra; | |
| 4415 } | |
| 4416 --n_extra; | |
| 4417 } | |
| 4418 else | |
| 4419 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4420 #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
|
4421 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4422 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4423 |
| 6026 | 4424 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
|
4425 VIM_CLEAR(p_extra_free); |
| 7 | 4426 /* |
| 4427 * Get a character from the line itself. | |
| 4428 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4429 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4430 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4431 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4432 #endif |
| 7 | 4433 if (has_mbyte) |
| 4434 { | |
| 4435 mb_c = c; | |
| 4436 if (enc_utf8) | |
| 4437 { | |
| 4438 /* If the UTF-8 character is more than one byte: Decode it | |
| 4439 * 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
|
4440 mb_l = utfc_ptr2len(ptr); |
| 7 | 4441 mb_utf8 = FALSE; |
| 4442 if (mb_l > 1) | |
| 4443 { | |
| 714 | 4444 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4445 /* Overlong encoded ASCII or ASCII with composing char |
| 4446 * is displayed normally, except a NUL. */ | |
| 4447 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
|
4448 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4449 c = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4450 #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
|
4451 c0 = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4452 #endif |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4453 } |
| 7 | 4454 mb_utf8 = TRUE; |
| 507 | 4455 |
| 4456 /* At start of the line we can have a composing char. | |
| 4457 * Draw it as a space with a composing char. */ | |
| 4458 if (utf_iscomposing(mb_c)) | |
| 4459 { | |
| 1326 | 4460 int i; |
| 4461 | |
| 714 | 4462 for (i = Screen_mco - 1; i > 0; --i) |
| 4463 u8cc[i] = u8cc[i - 1]; | |
| 4464 u8cc[0] = mb_c; | |
| 507 | 4465 mb_c = ' '; |
| 4466 } | |
| 7 | 4467 } |
| 4468 | |
| 4469 if ((mb_l == 1 && c >= 0x80) | |
| 4470 || (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
|
4471 || (mb_l > 1 && (!vim_isprintc(mb_c)))) |
| 7 | 4472 { |
| 4473 /* | |
| 4474 * Illegal UTF-8 byte: display as <xx>. | |
| 4475 * Non-BMP character : display as ? or fullwidth ?. | |
| 4476 */ | |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4477 transchar_hex(extra, mb_c); |
| 714 | 4478 # ifdef FEAT_RIGHTLEFT |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4479 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
|
4480 rl_mirror(extra); |
| 714 | 4481 # endif |
| 7 | 4482 p_extra = extra; |
| 4483 c = *p_extra; | |
| 4484 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4485 mb_utf8 = (c >= 0x80); | |
| 4486 n_extra = (int)STRLEN(p_extra); | |
| 4487 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
|
4488 c_final = NUL; |
| 7 | 4489 if (area_attr == 0 && search_attr == 0) |
| 4490 { | |
| 4491 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
|
4492 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4493 saved_attr2 = char_attr; /* save current attr */ |
| 4494 } | |
| 4495 } | |
| 4496 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4497 mb_l = 1; | |
| 4498 #ifdef FEAT_ARABIC | |
| 4499 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4500 { | |
| 4501 /* Do Arabic shaping. */ | |
| 714 | 4502 int pc, pc1, nc; |
| 4503 int pcc[MAX_MCO]; | |
| 7 | 4504 |
| 4505 /* The idea of what is the previous and next | |
| 4506 * character depends on 'rightleft'. */ | |
| 4507 if (wp->w_p_rl) | |
| 4508 { | |
| 4509 pc = prev_c; | |
| 4510 pc1 = prev_c1; | |
| 4511 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4512 prev_c1 = u8cc[0]; |
| 7 | 4513 } |
| 4514 else | |
| 4515 { | |
| 714 | 4516 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4517 nc = prev_c; |
| 714 | 4518 pc1 = pcc[0]; |
| 7 | 4519 } |
| 4520 prev_c = mb_c; | |
| 4521 | |
| 714 | 4522 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4523 } |
| 4524 else | |
| 4525 prev_c = mb_c; | |
| 4526 #endif | |
| 4527 } | |
| 4528 else /* enc_dbcs */ | |
| 4529 { | |
| 4530 mb_l = MB_BYTE2LEN(c); | |
| 4531 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4532 mb_l = 1; | |
| 4533 else if (mb_l > 1) | |
| 4534 { | |
| 4535 /* We assume a second byte below 32 is illegal. | |
| 4536 * Hopefully this is OK for all double-byte encodings! | |
| 4537 */ | |
| 4538 if (ptr[1] >= 32) | |
| 4539 mb_c = (c << 8) + ptr[1]; | |
| 4540 else | |
| 4541 { | |
| 4542 if (ptr[1] == NUL) | |
| 4543 { | |
| 4544 /* head byte at end of line */ | |
| 4545 mb_l = 1; | |
| 4546 transchar_nonprint(extra, c); | |
| 4547 } | |
| 4548 else | |
| 4549 { | |
| 4550 /* illegal tail byte */ | |
| 4551 mb_l = 2; | |
| 4552 STRCPY(extra, "XX"); | |
| 4553 } | |
| 4554 p_extra = extra; | |
| 4555 n_extra = (int)STRLEN(extra) - 1; | |
| 4556 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
|
4557 c_final = NUL; |
| 7 | 4558 c = *p_extra++; |
| 4559 if (area_attr == 0 && search_attr == 0) | |
| 4560 { | |
| 4561 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
|
4562 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4563 saved_attr2 = char_attr; /* save current attr */ |
| 4564 } | |
| 4565 mb_c = c; | |
| 4566 } | |
| 4567 } | |
| 4568 } | |
| 4569 /* If a double-width char doesn't fit display a '>' in the | |
| 4570 * last column; the character is displayed at the start of the | |
| 4571 * next line. */ | |
| 4572 if (( | |
| 4573 # ifdef FEAT_RIGHTLEFT | |
| 4574 wp->w_p_rl ? (col <= 0) : | |
| 4575 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4576 (col >= wp->w_width - 1)) |
| 7 | 4577 && (*mb_char2cells)(mb_c) == 2) |
| 4578 { | |
| 4579 c = '>'; | |
| 4580 mb_c = c; | |
| 4581 mb_utf8 = FALSE; | |
| 4582 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
|
4583 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
|
4584 // 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
|
4585 // displayed at the start of the next line. |
| 7 | 4586 --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
|
4587 #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
|
4588 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
|
4589 #endif |
| 7 | 4590 } |
| 4591 else if (*ptr != NUL) | |
| 4592 ptr += mb_l - 1; | |
| 4593 | |
| 4594 /* 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
|
4595 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4596 * 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
|
4597 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4598 { |
| 4599 n_extra = 1; | |
| 3586 | 4600 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
|
4601 c_final = NUL; |
| 7 | 4602 c = ' '; |
| 4603 if (area_attr == 0 && search_attr == 0) | |
| 4604 { | |
| 4605 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
|
4606 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4607 saved_attr2 = char_attr; /* save current attr */ |
| 4608 } | |
| 4609 mb_c = c; | |
| 4610 mb_utf8 = FALSE; | |
| 4611 mb_l = 1; | |
| 4612 } | |
| 4613 | |
| 4614 } | |
| 4615 ++ptr; | |
| 4616 | |
| 4617 if (extra_check) | |
| 4618 { | |
| 743 | 4619 #ifdef FEAT_SPELL |
| 221 | 4620 int can_spell = TRUE; |
| 743 | 4621 #endif |
| 4622 | |
|
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
|
4623 #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
|
4624 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
|
4625 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4626 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
|
4627 |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4628 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
|
4629 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
|
4630 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
|
4631 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
|
4632 } |
|
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 #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
|
4634 |
| 743 | 4635 #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
|
4636 // 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
|
4637 // (double-wide char that doesn't fit). |
| 221 | 4638 v = (long)(ptr - line); |
| 4639 if (has_syntax && v > 0) | |
| 7 | 4640 { |
| 4641 /* Get the syntax attribute for the character. If there | |
| 4642 * is an error, disable syntax highlighting. */ | |
| 4643 save_did_emsg = did_emsg; | |
| 4644 did_emsg = FALSE; | |
| 4645 | |
| 221 | 4646 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4647 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4648 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4649 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4650 NULL, FALSE); |
| 7 | 4651 |
| 4652 if (did_emsg) | |
| 482 | 4653 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4654 wp->w_s->b_syn_error = TRUE; |
| 482 | 4655 has_syntax = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4656 syntax_attr = 0; |
| 482 | 4657 } |
| 7 | 4658 else |
| 4659 did_emsg = save_did_emsg; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4660 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4661 // combine syntax attribute with 'wincolor' |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4662 if (win_attr != 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4663 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
|
4664 |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4665 #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
|
4666 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
|
4667 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4668 #endif |
| 7 | 4669 |
| 4670 /* Need to get the line again, a multi-line regexp may | |
| 4671 * have made it invalid. */ | |
| 4672 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4673 ptr = line + v; | |
| 4674 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4675 # 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
|
4676 // 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
|
4677 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
|
4678 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4679 { |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4680 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
|
4681 # 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
|
4682 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
|
4683 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4684 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
|
4685 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
|
4686 else |
|
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 = 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
|
4688 } |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4689 # 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
|
4690 /* 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
|
4691 * 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
|
4692 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
|
4693 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
|
4694 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
|
4695 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
|
4696 # endif |
| 7 | 4697 } |
| 743 | 4698 #endif |
| 4699 | |
| 4700 #ifdef FEAT_SPELL | |
| 301 | 4701 /* Check spelling (unless at the end of the line). |
| 319 | 4702 * Only do this when there is no syntax highlighting, the |
| 4703 * @Spell cluster is not used or the current syntax item | |
| 4704 * contains the @Spell cluster. */ | |
| 348 | 4705 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4706 { |
| 230 | 4707 spell_attr = 0; |
| 743 | 4708 if (c != 0 && ( |
| 4709 # ifdef FEAT_SYN_HL | |
| 4710 !has_syntax || | |
| 4711 # endif | |
| 4712 can_spell)) | |
| 221 | 4713 { |
| 348 | 4714 char_u *prev_ptr, *p; |
| 4715 int len; | |
| 534 | 4716 hlf_T spell_hlf = HLF_COUNT; |
| 336 | 4717 if (has_mbyte) |
| 4718 { | |
| 4719 prev_ptr = ptr - mb_l; | |
| 4720 v -= mb_l - 1; | |
| 4721 } | |
| 4722 else | |
| 4723 prev_ptr = ptr - 1; | |
| 348 | 4724 |
| 4725 /* Use nextline[] if possible, it has the start of the | |
| 4726 * next line concatenated. */ | |
| 4727 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4728 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4729 else | |
| 4730 p = prev_ptr; | |
| 835 | 4731 cap_col -= (int)(prev_ptr - line); |
| 625 | 4732 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4733 nochange); | |
| 348 | 4734 word_end = v + len; |
| 301 | 4735 |
| 4736 /* In Insert mode only highlight a word that | |
| 4737 * doesn't touch the cursor. */ | |
| 534 | 4738 if (spell_hlf != HLF_COUNT |
| 301 | 4739 && (State & INSERT) != 0 |
| 4740 && wp->w_cursor.lnum == lnum | |
| 4741 && wp->w_cursor.col >= | |
| 4742 (colnr_T)(prev_ptr - line) | |
| 4743 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4744 { |
| 534 | 4745 spell_hlf = HLF_COUNT; |
| 301 | 4746 spell_redraw_lnum = lnum; |
| 221 | 4747 } |
| 348 | 4748 |
| 534 | 4749 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4750 && (p - nextline) + len > nextline_idx) |
| 4751 { | |
| 4752 /* Remember that the good word continues at the | |
| 4753 * start of the next line. */ | |
| 4754 checked_lnum = lnum + 1; | |
| 835 | 4755 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4756 } |
| 386 | 4757 |
| 534 | 4758 /* Turn index into actual attributes. */ |
| 4759 if (spell_hlf != HLF_COUNT) | |
| 4760 spell_attr = highlight_attr[spell_hlf]; | |
| 4761 | |
| 386 | 4762 if (cap_col > 0) |
| 4763 { | |
| 4764 if (p != prev_ptr | |
| 4765 && (p - nextline) + cap_col >= nextline_idx) | |
| 4766 { | |
| 4767 /* Remember that the word in the next line | |
| 4768 * must start with a capital. */ | |
| 4769 capcol_lnum = lnum + 1; | |
| 835 | 4770 cap_col = (int)((p - nextline) + cap_col |
| 4771 - nextline_idx); | |
| 386 | 4772 } |
| 4773 else | |
| 4774 /* Compute the actual column. */ | |
| 835 | 4775 cap_col += (int)(prev_ptr - line); |
| 386 | 4776 } |
| 221 | 4777 } |
| 4778 } | |
| 4779 if (spell_attr != 0) | |
| 348 | 4780 { |
| 674 | 4781 if (!attr_pri) |
| 348 | 4782 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4783 else | |
| 4784 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4785 } | |
| 7 | 4786 #endif |
| 4787 #ifdef FEAT_LINEBREAK | |
| 4788 /* | |
| 221 | 4789 * Found last space before word: check for line break. |
| 7 | 4790 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4791 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
|
4792 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4793 { |
| 6693 | 4794 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
|
4795 char_u *p = ptr - (mb_off + 1); |
| 6681 | 4796 |
| 5995 | 4797 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4798 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4799 NULL) - 1; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4800 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
|
4801 # ifdef FEAT_VARTABS |
|
14198
9ca8c36869ce
patch 8.1.0116: display problem with 'vartabstop' and 'linebreak'
Christian Brabandt <cb@256bit.org>
parents:
14191
diff
changeset
|
4802 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
|
4803 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
|
4804 # else |
| 6371 | 4805 n_extra = (int)wp->w_buffer->b_p_ts |
| 4806 - 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
|
4807 # endif |
| 6371 | 4808 |
| 6693 | 4809 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
|
4810 c_final = NUL; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4811 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4812 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4813 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4814 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4815 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4816 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4817 #endif |
| 6026 | 4818 if (!wp->w_p_list) |
| 4819 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4820 } |
| 7 | 4821 } |
| 4822 #endif | |
| 4823 | |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4824 // '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
|
4825 // 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
|
4826 // 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
|
4827 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
|
4828 && ((((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
|
4829 || (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
|
4830 && ((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
|
4831 || (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
|
4832 && 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
|
4833 || (c == ' ' |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4834 && 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
|
4835 && 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
|
4836 && 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
|
4837 { |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4838 c = (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
|
4839 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
|
4840 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4841 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
|
4842 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
|
4843 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
|
4844 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4845 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
|
4846 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
|
4847 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4848 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
|
4849 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
|
4850 c = 0xc0; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4851 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4852 else |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4853 mb_utf8 = FALSE; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4854 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4855 |
| 7 | 4856 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4857 { | |
| 4858 c = lcs_trail; | |
| 674 | 4859 if (!attr_pri) |
| 7 | 4860 { |
| 4861 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
|
4862 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4863 saved_attr2 = char_attr; /* save current attr */ |
| 4864 } | |
| 4865 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
|
4866 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4867 { |
| 4868 mb_utf8 = TRUE; | |
| 714 | 4869 u8cc[0] = 0; |
| 819 | 4870 c = 0xc0; |
| 7 | 4871 } |
| 4872 else | |
| 4873 mb_utf8 = FALSE; | |
| 4874 } | |
| 4875 } | |
| 4876 | |
| 4877 /* | |
| 4878 * Handling of non-printable characters. | |
| 4879 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4880 if (!vim_isprintc(c)) |
| 7 | 4881 { |
| 4882 /* | |
| 4883 * when getting a character from the file, we may have to | |
| 4884 * turn it into something else on the way to putting it | |
| 4885 * into "ScreenLines". | |
| 4886 */ | |
| 4887 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4888 { | |
| 6026 | 4889 int tab_len = 0; |
| 6503 | 4890 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 4891 #ifdef FEAT_LINEBREAK | |
| 4892 /* only adjust the tab_len, when at the first column | |
| 4893 * after the showbreak value was drawn */ | |
| 4894 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 4895 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 4896 #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
|
4897 // 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
|
4898 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4899 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
|
4900 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
|
4901 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
|
4902 #else |
| 6026 | 4903 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
|
4904 - 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
|
4905 #endif |
| 6503 | 4906 |
| 6026 | 4907 #ifdef FEAT_LINEBREAK |
| 6100 | 4908 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 4909 #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
|
4910 // tab amount depends on current column |
| 6026 | 4911 n_extra = tab_len; |
| 4912 #ifdef FEAT_LINEBREAK | |
| 4913 else | |
| 4914 { | |
|
17742
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4915 char_u *p; |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
4916 int len; |
| 6026 | 4917 int i; |
| 4918 int saved_nextra = n_extra; | |
| 4919 | |
| 6172 | 4920 #ifdef FEAT_CONCEAL |
| 6627 | 4921 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
|
4922 // there are characters to conceal |
| 6172 | 4923 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
|
4924 // boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 6520 | 4925 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 |
| 4926 && n_extra > tab_len) | |
| 4927 tab_len += n_extra - tab_len; | |
| 4928 #endif | |
| 4929 | |
|
17742
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4930 // 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
|
4931 // 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
|
4932 // for a tab |
| 6026 | 4933 len = (tab_len * mb_char2len(lcs_tab2)); |
| 4934 if (n_extra > 0) | |
| 4935 len += n_extra - tab_len; | |
| 4936 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
|
4937 p = alloc(len + 1); |
| 6026 | 4938 vim_memset(p, ' ', len); |
| 4939 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4940 vim_free(p_extra_free); |
| 6026 | 4941 p_extra_free = p; |
| 4942 for (i = 0; i < tab_len; i++) | |
| 4943 { | |
|
17742
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4944 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
|
4945 |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4946 if (*p == NUL) |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4947 { |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4948 tab_len = i; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4949 break; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4950 } |
|
17742
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4951 |
|
a51ccadd0dca
patch 8.1.1868: multi-byte chars in 'listchars' fail with 'linebreak' set
Bram Moolenaar <Bram@vim.org>
parents:
17696
diff
changeset
|
4952 // 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
|
4953 // 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
|
4954 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
|
4955 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
|
4956 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
|
4957 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
|
4958 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
|
4959 - (saved_nextra > 0 ? 1 : 0); |
| 6026 | 4960 } |
| 4961 p_extra = p_extra_free; | |
| 6172 | 4962 #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
|
4963 // 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
|
4964 // macro below, so need to adjust for that here |
| 6627 | 4965 if (vcol_off > 0) |
| 6172 | 4966 n_extra -= vcol_off; |
| 4967 #endif | |
| 6026 | 4968 } |
| 4969 #endif | |
| 3984 | 4970 #ifdef FEAT_CONCEAL |
| 6627 | 4971 { |
| 4972 int vc_saved = vcol_off; | |
| 4973 | |
| 4974 /* Tab alignment should be identical regardless of | |
| 4975 * 'conceallevel' value. So tab compensates of all | |
| 4976 * previous concealed characters, and thus resets | |
| 4977 * vcol_off and boguscols accumulated so far in the | |
| 4978 * line. Note that the tab can be longer than | |
| 4979 * 'tabstop' when there are concealed characters. */ | |
| 4980 FIX_FOR_BOGUSCOLS; | |
| 4981 | |
| 4982 /* Make sure, the highlighting for the tab char will be | |
| 4983 * correctly set further below (effectively reverts the | |
| 4984 * FIX_FOR_BOGSUCOLS macro */ | |
| 4985 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 4986 && lcs_tab1) |
| 6627 | 4987 tab_len += vc_saved; |
| 4988 } | |
| 3984 | 4989 #endif |
| 7 | 4990 mb_utf8 = FALSE; /* don't draw as UTF-8 */ |
| 4991 if (wp->w_p_list) | |
| 4992 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4993 c = (n_extra == 0 && lcs_tab3) ? lcs_tab3 : lcs_tab1; |
| 6026 | 4994 #ifdef FEAT_LINEBREAK |
| 4995 if (wp->w_p_lbr) | |
| 4996 c_extra = NUL; /* using p_extra from above */ | |
| 4997 else | |
| 4998 #endif | |
| 4999 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
|
5000 c_final = lcs_tab3; |
| 6026 | 5001 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
|
5002 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5003 saved_attr2 = char_attr; /* save current attr */ |
| 5004 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
|
5005 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5006 { |
| 5007 mb_utf8 = TRUE; | |
| 714 | 5008 u8cc[0] = 0; |
| 819 | 5009 c = 0xc0; |
| 7 | 5010 } |
| 5011 } | |
| 5012 else | |
| 5013 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5014 c_final = NUL; |
| 7 | 5015 c_extra = ' '; |
| 5016 c = ' '; | |
| 5017 } | |
| 5018 } | |
| 36 | 5019 else if (c == NUL |
| 6799 | 5020 && (wp->w_p_list |
| 36 | 5021 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 5022 && tocol > vcol | |
| 5023 && VIsual_mode != Ctrl_V | |
| 5024 && ( | |
| 5025 # ifdef FEAT_RIGHTLEFT | |
| 5026 wp->w_p_rl ? (col >= 0) : | |
| 5027 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5028 (col < wp->w_width)) |
| 36 | 5029 && !(noinvcur |
| 1850 | 5030 && lnum == wp->w_cursor.lnum |
| 36 | 5031 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 5032 && lcs_eol_one > 0) |
| 7 | 5033 { |
| 36 | 5034 /* Display a '$' after the line or highlight an extra |
| 5035 * character if the line break is included. */ | |
| 7 | 5036 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 5037 /* For a diff line the highlighting continues after the | |
| 5038 * "$". */ | |
| 5039 if ( | |
| 5040 # ifdef FEAT_DIFF | |
| 534 | 5041 diff_hlf == (hlf_T)0 |
| 7 | 5042 # ifdef LINE_ATTR |
| 5043 && | |
| 5044 # endif | |
| 5045 # endif | |
| 5046 # ifdef LINE_ATTR | |
| 5047 line_attr == 0 | |
| 5048 # endif | |
| 5049 ) | |
| 5050 #endif | |
| 5051 { | |
| 5052 /* In virtualedit, visual selections may extend | |
| 5053 * beyond end of line. */ | |
| 5054 if (area_highlighting && virtual_active() | |
| 5055 && tocol != MAXCOL && vcol < tocol) | |
| 5056 n_extra = 0; | |
| 5057 else | |
| 5058 { | |
| 5059 p_extra = at_end_str; | |
| 5060 n_extra = 1; | |
| 5061 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
|
5062 c_final = NUL; |
| 7 | 5063 } |
| 5064 } | |
| 6799 | 5065 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 5066 c = lcs_eol; |
| 5067 else | |
| 5068 c = ' '; | |
| 7 | 5069 lcs_eol_one = -1; |
| 5070 --ptr; /* put it back at the NUL */ | |
| 674 | 5071 if (!attr_pri) |
| 7 | 5072 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5073 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 5074 n_attr = 1; |
| 5075 } | |
| 5076 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
|
5077 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5078 { |
| 5079 mb_utf8 = TRUE; | |
| 714 | 5080 u8cc[0] = 0; |
| 819 | 5081 c = 0xc0; |
| 7 | 5082 } |
| 5083 else | |
| 5084 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5085 } | |
| 5086 else if (c != NUL) | |
| 5087 { | |
| 5088 p_extra = transchar(c); | |
| 6064 | 5089 if (n_extra == 0) |
| 5090 n_extra = byte2cells(c) - 1; | |
| 7 | 5091 #ifdef FEAT_RIGHTLEFT |
| 5092 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5093 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5094 #endif | |
| 5095 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
|
5096 c_final = NUL; |
| 6026 | 5097 #ifdef FEAT_LINEBREAK |
| 5098 if (wp->w_p_lbr) | |
| 5099 { | |
| 5100 char_u *p; | |
| 5101 | |
| 5102 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
|
5103 p = alloc(n_extra + 1); |
| 6026 | 5104 vim_memset(p, ' ', n_extra); |
| 5105 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5106 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5107 vim_free(p_extra_free); |
| 6026 | 5108 p_extra_free = p_extra = p; |
| 5109 } | |
| 5110 else | |
| 5111 #endif | |
| 5112 { | |
| 5113 n_extra = byte2cells(c) - 1; | |
| 5114 c = *p_extra++; | |
| 5115 } | |
| 674 | 5116 if (!attr_pri) |
| 7 | 5117 { |
| 5118 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
|
5119 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5120 saved_attr2 = char_attr; /* save current attr */ |
| 5121 } | |
| 5122 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5123 } | |
| 5124 else if (VIsual_active | |
| 5125 && (VIsual_mode == Ctrl_V | |
| 5126 || VIsual_mode == 'v') | |
| 5127 && virtual_active() | |
| 5128 && tocol != MAXCOL | |
| 5129 && vcol < tocol | |
| 5130 && ( | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5131 #ifdef FEAT_RIGHTLEFT |
| 7 | 5132 wp->w_p_rl ? (col >= 0) : |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5133 #endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5134 (col < wp->w_width))) |
| 7 | 5135 { |
| 5136 c = ' '; | |
| 5137 --ptr; /* put it back at the NUL */ | |
| 5138 } | |
| 910 | 5139 #if defined(LINE_ATTR) |
| 7 | 5140 else if (( |
| 5141 # ifdef FEAT_DIFF | |
| 910 | 5142 diff_hlf != (hlf_T)0 || |
| 7 | 5143 # endif |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5144 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5145 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
|
5146 # endif |
| 7 | 5147 line_attr != 0 |
| 5148 ) && ( | |
| 5149 # ifdef FEAT_RIGHTLEFT | |
| 5150 wp->w_p_rl ? (col >= 0) : | |
| 5151 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5152 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5153 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5154 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5155 # endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5156 < wp->w_width))) |
| 7 | 5157 { |
| 5158 /* Highlight until the right side of the window */ | |
| 5159 c = ' '; | |
| 5160 --ptr; /* put it back at the NUL */ | |
| 867 | 5161 |
| 5162 /* Remember we do the char for line highlighting. */ | |
| 5163 ++did_line_attr; | |
| 5164 | |
| 5165 /* 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
|
5166 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
|
5167 && (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
|
5168 || (wp->w_p_list && lcs_eol > 0))) |
| 867 | 5169 char_attr = line_attr; |
| 7 | 5170 # ifdef FEAT_DIFF |
| 5171 if (diff_hlf == HLF_TXD) | |
| 5172 { | |
| 5173 diff_hlf = HLF_CHD; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5174 if (vi_attr == 0 || char_attr != vi_attr) |
| 6106 | 5175 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5176 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5177 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5178 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
|
5179 HL_ATTR(HLF_CUL)); |
| 6106 | 5180 } |
| 7 | 5181 } |
| 5182 # endif | |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5183 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5184 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
|
5185 { |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5186 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
|
5187 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
|
5188 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
|
5189 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
|
5190 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
|
5191 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
|
5192 } |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5193 # endif |
| 7 | 5194 } |
| 5195 #endif | |
| 5196 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5197 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5198 #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
|
5199 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
|
5200 && (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
|
5201 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
|
5202 && ((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
|
5203 && !(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
|
5204 && 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
|
5205 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5206 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5207 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5208 && (syn_get_sub_char() != NUL || match_conc |
| 5209 || 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
|
5210 && 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
|
5211 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5212 /* 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
|
5213 * character. */ |
| 6947 | 5214 if (match_conc) |
| 5215 c = match_conc; | |
| 5216 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
|
5217 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5218 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5219 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5220 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5221 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5222 |
|
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
|
5223 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5224 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5225 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5226 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5227 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5228 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
|
5229 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5230 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5231 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5232 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5233 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5234 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5235 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5236 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5237 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5238 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5239 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5240 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5241 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5242 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5243 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5244 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5245 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5246 else if (n_skip == 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 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5249 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5250 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5251 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
|
5252 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
|
5253 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5254 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5255 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5256 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5257 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5258 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5259 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
|
5260 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5261 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5262 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5263 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
|
5264 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5265 } |
|
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
|
5266 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5267 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
|
5268 // 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
|
5269 ++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 |
|
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 #endif // FEAT_CONCEAL |
| 7 | 5272 } |
| 5273 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5274 #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
|
5275 /* 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
|
5276 * 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
|
5277 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
|
5278 && 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
|
5279 && 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
|
5280 && (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
|
5281 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5282 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5283 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
|
5284 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
|
5285 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5286 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5287 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
|
5288 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
|
5289 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
|
5290 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5291 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5292 |
| 7 | 5293 /* Don't override visual selection highlighting. */ |
| 5294 if (n_attr > 0 | |
| 5295 && draw_state == WL_LINE | |
| 674 | 5296 && !attr_pri) |
| 7 | 5297 char_attr = extra_attr; |
| 5298 | |
| 42 | 5299 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5300 /* XIM don't send preedit_start and preedit_end, but they send |
| 5301 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5302 * 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
|
5303 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
|
5304 && xic != NULL |
| 1850 | 5305 && lnum == wp->w_cursor.lnum |
| 7 | 5306 && (State & INSERT) |
| 5307 && !p_imdisable | |
| 5308 && im_is_preediting() | |
| 5309 && draw_state == WL_LINE) | |
| 5310 { | |
| 5311 colnr_T tcol; | |
| 5312 | |
| 5313 if (preedit_end_col == MAXCOL) | |
| 1850 | 5314 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5315 else |
| 5316 tcol = preedit_end_col; | |
| 5317 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5318 { | |
| 5319 if (feedback_old_attr < 0) | |
| 5320 { | |
| 5321 feedback_col = 0; | |
| 5322 feedback_old_attr = char_attr; | |
| 5323 } | |
| 5324 char_attr = im_get_feedback_attr(feedback_col); | |
| 5325 if (char_attr < 0) | |
| 5326 char_attr = feedback_old_attr; | |
| 5327 feedback_col++; | |
| 5328 } | |
| 5329 else if (feedback_old_attr >= 0) | |
| 5330 { | |
| 5331 char_attr = feedback_old_attr; | |
| 5332 feedback_old_attr = -1; | |
| 5333 feedback_col = 0; | |
| 5334 } | |
| 5335 } | |
| 5336 #endif | |
| 5337 /* | |
| 5338 * Handle the case where we are in column 0 but not on the first | |
| 5339 * character of the line and the user wants us to show us a | |
| 5340 * special character (via 'listchars' option "precedes:<char>". | |
| 5341 */ | |
| 5342 if (lcs_prec_todo != NUL | |
| 6276 | 5343 && wp->w_p_list |
| 7 | 5344 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5345 #ifdef FEAT_DIFF | |
| 5346 && filler_todo <= 0 | |
| 5347 #endif | |
| 5348 && draw_state > WL_NR | |
| 5349 && c != NUL) | |
| 5350 { | |
| 5351 c = lcs_prec; | |
| 5352 lcs_prec_todo = NUL; | |
| 3586 | 5353 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5354 { | |
| 5355 /* Double-width character being overwritten by the "precedes" | |
| 5356 * character, need to fill up half the character. */ | |
| 5357 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
|
5358 c_final = NUL; |
| 3586 | 5359 n_extra = 1; |
| 5360 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
|
5361 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5362 } |
| 7 | 5363 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
|
5364 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5365 { |
| 5366 mb_utf8 = TRUE; | |
| 714 | 5367 u8cc[0] = 0; |
| 819 | 5368 c = 0xc0; |
| 7 | 5369 } |
| 5370 else | |
| 5371 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 674 | 5372 if (!attr_pri) |
| 7 | 5373 { |
| 5374 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
|
5375 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5376 n_attr3 = 1; |
| 5377 } | |
| 5378 } | |
| 5379 | |
| 5380 /* | |
| 867 | 5381 * At end of the text line or just after the last character. |
| 7 | 5382 */ |
|
17438
967e2ee9b656
patch 8.1.1717: last char in menu popup window highlighted
Bram Moolenaar <Bram@vim.org>
parents:
17427
diff
changeset
|
5383 if ((c == NUL |
| 910 | 5384 #if defined(LINE_ATTR) |
| 867 | 5385 || did_line_attr == 1 |
| 5386 #endif | |
|
17438
967e2ee9b656
patch 8.1.1717: last char in menu popup window highlighted
Bram Moolenaar <Bram@vim.org>
parents:
17427
diff
changeset
|
5387 ) && eol_hl_off == 0) |
| 867 | 5388 { |
| 5389 #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
|
5390 // 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
|
5391 // 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
|
5392 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
|
5393 (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
|
5394 #endif |
|
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5395 // 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
|
5396 // 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
|
5397 // 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
|
5398 // needed when a '$' was displayed for 'list'. |
| 7 | 5399 if (lcs_eol == lcs_eol_one |
| 1850 | 5400 && ((area_attr != 0 && vcol == fromcol |
| 5401 && (VIsual_mode != Ctrl_V | |
| 5402 || lnum == VIsual.lnum | |
| 5403 || lnum == curwin->w_cursor.lnum) | |
| 5404 && c == NUL) | |
| 7 | 5405 #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
|
5406 // 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
|
5407 || (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
|
5408 # 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
|
5409 && !(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
|
5410 && !(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
|
5411 # endif |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5412 # 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
|
5413 && 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
|
5414 # endif |
| 910 | 5415 # if defined(LINE_ATTR) |
| 867 | 5416 && did_line_attr <= 1 |
| 5417 # endif | |
| 5418 ) | |
| 7 | 5419 #endif |
| 5420 )) | |
| 5421 { | |
| 5422 int n = 0; | |
| 5423 | |
| 5424 #ifdef FEAT_RIGHTLEFT | |
| 5425 if (wp->w_p_rl) | |
| 5426 { | |
| 5427 if (col < 0) | |
| 5428 n = 1; | |
| 5429 } | |
| 5430 else | |
| 5431 #endif | |
| 5432 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5433 if (col >= wp->w_width) |
| 7 | 5434 n = -1; |
| 5435 } | |
| 5436 if (n != 0) | |
| 5437 { | |
| 5438 /* At the window boundary, highlight the last character | |
| 5439 * instead (better than nothing). */ | |
| 5440 off += n; | |
| 5441 col += n; | |
| 5442 } | |
| 5443 else | |
| 5444 { | |
| 5445 /* Add a blank character to highlight. */ | |
| 5446 ScreenLines[off] = ' '; | |
| 5447 if (enc_utf8) | |
| 5448 ScreenLinesUC[off] = 0; | |
| 5449 } | |
| 5450 #ifdef FEAT_SEARCH_EXTRA | |
| 5451 if (area_attr == 0) | |
| 5452 { | |
|
17490
367ef00c6258
patch 8.1.1743: 'hlsearch' and match highlighting in the wrong place
Bram Moolenaar <Bram@vim.org>
parents:
17452
diff
changeset
|
5453 // 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
|
5454 // '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
|
5455 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
|
5456 (long)(ptr - line), &char_attr); |
| 7 | 5457 } |
| 5458 #endif | |
| 5459 ScreenAttrs[off] = char_attr; | |
| 5460 #ifdef FEAT_RIGHTLEFT | |
| 5461 if (wp->w_p_rl) | |
| 1437 | 5462 { |
| 7 | 5463 --col; |
| 1437 | 5464 --off; |
| 5465 } | |
| 7 | 5466 else |
| 5467 #endif | |
| 1437 | 5468 { |
| 7 | 5469 ++col; |
| 1437 | 5470 ++off; |
| 5471 } | |
| 743 | 5472 ++vcol; |
| 1437 | 5473 eol_hl_off = 1; |
| 743 | 5474 } |
| 867 | 5475 } |
| 5476 | |
| 5477 /* | |
| 5478 * At end of the text line. | |
| 5479 */ | |
| 5480 if (c == NUL) | |
| 5481 { | |
| 743 | 5482 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5483 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5484 if (wp->w_p_wrap) |
| 5485 v = wp->w_skipcol; | |
| 5486 else | |
| 5487 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5488 |
| 820 | 5489 /* check if line ends before left margin */ |
| 5490 if (vcol < v + col - win_col_off(wp)) | |
| 5491 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
|
5492 #ifdef FEAT_CONCEAL |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5493 // 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
|
5494 // edge for 'cursorcolumn'. |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5495 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5496 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5497 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5498 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5499 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5500 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
|
5501 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5502 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5503 && (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
|
5504 && (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
|
5505 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
|
5506 && lnum != wp->w_cursor.lnum) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5507 || draw_color_col |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5508 || win_attr != 0) |
| 743 | 5509 # ifdef FEAT_RIGHTLEFT |
| 5510 && !wp->w_p_rl | |
| 5511 # endif | |
| 5512 ) | |
| 5513 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5514 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5515 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5516 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5517 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5518 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5519 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5520 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5521 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
|
5522 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5523 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5524 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5525 while (col < wp->w_width) |
| 743 | 5526 { |
| 5527 ScreenLines[off] = ' '; | |
| 5528 if (enc_utf8) | |
| 5529 ScreenLinesUC[off] = 0; | |
| 5530 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5531 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5532 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
|
5533 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5534 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5535 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
|
5536 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
|
5537 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
|
5538 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5539 else |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5540 ScreenAttrs[off++] = win_attr; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5541 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5542 if (VCOL_HLC >= rightmost_vcol && win_attr == 0) |
| 743 | 5543 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5544 |
| 743 | 5545 ++vcol; |
| 5546 } | |
| 5547 } | |
| 5548 #endif | |
| 7 | 5549 |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5550 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
|
5551 (int)wp->w_width, screen_line_flags); |
| 7 | 5552 row++; |
| 5553 | |
| 5554 /* | |
| 5555 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5556 * updated (saves a call to plines() later). | |
| 5557 */ | |
| 5558 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5559 { | |
| 5560 curwin->w_cline_row = startrow; | |
| 5561 curwin->w_cline_height = row - startrow; | |
| 5562 #ifdef FEAT_FOLDING | |
| 5563 curwin->w_cline_folded = FALSE; | |
| 5564 #endif | |
| 5565 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5566 } | |
| 5567 | |
| 5568 break; | |
| 5569 } | |
| 5570 | |
|
16592
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5571 // 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
|
5572 // '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
|
5573 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
|
5574 && wp->w_p_list |
| 7 | 5575 && !wp->w_p_wrap |
| 5576 #ifdef FEAT_DIFF | |
| 5577 && filler_todo <= 0 | |
| 5578 #endif | |
| 5579 && ( | |
| 5580 #ifdef FEAT_RIGHTLEFT | |
| 5581 wp->w_p_rl ? col == 0 : | |
| 5582 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5583 col == wp->w_width - 1) |
| 7 | 5584 && (*ptr != NUL |
| 1555 | 5585 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5586 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5587 { | |
| 5588 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
|
5589 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5590 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
|
5591 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5592 { |
| 5593 mb_utf8 = TRUE; | |
| 714 | 5594 u8cc[0] = 0; |
| 819 | 5595 c = 0xc0; |
| 7 | 5596 } |
| 5597 else | |
| 5598 mb_utf8 = FALSE; | |
| 5599 } | |
| 5600 | |
| 743 | 5601 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5602 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5603 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5604 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
|
5605 |
| 743 | 5606 /* 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
|
5607 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5608 * 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
|
5609 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5610 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
|
5611 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
|
5612 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5613 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5614 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
|
5615 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5616 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5617 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
|
5618 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
|
5619 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5620 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
|
5621 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5622 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
|
5623 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
|
5624 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5625 } |
| 743 | 5626 #endif |
| 5627 | |
| 7 | 5628 /* |
| 5629 * Store character to be displayed. | |
| 5630 * Skip characters that are left of the screen for 'nowrap'. | |
| 5631 */ | |
| 5632 vcol_prev = vcol; | |
| 5633 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5634 { | |
| 5635 /* | |
| 5636 * Store the character. | |
| 5637 */ | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5638 #if defined(FEAT_RIGHTLEFT) |
| 7 | 5639 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) |
| 5640 { | |
| 5641 /* A double-wide character is: put first halve in left cell. */ | |
| 5642 --off; | |
| 5643 --col; | |
| 5644 } | |
| 5645 #endif | |
| 5646 ScreenLines[off] = c; | |
| 5647 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5648 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5649 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5650 ScreenLines[off] = 0x8e; |
| 7 | 5651 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5652 } |
| 7 | 5653 else if (enc_utf8) |
| 5654 { | |
| 5655 if (mb_utf8) | |
| 5656 { | |
| 1326 | 5657 int i; |
| 5658 | |
| 7 | 5659 ScreenLinesUC[off] = mb_c; |
| 819 | 5660 if ((c & 0xff) == 0) |
| 5661 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5662 for (i = 0; i < Screen_mco; ++i) |
| 5663 { | |
| 5664 ScreenLinesC[i][off] = u8cc[i]; | |
| 5665 if (u8cc[i] == 0) | |
| 5666 break; | |
| 5667 } | |
| 7 | 5668 } |
| 5669 else | |
| 5670 ScreenLinesUC[off] = 0; | |
| 5671 } | |
| 5672 if (multi_attr) | |
| 5673 { | |
| 5674 ScreenAttrs[off] = multi_attr; | |
| 5675 multi_attr = 0; | |
| 5676 } | |
| 5677 else | |
| 5678 ScreenAttrs[off] = char_attr; | |
| 5679 | |
| 5680 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5681 { | |
| 5682 /* Need to fill two screen columns. */ | |
| 5683 ++off; | |
| 5684 ++col; | |
| 5685 if (enc_utf8) | |
| 5686 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5687 ScreenLines[off] = 0; | |
| 5688 else | |
| 5689 /* DBCS: Put second byte in the second screen char. */ | |
| 5690 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5691 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5692 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5693 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5694 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5695 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5696 ++vcol; |
| 7 | 5697 /* When "tocol" is halfway a character, set it to the end of |
| 5698 * the character, otherwise highlighting won't stop. */ | |
| 5699 if (tocol == vcol) | |
| 5700 ++tocol; | |
| 5701 #ifdef FEAT_RIGHTLEFT | |
| 5702 if (wp->w_p_rl) | |
| 5703 { | |
| 5704 /* now it's time to backup one cell */ | |
| 5705 --off; | |
| 5706 --col; | |
| 5707 } | |
| 5708 #endif | |
| 5709 } | |
| 5710 #ifdef FEAT_RIGHTLEFT | |
| 5711 if (wp->w_p_rl) | |
| 5712 { | |
| 5713 --off; | |
| 5714 --col; | |
| 5715 } | |
| 5716 else | |
| 5717 #endif | |
| 5718 { | |
| 5719 ++off; | |
| 5720 ++col; | |
| 5721 } | |
| 5722 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5723 #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
|
5724 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
|
5725 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5726 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5727 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5728 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5729 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5730 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5731 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5732 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5733 * Special voodoo required if 'wrap' is on. |
|
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 * 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
|
5736 * 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
|
5737 * 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
|
5738 * 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
|
5739 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5740 * 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
|
5741 * 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
|
5742 * 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
|
5743 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5744 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5745 if (n_extra > 0) |
|
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 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5748 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5749 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5750 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5751 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5752 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5753 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5754 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5755 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5756 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5757 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5758 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5759 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5760 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5761 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5762 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5763 |
|
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 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
|
5766 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5767 /* Need to fill two screen columns. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5768 # ifdef FEAT_RIGHTLEFT |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5769 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5770 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5771 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5772 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5773 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5774 else |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5775 # endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5776 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5777 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5778 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5779 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5780 } |
|
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 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5783 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5784 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5785 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5786 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5787 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5788 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5789 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5790 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5791 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5792 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5793 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5794 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5795 else |
|
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 if (n_extra > 0) |
|
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 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5800 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5801 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5802 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5803 } |
|
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 #endif /* FEAT_CONCEAL */ |
| 7 | 5807 else |
| 5808 --n_skip; | |
| 5809 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5810 /* 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
|
5811 * column. */ |
| 1849 | 5812 if (draw_state > WL_NR |
| 7 | 5813 #ifdef FEAT_DIFF |
| 5814 && filler_todo <= 0 | |
| 5815 #endif | |
| 5816 ) | |
| 5817 ++vcol; | |
| 5818 | |
| 743 | 5819 #ifdef FEAT_SYN_HL |
| 5820 if (vcol_save_attr >= 0) | |
| 5821 char_attr = vcol_save_attr; | |
| 5822 #endif | |
| 5823 | |
| 7 | 5824 /* restore attributes after "predeces" in 'listchars' */ |
| 5825 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5826 char_attr = saved_attr3; | |
| 5827 | |
| 5828 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5829 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5830 char_attr = saved_attr2; | |
| 5831 | |
| 5832 /* | |
| 5833 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5834 * so far. If there is no more to display it is caught above. |
| 7 | 5835 */ |
| 5836 if (( | |
| 5837 #ifdef FEAT_RIGHTLEFT | |
| 5838 wp->w_p_rl ? (col < 0) : | |
| 5839 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5840 (col >= wp->w_width)) |
| 7 | 5841 && (*ptr != NUL |
| 5842 #ifdef FEAT_DIFF | |
| 5843 || filler_todo > 0 | |
| 5844 #endif | |
| 2724 | 5845 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5846 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5847 ) | |
| 5848 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5849 #ifdef FEAT_CONCEAL |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5850 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
|
5851 (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
|
5852 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5853 #else |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5854 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
|
5855 (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
|
5856 #endif |
| 7 | 5857 ++row; |
| 5858 ++screen_row; | |
| 5859 | |
| 5860 /* When not wrapping and finished diff lines, or when displayed | |
| 5861 * '$' and highlighting until last column, break here. */ | |
| 5862 if ((!wp->w_p_wrap | |
| 5863 #ifdef FEAT_DIFF | |
| 5864 && filler_todo <= 0 | |
| 5865 #endif | |
| 5866 ) || lcs_eol_one == -1) | |
| 5867 break; | |
| 5868 | |
| 5869 /* When the window is too narrow draw all "@" lines. */ | |
| 5870 if (draw_state != WL_LINE | |
| 5871 #ifdef FEAT_DIFF | |
| 5872 && filler_todo <= 0 | |
| 5873 #endif | |
| 5874 ) | |
| 5875 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
5876 win_draw_end(wp, '@', ' ', TRUE, row, wp->w_height, HLF_AT); |
| 7 | 5877 draw_vsep_win(wp, row); |
| 5878 row = endrow; | |
| 5879 } | |
| 5880 | |
| 5881 /* When line got too long for screen break here. */ | |
| 5882 if (row == endrow) | |
| 5883 { | |
| 5884 ++row; | |
| 5885 break; | |
| 5886 } | |
| 5887 | |
| 5888 if (screen_cur_row == screen_row - 1 | |
| 5889 #ifdef FEAT_DIFF | |
| 5890 && filler_todo <= 0 | |
| 5891 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5892 && wp->w_width == Columns) |
| 7 | 5893 { |
| 5894 /* Remember that the line wraps, used for modeless copy. */ | |
| 5895 LineWraps[screen_row - 1] = TRUE; | |
| 5896 | |
| 5897 /* | |
| 5898 * Special trick to make copy/paste of wrapped lines work with | |
| 5899 * xterm/screen: write an extra character beyond the end of | |
| 5900 * the line. This will work with all terminal types | |
| 5901 * (regardless of the xn,am settings). | |
| 5902 * Only do this on a fast tty. | |
| 5903 * Only do this if the cursor is on the current line | |
| 5904 * (something has been written in it). | |
| 5905 * Don't do this for the GUI. | |
| 5906 * Don't do this for double-width characters. | |
| 5907 * Don't do this for a window not at the right screen border. | |
| 5908 */ | |
| 5909 if (p_tf | |
| 5910 #ifdef FEAT_GUI | |
| 5911 && !gui.in_use | |
| 5912 #endif | |
| 5913 && !(has_mbyte | |
| 1378 | 5914 && ((*mb_off2cells)(LineOffset[screen_row], |
| 5915 LineOffset[screen_row] + screen_Columns) | |
| 5916 == 2 | |
| 7 | 5917 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 5918 + (int)Columns - 2, |
| 5919 LineOffset[screen_row] + screen_Columns) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5920 == 2))) |
| 7 | 5921 { |
| 5922 /* First make sure we are at the end of the screen line, | |
| 5923 * then output the same character again to let the | |
| 5924 * terminal know about the wrap. If the terminal doesn't | |
| 5925 * 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
|
5926 if (screen_cur_col != wp->w_width) |
| 7 | 5927 screen_char(LineOffset[screen_row - 1] |
| 5928 + (unsigned)Columns - 1, | |
| 5929 screen_row - 1, (int)(Columns - 1)); | |
| 5930 | |
| 5931 /* When there is a multi-byte character, just output a | |
| 5932 * space to keep it simple. */ | |
| 148 | 5933 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 5934 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 5935 out_char(' '); |
| 5936 else | |
| 5937 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 5938 + (Columns - 1)]); | |
| 5939 /* force a redraw of the first char on the next line */ | |
| 5940 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 5941 screen_start(); /* don't know where cursor is now */ | |
| 5942 } | |
| 5943 } | |
| 5944 | |
| 5945 col = 0; | |
| 5946 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5947 #ifdef FEAT_RIGHTLEFT | |
| 5948 if (wp->w_p_rl) | |
| 5949 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5950 col = wp->w_width - 1; /* col is not used if breaking! */ |
| 7 | 5951 off += col; |
| 5952 } | |
| 5953 #endif | |
| 5954 | |
| 5955 /* reset the drawing state for the start of a wrapped line */ | |
| 5956 draw_state = WL_START; | |
| 5957 saved_n_extra = n_extra; | |
| 5958 saved_p_extra = p_extra; | |
| 5959 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
|
5960 saved_c_final = c_final; |
| 7 | 5961 saved_char_attr = char_attr; |
| 5962 n_extra = 0; | |
| 5963 lcs_prec_todo = lcs_prec; | |
| 5964 #ifdef FEAT_LINEBREAK | |
| 5965 # ifdef FEAT_DIFF | |
| 5966 if (filler_todo <= 0) | |
| 5967 # endif | |
| 5968 need_showbreak = TRUE; | |
| 5969 #endif | |
| 5970 #ifdef FEAT_DIFF | |
| 5971 --filler_todo; | |
| 5972 /* When the filler lines are actually below the last line of the | |
| 5973 * file, don't draw the line itself, break here. */ | |
| 5974 if (filler_todo == 0 && wp->w_botfill) | |
| 5975 break; | |
| 5976 #endif | |
| 5977 } | |
| 5978 | |
| 5979 } /* for every character in the line */ | |
| 5980 | |
| 743 | 5981 #ifdef FEAT_SPELL |
| 386 | 5982 /* After an empty line check first word for capital. */ |
| 5983 if (*skipwhite(line) == NUL) | |
| 5984 { | |
| 5985 capcol_lnum = lnum + 1; | |
| 5986 cap_col = 0; | |
| 5987 } | |
| 5988 #endif | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
5989 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
5990 vim_free(text_props); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
5991 vim_free(text_prop_idxs); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
5992 #endif |
| 386 | 5993 |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5994 vim_free(p_extra_free); |
| 7 | 5995 return row; |
| 5996 } | |
| 5997 | |
| 714 | 5998 /* |
| 5999 * 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
|
6000 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 6001 */ |
| 6002 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6003 comp_char_differs(int off_from, int off_to) |
| 714 | 6004 { |
| 6005 int i; | |
| 6006 | |
| 6007 for (i = 0; i < Screen_mco; ++i) | |
| 6008 { | |
| 6009 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 6010 return TRUE; | |
| 6011 if (ScreenLinesC[i][off_from] == 0) | |
| 6012 break; | |
| 6013 } | |
| 6014 return FALSE; | |
| 6015 } | |
| 6016 | |
| 7 | 6017 /* |
| 6018 * Check whether the given character needs redrawing: | |
| 6019 * - the (first byte of the) character is different | |
| 6020 * - the attributes are different | |
| 6021 * - the character is multi-byte and the next byte is different | |
| 1616 | 6022 * - the character is two cells wide and the second cell differs. |
| 7 | 6023 */ |
| 6024 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6025 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 6026 { |
| 6027 if (cols > 0 | |
| 6028 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 6029 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6030 || (enc_dbcs != 0 | |
| 6031 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 6032 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 6033 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 6034 : (cols > 1 && ScreenLines[off_from + 1] | |
| 6035 != ScreenLines[off_to + 1]))) | |
| 6036 || (enc_utf8 | |
| 6037 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 6038 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 6039 && comp_char_differs(off_from, off_to)) |
| 3759 | 6040 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6041 && ScreenLines[off_from + 1] | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6042 != ScreenLines[off_to + 1]))))) |
| 7 | 6043 return TRUE; |
| 6044 return FALSE; | |
| 6045 } | |
| 6046 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6047 #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
|
6048 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6049 * 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
|
6050 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6051 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6052 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
|
6053 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6054 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
|
6055 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6056 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6057 |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6058 #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
|
6059 /* |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6060 * 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
|
6061 * 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
|
6062 */ |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6063 static int |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6064 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
|
6065 { |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6066 int off; |
|
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 if (!popup_visible) |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6069 return FALSE; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6070 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
|
6071 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
|
6072 } |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6073 #endif |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6074 |
| 7 | 6075 /* |
| 6076 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6077 * have actually changed. Handle insert/delete character. | |
| 6078 * "coloff" gives the first column on the screen for this line. | |
| 6079 * "endcol" gives the columns where valid characters are. | |
| 6080 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6081 * 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
|
6082 * "flags" can have bits: |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6083 * SLF_POPUP popup window |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6084 * SLF_RIGHTLEFT rightleft window: |
| 7 | 6085 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" |
| 6086 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6087 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6088 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6089 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6090 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6091 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6092 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
|
6093 int clear_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6094 int flags UNUSED) |
| 7 | 6095 { |
| 6096 unsigned off_from; | |
| 6097 unsigned off_to; | |
| 1378 | 6098 unsigned max_off_from; |
| 6099 unsigned max_off_to; | |
| 7 | 6100 int col = 0; |
| 6101 int hl; | |
| 6102 int force = FALSE; /* force update rest of the line */ | |
| 6103 int redraw_this /* bool: does character need redraw? */ | |
| 6104 #ifdef FEAT_GUI | |
| 6105 = TRUE /* For GUI when while-loop empty */ | |
| 6106 #endif | |
| 6107 ; | |
| 6108 int redraw_next; /* redraw_this for next character */ | |
| 6109 int clear_next = FALSE; | |
| 6110 int char_cells; /* 1: normal char */ | |
| 6111 /* 2: occupies two display cells */ | |
| 6112 # define CHAR_CELLS char_cells | |
| 6113 | |
| 3413 | 6114 /* Check for illegal row and col, just in case. */ |
| 6115 if (row >= Rows) | |
| 6116 row = Rows - 1; | |
| 6117 if (endcol > Columns) | |
| 6118 endcol = Columns; | |
| 6119 | |
| 7 | 6120 # ifdef FEAT_CLIPBOARD |
| 6121 clip_may_clear_selection(row, row); | |
| 6122 # endif | |
| 6123 | |
| 6124 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6125 off_to = LineOffset[row] + coloff; | |
| 1378 | 6126 max_off_from = off_from + screen_Columns; |
| 6127 max_off_to = LineOffset[row] + screen_Columns; | |
| 7 | 6128 |
| 6129 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6130 if (flags & SLF_RIGHTLEFT) |
| 7 | 6131 { |
| 6132 /* Clear rest first, because it's left of the text. */ | |
| 6133 if (clear_width > 0) | |
| 6134 { | |
| 6135 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6136 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6137 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6138 { |
| 6139 ++off_to; | |
| 6140 ++col; | |
| 6141 } | |
| 6142 if (col <= endcol) | |
| 6143 screen_fill(row, row + 1, col + coloff, | |
| 6144 endcol + coloff + 1, ' ', ' ', 0); | |
| 6145 } | |
| 6146 col = endcol + 1; | |
| 6147 off_to = LineOffset[row] + col + coloff; | |
| 6148 off_from += col; | |
| 6149 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6150 } | |
| 6151 #endif /* FEAT_RIGHTLEFT */ | |
| 6152 | |
| 6153 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6154 | |
| 6155 while (col < endcol) | |
| 6156 { | |
| 6157 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6158 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6159 else |
| 6160 char_cells = 1; | |
| 6161 | |
| 6162 redraw_this = redraw_next; | |
| 6163 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6164 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6165 | |
| 6166 #ifdef FEAT_GUI | |
| 6167 /* If the next character was bold, then redraw the current character to | |
| 6168 * remove any pixels that might have spilt over into us. This only | |
| 6169 * happens in the GUI. | |
| 6170 */ | |
| 6171 if (redraw_next && gui.in_use) | |
| 6172 { | |
| 6173 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6174 if (hl > HL_ALL) |
| 6175 hl = syn_attr2attr(hl); | |
| 6176 if (hl & HL_BOLD) | |
| 7 | 6177 redraw_this = TRUE; |
| 6178 } | |
| 6179 #endif | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
6180 #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
|
6181 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
|
6182 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
|
6183 #endif |
| 7 | 6184 if (redraw_this) |
| 6185 { | |
| 6186 /* | |
| 6187 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6188 * Attributes for characters are stored at the position where the | |
| 6189 * cursor is when writing the highlighting code. The | |
| 6190 * start-highlighting code must be written with the cursor on the | |
| 6191 * first highlighted character. The stop-highlighting code must | |
| 6192 * be written with the cursor just after the last highlighted | |
| 6193 * character. | |
|
15034
6e4e0d43b20b
patch 8.1.0528: various typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
14877
diff
changeset
|
6194 * Overwriting a character doesn't remove its highlighting. Need |
| 7 | 6195 * to clear the rest of the line, and force redrawing it |
| 6196 * completely. | |
| 6197 */ | |
| 6198 if ( p_wiv | |
| 6199 && !force | |
| 6200 #ifdef FEAT_GUI | |
| 6201 && !gui.in_use | |
| 6202 #endif | |
| 6203 && ScreenAttrs[off_to] != 0 | |
| 6204 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6205 { | |
| 6206 /* | |
| 6207 * Need to remove highlighting attributes here. | |
| 6208 */ | |
| 6209 windgoto(row, col + coloff); | |
| 6210 out_str(T_CE); /* clear rest of this screen line */ | |
| 6211 screen_start(); /* don't know where cursor is now */ | |
| 6212 force = TRUE; /* force redraw of rest of the line */ | |
| 6213 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6214 | |
| 6215 /* | |
| 6216 * If the previous character was highlighted, need to stop | |
| 6217 * highlighting at this character. | |
| 6218 */ | |
| 6219 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6220 { | |
| 6221 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6222 term_windgoto(row, col + coloff); | |
| 6223 screen_stop_highlight(); | |
| 6224 } | |
| 6225 else | |
| 6226 screen_attr = 0; /* highlighting has stopped */ | |
| 6227 } | |
| 6228 if (enc_dbcs != 0) | |
| 6229 { | |
| 6230 /* Check if overwriting a double-byte with a single-byte or | |
| 6231 * the other way around requires another character to be | |
| 6232 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6233 * ScreenLinesUC[] is sufficient. */ | |
| 6234 if (char_cells == 1 | |
| 6235 && col + 1 < endcol | |
| 1378 | 6236 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6237 { |
| 6238 /* Writing a single-cell character over a double-cell | |
| 6239 * character: need to redraw the next cell. */ | |
| 6240 ScreenLines[off_to + 1] = 0; | |
| 6241 redraw_next = TRUE; | |
| 6242 } | |
| 6243 else if (char_cells == 2 | |
| 6244 && col + 2 < endcol | |
| 1378 | 6245 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6246 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6247 { |
| 6248 /* Writing the second half of a double-cell character over | |
| 6249 * a double-cell character: need to redraw the second | |
| 6250 * cell. */ | |
| 6251 ScreenLines[off_to + 2] = 0; | |
| 6252 redraw_next = TRUE; | |
| 6253 } | |
| 6254 | |
| 6255 if (enc_dbcs == DBCS_JPNU) | |
| 6256 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6257 } | |
| 6258 /* When writing a single-width character over a double-width | |
| 6259 * character and at the end of the redrawn text, need to clear out | |
| 6260 * the right halve of the old character. | |
| 6261 * Also required when writing the right halve of a double-width | |
| 6262 * char over the left halve of an existing one. */ | |
| 6263 if (has_mbyte && col + char_cells == endcol | |
| 6264 && ((char_cells == 1 | |
| 1378 | 6265 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6266 || (char_cells == 2 |
| 1378 | 6267 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6268 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6269 clear_next = TRUE; |
| 6270 | |
| 6271 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6272 if (enc_utf8) | |
| 6273 { | |
| 6274 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6275 if (ScreenLinesUC[off_from] != 0) | |
| 6276 { | |
| 714 | 6277 int i; |
| 6278 | |
| 6279 for (i = 0; i < Screen_mco; ++i) | |
| 6280 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6281 } |
| 6282 } | |
| 6283 if (char_cells == 2) | |
| 6284 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6285 | |
| 6286 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6287 /* The bold trick makes a single column of pixels appear in the |
| 6288 * next character. When a bold character is removed, the next | |
| 7 | 6289 * character should be redrawn too. This happens for our own GUI |
| 6290 * and for some xterms. */ | |
| 6291 if ( | |
| 6292 # ifdef FEAT_GUI | |
| 6293 gui.in_use | |
| 6294 # endif | |
| 6295 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6296 || | |
| 6297 # endif | |
| 6298 # ifdef UNIX | |
| 6299 term_is_xterm | |
| 6300 # endif | |
| 6301 ) | |
| 6302 { | |
| 6303 hl = ScreenAttrs[off_to]; | |
| 743 | 6304 if (hl > HL_ALL) |
| 6305 hl = syn_attr2attr(hl); | |
| 6306 if (hl & HL_BOLD) | |
| 7 | 6307 redraw_next = TRUE; |
| 6308 } | |
| 6309 #endif | |
| 6310 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6311 |
| 819 | 6312 /* For simplicity set the attributes of second half of a |
| 6313 * double-wide character equal to the first half. */ | |
| 6314 if (char_cells == 2) | |
| 6315 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6316 | |
| 7 | 6317 if (enc_dbcs != 0 && char_cells == 2) |
| 6318 screen_char_2(off_to, row, col + coloff); | |
| 6319 else | |
| 6320 screen_char(off_to, row, col + coloff); | |
| 6321 } | |
| 6322 else if ( p_wiv | |
| 6323 #ifdef FEAT_GUI | |
| 6324 && !gui.in_use | |
| 6325 #endif | |
| 6326 && col + coloff > 0) | |
| 6327 { | |
| 6328 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6329 { | |
| 6330 /* | |
| 6331 * Don't output stop-highlight when moving the cursor, it will | |
| 6332 * stop the highlighting when it should continue. | |
| 6333 */ | |
| 6334 screen_attr = 0; | |
| 6335 } | |
| 6336 else if (screen_attr != 0) | |
| 6337 screen_stop_highlight(); | |
| 6338 } | |
| 6339 | |
| 6340 off_to += CHAR_CELLS; | |
| 6341 off_from += CHAR_CELLS; | |
| 6342 col += CHAR_CELLS; | |
| 6343 } | |
| 6344 | |
| 6345 if (clear_next) | |
| 6346 { | |
| 6347 /* Clear the second half of a double-wide character of which the left | |
| 6348 * half was overwritten with a single-wide character. */ | |
| 6349 ScreenLines[off_to] = ' '; | |
| 6350 if (enc_utf8) | |
| 6351 ScreenLinesUC[off_to] = 0; | |
| 6352 screen_char(off_to, row, col + coloff); | |
| 6353 } | |
| 6354 | |
| 6355 if (clear_width > 0 | |
| 6356 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6357 && !(flags & SLF_RIGHTLEFT) |
| 7 | 6358 #endif |
| 6359 ) | |
| 6360 { | |
| 6361 #ifdef FEAT_GUI | |
| 6362 int startCol = col; | |
| 6363 #endif | |
| 6364 | |
| 6365 /* blank out the rest of the line */ | |
| 6366 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6367 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6368 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6369 { |
| 6370 ++off_to; | |
| 6371 ++col; | |
| 6372 } | |
| 6373 if (col < clear_width) | |
| 6374 { | |
| 6375 #ifdef FEAT_GUI | |
| 6376 /* | |
| 6377 * In the GUI, clearing the rest of the line may leave pixels | |
| 6378 * behind if the first character cleared was bold. Some bold | |
| 6379 * fonts spill over the left. In this case we redraw the previous | |
| 6380 * character too. If we didn't skip any blanks above, then we | |
| 6381 * only redraw if the character wasn't already redrawn anyway. | |
| 6382 */ | |
| 996 | 6383 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6384 { |
| 6385 hl = ScreenAttrs[off_to]; | |
| 6386 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6387 { |
| 6388 int prev_cells = 1; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6389 |
| 996 | 6390 if (enc_utf8) |
| 6391 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6392 * that its width is 2. */ | |
| 6393 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6394 else if (enc_dbcs != 0) | |
| 6395 { | |
| 6396 /* find previous character by counting from first | |
| 6397 * column and get its width. */ | |
| 6398 unsigned off = LineOffset[row]; | |
| 1378 | 6399 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6400 |
| 6401 while (off < off_to) | |
| 6402 { | |
| 1378 | 6403 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6404 off += prev_cells; |
| 6405 } | |
| 6406 } | |
| 6407 | |
| 6408 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6409 screen_char_2(off_to - prev_cells, row, | |
| 6410 col + coloff - prev_cells); | |
| 6411 else | |
| 6412 screen_char(off_to - prev_cells, row, | |
| 6413 col + coloff - prev_cells); | |
| 6414 } | |
| 7 | 6415 } |
| 6416 #endif | |
| 6417 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6418 ' ', ' ', 0); | |
| 6419 off_to += clear_width - col; | |
| 6420 col = clear_width; | |
| 6421 } | |
| 6422 } | |
| 6423 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6424 if (clear_width > 0 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6425 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6426 && !(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
|
6427 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6428 ) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6429 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6430 // 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
|
6431 // 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
|
6432 if (coloff + col < Columns) |
| 7 | 6433 { |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6434 #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
|
6435 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
|
6436 #endif |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6437 { |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6438 int c; |
|
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 c = fillchar_vsep(&hl); |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6441 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
|
6442 || (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
|
6443 != (c >= 0x80 ? c : 0)) |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6444 || ScreenAttrs[off_to] != hl) |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6445 { |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6446 ScreenLines[off_to] = c; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6447 ScreenAttrs[off_to] = hl; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6448 if (enc_utf8) |
| 7 | 6449 { |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6450 if (c >= 0x80) |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6451 { |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6452 ScreenLinesUC[off_to] = c; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6453 ScreenLinesC[0][off_to] = 0; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6454 } |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6455 else |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6456 ScreenLinesUC[off_to] = 0; |
| 7 | 6457 } |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6458 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
|
6459 } |
| 7 | 6460 } |
| 6461 } | |
| 6462 else | |
| 6463 LineWraps[row] = FALSE; | |
| 6464 } | |
| 6465 } | |
| 6466 | |
| 474 | 6467 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6468 /* |
| 474 | 6469 * Mirror text "str" for right-left displaying. |
| 6470 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6471 */ |
| 474 | 6472 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6473 rl_mirror(char_u *str) |
| 7 | 6474 { |
| 6475 char_u *p1, *p2; | |
| 6476 int t; | |
| 6477 | |
| 6478 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6479 { | |
| 6480 t = *p1; | |
| 6481 *p1 = *p2; | |
| 6482 *p2 = t; | |
| 6483 } | |
| 6484 } | |
| 6485 #endif | |
| 6486 | |
| 6487 /* | |
| 6488 * mark all status lines for redraw; used after first :cd | |
| 6489 */ | |
| 6490 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6491 status_redraw_all(void) |
| 7 | 6492 { |
| 6493 win_T *wp; | |
| 6494 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6495 FOR_ALL_WINDOWS(wp) |
| 7 | 6496 if (wp->w_status_height) |
| 6497 { | |
| 6498 wp->w_redr_status = TRUE; | |
| 6499 redraw_later(VALID); | |
| 6500 } | |
| 6501 } | |
| 6502 | |
| 6503 /* | |
| 6504 * mark all status lines of the current buffer for redraw | |
| 6505 */ | |
| 6506 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6507 status_redraw_curbuf(void) |
| 7 | 6508 { |
| 6509 win_T *wp; | |
| 6510 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6511 FOR_ALL_WINDOWS(wp) |
| 7 | 6512 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6513 { | |
| 6514 wp->w_redr_status = TRUE; | |
| 6515 redraw_later(VALID); | |
| 6516 } | |
| 6517 } | |
| 6518 | |
| 6519 /* | |
| 6520 * Redraw all status lines that need to be redrawn. | |
| 6521 */ | |
| 6522 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6523 redraw_statuslines(void) |
| 7 | 6524 { |
| 6525 win_T *wp; | |
| 6526 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6527 FOR_ALL_WINDOWS(wp) |
| 7 | 6528 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
|
6529 win_redr_status(wp, FALSE); |
| 673 | 6530 if (redraw_tabline) |
| 677 | 6531 draw_tabline(); |
| 7 | 6532 } |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6533 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6534 #if defined(FEAT_WILDMENU) || defined(PROTO) |
| 7 | 6535 /* |
| 6536 * Redraw all status lines at the bottom of frame "frp". | |
| 6537 */ | |
| 6538 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6539 win_redraw_last_status(frame_T *frp) |
| 7 | 6540 { |
| 6541 if (frp->fr_layout == FR_LEAF) | |
| 6542 frp->fr_win->w_redr_status = TRUE; | |
| 6543 else if (frp->fr_layout == FR_ROW) | |
| 6544 { | |
|
15227
95678f27a704
patch 8.1.0623: iterating through window frames is repeated
Bram Moolenaar <Bram@vim.org>
parents:
15138
diff
changeset
|
6545 FOR_ALL_FRAMES(frp, frp->fr_child) |
| 7 | 6546 win_redraw_last_status(frp); |
| 6547 } | |
| 6548 else /* frp->fr_layout == FR_COL */ | |
| 6549 { | |
| 6550 frp = frp->fr_child; | |
| 6551 while (frp->fr_next != NULL) | |
| 6552 frp = frp->fr_next; | |
| 6553 win_redraw_last_status(frp); | |
| 6554 } | |
| 6555 } | |
| 6556 #endif | |
| 6557 | |
| 6558 /* | |
| 6559 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6560 */ | |
| 6561 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6562 draw_vsep_win(win_T *wp, int row) |
| 7 | 6563 { |
| 6564 int hl; | |
| 6565 int c; | |
| 6566 | |
| 6567 if (wp->w_vsep_width) | |
| 6568 { | |
| 6569 /* draw the vertical separator right of this window */ | |
| 6570 c = fillchar_vsep(&hl); | |
| 6571 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6572 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6573 c, ' ', hl); | |
| 6574 } | |
| 6575 } | |
| 6576 | |
| 6577 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6578 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6579 |
| 6580 /* | |
| 1378 | 6581 * Get the length of an item as it will be shown in the status line. |
| 7 | 6582 */ |
| 6583 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6584 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6585 { |
| 6586 int len = 0; | |
| 6587 | |
| 6588 #ifdef FEAT_MENU | |
| 6589 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6590 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6591 | |
| 6592 /* Check for menu separators - replace with '|'. */ | |
| 6593 if (emenu && menu_is_separator(s)) | |
| 6594 return 1; | |
| 6595 #endif | |
| 6596 | |
| 6597 while (*s != NUL) | |
| 6598 { | |
| 1685 | 6599 s += skip_status_match_char(xp, s); |
| 42 | 6600 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6601 MB_PTR_ADV(s); |
| 7 | 6602 } |
| 6603 | |
| 6604 return len; | |
| 6605 } | |
| 6606 | |
| 6607 /* | |
| 1685 | 6608 * Return the number of characters that should be skipped in a status match. |
| 277 | 6609 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6610 */ | |
| 6611 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6612 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6613 { |
| 1685 | 6614 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6615 #ifdef FEAT_MENU |
| 6616 || ((xp->xp_context == EXPAND_MENUS | |
| 6617 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6618 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6619 #endif | |
| 1685 | 6620 ) |
| 6621 { | |
| 6622 #ifndef BACKSLASH_IN_FILENAME | |
| 6623 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6624 return 2; | |
| 6625 #endif | |
| 6626 return 1; | |
| 6627 } | |
| 6628 return 0; | |
| 277 | 6629 } |
| 6630 | |
| 6631 /* | |
| 7 | 6632 * Show wildchar matches in the status line. |
| 6633 * Show at least the "match" item. | |
| 6634 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6635 * | |
| 6636 * If inversion is possible we use it. Else '=' characters are used. | |
| 6637 */ | |
| 6638 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6639 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6640 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6641 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6642 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6643 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6644 int showtail) |
| 7 | 6645 { |
| 6646 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6647 int row; | |
| 6648 char_u *buf; | |
| 6649 int len; | |
| 1378 | 6650 int clen; /* length in screen cells */ |
| 7 | 6651 int fillchar; |
| 6652 int attr; | |
| 6653 int i; | |
| 6654 int highlight = TRUE; | |
| 6655 char_u *selstart = NULL; | |
| 6656 int selstart_col = 0; | |
| 6657 char_u *selend = NULL; | |
| 6658 static int first_match = 0; | |
| 6659 int add_left = FALSE; | |
| 6660 char_u *s; | |
| 6661 #ifdef FEAT_MENU | |
| 6662 int emenu; | |
| 6663 #endif | |
| 6664 int l; | |
| 6665 | |
| 6666 if (matches == NULL) /* interrupted completion? */ | |
| 6667 return; | |
| 6668 | |
| 39 | 6669 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
|
6670 buf = alloc(Columns * MB_MAXBYTES + 1); |
| 39 | 6671 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
|
6672 buf = alloc(Columns + 1); |
| 7 | 6673 if (buf == NULL) |
| 6674 return; | |
| 6675 | |
| 6676 if (match == -1) /* don't show match but original text */ | |
| 6677 { | |
| 6678 match = 0; | |
| 6679 highlight = FALSE; | |
| 6680 } | |
| 6681 /* count 1 for the ending ">" */ | |
| 6682 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6683 if (match == 0) | |
| 6684 first_match = 0; | |
| 6685 else if (match < first_match) | |
| 6686 { | |
| 6687 /* jumping left, as far as we can go */ | |
| 6688 first_match = match; | |
| 6689 add_left = TRUE; | |
| 6690 } | |
| 6691 else | |
| 6692 { | |
| 6693 /* check if match fits on the screen */ | |
| 6694 for (i = first_match; i < match; ++i) | |
| 6695 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6696 if (first_match > 0) | |
| 6697 clen += 2; | |
| 6698 /* jumping right, put match at the left */ | |
| 6699 if ((long)clen > Columns) | |
| 6700 { | |
| 6701 first_match = match; | |
| 6702 /* if showing the last match, we can add some on the left */ | |
| 6703 clen = 2; | |
| 6704 for (i = match; i < num_matches; ++i) | |
| 6705 { | |
| 6706 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6707 if ((long)clen >= Columns) | |
| 6708 break; | |
| 6709 } | |
| 6710 if (i == num_matches) | |
| 6711 add_left = TRUE; | |
| 6712 } | |
| 6713 } | |
| 6714 if (add_left) | |
| 6715 while (first_match > 0) | |
| 6716 { | |
| 6717 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6718 if ((long)clen >= Columns) | |
| 6719 break; | |
| 6720 --first_match; | |
| 6721 } | |
| 6722 | |
|
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
|
6723 fillchar = fillchar_status(&attr, curwin); |
| 7 | 6724 |
| 6725 if (first_match == 0) | |
| 6726 { | |
| 6727 *buf = NUL; | |
| 6728 len = 0; | |
| 6729 } | |
| 6730 else | |
| 6731 { | |
| 6732 STRCPY(buf, "< "); | |
| 6733 len = 2; | |
| 6734 } | |
| 6735 clen = len; | |
| 6736 | |
| 6737 i = first_match; | |
| 6738 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6739 { | |
| 6740 if (i == match) | |
| 6741 { | |
| 6742 selstart = buf + len; | |
| 6743 selstart_col = clen; | |
| 6744 } | |
| 6745 | |
| 6746 s = L_MATCH(i); | |
| 6747 /* Check for menu separators - replace with '|' */ | |
| 6748 #ifdef FEAT_MENU | |
| 6749 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6750 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6751 if (emenu && menu_is_separator(s)) | |
| 6752 { | |
| 6753 STRCPY(buf + len, transchar('|')); | |
| 6754 l = (int)STRLEN(buf + len); | |
| 6755 len += l; | |
| 6756 clen += l; | |
| 6757 } | |
| 6758 else | |
| 6759 #endif | |
| 6760 for ( ; *s != NUL; ++s) | |
| 6761 { | |
| 1685 | 6762 s += skip_status_match_char(xp, s); |
| 7 | 6763 clen += ptr2cells(s); |
| 474 | 6764 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6765 { |
| 6766 STRNCPY(buf + len, s, l); | |
| 6767 s += l - 1; | |
| 6768 len += l; | |
| 6769 } | |
| 6770 else | |
| 6771 { | |
| 6772 STRCPY(buf + len, transchar_byte(*s)); | |
| 6773 len += (int)STRLEN(buf + len); | |
| 6774 } | |
| 6775 } | |
| 6776 if (i == match) | |
| 6777 selend = buf + len; | |
| 6778 | |
| 6779 *(buf + len++) = ' '; | |
| 6780 *(buf + len++) = ' '; | |
| 6781 clen += 2; | |
| 6782 if (++i == num_matches) | |
| 6783 break; | |
| 6784 } | |
| 6785 | |
| 6786 if (i != num_matches) | |
| 6787 { | |
| 6788 *(buf + len++) = '>'; | |
| 6789 ++clen; | |
| 6790 } | |
| 6791 | |
| 6792 buf[len] = NUL; | |
| 6793 | |
| 6794 row = cmdline_row - 1; | |
| 6795 if (row >= 0) | |
| 6796 { | |
| 6797 if (wild_menu_showing == 0) | |
| 6798 { | |
| 6799 if (msg_scrolled > 0) | |
| 6800 { | |
| 6801 /* Put the wildmenu just above the command line. If there is | |
| 6802 * no room, scroll the screen one line up. */ | |
| 6803 if (cmdline_row == Rows - 1) | |
| 6804 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
6805 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 6806 ++msg_scrolled; |
| 6807 } | |
| 6808 else | |
| 6809 { | |
| 6810 ++cmdline_row; | |
| 6811 ++row; | |
| 6812 } | |
| 6813 wild_menu_showing = WM_SCROLLED; | |
| 6814 } | |
| 6815 else | |
| 6816 { | |
| 6817 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6818 * Set 'winminheight' to zero to avoid that the window is | |
| 6819 * resized. */ | |
| 6820 if (lastwin->w_status_height == 0) | |
| 6821 { | |
| 6822 save_p_ls = p_ls; | |
| 6823 save_p_wmh = p_wmh; | |
| 6824 p_ls = 2; | |
| 6825 p_wmh = 0; | |
| 6826 last_status(FALSE); | |
| 6827 } | |
| 6828 wild_menu_showing = WM_SHOWN; | |
| 6829 } | |
| 6830 } | |
| 6831 | |
| 6832 screen_puts(buf, row, 0, attr); | |
| 6833 if (selstart != NULL && highlight) | |
| 6834 { | |
| 6835 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
6836 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 6837 } |
| 6838 | |
| 6839 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6840 } | |
| 6841 | |
| 6842 win_redraw_last_status(topframe); | |
| 6843 vim_free(buf); | |
| 6844 } | |
| 6845 #endif | |
| 6846 | |
| 6847 /* | |
| 6848 * Redraw the status line of window wp. | |
| 6849 * | |
| 6850 * 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
|
6851 * 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
|
6852 * displayed. |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6853 */ |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6854 static void |
|
14191
ec39f281e3e8
patch 8.1.0113: compiler warning for unused variable
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
6855 win_redr_status(win_T *wp, int ignore_pum UNUSED) |
| 7 | 6856 { |
| 6857 int row; | |
| 6858 char_u *p; | |
| 6859 int len; | |
| 6860 int fillchar; | |
| 6861 int attr; | |
| 6862 int this_ru_col; | |
| 1910 | 6863 static int busy = FALSE; |
| 6864 | |
| 6865 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6866 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6867 if (busy) | |
| 6868 return; | |
| 6869 busy = TRUE; | |
| 7 | 6870 |
| 6871 wp->w_redr_status = FALSE; | |
| 6872 if (wp->w_status_height == 0) | |
| 6873 { | |
| 6874 /* no status line, can only be last window */ | |
| 6875 redraw_cmdline = TRUE; | |
| 6876 } | |
| 540 | 6877 else if (!redrawing() |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6878 // 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
|
6879 // drawn over it, unless it will be redrawn later |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17771
diff
changeset
|
6880 || (!ignore_pum && pum_visible())) |
| 7 | 6881 { |
| 6882 /* Don't redraw right now, do it later. */ | |
| 6883 wp->w_redr_status = TRUE; | |
| 6884 } | |
| 6885 #ifdef FEAT_STL_OPT | |
| 40 | 6886 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 6887 { |
| 6888 /* redraw custom status line */ | |
| 1983 | 6889 redraw_custom_statusline(wp); |
| 7 | 6890 } |
| 6891 #endif | |
| 6892 else | |
| 6893 { | |
|
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
|
6894 fillchar = fillchar_status(&attr, wp); |
| 7 | 6895 |
| 685 | 6896 get_trans_bufname(wp->w_buffer); |
| 7 | 6897 p = NameBuff; |
| 6898 len = (int)STRLEN(p); | |
| 6899 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
6900 if (bt_help(wp->w_buffer) |
| 7 | 6901 #ifdef FEAT_QUICKFIX |
| 6902 || wp->w_p_pvw | |
| 6903 #endif | |
| 6904 || bufIsChanged(wp->w_buffer) | |
| 6905 || wp->w_buffer->b_p_ro) | |
| 6906 *(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
|
6907 if (bt_help(wp->w_buffer)) |
| 7 | 6908 { |
| 809 | 6909 STRCPY(p + len, _("[Help]")); |
| 7 | 6910 len += (int)STRLEN(p + len); |
| 6911 } | |
| 6912 #ifdef FEAT_QUICKFIX | |
| 6913 if (wp->w_p_pvw) | |
| 6914 { | |
| 6915 STRCPY(p + len, _("[Preview]")); | |
| 6916 len += (int)STRLEN(p + len); | |
| 6917 } | |
| 6918 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6919 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
|
6920 #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
|
6921 && !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
|
6922 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6923 ) |
| 7 | 6924 { |
| 6925 STRCPY(p + len, "[+]"); | |
| 6926 len += 3; | |
| 6927 } | |
| 6928 if (wp->w_buffer->b_p_ro) | |
| 6929 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
6930 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
|
6931 len += (int)STRLEN(p + len); |
| 7 | 6932 } |
| 6933 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6934 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
|
6935 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
|
6936 this_ru_col = (wp->w_width + 1) / 2; |
| 7 | 6937 if (this_ru_col <= 1) |
| 6938 { | |
| 6939 p = (char_u *)"<"; /* No room for file name! */ | |
| 6940 len = 1; | |
| 6941 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6942 else if (has_mbyte) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6943 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6944 int clen = 0, i; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6945 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6946 /* Count total number of display cells. */ |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6947 clen = mb_string2cells(p, -1); |
|
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 /* Find first character that will fit. |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6950 * 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
|
6951 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
|
6952 i += (*mb_ptr2len)(p + i)) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6953 clen -= (*mb_ptr2cells)(p + i); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6954 len = clen; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6955 if (i > 0) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6956 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6957 p = p + i - 1; |
| 7 | 6958 *p = '<'; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6959 ++len; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6960 } |
|
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 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6963 else if (len > this_ru_col - 1) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6964 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6965 p += len - (this_ru_col - 1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6966 *p = '<'; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6967 len = this_ru_col - 1; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6968 } |
| 7 | 6969 |
| 6970 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
|
6971 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
|
6972 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
|
6973 this_ru_col + wp->w_wincol, fillchar, fillchar, attr); |
| 7 | 6974 |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6975 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 6976 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 6977 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
|
6978 - 1 + wp->w_wincol), attr); |
| 7 | 6979 |
| 6980 #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
|
6981 win_redr_ruler(wp, TRUE, ignore_pum); |
| 7 | 6982 #endif |
| 6983 } | |
| 6984 | |
| 6985 /* | |
| 6986 * May need to draw the character below the vertical separator. | |
| 6987 */ | |
| 6988 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 6989 { | |
| 6990 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
|
6991 fillchar = fillchar_status(&attr, wp); |
| 7 | 6992 else |
| 6993 fillchar = fillchar_vsep(&attr); | |
| 6994 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 6995 attr); | |
| 6996 } | |
| 1910 | 6997 busy = FALSE; |
| 7 | 6998 } |
| 6999 | |
| 680 | 7000 #ifdef FEAT_STL_OPT |
| 7001 /* | |
| 7002 * Redraw the status line according to 'statusline' and take care of any | |
| 7003 * errors encountered. | |
| 7004 */ | |
| 7005 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7006 redraw_custom_statusline(win_T *wp) |
| 680 | 7007 { |
| 1983 | 7008 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7009 int saved_did_emsg = did_emsg; |
| 1983 | 7010 |
| 7011 /* When called recursively return. This can happen when the statusline | |
| 7012 * contains an expression that triggers a redraw. */ | |
| 7013 if (entered) | |
| 7014 return; | |
| 7015 entered = TRUE; | |
| 680 | 7016 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7017 did_emsg = FALSE; |
| 680 | 7018 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7019 if (did_emsg) |
| 1983 | 7020 { |
| 7021 /* When there is an error disable the statusline, otherwise the | |
| 7022 * display is messed up with errors and a redraw triggers the problem | |
| 7023 * again and again. */ | |
| 680 | 7024 set_string_option_direct((char_u *)"statusline", -1, |
| 7025 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7026 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7027 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7028 did_emsg |= saved_did_emsg; |
| 1983 | 7029 entered = FALSE; |
| 680 | 7030 } |
| 7031 #endif | |
| 7032 | |
| 7 | 7033 /* |
| 7034 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7035 * line of the window right of it. If not, then it's a vertical separator. | |
| 7036 * Only call if (wp->w_vsep_width != 0). | |
| 7037 */ | |
| 7038 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7039 stl_connected(win_T *wp) |
| 7 | 7040 { |
| 7041 frame_T *fr; | |
| 7042 | |
| 7043 fr = wp->w_frame; | |
| 7044 while (fr->fr_parent != NULL) | |
| 7045 { | |
| 7046 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7047 { | |
| 7048 if (fr->fr_next != NULL) | |
| 7049 break; | |
| 7050 } | |
| 7051 else | |
| 7052 { | |
| 7053 if (fr->fr_next != NULL) | |
| 7054 return TRUE; | |
| 7055 } | |
| 7056 fr = fr->fr_parent; | |
| 7057 } | |
| 7058 return FALSE; | |
| 7059 } | |
| 7060 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7061 |
| 7 | 7062 /* |
| 7063 * Get the value to show for the language mappings, active 'keymap'. | |
| 7064 */ | |
| 7065 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7066 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7067 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7068 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
|
7069 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
|
7070 int len) /* length of buffer */ |
| 7 | 7071 { |
| 7072 char_u *p; | |
| 7073 | |
| 7074 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7075 return FALSE; | |
| 7076 | |
| 7077 { | |
| 7078 #ifdef FEAT_EVAL | |
| 7079 buf_T *old_curbuf = curbuf; | |
| 7080 win_T *old_curwin = curwin; | |
| 7081 char_u *s; | |
| 7082 | |
| 7083 curbuf = wp->w_buffer; | |
| 7084 curwin = wp; | |
| 7085 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7086 ++emsg_skip; | |
| 714 | 7087 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7088 --emsg_skip; |
| 7089 curbuf = old_curbuf; | |
| 7090 curwin = old_curwin; | |
| 7091 if (p == NULL || *p == NUL) | |
| 7092 #endif | |
| 7093 { | |
| 7094 #ifdef FEAT_KEYMAP | |
| 7095 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7096 p = wp->w_buffer->b_p_keymap; | |
| 7097 else | |
| 7098 #endif | |
| 7099 p = (char_u *)"lang"; | |
| 7100 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7101 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7102 buf[0] = NUL; |
| 7103 #ifdef FEAT_EVAL | |
| 7104 vim_free(s); | |
| 7105 #endif | |
| 7106 } | |
| 7107 return buf[0] != NUL; | |
| 7108 } | |
| 7109 | |
| 7110 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7111 /* | |
| 677 | 7112 * Redraw the status line or ruler of window "wp". |
| 7113 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7114 */ |
| 7115 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7116 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7117 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7118 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7119 { |
| 5539 | 7120 static int entered = FALSE; |
| 7 | 7121 int attr; |
| 7122 int curattr; | |
| 7123 int row; | |
| 7124 int col = 0; | |
| 7125 int maxwidth; | |
| 7126 int width; | |
| 7127 int n; | |
| 7128 int len; | |
| 7129 int fillchar; | |
| 7130 char_u buf[MAXPATHL]; | |
| 1983 | 7131 char_u *stl; |
| 7 | 7132 char_u *p; |
| 681 | 7133 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7134 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7135 int use_sandbox = FALSE; |
| 2693 | 7136 win_T *ewp; |
| 7137 int p_crb_save; | |
| 7 | 7138 |
| 5539 | 7139 /* There is a tiny chance that this gets called recursively: When |
| 7140 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7141 * Avoid trouble by not allowing recursion. */ | |
| 7142 if (entered) | |
| 7143 return; | |
| 7144 entered = TRUE; | |
| 7145 | |
| 7 | 7146 /* setup environment for the task at hand */ |
| 677 | 7147 if (wp == NULL) |
| 7148 { | |
| 7149 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7150 stl = p_tal; |
| 677 | 7151 row = 0; |
| 707 | 7152 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7153 attr = HL_ATTR(HLF_TPF); |
| 677 | 7154 maxwidth = Columns; |
| 7155 # ifdef FEAT_EVAL | |
| 681 | 7156 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7157 # endif |
| 7158 } | |
| 40 | 7159 else |
| 677 | 7160 { |
| 7161 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
|
7162 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
|
7163 maxwidth = wp->w_width; |
| 677 | 7164 |
| 7165 if (draw_ruler) | |
| 7166 { | |
| 1983 | 7167 stl = p_ruf; |
| 677 | 7168 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7169 if (*stl == '%') |
| 7170 { | |
| 7171 if (*++stl == '-') | |
| 7172 stl++; | |
| 7173 if (atoi((char *)stl)) | |
| 7174 while (VIM_ISDIGIT(*stl)) | |
| 7175 stl++; | |
| 7176 if (*stl++ != '(') | |
| 7177 stl = p_ruf; | |
| 677 | 7178 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7179 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
|
7180 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
|
7181 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
|
7182 maxwidth = wp->w_width - col; |
| 677 | 7183 if (!wp->w_status_height) |
| 7184 { | |
| 7185 row = Rows - 1; | |
| 7186 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7187 fillchar = ' '; | |
| 7188 attr = 0; | |
| 7189 } | |
| 7190 | |
| 7191 # ifdef FEAT_EVAL | |
| 681 | 7192 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7193 # endif |
| 7194 } | |
| 7195 else | |
| 7196 { | |
| 7197 if (*wp->w_p_stl != NUL) | |
| 1983 | 7198 stl = wp->w_p_stl; |
| 677 | 7199 else |
| 1983 | 7200 stl = p_stl; |
| 677 | 7201 # ifdef FEAT_EVAL |
| 681 | 7202 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7203 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7204 # endif |
| 7205 } | |
| 7206 | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7207 col += wp->w_wincol; |
| 677 | 7208 } |
| 7209 | |
| 7 | 7210 if (maxwidth <= 0) |
| 5539 | 7211 goto theend; |
| 677 | 7212 |
| 2693 | 7213 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7214 * the cursor away and back. */ | |
| 7215 ewp = wp == NULL ? curwin : wp; | |
| 7216 p_crb_save = ewp->w_p_crb; | |
| 7217 ewp->w_p_crb = FALSE; | |
| 7218 | |
| 1983 | 7219 /* Make a copy, because the statusline may include a function call that |
| 7220 * might change the option value and free the memory. */ | |
| 7221 stl = vim_strsave(stl); | |
| 2693 | 7222 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7223 stl, use_sandbox, |
| 681 | 7224 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7225 vim_free(stl); |
| 2693 | 7226 ewp->w_p_crb = p_crb_save; |
| 2661 | 7227 |
| 7228 /* Make all characters printable. */ | |
| 7229 p = transstr(buf); | |
| 7230 if (p != NULL) | |
| 7231 { | |
| 7232 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7233 vim_free(p); | |
| 7234 } | |
| 7235 | |
| 7236 /* fill up with "fillchar" */ | |
| 835 | 7237 len = (int)STRLEN(buf); |
| 1883 | 7238 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7239 { |
| 7240 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7241 ++width; | |
| 7242 } | |
| 7243 buf[len] = NUL; | |
| 7244 | |
| 681 | 7245 /* |
| 7246 * Draw each snippet with the specified highlighting. | |
| 7247 */ | |
| 7 | 7248 curattr = attr; |
| 7249 p = buf; | |
| 681 | 7250 for (n = 0; hltab[n].start != NULL; n++) |
| 7251 { | |
| 7252 len = (int)(hltab[n].start - p); | |
| 7 | 7253 screen_puts_len(p, len, row, col, curattr); |
| 7254 col += vim_strnsize(p, len); | |
| 681 | 7255 p = hltab[n].start; |
| 7256 | |
| 7257 if (hltab[n].userhl == 0) | |
| 7 | 7258 curattr = attr; |
| 681 | 7259 else if (hltab[n].userhl < 0) |
| 7260 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
|
7261 #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
|
7262 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
|
7263 && 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
|
7264 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
|
7265 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
|
7266 && 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
|
7267 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
|
7268 #endif |
| 680 | 7269 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7270 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7271 else |
| 681 | 7272 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7273 } |
| 7274 screen_puts(p, row, col, curattr); | |
| 681 | 7275 |
| 7276 if (wp == NULL) | |
| 7277 { | |
| 7278 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7279 col = 0; | |
| 7280 len = 0; | |
| 7281 p = buf; | |
| 7282 fillchar = 0; | |
| 7283 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7284 { | |
| 7285 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7286 while (col < len) | |
| 7287 TabPageIdxs[col++] = fillchar; | |
| 7288 p = tabtab[n].start; | |
| 7289 fillchar = tabtab[n].userhl; | |
| 7290 } | |
| 7291 while (col < Columns) | |
| 7292 TabPageIdxs[col++] = fillchar; | |
| 7293 } | |
| 5539 | 7294 |
| 7295 theend: | |
| 7296 entered = FALSE; | |
| 7 | 7297 } |
| 7298 | |
| 7299 #endif /* FEAT_STL_OPT */ | |
| 7300 | |
| 7301 /* | |
| 7302 * Output a single character directly to the screen and update ScreenLines. | |
| 7303 */ | |
| 7304 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7305 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7306 { |
| 3549 | 7307 char_u buf[MB_MAXBYTES + 1]; |
| 7308 | |
| 7309 if (has_mbyte) | |
| 7310 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7311 else | |
| 7312 { | |
| 7313 buf[0] = c; | |
| 7314 buf[1] = NUL; | |
| 7315 } | |
| 7 | 7316 screen_puts(buf, row, col, attr); |
| 7317 } | |
| 7318 | |
| 7319 /* | |
| 7320 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7321 * Also return its attribute in *attrp; | |
| 7322 */ | |
| 7323 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7324 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7325 { |
| 7326 unsigned off; | |
| 7327 | |
| 7328 /* safety check */ | |
| 7329 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7330 { | |
| 7331 off = LineOffset[row] + col; | |
| 7332 *attrp = ScreenAttrs[off]; | |
| 7333 bytes[0] = ScreenLines[off]; | |
| 7334 bytes[1] = NUL; | |
| 7335 | |
| 7336 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7337 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7338 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7339 { | |
| 7340 bytes[0] = ScreenLines[off]; | |
| 7341 bytes[1] = ScreenLines2[off]; | |
| 7342 bytes[2] = NUL; | |
| 7343 } | |
| 7344 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7345 { | |
| 7346 bytes[1] = ScreenLines[off + 1]; | |
| 7347 bytes[2] = NUL; | |
| 7348 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7349 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7350 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7351 |
| 714 | 7352 /* |
| 7353 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7354 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7355 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7356 */ |
| 7357 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7358 screen_comp_differs(int off, int *u8cc) |
| 714 | 7359 { |
| 7360 int i; | |
| 7361 | |
| 7362 for (i = 0; i < Screen_mco; ++i) | |
| 7363 { | |
| 7364 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7365 return TRUE; | |
| 7366 if (u8cc[i] == 0) | |
| 7367 break; | |
| 7368 } | |
| 7369 return FALSE; | |
| 7370 } | |
| 7371 | |
| 7 | 7372 /* |
| 7373 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7374 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7375 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7376 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7377 */ | |
| 7378 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7379 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7380 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7381 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7382 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7383 int attr) |
| 7 | 7384 { |
| 7385 screen_puts_len(text, -1, row, col, attr); | |
| 7386 } | |
| 7387 | |
| 7388 /* | |
| 7389 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7390 * a NUL. | |
| 7391 */ | |
| 7392 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7393 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7394 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7395 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7396 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7397 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7398 int attr) |
| 7 | 7399 { |
| 7400 unsigned off; | |
| 7401 char_u *ptr = text; | |
| 5923 | 7402 int len = textlen; |
| 7 | 7403 int c; |
| 1378 | 7404 unsigned max_off; |
| 7 | 7405 int mbyte_blen = 1; |
| 7406 int mbyte_cells = 1; | |
| 7407 int u8c = 0; | |
| 714 | 7408 int u8cc[MAX_MCO]; |
| 7 | 7409 int clear_next_cell = FALSE; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7410 #ifdef FEAT_ARABIC |
| 7 | 7411 int prev_c = 0; /* previous Arabic character */ |
| 714 | 7412 int pc, nc, nc1; |
| 7413 int pcc[MAX_MCO]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7414 #endif |
| 1843 | 7415 int force_redraw_this; |
| 7416 int force_redraw_next = FALSE; | |
| 7417 int need_redraw; | |
| 7 | 7418 |
|
16914
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7419 // 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
|
7420 // #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
|
7421 if (ScreenLines == NULL |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7422 || row >= screen_Rows || row < 0 |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7423 || col >= screen_Columns || col < 0) |
| 7 | 7424 return; |
| 1843 | 7425 off = LineOffset[row] + col; |
| 7 | 7426 |
| 1668 | 7427 /* When drawing over the right halve of a double-wide char clear out the |
| 7428 * left halve. Only needed in a terminal. */ | |
| 1685 | 7429 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
|
7430 #ifdef FEAT_GUI |
| 1668 | 7431 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7432 #endif |
| 1668 | 7433 && mb_fix_col(col, row) != col) |
| 1843 | 7434 { |
| 7435 ScreenLines[off - 1] = ' '; | |
| 7436 ScreenAttrs[off - 1] = 0; | |
| 7437 if (enc_utf8) | |
| 7438 { | |
| 7439 ScreenLinesUC[off - 1] = 0; | |
| 7440 ScreenLinesC[0][off - 1] = 0; | |
| 7441 } | |
| 7442 /* redraw the previous cell, make it empty */ | |
| 7443 screen_char(off - 1, row, col - 1); | |
| 7444 /* force the cell at "col" to be redrawn */ | |
| 7445 force_redraw_next = TRUE; | |
| 7446 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7447 |
| 1378 | 7448 max_off = LineOffset[row] + screen_Columns; |
| 1340 | 7449 while (col < screen_Columns |
| 7450 && (len < 0 || (int)(ptr - text) < len) | |
| 7451 && *ptr != NUL) | |
| 7 | 7452 { |
| 7453 c = *ptr; | |
| 7454 /* check if this is the first byte of a multibyte */ | |
| 7455 if (has_mbyte) | |
| 7456 { | |
| 7457 if (enc_utf8 && len > 0) | |
| 474 | 7458 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7459 else |
| 474 | 7460 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7461 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7462 mbyte_cells = 1; | |
| 7463 else if (enc_dbcs != 0) | |
| 7464 mbyte_cells = mbyte_blen; | |
| 7465 else /* enc_utf8 */ | |
| 7466 { | |
| 7467 if (len >= 0) | |
| 714 | 7468 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7469 (int)((text + len) - ptr)); |
| 7470 else | |
| 714 | 7471 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7472 mbyte_cells = utf_char2cells(u8c); |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7473 #ifdef FEAT_ARABIC |
| 7 | 7474 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) |
| 7475 { | |
| 7476 /* Do Arabic shaping. */ | |
| 7477 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7478 { | |
| 7479 /* Past end of string to be displayed. */ | |
| 7480 nc = NUL; | |
| 7481 nc1 = NUL; | |
| 7482 } | |
| 7483 else | |
| 714 | 7484 { |
| 1994 | 7485 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7486 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7487 nc1 = pcc[0]; |
| 7488 } | |
| 7 | 7489 pc = prev_c; |
| 7490 prev_c = u8c; | |
| 714 | 7491 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7492 } |
| 7493 else | |
| 7494 prev_c = u8c; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7495 #endif |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7496 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7497 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7498 /* 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
|
7499 * 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
|
7500 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7501 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7502 } |
| 7 | 7503 } |
| 7504 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7505 |
| 1843 | 7506 force_redraw_this = force_redraw_next; |
| 7507 force_redraw_next = FALSE; | |
| 7508 | |
| 7509 need_redraw = ScreenLines[off] != c | |
| 7 | 7510 || (mbyte_cells == 2 |
| 7511 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7512 || (enc_dbcs == DBCS_JPNU | |
| 7513 && c == 0x8e | |
| 7514 && ScreenLines2[off] != ptr[1]) | |
| 7515 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7516 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7517 (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
|
7518 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7519 && screen_comp_differs(off, u8cc)))) |
| 7 | 7520 || ScreenAttrs[off] != attr |
| 1843 | 7521 || exmode_active; |
| 7522 | |
|
16998
2ec0f953ec3f
patch 8.1.1499: ruler not updated after popup window was removed
Bram Moolenaar <Bram@vim.org>
parents:
16994
diff
changeset
|
7523 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
|
7524 #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
|
7525 && !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
|
7526 #endif |
|
2ec0f953ec3f
patch 8.1.1499: ruler not updated after popup window was removed
Bram Moolenaar <Bram@vim.org>
parents:
16994
diff
changeset
|
7527 ) |
| 7 | 7528 { |
| 7529 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7530 /* The bold trick makes a single row of pixels appear in the next | |
| 7531 * character. When a bold character is removed, the next | |
| 7532 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7533 * and for some xterms. */ |
| 7534 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7535 # ifdef FEAT_GUI |
| 7536 gui.in_use | |
| 7537 # endif | |
| 7538 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7539 || | |
| 7540 # endif | |
| 7541 # ifdef UNIX | |
| 7542 term_is_xterm | |
| 7543 # endif | |
| 1843 | 7544 )) |
| 7545 { | |
| 7546 int n = ScreenAttrs[off]; | |
| 7547 | |
| 7548 if (n > HL_ALL) | |
| 7549 n = syn_attr2attr(n); | |
| 7550 if (n & HL_BOLD) | |
| 7551 force_redraw_next = TRUE; | |
| 7 | 7552 } |
| 7553 #endif | |
| 7554 /* When at the end of the text and overwriting a two-cell | |
| 7555 * character with a one-cell character, need to clear the next | |
| 7556 * cell. Also when overwriting the left halve of a two-cell char | |
| 7557 * with the right halve of a two-cell char. Do this only once | |
| 7558 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7559 if (clear_next_cell) | |
| 7560 clear_next_cell = FALSE; | |
| 7561 else if (has_mbyte | |
| 7562 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7563 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7564 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7565 || (mbyte_cells == 2 |
| 1378 | 7566 && (*mb_off2cells)(off, max_off) == 1 |
| 7567 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7568 clear_next_cell = TRUE; |
| 7569 | |
| 7570 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7571 * it confuses mb_off2cells(). */ | |
| 7572 if (enc_dbcs | |
| 1378 | 7573 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7574 || (mbyte_cells == 2 |
| 1378 | 7575 && (*mb_off2cells)(off, max_off) == 1 |
| 7576 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7577 ScreenLines[off + mbyte_blen] = 0; |
| 7578 ScreenLines[off] = c; | |
| 7579 ScreenAttrs[off] = attr; | |
| 7580 if (enc_utf8) | |
| 7581 { | |
| 714 | 7582 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7583 ScreenLinesUC[off] = 0; |
| 7584 else | |
| 7585 { | |
| 714 | 7586 int i; |
| 7587 | |
| 7 | 7588 ScreenLinesUC[off] = u8c; |
| 714 | 7589 for (i = 0; i < Screen_mco; ++i) |
| 7590 { | |
| 7591 ScreenLinesC[i][off] = u8cc[i]; | |
| 7592 if (u8cc[i] == 0) | |
| 7593 break; | |
| 7594 } | |
| 7 | 7595 } |
| 7596 if (mbyte_cells == 2) | |
| 7597 { | |
| 7598 ScreenLines[off + 1] = 0; | |
| 7599 ScreenAttrs[off + 1] = attr; | |
| 7600 } | |
| 7601 screen_char(off, row, col); | |
| 7602 } | |
| 7603 else if (mbyte_cells == 2) | |
| 7604 { | |
| 7605 ScreenLines[off + 1] = ptr[1]; | |
| 7606 ScreenAttrs[off + 1] = attr; | |
| 7607 screen_char_2(off, row, col); | |
| 7608 } | |
| 7609 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7610 { | |
| 7611 ScreenLines2[off] = ptr[1]; | |
| 7612 screen_char(off, row, col); | |
| 7613 } | |
| 7614 else | |
| 7615 screen_char(off, row, col); | |
| 7616 } | |
| 7617 if (has_mbyte) | |
| 7618 { | |
| 7619 off += mbyte_cells; | |
| 7620 col += mbyte_cells; | |
| 7621 ptr += mbyte_blen; | |
| 7622 if (clear_next_cell) | |
| 5923 | 7623 { |
| 7624 /* This only happens at the end, display one space next. */ | |
| 7 | 7625 ptr = (char_u *)" "; |
| 5923 | 7626 len = -1; |
| 7627 } | |
| 7 | 7628 } |
| 7629 else | |
| 7630 { | |
| 7631 ++off; | |
| 7632 ++col; | |
| 7633 ++ptr; | |
| 7634 } | |
| 7635 } | |
| 1843 | 7636 |
| 7637 /* If we detected the next character needs to be redrawn, but the text | |
| 7638 * doesn't extend up to there, update the character here. */ | |
| 7639 if (force_redraw_next && col < screen_Columns) | |
| 7640 { | |
| 7641 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7642 screen_char_2(off, row, col); | |
| 7643 else | |
| 7644 screen_char(off, row, col); | |
| 7645 } | |
| 7 | 7646 } |
| 7647 | |
| 7648 #ifdef FEAT_SEARCH_EXTRA | |
| 7649 /* | |
| 1326 | 7650 * Prepare for 'hlsearch' highlighting. |
| 7 | 7651 */ |
| 7652 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7653 start_search_hl(void) |
| 7 | 7654 { |
| 7655 if (p_hls && !no_hlsearch) | |
| 7656 { | |
| 7657 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
|
7658 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7659 # ifdef FEAT_RELTIME |
| 7660 /* Set the time limit to 'redrawtime'. */ | |
| 7661 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7662 # endif | |
| 7 | 7663 } |
| 7664 } | |
| 7665 | |
| 7666 /* | |
| 1326 | 7667 * Clean up for 'hlsearch' highlighting. |
| 7 | 7668 */ |
| 7669 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7670 end_search_hl(void) |
| 7 | 7671 { |
| 7672 if (search_hl.rm.regprog != NULL) | |
| 7673 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7674 vim_regfree(search_hl.rm.regprog); |
| 7 | 7675 search_hl.rm.regprog = NULL; |
| 7676 } | |
| 7677 } | |
| 5985 | 7678 #endif |
| 5979 | 7679 |
| 7 | 7680 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7681 screen_start_highlight(int attr) |
| 7 | 7682 { |
| 7683 attrentry_T *aep = NULL; | |
| 7684 | |
| 7685 screen_attr = attr; | |
| 7686 if (full_screen | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15850
diff
changeset
|
7687 #ifdef MSWIN |
| 7 | 7688 && termcap_active |
| 7689 #endif | |
| 7690 ) | |
| 7691 { | |
| 7692 #ifdef FEAT_GUI | |
| 7693 if (gui.in_use) | |
| 7694 { | |
| 7695 char buf[20]; | |
| 7696 | |
| 681 | 7697 /* The GUI handles this internally. */ |
| 7698 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 7699 OUT_STR(buf); |
| 7700 } | |
| 7701 else | |
| 7702 #endif | |
| 7703 { | |
| 7704 if (attr > HL_ALL) /* special HL attr. */ | |
| 7705 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7706 if (IS_CTERM) |
| 7 | 7707 aep = syn_cterm_attr2entry(attr); |
| 7708 else | |
| 7709 aep = syn_term_attr2entry(attr); | |
| 7710 if (aep == NULL) /* did ":syntax clear" */ | |
| 7711 attr = 0; | |
| 7712 else | |
| 7713 attr = aep->ae_attr; | |
| 7714 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
7715 if ((attr & HL_BOLD) && *T_MD != NUL) /* bold */ |
| 7 | 7716 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
|
7717 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
|
7718 #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
|
7719 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
|
7720 ? 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
|
7721 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7722 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7723 t_colors > 1 && aep->ae_u.cterm.fg_color)) |
| 681 | 7724 /* If the Normal FG color has BOLD attribute and the new HL |
| 7725 * has a FG color defined, clear BOLD. */ | |
| 7726 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
|
7727 if ((attr & HL_STANDOUT) && *T_SO != NUL) /* standout */ |
| 7 | 7728 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
|
7729 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
|
7730 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
|
7731 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
|
7732 || ((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
|
7733 && *T_US != NUL) |
| 7 | 7734 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
|
7735 if ((attr & HL_ITALIC) && *T_CZH != NUL) /* italic */ |
| 7 | 7736 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
|
7737 if ((attr & HL_INVERSE) && *T_MR != NUL) /* inverse (reverse) */ |
| 7 | 7738 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
|
7739 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
|
7740 out_str(T_STS); |
| 7 | 7741 |
| 7742 /* | |
| 7743 * Output the color or start string after bold etc., in case the | |
| 7744 * bold etc. override the color setting. | |
| 7745 */ | |
| 7746 if (aep != NULL) | |
| 7747 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7748 #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
|
7749 /* 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
|
7750 * 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
|
7751 * 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
|
7752 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
|
7753 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7754 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
|
7755 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
|
7756 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7757 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7758 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7759 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
|
7760 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7761 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
|
7762 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
|
7763 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7764 #ifdef FEAT_TERMGUICOLORS |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7765 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
|
7766 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7767 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
|
7768 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 7769 } |
| 7770 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7771 #endif |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7772 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
|
7773 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7774 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
|
7775 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
|
7776 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7777 |
|
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
|
7778 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
|
7779 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7780 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
|
7781 out_str(aep->ae_u.term.start); |
| 7 | 7782 } |
| 7783 } | |
| 7784 } | |
| 7785 } | |
| 7786 } | |
| 7787 | |
| 7788 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7789 screen_stop_highlight(void) |
| 7 | 7790 { |
| 7791 int do_ME = FALSE; /* output T_ME code */ | |
| 7792 | |
| 7793 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
|
7794 #ifdef MSWIN |
| 7 | 7795 && termcap_active |
| 7796 #endif | |
| 7797 ) | |
| 7798 { | |
| 7799 #ifdef FEAT_GUI | |
| 7800 if (gui.in_use) | |
| 7801 { | |
| 7802 char buf[20]; | |
| 7803 | |
| 7804 /* use internal GUI code */ | |
| 7805 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 7806 OUT_STR(buf); | |
| 7807 } | |
| 7808 else | |
| 7809 #endif | |
| 7810 { | |
| 7811 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 7812 { | |
| 7813 attrentry_T *aep; | |
| 7814 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7815 if (IS_CTERM) |
| 7 | 7816 { |
| 7817 /* | |
| 7818 * Assume that t_me restores the original colors! | |
| 7819 */ | |
| 7820 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
|
7821 if (aep != NULL && (( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7822 #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
|
7823 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
|
7824 ? 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
|
7825 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7826 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7827 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
|
7828 #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
|
7829 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
|
7830 ? 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
|
7831 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7832 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
7833 aep->ae_u.cterm.bg_color))) |
| 7 | 7834 do_ME = TRUE; |
| 7835 } | |
| 7836 else | |
| 7837 { | |
| 7838 aep = syn_term_attr2entry(screen_attr); | |
| 7839 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 7840 { | |
| 7841 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 7842 do_ME = TRUE; | |
| 7843 else | |
| 7844 out_str(aep->ae_u.term.stop); | |
| 7845 } | |
| 7846 } | |
| 7847 if (aep == NULL) /* did ":syntax clear" */ | |
| 7848 screen_attr = 0; | |
| 7849 else | |
| 7850 screen_attr = aep->ae_attr; | |
| 7851 } | |
| 7852 | |
| 7853 /* | |
| 7854 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 7855 * same sequence several times. | |
| 7856 */ | |
| 7857 if (screen_attr & HL_STANDOUT) | |
| 7858 { | |
| 7859 if (STRCMP(T_SE, T_ME) == 0) | |
| 7860 do_ME = TRUE; | |
| 7861 else | |
| 7862 out_str(T_SE); | |
| 7863 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
7864 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
|
7865 { |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
7866 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
|
7867 do_ME = TRUE; |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
7868 else |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
7869 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
|
7870 } |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
7871 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
|
7872 || ((screen_attr & HL_UNDERCURL) && *T_UCE == NUL)) |
| 7 | 7873 { |
| 7874 if (STRCMP(T_UE, T_ME) == 0) | |
| 7875 do_ME = TRUE; | |
| 7876 else | |
| 7877 out_str(T_UE); | |
| 7878 } | |
| 7879 if (screen_attr & HL_ITALIC) | |
| 7880 { | |
| 7881 if (STRCMP(T_CZR, T_ME) == 0) | |
| 7882 do_ME = TRUE; | |
| 7883 else | |
| 7884 out_str(T_CZR); | |
| 7885 } | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7886 if (screen_attr & HL_STRIKETHROUGH) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7887 { |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7888 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
|
7889 do_ME = TRUE; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7890 else |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7891 out_str(T_STE); |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
7892 } |
| 7 | 7893 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) |
| 7894 out_str(T_ME); | |
| 7895 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7896 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7897 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7898 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7899 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
|
7900 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
|
7901 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
|
7902 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
|
7903 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7904 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7905 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7906 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7907 if (t_colors > 1) |
|
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 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7910 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7911 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
|
7912 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7913 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
|
7914 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7915 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7916 } |
| 7 | 7917 } |
| 7918 } | |
| 7919 } | |
| 7920 screen_attr = 0; | |
| 7921 } | |
| 7922 | |
| 7923 /* | |
| 7924 * Reset the colors for a cterm. Used when leaving Vim. | |
| 7925 * The machine specific code may override this again. | |
| 7926 */ | |
| 7927 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7928 reset_cterm_colors(void) |
| 7 | 7929 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7930 if (IS_CTERM) |
| 7 | 7931 { |
| 7932 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7933 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7934 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
|
7935 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7936 : (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
|
7937 #else |
| 7 | 7938 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
|
7939 #endif |
| 7 | 7940 { |
| 7941 out_str(T_OP); | |
| 7942 screen_attr = -1; | |
| 7943 } | |
| 7944 if (cterm_normal_fg_bold) | |
| 7945 { | |
| 7946 out_str(T_ME); | |
| 7947 screen_attr = -1; | |
| 7948 } | |
| 7949 } | |
| 7950 } | |
| 7951 | |
| 7952 /* | |
| 7953 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 7954 * using the attributes from ScreenAttrs["off"]. | |
| 7955 */ | |
| 7956 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7957 screen_char(unsigned off, int row, int col) |
| 7 | 7958 { |
| 7959 int attr; | |
| 7960 | |
| 7961 /* Check for illegal values, just in case (could happen just after | |
| 7962 * resizing). */ | |
| 7963 if (row >= screen_Rows || col >= screen_Columns) | |
| 7964 return; | |
| 7965 | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7966 // 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
|
7967 // 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
|
7968 if (pum_under_menu(row, col) |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17771
diff
changeset
|
7969 #ifdef FEAT_TEXT_PROP |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7970 && screen_zindex <= POPUPMENU_ZINDEX |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17771
diff
changeset
|
7971 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7972 ) |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
7973 return; |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
7974 #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
|
7975 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
|
7976 return; |
|
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 |
| 6602 | 7979 /* Outputting a character in the last cell on the screen may scroll the |
| 7980 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 7981 * mark the character invalid (update it when scrolled up). */ | |
| 7982 if (*T_XN == NUL | |
| 7983 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 7984 #ifdef FEAT_RIGHTLEFT |
| 7985 /* account for first command-line character in rightleft mode */ | |
| 7986 && !cmdmsg_rl | |
| 7987 #endif | |
| 7988 ) | |
| 7989 { | |
| 7990 ScreenAttrs[off] = (sattr_T)-1; | |
| 7991 return; | |
| 7992 } | |
| 7993 | |
| 7994 /* | |
| 7995 * Stop highlighting first, so it's easier to move the cursor. | |
| 7996 */ | |
| 7997 if (screen_char_attr != 0) | |
| 7998 attr = screen_char_attr; | |
| 7999 else | |
| 8000 attr = ScreenAttrs[off]; | |
| 8001 if (screen_attr != attr) | |
| 8002 screen_stop_highlight(); | |
| 8003 | |
| 8004 windgoto(row, col); | |
| 8005 | |
| 8006 if (screen_attr != attr) | |
| 8007 screen_start_highlight(attr); | |
| 8008 | |
| 8009 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8010 { | |
| 8011 char_u buf[MB_MAXBYTES + 1]; | |
| 8012 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8013 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
|
8014 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8015 if (*p_ambw == 'd' |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8016 #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
|
8017 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8018 #endif |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8019 ) |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8020 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8021 /* 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
|
8022 * 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
|
8023 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
|
8024 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
|
8025 } |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8026 /* 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
|
8027 * character */ |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8028 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
|
8029 } |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8030 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8031 ++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
|
8032 |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8033 /* 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
|
8034 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
|
8035 out_str(buf); |
| 7 | 8036 } |
| 8037 else | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8038 { |
| 7 | 8039 out_flush_check(); |
| 8040 out_char(ScreenLines[off]); | |
| 8041 /* double-byte character in single-width cell */ | |
| 8042 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8043 out_char(ScreenLines2[off]); | |
| 8044 } | |
| 8045 | |
| 8046 screen_cur_col++; | |
| 8047 } | |
| 8048 | |
| 8049 /* | |
| 8050 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8051 * on the screen at position 'row' and 'col'. | |
| 8052 * The attributes of the first byte is used for all. This is required to | |
| 8053 * output the two bytes of a double-byte character with nothing in between. | |
| 8054 */ | |
| 8055 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8056 screen_char_2(unsigned off, int row, int col) |
| 7 | 8057 { |
| 8058 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8059 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8060 return; | |
| 8061 | |
| 8062 /* Outputting the last character on the screen may scrollup the screen. | |
| 8063 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8064 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8065 { | |
| 8066 ScreenAttrs[off] = (sattr_T)-1; | |
| 8067 return; | |
| 8068 } | |
| 8069 | |
| 8070 /* Output the first byte normally (positions the cursor), then write the | |
| 8071 * second byte directly. */ | |
| 8072 screen_char(off, row, col); | |
| 8073 out_char(ScreenLines[off + 1]); | |
| 8074 ++screen_cur_col; | |
| 8075 } | |
| 8076 | |
| 8077 /* | |
| 8078 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8079 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8080 */ | |
| 8081 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8082 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8083 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8084 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8085 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8086 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8087 int invert) |
| 7 | 8088 { |
| 8089 int r, c; | |
| 8090 int off; | |
| 1378 | 8091 int max_off; |
| 7 | 8092 |
| 534 | 8093 /* Can't use ScreenLines unless initialized */ |
| 8094 if (ScreenLines == NULL) | |
| 8095 return; | |
| 8096 | |
| 7 | 8097 if (invert) |
| 8098 screen_char_attr = HL_INVERSE; | |
| 8099 for (r = row; r < row + height; ++r) | |
| 8100 { | |
| 8101 off = LineOffset[r]; | |
| 1378 | 8102 max_off = off + screen_Columns; |
| 7 | 8103 for (c = col; c < col + width; ++c) |
| 8104 { | |
| 1378 | 8105 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8106 { |
| 8107 screen_char_2(off + c, r, c); | |
| 8108 ++c; | |
| 8109 } | |
| 8110 else | |
| 8111 { | |
| 8112 screen_char(off + c, r, c); | |
| 1378 | 8113 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8114 ++c; |
| 8115 } | |
| 8116 } | |
| 8117 } | |
| 8118 screen_char_attr = 0; | |
| 8119 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
8120 |
| 7 | 8121 /* |
| 8122 * Redraw the characters for a vertically split window. | |
| 8123 */ | |
| 8124 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8125 redraw_block(int row, int end, win_T *wp) |
| 7 | 8126 { |
| 8127 int col; | |
| 8128 int width; | |
| 8129 | |
| 8130 # ifdef FEAT_CLIPBOARD | |
| 8131 clip_may_clear_selection(row, end - 1); | |
| 8132 # endif | |
| 8133 | |
| 8134 if (wp == NULL) | |
| 8135 { | |
| 8136 col = 0; | |
| 8137 width = Columns; | |
| 8138 } | |
| 8139 else | |
| 8140 { | |
| 8141 col = wp->w_wincol; | |
| 8142 width = wp->w_width; | |
| 8143 } | |
| 8144 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8145 } | |
| 8146 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8147 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8148 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
|
8149 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8150 ScreenLines[off] = ' '; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8151 ScreenAttrs[off] = attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8152 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8153 ScreenLinesUC[off] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8154 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8155 |
| 7 | 8156 /* |
| 8157 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8158 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8159 * Use attributes 'attr'. | |
| 8160 */ | |
| 8161 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8162 screen_fill( |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8163 int start_row, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8164 int end_row, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8165 int start_col, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8166 int end_col, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8167 int c1, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8168 int c2, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8169 int attr) |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8170 { |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8171 int row; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8172 int col; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8173 int off; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8174 int end_off; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8175 int did_delete; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8176 int c; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8177 int norm_term; |
| 7 | 8178 #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
|
8179 int force_next = FALSE; |
| 7 | 8180 #endif |
| 8181 | |
| 8182 if (end_row > screen_Rows) /* safety check */ | |
| 8183 end_row = screen_Rows; | |
| 8184 if (end_col > screen_Columns) /* safety check */ | |
| 8185 end_col = screen_Columns; | |
| 8186 if (ScreenLines == NULL | |
| 8187 || start_row >= end_row | |
| 8188 || start_col >= end_col) /* nothing to do */ | |
| 8189 return; | |
| 8190 | |
| 8191 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8192 norm_term = ( | |
| 8193 #ifdef FEAT_GUI | |
| 8194 !gui.in_use && | |
| 8195 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8196 !IS_CTERM); |
| 7 | 8197 for (row = start_row; row < end_row; ++row) |
| 8198 { | |
| 1668 | 8199 if (has_mbyte |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8200 #ifdef FEAT_GUI |
| 1668 | 8201 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8202 #endif |
| 1668 | 8203 ) |
| 8204 { | |
| 8205 /* When drawing over the right halve of a double-wide char clear | |
| 8206 * out the left halve. When drawing over the left halve of a | |
| 8207 * double wide-char clear out the right halve. Only needed in a | |
| 8208 * terminal. */ | |
| 1685 | 8209 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8210 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8211 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8212 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8213 } |
| 7 | 8214 /* |
| 8215 * Try to use delete-line termcap code, when no attributes or in a | |
| 8216 * "normal" terminal, where a bold/italic space is just a | |
| 8217 * space. | |
| 8218 */ | |
| 8219 did_delete = FALSE; | |
| 8220 if (c2 == ' ' | |
| 8221 && end_col == Columns | |
| 8222 && can_clear(T_CE) | |
| 8223 && (attr == 0 | |
| 8224 || (norm_term | |
| 8225 && attr <= HL_ALL | |
| 8226 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8227 { | |
| 8228 /* | |
| 8229 * check if we really need to clear something | |
| 8230 */ | |
| 8231 col = start_col; | |
| 8232 if (c1 != ' ') /* don't clear first char */ | |
| 8233 ++col; | |
| 8234 | |
| 8235 off = LineOffset[row] + col; | |
| 8236 end_off = LineOffset[row] + end_col; | |
| 8237 | |
| 8238 /* skip blanks (used often, keep it fast!) */ | |
| 8239 if (enc_utf8) | |
| 8240 while (off < end_off && ScreenLines[off] == ' ' | |
| 8241 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8242 ++off; | |
| 8243 else | |
| 8244 while (off < end_off && ScreenLines[off] == ' ' | |
| 8245 && ScreenAttrs[off] == 0) | |
| 8246 ++off; | |
| 8247 if (off < end_off) /* something to be cleared */ | |
| 8248 { | |
| 8249 col = off - LineOffset[row]; | |
| 8250 screen_stop_highlight(); | |
| 8251 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8252 out_str(T_CE); | |
| 8253 screen_start(); /* don't know where cursor is now */ | |
| 8254 col = end_col - col; | |
| 8255 while (col--) /* clear chars in ScreenLines */ | |
| 8256 { | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8257 space_to_screenline(off, 0); |
| 7 | 8258 ++off; |
| 8259 } | |
| 8260 } | |
| 8261 did_delete = TRUE; /* the chars are cleared now */ | |
| 8262 } | |
| 8263 | |
| 8264 off = LineOffset[row] + start_col; | |
| 8265 c = c1; | |
| 8266 for (col = start_col; col < end_col; ++col) | |
| 8267 { | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8268 if ((ScreenLines[off] != c |
| 714 | 8269 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8270 != (c >= 0x80 ? c : 0)) | |
| 7 | 8271 || ScreenAttrs[off] != attr |
| 8272 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8273 || force_next | |
| 8274 #endif | |
| 8275 ) | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8276 #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
|
8277 // 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
|
8278 && !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
|
8279 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8280 ) |
| 7 | 8281 { |
| 8282 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8283 /* The bold trick may make a single row of pixels appear in | |
| 8284 * the next character. When a bold character is removed, the | |
| 8285 * next character should be redrawn too. This happens for our | |
| 8286 * own GUI and for some xterms. */ | |
| 8287 if ( | |
| 8288 # ifdef FEAT_GUI | |
| 8289 gui.in_use | |
| 8290 # endif | |
| 8291 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8292 || | |
| 8293 # endif | |
| 8294 # ifdef UNIX | |
| 8295 term_is_xterm | |
| 8296 # endif | |
| 8297 ) | |
| 8298 { | |
| 8299 if (ScreenLines[off] != ' ' | |
| 8300 && (ScreenAttrs[off] > HL_ALL | |
| 8301 || ScreenAttrs[off] & HL_BOLD)) | |
| 8302 force_next = TRUE; | |
| 8303 else | |
| 8304 force_next = FALSE; | |
| 8305 } | |
| 8306 #endif | |
| 8307 ScreenLines[off] = c; | |
| 8308 if (enc_utf8) | |
| 8309 { | |
| 8310 if (c >= 0x80) | |
| 8311 { | |
| 8312 ScreenLinesUC[off] = c; | |
| 714 | 8313 ScreenLinesC[0][off] = 0; |
| 7 | 8314 } |
| 8315 else | |
| 8316 ScreenLinesUC[off] = 0; | |
| 8317 } | |
| 8318 ScreenAttrs[off] = attr; | |
| 8319 if (!did_delete || c != ' ') | |
| 8320 screen_char(off, row, col); | |
| 8321 } | |
| 8322 ++off; | |
| 8323 if (col == start_col) | |
| 8324 { | |
| 8325 if (did_delete) | |
| 8326 break; | |
| 8327 c = c2; | |
| 8328 } | |
| 8329 } | |
| 8330 if (end_col == Columns) | |
| 8331 LineWraps[row] = FALSE; | |
| 8332 if (row == Rows - 1) /* overwritten the command line */ | |
| 8333 { | |
| 8334 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
|
8335 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
|
8336 && c1 == ' ' && c2 == ' ' && attr == 0) |
| 7 | 8337 clear_cmdline = FALSE; /* command line has been cleared */ |
| 644 | 8338 if (start_col == 0) |
| 8339 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8340 } |
| 8341 } | |
| 8342 } | |
| 8343 | |
| 8344 /* | |
| 8345 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8346 * screen or the command line. | |
| 8347 */ | |
| 8348 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8349 check_for_delay(int check_msg_scroll) |
| 7 | 8350 { |
| 8351 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8352 && !did_wait_return | |
| 8353 && emsg_silent == 0) | |
| 8354 { | |
| 8355 out_flush(); | |
| 8356 ui_delay(1000L, TRUE); | |
| 8357 emsg_on_display = FALSE; | |
| 8358 if (check_msg_scroll) | |
| 8359 msg_scroll = FALSE; | |
| 8360 } | |
| 8361 } | |
| 8362 | |
| 8363 /* | |
|
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
|
8364 * 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
|
8365 */ |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8366 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
|
8367 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
|
8368 { |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8369 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
|
8370 |
|
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 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
|
8372 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
|
8373 } |
|
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 |
|
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 /* |
| 7 | 8376 * screen_valid - allocate screen buffers if size changed |
| 3263 | 8377 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8378 * Returns TRUE if there is a valid screen to write to. |
| 8379 * Returns FALSE when starting up and screen not initialized yet. | |
| 8380 */ | |
| 8381 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8382 screen_valid(int doclear) |
| 7 | 8383 { |
| 3263 | 8384 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8385 return (ScreenLines != NULL); |
| 8386 } | |
| 8387 | |
| 8388 /* | |
| 8389 * Resize the shell to Rows and Columns. | |
| 8390 * Allocate ScreenLines[] and associated items. | |
| 8391 * | |
| 8392 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8393 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8394 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8395 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8396 * final size of the shell is needed. | |
| 8397 */ | |
| 8398 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8399 screenalloc(int doclear) |
| 7 | 8400 { |
| 8401 int new_row, old_row; | |
| 8402 #ifdef FEAT_GUI | |
| 8403 int old_Rows; | |
| 8404 #endif | |
| 8405 win_T *wp; | |
| 8406 int outofmem = FALSE; | |
| 8407 int len; | |
| 8408 schar_T *new_ScreenLines; | |
| 8409 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8410 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8411 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8412 int i; |
| 7 | 8413 sattr_T *new_ScreenAttrs; |
| 8414 unsigned *new_LineOffset; | |
| 8415 char_u *new_LineWraps; | |
| 681 | 8416 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
|
8417 #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
|
8418 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
|
8419 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
|
8420 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
|
8421 #endif |
| 671 | 8422 tabpage_T *tp; |
| 7 | 8423 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8424 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8425 int retry_count = 0; |
| 8426 | |
| 8427 retry: | |
| 7 | 8428 /* |
| 8429 * Allocation of the screen buffers is done only when the size changes and | |
| 8430 * when Rows and Columns have been set and we have started doing full | |
| 8431 * screen stuff. | |
| 8432 */ | |
| 8433 if ((ScreenLines != NULL | |
| 8434 && Rows == screen_Rows | |
| 8435 && Columns == screen_Columns | |
| 8436 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8437 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8438 && p_mco == Screen_mco) |
| 7 | 8439 || Rows == 0 |
| 8440 || Columns == 0 | |
| 8441 || (!full_screen && ScreenLines == NULL)) | |
| 8442 return; | |
| 8443 | |
| 8444 /* | |
| 8445 * It's possible that we produce an out-of-memory message below, which | |
| 8446 * will cause this function to be called again. To break the loop, just | |
| 8447 * return here. | |
| 8448 */ | |
| 8449 if (entered) | |
| 8450 return; | |
| 8451 entered = TRUE; | |
| 8452 | |
| 911 | 8453 /* |
| 8454 * Note that the window sizes are updated before reallocating the arrays, | |
| 8455 * thus we must not redraw here! | |
| 8456 */ | |
| 8457 ++RedrawingDisabled; | |
| 8458 | |
| 7 | 8459 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8460 | |
| 8461 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8462 | |
| 8463 /* | |
| 8464 * We're changing the size of the screen. | |
| 8465 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8466 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8467 * lines (unless the screen is going to be cleared). | |
| 8468 * - Free the old arrays. | |
| 8469 * | |
| 8470 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8471 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8472 * size is wrong. | |
| 8473 */ | |
| 671 | 8474 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8475 win_free_lsize(wp); |
| 1946 | 8476 if (aucmd_win != NULL) |
| 8477 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
|
8478 #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
|
8479 // 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
|
8480 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
|
8481 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
|
8482 // 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
|
8483 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
|
8484 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
|
8485 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
|
8486 #endif |
| 7 | 8487 |
|
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
|
8488 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
|
8489 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8490 if (enc_utf8) |
| 8491 { | |
|
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
|
8492 new_ScreenLinesUC = LALLOC_MULT(u8char_T, (Rows + 1) * Columns); |
| 714 | 8493 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
|
8494 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
|
8495 (Rows + 1) * Columns); |
| 7 | 8496 } |
| 8497 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
|
8498 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
|
8499 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
|
8500 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
|
8501 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
|
8502 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
|
8503 #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
|
8504 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
|
8505 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
|
8506 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
|
8507 #endif |
| 7 | 8508 |
| 677 | 8509 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8510 { |
| 8511 if (win_alloc_lines(wp) == FAIL) | |
| 8512 { | |
| 8513 outofmem = TRUE; | |
| 1819 | 8514 goto give_up; |
| 8515 } | |
| 8516 } | |
| 1946 | 8517 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8518 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8519 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
|
8520 #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
|
8521 // 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
|
8522 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
|
8523 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
|
8524 { |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8525 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
|
8526 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
|
8527 } |
|
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 // 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
|
8529 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
|
8530 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
|
8531 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
|
8532 { |
|
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 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
|
8534 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
|
8535 } |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8536 #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
|
8537 |
| 1819 | 8538 give_up: |
| 7 | 8539 |
| 714 | 8540 for (i = 0; i < p_mco; ++i) |
| 8541 if (new_ScreenLinesC[i] == NULL) | |
| 8542 break; | |
| 7 | 8543 if (new_ScreenLines == NULL |
| 714 | 8544 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8545 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8546 || new_ScreenAttrs == NULL | |
| 8547 || new_LineOffset == NULL | |
| 8548 || new_LineWraps == NULL | |
| 671 | 8549 || 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
|
8550 #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
|
8551 || 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
|
8552 || 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
|
8553 || 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
|
8554 #endif |
| 7 | 8555 || outofmem) |
| 8556 { | |
| 944 | 8557 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8558 { |
| 8559 /* guess the size */ | |
| 8560 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8561 | |
| 8562 /* Remember we did this to avoid getting outofmem messages over | |
| 8563 * and over again. */ | |
| 944 | 8564 done_outofmem_msg = TRUE; |
| 534 | 8565 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8566 VIM_CLEAR(new_ScreenLines); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8567 VIM_CLEAR(new_ScreenLinesUC); |
| 714 | 8568 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
|
8569 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
|
8570 VIM_CLEAR(new_ScreenLines2); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8571 VIM_CLEAR(new_ScreenAttrs); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8572 VIM_CLEAR(new_LineOffset); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8573 VIM_CLEAR(new_LineWraps); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8574 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
|
8575 #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
|
8576 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
|
8577 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
|
8578 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
|
8579 #endif |
| 7 | 8580 } |
| 8581 else | |
| 8582 { | |
| 944 | 8583 done_outofmem_msg = FALSE; |
| 534 | 8584 |
| 7 | 8585 for (new_row = 0; new_row < Rows; ++new_row) |
| 8586 { | |
| 8587 new_LineOffset[new_row] = new_row * Columns; | |
| 8588 new_LineWraps[new_row] = FALSE; | |
| 8589 | |
| 8590 /* | |
| 8591 * If the screen is not going to be cleared, copy as much as | |
| 8592 * possible from the old screen to the new one and clear the rest | |
| 8593 * (used when resizing the window at the "--more--" prompt or when | |
| 8594 * executing an external command, for the GUI). | |
| 8595 */ | |
| 3263 | 8596 if (!doclear) |
| 7 | 8597 { |
| 8598 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 8599 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 8600 if (enc_utf8) | |
| 8601 { | |
| 8602 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 8603 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 8604 for (i = 0; i < p_mco; ++i) |
| 8605 (void)vim_memset(new_ScreenLinesC[i] | |
| 8606 + new_row * Columns, | |
| 7 | 8607 0, (size_t)Columns * sizeof(u8char_T)); |
| 8608 } | |
| 8609 if (enc_dbcs == DBCS_JPNU) | |
| 8610 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 8611 0, (size_t)Columns * sizeof(schar_T)); | |
| 8612 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 8613 0, (size_t)Columns * sizeof(sattr_T)); | |
| 8614 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 8615 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 8616 { |
| 8617 if (screen_Columns < Columns) | |
| 8618 len = screen_Columns; | |
| 8619 else | |
| 8620 len = Columns; | |
| 571 | 8621 /* When switching to utf-8 don't copy characters, they |
| 714 | 8622 * may be invalid now. Also when p_mco changes. */ |
| 8623 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 8624 && p_mco == Screen_mco) | |
| 26 | 8625 mch_memmove(new_ScreenLines + new_LineOffset[new_row], |
| 8626 ScreenLines + LineOffset[old_row], | |
| 8627 (size_t)len * sizeof(schar_T)); | |
| 714 | 8628 if (enc_utf8 && ScreenLinesUC != NULL |
| 8629 && p_mco == Screen_mco) | |
| 7 | 8630 { |
| 8631 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 8632 ScreenLinesUC + LineOffset[old_row], | |
| 8633 (size_t)len * sizeof(u8char_T)); | |
| 714 | 8634 for (i = 0; i < p_mco; ++i) |
| 8635 mch_memmove(new_ScreenLinesC[i] | |
| 8636 + new_LineOffset[new_row], | |
| 8637 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 8638 (size_t)len * sizeof(u8char_T)); |
| 8639 } | |
| 8640 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 8641 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 8642 ScreenLines2 + LineOffset[old_row], | |
| 8643 (size_t)len * sizeof(schar_T)); | |
| 8644 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 8645 ScreenAttrs + LineOffset[old_row], | |
| 8646 (size_t)len * sizeof(sattr_T)); | |
| 8647 } | |
| 8648 } | |
| 8649 } | |
| 8650 /* Use the last line of the screen for the current line. */ | |
| 8651 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
|
8652 |
|
03dcb660c4e8
patch 8.1.1845: may use NULL pointer when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
17628
diff
changeset
|
8653 #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
|
8654 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
|
8655 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
|
8656 #endif |
| 7 | 8657 } |
| 8658 | |
| 356 | 8659 free_screenlines(); |
| 8660 | |
|
17696
03dcb660c4e8
patch 8.1.1845: may use NULL pointer when running out of memory
Bram Moolenaar <Bram@vim.org>
parents:
17628
diff
changeset
|
8661 // NOTE: this may result in all pointers to become NULL. |
| 7 | 8662 ScreenLines = new_ScreenLines; |
| 8663 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 8664 for (i = 0; i < p_mco; ++i) |
| 8665 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 8666 Screen_mco = p_mco; | |
| 7 | 8667 ScreenLines2 = new_ScreenLines2; |
| 8668 ScreenAttrs = new_ScreenAttrs; | |
| 8669 LineOffset = new_LineOffset; | |
| 8670 LineWraps = new_LineWraps; | |
| 671 | 8671 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
|
8672 #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
|
8673 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
|
8674 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
|
8675 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
|
8676 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
|
8677 #endif |
| 7 | 8678 |
| 8679 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 8680 * size of ScreenLines[]. Set them before calling anything. */ | |
| 8681 #ifdef FEAT_GUI | |
| 8682 old_Rows = screen_Rows; | |
| 8683 #endif | |
| 8684 screen_Rows = Rows; | |
| 8685 screen_Columns = Columns; | |
| 8686 | |
| 8687 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 8688 if (doclear) |
| 7 | 8689 screenclear2(); |
| 8690 #ifdef FEAT_GUI | |
| 8691 else if (gui.in_use | |
| 8692 && !gui.starting | |
| 8693 && ScreenLines != NULL | |
| 8694 && old_Rows != Rows) | |
| 8695 { | |
| 8696 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 8697 /* | |
| 8698 * Adjust the position of the cursor, for when executing an external | |
| 8699 * command. | |
| 8700 */ | |
| 8701 if (msg_row >= Rows) /* Rows got smaller */ | |
| 8702 msg_row = Rows - 1; /* put cursor at last row */ | |
| 8703 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 8704 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 8705 if (msg_col >= Columns) /* Columns got smaller */ | |
| 8706 msg_col = Columns - 1; /* put cursor at last column */ | |
| 8707 } | |
| 8708 #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
|
8709 clear_TabPageIdxs(); |
| 7 | 8710 |
| 8711 entered = FALSE; | |
| 911 | 8712 --RedrawingDisabled; |
| 766 | 8713 |
| 1824 | 8714 /* |
| 8715 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 8716 * in case applying autocommands always changes Rows or Columns. | |
| 8717 */ | |
| 8718 if (starting == 0 && ++retry_count <= 3) | |
| 8719 { | |
| 766 | 8720 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 8721 /* In rare cases, autocommands may have altered Rows or Columns, |
| 8722 * jump back to check if we need to allocate the screen again. */ | |
| 8723 goto retry; | |
| 8724 } | |
| 7 | 8725 } |
| 8726 | |
| 8727 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8728 free_screenlines(void) |
| 356 | 8729 { |
| 714 | 8730 int i; |
| 8731 | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8732 VIM_CLEAR(ScreenLinesUC); |
| 714 | 8733 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
|
8734 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
|
8735 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
|
8736 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
|
8737 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
|
8738 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
|
8739 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
|
8740 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
|
8741 #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
|
8742 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
|
8743 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
|
8744 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
|
8745 #endif |
| 356 | 8746 } |
| 8747 | |
| 8748 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8749 screenclear(void) |
| 7 | 8750 { |
| 8751 check_for_delay(FALSE); | |
| 8752 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 8753 screenclear2(); /* clear the screen */ | |
| 8754 } | |
| 8755 | |
| 8756 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8757 screenclear2(void) |
| 7 | 8758 { |
| 8759 int i; | |
| 8760 | |
| 8761 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 8762 #ifdef FEAT_GUI | |
| 8763 || (gui.in_use && gui.starting) | |
| 8764 #endif | |
| 8765 ) | |
| 8766 return; | |
| 8767 | |
| 8768 #ifdef FEAT_GUI | |
| 8769 if (!gui.in_use) | |
| 8770 #endif | |
| 8771 screen_attr = -1; /* force setting the Normal colors */ | |
| 8772 screen_stop_highlight(); /* don't want highlighting here */ | |
| 8773 | |
| 8774 #ifdef FEAT_CLIPBOARD | |
| 8775 /* disable selection without redrawing it */ | |
| 8776 clip_scroll_selection(9999); | |
| 8777 #endif | |
| 8778 | |
| 8779 /* blank out ScreenLines */ | |
| 8780 for (i = 0; i < Rows; ++i) | |
| 8781 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
8782 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 8783 LineWraps[i] = FALSE; |
| 8784 } | |
| 8785 | |
| 8786 if (can_clear(T_CL)) | |
| 8787 { | |
| 8788 out_str(T_CL); /* clear the display */ | |
| 8789 clear_cmdline = FALSE; | |
| 644 | 8790 mode_displayed = FALSE; |
| 7 | 8791 } |
| 8792 else | |
| 8793 { | |
| 8794 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 8795 for (i = 0; i < Rows; ++i) | |
| 8796 lineinvalid(LineOffset[i], (int)Columns); | |
| 8797 clear_cmdline = TRUE; | |
| 8798 } | |
| 8799 | |
| 8800 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 8801 | |
| 8802 win_rest_invalid(firstwin); | |
| 8803 redraw_cmdline = TRUE; | |
| 673 | 8804 redraw_tabline = TRUE; |
| 7 | 8805 if (must_redraw == CLEAR) /* no need to clear again */ |
| 8806 must_redraw = NOT_VALID; | |
| 8807 compute_cmdrow(); | |
| 8808 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 8809 msg_col = 0; | |
| 8810 screen_start(); /* don't know where cursor is now */ | |
| 8811 msg_scrolled = 0; /* can't scroll back */ | |
| 8812 msg_didany = FALSE; | |
| 8813 msg_didout = FALSE; | |
| 8814 } | |
| 8815 | |
| 8816 /* | |
| 8817 * Clear one line in ScreenLines. | |
| 8818 */ | |
| 8819 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
8820 lineclear(unsigned off, int width, int attr) |
| 7 | 8821 { |
| 8822 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 8823 if (enc_utf8) | |
| 8824 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 8825 (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
|
8826 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 8827 } |
| 8828 | |
| 8829 /* | |
| 8830 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 8831 * invalid value. | |
| 8832 */ | |
| 8833 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8834 lineinvalid(unsigned off, int width) |
| 7 | 8835 { |
| 8836 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 8837 } | |
| 8838 | |
| 8839 /* | |
| 8840 * Copy part of a Screenline for vertically split window "wp". | |
| 8841 */ | |
| 8842 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8843 linecopy(int to, int from, win_T *wp) |
| 7 | 8844 { |
| 8845 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 8846 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 8847 | |
| 8848 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 8849 wp->w_width * sizeof(schar_T)); | |
| 8850 if (enc_utf8) | |
| 8851 { | |
| 714 | 8852 int i; |
| 8853 | |
| 7 | 8854 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 8855 wp->w_width * sizeof(u8char_T)); | |
| 714 | 8856 for (i = 0; i < p_mco; ++i) |
| 8857 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 8858 wp->w_width * sizeof(u8char_T)); | |
| 7 | 8859 } |
| 8860 if (enc_dbcs == DBCS_JPNU) | |
| 8861 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 8862 wp->w_width * sizeof(schar_T)); | |
| 8863 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 8864 wp->w_width * sizeof(sattr_T)); | |
| 8865 } | |
| 8866 | |
| 8867 /* | |
| 8868 * Return TRUE if clearing with term string "p" would work. | |
| 8869 * 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
|
8870 * Don't clear to end-of-line when there are popups, it may cause flicker. |
| 7 | 8871 */ |
| 8872 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8873 can_clear(char_u *p) |
| 7 | 8874 { |
| 8875 return (*p != NUL && (t_colors <= 1 | |
| 8876 #ifdef FEAT_GUI | |
| 8877 || gui.in_use | |
| 8878 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8879 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8880 || (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
|
8881 || (!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
|
8882 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
8883 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
8884 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8885 || *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
|
8886 #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
|
8887 && !(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
|
8888 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8889 ); |
| 7 | 8890 } |
| 8891 | |
| 8892 /* | |
| 8893 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 8894 * something directly to the screen (shell commands) or a terminal control | |
| 8895 * code. | |
| 8896 */ | |
| 8897 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8898 screen_start(void) |
| 7 | 8899 { |
| 8900 screen_cur_row = screen_cur_col = 9999; | |
| 8901 } | |
| 8902 | |
| 8903 /* | |
| 8904 * Move the cursor to position "row","col" in the screen. | |
| 8905 * This tries to find the most efficient way to move, minimizing the number of | |
| 8906 * characters sent to the terminal. | |
| 8907 */ | |
| 8908 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8909 windgoto(int row, int col) |
| 7 | 8910 { |
| 205 | 8911 sattr_T *p; |
| 7 | 8912 int i; |
| 8913 int plan; | |
| 8914 int cost; | |
| 8915 int wouldbe_col; | |
| 8916 int noinvcurs; | |
| 8917 char_u *bs; | |
| 8918 int goto_cost; | |
| 8919 int attr; | |
| 8920 | |
| 1213 | 8921 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 8922 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 8923 | |
| 8924 #define PLAN_LE 1 | |
| 8925 #define PLAN_CR 2 | |
| 8926 #define PLAN_NL 3 | |
| 8927 #define PLAN_WRITE 4 | |
| 8928 /* Can't use ScreenLines unless initialized */ | |
| 8929 if (ScreenLines == NULL) | |
| 8930 return; | |
| 8931 | |
| 8932 if (col != screen_cur_col || row != screen_cur_row) | |
| 8933 { | |
| 8934 /* Check for valid position. */ | |
| 8935 if (row < 0) /* window without text lines? */ | |
| 8936 row = 0; | |
| 8937 if (row >= screen_Rows) | |
| 8938 row = screen_Rows - 1; | |
| 8939 if (col >= screen_Columns) | |
| 8940 col = screen_Columns - 1; | |
| 8941 | |
| 8942 /* check if no cursor movement is allowed in highlight mode */ | |
| 8943 if (screen_attr && *T_MS == NUL) | |
| 8944 noinvcurs = HIGHL_COST; | |
| 8945 else | |
| 8946 noinvcurs = 0; | |
| 8947 goto_cost = GOTO_COST + noinvcurs; | |
| 8948 | |
| 8949 /* | |
| 8950 * Plan how to do the positioning: | |
| 8951 * 1. Use CR to move it to column 0, same row. | |
| 8952 * 2. Use T_LE to move it a few columns to the left. | |
| 8953 * 3. Use NL to move a few lines down, column 0. | |
| 8954 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 8955 * | |
| 8956 * Don't do this if the cursor went beyond the last column, the cursor | |
| 8957 * position is unknown then (some terminals wrap, some don't ) | |
| 8958 * | |
| 1213 | 8959 * First check if the highlighting attributes allow us to write |
| 7 | 8960 * characters to move the cursor to the right. |
| 8961 */ | |
| 8962 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 8963 { | |
| 8964 /* | |
| 8965 * If the cursor is in the same row, bigger col, we can use CR | |
| 8966 * or T_LE. | |
| 8967 */ | |
| 8968 bs = NULL; /* init for GCC */ | |
| 8969 attr = screen_attr; | |
| 8970 if (row == screen_cur_row && col < screen_cur_col) | |
| 8971 { | |
| 8972 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 8973 if (*T_LE) | |
| 8974 bs = T_LE; /* "cursor left" */ | |
| 8975 else | |
| 8976 bs = T_BC; /* "backspace character (old) */ | |
| 8977 if (*bs) | |
| 8978 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 8979 else | |
| 8980 cost = 999; | |
| 8981 if (col + 1 < cost) /* using CR is less characters */ | |
| 8982 { | |
| 8983 plan = PLAN_CR; | |
| 8984 wouldbe_col = 0; | |
| 8985 cost = 1; /* CR is just one character */ | |
| 8986 } | |
| 8987 else | |
| 8988 { | |
| 8989 plan = PLAN_LE; | |
| 8990 wouldbe_col = col; | |
| 8991 } | |
| 8992 if (noinvcurs) /* will stop highlighting */ | |
| 8993 { | |
| 8994 cost += noinvcurs; | |
| 8995 attr = 0; | |
| 8996 } | |
| 8997 } | |
| 8998 | |
| 8999 /* | |
| 9000 * If the cursor is above where we want to be, we can use CR LF. | |
| 9001 */ | |
| 9002 else if (row > screen_cur_row) | |
| 9003 { | |
| 9004 plan = PLAN_NL; | |
| 9005 wouldbe_col = 0; | |
| 9006 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9007 if (noinvcurs) /* will stop highlighting */ | |
| 9008 { | |
| 9009 cost += noinvcurs; | |
| 9010 attr = 0; | |
| 9011 } | |
| 9012 } | |
| 9013 | |
| 9014 /* | |
| 9015 * If the cursor is in the same row, smaller col, just use write. | |
| 9016 */ | |
| 9017 else | |
| 9018 { | |
| 9019 plan = PLAN_WRITE; | |
| 9020 wouldbe_col = screen_cur_col; | |
| 9021 cost = 0; | |
| 9022 } | |
| 9023 | |
| 9024 /* | |
| 9025 * Check if any characters that need to be written have the | |
| 9026 * correct attributes. Also avoid UTF-8 characters. | |
| 9027 */ | |
| 9028 i = col - wouldbe_col; | |
| 9029 if (i > 0) | |
| 9030 cost += i; | |
| 9031 if (cost < goto_cost && i > 0) | |
| 9032 { | |
| 9033 /* | |
| 9034 * Check if the attributes are correct without additionally | |
| 9035 * stopping highlighting. | |
| 9036 */ | |
| 9037 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9038 while (i && *p++ == attr) | |
| 9039 --i; | |
| 9040 if (i != 0) | |
| 9041 { | |
| 9042 /* | |
| 9043 * Try if it works when highlighting is stopped here. | |
| 9044 */ | |
| 9045 if (*--p == 0) | |
| 9046 { | |
| 9047 cost += noinvcurs; | |
| 9048 while (i && *p++ == 0) | |
| 9049 --i; | |
| 9050 } | |
| 9051 if (i != 0) | |
| 9052 cost = 999; /* different attributes, don't do it */ | |
| 9053 } | |
| 9054 if (enc_utf8) | |
| 9055 { | |
| 9056 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9057 for (i = wouldbe_col; i < col; ++i) | |
| 9058 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9059 { | |
| 9060 cost = 999; | |
| 9061 break; | |
| 9062 } | |
| 9063 } | |
| 9064 } | |
| 9065 | |
| 9066 /* | |
| 9067 * We can do it without term_windgoto()! | |
| 9068 */ | |
| 9069 if (cost < goto_cost) | |
| 9070 { | |
| 9071 if (plan == PLAN_LE) | |
| 9072 { | |
| 9073 if (noinvcurs) | |
| 9074 screen_stop_highlight(); | |
| 9075 while (screen_cur_col > col) | |
| 9076 { | |
| 9077 out_str(bs); | |
| 9078 --screen_cur_col; | |
| 9079 } | |
| 9080 } | |
| 9081 else if (plan == PLAN_CR) | |
| 9082 { | |
| 9083 if (noinvcurs) | |
| 9084 screen_stop_highlight(); | |
| 9085 out_char('\r'); | |
| 9086 screen_cur_col = 0; | |
| 9087 } | |
| 9088 else if (plan == PLAN_NL) | |
| 9089 { | |
| 9090 if (noinvcurs) | |
| 9091 screen_stop_highlight(); | |
| 9092 while (screen_cur_row < row) | |
| 9093 { | |
| 9094 out_char('\n'); | |
| 9095 ++screen_cur_row; | |
| 9096 } | |
| 9097 screen_cur_col = 0; | |
| 9098 } | |
| 9099 | |
| 9100 i = col - screen_cur_col; | |
| 9101 if (i > 0) | |
| 9102 { | |
| 9103 /* | |
| 9104 * Use cursor-right if it's one character only. Avoids | |
| 9105 * removing a line of pixels from the last bold char, when | |
| 9106 * using the bold trick in the GUI. | |
| 9107 */ | |
| 9108 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9109 { | |
| 9110 while (i-- > 0) | |
| 9111 out_char(*T_ND); | |
| 9112 } | |
| 9113 else | |
| 9114 { | |
| 9115 int off; | |
| 9116 | |
| 9117 off = LineOffset[row] + screen_cur_col; | |
| 9118 while (i-- > 0) | |
| 9119 { | |
| 9120 if (ScreenAttrs[off] != screen_attr) | |
| 9121 screen_stop_highlight(); | |
| 9122 out_flush_check(); | |
| 9123 out_char(ScreenLines[off]); | |
| 9124 if (enc_dbcs == DBCS_JPNU | |
| 9125 && ScreenLines[off] == 0x8e) | |
| 9126 out_char(ScreenLines2[off]); | |
| 9127 ++off; | |
| 9128 } | |
| 9129 } | |
| 9130 } | |
| 9131 } | |
| 9132 } | |
| 9133 else | |
| 9134 cost = 999; | |
| 9135 | |
| 9136 if (cost >= goto_cost) | |
| 9137 { | |
| 9138 if (noinvcurs) | |
| 9139 screen_stop_highlight(); | |
| 5995 | 9140 if (row == screen_cur_row && (col > screen_cur_col) |
| 9141 && *T_CRI != NUL) | |
| 7 | 9142 term_cursor_right(col - screen_cur_col); |
| 9143 else | |
| 9144 term_windgoto(row, col); | |
| 9145 } | |
| 9146 screen_cur_row = row; | |
| 9147 screen_cur_col = col; | |
| 9148 } | |
| 9149 } | |
| 9150 | |
| 9151 /* | |
| 9152 * Set cursor to its position in the current window. | |
| 9153 */ | |
| 9154 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9155 setcursor(void) |
| 7 | 9156 { |
|
13400
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9157 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
|
9158 } |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9159 |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9160 /* |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9161 * 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
|
9162 * 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
|
9163 */ |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9164 void |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9165 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
|
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 if (force || redrawing()) |
| 7 | 9168 { |
| 9169 validate_cursor(); | |
| 9170 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
|
9171 curwin->w_wincol + ( |
| 7 | 9172 #ifdef FEAT_RIGHTLEFT |
| 1545 | 9173 /* With 'rightleft' set and the cursor on a double-wide |
| 9174 * 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
|
9175 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
|
9176 - ((has_mbyte |
| 1545 | 9177 && (*mb_ptr2cells)(ml_get_cursor()) == 2 |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9178 && vim_isprintc(gchar_cursor())) ? 2 : 1)) : |
| 7 | 9179 #endif |
| 9180 curwin->w_wcol)); | |
| 9181 } | |
| 9182 } | |
| 9183 | |
| 9184 | |
| 9185 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9186 * 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
|
9187 * 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
|
9188 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9189 * scrolling. |
| 9190 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9191 */ | |
| 9192 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9193 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9194 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9195 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9196 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9197 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9198 int mayclear) |
| 7 | 9199 { |
| 9200 int did_delete; | |
| 9201 int nextrow; | |
| 9202 int lastrow; | |
| 9203 int retval; | |
| 9204 | |
| 9205 if (invalid) | |
| 9206 wp->w_lines_valid = 0; | |
| 9207 | |
| 9208 if (wp->w_height < 5) | |
| 9209 return FAIL; | |
| 9210 | |
| 9211 if (line_count > wp->w_height - row) | |
| 9212 line_count = wp->w_height - row; | |
| 9213 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9214 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9215 if (retval != MAYBE) |
| 9216 return retval; | |
| 9217 | |
| 9218 /* | |
| 9219 * If there is a next window or a status line, we first try to delete the | |
| 9220 * 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
|
9221 * 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
|
9222 * avoid messing up those windows, better just redraw. |
| 7 | 9223 */ |
| 9224 did_delete = FALSE; | |
| 9225 if (wp->w_next != NULL || wp->w_status_height) | |
| 9226 { | |
| 9227 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
|
9228 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9229 did_delete = TRUE; |
| 9230 else if (wp->w_next) | |
| 9231 return FAIL; | |
| 9232 } | |
| 9233 /* | |
| 9234 * if no lines deleted, blank the lines that will end up below the window | |
| 9235 */ | |
| 9236 if (!did_delete) | |
| 9237 { | |
| 9238 wp->w_redr_status = TRUE; | |
| 9239 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
|
9240 nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height; |
| 7 | 9241 lastrow = nextrow + line_count; |
| 9242 if (lastrow > Rows) | |
| 9243 lastrow = Rows; | |
| 9244 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
|
9245 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9246 ' ', ' ', 0); |
| 9247 } | |
| 9248 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9249 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9250 == FAIL) |
| 9251 { | |
|
17628
6146b10714de
patch 8.1.1811: popup window color cannot be set to "Normal"
Bram Moolenaar <Bram@vim.org>
parents:
17551
diff
changeset
|
9252 // deletion will have messed up other windows |
| 7 | 9253 if (did_delete) |
| 9254 { | |
| 9255 wp->w_redr_status = TRUE; | |
| 9256 win_rest_invalid(W_NEXT(wp)); | |
| 9257 } | |
| 9258 return FAIL; | |
| 9259 } | |
| 9260 | |
| 9261 return OK; | |
| 9262 } | |
| 9263 | |
| 9264 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9265 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9266 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9267 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9268 * scrolling | |
| 9269 * Return OK for success, FAIL if the lines are not deleted. | |
| 9270 */ | |
| 9271 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9272 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9273 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9274 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9275 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9276 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9277 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9278 int clear_attr) /* for clearing lines */ |
| 7 | 9279 { |
| 9280 int retval; | |
| 9281 | |
| 9282 if (invalid) | |
| 9283 wp->w_lines_valid = 0; | |
| 9284 | |
| 9285 if (line_count > wp->w_height - row) | |
| 9286 line_count = wp->w_height - row; | |
| 9287 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9288 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9289 if (retval != MAYBE) |
| 9290 return retval; | |
| 9291 | |
| 9292 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
|
9293 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9294 return FAIL; |
| 9295 | |
| 9296 /* | |
| 9297 * If there are windows or status lines below, try to put them at the | |
| 9298 * correct place. If we can't do that, they have to be redrawn. | |
| 9299 */ | |
| 9300 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9301 { | |
| 9302 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
|
9303 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9304 { |
| 9305 wp->w_redr_status = TRUE; | |
| 9306 win_rest_invalid(wp->w_next); | |
| 9307 } | |
| 9308 } | |
| 9309 /* | |
| 9310 * If this is the last window and there is no status line, redraw the | |
| 9311 * command line later. | |
| 9312 */ | |
| 9313 else | |
| 9314 redraw_cmdline = TRUE; | |
| 9315 return OK; | |
| 9316 } | |
| 9317 | |
| 9318 /* | |
| 9319 * Common code for win_ins_lines() and win_del_lines(). | |
| 9320 * Returns OK or FAIL when the work has been done. | |
| 9321 * Returns MAYBE when not finished yet. | |
| 9322 */ | |
| 9323 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9324 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9325 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9326 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9327 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9328 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9329 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9330 int clear_attr) |
| 7 | 9331 { |
| 9332 int retval; | |
| 9333 | |
| 9334 if (!redrawing() || line_count <= 0) | |
| 9335 return FAIL; | |
| 9336 | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9337 // 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
|
9338 // 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
|
9339 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
|
9340 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
|
9341 |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9342 // 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
|
9343 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) |
| 7 | 9344 { |
|
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
|
9345 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
|
9346 screenclear(); // will set wp->w_lines_valid to 0 |
| 7 | 9347 return FAIL; |
| 9348 } | |
| 9349 | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9350 #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
|
9351 // 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
|
9352 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
|
9353 return FAIL; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9354 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9355 |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9356 // Delete all remaining lines |
| 7 | 9357 if (row + line_count >= wp->w_height) |
| 9358 { | |
| 9359 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
|
9360 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9361 ' ', ' ', 0); |
| 9362 return OK; | |
| 9363 } | |
| 9364 | |
| 9365 /* | |
|
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
|
9366 * When scrolling, the message on the command line should be cleared, |
| 7 | 9367 * 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
|
9368 * Don't do this when avoiding to insert lines. |
| 7 | 9369 */ |
|
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
|
9370 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
|
9371 clear_cmdline = TRUE; |
| 7 | 9372 |
| 9373 /* | |
| 9374 * If the terminal can set a scroll region, use that. | |
| 9375 * Always do this in a vertically split window. This will redraw from | |
| 9376 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9377 * win_line(). | |
| 9378 * 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
|
9379 * 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
|
9380 * scroll-up . |
| 7 | 9381 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9382 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
|
9383 { |
| 7 | 9384 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9385 scroll_region_set(wp, row); | |
| 9386 if (del) | |
| 9387 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
|
9388 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 9389 else |
| 9390 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
|
9391 wp->w_height - row, clear_attr, wp); |
| 7 | 9392 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9393 scroll_region_reset(); | |
| 9394 return retval; | |
| 9395 } | |
| 9396 | |
| 9397 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9398 return FAIL; | |
| 9399 | |
| 9400 return MAYBE; | |
| 9401 } | |
| 9402 | |
| 9403 /* | |
| 9404 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9405 */ | |
| 9406 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9407 win_rest_invalid(win_T *wp) |
| 7 | 9408 { |
| 9409 while (wp != NULL) | |
| 9410 { | |
| 9411 redraw_win_later(wp, NOT_VALID); | |
| 9412 wp->w_redr_status = TRUE; | |
| 9413 wp = wp->w_next; | |
| 9414 } | |
| 9415 redraw_cmdline = TRUE; | |
| 9416 } | |
| 9417 | |
| 9418 /* | |
| 9419 * The rest of the routines in this file perform screen manipulations. The | |
| 9420 * given operation is performed physically on the screen. The corresponding | |
| 9421 * change is also made to the internal screen image. In this way, the editor | |
| 9422 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9423 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9424 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9425 * screen changes, and in the meantime, everything still works. | |
| 9426 */ | |
| 9427 | |
| 9428 /* | |
| 9429 * types for inserting or deleting lines | |
| 9430 */ | |
| 9431 #define USE_T_CAL 1 | |
| 9432 #define USE_T_CDL 2 | |
| 9433 #define USE_T_AL 3 | |
| 9434 #define USE_T_CE 4 | |
| 9435 #define USE_T_DL 5 | |
| 9436 #define USE_T_SR 6 | |
| 9437 #define USE_NL 7 | |
| 9438 #define USE_T_CD 8 | |
| 9439 #define USE_REDRAW 9 | |
| 9440 | |
| 9441 /* | |
| 9442 * insert lines on the screen and update ScreenLines[] | |
| 9443 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9444 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9445 * 'row' and 'end' are relative to the start of the region. | |
| 9446 * | |
| 9447 * return FAIL for failure, OK for success. | |
| 9448 */ | |
| 446 | 9449 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9450 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9451 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9452 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9453 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9454 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9455 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9456 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9457 { |
| 9458 int i; | |
| 9459 int j; | |
| 9460 unsigned temp; | |
| 9461 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9462 int cursor_col = 0; |
| 7 | 9463 int type; |
| 9464 int result_empty; | |
| 9465 int can_ce = can_clear(T_CE); | |
| 9466 | |
| 9467 /* | |
| 9468 * FAIL if | |
| 9469 * - there is no valid screen | |
| 9470 * - the screen has to be redrawn completely | |
| 9471 * - the line count is less than one | |
| 9472 * - 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
|
9473 * - 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
|
9474 * - there is a popup window |
| 7 | 9475 */ |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9476 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
|
9477 || 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
|
9478 #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
|
9479 || (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
|
9480 && 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
|
9481 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9482 #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
|
9483 || popup_visible |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9484 #endif |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9485 ) |
| 7 | 9486 return FAIL; |
| 9487 | |
| 9488 /* | |
| 9489 * There are seven ways to insert lines: | |
| 9490 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9491 * characters from ScreenLines[]. | |
| 9492 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9493 * the insert is just empty lines | |
| 9494 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9495 * present or line_count > 1. It looks better if we do all the inserts | |
| 9496 * at once. | |
| 9497 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9498 * insert is just empty lines and T_CE is not present or line_count > | |
| 9499 * 1. | |
| 9500 * 4. Use T_AL (insert line) if it exists. | |
| 9501 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9502 * just empty lines. | |
| 9503 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9504 * just empty lines. | |
| 9505 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9506 * the 'da' flag is not set or we have clear line capability. | |
| 9507 * 8. redraw the characters from ScreenLines[]. | |
| 9508 * | |
| 9509 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9510 * the scrollbar for the window. It does have insert line, use that if it | |
| 9511 * exists. | |
| 9512 */ | |
| 9513 result_empty = (row + line_count >= end); | |
| 9514 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 9515 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
|
9516 else if (can_clear(T_CD) && result_empty) |
| 7 | 9517 type = USE_T_CD; |
| 9518 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9519 type = USE_T_CAL; | |
| 9520 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9521 type = USE_T_CDL; | |
| 9522 else if (*T_AL != NUL) | |
| 9523 type = USE_T_AL; | |
| 9524 else if (can_ce && result_empty) | |
| 9525 type = USE_T_CE; | |
| 9526 else if (*T_DL != NUL && result_empty) | |
| 9527 type = USE_T_DL; | |
| 9528 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9529 type = USE_T_SR; | |
| 9530 else | |
| 9531 return FAIL; | |
| 9532 | |
| 9533 /* | |
| 9534 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9535 * care of t_db if necessary. | |
| 9536 */ | |
| 9537 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9538 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
|
9539 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 9540 |
| 9541 /* | |
| 9542 * If text is retained below the screen, first clear or delete as many | |
| 9543 * lines at the bottom of the window as are about to be inserted so that | |
| 9544 * the deleted lines won't later surface during a screen_del_lines. | |
| 9545 */ | |
| 9546 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
|
9547 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 9548 |
| 9549 #ifdef FEAT_CLIPBOARD | |
| 9550 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9551 * 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
|
9552 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 9553 clip_clear_selection(&clip_star); |
| 7 | 9554 else |
| 9555 clip_scroll_selection(-line_count); | |
| 9556 #endif | |
| 9557 | |
| 9558 #ifdef FEAT_GUI | |
| 9559 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9560 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9561 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 9562 #endif |
| 9563 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9564 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
|
9565 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
|
9566 |
| 7 | 9567 if (*T_CCS != NUL) /* cursor relative to region */ |
| 9568 cursor_row = row; | |
| 9569 else | |
| 9570 cursor_row = row + off; | |
| 9571 | |
| 9572 /* | |
| 9573 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9574 * Clear the inserted lines in ScreenLines[]. | |
| 9575 */ | |
| 9576 row += off; | |
| 9577 end += off; | |
| 9578 for (i = 0; i < line_count; ++i) | |
| 9579 { | |
| 9580 if (wp != NULL && wp->w_width != Columns) | |
| 9581 { | |
| 9582 /* need to copy part of a line */ | |
| 9583 j = end - 1 - i; | |
| 9584 while ((j -= line_count) >= row) | |
| 9585 linecopy(j + line_count, j, wp); | |
| 9586 j += line_count; | |
| 9587 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
|
9588 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
|
9589 clear_attr); |
| 7 | 9590 else |
| 9591 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9592 LineWraps[j] = FALSE; | |
| 9593 } | |
| 9594 else | |
| 9595 { | |
| 9596 j = end - 1 - i; | |
| 9597 temp = LineOffset[j]; | |
| 9598 while ((j -= line_count) >= row) | |
| 9599 { | |
| 9600 LineOffset[j + line_count] = LineOffset[j]; | |
| 9601 LineWraps[j + line_count] = LineWraps[j]; | |
| 9602 } | |
| 9603 LineOffset[j + line_count] = temp; | |
| 9604 LineWraps[j + line_count] = FALSE; | |
| 9605 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
|
9606 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 9607 else |
| 9608 lineinvalid(temp, (int)Columns); | |
| 9609 } | |
| 9610 } | |
| 9611 | |
| 9612 screen_stop_highlight(); | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9613 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
|
9614 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
|
9615 screen_start_highlight(clear_attr); |
| 7 | 9616 |
| 9617 /* redraw the characters */ | |
| 9618 if (type == USE_REDRAW) | |
| 9619 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
|
9620 else if (type == USE_T_CAL) |
| 7 | 9621 { |
| 9622 term_append_lines(line_count); | |
| 9623 screen_start(); /* don't know where cursor is now */ | |
| 9624 } | |
| 9625 else | |
| 9626 { | |
| 9627 for (i = 0; i < line_count; i++) | |
| 9628 { | |
| 9629 if (type == USE_T_AL) | |
| 9630 { | |
| 9631 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
|
9632 windgoto(cursor_row, cursor_col); |
| 7 | 9633 out_str(T_AL); |
| 9634 } | |
| 9635 else /* type == USE_T_SR */ | |
| 9636 out_str(T_SR); | |
| 9637 screen_start(); /* don't know where cursor is now */ | |
| 9638 } | |
| 9639 } | |
| 9640 | |
| 9641 /* | |
| 9642 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 9643 * have been scrolled down into the region. | |
| 9644 */ | |
| 9645 if (type == USE_T_SR && *T_DA) | |
| 9646 { | |
| 9647 for (i = 0; i < line_count; ++i) | |
| 9648 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9649 windgoto(off + i, cursor_col); |
| 7 | 9650 out_str(T_CE); |
| 9651 screen_start(); /* don't know where cursor is now */ | |
| 9652 } | |
| 9653 } | |
| 9654 | |
| 9655 #ifdef FEAT_GUI | |
| 9656 gui_can_update_cursor(); | |
| 9657 if (gui.in_use) | |
| 9658 out_flush(); /* always flush after a scroll */ | |
| 9659 #endif | |
| 9660 return OK; | |
| 9661 } | |
| 9662 | |
| 9663 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9664 * 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
|
9665 * "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
|
9666 * 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
|
9667 * "row" and "end" are relative to the start of the region. |
| 7 | 9668 * |
| 9669 * Return OK for success, FAIL if the lines are not deleted. | |
| 9670 */ | |
| 9671 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9672 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9673 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9674 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9675 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9676 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9677 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
|
9678 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
|
9679 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 9680 { |
| 9681 int j; | |
| 9682 int i; | |
| 9683 unsigned temp; | |
| 9684 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9685 int cursor_col = 0; |
| 7 | 9686 int cursor_end; |
| 9687 int result_empty; /* result is empty until end of region */ | |
| 9688 int can_delete; /* deleting line codes can be used */ | |
| 9689 int type; | |
| 9690 | |
| 9691 /* | |
| 9692 * FAIL if | |
| 9693 * - there is no valid screen | |
| 9694 * - the screen has to be redrawn completely | |
| 9695 * - the line count is less than one | |
| 9696 * - 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
|
9697 * - redrawing for a callback and there is a modeless selection |
| 7 | 9698 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9699 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
|
9700 || (!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
|
9701 #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
|
9702 || (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
|
9703 && 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
|
9704 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9705 ) |
| 7 | 9706 return FAIL; |
| 9707 | |
| 9708 /* | |
| 9709 * Check if the rest of the current region will become empty. | |
| 9710 */ | |
| 9711 result_empty = row + line_count >= end; | |
| 9712 | |
| 9713 /* | |
| 9714 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 9715 * available. | |
| 9716 */ | |
| 9717 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 9718 | |
| 9719 /* | |
| 9720 * There are six ways to delete lines: | |
| 9721 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9722 * characters from ScreenLines[]. | |
| 9723 * 1. Use T_CD if it exists and the result is empty. | |
| 9724 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 9725 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 9726 * none of the other ways work. | |
| 9727 * 4. Use T_CE (erase line) if the result is empty. | |
| 9728 * 5. Use T_DL (delete line) if it exists. | |
| 9729 * 6. redraw the characters from ScreenLines[]. | |
| 9730 */ | |
| 9731 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 9732 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
|
9733 else if (can_clear(T_CD) && result_empty) |
| 7 | 9734 type = USE_T_CD; |
| 9735 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 9736 /* | |
| 9737 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 9738 * its internal termcap... this works okay for tests which test *T_DB != | |
| 9739 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 9740 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 9741 * the trick... | |
| 9742 * Anyway, this hack will hopefully go away with the next OS release. | |
| 9743 * (Olaf Seibert) | |
| 9744 */ | |
| 9745 else if (row == 0 && T_DB == empty_option | |
| 9746 && (line_count == 1 || *T_CDL == NUL)) | |
| 9747 #else | |
| 9748 else if (row == 0 && ( | |
| 9749 #ifndef AMIGA | |
| 9750 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 9751 * up, so use delete-line command */ | |
| 9752 line_count == 1 || | |
| 9753 #endif | |
| 9754 *T_CDL == NUL)) | |
| 9755 #endif | |
| 9756 type = USE_NL; | |
| 9757 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 9758 type = USE_T_CDL; | |
| 9759 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
|
9760 && (wp == NULL || wp->w_width == Columns)) |
| 7 | 9761 type = USE_T_CE; |
| 9762 else if (*T_DL != NUL && can_delete) | |
| 9763 type = USE_T_DL; | |
| 9764 else if (*T_CDL != NUL && can_delete) | |
| 9765 type = USE_T_CDL; | |
| 9766 else | |
| 9767 return FAIL; | |
| 9768 | |
| 9769 #ifdef FEAT_CLIPBOARD | |
| 9770 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 9771 * 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
|
9772 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 9773 clip_clear_selection(&clip_star); |
| 7 | 9774 else |
| 9775 clip_scroll_selection(line_count); | |
| 9776 #endif | |
| 9777 | |
| 9778 #ifdef FEAT_GUI | |
| 9779 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9780 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9781 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
|
9782 && gui.cursor_row < end + off); |
| 7 | 9783 #endif |
| 9784 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9785 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
|
9786 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
|
9787 |
| 7 | 9788 if (*T_CCS != NUL) /* cursor relative to region */ |
| 9789 { | |
| 9790 cursor_row = row; | |
| 9791 cursor_end = end; | |
| 9792 } | |
| 9793 else | |
| 9794 { | |
| 9795 cursor_row = row + off; | |
| 9796 cursor_end = end + off; | |
| 9797 } | |
| 9798 | |
| 9799 /* | |
| 9800 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 9801 * Clear the inserted lines in ScreenLines[]. | |
| 9802 */ | |
| 9803 row += off; | |
| 9804 end += off; | |
| 9805 for (i = 0; i < line_count; ++i) | |
| 9806 { | |
| 9807 if (wp != NULL && wp->w_width != Columns) | |
| 9808 { | |
| 9809 /* need to copy part of a line */ | |
| 9810 j = row + i; | |
| 9811 while ((j += line_count) <= end - 1) | |
| 9812 linecopy(j - line_count, j, wp); | |
| 9813 j -= line_count; | |
| 9814 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
|
9815 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
|
9816 clear_attr); |
| 7 | 9817 else |
| 9818 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9819 LineWraps[j] = FALSE; | |
| 9820 } | |
| 9821 else | |
| 9822 { | |
| 9823 /* whole width, moving the line pointers is faster */ | |
| 9824 j = row + i; | |
| 9825 temp = LineOffset[j]; | |
| 9826 while ((j += line_count) <= end - 1) | |
| 9827 { | |
| 9828 LineOffset[j - line_count] = LineOffset[j]; | |
| 9829 LineWraps[j - line_count] = LineWraps[j]; | |
| 9830 } | |
| 9831 LineOffset[j - line_count] = temp; | |
| 9832 LineWraps[j - line_count] = FALSE; | |
| 9833 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
|
9834 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 9835 else |
| 9836 lineinvalid(temp, (int)Columns); | |
| 9837 } | |
| 9838 } | |
| 9839 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9840 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
|
9841 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9842 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
|
9843 screen_start_highlight(clear_attr); |
| 7 | 9844 |
| 9845 /* redraw the characters */ | |
| 9846 if (type == USE_REDRAW) | |
| 9847 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
|
9848 else if (type == USE_T_CD) /* delete the lines */ |
| 7 | 9849 { |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9850 windgoto(cursor_row, cursor_col); |
| 7 | 9851 out_str(T_CD); |
| 9852 screen_start(); /* don't know where cursor is now */ | |
| 9853 } | |
| 9854 else if (type == USE_T_CDL) | |
| 9855 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9856 windgoto(cursor_row, cursor_col); |
| 7 | 9857 term_delete_lines(line_count); |
| 9858 screen_start(); /* don't know where cursor is now */ | |
| 9859 } | |
| 9860 /* | |
| 9861 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 9862 * the whole screen (scroll region) up by outputting newlines on the | |
| 9863 * last line. | |
| 9864 */ | |
| 9865 else if (type == USE_NL) | |
| 9866 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9867 windgoto(cursor_end - 1, cursor_col); |
| 7 | 9868 for (i = line_count; --i >= 0; ) |
| 9869 out_char('\n'); /* cursor will remain on same line */ | |
| 9870 } | |
| 9871 else | |
| 9872 { | |
| 9873 for (i = line_count; --i >= 0; ) | |
| 9874 { | |
| 9875 if (type == USE_T_DL) | |
| 9876 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9877 windgoto(cursor_row, cursor_col); |
| 7 | 9878 out_str(T_DL); /* delete a line */ |
| 9879 } | |
| 9880 else /* type == USE_T_CE */ | |
| 9881 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9882 windgoto(cursor_row + i, cursor_col); |
| 7 | 9883 out_str(T_CE); /* erase a line */ |
| 9884 } | |
| 9885 screen_start(); /* don't know where cursor is now */ | |
| 9886 } | |
| 9887 } | |
| 9888 | |
| 9889 /* | |
| 9890 * If the 'db' flag is set, we need to clear the lines that have been | |
| 9891 * scrolled up at the bottom of the region. | |
| 9892 */ | |
| 9893 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 9894 { | |
| 9895 for (i = line_count; i > 0; --i) | |
| 9896 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9897 windgoto(cursor_end - i, cursor_col); |
| 7 | 9898 out_str(T_CE); /* erase a line */ |
| 9899 screen_start(); /* don't know where cursor is now */ | |
| 9900 } | |
| 9901 } | |
| 9902 | |
| 9903 #ifdef FEAT_GUI | |
| 9904 gui_can_update_cursor(); | |
| 9905 if (gui.in_use) | |
| 9906 out_flush(); /* always flush after a scroll */ | |
| 9907 #endif | |
| 9908 | |
| 9909 return OK; | |
| 9910 } | |
| 9911 | |
| 9912 /* | |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9913 * 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
|
9914 * 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
|
9915 */ |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9916 int |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9917 skip_showmode() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9918 { |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9919 // 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
|
9920 // 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
|
9921 if (global_busy |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9922 || msg_silent != 0 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9923 || !redrawing() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9924 || (char_avail() && !KeyTyped)) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9925 { |
|
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
|
9926 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
|
9927 return TRUE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9928 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9929 return FALSE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9930 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9931 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9932 /* |
|
13308
ae312df8d0ab
patch 8.0.1528: dead code found
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
9933 * Show the current mode and ruler. |
| 7 | 9934 * |
| 9935 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 9936 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 9937 * 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
|
9938 * If redraw_mode is TRUE show or clear the mode. |
| 7 | 9939 * Return the length of the message (0 if no message). |
| 9940 */ | |
| 9941 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9942 showmode(void) |
| 7 | 9943 { |
| 9944 int need_clear; | |
| 9945 int length = 0; | |
| 9946 int do_mode; | |
| 9947 int attr; | |
| 9948 int nwr_save; | |
| 9949 int sub_attr; | |
| 9950 | |
| 642 | 9951 do_mode = ((p_smd && msg_silent == 0) |
| 9952 && ((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
|
9953 || restart_edit != NUL |
| 5735 | 9954 || 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
|
9955 if (do_mode || reg_recording != 0) |
| 7 | 9956 { |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9957 if (skip_showmode()) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
9958 return 0; // show mode later |
| 7 | 9959 |
| 9960 nwr_save = need_wait_return; | |
| 9961 | |
| 9962 /* wait a bit before overwriting an important message */ | |
| 9963 check_for_delay(FALSE); | |
| 9964 | |
| 9965 /* if the cmdline is more than one line high, erase top lines */ | |
| 9966 need_clear = clear_cmdline; | |
| 9967 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 9968 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 9969 | |
| 9970 /* Position on the last line in the window, column 0 */ | |
| 9971 msg_pos_mode(); | |
| 9972 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
9973 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 9974 if (do_mode) |
| 9975 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
9976 msg_puts_attr("--", attr); |
| 7 | 9977 #if defined(FEAT_XIM) |
| 2520 | 9978 if ( |
| 9979 # ifdef FEAT_GUI_GTK | |
| 9980 preedit_get_status() | |
| 1668 | 9981 # else |
| 9982 im_get_status() | |
| 2520 | 9983 # endif |
| 1668 | 9984 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
9985 # 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
|
9986 msg_puts_attr(" IM", attr); |
| 7 | 9987 # else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
9988 msg_puts_attr(" XIM", attr); |
| 7 | 9989 # endif |
| 9990 #endif | |
| 9991 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 9992 if (gui.in_use) | |
| 9993 { | |
| 9994 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
9995 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
9996 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
9997 if (enc_utf8) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
9998 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
|
9999 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10000 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
|
10001 } |
| 7 | 10002 } |
| 10003 #endif | |
| 5946 | 10004 /* CTRL-X in Insert mode */ |
| 10005 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10006 { |
| 10007 /* These messages can get long, avoid a wrap in a narrow | |
| 10008 * window. Prefer showing edit_submode_extra. */ | |
| 10009 length = (Rows - msg_row) * Columns - 3; | |
| 10010 if (edit_submode_extra != NULL) | |
| 10011 length -= vim_strsize(edit_submode_extra); | |
| 10012 if (length > 0) | |
| 10013 { | |
| 10014 if (edit_submode_pre != NULL) | |
| 10015 length -= vim_strsize(edit_submode_pre); | |
| 10016 if (length - vim_strsize(edit_submode) > 0) | |
| 10017 { | |
| 10018 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
|
10019 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
|
10020 msg_puts_attr((char *)edit_submode, attr); |
| 7 | 10021 } |
| 10022 if (edit_submode_extra != NULL) | |
| 10023 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10024 msg_puts_attr(" ", attr); /* add a space in between */ |
| 7 | 10025 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
|
10026 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10027 else |
| 10028 sub_attr = attr; | |
|
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_extra, sub_attr); |
| 7 | 10030 } |
| 10031 } | |
| 10032 } | |
| 10033 else | |
| 10034 { | |
| 10035 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
|
10036 msg_puts_attr(_(" VREPLACE"), attr); |
|
14424
0a69e6e708f9
patch 8.1.0226: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
14218
diff
changeset
|
10037 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
|
10038 msg_puts_attr(_(" REPLACE"), attr); |
| 7 | 10039 else if (State & INSERT) |
| 10040 { | |
| 10041 #ifdef FEAT_RIGHTLEFT | |
| 10042 if (p_ri) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10043 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
|
10044 #endif |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10045 msg_puts_attr(_(" INSERT"), attr); |
| 7 | 10046 } |
|
14093
a9d94f10ecef
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Christian Brabandt <cb@256bit.org>
parents:
14089
diff
changeset
|
10047 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
|
10048 msg_puts_attr(_(" (insert)"), attr); |
| 7 | 10049 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
|
10050 msg_puts_attr(_(" (replace)"), attr); |
| 7 | 10051 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
|
10052 msg_puts_attr(_(" (vreplace)"), attr); |
| 7 | 10053 #ifdef FEAT_RIGHTLEFT |
| 10054 if (p_hkmap) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10055 msg_puts_attr(_(" Hebrew"), attr); |
| 7 | 10056 #endif |
| 10057 #ifdef FEAT_KEYMAP | |
| 10058 if (State & LANGMAP) | |
| 10059 { | |
| 10060 # ifdef FEAT_ARABIC | |
| 10061 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
|
10062 msg_puts_attr(_(" Arabic"), attr); |
| 7 | 10063 else |
| 10064 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10065 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
|
10066 NameBuff, MAXPATHL)) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10067 msg_puts_attr((char *)NameBuff, attr); |
| 7 | 10068 } |
| 10069 #endif | |
| 10070 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
|
10071 msg_puts_attr(_(" (paste)"), attr); |
| 7 | 10072 |
| 10073 if (VIsual_active) | |
| 10074 { | |
| 10075 char *p; | |
| 10076 | |
| 10077 /* Don't concatenate separate words to avoid translation | |
| 10078 * problems. */ | |
| 10079 switch ((VIsual_select ? 4 : 0) | |
| 10080 + (VIsual_mode == Ctrl_V) * 2 | |
| 10081 + (VIsual_mode == 'V')) | |
| 10082 { | |
| 10083 case 0: p = N_(" VISUAL"); break; | |
| 10084 case 1: p = N_(" VISUAL LINE"); break; | |
| 10085 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10086 case 4: p = N_(" SELECT"); break; | |
| 10087 case 5: p = N_(" SELECT LINE"); break; | |
| 10088 default: p = N_(" SELECT BLOCK"); break; | |
| 10089 } | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10090 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
|
10091 } |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10092 msg_puts_attr(" --", attr); |
| 7 | 10093 } |
| 644 | 10094 |
| 7 | 10095 need_clear = TRUE; |
| 10096 } | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10097 if (reg_recording != 0 |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17771
diff
changeset
|
10098 && edit_submode == NULL) // otherwise it gets too long |
| 7 | 10099 { |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10100 recording_mode(attr); |
| 7 | 10101 need_clear = TRUE; |
| 10102 } | |
| 644 | 10103 |
| 10104 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
|
10105 if (need_clear || clear_cmdline || redraw_mode) |
| 7 | 10106 msg_clr_eos(); |
| 10107 msg_didout = FALSE; /* overwrite this message */ | |
| 10108 length = msg_col; | |
| 10109 msg_col = 0; | |
| 10110 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10111 } | |
| 10112 else if (clear_cmdline && msg_silent == 0) | |
| 10113 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10114 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
|
10115 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
|
10116 { |
|
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
|
10117 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
|
10118 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
|
10119 } |
| 7 | 10120 |
| 10121 #ifdef FEAT_CMDL_INFO | |
| 10122 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10123 if (VIsual_active) | |
| 10124 clear_showcmd(); | |
| 10125 | |
| 10126 /* If the last window has no status line, the ruler is after the mode | |
| 10127 * 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
|
10128 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
|
10129 win_redr_ruler(lastwin, TRUE, FALSE); |
| 7 | 10130 #endif |
| 10131 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
|
10132 redraw_mode = FALSE; |
| 7 | 10133 clear_cmdline = FALSE; |
| 10134 | |
| 10135 return length; | |
| 10136 } | |
| 10137 | |
| 10138 /* | |
| 10139 * Position for a mode message. | |
| 10140 */ | |
| 10141 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10142 msg_pos_mode(void) |
| 7 | 10143 { |
| 10144 msg_col = 0; | |
| 10145 msg_row = Rows - 1; | |
| 10146 } | |
| 10147 | |
| 10148 /* | |
| 10149 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10150 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10151 * Caller should check "mode_displayed". |
| 7 | 10152 */ |
| 10153 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10154 unshowmode(int force) |
| 7 | 10155 { |
| 10156 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10157 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10158 */ |
| 10159 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10160 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10161 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10162 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10163 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10164 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10165 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10166 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10167 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10168 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10169 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10170 { |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10171 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
|
10172 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
|
10173 |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10174 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
|
10175 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
|
10176 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
|
10177 msg_clr_eos(); |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10178 |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10179 msg_col = save_msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10180 msg_row = save_msg_row; |
| 7 | 10181 } |
| 10182 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10183 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10184 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10185 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10186 msg_puts_attr(_("recording"), attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10187 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10188 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10189 char s[4]; |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10190 |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10191 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
|
10192 msg_puts_attr(s, attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10193 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10194 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10195 |
| 667 | 10196 /* |
| 10197 * Draw the tab pages line at the top of the Vim window. | |
| 10198 */ | |
|
15396
325e4a8ba1b6
patch 8.1.0706: tabline is not always redrawn
Bram Moolenaar <Bram@vim.org>
parents:
15384
diff
changeset
|
10199 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10200 draw_tabline(void) |
| 667 | 10201 { |
| 10202 int tabcount = 0; | |
| 10203 tabpage_T *tp; | |
| 10204 int tabwidth; | |
| 10205 int col = 0; | |
| 673 | 10206 int scol = 0; |
| 667 | 10207 int attr; |
| 10208 win_T *wp; | |
| 671 | 10209 win_T *cwp; |
| 10210 int wincount; | |
| 10211 int modified; | |
| 667 | 10212 int c; |
| 10213 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10214 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
|
10215 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
|
10216 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10217 char_u *p; |
| 677 | 10218 int room; |
| 10219 int use_sep_chars = (t_colors < 8 | |
| 10220 #ifdef FEAT_GUI | |
| 10221 && !gui.in_use | |
| 10222 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10223 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10224 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10225 #endif |
| 677 | 10226 ); |
| 673 | 10227 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10228 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10229 return; |
| 673 | 10230 redraw_tabline = FALSE; |
| 667 | 10231 |
| 685 | 10232 #ifdef FEAT_GUI_TABLINE |
| 798 | 10233 /* Take care of a GUI tabline. */ |
| 685 | 10234 if (gui_use_tabline()) |
| 10235 { | |
| 10236 gui_update_tabline(); | |
| 10237 return; | |
| 10238 } | |
| 10239 #endif | |
| 10240 | |
| 10241 if (tabline_height() < 1) | |
| 667 | 10242 return; |
| 10243 | |
| 677 | 10244 #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
|
10245 clear_TabPageIdxs(); |
| 681 | 10246 |
| 677 | 10247 /* Use the 'tabline' option if it's set. */ |
| 10248 if (*p_tal != NUL) | |
| 10249 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10250 int saved_did_emsg = did_emsg; |
| 680 | 10251 |
| 10252 /* Check for an error. If there is one we would loop in redrawing the | |
| 10253 * 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
|
10254 did_emsg = FALSE; |
| 677 | 10255 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10256 if (did_emsg) |
| 680 | 10257 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10258 (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
|
10259 did_emsg |= saved_did_emsg; |
| 680 | 10260 } |
| 10261 else | |
| 10262 #endif | |
| 10263 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10264 FOR_ALL_TABPAGES(tp) |
| 680 | 10265 ++tabcount; |
| 10266 | |
| 10267 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10268 if (tabwidth < 6) | |
| 10269 tabwidth = 6; | |
| 10270 | |
| 10271 attr = attr_nosel; | |
| 10272 tabcount = 0; | |
| 699 | 10273 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10274 tp = tp->tp_next) | |
| 680 | 10275 { |
| 10276 scol = col; | |
| 10277 | |
| 10278 if (tp->tp_topframe == topframe) | |
| 10279 attr = attr_sel; | |
| 10280 if (use_sep_chars && col > 0) | |
| 10281 screen_putchar('|', 0, col++, attr); | |
| 10282 | |
| 10283 if (tp->tp_topframe != topframe) | |
| 10284 attr = attr_nosel; | |
| 10285 | |
| 10286 screen_putchar(' ', 0, col++, attr); | |
| 10287 | |
| 10288 if (tp == curtab) | |
| 10289 { | |
| 10290 cwp = curwin; | |
| 10291 wp = firstwin; | |
| 10292 } | |
| 10293 else | |
| 10294 { | |
| 10295 cwp = tp->tp_curwin; | |
| 10296 wp = tp->tp_firstwin; | |
| 10297 } | |
| 10298 | |
| 10299 modified = FALSE; | |
| 10300 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10301 if (bufIsChanged(wp->w_buffer)) | |
| 10302 modified = TRUE; | |
| 10303 if (modified || wincount > 1) | |
| 10304 { | |
| 10305 if (wincount > 1) | |
| 10306 { | |
| 10307 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10308 len = (int)STRLEN(NameBuff); |
| 699 | 10309 if (col + len >= Columns - 3) |
| 10310 break; | |
| 680 | 10311 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10312 #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
|
10313 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10314 #else |
| 6106 | 10315 attr |
| 680 | 10316 #endif |
| 10317 ); | |
| 10318 col += len; | |
| 10319 } | |
| 10320 if (modified) | |
| 10321 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10322 screen_putchar(' ', 0, col++, attr); | |
| 10323 } | |
| 10324 | |
| 10325 room = scol - col + tabwidth - 1; | |
| 10326 if (room > 0) | |
| 10327 { | |
| 685 | 10328 /* Get buffer name in NameBuff[] */ |
| 10329 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10330 shorten_dir(NameBuff); |
| 680 | 10331 len = vim_strsize(NameBuff); |
| 10332 p = NameBuff; | |
| 10333 if (has_mbyte) | |
| 10334 while (len > room) | |
| 10335 { | |
| 10336 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10337 MB_PTR_ADV(p); |
| 680 | 10338 } |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
10339 else if (len > room) |
| 677 | 10340 { |
| 680 | 10341 p += len - room; |
| 10342 len = room; | |
| 677 | 10343 } |
| 699 | 10344 if (len > Columns - col - 1) |
| 10345 len = Columns - col - 1; | |
| 680 | 10346 |
| 835 | 10347 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10348 col += len; |
| 10349 } | |
| 10350 screen_putchar(' ', 0, col++, attr); | |
| 10351 | |
| 10352 /* Store the tab page number in TabPageIdxs[], so that | |
| 10353 * jump_to_mouse() knows where each one is. */ | |
| 10354 ++tabcount; | |
| 10355 while (scol < col) | |
| 10356 TabPageIdxs[scol++] = tabcount; | |
| 10357 } | |
| 10358 | |
| 10359 if (use_sep_chars) | |
| 10360 c = '_'; | |
| 10361 else | |
| 10362 c = ' '; | |
| 10363 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10364 |
| 10365 /* Put an "X" for closing the current tab if there are several. */ | |
| 10366 if (first_tabpage->tp_next != NULL) | |
| 10367 { | |
| 10368 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10369 TabPageIdxs[Columns - 1] = -999; | |
| 10370 } | |
| 10371 } | |
| 834 | 10372 |
| 10373 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10374 * set. */ | |
| 10375 redraw_tabline = FALSE; | |
| 667 | 10376 } |
| 685 | 10377 |
| 10378 /* | |
| 10379 * Get buffer name for "buf" into NameBuff[]. | |
| 10380 * Takes care of special buffer names and translates special characters. | |
| 10381 */ | |
| 10382 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10383 get_trans_bufname(buf_T *buf) |
| 685 | 10384 { |
| 10385 if (buf_spname(buf) != NULL) | |
| 3839 | 10386 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10387 else |
| 10388 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10389 trans_characters(NameBuff, MAXPATHL); | |
| 10390 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10391 |
| 7 | 10392 /* |
| 10393 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10394 */ | |
| 10395 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
|
10396 fillchar_status(int *attr, win_T *wp) |
| 7 | 10397 { |
| 10398 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
|
10399 |
|
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
|
10400 #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
|
10401 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
|
10402 { |
|
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
|
10403 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
|
10404 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10405 *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
|
10406 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
|
10407 } |
|
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
|
10408 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10409 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10410 *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
|
10411 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
|
10412 } |
|
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 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
|
10415 #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
|
10416 if (wp == curwin) |
| 7 | 10417 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10418 *attr = HL_ATTR(HLF_S); |
| 7 | 10419 fill = fill_stl; |
| 10420 } | |
| 10421 else | |
| 10422 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10423 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10424 fill = fill_stlnc; |
| 10425 } | |
| 10426 /* Use fill when there is highlighting, and highlighting of current | |
| 10427 * window differs, or the fillchars differ, or this is not the | |
| 10428 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10429 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
|
10430 || wp != curwin || ONE_WINDOW) |
| 7 | 10431 || (fill_stl != fill_stlnc))) |
| 10432 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
|
10433 if (wp == curwin) |
| 7 | 10434 return '^'; |
| 10435 return '='; | |
| 10436 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10437 |
| 7 | 10438 /* |
| 10439 * Get the character to use in a separator between vertically split windows. | |
| 10440 * Get its attributes in "*attr". | |
| 10441 */ | |
| 10442 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10443 fillchar_vsep(int *attr) |
| 7 | 10444 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10445 *attr = HL_ATTR(HLF_C); |
| 7 | 10446 if (*attr == 0 && fill_vert == ' ') |
| 10447 return '|'; | |
| 10448 else | |
| 10449 return fill_vert; | |
| 10450 } | |
| 10451 | |
| 10452 /* | |
| 10453 * Return TRUE if redrawing should currently be done. | |
| 10454 */ | |
| 10455 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10456 redrawing(void) |
| 7 | 10457 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10458 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10459 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
|
10460 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10461 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10462 #endif |
|
14673
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10463 return ((!RedrawingDisabled |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10464 #ifdef FEAT_EVAL |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10465 || 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
|
10466 #endif |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10467 ) && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 7 | 10468 } |
| 10469 | |
| 10470 /* | |
| 10471 * Return TRUE if printing messages should currently be done. | |
| 10472 */ | |
| 10473 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10474 messaging(void) |
| 7 | 10475 { |
| 10476 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10477 } | |
| 10478 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10479 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10480 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10481 * 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
|
10482 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10483 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10484 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
|
10485 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10486 vimmenu_T *menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10487 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
|
10488 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
|
10489 int col = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10490 int next_col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10491 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
|
10492 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
|
10493 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
|
10494 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10495 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
|
10496 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
|
10497 ++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
|
10498 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
|
10499 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10500 /* 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
|
10501 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
|
10502 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
|
10503 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10504 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
|
10505 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
|
10506 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10507 if (col > 1) |
|
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 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
|
10510 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
|
10511 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10512 } |
|
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 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
|
10515 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
|
10516 if (++col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10517 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10518 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10519 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
|
10520 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
|
10521 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10522 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
|
10523 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10524 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10525 wp->w_winbar_items[item_idx].wb_endcol = col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10526 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
|
10527 ++item_idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10528 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10529 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
|
10530 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10531 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
|
10532 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10533 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10534 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
|
10535 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10536 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
|
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_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
|
10540 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10541 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
|
10542 (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
|
10543 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10544 #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
|
10545 |
| 7 | 10546 /* |
| 10547 * Show current status info in ruler and various other places | |
| 10548 * If always is FALSE, only show ruler if position has changed. | |
| 10549 */ | |
| 10550 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10551 showruler(int always) |
| 7 | 10552 { |
| 10553 if (!always && !redrawing()) | |
| 10554 return; | |
| 574 | 10555 if (pum_visible()) |
| 10556 { | |
| 10557 /* Don't redraw right now, do it later. */ | |
| 10558 curwin->w_redr_status = TRUE; | |
| 10559 return; | |
| 10560 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10561 #if defined(FEAT_STL_OPT) |
| 40 | 10562 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 1983 | 10563 redraw_custom_statusline(curwin); |
| 7 | 10564 else |
| 10565 #endif | |
| 10566 #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
|
10567 win_redr_ruler(curwin, always, FALSE); |
| 7 | 10568 #endif |
| 10569 | |
| 10570 #ifdef FEAT_TITLE | |
| 10571 if (need_maketitle | |
| 10572 # ifdef FEAT_STL_OPT | |
| 10573 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10574 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10575 # endif | |
| 10576 ) | |
| 10577 maketitle(); | |
| 10578 #endif | |
| 1588 | 10579 /* Redraw the tab pages line if needed. */ |
| 10580 if (redraw_tabline) | |
| 10581 draw_tabline(); | |
| 7 | 10582 } |
| 10583 | |
| 10584 #ifdef FEAT_CMDL_INFO | |
| 10585 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
|
10586 win_redr_ruler(win_T *wp, int always, int ignore_pum) |
| 7 | 10587 { |
| 1869 | 10588 #define RULER_BUF_LEN 70 |
| 10589 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10590 int row; |
| 10591 int fillchar; | |
| 10592 int attr; | |
| 10593 int empty_line = FALSE; | |
| 10594 colnr_T virtcol; | |
| 10595 int i; | |
| 1869 | 10596 size_t len; |
| 7 | 10597 int o; |
| 10598 int this_ru_col; | |
| 10599 int off = 0; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
10600 int width; |
| 7 | 10601 |
| 10602 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10603 if (!p_ru) | |
| 10604 return; | |
| 10605 | |
| 10606 /* | |
| 10607 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10608 * after deleting lines, before cursor.lnum is corrected. | |
| 10609 */ | |
| 10610 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10611 return; | |
| 10612 | |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17771
diff
changeset
|
10613 // Don't draw the ruler while doing insert-completion, it might overwrite |
|
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17771
diff
changeset
|
10614 // the (long) mode message. |
| 7 | 10615 if (wp == lastwin && lastwin->w_status_height == 0) |
| 10616 if (edit_submode != NULL) | |
| 10617 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
|
10618 // 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
|
10619 // 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
|
10620 if (!ignore_pum && pum_visible()) |
| 540 | 10621 return; |
| 7 | 10622 |
| 10623 #ifdef FEAT_STL_OPT | |
| 10624 if (*p_ruf) | |
| 10625 { | |
| 680 | 10626 int save_called_emsg = called_emsg; |
| 10627 | |
| 10628 called_emsg = FALSE; | |
| 7 | 10629 win_redr_custom(wp, TRUE); |
| 680 | 10630 if (called_emsg) |
| 10631 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 10632 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 10633 called_emsg |= save_called_emsg; |
| 7 | 10634 return; |
| 10635 } | |
| 10636 #endif | |
| 10637 | |
| 10638 /* | |
| 10639 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 10640 */ | |
| 10641 if (!(State & INSERT) | |
| 10642 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 10643 empty_line = TRUE; | |
| 10644 | |
| 10645 /* | |
| 10646 * Only draw the ruler when something changed. | |
| 10647 */ | |
| 10648 validate_virtcol_win(wp); | |
| 10649 if ( redraw_cmdline | |
| 10650 || always | |
| 10651 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 10652 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 10653 || wp->w_virtcol != wp->w_ru_virtcol | |
| 10654 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 10655 || wp->w_topline != wp->w_ru_topline | |
| 10656 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 10657 #ifdef FEAT_DIFF | |
| 10658 || wp->w_topfill != wp->w_ru_topfill | |
| 10659 #endif | |
| 10660 || empty_line != wp->w_ru_empty) | |
| 10661 { | |
| 10662 cursor_off(); | |
| 10663 if (wp->w_status_height) | |
| 10664 { | |
| 10665 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
|
10666 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
|
10667 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
|
10668 width = wp->w_width; |
| 7 | 10669 } |
| 10670 else | |
| 10671 { | |
| 10672 row = Rows - 1; | |
| 10673 fillchar = ' '; | |
| 10674 attr = 0; | |
| 10675 width = Columns; | |
| 10676 off = 0; | |
| 10677 } | |
| 10678 | |
| 10679 /* In list mode virtcol needs to be recomputed */ | |
| 10680 virtcol = wp->w_virtcol; | |
| 10681 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 10682 { | |
| 10683 wp->w_p_list = FALSE; | |
| 10684 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 10685 wp->w_p_list = TRUE; | |
| 10686 } | |
| 10687 | |
| 10688 /* | |
| 10689 * Some sprintfs return the length, some return a pointer. | |
| 10690 * To avoid portability problems we use strlen() here. | |
| 10691 */ | |
| 1869 | 10692 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 10693 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 10694 ? 0L | |
| 10695 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 10696 len = STRLEN(buffer); |
| 10697 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 10698 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 10699 (int)virtcol + 1); | |
| 10700 | |
| 10701 /* | |
| 10702 * Add a "50%" if there is room for it. | |
| 10703 * On the last line, don't print in the last column (scrolls the | |
| 10704 * screen up on some terminals). | |
| 10705 */ | |
| 10706 i = (int)STRLEN(buffer); | |
| 1869 | 10707 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 10708 o = i + vim_strsize(buffer + i + 1); |
| 10709 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 10710 ++o; | |
| 10711 this_ru_col = ru_col - (Columns - width); | |
| 10712 if (this_ru_col < 0) | |
| 10713 this_ru_col = 0; | |
| 10714 /* Never use more than half the window/screen width, leave the other | |
| 10715 * 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
|
10716 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
|
10717 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
|
10718 if (this_ru_col + o < width) |
| 7 | 10719 { |
| 6466 | 10720 /* 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
|
10721 while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) |
| 7 | 10722 { |
| 10723 if (has_mbyte) | |
| 10724 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 10725 else | |
| 10726 buffer[i++] = fillchar; | |
| 10727 ++o; | |
| 10728 } | |
| 1869 | 10729 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 10730 } |
| 10731 /* Truncate at window boundary. */ | |
| 10732 if (has_mbyte) | |
| 10733 { | |
| 10734 o = 0; | |
| 474 | 10735 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 10736 { |
| 10737 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
|
10738 if (this_ru_col + o > width) |
| 7 | 10739 { |
| 10740 buffer[i] = NUL; | |
| 10741 break; | |
| 10742 } | |
| 10743 } | |
| 10744 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
10745 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
|
10746 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
|
10747 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10748 screen_puts(buffer, row, this_ru_col + off, attr); |
| 7 | 10749 i = redraw_cmdline; |
| 10750 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
|
10751 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
|
10752 (int)(off + width), |
| 7 | 10753 fillchar, fillchar, attr); |
| 10754 /* don't redraw the cmdline because of showing the ruler */ | |
| 10755 redraw_cmdline = i; | |
| 10756 wp->w_ru_cursor = wp->w_cursor; | |
| 10757 wp->w_ru_virtcol = wp->w_virtcol; | |
| 10758 wp->w_ru_empty = empty_line; | |
| 10759 wp->w_ru_topline = wp->w_topline; | |
| 10760 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 10761 #ifdef FEAT_DIFF | |
| 10762 wp->w_ru_topfill = wp->w_topfill; | |
| 10763 #endif | |
| 10764 } | |
| 10765 } | |
| 10766 #endif | |
| 13 | 10767 |
| 10768 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 10769 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
10770 * 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
|
10771 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 10772 * Otherwise it depends on 'numberwidth' and the line count. |
| 10773 */ | |
| 10774 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10775 number_width(win_T *wp) |
| 13 | 10776 { |
| 10777 int n; | |
| 10778 linenr_T lnum; | |
| 10779 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10780 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
|
10781 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10782 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10783 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10784 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10785 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
|
10786 |
| 6679 | 10787 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 10788 return wp->w_nrwidth_width; |
| 10789 wp->w_nrwidth_line_count = lnum; | |
| 10790 | |
| 10791 n = 0; | |
| 10792 do | |
| 10793 { | |
| 856 | 10794 lnum /= 10; |
| 10795 ++n; | |
| 13 | 10796 } while (lnum > 0); |
| 10797 | |
| 10798 /* 'numberwidth' gives the minimal width plus one */ | |
| 10799 if (n < wp->w_p_nuw - 1) | |
| 10800 n = wp->w_p_nuw - 1; | |
| 10801 | |
|
17247
cbd0432cf8ff
patch 8.1.1623: display wrong with signs in narrow number column
Bram Moolenaar <Bram@vim.org>
parents:
17229
diff
changeset
|
10802 # 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
|
10803 // 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
|
10804 // 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
|
10805 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
|
10806 && (*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
|
10807 n = 2; |
|
cbd0432cf8ff
patch 8.1.1623: display wrong with signs in narrow number column
Bram Moolenaar <Bram@vim.org>
parents:
17229
diff
changeset
|
10808 # endif |
|
cbd0432cf8ff
patch 8.1.1623: display wrong with signs in narrow number column
Bram Moolenaar <Bram@vim.org>
parents:
17229
diff
changeset
|
10809 |
| 13 | 10810 wp->w_nrwidth_width = n; |
| 6679 | 10811 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 10812 return n; |
| 10813 } | |
| 10814 #endif | |
| 3986 | 10815 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
10816 #if defined(FEAT_EVAL) || defined(PROTO) |
| 3986 | 10817 /* |
| 10818 * Return the current cursor column. This is the actual position on the | |
| 10819 * screen. First column is 0. | |
| 10820 */ | |
| 10821 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10822 screen_screencol(void) |
| 3986 | 10823 { |
| 10824 return screen_cur_col; | |
| 10825 } | |
| 10826 | |
| 10827 /* | |
| 10828 * Return the current cursor row. This is the actual position on the screen. | |
| 10829 * First row is 0. | |
| 10830 */ | |
| 10831 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10832 screen_screenrow(void) |
| 3986 | 10833 { |
| 10834 return screen_cur_row; | |
| 10835 } | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
10836 #endif |