Mercurial > vim
annotate src/screen.c @ 15555:d89c5b339c2a v8.1.0785
patch 8.1.0785: depending on the configuration some functions are unused
commit https://github.com/vim/vim/commit/113e10721f42fc2500b63fe95193f8665658a90c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 20 15:30:40 2019 +0100
patch 8.1.0785: depending on the configuration some functions are unused
Problem: Depending on the configuration some functions are unused.
Solution: Add more #ifdefs, remove unused functions. (Dominique Pelle,
closes #3822)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 20 Jan 2019 15:45:07 +0100 |
| parents | dd725a8ab112 |
| children | 639b8318472c |
| 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 | |
| 107 static match_T search_hl; /* used for 'hlsearch' highlight matching */ | |
| 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); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
126 static void win_draw_end(win_T *wp, int c1, int c2, 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 |
| 5985 | 138 # define SEARCH_HL_PRIORITY 0 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
139 static void start_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
140 static void end_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
141 static void init_search_hl(win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
142 static void prepare_search_hl(win_T *wp, linenr_T lnum); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
143 static void next_search_hl(win_T *win, match_T *shl, linenr_T lnum, colnr_T mincol, matchitem_T *cur); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
144 static int next_search_hl_pos(match_T *shl, linenr_T lnum, posmatch_T *pos, colnr_T mincol); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
145 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
146 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
|
147 #ifdef FEAT_MBYTE |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
148 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
|
149 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
150 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
|
151 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
|
152 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
|
153 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
|
154 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
|
155 static void msg_pos_mode(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
156 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
|
157 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
|
158 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
|
159 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
160 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
|
161 #endif |
| 7 | 162 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
163 static void win_redr_custom(win_T *wp, int draw_ruler); |
| 7 | 164 #endif |
| 165 #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
|
166 static void win_redr_ruler(win_T *wp, int always, int ignore_pum); |
| 7 | 167 #endif |
| 168 | |
| 169 /* Ugly global: overrule attribute used by screen_char() */ | |
| 170 static int screen_char_attr = 0; | |
| 171 | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
172 #if defined(FEAT_SYN_HL) && defined(FEAT_RELTIME) |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
173 /* Can limit syntax highlight time to 'redrawtime'. */ |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
174 # define SYN_TIME_LIMIT 1 |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
175 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
176 |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
177 #ifdef FEAT_RIGHTLEFT |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
178 # define HAS_RIGHTLEFT(x) x |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
179 #else |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
180 # define HAS_RIGHTLEFT(x) FALSE |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
181 #endif |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
182 |
| 7 | 183 /* |
| 184 * Redraw the current window later, with update_screen(type). | |
| 185 * 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
|
186 * E.g. if must_redraw is CLEAR, type NOT_VALID will do nothing. |
| 7 | 187 */ |
| 188 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
189 redraw_later(int type) |
| 7 | 190 { |
| 191 redraw_win_later(curwin, type); | |
| 192 } | |
| 193 | |
| 194 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
195 redraw_win_later( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
196 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
197 int type) |
| 7 | 198 { |
|
12672
4e846c9d61a8
patch 8.0.1214: accessing freed memory when EXITFREE is set
Christian Brabandt <cb@256bit.org>
parents:
12582
diff
changeset
|
199 if (!exiting && wp->w_redr_type < type) |
| 7 | 200 { |
| 201 wp->w_redr_type = type; | |
| 202 if (type >= NOT_VALID) | |
| 203 wp->w_lines_valid = 0; | |
| 204 if (must_redraw < type) /* must_redraw is the maximum of all windows */ | |
| 205 must_redraw = type; | |
| 206 } | |
| 207 } | |
| 208 | |
| 209 /* | |
| 210 * Force a complete redraw later. Also resets the highlighting. To be used | |
| 211 * after executing a shell command that messes up the screen. | |
| 212 */ | |
| 213 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
214 redraw_later_clear(void) |
| 7 | 215 { |
| 216 redraw_all_later(CLEAR); | |
| 826 | 217 #ifdef FEAT_GUI |
| 218 if (gui.in_use) | |
| 219 /* Use a code that will reset gui.highlight_mask in | |
| 220 * gui_stop_highlight(). */ | |
| 221 screen_attr = HL_ALL + 1; | |
| 222 else | |
| 223 #endif | |
| 224 /* 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
|
225 screen_attr = HL_BOLD | HL_UNDERLINE | HL_INVERSE | HL_STRIKETHROUGH; |
| 7 | 226 } |
| 227 | |
| 228 /* | |
| 229 * Mark all windows to be redrawn later. | |
| 230 */ | |
| 231 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
232 redraw_all_later(int type) |
| 7 | 233 { |
| 234 win_T *wp; | |
| 235 | |
| 236 FOR_ALL_WINDOWS(wp) | |
| 237 { | |
| 238 redraw_win_later(wp, type); | |
| 239 } | |
|
15384
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
240 // 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
|
241 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
|
242 must_redraw = type; |
| 7 | 243 } |
| 244 | |
| 245 /* | |
| 301 | 246 * Mark all windows that are editing the current buffer to be updated later. |
| 7 | 247 */ |
| 248 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
249 redraw_curbuf_later(int type) |
| 7 | 250 { |
| 251 redraw_buf_later(curbuf, type); | |
| 252 } | |
| 253 | |
| 254 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
255 redraw_buf_later(buf_T *buf, int type) |
| 7 | 256 { |
| 257 win_T *wp; | |
| 258 | |
| 259 FOR_ALL_WINDOWS(wp) | |
| 260 { | |
| 261 if (wp->w_buffer == buf) | |
| 262 redraw_win_later(wp, type); | |
| 263 } | |
| 264 } | |
| 265 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
266 #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
|
267 void |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
268 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
|
269 { |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
270 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
|
271 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
272 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
|
273 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
|
274 && 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
|
275 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
|
276 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
277 #endif |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
278 |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
279 #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
|
280 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
|
281 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
|
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 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
|
284 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
285 #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
|
286 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
|
287 /* 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
|
288 * 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
|
289 return; |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
290 #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
|
291 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
|
292 { |
|
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
|
293 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
|
294 { |
|
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
|
295 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
|
296 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
|
297 } |
|
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
|
298 } |
|
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
|
299 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
300 #endif |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
301 |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
302 #if defined(FEAT_TERMRESPONSE) || defined(PROTO) |
| 7 | 303 /* |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
304 * 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
|
305 * 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
|
306 * Return a code indicating what happened. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
307 */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
308 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
309 redraw_asap(int type) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
310 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
311 int rows; |
| 6959 | 312 int cols = screen_Columns; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
313 int r; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
314 int ret = 0; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
315 schar_T *screenline; /* copy from ScreenLines[] */ |
|
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
316 sattr_T *screenattr; /* copy from ScreenAttrs[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
317 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
318 int i; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
319 u8char_T *screenlineUC = NULL; /* copy from ScreenLinesUC[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
320 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
|
321 schar_T *screenline2 = NULL; /* copy from ScreenLines2[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
322 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
323 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
324 redraw_later(type); |
| 6959 | 325 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
|
326 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
327 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
328 /* Allocate space to save the text displayed in the command line area. */ |
| 6959 | 329 rows = screen_Rows - cmdline_row; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
330 screenline = (schar_T *)lalloc( |
| 6959 | 331 (long_u)(rows * cols * sizeof(schar_T)), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
332 screenattr = (sattr_T *)lalloc( |
| 6959 | 333 (long_u)(rows * cols * sizeof(sattr_T)), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
334 if (screenline == NULL || screenattr == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
335 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
336 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
337 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
338 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
339 screenlineUC = (u8char_T *)lalloc( |
| 6959 | 340 (long_u)(rows * cols * sizeof(u8char_T)), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
341 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
342 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
343 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
344 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
345 screenlineC[i] = (u8char_T *)lalloc( |
| 6959 | 346 (long_u)(rows * cols * sizeof(u8char_T)), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
347 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
348 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
349 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
350 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
351 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
352 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
353 screenline2 = (schar_T *)lalloc( |
| 6959 | 354 (long_u)(rows * cols * sizeof(schar_T)), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
355 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
356 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
357 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
358 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
359 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
360 if (ret != 2) |
|
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 /* 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
|
363 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
364 { |
| 6959 | 365 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
366 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 367 (size_t)cols * sizeof(schar_T)); |
| 368 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
369 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 370 (size_t)cols * sizeof(sattr_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
371 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
372 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
373 { |
| 6959 | 374 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
375 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 376 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
377 for (i = 0; i < p_mco; ++i) |
| 6959 | 378 mch_memmove(screenlineC[i] + r * cols, |
| 379 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 380 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
381 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
382 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 383 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
384 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 385 (size_t)cols * sizeof(schar_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
386 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
387 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
388 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
389 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
390 ret = 3; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
391 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
392 if (must_redraw == 0) |
|
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 int off = (int)(current_ScreenLine - ScreenLines); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
395 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
396 /* 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
|
397 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
398 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
399 mch_memmove(current_ScreenLine, |
| 6959 | 400 screenline + r * cols, |
| 401 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
402 mch_memmove(ScreenAttrs + off, |
| 6959 | 403 screenattr + r * cols, |
| 404 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
405 #ifdef FEAT_MBYTE |
|
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 mch_memmove(ScreenLinesUC + off, |
| 6959 | 409 screenlineUC + r * cols, |
| 410 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
411 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
412 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 413 screenlineC[i] + r * cols, |
| 414 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
415 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
416 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
417 mch_memmove(ScreenLines2 + off, |
| 6959 | 418 screenline2 + r * cols, |
| 419 (size_t)cols * sizeof(schar_T)); | |
| 420 #endif | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
421 screen_line(cmdline_row + r, 0, cols, cols, FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
422 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
423 ret = 4; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
424 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
425 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
426 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
427 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
428 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
429 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
430 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
431 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
432 vim_free(screenlineUC); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
433 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
434 vim_free(screenlineC[i]); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
435 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
436 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
437 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
438 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
439 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
440 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
441 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
442 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
443 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
444 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
445 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
446 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
447 #endif |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
448 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
449 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
450 * 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
|
451 * 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
|
452 * 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
|
453 * 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
|
454 * command line. |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
455 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
456 void |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
457 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
|
458 { |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
459 ++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
|
460 |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
461 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
|
462 ; // do nothing |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
463 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
|
464 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
465 // 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
|
466 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
|
467 { |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
468 // 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
|
469 // wildmenu entries. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
470 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
|
471 #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
|
472 && 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
|
473 #endif |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
474 && call_update_screen) |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
475 update_screen(0); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
476 |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
477 // 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
|
478 // editing the command. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
479 redrawcmdline_ex(FALSE); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
480 } |
|
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
|
481 } |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
482 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
|
483 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
484 // 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
|
485 update_screen(VALID_NO_UPDATE); |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
486 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
487 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
488 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
489 #ifdef FEAT_GUI |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
490 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
|
491 // 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
|
492 // flicker. |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
493 out_flush_cursor(FALSE, FALSE); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
494 else |
|
13204
a8a154cafc60
patch 8.0.1476: screen isn't always updated right away
Christian Brabandt <cb@256bit.org>
parents:
13150
diff
changeset
|
495 #endif |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
496 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
|
497 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
498 --redrawing_for_callback; |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
499 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
500 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
501 /* |
| 7 | 502 * Changed something in the current window, at buffer line "lnum", that |
| 503 * requires that line and possibly other lines to be redrawn. | |
| 504 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 505 * Used to remove the "$" from a change command. | |
| 506 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 507 * may become invalid and the whole window will have to be redrawn. | |
| 508 */ | |
| 509 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
510 redrawWinline( |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
511 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
|
512 linenr_T lnum) |
|
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15396
diff
changeset
|
513 { |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
514 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
|
515 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
|
516 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
|
517 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
|
518 redraw_win_later(wp, VALID); |
| 7 | 519 } |
| 520 | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
521 void |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
522 reset_updating_screen(int may_resize_shell UNUSED) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
523 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
524 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
|
525 #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
|
526 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
|
527 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
|
528 #endif |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
529 #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
|
530 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
|
531 #endif |
|
14428
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
532 |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
533 #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
|
534 // 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
|
535 // 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
|
536 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
|
537 #endif |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
538 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
539 |
| 7 | 540 /* |
|
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
|
541 * Update all windows that are editing the current buffer. |
| 7 | 542 */ |
| 543 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
544 update_curbuf(int type) |
| 7 | 545 { |
| 546 redraw_curbuf_later(type); | |
| 547 update_screen(type); | |
| 548 } | |
| 549 | |
| 550 /* | |
| 551 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 552 * 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
|
553 * 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
|
554 */ |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
555 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
|
556 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
|
557 { |
|
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 int type = type_arg; |
| 7 | 559 win_T *wp; |
| 560 static int did_intro = FALSE; | |
| 561 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 562 int did_one; | |
| 563 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
564 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
565 int did_undraw = FALSE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
566 int gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
567 int gui_cursor_row; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
568 #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
|
569 int no_update = FALSE; |
| 7 | 570 |
| 2008 | 571 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 572 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
|
573 return FAIL; |
| 7 | 574 |
|
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
|
575 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
|
576 { |
|
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
|
577 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
|
578 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
|
579 } |
|
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
|
580 |
| 7 | 581 if (must_redraw) |
| 582 { | |
| 583 if (type < must_redraw) /* use maximal type */ | |
| 584 type = must_redraw; | |
| 1331 | 585 |
| 586 /* must_redraw is reset here, so that when we run into some weird | |
| 587 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 588 * scrolling), or update_topline() in win_update() will cause a | |
| 589 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 590 must_redraw = 0; |
| 591 } | |
| 592 | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
593 /* 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
|
594 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
|
595 #ifdef FEAT_TERMINAL |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
596 && !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
|
597 #endif |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
598 ) |
| 7 | 599 type = NOT_VALID; |
| 600 | |
| 2008 | 601 /* Postpone the redrawing when it's not needed and when being called |
| 602 * recursively. */ | |
| 603 if (!redrawing() || updating_screen) | |
| 7 | 604 { |
| 605 redraw_later(type); /* remember type for next time */ | |
| 606 must_redraw = type; | |
| 607 if (type > INVERTED_ALL) | |
| 608 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
|
609 return FAIL; |
| 7 | 610 } |
| 611 | |
| 612 updating_screen = TRUE; | |
| 613 #ifdef FEAT_SYN_HL | |
| 614 ++display_tick; /* let syntax code know we're in a next round of | |
| 615 * display updating */ | |
| 616 #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
|
617 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
|
618 ++no_win_do_lines_ins; |
| 7 | 619 |
| 620 /* | |
| 621 * if the screen was scrolled up when displaying a message, scroll it down | |
| 622 */ | |
| 623 if (msg_scrolled) | |
| 624 { | |
| 625 clear_cmdline = TRUE; | |
| 626 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 627 type = CLEAR; | |
| 628 else if (type != CLEAR) | |
| 629 { | |
| 630 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
|
631 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
|
632 == FAIL) |
| 7 | 633 type = CLEAR; |
| 634 FOR_ALL_WINDOWS(wp) | |
| 635 { | |
| 636 if (W_WINROW(wp) < msg_scrolled) | |
| 637 { | |
| 638 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 639 && wp->w_redr_type < REDRAW_TOP | |
| 640 && wp->w_lines_valid > 0 | |
| 641 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 642 { | |
| 643 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 644 wp->w_redr_type = REDRAW_TOP; | |
| 645 } | |
| 646 else | |
| 647 { | |
| 648 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
|
649 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
|
650 <= msg_scrolled) |
| 7 | 651 wp->w_redr_status = TRUE; |
| 652 } | |
| 653 } | |
| 654 } | |
|
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
|
655 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
|
656 redraw_cmdline = TRUE; |
| 673 | 657 redraw_tabline = TRUE; |
| 7 | 658 } |
| 659 msg_scrolled = 0; | |
| 660 need_wait_return = FALSE; | |
| 661 } | |
| 662 | |
| 663 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 664 compute_cmdrow(); | |
| 665 | |
| 666 /* Check for changed highlighting */ | |
| 667 if (need_highlight_changed) | |
| 668 highlight_changed(); | |
| 669 | |
| 670 if (type == CLEAR) /* first clear screen */ | |
| 671 { | |
| 672 screenclear(); /* will reset clear_cmdline */ | |
| 673 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
|
674 /* 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
|
675 must_redraw = 0; |
| 7 | 676 } |
| 677 | |
| 678 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 679 check_for_delay(FALSE); | |
| 680 | |
| 13 | 681 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
682 /* 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
|
683 * changes. */ |
| 13 | 684 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
685 && 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
|
686 ? number_width(curwin) : 0)) |
| 13 | 687 curwin->w_redr_type = NOT_VALID; |
| 688 #endif | |
| 689 | |
| 7 | 690 /* |
| 691 * Only start redrawing if there is really something to do. | |
| 692 */ | |
| 693 if (type == INVERTED) | |
| 694 update_curswant(); | |
| 695 if (curwin->w_redr_type < type | |
| 696 && !((type == VALID | |
| 697 && curwin->w_lines[0].wl_valid | |
| 698 #ifdef FEAT_DIFF | |
| 699 && curwin->w_topfill == curwin->w_old_topfill | |
| 700 && curwin->w_botfill == curwin->w_old_botfill | |
| 701 #endif | |
| 702 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 703 || (type == INVERTED | |
| 1043 | 704 && VIsual_active |
| 7 | 705 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 706 && curwin->w_old_visual_mode == VIsual_mode | |
| 707 && (curwin->w_valid & VALID_VIRTCOL) | |
| 708 && curwin->w_old_curswant == curwin->w_curswant) | |
| 709 )) | |
| 710 curwin->w_redr_type = type; | |
| 711 | |
| 849 | 712 /* Redraw the tab pages line if needed. */ |
| 713 if (redraw_tabline || type >= NOT_VALID) | |
| 714 draw_tabline(); | |
| 715 | |
| 7 | 716 #ifdef FEAT_SYN_HL |
| 717 /* | |
| 718 * Correct stored syntax highlighting info for changes in each displayed | |
| 719 * buffer. Each buffer must only be done once. | |
| 720 */ | |
| 721 FOR_ALL_WINDOWS(wp) | |
| 722 { | |
| 723 if (wp->w_buffer->b_mod_set) | |
| 724 { | |
| 725 win_T *wwp; | |
| 726 | |
| 727 /* Check if we already did this buffer. */ | |
| 728 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 729 if (wwp->w_buffer == wp->w_buffer) | |
| 730 break; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
731 if (wwp == wp && syntax_present(wp)) |
| 7 | 732 syn_stack_apply_changes(wp->w_buffer); |
| 733 } | |
| 734 } | |
| 735 #endif | |
| 736 | |
| 737 /* | |
| 738 * Go from top to bottom through the windows, redrawing the ones that need | |
| 739 * it. | |
| 740 */ | |
| 741 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 742 did_one = FALSE; | |
| 743 #endif | |
| 744 #ifdef FEAT_SEARCH_EXTRA | |
| 745 search_hl.rm.regprog = NULL; | |
| 746 #endif | |
| 747 FOR_ALL_WINDOWS(wp) | |
| 748 { | |
| 749 if (wp->w_redr_type != 0) | |
| 750 { | |
| 751 cursor_off(); | |
| 752 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 753 if (!did_one) | |
| 754 { | |
| 755 did_one = TRUE; | |
| 756 # ifdef FEAT_SEARCH_EXTRA | |
| 757 start_search_hl(); | |
| 758 # endif | |
| 759 # ifdef FEAT_CLIPBOARD | |
| 760 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 761 if (clip_star.available && clip_isautosel_star()) |
| 762 clip_update_selection(&clip_star); | |
| 763 if (clip_plus.available && clip_isautosel_plus()) | |
| 764 clip_update_selection(&clip_plus); | |
| 7 | 765 # endif |
| 766 #ifdef FEAT_GUI | |
| 767 /* Remove the cursor before starting to do anything, because | |
| 768 * scrolling may make it difficult to redraw the text under | |
| 769 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
770 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
|
771 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
772 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
773 gui_cursor_row = gui.cursor_row; |
| 7 | 774 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
775 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
776 } |
| 7 | 777 #endif |
| 778 } | |
| 779 #endif | |
| 780 win_update(wp); | |
| 781 } | |
| 782 | |
| 783 /* redraw status line after the window to minimize cursor movement */ | |
| 784 if (wp->w_redr_status) | |
| 785 { | |
| 786 cursor_off(); | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
787 win_redr_status(wp, TRUE); // any popup menu will be redrawn below |
| 7 | 788 } |
| 789 } | |
| 790 #if defined(FEAT_SEARCH_EXTRA) | |
| 791 end_search_hl(); | |
| 792 #endif | |
| 4107 | 793 #ifdef FEAT_INS_EXPAND |
| 794 /* May need to redraw the popup menu. */ | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
795 pum_may_redraw(); |
| 4107 | 796 #endif |
| 7 | 797 |
| 798 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 799 * 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
|
800 FOR_ALL_WINDOWS(wp) |
| 7 | 801 wp->w_buffer->b_mod_set = FALSE; |
| 802 | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
803 reset_updating_screen(TRUE); |
| 7 | 804 |
| 805 /* Clear or redraw the command line. Done last, because scrolling may | |
| 806 * mess up the command line. */ | |
| 807 if (clear_cmdline || redraw_cmdline) | |
| 808 showmode(); | |
| 809 | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
810 if (no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
811 --no_win_do_lines_ins; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
812 |
| 7 | 813 /* May put up an introductory message when not editing a file */ |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
814 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
815 maybe_intro_message(); |
| 7 | 816 did_intro = TRUE; |
| 817 | |
| 818 #ifdef FEAT_GUI | |
| 819 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 820 * done. */ | |
| 821 if (gui.in_use) | |
| 822 { | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
823 if (did_undraw && !gui_mch_is_blink_off()) |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
824 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
825 mch_disable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
826 out_flush(); /* required before updating the cursor */ |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
827 mch_enable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
828 |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
829 /* Put the GUI position where the cursor was, gui_update_cursor() |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
830 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
831 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
832 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
833 # ifdef FEAT_MBYTE |
|
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
834 gui.col = mb_fix_col(gui.col, gui.row); |
|
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
835 # endif |
| 7 | 836 gui_update_cursor(FALSE, FALSE); |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
837 gui_may_flush(); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
838 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
839 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
840 } |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
841 else |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
842 out_flush(); |
| 7 | 843 gui_update_scrollbars(FALSE); |
| 844 } | |
| 845 #endif | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
846 return OK; |
| 7 | 847 } |
| 848 | |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
849 #if defined(FEAT_SIGNS) || defined(FEAT_GUI) || defined(FEAT_CONCEAL) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
850 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
851 * 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
|
852 * 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
|
853 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
854 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
855 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
856 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
857 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
858 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
859 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
860 /* 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
|
861 * 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
|
862 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
863 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
864 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
865 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
866 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
867 #endif |
|
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 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
876 if (redraw_cmdline) |
|
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 |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
883 reset_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 | |
| 984 | |
| 985 #if defined(FEAT_GUI) || defined(PROTO) | |
| 986 /* | |
| 987 * Update a single window, its status line and maybe the command line msg. | |
| 988 * Used for the GUI scrollbar. | |
| 989 */ | |
| 990 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
991 updateWindow(win_T *wp) |
| 7 | 992 { |
| 2008 | 993 /* return if already busy updating */ |
| 994 if (updating_screen) | |
| 995 return; | |
| 996 | |
| 7 | 997 update_prepare(); |
| 998 | |
| 999 #ifdef FEAT_CLIPBOARD | |
| 1000 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1001 if (clip_star.available && clip_isautosel_star()) |
| 1002 clip_update_selection(&clip_star); | |
| 1003 if (clip_plus.available && clip_isautosel_plus()) | |
| 1004 clip_update_selection(&clip_plus); | |
| 7 | 1005 #endif |
| 670 | 1006 |
| 7 | 1007 win_update(wp); |
| 670 | 1008 |
| 1009 /* When the screen was cleared redraw the tab pages line. */ | |
| 673 | 1010 if (redraw_tabline) |
| 677 | 1011 draw_tabline(); |
| 670 | 1012 |
| 7 | 1013 if (wp->w_redr_status |
| 1014 # ifdef FEAT_CMDL_INFO | |
| 1015 || p_ru | |
| 1016 # endif | |
| 1017 # ifdef FEAT_STL_OPT | |
| 40 | 1018 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1019 # endif |
| 1020 ) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
1021 win_redr_status(wp, FALSE); |
| 7 | 1022 |
| 1023 update_finish(); | |
| 1024 } | |
| 1025 #endif | |
| 1026 | |
| 1027 /* | |
| 1028 * Update a single window. | |
| 1029 * | |
| 1030 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1031 * screen or scrolling lines). | |
| 1032 * | |
| 1033 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1034 * implies the one below it. | |
| 1035 * NOT_VALID redraw the whole window | |
| 743 | 1036 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1037 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1038 * INVERTED redraw the changed part of the Visual area | |
| 1039 * INVERTED_ALL redraw the whole Visual area | |
| 1040 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1041 * 2. update lines at the top when scrolled down | |
| 1042 * 3. redraw changed text: | |
| 301 | 1043 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1044 * b_mod_top and b_mod_bot. |
| 1045 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1046 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1047 * - continue redrawing when syntax status is invalid. | |
| 1048 * 4. if scrolled up, update lines at the bottom. | |
| 1049 * This results in three areas that may need updating: | |
| 1050 * top: from first row to top_end (when scrolled down) | |
| 1051 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1052 * bot: from bot_start to last row (when scrolled up) | |
| 1053 */ | |
| 1054 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1055 win_update(win_T *wp) |
| 7 | 1056 { |
| 1057 buf_T *buf = wp->w_buffer; | |
| 1058 int type; | |
| 1059 int top_end = 0; /* Below last row of the top area that needs | |
| 1060 updating. 0 when no top area updating. */ | |
| 1061 int mid_start = 999;/* first row of the mid area that needs | |
| 1062 updating. 999 when no mid area updating. */ | |
| 1063 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1064 updating. 0 when no mid area updating. */ | |
| 1065 int bot_start = 999;/* first row of the bot area that needs | |
| 1066 updating. 999 when no bot area updating */ | |
| 1067 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1068 w_topline got smaller a bit */ | |
| 1069 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1070 matchitem_T *cur; /* points to the match list */ |
| 7 | 1071 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1072 #endif | |
| 1073 | |
| 1074 int row; /* current window row to display */ | |
| 1075 linenr_T lnum; /* current buffer lnum to display */ | |
| 1076 int idx; /* current index in w_lines[] */ | |
| 1077 int srow; /* starting row of the current line */ | |
| 1078 | |
| 1079 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1080 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1081 int i; | |
| 1082 long j; | |
| 1083 static int recursive = FALSE; /* being called recursively */ | |
| 1084 int old_botline = wp->w_botline; | |
| 1085 #ifdef FEAT_FOLDING | |
| 1086 long fold_count; | |
| 1087 #endif | |
| 1088 #ifdef FEAT_SYN_HL | |
| 1089 /* remember what happened to the previous line, to know if | |
| 1090 * check_visual_highlight() can be used */ | |
| 1091 #define DID_NONE 1 /* didn't update a line */ | |
| 1092 #define DID_LINE 2 /* updated a normal line */ | |
| 1093 #define DID_FOLD 3 /* updated a folded line */ | |
| 1094 int did_update = DID_NONE; | |
| 1095 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1096 #endif | |
| 1097 linenr_T mod_top = 0; | |
| 1098 linenr_T mod_bot = 0; | |
| 1099 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1100 int save_got_int; | |
| 1101 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1102 #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
|
1103 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
|
1104 #endif |
| 7 | 1105 |
| 1106 type = wp->w_redr_type; | |
| 1107 | |
| 1108 if (type == NOT_VALID) | |
| 1109 { | |
| 1110 wp->w_redr_status = TRUE; | |
| 1111 wp->w_lines_valid = 0; | |
| 1112 } | |
| 1113 | |
| 1114 /* 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
|
1115 if (wp->w_height + WINBAR_HEIGHT(wp) == 0) |
| 7 | 1116 { |
| 1117 wp->w_redr_type = 0; | |
| 1118 return; | |
| 1119 } | |
| 1120 | |
| 1121 /* Window is zero-width: Only need to draw the separator. */ | |
| 1122 if (wp->w_width == 0) | |
| 1123 { | |
| 1124 /* draw the vertical separator right of this window */ | |
| 1125 draw_vsep_win(wp, 0); | |
| 1126 wp->w_redr_type = 0; | |
| 1127 return; | |
| 1128 } | |
| 1129 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1130 #ifdef FEAT_TERMINAL |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1131 // 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
|
1132 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
|
1133 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1134 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
|
1135 # 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
|
1136 /* 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
|
1137 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
|
1138 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
|
1139 # endif |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1140 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
|
1141 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1142 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1143 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1144 |
| 7 | 1145 #ifdef FEAT_SEARCH_EXTRA |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1146 init_search_hl(wp); |
| 7 | 1147 #endif |
| 1148 | |
| 13 | 1149 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1150 /* 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
|
1151 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1152 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1153 if (wp->w_nrwidth != i) |
| 13 | 1154 { |
| 1155 type = NOT_VALID; | |
| 677 | 1156 wp->w_nrwidth = i; |
| 13 | 1157 } |
| 1158 else | |
| 1159 #endif | |
| 1160 | |
| 7 | 1161 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1162 { | |
| 1163 /* | |
| 1164 * When there are both inserted/deleted lines and specific lines to be | |
| 1165 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1166 * everything (only happens when redrawing is off for while). | |
| 1167 */ | |
| 1168 type = NOT_VALID; | |
| 1169 } | |
| 1170 else | |
| 1171 { | |
| 1172 /* | |
| 1173 * Set mod_top to the first line that needs displaying because of | |
| 1174 * changes. Set mod_bot to the first line after the changes. | |
| 1175 */ | |
| 1176 mod_top = wp->w_redraw_top; | |
| 1177 if (wp->w_redraw_bot != 0) | |
| 1178 mod_bot = wp->w_redraw_bot + 1; | |
| 1179 else | |
| 1180 mod_bot = 0; | |
| 1181 wp->w_redraw_top = 0; /* reset for next time */ | |
| 1182 wp->w_redraw_bot = 0; | |
| 1183 if (buf->b_mod_set) | |
| 1184 { | |
| 1185 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1186 { | |
| 1187 mod_top = buf->b_mod_top; | |
| 1188 #ifdef FEAT_SYN_HL | |
| 1189 /* Need to redraw lines above the change that may be included | |
| 1190 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1191 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1192 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1193 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1194 if (mod_top < 1) |
| 1195 mod_top = 1; | |
| 1196 } | |
| 1197 #endif | |
| 1198 } | |
| 1199 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1200 mod_bot = buf->b_mod_bot; | |
| 1201 | |
| 1202 #ifdef FEAT_SEARCH_EXTRA | |
| 1203 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1204 * change in one line may make the Search highlighting in a | |
| 1205 * previous line invalid. Simple solution: redraw all visible | |
| 1206 * lines above the change. | |
| 1326 | 1207 * Same for a match pattern. |
| 7 | 1208 */ |
| 699 | 1209 if (search_hl.rm.regprog != NULL |
| 1210 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1211 top_to_mod = TRUE; |
| 699 | 1212 else |
| 1326 | 1213 { |
| 1214 cur = wp->w_match_head; | |
| 1215 while (cur != NULL) | |
| 1216 { | |
| 1217 if (cur->match.regprog != NULL | |
| 1218 && re_multiline(cur->match.regprog)) | |
| 699 | 1219 { |
| 1220 top_to_mod = TRUE; | |
| 1221 break; | |
| 1222 } | |
| 1326 | 1223 cur = cur->next; |
| 1224 } | |
| 1225 } | |
| 7 | 1226 #endif |
| 1227 } | |
| 1228 #ifdef FEAT_FOLDING | |
| 1229 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1230 { | |
| 1231 linenr_T lnumt, lnumb; | |
| 1232 | |
| 1233 /* | |
| 1234 * A change in a line can cause lines above it to become folded or | |
| 1235 * unfolded. Find the top most buffer line that may be affected. | |
| 1236 * If the line was previously folded and displayed, get the first | |
| 1237 * line of that fold. If the line is folded now, get the first | |
| 1238 * folded line. Use the minimum of these two. | |
| 1239 */ | |
| 1240 | |
| 1241 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1242 * the line below it. If there is no valid entry, use w_topline. | |
| 1243 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1244 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1245 lnumt = wp->w_topline; | |
| 1246 lnumb = MAXLNUM; | |
| 1247 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1248 if (wp->w_lines[i].wl_valid) | |
| 1249 { | |
| 1250 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1251 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1252 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1253 { | |
| 1254 lnumb = wp->w_lines[i].wl_lnum; | |
| 1255 /* When there is a fold column it might need updating | |
| 1256 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1257 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1258 ++lnumb; |
| 1259 } | |
| 1260 } | |
| 1261 | |
| 1262 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1263 if (mod_top > lnumt) | |
| 1264 mod_top = lnumt; | |
| 1265 | |
| 1266 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1267 --mod_bot; | |
| 1268 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1269 ++mod_bot; | |
| 1270 if (mod_bot < lnumb) | |
| 1271 mod_bot = lnumb; | |
| 1272 } | |
| 1273 #endif | |
| 1274 | |
| 1275 /* When a change starts above w_topline and the end is below | |
| 1276 * w_topline, start redrawing at w_topline. | |
| 36 | 1277 * If the end of the change is above w_topline: do like no change was |
| 1278 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1279 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1280 { | |
| 1281 if (mod_bot > wp->w_topline) | |
| 1282 mod_top = wp->w_topline; | |
| 1283 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1284 else if (syntax_present(wp)) |
| 7 | 1285 top_end = 1; |
| 1286 #endif | |
| 1287 } | |
| 36 | 1288 |
| 1289 /* When line numbers are displayed need to redraw all lines below | |
| 1290 * inserted/deleted lines. */ | |
| 1291 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1292 mod_bot = MAXLNUM; | |
| 7 | 1293 } |
| 1294 | |
| 1295 /* | |
| 1296 * When only displaying the lines at the top, set top_end. Used when | |
| 1297 * window has scrolled down for msg_scrolled. | |
| 1298 */ | |
| 1299 if (type == REDRAW_TOP) | |
| 1300 { | |
| 1301 j = 0; | |
| 1302 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1303 { | |
| 1304 j += wp->w_lines[i].wl_size; | |
| 1305 if (j >= wp->w_upd_rows) | |
| 1306 { | |
| 1307 top_end = j; | |
| 1308 break; | |
| 1309 } | |
| 1310 } | |
| 1311 if (top_end == 0) | |
| 1312 /* not found (cannot happen?): redraw everything */ | |
| 1313 type = NOT_VALID; | |
| 1314 else | |
| 1315 /* top area defined, the rest is VALID */ | |
| 1316 type = VALID; | |
| 1317 } | |
| 1318 | |
| 1378 | 1319 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1320 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1321 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1322 * called. */ | |
| 1323 if (screen_cleared) | |
| 1324 screen_cleared = MAYBE; | |
| 1325 | |
| 7 | 1326 /* |
| 1327 * If there are no changes on the screen that require a complete redraw, | |
| 1328 * handle three cases: | |
| 1329 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1330 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1331 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1332 * w_lines[] that needs updating. | |
| 1333 */ | |
| 743 | 1334 if ((type == VALID || type == SOME_VALID |
| 1335 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1336 #ifdef FEAT_DIFF |
| 1337 && !wp->w_botfill && !wp->w_old_botfill | |
| 1338 #endif | |
| 1339 ) | |
| 1340 { | |
| 1341 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1342 { | |
| 1343 /* | |
| 1344 * w_topline is the first changed line, the scrolling will be done | |
| 1345 * further down. | |
| 1346 */ | |
| 1347 } | |
| 1348 else if (wp->w_lines[0].wl_valid | |
| 1349 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1350 #ifdef FEAT_DIFF | |
| 1351 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1352 && wp->w_topfill > wp->w_old_topfill) | |
| 1353 #endif | |
| 1354 )) | |
| 1355 { | |
| 1356 /* | |
| 1357 * New topline is above old topline: May scroll down. | |
| 1358 */ | |
| 1359 #ifdef FEAT_FOLDING | |
| 1360 if (hasAnyFolding(wp)) | |
| 1361 { | |
| 1362 linenr_T ln; | |
| 1363 | |
| 1364 /* count the number of lines we are off, counting a sequence | |
| 1365 * of folded lines as one */ | |
| 1366 j = 0; | |
| 1367 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1368 { | |
| 1369 ++j; | |
| 1370 if (j >= wp->w_height - 2) | |
| 1371 break; | |
| 1372 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1373 } | |
| 1374 } | |
| 1375 else | |
| 1376 #endif | |
| 1377 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1378 if (j < wp->w_height - 2) /* not too far off */ | |
| 1379 { | |
| 1380 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1381 #ifdef FEAT_DIFF | |
| 1382 /* insert extra lines for previously invisible filler lines */ | |
| 1383 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1384 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1385 - wp->w_old_topfill; | |
| 1386 #endif | |
| 1387 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1388 { | |
| 1389 /* | |
| 1390 * Try to insert the correct number of lines. | |
| 1391 * If not the last window, delete the lines at the bottom. | |
| 1392 * win_ins_lines may fail when the terminal can't do it. | |
| 1393 */ | |
| 1394 if (i > 0) | |
| 1395 check_for_delay(FALSE); | |
| 1396 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1397 { | |
| 1398 if (wp->w_lines_valid != 0) | |
| 1399 { | |
| 1400 /* Need to update rows that are new, stop at the | |
| 1401 * first one that scrolled down. */ | |
| 1402 top_end = i; | |
| 1403 scrolled_down = TRUE; | |
| 1404 | |
| 1405 /* Move the entries that were scrolled, disable | |
| 1406 * the entries for the lines to be redrawn. */ | |
| 1407 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1408 wp->w_lines_valid = wp->w_height; | |
| 1409 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1410 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1411 while (idx >= 0) | |
| 1412 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1413 } | |
| 1414 } | |
| 1415 else | |
| 1416 mid_start = 0; /* redraw all lines */ | |
| 1417 } | |
| 1418 else | |
| 1419 mid_start = 0; /* redraw all lines */ | |
| 1420 } | |
| 1421 else | |
| 1422 mid_start = 0; /* redraw all lines */ | |
| 1423 } | |
| 1424 else | |
| 1425 { | |
| 1426 /* | |
| 1427 * New topline is at or below old topline: May scroll up. | |
| 1428 * When topline didn't change, find first entry in w_lines[] that | |
| 1429 * needs updating. | |
| 1430 */ | |
| 1431 | |
| 1432 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1433 j = -1; | |
| 1434 row = 0; | |
| 1435 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1436 { | |
| 1437 if (wp->w_lines[i].wl_valid | |
| 1438 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1439 { | |
| 1440 j = i; | |
| 1441 break; | |
| 1442 } | |
| 1443 row += wp->w_lines[i].wl_size; | |
| 1444 } | |
| 1445 if (j == -1) | |
| 1446 { | |
| 1447 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1448 * lines */ | |
| 1449 mid_start = 0; | |
| 1450 } | |
| 1451 else | |
| 1452 { | |
| 1453 /* | |
| 1454 * Try to delete the correct number of lines. | |
| 1455 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1456 */ | |
| 1457 #ifdef FEAT_DIFF | |
| 1458 /* If the topline didn't change, delete old filler lines, | |
| 1459 * otherwise delete filler lines of the new topline... */ | |
| 1460 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1461 row += wp->w_old_topfill; | |
| 1462 else | |
| 1463 row += diff_check_fill(wp, wp->w_topline); | |
| 1464 /* ... but don't delete new filler lines. */ | |
| 1465 row -= wp->w_topfill; | |
| 1466 #endif | |
| 1467 if (row > 0) | |
| 1468 { | |
| 1469 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
|
1470 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
|
1471 == OK) |
| 7 | 1472 bot_start = wp->w_height - row; |
| 1473 else | |
| 1474 mid_start = 0; /* redraw all lines */ | |
| 1475 } | |
| 1476 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1477 { | |
| 1478 /* | |
| 1479 * Skip the lines (below the deleted lines) that are still | |
| 1480 * valid and don't need redrawing. Copy their info | |
| 1481 * upwards, to compensate for the deleted lines. Set | |
| 1482 * bot_start to the first row that needs redrawing. | |
| 1483 */ | |
| 1484 bot_start = 0; | |
| 1485 idx = 0; | |
| 1486 for (;;) | |
| 1487 { | |
| 1488 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1489 /* stop at line that didn't fit, unless it is still | |
| 1490 * valid (no lines deleted) */ | |
| 1491 if (row > 0 && bot_start + row | |
| 1492 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1493 { | |
| 1494 wp->w_lines_valid = idx + 1; | |
| 1495 break; | |
| 1496 } | |
| 1497 bot_start += wp->w_lines[idx++].wl_size; | |
| 1498 | |
| 1499 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1500 if (++j >= wp->w_lines_valid) | |
| 1501 { | |
| 1502 wp->w_lines_valid = idx; | |
| 1503 break; | |
| 1504 } | |
| 1505 } | |
| 1506 #ifdef FEAT_DIFF | |
| 1507 /* Correct the first entry for filler lines at the top | |
| 1508 * when it won't get updated below. */ | |
| 1509 if (wp->w_p_diff && bot_start > 0) | |
| 1510 wp->w_lines[0].wl_size = | |
| 1511 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1512 + wp->w_topfill; | |
| 1513 #endif | |
| 1514 } | |
| 1515 } | |
| 1516 } | |
| 1517 | |
| 1518 /* When starting redraw in the first line, redraw all lines. When | |
| 1519 * there is only one window it's probably faster to clear the screen | |
| 1520 * first. */ | |
| 1521 if (mid_start == 0) | |
| 1522 { | |
| 1523 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1524 if (ONE_WINDOW) |
| 981 | 1525 { |
| 1331 | 1526 /* Clear the screen when it was not done by win_del_lines() or |
| 1527 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1528 * then. */ | |
| 1529 if (screen_cleared != TRUE) | |
| 1530 screenclear(); | |
| 981 | 1531 /* The screen was cleared, redraw the tab pages line. */ |
| 1532 if (redraw_tabline) | |
| 1533 draw_tabline(); | |
| 1534 } | |
| 7 | 1535 } |
| 1331 | 1536 |
| 1537 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1538 * cleared (only happens for the first window) or when screenclear() | |
| 1539 * was called directly above, "must_redraw" will have been set to | |
| 1540 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1541 if (screen_cleared == TRUE) | |
| 1542 must_redraw = 0; | |
| 7 | 1543 } |
| 1544 else | |
| 1545 { | |
| 1546 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1547 mid_start = 0; | |
| 1548 mid_end = wp->w_height; | |
| 1549 } | |
| 1550 | |
| 743 | 1551 if (type == SOME_VALID) |
| 1552 { | |
| 1553 /* SOME_VALID: redraw all lines. */ | |
| 1554 mid_start = 0; | |
| 1555 mid_end = wp->w_height; | |
| 1556 type = NOT_VALID; | |
| 1557 } | |
| 1558 | |
| 7 | 1559 /* check if we are updating or removing the inverted part */ |
| 1560 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1561 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1562 { | |
| 1563 linenr_T from, to; | |
| 1564 | |
| 1565 if (VIsual_active) | |
| 1566 { | |
| 1567 if (VIsual_active | |
| 1568 && (VIsual_mode != wp->w_old_visual_mode | |
| 1569 || type == INVERTED_ALL)) | |
| 1570 { | |
| 1571 /* | |
| 1572 * If the type of Visual selection changed, redraw the whole | |
| 1573 * selection. Also when the ownership of the X selection is | |
| 1574 * gained or lost. | |
| 1575 */ | |
| 1576 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1577 { | |
| 1578 from = curwin->w_cursor.lnum; | |
| 1579 to = VIsual.lnum; | |
| 1580 } | |
| 1581 else | |
| 1582 { | |
| 1583 from = VIsual.lnum; | |
| 1584 to = curwin->w_cursor.lnum; | |
| 1585 } | |
| 1586 /* redraw more when the cursor moved as well */ | |
| 1587 if (wp->w_old_cursor_lnum < from) | |
| 1588 from = wp->w_old_cursor_lnum; | |
| 1589 if (wp->w_old_cursor_lnum > to) | |
| 1590 to = wp->w_old_cursor_lnum; | |
| 1591 if (wp->w_old_visual_lnum < from) | |
| 1592 from = wp->w_old_visual_lnum; | |
| 1593 if (wp->w_old_visual_lnum > to) | |
| 1594 to = wp->w_old_visual_lnum; | |
| 1595 } | |
| 1596 else | |
| 1597 { | |
| 1598 /* | |
| 1599 * Find the line numbers that need to be updated: The lines | |
| 1600 * between the old cursor position and the current cursor | |
| 1601 * position. Also check if the Visual position changed. | |
| 1602 */ | |
| 1603 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1604 { | |
| 1605 from = curwin->w_cursor.lnum; | |
| 1606 to = wp->w_old_cursor_lnum; | |
| 1607 } | |
| 1608 else | |
| 1609 { | |
| 1610 from = wp->w_old_cursor_lnum; | |
| 1611 to = curwin->w_cursor.lnum; | |
| 1612 if (from == 0) /* Visual mode just started */ | |
| 1613 from = to; | |
| 1614 } | |
| 1615 | |
| 422 | 1616 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1617 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1618 { |
| 1619 if (wp->w_old_visual_lnum < from | |
| 1620 && wp->w_old_visual_lnum != 0) | |
| 1621 from = wp->w_old_visual_lnum; | |
| 1622 if (wp->w_old_visual_lnum > to) | |
| 1623 to = wp->w_old_visual_lnum; | |
| 1624 if (VIsual.lnum < from) | |
| 1625 from = VIsual.lnum; | |
| 1626 if (VIsual.lnum > to) | |
| 1627 to = VIsual.lnum; | |
| 1628 } | |
| 1629 } | |
| 1630 | |
| 1631 /* | |
| 1632 * If in block mode and changed column or curwin->w_curswant: | |
| 1633 * update all lines. | |
| 1634 * First compute the actual start and end column. | |
| 1635 */ | |
| 1636 if (VIsual_mode == Ctrl_V) | |
| 1637 { | |
| 6266 | 1638 colnr_T fromc, toc; |
| 1639 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) | |
| 1640 int save_ve_flags = ve_flags; | |
| 1641 | |
| 1642 if (curwin->w_p_lbr) | |
| 1643 ve_flags = VE_ALL; | |
| 1644 #endif | |
| 7 | 1645 getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); |
| 6266 | 1646 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) |
| 1647 ve_flags = save_ve_flags; | |
| 1648 #endif | |
| 7 | 1649 ++toc; |
| 1650 if (curwin->w_curswant == MAXCOL) | |
| 1651 toc = MAXCOL; | |
| 1652 | |
| 1653 if (fromc != wp->w_old_cursor_fcol | |
| 1654 || toc != wp->w_old_cursor_lcol) | |
| 1655 { | |
| 1656 if (from > VIsual.lnum) | |
| 1657 from = VIsual.lnum; | |
| 1658 if (to < VIsual.lnum) | |
| 1659 to = VIsual.lnum; | |
| 1660 } | |
| 1661 wp->w_old_cursor_fcol = fromc; | |
| 1662 wp->w_old_cursor_lcol = toc; | |
| 1663 } | |
| 1664 } | |
| 1665 else | |
| 1666 { | |
| 1667 /* Use the line numbers of the old Visual area. */ | |
| 1668 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1669 { | |
| 1670 from = wp->w_old_cursor_lnum; | |
| 1671 to = wp->w_old_visual_lnum; | |
| 1672 } | |
| 1673 else | |
| 1674 { | |
| 1675 from = wp->w_old_visual_lnum; | |
| 1676 to = wp->w_old_cursor_lnum; | |
| 1677 } | |
| 1678 } | |
| 1679 | |
| 1680 /* | |
| 1681 * There is no need to update lines above the top of the window. | |
| 1682 */ | |
| 1683 if (from < wp->w_topline) | |
| 1684 from = wp->w_topline; | |
| 1685 | |
| 1686 /* | |
| 1687 * If we know the value of w_botline, use it to restrict the update to | |
| 1688 * the lines that are visible in the window. | |
| 1689 */ | |
| 1690 if (wp->w_valid & VALID_BOTLINE) | |
| 1691 { | |
| 1692 if (from >= wp->w_botline) | |
| 1693 from = wp->w_botline - 1; | |
| 1694 if (to >= wp->w_botline) | |
| 1695 to = wp->w_botline - 1; | |
| 1696 } | |
| 1697 | |
| 1698 /* | |
| 1699 * Find the minimal part to be updated. | |
| 1700 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1701 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1702 * top_end; need to redraw from top_end to the "to" line. | |
| 1703 * A middle mouse click with a Visual selection may change the text | |
| 1704 * above the Visual area and reset wl_valid, do count these for | |
| 1705 * mid_end (in srow). | |
| 1706 */ | |
| 1707 if (mid_start > 0) | |
| 1708 { | |
| 1709 lnum = wp->w_topline; | |
| 1710 idx = 0; | |
| 1711 srow = 0; | |
| 1712 if (scrolled_down) | |
| 1713 mid_start = top_end; | |
| 1714 else | |
| 1715 mid_start = 0; | |
| 1716 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1717 { | |
| 1718 if (wp->w_lines[idx].wl_valid) | |
| 1719 mid_start += wp->w_lines[idx].wl_size; | |
| 1720 else if (!scrolled_down) | |
| 1721 srow += wp->w_lines[idx].wl_size; | |
| 1722 ++idx; | |
| 1723 # ifdef FEAT_FOLDING | |
| 1724 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1725 lnum = wp->w_lines[idx].wl_lnum; | |
| 1726 else | |
| 1727 # endif | |
| 1728 ++lnum; | |
| 1729 } | |
| 1730 srow += mid_start; | |
| 1731 mid_end = wp->w_height; | |
| 1732 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1733 { | |
| 1734 if (wp->w_lines[idx].wl_valid | |
| 1735 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1736 { | |
| 1737 /* Only update until first row of this line */ | |
| 1738 mid_end = srow; | |
| 1739 break; | |
| 1740 } | |
| 1741 srow += wp->w_lines[idx].wl_size; | |
| 1742 } | |
| 1743 } | |
| 1744 } | |
| 1745 | |
| 1746 if (VIsual_active && buf == curwin->w_buffer) | |
| 1747 { | |
| 1748 wp->w_old_visual_mode = VIsual_mode; | |
| 1749 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1750 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1751 wp->w_old_visual_col = VIsual.col; |
| 7 | 1752 wp->w_old_curswant = curwin->w_curswant; |
| 1753 } | |
| 1754 else | |
| 1755 { | |
| 1756 wp->w_old_visual_mode = 0; | |
| 1757 wp->w_old_cursor_lnum = 0; | |
| 1758 wp->w_old_visual_lnum = 0; | |
| 422 | 1759 wp->w_old_visual_col = 0; |
| 7 | 1760 } |
| 1761 | |
| 1762 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1763 /* reset got_int, otherwise regexp won't work */ | |
| 1764 save_got_int = got_int; | |
| 1765 got_int = 0; | |
| 1766 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1767 #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
|
1768 /* 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
|
1769 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
|
1770 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
|
1771 #endif |
| 7 | 1772 #ifdef FEAT_FOLDING |
| 1773 win_foldinfo.fi_level = 0; | |
| 1774 #endif | |
| 1775 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1776 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1777 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1778 * 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
|
1779 * 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
|
1780 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1781 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
|
1782 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
|
1783 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1784 |
| 7 | 1785 /* |
| 1786 * Update all the window rows. | |
| 1787 */ | |
| 1788 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1789 row = 0; | |
| 1790 srow = 0; | |
| 1791 lnum = wp->w_topline; /* first line shown in window */ | |
| 1792 for (;;) | |
| 1793 { | |
| 1794 /* stop updating when reached the end of the window (check for _past_ | |
| 1795 * the end of the window is at the end of the loop) */ | |
| 1796 if (row == wp->w_height) | |
| 1797 { | |
| 1798 didline = TRUE; | |
| 1799 break; | |
| 1800 } | |
| 1801 | |
| 1802 /* stop updating when hit the end of the file */ | |
| 1803 if (lnum > buf->b_ml.ml_line_count) | |
| 1804 { | |
| 1805 eof = TRUE; | |
| 1806 break; | |
| 1807 } | |
| 1808 | |
| 1809 /* Remember the starting row of the line that is going to be dealt | |
| 1810 * with. It is used further down when the line doesn't fit. */ | |
| 1811 srow = row; | |
| 1812 | |
| 1813 /* | |
| 1814 * Update a line when it is in an area that needs updating, when it | |
| 1815 * 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
|
1816 * "bot_start" may be halfway a wrapped line after using |
| 7 | 1817 * win_del_lines(), check if the current line includes it. |
| 1818 * When syntax folding is being used, the saved syntax states will | |
| 1819 * already have been updated, we can't see where the syntax state is | |
| 1820 * the same again, just update until the end of the window. | |
| 1821 */ | |
| 1822 if (row < top_end | |
| 1823 || (row >= mid_start && row < mid_end) | |
| 1824 #ifdef FEAT_SEARCH_EXTRA | |
| 1825 || top_to_mod | |
| 1826 #endif | |
| 1827 || idx >= wp->w_lines_valid | |
| 1828 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1829 || (mod_top != 0 | |
| 1830 && (lnum == mod_top | |
| 1831 || (lnum >= mod_top | |
| 1832 && (lnum < mod_bot | |
| 1833 #ifdef FEAT_SYN_HL | |
| 1834 || did_update == DID_FOLD | |
| 1835 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1836 && syntax_present(wp) |
| 7 | 1837 && ( |
| 1838 # ifdef FEAT_FOLDING | |
| 1839 (foldmethodIsSyntax(wp) | |
| 1840 && hasAnyFolding(wp)) || | |
| 1841 # endif | |
| 1842 syntax_check_changed(lnum))) | |
| 1843 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1844 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1845 /* match in fixed position might need redraw |
| 1846 * if lines were inserted or deleted */ | |
| 1847 || (wp->w_match_head != NULL | |
| 1848 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1849 #endif |
| 7 | 1850 ))))) |
| 1851 { | |
| 1852 #ifdef FEAT_SEARCH_EXTRA | |
| 1853 if (lnum == mod_top) | |
| 1854 top_to_mod = FALSE; | |
| 1855 #endif | |
| 1856 | |
| 1857 /* | |
| 1858 * When at start of changed lines: May scroll following lines | |
| 1859 * up or down to minimize redrawing. | |
| 1860 * Don't do this when the change continues until the end. | |
| 3318 | 1861 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1862 */ |
| 1863 if (lnum == mod_top | |
| 1864 && mod_bot != MAXLNUM | |
| 3318 | 1865 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1866 { |
| 1867 int old_rows = 0; | |
| 1868 int new_rows = 0; | |
| 1869 int xtra_rows; | |
| 1870 linenr_T l; | |
| 1871 | |
| 1872 /* Count the old number of window rows, using w_lines[], which | |
| 1873 * should still contain the sizes for the lines as they are | |
| 1874 * currently displayed. */ | |
| 1875 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1876 { | |
| 1877 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1878 * lines are part of the changed area. */ | |
| 1879 if (wp->w_lines[i].wl_valid | |
| 1880 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1881 break; | |
| 1882 old_rows += wp->w_lines[i].wl_size; | |
| 1883 #ifdef FEAT_FOLDING | |
| 1884 if (wp->w_lines[i].wl_valid | |
| 1885 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1886 { | |
| 1887 /* Must have found the last valid entry above mod_bot. | |
| 1888 * Add following invalid entries. */ | |
| 1889 ++i; | |
| 1890 while (i < wp->w_lines_valid | |
| 1891 && !wp->w_lines[i].wl_valid) | |
| 1892 old_rows += wp->w_lines[i++].wl_size; | |
| 1893 break; | |
| 1894 } | |
| 1895 #endif | |
| 1896 } | |
| 1897 | |
| 1898 if (i >= wp->w_lines_valid) | |
| 1899 { | |
| 1900 /* We can't find a valid line below the changed lines, | |
| 1901 * need to redraw until the end of the window. | |
| 1902 * Inserting/deleting lines has no use. */ | |
| 1903 bot_start = 0; | |
| 1904 } | |
| 1905 else | |
| 1906 { | |
| 1907 /* Able to count old number of rows: Count new window | |
| 1908 * rows, and may insert/delete lines */ | |
| 1909 j = idx; | |
| 1910 for (l = lnum; l < mod_bot; ++l) | |
| 1911 { | |
| 1912 #ifdef FEAT_FOLDING | |
| 1913 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1914 ++new_rows; | |
| 1915 else | |
| 1916 #endif | |
| 1917 #ifdef FEAT_DIFF | |
| 1918 if (l == wp->w_topline) | |
| 1919 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1920 + wp->w_topfill; | |
| 1921 else | |
| 1922 #endif | |
| 1923 new_rows += plines_win(wp, l, TRUE); | |
| 1924 ++j; | |
| 1925 if (new_rows > wp->w_height - row - 2) | |
| 1926 { | |
| 1927 /* it's getting too much, must redraw the rest */ | |
| 1928 new_rows = 9999; | |
| 1929 break; | |
| 1930 } | |
| 1931 } | |
| 1932 xtra_rows = new_rows - old_rows; | |
| 1933 if (xtra_rows < 0) | |
| 1934 { | |
| 1935 /* May scroll text up. If there is not enough | |
| 1936 * remaining text or scrolling fails, must redraw the | |
| 1937 * rest. If scrolling works, must redraw the text | |
| 1938 * below the scrolled text. */ | |
| 1939 if (row - xtra_rows >= wp->w_height - 2) | |
| 1940 mod_bot = MAXLNUM; | |
| 1941 else | |
| 1942 { | |
| 1943 check_for_delay(FALSE); | |
| 1944 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
|
1945 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 1946 mod_bot = MAXLNUM; |
| 1947 else | |
| 1948 bot_start = wp->w_height + xtra_rows; | |
| 1949 } | |
| 1950 } | |
| 1951 else if (xtra_rows > 0) | |
| 1952 { | |
| 1953 /* May scroll text down. If there is not enough | |
| 1954 * remaining text of scrolling fails, must redraw the | |
| 1955 * rest. */ | |
| 1956 if (row + xtra_rows >= wp->w_height - 2) | |
| 1957 mod_bot = MAXLNUM; | |
| 1958 else | |
| 1959 { | |
| 1960 check_for_delay(FALSE); | |
| 1961 if (win_ins_lines(wp, row + old_rows, | |
| 1962 xtra_rows, FALSE, FALSE) == FAIL) | |
| 1963 mod_bot = MAXLNUM; | |
| 1964 else if (top_end > row + old_rows) | |
| 1965 /* Scrolled the part at the top that requires | |
| 1966 * updating down. */ | |
| 1967 top_end += xtra_rows; | |
| 1968 } | |
| 1969 } | |
| 1970 | |
| 1971 /* When not updating the rest, may need to move w_lines[] | |
| 1972 * entries. */ | |
| 1973 if (mod_bot != MAXLNUM && i != j) | |
| 1974 { | |
| 1975 if (j < i) | |
| 1976 { | |
| 1977 int x = row + new_rows; | |
| 1978 | |
| 1979 /* move entries in w_lines[] upwards */ | |
| 1980 for (;;) | |
| 1981 { | |
| 1982 /* stop at last valid entry in w_lines[] */ | |
| 1983 if (i >= wp->w_lines_valid) | |
| 1984 { | |
| 1985 wp->w_lines_valid = j; | |
| 1986 break; | |
| 1987 } | |
| 1988 wp->w_lines[j] = wp->w_lines[i]; | |
| 1989 /* stop at a line that won't fit */ | |
| 1990 if (x + (int)wp->w_lines[j].wl_size | |
| 1991 > wp->w_height) | |
| 1992 { | |
| 1993 wp->w_lines_valid = j + 1; | |
| 1994 break; | |
| 1995 } | |
| 1996 x += wp->w_lines[j++].wl_size; | |
| 1997 ++i; | |
| 1998 } | |
| 1999 if (bot_start > x) | |
| 2000 bot_start = x; | |
| 2001 } | |
| 2002 else /* j > i */ | |
| 2003 { | |
| 2004 /* move entries in w_lines[] downwards */ | |
| 2005 j -= i; | |
| 2006 wp->w_lines_valid += j; | |
| 2007 if (wp->w_lines_valid > wp->w_height) | |
| 2008 wp->w_lines_valid = wp->w_height; | |
| 2009 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2010 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2011 | |
| 2012 /* The w_lines[] entries for inserted lines are | |
| 2013 * now invalid, but wl_size may be used above. | |
| 2014 * Reset to zero. */ | |
| 2015 while (i >= idx) | |
| 2016 { | |
| 2017 wp->w_lines[i].wl_size = 0; | |
| 2018 wp->w_lines[i--].wl_valid = FALSE; | |
| 2019 } | |
| 2020 } | |
| 2021 } | |
| 2022 } | |
| 2023 } | |
| 2024 | |
| 2025 #ifdef FEAT_FOLDING | |
| 2026 /* | |
| 2027 * When lines are folded, display one line for all of them. | |
| 2028 * Otherwise, display normally (can be several display lines when | |
| 2029 * 'wrap' is on). | |
| 2030 */ | |
| 2031 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2032 if (fold_count != 0) | |
| 2033 { | |
| 2034 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2035 ++row; | |
| 2036 --fold_count; | |
| 2037 wp->w_lines[idx].wl_folded = TRUE; | |
| 2038 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2039 # ifdef FEAT_SYN_HL | |
| 2040 did_update = DID_FOLD; | |
| 2041 # endif | |
| 2042 } | |
| 2043 else | |
| 2044 #endif | |
| 2045 if (idx < wp->w_lines_valid | |
| 2046 && wp->w_lines[idx].wl_valid | |
| 2047 && wp->w_lines[idx].wl_lnum == lnum | |
| 2048 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2049 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
| 7 | 2050 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2051 #ifdef FEAT_DIFF | |
| 2052 && diff_check_fill(wp, lnum) == 0 | |
| 2053 #endif | |
| 2054 ) | |
| 2055 { | |
| 2056 /* This line is not going to fit. Don't draw anything here, | |
| 2057 * will draw "@ " lines below. */ | |
| 2058 row = wp->w_height + 1; | |
| 2059 } | |
| 2060 else | |
| 2061 { | |
| 2062 #ifdef FEAT_SEARCH_EXTRA | |
| 2063 prepare_search_hl(wp, lnum); | |
| 2064 #endif | |
| 2065 #ifdef FEAT_SYN_HL | |
| 2066 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2067 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
|
2068 && syntax_present(wp)) |
| 7 | 2069 syntax_end_parsing(syntax_last_parsed + 1); |
| 2070 #endif | |
| 2071 | |
| 2072 /* | |
| 2073 * Display one line. | |
| 2074 */ | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2075 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
|
2076 mod_top == 0, FALSE); |
| 7 | 2077 |
| 2078 #ifdef FEAT_FOLDING | |
| 2079 wp->w_lines[idx].wl_folded = FALSE; | |
| 2080 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2081 #endif | |
| 2082 #ifdef FEAT_SYN_HL | |
| 2083 did_update = DID_LINE; | |
| 2084 syntax_last_parsed = lnum; | |
| 2085 #endif | |
| 2086 } | |
| 2087 | |
| 2088 wp->w_lines[idx].wl_lnum = lnum; | |
| 2089 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
|
2090 |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2091 /* 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
|
2092 * 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
|
2093 * 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
|
2094 if (row > wp->w_height || row + wp->w_winrow >= Rows) |
| 7 | 2095 { |
| 2096 /* we may need the size of that too long line later on */ | |
| 3318 | 2097 if (dollar_vcol == -1) |
| 7 | 2098 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2099 ++idx; | |
| 2100 break; | |
| 2101 } | |
| 3318 | 2102 if (dollar_vcol == -1) |
| 7 | 2103 wp->w_lines[idx].wl_size = row - srow; |
| 2104 ++idx; | |
| 2105 #ifdef FEAT_FOLDING | |
| 2106 lnum += fold_count + 1; | |
| 2107 #else | |
| 2108 ++lnum; | |
| 2109 #endif | |
| 2110 } | |
| 2111 else | |
| 2112 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2113 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
|
2114 { |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2115 #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
|
2116 // '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
|
2117 // 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
|
2118 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
|
2119 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
|
2120 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
|
2121 else |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2122 #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
|
2123 (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
|
2124 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2125 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2126 // This line does not need to be drawn, advance to the next one. |
| 7 | 2127 row += wp->w_lines[idx++].wl_size; |
| 2128 if (row > wp->w_height) /* past end of screen */ | |
| 2129 break; | |
| 2130 #ifdef FEAT_FOLDING | |
| 2131 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2132 #else | |
| 2133 ++lnum; | |
| 2134 #endif | |
| 2135 #ifdef FEAT_SYN_HL | |
| 2136 did_update = DID_NONE; | |
| 2137 #endif | |
| 2138 } | |
| 2139 | |
| 2140 if (lnum > buf->b_ml.ml_line_count) | |
| 2141 { | |
| 2142 eof = TRUE; | |
| 2143 break; | |
| 2144 } | |
| 2145 } | |
| 2146 /* | |
| 2147 * End of loop over all window lines. | |
| 2148 */ | |
| 2149 | |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2150 #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
|
2151 /* 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
|
2152 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
|
2153 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2154 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
|
2155 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2156 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
|
2157 # ifdef FEAT_MBYTE |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2158 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
|
2159 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
|
2160 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
|
2161 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
|
2162 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2163 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
|
2164 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2165 # endif |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2166 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
|
2167 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2168 #endif |
| 7 | 2169 |
| 2170 if (idx > wp->w_lines_valid) | |
| 2171 wp->w_lines_valid = idx; | |
| 2172 | |
| 2173 #ifdef FEAT_SYN_HL | |
| 2174 /* | |
| 2175 * Let the syntax stuff know we stop parsing here. | |
| 2176 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2177 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2178 syntax_end_parsing(syntax_last_parsed + 1); |
| 2179 #endif | |
| 2180 | |
| 2181 /* | |
| 2182 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2183 * line we were working on, then the line didn't fit. | |
| 2184 */ | |
| 2185 wp->w_empty_rows = 0; | |
| 2186 #ifdef FEAT_DIFF | |
| 2187 wp->w_filler_rows = 0; | |
| 2188 #endif | |
| 2189 if (!eof && !didline) | |
| 2190 { | |
| 2191 if (lnum == wp->w_topline) | |
| 2192 { | |
| 2193 /* | |
| 2194 * Single line that does not fit! | |
| 2195 * Don't overwrite it, it can be edited. | |
| 2196 */ | |
| 2197 wp->w_botline = lnum + 1; | |
| 2198 } | |
| 2199 #ifdef FEAT_DIFF | |
| 2200 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2201 { | |
| 2202 /* Window ends in filler lines. */ | |
| 2203 wp->w_botline = lnum; | |
| 2204 wp->w_filler_rows = wp->w_height - srow; | |
| 2205 } | |
| 2206 #endif | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2207 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
|
2208 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2209 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
|
2210 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2211 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2212 * 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
|
2213 */ |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2214 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
|
2215 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2216 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
|
2217 (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
|
2218 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2219 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2220 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2221 } |
| 7 | 2222 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2223 { | |
| 2224 /* | |
| 2225 * Last line isn't finished: Display "@@@" at the end. | |
| 2226 */ | |
| 2227 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2228 W_WINROW(wp) + wp->w_height, | |
| 2229 (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
|
2230 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2231 set_empty_rows(wp, srow); |
| 2232 wp->w_botline = lnum; | |
| 2233 } | |
| 2234 else | |
| 2235 { | |
| 2236 win_draw_end(wp, '@', ' ', srow, wp->w_height, HLF_AT); | |
| 2237 wp->w_botline = lnum; | |
| 2238 } | |
| 2239 } | |
| 2240 else | |
| 2241 { | |
| 2242 draw_vsep_win(wp, row); | |
| 2243 if (eof) /* we hit the end of the file */ | |
| 2244 { | |
| 2245 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2246 #ifdef FEAT_DIFF | |
| 2247 j = diff_check_fill(wp, wp->w_botline); | |
| 2248 if (j > 0 && !wp->w_botfill) | |
| 2249 { | |
| 2250 /* | |
| 2251 * Display filler lines at the end of the file | |
| 2252 */ | |
| 2253 if (char2cells(fill_diff) > 1) | |
| 2254 i = '-'; | |
| 2255 else | |
| 2256 i = fill_diff; | |
| 2257 if (row + j > wp->w_height) | |
| 2258 j = wp->w_height - row; | |
| 2259 win_draw_end(wp, i, i, row, row + (int)j, HLF_DED); | |
| 2260 row += j; | |
| 2261 } | |
| 2262 #endif | |
| 2263 } | |
| 3318 | 2264 else if (dollar_vcol == -1) |
| 7 | 2265 wp->w_botline = lnum; |
| 2266 | |
| 2267 /* make sure the rest of the screen is blank */ | |
| 2268 /* put '~'s on rows that aren't part of the file. */ | |
|
9877
7da89d9c744b
commit https://github.com/vim/vim/commit/58b853460add42098ab08017df9e030fb14fd34b
Christian Brabandt <cb@256bit.org>
parents:
9852
diff
changeset
|
2269 win_draw_end(wp, '~', ' ', row, wp->w_height, HLF_EOB); |
| 7 | 2270 } |
| 2271 | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2272 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2273 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2274 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2275 |
| 7 | 2276 /* Reset the type of redrawing required, the window has been updated. */ |
| 2277 wp->w_redr_type = 0; | |
| 2278 #ifdef FEAT_DIFF | |
| 2279 wp->w_old_topfill = wp->w_topfill; | |
| 2280 wp->w_old_botfill = wp->w_botfill; | |
| 2281 #endif | |
| 2282 | |
| 3318 | 2283 if (dollar_vcol == -1) |
| 7 | 2284 { |
| 2285 /* | |
| 2286 * There is a trick with w_botline. If we invalidate it on each | |
| 2287 * change that might modify it, this will cause a lot of expensive | |
| 2288 * calls to plines() in update_topline() each time. Therefore the | |
| 2289 * value of w_botline is often approximated, and this value is used to | |
| 2290 * compute the value of w_topline. If the value of w_botline was | |
| 2291 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2292 * the visible part of the text). If it's not, we need to redraw | |
| 2293 * again. Mostly this just means scrolling up a few lines, so it | |
| 2294 * doesn't look too bad. Only do this for the current window (where | |
| 2295 * changes are relevant). | |
| 2296 */ | |
| 2297 wp->w_valid |= VALID_BOTLINE; | |
| 2298 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2299 { | |
| 2300 recursive = TRUE; | |
| 2301 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2302 update_topline(); /* may invalidate w_botline again */ | |
| 2303 if (must_redraw != 0) | |
| 2304 { | |
| 2305 /* Don't update for changes in buffer again. */ | |
| 2306 i = curbuf->b_mod_set; | |
| 2307 curbuf->b_mod_set = FALSE; | |
| 2308 win_update(curwin); | |
| 2309 must_redraw = 0; | |
| 2310 curbuf->b_mod_set = i; | |
| 2311 } | |
| 2312 recursive = FALSE; | |
| 2313 } | |
| 2314 } | |
| 2315 | |
| 2316 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2317 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2318 if (!got_int) | |
| 2319 got_int = save_got_int; | |
| 2320 #endif | |
| 2321 } | |
| 2322 | |
| 2323 /* | |
| 2324 * Clear the rest of the window and mark the unused lines with "c1". use "c2" | |
| 2325 * as the filler character. | |
| 2326 */ | |
| 2327 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2328 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2329 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2330 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2331 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2332 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2333 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2334 hlf_T hl) |
| 7 | 2335 { |
| 2336 #if defined(FEAT_FOLDING) || defined(FEAT_SIGNS) || defined(FEAT_CMDWIN) | |
| 2337 int n = 0; | |
| 2338 # define FDC_OFF n | |
| 2339 #else | |
| 2340 # define FDC_OFF 0 | |
| 2341 #endif | |
| 6553 | 2342 #ifdef FEAT_FOLDING |
| 2343 int fdc = compute_foldcolumn(wp, 0); | |
| 2344 #endif | |
| 7 | 2345 |
| 2346 #ifdef FEAT_RIGHTLEFT | |
| 2347 if (wp->w_p_rl) | |
| 2348 { | |
| 2349 /* No check for cmdline window: should never be right-left. */ | |
| 2350 # ifdef FEAT_FOLDING | |
| 6553 | 2351 n = fdc; |
| 7 | 2352 |
| 2353 if (n > 0) | |
| 2354 { | |
| 2355 /* draw the fold column at the right */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2356 if (n > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2357 n = wp->w_width; |
| 7 | 2358 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2359 W_ENDCOL(wp) - n, (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
|
2360 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2361 } |
| 2362 # endif | |
| 2363 # ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2364 if (signcolumn_on(wp)) |
| 7 | 2365 { |
| 2366 int nn = n + 2; | |
| 2367 | |
| 2368 /* draw the sign column left of the fold column */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2369 if (nn > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2370 nn = wp->w_width; |
| 7 | 2371 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2372 W_ENDCOL(wp) - nn, (int)W_ENDCOL(wp) - n, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2373 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2374 n = nn; |
| 2375 } | |
| 2376 # endif | |
| 2377 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2378 wp->w_wincol, W_ENDCOL(wp) - 1 - FDC_OFF, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2379 c2, c2, HL_ATTR(hl)); |
| 7 | 2380 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2381 W_ENDCOL(wp) - 1 - FDC_OFF, W_ENDCOL(wp) - FDC_OFF, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2382 c1, c2, HL_ATTR(hl)); |
| 7 | 2383 } |
| 2384 else | |
| 2385 #endif | |
| 2386 { | |
| 2387 #ifdef FEAT_CMDWIN | |
| 2388 if (cmdwin_type != 0 && wp == curwin) | |
| 2389 { | |
| 2390 /* draw the cmdline character in the leftmost column */ | |
| 2391 n = 1; | |
| 2392 if (n > wp->w_width) | |
| 2393 n = wp->w_width; | |
| 2394 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2395 wp->w_wincol, (int)wp->w_wincol + n, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2396 cmdwin_type, ' ', HL_ATTR(HLF_AT)); |
| 7 | 2397 } |
| 2398 #endif | |
| 2399 #ifdef FEAT_FOLDING | |
| 6553 | 2400 if (fdc > 0) |
| 2401 { | |
| 2402 int nn = n + fdc; | |
| 7 | 2403 |
| 2404 /* draw the fold column at the left */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2405 if (nn > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2406 nn = wp->w_width; |
| 7 | 2407 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2408 wp->w_wincol + n, (int)wp->w_wincol + nn, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2409 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2410 n = nn; |
| 2411 } | |
| 2412 #endif | |
| 2413 #ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2414 if (signcolumn_on(wp)) |
| 7 | 2415 { |
| 2416 int nn = n + 2; | |
| 2417 | |
| 2418 /* draw the sign column after the fold column */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2419 if (nn > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2420 nn = wp->w_width; |
| 7 | 2421 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2422 wp->w_wincol + n, (int)wp->w_wincol + nn, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2423 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2424 n = nn; |
| 2425 } | |
| 2426 #endif | |
| 2427 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2428 wp->w_wincol + FDC_OFF, (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
|
2429 c1, c2, HL_ATTR(hl)); |
| 7 | 2430 } |
| 2431 set_empty_rows(wp, row); | |
| 2432 } | |
| 2433 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2434 #ifdef FEAT_SYN_HL |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2435 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2436 * 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
|
2437 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2438 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2439 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
|
2440 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2441 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2442 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2443 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2444 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2445 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2446 |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2447 #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
|
2448 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2449 * 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
|
2450 * 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
|
2451 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2452 static int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2453 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
|
2454 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2455 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
|
2456 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2457 #ifdef FEAT_MBYTE |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2458 if (has_mbyte) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2459 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2460 int cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2461 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
|
2462 int i; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2463 int idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2464 int c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2465 char_u *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2466 # ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2467 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
|
2468 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
|
2469 # endif |
|
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 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2472 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
|
2473 idx = off; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2474 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2475 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2476 idx = off + col; |
|
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 /* 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
|
2479 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
|
2480 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2481 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
|
2482 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
|
2483 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
|
2484 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2485 - (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
|
2486 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2487 ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2488 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2489 ScreenLines[idx] = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2490 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2491 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2492 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
|
2493 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
|
2494 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2495 ScreenLinesUC[idx] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2496 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2497 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2498 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2499 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2500 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2501 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2502 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2503 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
|
2504 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2505 /* Do Arabic shaping. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2506 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
|
2507 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
|
2508 int firstbyte = *p; |
|
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 /* 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
|
2511 * 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
|
2512 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
|
2513 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2514 pc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2515 pc1 = prev_c1; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2516 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
|
2517 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
|
2518 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2519 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2520 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2521 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
|
2522 nc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2523 pc1 = pcc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2524 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2525 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2526 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2527 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
|
2528 pc, pc1, nc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2529 ScreenLines[idx] = firstbyte; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2530 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2531 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2532 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2533 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2534 /* Non-BMP character: display as ? or fullwidth ?. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2535 #ifdef UNICODE16 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2536 if (u8c >= 0x10000) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2537 ScreenLinesUC[idx] = (cells == 2) ? 0xff1f : (int)'?'; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2538 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2539 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2540 ScreenLinesUC[idx] = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2541 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
|
2542 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2543 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
|
2544 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
|
2545 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2546 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2547 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2548 if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2549 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
|
2550 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2551 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
|
2552 /* 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
|
2553 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
|
2554 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
|
2555 /* double-width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2556 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
|
2557 col += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2558 idx += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2559 p += c_len; |
|
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 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2562 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2563 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2564 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2565 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
|
2566 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2567 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
|
2568 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
|
2569 if (len > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2570 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2571 #ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2572 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
|
2573 STRNCPY(current_ScreenLine, text, len); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2574 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2575 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2576 STRNCPY(current_ScreenLine + col, text, len); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2577 col += len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2578 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2579 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2580 return col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2581 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2582 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2583 |
| 7 | 2584 #ifdef FEAT_FOLDING |
| 2585 /* | |
| 6553 | 2586 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2587 * space is available for window "wp", minus "col". | |
| 2588 */ | |
| 2589 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2590 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2591 { |
| 2592 int fdc = wp->w_p_fdc; | |
| 2593 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
|
2594 int wwidth = wp->w_width; |
| 6553 | 2595 |
| 2596 if (fdc > wwidth - (col + wmw)) | |
| 2597 fdc = wwidth - (col + wmw); | |
| 2598 return fdc; | |
| 2599 } | |
| 2600 | |
| 2601 /* | |
| 7 | 2602 * Display one folded line. |
| 2603 */ | |
| 2604 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2605 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2606 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2607 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2608 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2609 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2610 int row) |
| 7 | 2611 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2612 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2613 pos_T *top, *bot; |
| 2614 linenr_T lnume = lnum + fold_count - 1; | |
| 2615 int len; | |
| 29 | 2616 char_u *text; |
| 7 | 2617 int fdc; |
| 2618 int col; | |
| 2619 int txtcol; | |
| 2620 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2621 int ri; |
| 7 | 2622 |
| 2623 /* Build the fold line: | |
| 2624 * 1. Add the cmdwin_type for the command-line window | |
| 2625 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2626 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2627 * 4. Compose the text |
| 2628 * 5. Add the text | |
| 2629 * 6. set highlighting for the Visual area an other text | |
| 2630 */ | |
| 2631 col = 0; | |
| 2632 | |
| 2633 /* | |
| 2634 * 1. Add the cmdwin_type for the command-line window | |
| 2635 * Ignores 'rightleft', this window is never right-left. | |
| 2636 */ | |
| 2637 #ifdef FEAT_CMDWIN | |
| 2638 if (cmdwin_type != 0 && wp == curwin) | |
| 2639 { | |
| 2640 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
|
2641 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2642 #ifdef FEAT_MBYTE |
| 2643 if (enc_utf8) | |
| 2644 ScreenLinesUC[off] = 0; | |
| 2645 #endif | |
| 2646 ++col; | |
| 2647 } | |
| 2648 #endif | |
| 2649 | |
| 2650 /* | |
| 2651 * 2. Add the 'foldcolumn' | |
| 6553 | 2652 * Reduce the width when there is not enough space. |
| 7 | 2653 */ |
| 6553 | 2654 fdc = compute_foldcolumn(wp, col); |
| 7 | 2655 if (fdc > 0) |
| 2656 { | |
| 2657 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2658 #ifdef FEAT_RIGHTLEFT | |
| 2659 if (wp->w_p_rl) | |
| 2660 { | |
| 2661 int i; | |
| 2662 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2663 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
|
2664 HL_ATTR(HLF_FC)); |
| 7 | 2665 /* reverse the fold column */ |
| 2666 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
|
2667 ScreenLines[off + wp->w_width - i - 1 - col] = buf[i]; |
| 7 | 2668 } |
| 2669 else | |
| 2670 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2671 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2672 col += fdc; |
| 2673 } | |
| 2674 | |
| 2675 #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
|
2676 # 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
|
2677 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2678 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
|
2679 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
|
2680 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
|
2681 else \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2682 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
|
2683 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
|
2684 } while (0) |
| 7 | 2685 #else |
|
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 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
|
2689 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
|
2690 } while (0) |
| 7 | 2691 #endif |
| 2692 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2693 /* 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
|
2694 * text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2695 RL_MEMSET(col, HL_ATTR(HLF_FL), wp->w_width - col); |
| 7 | 2696 |
| 2697 #ifdef FEAT_SIGNS | |
| 2698 /* 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
|
2699 if (signcolumn_on(wp)) |
| 7 | 2700 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2701 len = wp->w_width - col; |
| 7 | 2702 if (len > 0) |
| 2703 { | |
| 2704 if (len > 2) | |
| 2705 len = 2; | |
| 2706 # ifdef FEAT_RIGHTLEFT | |
| 2707 if (wp->w_p_rl) | |
| 2708 /* 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
|
2709 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
|
2710 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2711 else |
| 2712 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2713 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2714 col += len; |
| 2715 } | |
| 2716 } | |
| 2717 #endif | |
| 2718 | |
| 2719 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2720 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2721 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2722 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2723 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2724 len = wp->w_width - col; |
| 7 | 2725 if (len > 0) |
| 2726 { | |
| 13 | 2727 int w = number_width(wp); |
| 5905 | 2728 long num; |
| 2729 char *fmt = "%*ld "; | |
| 13 | 2730 |
| 2731 if (len > w + 1) | |
| 2732 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2733 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2734 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
|
2735 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2736 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2737 else |
| 4065 | 2738 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2739 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2740 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
|
2741 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
|
2742 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2743 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2744 * line number */ |
| 4065 | 2745 num = lnum; |
| 2746 fmt = "%-*ld "; | |
| 2747 } | |
| 2748 } | |
| 2749 | |
| 2750 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2751 #ifdef FEAT_RIGHTLEFT |
| 2752 if (wp->w_p_rl) | |
| 2753 /* 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
|
2754 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
|
2755 HL_ATTR(HLF_FL)); |
| 7 | 2756 else |
| 2757 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2758 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2759 col += len; |
| 2760 } | |
| 2761 } | |
| 2762 | |
| 2763 /* | |
| 2764 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2765 */ | |
| 29 | 2766 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2767 |
| 2768 txtcol = col; /* remember where text starts */ | |
| 2769 | |
| 2770 /* | |
| 2771 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2772 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2773 * in columns number-col - window-width. | |
| 2774 */ | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2775 col = text_to_screenline(wp, text, col); |
| 7 | 2776 |
| 2777 /* Fill the rest of the line with the fold filler */ | |
| 2778 #ifdef FEAT_RIGHTLEFT | |
| 2779 if (wp->w_p_rl) | |
| 2780 col -= txtcol; | |
| 2781 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2782 while (col < wp->w_width |
| 7 | 2783 #ifdef FEAT_RIGHTLEFT |
| 2784 - (wp->w_p_rl ? txtcol : 0) | |
| 2785 #endif | |
| 2786 ) | |
| 2787 { | |
| 2788 #ifdef FEAT_MBYTE | |
| 2789 if (enc_utf8) | |
| 2790 { | |
| 2791 if (fill_fold >= 0x80) | |
| 2792 { | |
| 2793 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2794 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
|
2795 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2796 } |
| 2797 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2798 { |
| 7 | 2799 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2800 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2801 } |
|
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
|
2802 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
|
2803 } |
|
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
|
2804 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
|
2805 #endif |
|
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
|
2806 ScreenLines[off + col++] = fill_fold; |
| 7 | 2807 } |
| 2808 | |
| 2809 if (text != buf) | |
| 2810 vim_free(text); | |
| 2811 | |
| 2812 /* | |
| 2813 * 6. set highlighting for the Visual area an other text. | |
| 2814 * If all folded lines are in the Visual area, highlight the line. | |
| 2815 */ | |
| 2816 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2817 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2818 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2819 { |
| 2820 /* Visual is after curwin->w_cursor */ | |
| 2821 top = &curwin->w_cursor; | |
| 2822 bot = &VIsual; | |
| 2823 } | |
| 2824 else | |
| 2825 { | |
| 2826 /* Visual is before curwin->w_cursor */ | |
| 2827 top = &VIsual; | |
| 2828 bot = &curwin->w_cursor; | |
| 2829 } | |
| 2830 if (lnum >= top->lnum | |
| 2831 && lnume <= bot->lnum | |
| 2832 && (VIsual_mode != 'v' | |
| 2833 || ((lnum > top->lnum | |
| 2834 || (lnum == top->lnum | |
| 2835 && top->col == 0)) | |
| 2836 && (lnume < bot->lnum | |
| 2837 || (lnume == bot->lnum | |
| 2838 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2839 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2840 { |
| 2841 if (VIsual_mode == Ctrl_V) | |
| 2842 { | |
| 2843 /* 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
|
2844 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)wp->w_width) |
| 7 | 2845 { |
| 3040 | 2846 if (wp->w_old_cursor_lcol != MAXCOL |
| 2847 && 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
|
2848 < (colnr_T)wp->w_width) |
| 7 | 2849 len = wp->w_old_cursor_lcol; |
| 2850 else | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2851 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
|
2852 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2853 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2854 } |
| 2855 } | |
| 2856 else | |
| 216 | 2857 { |
| 7 | 2858 /* 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
|
2859 RL_MEMSET(txtcol, HL_ATTR(HLF_V), wp->w_width - txtcol); |
| 216 | 2860 } |
| 7 | 2861 } |
| 2862 } | |
| 2863 | |
| 743 | 2864 #ifdef FEAT_SYN_HL |
| 6685 | 2865 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2866 if (wp->w_p_cc_cols) | |
| 2867 { | |
| 2868 int i = 0; | |
| 2869 int j = wp->w_p_cc_cols[i]; | |
| 2870 int old_txtcol = txtcol; | |
| 2871 | |
| 2872 while (j > -1) | |
| 2873 { | |
| 2874 txtcol += j; | |
| 2875 if (wp->w_p_wrap) | |
| 2876 txtcol -= wp->w_skipcol; | |
| 2877 else | |
| 2878 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
|
2879 if (txtcol >= 0 && txtcol < wp->w_width) |
| 6685 | 2880 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
|
2881 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2882 txtcol = old_txtcol; |
| 2883 j = wp->w_p_cc_cols[++i]; | |
| 2884 } | |
| 2885 } | |
| 2886 | |
| 743 | 2887 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2888 if (wp->w_p_cuc) |
| 2889 { | |
| 2890 txtcol += wp->w_virtcol; | |
| 2891 if (wp->w_p_wrap) | |
| 2892 txtcol -= wp->w_skipcol; | |
| 2893 else | |
| 2894 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
|
2895 if (txtcol >= 0 && txtcol < wp->w_width) |
| 1725 | 2896 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
|
2897 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2898 } |
| 743 | 2899 #endif |
| 7 | 2900 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2901 screen_line(row + W_WINROW(wp), wp->w_wincol, (int)wp->w_width, |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2902 (int)wp->w_width, FALSE); |
| 7 | 2903 |
| 2904 /* | |
| 2905 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2906 * updated (saves a call to plines() later). | |
| 2907 */ | |
| 2908 if (wp == curwin | |
| 2909 && lnum <= curwin->w_cursor.lnum | |
| 2910 && lnume >= curwin->w_cursor.lnum) | |
| 2911 { | |
| 2912 curwin->w_cline_row = row; | |
| 2913 curwin->w_cline_height = 1; | |
| 2914 curwin->w_cline_folded = TRUE; | |
| 2915 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2916 } | |
| 2917 } | |
| 2918 | |
| 2919 /* | |
| 2920 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2921 */ | |
| 2922 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2923 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2924 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2925 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2926 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2927 int attr) |
| 7 | 2928 { |
| 216 | 2929 int i; |
| 2930 | |
| 7 | 2931 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2932 # ifdef FEAT_MBYTE | |
| 2933 if (enc_utf8) | |
| 2934 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 2935 # endif | |
| 216 | 2936 for (i = 0; i < len; ++i) |
| 2937 ScreenAttrs[off + i] = attr; | |
| 7 | 2938 } |
| 2939 | |
| 2940 /* | |
| 2941 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2942 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2943 */ |
| 2944 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2945 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2946 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2947 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2948 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2949 linenr_T lnum) /* current line number */ |
| 7 | 2950 { |
| 2951 int i = 0; | |
| 2952 int level; | |
| 2953 int first_level; | |
| 519 | 2954 int empty; |
| 6553 | 2955 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2956 |
| 2957 /* Init to all spaces. */ | |
| 6929 | 2958 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2959 |
| 2960 level = win_foldinfo.fi_level; | |
| 2961 if (level > 0) | |
| 2962 { | |
| 519 | 2963 /* If there is only one column put more info in it. */ |
| 6553 | 2964 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2965 |
| 7 | 2966 /* If the column is too narrow, we start at the lowest level that |
| 2967 * fits and use numbers to indicated the depth. */ | |
| 6553 | 2968 first_level = level - fdc - closed + 1 + empty; |
| 7 | 2969 if (first_level < 1) |
| 2970 first_level = 1; | |
| 2971 | |
| 6553 | 2972 for (i = 0; i + empty < fdc; ++i) |
| 7 | 2973 { |
| 2974 if (win_foldinfo.fi_lnum == lnum | |
| 2975 && first_level + i >= win_foldinfo.fi_low_level) | |
| 2976 p[i] = '-'; | |
| 2977 else if (first_level == 1) | |
| 2978 p[i] = '|'; | |
| 2979 else if (first_level + i <= 9) | |
| 2980 p[i] = '0' + first_level + i; | |
| 2981 else | |
| 2982 p[i] = '>'; | |
| 2983 if (first_level + i == level) | |
| 2984 break; | |
| 2985 } | |
| 2986 } | |
| 2987 if (closed) | |
| 6553 | 2988 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 2989 } |
| 2990 #endif /* FEAT_FOLDING */ | |
| 2991 | |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2992 #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
|
2993 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
|
2994 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
|
2995 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2996 static int |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2997 #ifdef __BORLANDC__ |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2998 _RTLENTRYF |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2999 #endif |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3000 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
|
3001 { |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3002 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
|
3003 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
|
3004 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
|
3005 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3006 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
|
3007 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
|
3008 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
|
3009 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
|
3010 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
|
3011 return 0; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3012 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
|
3013 return -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3014 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
|
3015 return 1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3016 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
|
3017 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
|
3018 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
|
3019 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
|
3020 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
|
3021 } |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3022 #endif |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3023 |
| 7 | 3024 /* |
| 3025 * Display line "lnum" of window 'wp' on the screen. | |
| 3026 * Start at row "startrow", stop when "endrow" is reached. | |
| 3027 * wp->w_virtcol needs to be valid. | |
| 3028 * | |
| 3029 * Return the number of last row the line occupies. | |
| 3030 */ | |
| 3031 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3032 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3033 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3034 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3035 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3036 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
|
3037 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
|
3038 int number_only) // only update the number column |
| 7 | 3039 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3040 int col = 0; /* visual column on screen */ |
| 7 | 3041 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 3042 int c = 0; /* init for GCC */ | |
| 3043 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 3044 #ifdef FEAT_LINEBREAK |
| 3045 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 3046 #endif | |
| 7 | 3047 long vcol_prev = -1; /* "vcol" of previous character */ |
| 3048 char_u *line; /* current line */ | |
| 3049 char_u *ptr; /* current position in "line" */ | |
| 3050 int row; /* row in the window, excl w_winrow */ | |
| 3051 int screen_row; /* row on the screen, incl w_winrow */ | |
| 3052 | |
| 3053 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 3054 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 3055 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 3056 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 3057 int c_extra = NUL; /* extra chars, all the same */ |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3058 int c_final = NUL; /* final char, mandatory if set */ |
| 7 | 3059 int extra_attr = 0; /* attributes when n_extra != 0 */ |
| 3060 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 3061 displaying lcs_eol at end-of-line */ | |
| 3062 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 3063 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 3064 | |
| 3065 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 3066 int saved_n_extra = 0; | |
| 3067 char_u *saved_p_extra = NULL; | |
| 3068 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
|
3069 int saved_c_final = 0; |
| 7 | 3070 int saved_char_attr = 0; |
| 3071 | |
| 3072 int n_attr = 0; /* chars with special attr */ | |
| 3073 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3074 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3075 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3076 | |
| 3077 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3078 | |
| 3079 int fromcol, tocol; /* start/end of inverting */ | |
| 3080 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3081 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3082 pos_T *top, *bot; | |
| 1813 | 3083 int lnum_in_visual_area = FALSE; |
| 7 | 3084 pos_T pos; |
| 3085 long v; | |
| 3086 | |
| 3087 int char_attr = 0; /* attributes for next character */ | |
| 674 | 3088 int attr_pri = FALSE; /* char_attr has priority */ |
| 7 | 3089 int area_highlighting = FALSE; /* Visual or incsearch highlighting |
| 3090 in this line */ | |
| 3091 int attr = 0; /* attributes for area highlighting */ | |
| 3092 int area_attr = 0; /* attributes desired by highlighting */ | |
| 3093 int search_attr = 0; /* attributes desired by 'hlsearch' */ | |
| 3094 #ifdef FEAT_SYN_HL | |
| 743 | 3095 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3096 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3097 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3098 int save_did_emsg; | |
| 1437 | 3099 int eol_hl_off = 0; /* 1 if highlighted char after EOL */ |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3100 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3101 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3102 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3103 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3104 int text_prop_count; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3105 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
|
3106 textprop_T *text_props = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3107 int *text_prop_idxs = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3108 int text_props_active = 0; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3109 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
|
3110 int text_prop_attr = 0; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3111 #endif |
| 743 | 3112 #ifdef FEAT_SPELL |
| 221 | 3113 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3114 # define SPWORDLEN 150 |
| 3115 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3116 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3117 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3118 starts */ |
| 221 | 3119 int spell_attr = 0; /* attributes desired by spelling */ |
| 3120 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3121 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3122 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3123 * there are no spell errors */ |
| 386 | 3124 static int cap_col = -1; /* column to check for Cap word */ |
| 3125 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3126 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3127 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3128 int extra_check = 0; // has extra highlighting |
| 7 | 3129 #ifdef FEAT_MBYTE |
| 3130 int multi_attr = 0; /* attributes desired by multibyte */ | |
| 3131 int mb_l = 1; /* multi-byte byte length */ | |
| 3132 int mb_c = 0; /* decoded multi-byte character */ | |
| 3133 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3134 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3135 #endif |
| 3136 #ifdef FEAT_DIFF | |
| 3137 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3138 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3139 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3140 int change_start = MAXCOL; /* first col of changed area */ |
| 3141 int change_end = -1; /* last col of changed area */ | |
| 3142 #endif | |
| 3143 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3144 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3145 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
|
3146 chars */ |
| 7 | 3147 #endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3148 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
| 910 | 3149 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) |
| 7 | 3150 # define LINE_ATTR |
| 1536 | 3151 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3152 #endif |
| 3153 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3154 matchitem_T *cur; /* points to the match list */ |
| 3155 match_T *shl; /* points to search_hl or a match */ | |
| 3156 int shl_flag; /* flag to indicate whether search_hl | |
| 3157 has been processed or not */ | |
| 5979 | 3158 int pos_inprogress; /* marks that position match search is |
| 3159 in progress */ | |
| 1326 | 3160 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3161 equals startcol of search_hl or one | |
| 3162 of the matches */ | |
| 7 | 3163 #endif |
| 3164 #ifdef FEAT_ARABIC | |
| 3165 int prev_c = 0; /* previous Arabic character */ | |
| 3166 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3167 #endif | |
| 910 | 3168 #if defined(LINE_ATTR) |
| 867 | 3169 int did_line_attr = 0; |
| 3170 #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
|
3171 #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
|
3172 int get_term_attr = FALSE; |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
3173 int term_attr = 0; /* background for terminal window */ |
|
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
|
3174 #endif |
| 7 | 3175 |
| 3176 /* draw_state: items that are drawn in sequence: */ | |
| 3177 #define WL_START 0 /* nothing done yet */ | |
| 3178 #ifdef FEAT_CMDWIN | |
| 3179 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3180 #else | |
| 3181 # define WL_CMDLINE WL_START | |
| 3182 #endif | |
| 3183 #ifdef FEAT_FOLDING | |
| 3184 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3185 #else | |
| 3186 # define WL_FOLD WL_CMDLINE | |
| 3187 #endif | |
| 3188 #ifdef FEAT_SIGNS | |
| 3189 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3190 #else | |
| 3191 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3192 #endif | |
| 3193 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3194 #ifdef FEAT_LINEBREAK |
| 3195 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3196 #else | |
| 3197 # define WL_BRI WL_NR | |
| 3198 #endif | |
| 7 | 3199 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3200 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3201 #else |
| 5995 | 3202 # define WL_SBR WL_BRI |
| 7 | 3203 #endif |
| 3204 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3205 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3206 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3207 int feedback_col = 0; |
| 3208 int feedback_old_attr = -1; | |
| 3209 #endif | |
| 3210 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3211 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3212 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
|
3213 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
|
3214 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
|
3215 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
|
3216 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3217 int boguscols = 0; /* nonexistent columns added to force |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3218 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3219 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
|
3220 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3221 int match_conc = 0; /* cchar for match functions */ |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3222 int has_match_conc = 0; /* match wants to conceal */ |
| 6520 | 3223 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3224 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3225 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3226 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3227 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3228 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3229 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3230 col -= boguscols; \ |
| 6520 | 3231 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3232 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3233 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3234 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3235 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3236 #endif |
| 7 | 3237 |
| 3238 if (startrow > endrow) /* past the end already! */ | |
| 3239 return startrow; | |
| 3240 | |
| 3241 row = startrow; | |
| 3242 screen_row = row + W_WINROW(wp); | |
| 3243 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3244 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
|
3245 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3246 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3247 * 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
|
3248 * 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
|
3249 */ |
| 7 | 3250 #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
|
3251 extra_check = wp->w_p_lbr; |
| 7 | 3252 #endif |
| 3253 #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
|
3254 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
|
3255 # 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
|
3256 && !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
|
3257 # endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3258 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3259 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3260 /* 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
|
3261 * 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
|
3262 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
|
3263 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
|
3264 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
|
3265 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
|
3266 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
|
3267 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3268 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3269 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
|
3270 #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
|
3271 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
|
3272 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3273 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3274 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
|
3275 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
|
3276 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3277 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3278 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3279 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3280 /* 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
|
3281 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
|
3282 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
|
3283 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3284 #endif |
| 3285 | |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3286 #ifdef FEAT_TERMINAL |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3287 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
|
3288 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3289 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
|
3290 get_term_attr = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3291 term_attr = term_get_attr(wp->w_buffer, 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
|
3292 } |
|
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
|
3293 #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
|
3294 |
| 743 | 3295 #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
|
3296 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
|
3297 && *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
|
3298 && 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
|
3299 && *(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
|
3300 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3301 /* 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
|
3302 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
|
3303 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
|
3304 |
|
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
|
3305 /* 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
|
3306 * 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
|
3307 * 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
|
3308 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
|
3309 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
|
3310 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3311 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
|
3312 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
|
3313 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3314 |
|
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
|
3315 /* 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
|
3316 * 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
|
3317 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
|
3318 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
|
3319 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
|
3320 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3321 /* 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
|
3322 * 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
|
3323 * 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
|
3324 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
|
3325 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
|
3326 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
|
3327 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
|
3328 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
|
3329 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3330 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3331 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3332 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3333 * handle visual active in this window |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3334 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3335 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
|
3336 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
|
3337 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
|
3338 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3339 /* Visual is after 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
|
3340 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
|
3341 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3342 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
|
3343 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
|
3344 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3345 else /* Visual is before 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
|
3346 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3347 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
|
3348 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
|
3349 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3350 lnum_in_visual_area = (lnum >= top->lnum && 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
|
3351 if (VIsual_mode == Ctrl_V) /* block mode */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3352 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3353 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
|
3354 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3355 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
|
3356 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
|
3357 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3358 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3359 else /* non-block mode */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3360 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3361 if (lnum > top->lnum && lnum <= bot->lnum) |
| 7 | 3362 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
|
3363 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
|
3364 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3365 if (VIsual_mode == 'V') /* linewise */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3366 fromcol = 0; |
| 7 | 3367 else |
| 3368 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3369 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
|
3370 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
|
3371 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
|
3372 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3373 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3374 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
|
3375 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3376 if (*p_sel == 'e' && bot->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
|
3377 #ifdef FEAT_VIRTUALEDIT |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3378 && bot->coladd == 0 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3379 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3380 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3381 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3382 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
|
3383 tocol = MAXCOL; |
| 7 | 3384 } |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3385 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
|
3386 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
|
3387 else |
|
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 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
|
3390 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
|
3391 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
|
3392 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3393 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3394 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
|
3395 ++tocol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3396 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3397 } |
|
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 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3400 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3401 /* 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
|
3402 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
|
3403 #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
|
3404 && !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
|
3405 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3406 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3407 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
|
3408 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3409 /* 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
|
3410 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
|
3411 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3412 area_highlighting = 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 attr = HL_ATTR(HLF_V); |
| 7 | 3414 #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
|
3415 if ((clip_star.available && !clip_star.owned |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3416 && clip_isautosel_star()) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3417 || (clip_plus.available && !clip_plus.owned |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3418 && clip_isautosel_plus())) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3419 attr = HL_ATTR(HLF_VNC); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3420 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3421 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3422 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3423 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3424 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3425 * 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
|
3426 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3427 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
|
3428 && 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
|
3429 && 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
|
3430 && 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
|
3431 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3432 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
|
3433 getvcol(curwin, &(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
|
3434 (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
|
3435 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3436 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
|
3437 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
|
3438 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3439 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
|
3440 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
|
3441 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
|
3442 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3443 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3444 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
|
3445 /* 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
|
3446 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
|
3447 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
|
3448 area_highlighting = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3449 attr = HL_ATTR(HLF_I); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3450 } |
| 7 | 3451 } |
| 3452 | |
| 3453 #ifdef FEAT_DIFF | |
| 3454 filler_lines = diff_check(wp, lnum); | |
| 3455 if (filler_lines < 0) | |
| 3456 { | |
| 3457 if (filler_lines == -1) | |
| 3458 { | |
| 3459 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3460 diff_hlf = HLF_ADD; /* added line */ | |
| 3461 else if (change_start == 0) | |
| 3462 diff_hlf = HLF_TXD; /* changed text */ | |
| 3463 else | |
| 3464 diff_hlf = HLF_CHD; /* changed line */ | |
| 3465 } | |
| 3466 else | |
| 3467 diff_hlf = HLF_ADD; /* added line */ | |
| 3468 filler_lines = 0; | |
| 3469 area_highlighting = TRUE; | |
| 3470 } | |
| 3471 if (lnum == wp->w_topline) | |
| 3472 filler_lines = wp->w_topfill; | |
| 3473 filler_todo = filler_lines; | |
| 3474 #endif | |
| 3475 | |
| 3476 #ifdef LINE_ATTR | |
| 3477 # ifdef FEAT_SIGNS | |
| 3478 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3479 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3480 if (v != 0) | |
| 3481 line_attr = sign_get_attr((int)v, TRUE); | |
| 3482 # endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3483 # if defined(FEAT_QUICKFIX) |
| 7 | 3484 /* Highlight the current line in the quickfix window. */ |
| 644 | 3485 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
|
3486 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3487 # endif |
| 3488 if (line_attr != 0) | |
| 3489 area_highlighting = TRUE; | |
| 3490 #endif | |
| 3491 | |
| 3492 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3493 ptr = line; | |
| 3494 | |
| 743 | 3495 #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
|
3496 if (has_spell && !number_only) |
| 348 | 3497 { |
| 386 | 3498 /* For checking first word with a capital skip white space. */ |
| 3499 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
|
3500 cap_col = getwhitecols(line); |
| 386 | 3501 |
| 348 | 3502 /* To be able to spell-check over line boundaries copy the end of the |
| 3503 * current line into nextline[]. Above the start of the next line was | |
| 3504 * copied to nextline[SPWORDLEN]. */ | |
| 3505 if (nextline[SPWORDLEN] == NUL) | |
| 3506 { | |
| 3507 /* No next line or it is empty. */ | |
| 3508 nextlinecol = MAXCOL; | |
| 3509 nextline_idx = 0; | |
| 3510 } | |
| 3511 else | |
| 3512 { | |
| 835 | 3513 v = (long)STRLEN(line); |
| 348 | 3514 if (v < SPWORDLEN) |
| 3515 { | |
| 3516 /* Short line, use it completely and append the start of the | |
| 3517 * next line. */ | |
| 3518 nextlinecol = 0; | |
| 3519 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3520 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3521 nextline_idx = v + 1; |
| 3522 } | |
| 3523 else | |
| 3524 { | |
| 3525 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3526 nextlinecol = v - SPWORDLEN; | |
| 3527 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3528 nextline_idx = SPWORDLEN + 1; | |
| 3529 } | |
| 3530 } | |
| 3531 } | |
| 3532 #endif | |
| 3533 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3534 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3535 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3536 if (lcs_space || lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3537 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3538 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3539 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3540 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3541 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
|
3542 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
|
3543 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3544 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3545 } |
| 7 | 3546 } |
| 3547 | |
| 3548 /* | |
| 3549 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3550 * first character to be displayed. | |
| 3551 */ | |
| 3552 if (wp->w_p_wrap) | |
| 3553 v = wp->w_skipcol; | |
| 3554 else | |
| 3555 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
|
3556 if (v > 0 && !number_only) |
| 7 | 3557 { |
| 3558 #ifdef FEAT_MBYTE | |
| 3559 char_u *prev_ptr = ptr; | |
| 3560 #endif | |
| 3561 while (vcol < v && *ptr != NUL) | |
| 3562 { | |
| 5995 | 3563 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3564 vcol += c; |
| 3565 #ifdef FEAT_MBYTE | |
| 3566 prev_ptr = ptr; | |
| 39 | 3567 #endif |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3568 MB_PTR_ADV(ptr); |
| 7 | 3569 } |
| 3570 | |
| 1984 | 3571 /* When: |
| 3572 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3573 * - 'colorcolumn' is set, or |
| 1984 | 3574 * - 'virtualedit' is set, or |
| 3575 * - the visual mode is active, | |
| 3576 * the end of the line may be before the start of the displayed part. | |
| 3577 */ | |
| 3578 if (vcol < v && ( | |
| 5735 | 3579 #ifdef FEAT_SYN_HL |
| 3580 wp->w_p_cuc || draw_color_col || | |
| 3581 #endif | |
| 3582 #ifdef FEAT_VIRTUALEDIT | |
| 3583 virtual_active() || | |
| 3584 #endif | |
| 3585 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 1984 | 3586 { |
| 7 | 3587 vcol = v; |
| 1984 | 3588 } |
| 7 | 3589 |
| 3590 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3591 * that character but skip the first few screen characters. */ | |
| 3592 if (vcol > v) | |
| 3593 { | |
| 3594 vcol -= c; | |
| 3595 #ifdef FEAT_MBYTE | |
| 3596 ptr = prev_ptr; | |
| 3597 #else | |
| 3598 --ptr; | |
| 3599 #endif | |
|
11010
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3600 /* 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
|
3601 * Except for a TAB. */ |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3602 if (( |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3603 #ifdef FEAT_MBYTE |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3604 (*mb_ptr2cells)(ptr) >= c || |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3605 #endif |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3606 *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
|
3607 n_skip = v - vcol; |
| 7 | 3608 } |
| 3609 | |
| 3610 /* | |
| 3611 * Adjust for when the inverted text is before the screen, | |
| 3612 * and when the start of the inverted text is before the screen. | |
| 3613 */ | |
| 3614 if (tocol <= vcol) | |
| 3615 fromcol = 0; | |
| 3616 else if (fromcol >= 0 && fromcol < vcol) | |
| 3617 fromcol = vcol; | |
| 3618 | |
| 3619 #ifdef FEAT_LINEBREAK | |
| 3620 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3621 if (wp->w_p_wrap) | |
| 3622 need_showbreak = TRUE; | |
| 3623 #endif | |
| 743 | 3624 #ifdef FEAT_SPELL |
| 499 | 3625 /* When spell checking a word we need to figure out the start of the |
| 3626 * word and if it's badly spelled or not. */ | |
| 3627 if (has_spell) | |
| 3628 { | |
| 3629 int len; | |
| 1536 | 3630 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3631 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3632 |
| 3633 pos = wp->w_cursor; | |
| 3634 wp->w_cursor.lnum = lnum; | |
| 1536 | 3635 wp->w_cursor.col = linecol; |
| 534 | 3636 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3637 |
| 3638 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3639 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3640 ptr = line + linecol; | |
| 3641 | |
| 530 | 3642 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3643 { |
| 3644 /* no bad word found at line start, don't check until end of a | |
| 3645 * word */ | |
| 534 | 3646 spell_hlf = HLF_COUNT; |
| 3572 | 3647 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3648 } |
| 3649 else | |
| 534 | 3650 { |
| 499 | 3651 /* bad word found, use attributes until end of word */ |
| 3652 word_end = wp->w_cursor.col + len + 1; | |
| 3653 | |
| 534 | 3654 /* Turn index into actual attributes. */ |
| 3655 if (spell_hlf != HLF_COUNT) | |
| 3656 spell_attr = highlight_attr[spell_hlf]; | |
| 3657 } | |
| 499 | 3658 wp->w_cursor = pos; |
| 501 | 3659 |
| 743 | 3660 # ifdef FEAT_SYN_HL |
| 501 | 3661 /* Need to restart syntax highlighting for this line. */ |
| 3662 if (has_syntax) | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3663 syntax_start(wp, lnum); |
| 743 | 3664 # endif |
| 499 | 3665 } |
| 3666 #endif | |
| 7 | 3667 } |
| 3668 | |
| 3669 /* | |
| 3670 * Correct highlighting for cursor that can't be disabled. | |
| 3671 * Avoids having to check this for each character. | |
| 3672 */ | |
| 3673 if (fromcol >= 0) | |
| 3674 { | |
| 3675 if (noinvcur) | |
| 3676 { | |
| 3677 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3678 { | |
| 3679 /* highlighting starts at cursor, let it start just after the | |
| 3680 * cursor */ | |
| 3681 fromcol_prev = fromcol; | |
| 3682 fromcol = -1; | |
| 3683 } | |
| 3684 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3685 /* restart highlighting after the cursor */ | |
| 3686 fromcol_prev = wp->w_virtcol; | |
| 3687 } | |
| 3688 if (fromcol >= tocol) | |
| 3689 fromcol = -1; | |
| 3690 } | |
| 3691 | |
| 3692 #ifdef FEAT_SEARCH_EXTRA | |
| 3693 /* | |
| 1326 | 3694 * Handle highlighting the last used search pattern and matches. |
| 3695 * Do this for both search_hl and the match list. | |
| 7 | 3696 */ |
| 1326 | 3697 cur = wp->w_match_head; |
| 3698 shl_flag = FALSE; | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3699 while ((cur != NULL || shl_flag == FALSE) && !number_only) |
| 1326 | 3700 { |
| 3701 if (shl_flag == FALSE) | |
| 3702 { | |
| 3703 shl = &search_hl; | |
| 3704 shl_flag = TRUE; | |
| 3705 } | |
| 3706 else | |
| 3707 shl = &cur->hl; | |
| 36 | 3708 shl->startcol = MAXCOL; |
| 3709 shl->endcol = MAXCOL; | |
| 7 | 3710 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3711 shl->is_addpos = FALSE; |
| 5979 | 3712 v = (long)(ptr - line); |
| 3713 if (cur != NULL) | |
| 3714 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3715 next_search_hl(wp, shl, lnum, (colnr_T)v, |
|
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3716 shl == &search_hl ? NULL : cur); |
| 5979 | 3717 |
| 3718 /* Need to get the line again, a multi-line regexp may have made it | |
| 3719 * invalid. */ | |
| 3720 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3721 ptr = line + v; | |
| 3722 | |
| 3723 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3724 { | |
| 3725 if (shl->lnum == lnum) | |
| 3726 shl->startcol = shl->rm.startpos[0].col; | |
| 3727 else | |
| 3728 shl->startcol = 0; | |
| 3729 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3730 - shl->rm.startpos[0].lnum) | |
| 3731 shl->endcol = shl->rm.endpos[0].col; | |
| 3732 else | |
| 3733 shl->endcol = MAXCOL; | |
| 3734 /* Highlight one character for an empty match. */ | |
| 3735 if (shl->startcol == shl->endcol) | |
| 3736 { | |
| 3737 #ifdef FEAT_MBYTE | |
| 3738 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3739 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3740 else |
| 5979 | 3741 #endif |
| 3742 ++shl->endcol; | |
| 3743 } | |
| 3744 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3745 { | |
| 3746 shl->attr_cur = shl->attr; | |
| 3747 search_attr = shl->attr; | |
| 3748 } | |
| 3749 area_highlighting = TRUE; | |
| 7 | 3750 } |
| 1326 | 3751 if (shl != &search_hl && cur != NULL) |
| 3752 cur = cur->next; | |
| 7 | 3753 } |
| 3754 #endif | |
| 3755 | |
| 743 | 3756 #ifdef FEAT_SYN_HL |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3757 /* Cursor line highlighting for 'cursorline' in the current window. Not |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3758 * when Visual mode is active, because it's not clear what is selected |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3759 * then. */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3760 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
| 5979 | 3761 && !(wp == curwin && VIsual_active)) |
| 743 | 3762 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3763 line_attr = HL_ATTR(HLF_CUL); |
| 743 | 3764 area_highlighting = TRUE; |
| 3765 } | |
| 3766 #endif | |
| 3767 | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3768 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3769 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3770 char_u *prop_start; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3771 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3772 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
|
3773 &prop_start, FALSE); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3774 if (text_prop_count > 0) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3775 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3776 // 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
|
3777 // aligned. |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3778 text_props = (textprop_T *)alloc( |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3779 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
|
3780 if (text_props != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3781 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
|
3782 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
|
3783 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3784 // Allocate an array for the indexes. |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3785 text_prop_idxs = (int *)alloc(text_prop_count * sizeof(int)); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3786 area_highlighting = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3787 extra_check = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3788 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3789 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3790 #endif |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3791 |
| 504 | 3792 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3793 col = 0; |
| 3794 #ifdef FEAT_RIGHTLEFT | |
| 3795 if (wp->w_p_rl) | |
| 3796 { | |
| 3797 /* Rightleft window: process the text in the normal direction, but put | |
| 3798 * it in current_ScreenLine[] from right to left. Start at the | |
| 3799 * 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
|
3800 col = wp->w_width - 1; |
| 7 | 3801 off += col; |
| 3802 } | |
| 3803 #endif | |
| 3804 | |
| 3805 /* | |
| 3806 * Repeat for the whole displayed line. | |
| 3807 */ | |
| 3808 for (;;) | |
| 3809 { | |
| 6947 | 3810 #ifdef FEAT_CONCEAL |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3811 has_match_conc = 0; |
| 6947 | 3812 #endif |
| 7 | 3813 /* Skip this quickly when working on the text. */ |
| 3814 if (draw_state != WL_LINE) | |
| 3815 { | |
| 3816 #ifdef FEAT_CMDWIN | |
| 3817 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3818 { | |
| 3819 draw_state = WL_CMDLINE; | |
| 3820 if (cmdwin_type != 0 && wp == curwin) | |
| 3821 { | |
| 3822 /* Draw the cmdline character. */ | |
| 3823 n_extra = 1; | |
| 1340 | 3824 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
|
3825 c_final = NUL; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3826 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3827 } |
| 3828 } | |
| 3829 #endif | |
| 3830 | |
| 3831 #ifdef FEAT_FOLDING | |
| 3832 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3833 { | |
| 6553 | 3834 int fdc = compute_foldcolumn(wp, 0); |
| 3835 | |
| 7 | 3836 draw_state = WL_FOLD; |
| 6553 | 3837 if (fdc > 0) |
| 7 | 3838 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3839 /* 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
|
3840 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3841 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3842 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3843 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3844 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3845 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3846 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
|
3847 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3848 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3849 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3850 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
|
3851 c_final = NUL; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3852 char_attr = HL_ATTR(HLF_FC); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3853 } |
| 7 | 3854 } |
| 3855 } | |
| 3856 #endif | |
| 3857 | |
| 3858 #ifdef FEAT_SIGNS | |
| 3859 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3860 { | |
| 3861 draw_state = WL_SIGN; | |
| 3862 /* Show the sign column when there are any signs in this | |
| 3863 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3864 if (signcolumn_on(wp)) |
| 7 | 3865 { |
| 2661 | 3866 int text_sign; |
| 7 | 3867 # ifdef FEAT_SIGN_ICONS |
| 2661 | 3868 int icon_sign; |
| 7 | 3869 # endif |
| 3870 | |
| 3871 /* Draw two cells with the sign value or blank. */ | |
| 3872 c_extra = ' '; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3873 c_final = NUL; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3874 char_attr = HL_ATTR(HLF_SC); |
| 7 | 3875 n_extra = 2; |
| 3876 | |
| 5921 | 3877 if (row == startrow |
| 3878 #ifdef FEAT_DIFF | |
| 3879 + filler_lines && filler_todo <= 0 | |
| 3880 #endif | |
| 3881 ) | |
| 7 | 3882 { |
| 3883 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3884 SIGN_TEXT); | |
| 3885 # ifdef FEAT_SIGN_ICONS | |
| 3886 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3887 SIGN_ICON); | |
| 3888 if (gui.in_use && icon_sign != 0) | |
| 3889 { | |
| 3890 /* Use the image in this position. */ | |
| 3891 c_extra = SIGN_BYTE; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3892 c_final = NUL; |
| 7 | 3893 # ifdef FEAT_NETBEANS_INTG |
| 3894 if (buf_signcount(wp->w_buffer, lnum) > 1) | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3895 { |
| 7 | 3896 c_extra = MULTISIGN_BYTE; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3897 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3898 } |
| 7 | 3899 # endif |
| 3900 char_attr = icon_sign; | |
| 3901 } | |
| 3902 else | |
| 3903 # endif | |
| 3904 if (text_sign != 0) | |
| 3905 { | |
| 3906 p_extra = sign_get_text(text_sign); | |
| 3907 if (p_extra != NULL) | |
| 3908 { | |
| 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; |
| 835 | 3911 n_extra = (int)STRLEN(p_extra); |
| 7 | 3912 } |
| 3913 char_attr = sign_get_attr(text_sign, FALSE); | |
| 3914 } | |
| 3915 } | |
| 3916 } | |
| 3917 } | |
| 3918 #endif | |
| 3919 | |
| 3920 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3921 { | |
| 3922 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3923 /* 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
|
3924 * 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
|
3925 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3926 && (row == startrow |
| 3927 #ifdef FEAT_DIFF | |
| 3928 + filler_lines | |
| 3929 #endif | |
| 3930 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3931 { | |
| 3932 /* Draw the line number (empty space after wrapping). */ | |
| 3933 if (row == startrow | |
| 3934 #ifdef FEAT_DIFF | |
| 3935 + filler_lines | |
| 3936 #endif | |
| 3937 ) | |
| 3938 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3939 long num; |
| 4065 | 3940 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3941 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3942 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
|
3943 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3944 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3945 else |
| 4065 | 3946 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3947 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3948 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
|
3949 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3950 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3951 /* 'number' + 'relativenumber' */ |
| 4065 | 3952 num = lnum; |
| 3953 fmt = "%-*ld "; | |
| 3954 } | |
| 3955 } | |
| 3956 | |
| 3957 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3958 number_width(wp), num); |
| 7 | 3959 if (wp->w_skipcol > 0) |
| 3960 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3961 *p_extra = '-'; | |
| 3962 #ifdef FEAT_RIGHTLEFT | |
| 3963 if (wp->w_p_rl) /* reverse line numbers */ | |
| 3964 rl_mirror(extra); | |
| 3965 #endif | |
| 3966 p_extra = extra; | |
| 3967 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
|
3968 c_final = NUL; |
| 7 | 3969 } |
| 3970 else | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3971 { |
| 7 | 3972 c_extra = ' '; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3973 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3974 } |
| 13 | 3975 n_extra = number_width(wp) + 1; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3976 char_attr = HL_ATTR(HLF_N); |
| 743 | 3977 #ifdef FEAT_SYN_HL |
| 3978 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 3979 * the current line differently. |
| 3980 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 3981 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3982 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 3983 && 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
|
3984 char_attr = HL_ATTR(HLF_CLN); |
| 743 | 3985 #endif |
| 7 | 3986 } |
| 3987 } | |
| 3988 | |
| 5995 | 3989 #ifdef FEAT_LINEBREAK |
| 3990 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 3991 && n_extra == 0 && *p_sbr != NUL) | |
| 3992 /* draw indent after showbreak value */ | |
| 3993 draw_state = WL_BRI; | |
| 3994 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 3995 /* After the showbreak, draw the breakindent */ | |
| 3996 draw_state = WL_BRI - 1; | |
| 3997 | |
| 3998 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 3999 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 4000 { | |
| 4001 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4002 /* 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
|
4003 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
|
4004 && (row != startrow || need_showbreak) |
| 5995 | 4005 # ifdef FEAT_DIFF |
| 4006 && filler_lines == 0 | |
| 6834 | 4007 # endif |
| 5995 | 4008 ) |
| 4009 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4010 char_attr = 0; |
| 6834 | 4011 # ifdef FEAT_DIFF |
| 5995 | 4012 if (diff_hlf != (hlf_T)0) |
| 6106 | 4013 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4014 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 4015 # ifdef FEAT_SYN_HL |
| 6106 | 4016 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4017 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
|
4018 HL_ATTR(HLF_CUL)); |
| 6834 | 4019 # endif |
| 6106 | 4020 } |
| 6834 | 4021 # endif |
| 6028 | 4022 p_extra = NULL; |
| 5995 | 4023 c_extra = ' '; |
| 4024 n_extra = get_breakindent_win(wp, | |
| 4025 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 4026 /* Correct end of highlighted area for 'breakindent', | |
| 4027 * required when 'linebreak' is also set. */ | |
| 4028 if (tocol == vcol) | |
| 4029 tocol += n_extra; | |
| 4030 } | |
| 4031 } | |
| 4032 #endif | |
| 4033 | |
| 7 | 4034 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 4035 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 4036 { | |
| 4037 draw_state = WL_SBR; | |
| 4038 # ifdef FEAT_DIFF | |
| 4039 if (filler_todo > 0) | |
| 4040 { | |
| 4041 /* Draw "deleted" diff line(s). */ | |
| 4042 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
|
4043 { |
| 7 | 4044 c_extra = '-'; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4045 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4046 } |
| 7 | 4047 else |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4048 { |
| 7 | 4049 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
|
4050 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4051 } |
| 7 | 4052 # ifdef FEAT_RIGHTLEFT |
| 4053 if (wp->w_p_rl) | |
| 4054 n_extra = col + 1; | |
| 4055 else | |
| 4056 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4057 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
|
4058 char_attr = HL_ATTR(HLF_DED); |
| 7 | 4059 } |
| 4060 # endif | |
| 4061 # ifdef FEAT_LINEBREAK | |
| 4062 if (*p_sbr != NUL && need_showbreak) | |
| 4063 { | |
| 4064 /* Draw 'showbreak' at the start of each broken line. */ | |
| 4065 p_extra = p_sbr; | |
| 4066 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
|
4067 c_final = NUL; |
| 7 | 4068 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
|
4069 char_attr = HL_ATTR(HLF_AT); |
| 7 | 4070 need_showbreak = FALSE; |
| 6503 | 4071 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 4072 /* Correct end of highlighted area for 'showbreak', |
| 4073 * required when 'linebreak' is also set. */ | |
| 4074 if (tocol == vcol) | |
| 4075 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4076 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4077 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4078 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 4079 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
|
4080 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4081 #endif |
| 7 | 4082 } |
| 4083 # endif | |
| 4084 } | |
| 4085 #endif | |
| 4086 | |
| 4087 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4088 { | |
| 4089 draw_state = WL_LINE; | |
| 4090 if (saved_n_extra) | |
| 4091 { | |
| 4092 /* Continue item from end of wrapped line. */ | |
| 4093 n_extra = saved_n_extra; | |
| 4094 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
|
4095 c_final = saved_c_final; |
| 7 | 4096 p_extra = saved_p_extra; |
| 4097 char_attr = saved_char_attr; | |
| 4098 } | |
| 4099 else | |
| 4100 char_attr = 0; | |
| 4101 } | |
| 4102 } | |
| 4103 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4104 // 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
|
4105 // 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
|
4106 // 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
|
4107 if ((dollar_vcol >= 0 && wp == curwin |
| 819 | 4108 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4109 #ifdef FEAT_DIFF |
| 4110 && filler_todo <= 0 | |
| 4111 #endif | |
| 4112 ) | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4113 || (number_only && draw_state > WL_NR)) |
| 7 | 4114 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4115 screen_line(screen_row, wp->w_wincol, col, -(int)wp->w_width, |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
4116 HAS_RIGHTLEFT(wp->w_p_rl)); |
| 819 | 4117 /* Pretend we have finished updating the window. Except when |
| 4118 * 'cursorcolumn' is set. */ | |
| 4119 #ifdef FEAT_SYN_HL | |
| 4120 if (wp->w_p_cuc) | |
| 4121 row = wp->w_cline_row + wp->w_cline_height; | |
| 4122 else | |
| 4123 #endif | |
| 4124 row = wp->w_height; | |
| 7 | 4125 break; |
| 4126 } | |
| 4127 | |
|
15351
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4128 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
|
4129 #ifdef FEAT_SPELL |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4130 || has_spell |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4131 #endif |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4132 )) |
| 7 | 4133 { |
| 4134 /* handle Visual or match highlighting in this line */ | |
| 4135 if (vcol == fromcol | |
| 4136 #ifdef FEAT_MBYTE | |
| 4137 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4138 && (*mb_ptr2cells)(ptr) > 1) | |
| 4139 #endif | |
| 4140 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4141 && vcol_prev < vcol /* not at margin */ |
| 7 | 4142 && vcol < tocol)) |
| 4143 area_attr = attr; /* start highlighting */ | |
| 4144 else if (area_attr != 0 | |
| 4145 && (vcol == tocol | |
| 4146 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4147 area_attr = 0; /* stop highlighting */ | |
| 4148 | |
| 4149 #ifdef FEAT_SEARCH_EXTRA | |
| 4150 if (!n_extra) | |
| 4151 { | |
| 4152 /* | |
| 4153 * Check for start/end of search pattern match. | |
| 4154 * After end, check for start/end of next match. | |
| 4155 * When another match, have to check for start again. | |
| 4156 * Watch out for matching an empty string! | |
| 1326 | 4157 * Do this for 'search_hl' and the match list (ordered by |
| 4158 * priority). | |
| 7 | 4159 */ |
| 36 | 4160 v = (long)(ptr - line); |
| 1326 | 4161 cur = wp->w_match_head; |
| 4162 shl_flag = FALSE; | |
| 4163 while (cur != NULL || shl_flag == FALSE) | |
| 4164 { | |
| 4165 if (shl_flag == FALSE | |
| 4166 && ((cur != NULL | |
| 4167 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4168 || cur == NULL)) | |
| 4169 { | |
| 4170 shl = &search_hl; | |
| 4171 shl_flag = TRUE; | |
| 4172 } | |
| 4173 else | |
| 4174 shl = &cur->hl; | |
| 5979 | 4175 if (cur != NULL) |
| 4176 cur->pos.cur = 0; | |
| 4177 pos_inprogress = TRUE; | |
| 4178 while (shl->rm.regprog != NULL | |
| 4179 || (cur != NULL && pos_inprogress)) | |
| 7 | 4180 { |
| 36 | 4181 if (shl->startcol != MAXCOL |
| 4182 && v >= (long)shl->startcol | |
| 4183 && v < (long)shl->endcol) | |
| 7 | 4184 { |
| 6430 | 4185 #ifdef FEAT_MBYTE |
| 4186 int tmp_col = v + MB_PTR2LEN(ptr); | |
| 4187 | |
| 4188 if (shl->endcol < tmp_col) | |
| 4189 shl->endcol = tmp_col; | |
| 4190 #endif | |
| 7 | 4191 shl->attr_cur = shl->attr; |
| 6947 | 4192 #ifdef FEAT_CONCEAL |
| 4193 if (cur != NULL && syn_name2id((char_u *)"Conceal") | |
| 4194 == cur->hlg_id) | |
| 4195 { | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4196 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4197 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4198 match_conc = cur->conceal_char; |
| 4199 } | |
| 4200 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4201 has_match_conc = match_conc = 0; |
| 6947 | 4202 #endif |
| 7 | 4203 } |
| 6430 | 4204 else if (v == (long)shl->endcol) |
| 7 | 4205 { |
| 4206 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4207 next_search_hl(wp, shl, lnum, (colnr_T)v, |
|
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4208 shl == &search_hl ? NULL : cur); |
| 5979 | 4209 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4210 ? FALSE : TRUE; |
| 7 | 4211 |
| 4212 /* Need to get the line again, a multi-line regexp | |
| 4213 * may have made it invalid. */ | |
| 4214 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4215 ptr = line + v; | |
| 4216 | |
| 4217 if (shl->lnum == lnum) | |
| 4218 { | |
| 36 | 4219 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4220 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4221 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4222 else |
| 36 | 4223 shl->endcol = MAXCOL; |
| 4224 | |
| 4225 if (shl->startcol == shl->endcol) | |
| 7 | 4226 { |
| 4227 /* highlight empty match, try again after | |
| 4228 * it */ | |
| 4229 #ifdef FEAT_MBYTE | |
| 4230 if (has_mbyte) | |
| 474 | 4231 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4232 + shl->endcol); |
| 7 | 4233 else |
| 4234 #endif | |
| 36 | 4235 ++shl->endcol; |
| 7 | 4236 } |
| 4237 | |
| 4238 /* Loop to check if the match starts at the | |
| 4239 * current position */ | |
| 4240 continue; | |
| 4241 } | |
| 4242 } | |
| 4243 break; | |
| 4244 } | |
| 1326 | 4245 if (shl != &search_hl && cur != NULL) |
| 4246 cur = cur->next; | |
| 4247 } | |
| 4248 | |
| 4249 /* Use attributes from match with highest priority among | |
| 4250 * 'search_hl' and the match list. */ | |
| 4251 search_attr = search_hl.attr_cur; | |
| 4252 cur = wp->w_match_head; | |
| 4253 shl_flag = FALSE; | |
| 4254 while (cur != NULL || shl_flag == FALSE) | |
| 4255 { | |
| 4256 if (shl_flag == FALSE | |
| 4257 && ((cur != NULL | |
| 4258 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4259 || cur == NULL)) | |
| 699 | 4260 { |
| 1326 | 4261 shl = &search_hl; |
| 4262 shl_flag = TRUE; | |
| 699 | 4263 } |
| 1326 | 4264 else |
| 4265 shl = &cur->hl; | |
| 4266 if (shl->attr_cur != 0) | |
| 4267 search_attr = shl->attr_cur; | |
| 4268 if (shl != &search_hl && cur != NULL) | |
| 4269 cur = cur->next; | |
| 4270 } | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4271 /* Only highlight one character after the last column. */ |
|
12582
97f0c74976c6
patch 8.0.1169: highlignting one char too many with 'list' and 'cul'
Christian Brabandt <cb@256bit.org>
parents:
12580
diff
changeset
|
4272 if (*ptr == NUL && (did_line_attr >= 1 |
|
97f0c74976c6
patch 8.0.1169: highlignting one char too many with 'list' and 'cul'
Christian Brabandt <cb@256bit.org>
parents:
12580
diff
changeset
|
4273 || (wp->w_p_list && lcs_eol_one == -1))) |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4274 search_attr = 0; |
| 7 | 4275 } |
| 4276 #endif | |
| 4277 | |
| 4278 #ifdef FEAT_DIFF | |
| 674 | 4279 if (diff_hlf != (hlf_T)0) |
| 7 | 4280 { |
| 1295 | 4281 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4282 && n_extra == 0) | |
| 7 | 4283 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4284 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4285 && n_extra == 0) | |
| 7 | 4286 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
|
4287 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4288 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
|
4289 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4290 } |
| 4291 #endif | |
| 4292 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4293 #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
|
4294 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
|
4295 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4296 int pi; |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4297 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
|
4298 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4299 // 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
|
4300 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
|
4301 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4302 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
|
4303 |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4304 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
|
4305 + 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
|
4306 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4307 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
|
4308 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
|
4309 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
|
4310 sizeof(int) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4311 * (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
|
4312 --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
|
4313 --pi; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4314 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4315 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4316 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4317 // 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
|
4318 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
|
4319 && 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
|
4320 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
|
4321 |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4322 text_prop_attr = 0; |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4323 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
|
4324 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4325 // 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
|
4326 // 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
|
4327 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
|
4328 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
|
4329 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
|
4330 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
|
4331 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4332 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
|
4333 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4334 int tpi = text_prop_idxs[pi]; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4335 proptype_T *pt = text_prop_type_by_id(wp->w_buffer, text_props[tpi].tp_type); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4336 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4337 if (pt != NULL) |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4338 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4339 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
|
4340 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4341 text_prop_type = pt; |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4342 if (text_prop_attr == 0) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4343 text_prop_attr = pt_attr; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4344 else |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4345 text_prop_attr = hl_combine_attr(text_prop_attr, pt_attr); |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4346 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4347 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4348 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4349 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4350 #endif |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4351 |
| 674 | 4352 /* Decide which of the highlight attributes to use. */ |
| 4353 attr_pri = TRUE; | |
| 6717 | 4354 #ifdef LINE_ATTR |
| 674 | 4355 if (area_attr != 0) |
| 6717 | 4356 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4357 else if (search_attr != 0) |
| 6717 | 4358 char_attr = hl_combine_attr(line_attr, search_attr); |
| 674 | 4359 /* Use line_attr when not in the Visual or 'incsearch' area |
| 4360 * (area_attr may be 0 when "noinvcur" is set). */ | |
| 4361 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) | |
| 1842 | 4362 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4363 || vcol >= tocol)) | |
| 674 | 4364 char_attr = line_attr; |
| 6717 | 4365 #else |
| 4366 if (area_attr != 0) | |
| 4367 char_attr = area_attr; | |
| 4368 else if (search_attr != 0) | |
| 4369 char_attr = search_attr; | |
| 674 | 4370 #endif |
| 4371 else | |
| 4372 { | |
| 4373 attr_pri = FALSE; | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4374 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4375 if (text_prop_type != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4376 char_attr = text_prop_attr; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4377 else |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4378 #endif |
| 674 | 4379 #ifdef FEAT_SYN_HL |
| 4380 if (has_syntax) | |
| 4381 char_attr = syntax_attr; | |
| 4382 else | |
| 4383 #endif | |
| 4384 char_attr = 0; | |
| 4385 } | |
| 7 | 4386 } |
| 4387 | |
| 4388 /* | |
| 4389 * Get the next character to put on the screen. | |
| 4390 */ | |
| 4391 /* | |
| 1340 | 4392 * The "p_extra" points to the extra stuff that is inserted to |
| 4393 * represent special characters (non-printable stuff) and other | |
| 4394 * 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
|
4395 * If c_final is set, it will compulsorily be used at the end. |
| 1340 | 4396 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past |
| 4397 * "p_extra[n_extra]". | |
| 7 | 4398 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4399 */ | |
| 4400 if (n_extra > 0) | |
| 4401 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4402 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
|
4403 { |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4404 c = (n_extra == 1 && c_final != NUL) ? c_final : c_extra; |
| 7 | 4405 #ifdef FEAT_MBYTE |
| 4406 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
|
4407 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4408 { |
| 4409 mb_utf8 = TRUE; | |
| 714 | 4410 u8cc[0] = 0; |
| 819 | 4411 c = 0xc0; |
| 7 | 4412 } |
| 4413 else | |
| 4414 mb_utf8 = FALSE; | |
| 4415 #endif | |
| 4416 } | |
| 4417 else | |
| 4418 { | |
| 4419 c = *p_extra; | |
| 4420 #ifdef FEAT_MBYTE | |
| 4421 if (has_mbyte) | |
| 4422 { | |
| 4423 mb_c = c; | |
| 4424 if (enc_utf8) | |
| 4425 { | |
| 4426 /* If the UTF-8 character is more than one byte: | |
| 4427 * 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
|
4428 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4429 mb_utf8 = FALSE; |
| 4430 if (mb_l > n_extra) | |
| 4431 mb_l = 1; | |
| 4432 else if (mb_l > 1) | |
| 4433 { | |
| 714 | 4434 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4435 mb_utf8 = TRUE; |
| 819 | 4436 c = 0xc0; |
| 7 | 4437 } |
| 4438 } | |
| 4439 else | |
| 4440 { | |
| 4441 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4442 mb_l = MB_BYTE2LEN(c); | |
| 4443 if (mb_l >= n_extra) | |
| 4444 mb_l = 1; | |
| 4445 else if (mb_l > 1) | |
| 4446 mb_c = (c << 8) + p_extra[1]; | |
| 4447 } | |
| 504 | 4448 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4449 mb_l = 1; | |
| 4450 | |
| 7 | 4451 /* If a double-width char doesn't fit display a '>' in the |
| 4452 * last column. */ | |
| 504 | 4453 if (( |
| 7 | 4454 # ifdef FEAT_RIGHTLEFT |
| 4455 wp->w_p_rl ? (col <= 0) : | |
| 4456 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4457 (col >= wp->w_width - 1)) |
| 7 | 4458 && (*mb_char2cells)(mb_c) == 2) |
| 4459 { | |
| 4460 c = '>'; | |
| 4461 mb_c = c; | |
| 4462 mb_l = 1; | |
| 4463 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
|
4464 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4465 /* put the pointer back to output the double-width |
| 4466 * character at the start of the next line. */ | |
| 4467 ++n_extra; | |
| 4468 --p_extra; | |
| 4469 } | |
| 4470 else | |
| 4471 { | |
| 4472 n_extra -= mb_l - 1; | |
| 4473 p_extra += mb_l - 1; | |
| 4474 } | |
| 4475 } | |
| 4476 #endif | |
| 4477 ++p_extra; | |
| 4478 } | |
| 4479 --n_extra; | |
| 4480 } | |
| 4481 else | |
| 4482 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4483 #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
|
4484 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4485 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4486 |
| 6026 | 4487 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
|
4488 VIM_CLEAR(p_extra_free); |
| 7 | 4489 /* |
| 4490 * Get a character from the line itself. | |
| 4491 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4492 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4493 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4494 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4495 #endif |
| 7 | 4496 #ifdef FEAT_MBYTE |
| 4497 if (has_mbyte) | |
| 4498 { | |
| 4499 mb_c = c; | |
| 4500 if (enc_utf8) | |
| 4501 { | |
| 4502 /* If the UTF-8 character is more than one byte: Decode it | |
| 4503 * 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
|
4504 mb_l = utfc_ptr2len(ptr); |
| 7 | 4505 mb_utf8 = FALSE; |
| 4506 if (mb_l > 1) | |
| 4507 { | |
| 714 | 4508 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4509 /* Overlong encoded ASCII or ASCII with composing char |
| 4510 * is displayed normally, except a NUL. */ | |
| 4511 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
|
4512 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4513 c = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4514 # ifdef FEAT_LINEBREAK |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4515 c0 = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4516 # endif |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4517 } |
| 7 | 4518 mb_utf8 = TRUE; |
| 507 | 4519 |
| 4520 /* At start of the line we can have a composing char. | |
| 4521 * Draw it as a space with a composing char. */ | |
| 4522 if (utf_iscomposing(mb_c)) | |
| 4523 { | |
| 1326 | 4524 int i; |
| 4525 | |
| 714 | 4526 for (i = Screen_mco - 1; i > 0; --i) |
| 4527 u8cc[i] = u8cc[i - 1]; | |
| 4528 u8cc[0] = mb_c; | |
| 507 | 4529 mb_c = ' '; |
| 4530 } | |
| 7 | 4531 } |
| 4532 | |
| 4533 if ((mb_l == 1 && c >= 0x80) | |
| 4534 || (mb_l >= 1 && mb_c == 0) | |
| 4535 || (mb_l > 1 && (!vim_isprintc(mb_c) | |
| 1401 | 4536 # ifdef UNICODE16 |
| 4537 || mb_c >= 0x10000 | |
| 4538 # endif | |
| 4539 ))) | |
| 7 | 4540 { |
| 4541 /* | |
| 4542 * Illegal UTF-8 byte: display as <xx>. | |
| 4543 * Non-BMP character : display as ? or fullwidth ?. | |
| 4544 */ | |
| 1401 | 4545 # ifdef UNICODE16 |
| 7 | 4546 if (mb_c < 0x10000) |
| 1401 | 4547 # endif |
| 7 | 4548 { |
| 4549 transchar_hex(extra, mb_c); | |
| 714 | 4550 # ifdef FEAT_RIGHTLEFT |
| 7 | 4551 if (wp->w_p_rl) /* reverse */ |
| 4552 rl_mirror(extra); | |
| 714 | 4553 # endif |
| 7 | 4554 } |
| 1401 | 4555 # ifdef UNICODE16 |
| 7 | 4556 else if (utf_char2cells(mb_c) != 2) |
| 4557 STRCPY(extra, "?"); | |
| 4558 else | |
| 4559 /* 0xff1f in UTF-8: full-width '?' */ | |
| 4560 STRCPY(extra, "\357\274\237"); | |
| 1401 | 4561 # endif |
| 7 | 4562 |
| 4563 p_extra = extra; | |
| 4564 c = *p_extra; | |
| 4565 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4566 mb_utf8 = (c >= 0x80); | |
| 4567 n_extra = (int)STRLEN(p_extra); | |
| 4568 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
|
4569 c_final = NUL; |
| 7 | 4570 if (area_attr == 0 && search_attr == 0) |
| 4571 { | |
| 4572 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
|
4573 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4574 saved_attr2 = char_attr; /* save current attr */ |
| 4575 } | |
| 4576 } | |
| 4577 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4578 mb_l = 1; | |
| 4579 #ifdef FEAT_ARABIC | |
| 4580 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4581 { | |
| 4582 /* Do Arabic shaping. */ | |
| 714 | 4583 int pc, pc1, nc; |
| 4584 int pcc[MAX_MCO]; | |
| 7 | 4585 |
| 4586 /* The idea of what is the previous and next | |
| 4587 * character depends on 'rightleft'. */ | |
| 4588 if (wp->w_p_rl) | |
| 4589 { | |
| 4590 pc = prev_c; | |
| 4591 pc1 = prev_c1; | |
| 4592 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4593 prev_c1 = u8cc[0]; |
| 7 | 4594 } |
| 4595 else | |
| 4596 { | |
| 714 | 4597 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4598 nc = prev_c; |
| 714 | 4599 pc1 = pcc[0]; |
| 7 | 4600 } |
| 4601 prev_c = mb_c; | |
| 4602 | |
| 714 | 4603 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4604 } |
| 4605 else | |
| 4606 prev_c = mb_c; | |
| 4607 #endif | |
| 4608 } | |
| 4609 else /* enc_dbcs */ | |
| 4610 { | |
| 4611 mb_l = MB_BYTE2LEN(c); | |
| 4612 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4613 mb_l = 1; | |
| 4614 else if (mb_l > 1) | |
| 4615 { | |
| 4616 /* We assume a second byte below 32 is illegal. | |
| 4617 * Hopefully this is OK for all double-byte encodings! | |
| 4618 */ | |
| 4619 if (ptr[1] >= 32) | |
| 4620 mb_c = (c << 8) + ptr[1]; | |
| 4621 else | |
| 4622 { | |
| 4623 if (ptr[1] == NUL) | |
| 4624 { | |
| 4625 /* head byte at end of line */ | |
| 4626 mb_l = 1; | |
| 4627 transchar_nonprint(extra, c); | |
| 4628 } | |
| 4629 else | |
| 4630 { | |
| 4631 /* illegal tail byte */ | |
| 4632 mb_l = 2; | |
| 4633 STRCPY(extra, "XX"); | |
| 4634 } | |
| 4635 p_extra = extra; | |
| 4636 n_extra = (int)STRLEN(extra) - 1; | |
| 4637 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
|
4638 c_final = NUL; |
| 7 | 4639 c = *p_extra++; |
| 4640 if (area_attr == 0 && search_attr == 0) | |
| 4641 { | |
| 4642 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
|
4643 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4644 saved_attr2 = char_attr; /* save current attr */ |
| 4645 } | |
| 4646 mb_c = c; | |
| 4647 } | |
| 4648 } | |
| 4649 } | |
| 4650 /* If a double-width char doesn't fit display a '>' in the | |
| 4651 * last column; the character is displayed at the start of the | |
| 4652 * next line. */ | |
| 4653 if (( | |
| 4654 # ifdef FEAT_RIGHTLEFT | |
| 4655 wp->w_p_rl ? (col <= 0) : | |
| 4656 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4657 (col >= wp->w_width - 1)) |
| 7 | 4658 && (*mb_char2cells)(mb_c) == 2) |
| 4659 { | |
| 4660 c = '>'; | |
| 4661 mb_c = c; | |
| 4662 mb_utf8 = FALSE; | |
| 4663 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
|
4664 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4665 /* Put pointer back so that the character will be |
| 4666 * displayed at the start of the next line. */ | |
| 4667 --ptr; | |
| 4668 } | |
| 4669 else if (*ptr != NUL) | |
| 4670 ptr += mb_l - 1; | |
| 4671 | |
| 4672 /* 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
|
4673 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4674 * 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
|
4675 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4676 { |
| 4677 n_extra = 1; | |
| 3586 | 4678 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
|
4679 c_final = NUL; |
| 7 | 4680 c = ' '; |
| 4681 if (area_attr == 0 && search_attr == 0) | |
| 4682 { | |
| 4683 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
|
4684 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4685 saved_attr2 = char_attr; /* save current attr */ |
| 4686 } | |
| 4687 mb_c = c; | |
| 4688 mb_utf8 = FALSE; | |
| 4689 mb_l = 1; | |
| 4690 } | |
| 4691 | |
| 4692 } | |
| 4693 #endif | |
| 4694 ++ptr; | |
| 4695 | |
| 4696 if (extra_check) | |
| 4697 { | |
| 743 | 4698 #ifdef FEAT_SPELL |
| 221 | 4699 int can_spell = TRUE; |
| 743 | 4700 #endif |
| 4701 | |
|
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
|
4702 #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
|
4703 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
|
4704 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4705 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
|
4706 |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4707 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
|
4708 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
|
4709 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
|
4710 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
|
4711 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4712 #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
|
4713 |
| 743 | 4714 #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
|
4715 // 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
|
4716 // (double-wide char that doesn't fit). |
| 221 | 4717 v = (long)(ptr - line); |
| 4718 if (has_syntax && v > 0) | |
| 7 | 4719 { |
| 4720 /* Get the syntax attribute for the character. If there | |
| 4721 * is an error, disable syntax highlighting. */ | |
| 4722 save_did_emsg = did_emsg; | |
| 4723 did_emsg = FALSE; | |
| 4724 | |
| 221 | 4725 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4726 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4727 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4728 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4729 NULL, FALSE); |
| 7 | 4730 |
| 4731 if (did_emsg) | |
| 482 | 4732 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4733 wp->w_s->b_syn_error = TRUE; |
| 482 | 4734 has_syntax = FALSE; |
| 4735 } | |
| 7 | 4736 else |
| 4737 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
|
4738 #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
|
4739 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
|
4740 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4741 #endif |
| 7 | 4742 |
| 4743 /* Need to get the line again, a multi-line regexp may | |
| 4744 * have made it invalid. */ | |
| 4745 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4746 ptr = line + v; | |
| 4747 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4748 # 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
|
4749 // Text properties overrule syntax highlighting. |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4750 if (text_prop_attr == 0) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4751 #endif |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4752 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4753 if (!attr_pri) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4754 char_attr = syntax_attr; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4755 else |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4756 char_attr = hl_combine_attr(syntax_attr, char_attr); |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4757 } |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4758 # 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
|
4759 /* 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
|
4760 * 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
|
4761 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
|
4762 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
|
4763 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
|
4764 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
|
4765 # endif |
| 7 | 4766 } |
| 743 | 4767 #endif |
| 4768 | |
| 4769 #ifdef FEAT_SPELL | |
| 301 | 4770 /* Check spelling (unless at the end of the line). |
| 319 | 4771 * Only do this when there is no syntax highlighting, the |
| 4772 * @Spell cluster is not used or the current syntax item | |
| 4773 * contains the @Spell cluster. */ | |
| 348 | 4774 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4775 { |
| 230 | 4776 spell_attr = 0; |
| 743 | 4777 if (c != 0 && ( |
| 4778 # ifdef FEAT_SYN_HL | |
| 4779 !has_syntax || | |
| 4780 # endif | |
| 4781 can_spell)) | |
| 221 | 4782 { |
| 348 | 4783 char_u *prev_ptr, *p; |
| 4784 int len; | |
| 534 | 4785 hlf_T spell_hlf = HLF_COUNT; |
| 221 | 4786 # ifdef FEAT_MBYTE |
| 336 | 4787 if (has_mbyte) |
| 4788 { | |
| 4789 prev_ptr = ptr - mb_l; | |
| 4790 v -= mb_l - 1; | |
| 4791 } | |
| 4792 else | |
| 221 | 4793 # endif |
| 336 | 4794 prev_ptr = ptr - 1; |
| 348 | 4795 |
| 4796 /* Use nextline[] if possible, it has the start of the | |
| 4797 * next line concatenated. */ | |
| 4798 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4799 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4800 else | |
| 4801 p = prev_ptr; | |
| 835 | 4802 cap_col -= (int)(prev_ptr - line); |
| 625 | 4803 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4804 nochange); | |
| 348 | 4805 word_end = v + len; |
| 301 | 4806 |
| 4807 /* In Insert mode only highlight a word that | |
| 4808 * doesn't touch the cursor. */ | |
| 534 | 4809 if (spell_hlf != HLF_COUNT |
| 301 | 4810 && (State & INSERT) != 0 |
| 4811 && wp->w_cursor.lnum == lnum | |
| 4812 && wp->w_cursor.col >= | |
| 4813 (colnr_T)(prev_ptr - line) | |
| 4814 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4815 { |
| 534 | 4816 spell_hlf = HLF_COUNT; |
| 301 | 4817 spell_redraw_lnum = lnum; |
| 221 | 4818 } |
| 348 | 4819 |
| 534 | 4820 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4821 && (p - nextline) + len > nextline_idx) |
| 4822 { | |
| 4823 /* Remember that the good word continues at the | |
| 4824 * start of the next line. */ | |
| 4825 checked_lnum = lnum + 1; | |
| 835 | 4826 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4827 } |
| 386 | 4828 |
| 534 | 4829 /* Turn index into actual attributes. */ |
| 4830 if (spell_hlf != HLF_COUNT) | |
| 4831 spell_attr = highlight_attr[spell_hlf]; | |
| 4832 | |
| 386 | 4833 if (cap_col > 0) |
| 4834 { | |
| 4835 if (p != prev_ptr | |
| 4836 && (p - nextline) + cap_col >= nextline_idx) | |
| 4837 { | |
| 4838 /* Remember that the word in the next line | |
| 4839 * must start with a capital. */ | |
| 4840 capcol_lnum = lnum + 1; | |
| 835 | 4841 cap_col = (int)((p - nextline) + cap_col |
| 4842 - nextline_idx); | |
| 386 | 4843 } |
| 4844 else | |
| 4845 /* Compute the actual column. */ | |
| 835 | 4846 cap_col += (int)(prev_ptr - line); |
| 386 | 4847 } |
| 221 | 4848 } |
| 4849 } | |
| 4850 if (spell_attr != 0) | |
| 348 | 4851 { |
| 674 | 4852 if (!attr_pri) |
| 348 | 4853 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4854 else | |
| 4855 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4856 } | |
| 7 | 4857 #endif |
| 4858 #ifdef FEAT_LINEBREAK | |
| 4859 /* | |
| 221 | 4860 * Found last space before word: check for line break. |
| 7 | 4861 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4862 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
|
4863 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4864 { |
| 6681 | 4865 # ifdef FEAT_MBYTE |
| 6693 | 4866 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
| 6681 | 4867 # endif |
| 5995 | 4868 char_u *p = ptr - ( |
| 7 | 4869 # ifdef FEAT_MBYTE |
| 6693 | 4870 mb_off + |
| 7 | 4871 # endif |
| 5995 | 4872 1); |
| 6681 | 4873 |
| 5995 | 4874 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4875 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4876 NULL) - 1; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4877 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
|
4878 # ifdef FEAT_VARTABS |
|
14198
9ca8c36869ce
patch 8.1.0116: display problem with 'vartabstop' and 'linebreak'
Christian Brabandt <cb@256bit.org>
parents:
14191
diff
changeset
|
4879 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
|
4880 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
|
4881 # else |
| 6371 | 4882 n_extra = (int)wp->w_buffer->b_p_ts |
| 4883 - 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
|
4884 # endif |
| 6371 | 4885 |
| 6681 | 4886 # ifdef FEAT_MBYTE |
| 6693 | 4887 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; |
| 6681 | 4888 # else |
| 7 | 4889 c_extra = ' '; |
| 6681 | 4890 # endif |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4891 c_final = NUL; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4892 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4893 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4894 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4895 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4896 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4897 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4898 #endif |
| 6026 | 4899 if (!wp->w_p_list) |
| 4900 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4901 } |
| 7 | 4902 } |
| 4903 #endif | |
| 4904 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4905 /* 'list': change char 160 to lcs_nbsp and space to lcs_space. |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4906 */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4907 if (wp->w_p_list |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4908 && (((c == 160 |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4909 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4910 || (mb_utf8 && (mb_c == 160 || mb_c == 0x202f)) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4911 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4912 ) && lcs_nbsp) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4913 || (c == ' ' && lcs_space && ptr - line <= trailcol))) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4914 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4915 c = (c == ' ') ? lcs_space : lcs_nbsp; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4916 if (area_attr == 0 && search_attr == 0) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4917 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4918 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
|
4919 extra_attr = HL_ATTR(HLF_8); |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4920 saved_attr2 = char_attr; /* save current attr */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4921 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4922 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4923 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
|
4924 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
|
4925 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4926 mb_utf8 = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4927 u8cc[0] = 0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4928 c = 0xc0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4929 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4930 else |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4931 mb_utf8 = FALSE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4932 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4933 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4934 |
| 7 | 4935 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4936 { | |
| 4937 c = lcs_trail; | |
| 674 | 4938 if (!attr_pri) |
| 7 | 4939 { |
| 4940 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
|
4941 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4942 saved_attr2 = char_attr; /* save current attr */ |
| 4943 } | |
| 4944 #ifdef FEAT_MBYTE | |
| 4945 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
|
4946 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4947 { |
| 4948 mb_utf8 = TRUE; | |
| 714 | 4949 u8cc[0] = 0; |
| 819 | 4950 c = 0xc0; |
| 7 | 4951 } |
| 4952 else | |
| 4953 mb_utf8 = FALSE; | |
| 4954 #endif | |
| 4955 } | |
| 4956 } | |
| 4957 | |
| 4958 /* | |
| 4959 * Handling of non-printable characters. | |
| 4960 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4961 if (!vim_isprintc(c)) |
| 7 | 4962 { |
| 4963 /* | |
| 4964 * when getting a character from the file, we may have to | |
| 4965 * turn it into something else on the way to putting it | |
| 4966 * into "ScreenLines". | |
| 4967 */ | |
| 4968 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4969 { | |
| 6026 | 4970 int tab_len = 0; |
| 6503 | 4971 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 4972 #ifdef FEAT_LINEBREAK | |
| 4973 /* only adjust the tab_len, when at the first column | |
| 4974 * after the showbreak value was drawn */ | |
| 4975 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 4976 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 4977 #endif | |
| 7 | 4978 /* 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
|
4979 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4980 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
|
4981 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
|
4982 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
|
4983 #else |
| 6026 | 4984 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
|
4985 - 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
|
4986 #endif |
| 6503 | 4987 |
| 6026 | 4988 #ifdef FEAT_LINEBREAK |
| 6100 | 4989 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 4990 #endif |
| 4991 /* tab amount depends on current column */ | |
| 4992 n_extra = tab_len; | |
| 4993 #ifdef FEAT_LINEBREAK | |
| 4994 else | |
| 4995 { | |
| 4996 char_u *p; | |
| 4997 int len = n_extra; | |
| 4998 int i; | |
| 4999 int saved_nextra = n_extra; | |
| 5000 | |
| 6172 | 5001 #ifdef FEAT_CONCEAL |
| 6627 | 5002 if (vcol_off > 0) |
| 6172 | 5003 /* there are characters to conceal */ |
| 5004 tab_len += vcol_off; | |
| 6520 | 5005 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 5006 */ | |
| 5007 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 5008 && n_extra > tab_len) | |
| 5009 tab_len += n_extra - tab_len; | |
| 5010 #endif | |
| 5011 | |
| 6026 | 5012 /* if n_extra > 0, it gives the number of chars, to |
| 5013 * use for a tab, else we need to calculate the width | |
| 5014 * for a tab */ | |
| 5015 #ifdef FEAT_MBYTE | |
| 5016 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 5017 if (n_extra > 0) | |
| 5018 len += n_extra - tab_len; | |
| 5019 #endif | |
| 5020 c = lcs_tab1; | |
| 5021 p = alloc((unsigned)(len + 1)); | |
| 5022 vim_memset(p, ' ', len); | |
| 5023 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5024 vim_free(p_extra_free); |
| 6026 | 5025 p_extra_free = p; |
| 5026 for (i = 0; i < tab_len; i++) | |
| 5027 { | |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5028 if (*p == NUL) |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5029 { |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5030 tab_len = i; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5031 break; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5032 } |
| 6026 | 5033 #ifdef FEAT_MBYTE |
| 5034 mb_char2bytes(lcs_tab2, p); | |
| 5035 p += mb_char2len(lcs_tab2); | |
| 5036 n_extra += mb_char2len(lcs_tab2) | |
| 5037 - (saved_nextra > 0 ? 1 : 0); | |
| 5038 #else | |
| 5039 p[i] = lcs_tab2; | |
| 5040 #endif | |
| 5041 } | |
| 5042 p_extra = p_extra_free; | |
| 6172 | 5043 #ifdef FEAT_CONCEAL |
| 5044 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 5045 * macro below, so need to adjust for that here */ | |
| 6627 | 5046 if (vcol_off > 0) |
| 6172 | 5047 n_extra -= vcol_off; |
| 5048 #endif | |
| 6026 | 5049 } |
| 5050 #endif | |
| 3984 | 5051 #ifdef FEAT_CONCEAL |
| 6627 | 5052 { |
| 5053 int vc_saved = vcol_off; | |
| 5054 | |
| 5055 /* Tab alignment should be identical regardless of | |
| 5056 * 'conceallevel' value. So tab compensates of all | |
| 5057 * previous concealed characters, and thus resets | |
| 5058 * vcol_off and boguscols accumulated so far in the | |
| 5059 * line. Note that the tab can be longer than | |
| 5060 * 'tabstop' when there are concealed characters. */ | |
| 5061 FIX_FOR_BOGUSCOLS; | |
| 5062 | |
| 5063 /* Make sure, the highlighting for the tab char will be | |
| 5064 * correctly set further below (effectively reverts the | |
| 5065 * FIX_FOR_BOGSUCOLS macro */ | |
| 5066 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 5067 && lcs_tab1) |
| 6627 | 5068 tab_len += vc_saved; |
| 5069 } | |
| 3984 | 5070 #endif |
| 7 | 5071 #ifdef FEAT_MBYTE |
| 5072 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5073 #endif | |
| 5074 if (wp->w_p_list) | |
| 5075 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5076 c = (n_extra == 0 && lcs_tab3) ? lcs_tab3 : lcs_tab1; |
| 6026 | 5077 #ifdef FEAT_LINEBREAK |
| 5078 if (wp->w_p_lbr) | |
| 5079 c_extra = NUL; /* using p_extra from above */ | |
| 5080 else | |
| 5081 #endif | |
| 5082 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
|
5083 c_final = lcs_tab3; |
| 6026 | 5084 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
|
5085 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5086 saved_attr2 = char_attr; /* save current attr */ |
| 5087 #ifdef FEAT_MBYTE | |
| 5088 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
|
5089 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5090 { |
| 5091 mb_utf8 = TRUE; | |
| 714 | 5092 u8cc[0] = 0; |
| 819 | 5093 c = 0xc0; |
| 7 | 5094 } |
| 5095 #endif | |
| 5096 } | |
| 5097 else | |
| 5098 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5099 c_final = NUL; |
| 7 | 5100 c_extra = ' '; |
| 5101 c = ' '; | |
| 5102 } | |
| 5103 } | |
| 36 | 5104 else if (c == NUL |
| 6799 | 5105 && (wp->w_p_list |
| 36 | 5106 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 5107 && tocol > vcol | |
| 5108 && VIsual_mode != Ctrl_V | |
| 5109 && ( | |
| 5110 # ifdef FEAT_RIGHTLEFT | |
| 5111 wp->w_p_rl ? (col >= 0) : | |
| 5112 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5113 (col < wp->w_width)) |
| 36 | 5114 && !(noinvcur |
| 1850 | 5115 && lnum == wp->w_cursor.lnum |
| 36 | 5116 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 5117 && lcs_eol_one > 0) |
| 7 | 5118 { |
| 36 | 5119 /* Display a '$' after the line or highlight an extra |
| 5120 * character if the line break is included. */ | |
| 7 | 5121 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 5122 /* For a diff line the highlighting continues after the | |
| 5123 * "$". */ | |
| 5124 if ( | |
| 5125 # ifdef FEAT_DIFF | |
| 534 | 5126 diff_hlf == (hlf_T)0 |
| 7 | 5127 # ifdef LINE_ATTR |
| 5128 && | |
| 5129 # endif | |
| 5130 # endif | |
| 5131 # ifdef LINE_ATTR | |
| 5132 line_attr == 0 | |
| 5133 # endif | |
| 5134 ) | |
| 5135 #endif | |
| 5136 { | |
| 5137 #ifdef FEAT_VIRTUALEDIT | |
| 5138 /* In virtualedit, visual selections may extend | |
| 5139 * beyond end of line. */ | |
| 5140 if (area_highlighting && virtual_active() | |
| 5141 && tocol != MAXCOL && vcol < tocol) | |
| 5142 n_extra = 0; | |
| 5143 else | |
| 5144 #endif | |
| 5145 { | |
| 5146 p_extra = at_end_str; | |
| 5147 n_extra = 1; | |
| 5148 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
|
5149 c_final = NUL; |
| 7 | 5150 } |
| 5151 } | |
| 6799 | 5152 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 5153 c = lcs_eol; |
| 5154 else | |
| 5155 c = ' '; | |
| 7 | 5156 lcs_eol_one = -1; |
| 5157 --ptr; /* put it back at the NUL */ | |
| 674 | 5158 if (!attr_pri) |
| 7 | 5159 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5160 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 5161 n_attr = 1; |
| 5162 } | |
| 5163 #ifdef FEAT_MBYTE | |
| 5164 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
|
5165 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5166 { |
| 5167 mb_utf8 = TRUE; | |
| 714 | 5168 u8cc[0] = 0; |
| 819 | 5169 c = 0xc0; |
| 7 | 5170 } |
| 5171 else | |
| 5172 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5173 #endif | |
| 5174 } | |
| 5175 else if (c != NUL) | |
| 5176 { | |
| 5177 p_extra = transchar(c); | |
| 6064 | 5178 if (n_extra == 0) |
| 5179 n_extra = byte2cells(c) - 1; | |
| 7 | 5180 #ifdef FEAT_RIGHTLEFT |
| 5181 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5182 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5183 #endif | |
| 5184 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
|
5185 c_final = NUL; |
| 6026 | 5186 #ifdef FEAT_LINEBREAK |
| 5187 if (wp->w_p_lbr) | |
| 5188 { | |
| 5189 char_u *p; | |
| 5190 | |
| 5191 c = *p_extra; | |
| 5192 p = alloc((unsigned)n_extra + 1); | |
| 5193 vim_memset(p, ' ', n_extra); | |
| 5194 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5195 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5196 vim_free(p_extra_free); |
| 6026 | 5197 p_extra_free = p_extra = p; |
| 5198 } | |
| 5199 else | |
| 5200 #endif | |
| 5201 { | |
| 5202 n_extra = byte2cells(c) - 1; | |
| 5203 c = *p_extra++; | |
| 5204 } | |
| 674 | 5205 if (!attr_pri) |
| 7 | 5206 { |
| 5207 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
|
5208 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5209 saved_attr2 = char_attr; /* save current attr */ |
| 5210 } | |
| 5211 #ifdef FEAT_MBYTE | |
| 5212 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5213 #endif | |
| 5214 } | |
| 5215 #ifdef FEAT_VIRTUALEDIT | |
| 5216 else if (VIsual_active | |
| 5217 && (VIsual_mode == Ctrl_V | |
| 5218 || VIsual_mode == 'v') | |
| 5219 && virtual_active() | |
| 5220 && tocol != MAXCOL | |
| 5221 && vcol < tocol | |
| 5222 && ( | |
| 5223 # ifdef FEAT_RIGHTLEFT | |
| 5224 wp->w_p_rl ? (col >= 0) : | |
| 5225 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5226 (col < wp->w_width))) |
| 7 | 5227 { |
| 5228 c = ' '; | |
| 5229 --ptr; /* put it back at the NUL */ | |
| 5230 } | |
| 5231 #endif | |
| 910 | 5232 #if defined(LINE_ATTR) |
| 7 | 5233 else if (( |
| 5234 # ifdef FEAT_DIFF | |
| 910 | 5235 diff_hlf != (hlf_T)0 || |
| 7 | 5236 # endif |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5237 # ifdef FEAT_TERMINAL |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5238 term_attr != 0 || |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5239 # endif |
| 7 | 5240 line_attr != 0 |
| 5241 ) && ( | |
| 5242 # ifdef FEAT_RIGHTLEFT | |
| 5243 wp->w_p_rl ? (col >= 0) : | |
| 5244 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5245 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5246 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5247 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5248 # endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5249 < wp->w_width))) |
| 7 | 5250 { |
| 5251 /* Highlight until the right side of the window */ | |
| 5252 c = ' '; | |
| 5253 --ptr; /* put it back at the NUL */ | |
| 867 | 5254 |
| 5255 /* Remember we do the char for line highlighting. */ | |
| 5256 ++did_line_attr; | |
| 5257 | |
| 5258 /* 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
|
5259 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
|
5260 && (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
|
5261 || (wp->w_p_list && lcs_eol > 0))) |
| 867 | 5262 char_attr = line_attr; |
| 7 | 5263 # ifdef FEAT_DIFF |
| 5264 if (diff_hlf == HLF_TXD) | |
| 5265 { | |
| 5266 diff_hlf = HLF_CHD; | |
| 5267 if (attr == 0 || char_attr != attr) | |
| 6106 | 5268 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5269 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5270 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5271 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
|
5272 HL_ATTR(HLF_CUL)); |
| 6106 | 5273 } |
| 7 | 5274 } |
| 5275 # endif | |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5276 # ifdef FEAT_TERMINAL |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5277 if (term_attr != 0) |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5278 { |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5279 char_attr = term_attr; |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5280 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
|
5281 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
|
5282 HL_ATTR(HLF_CUL)); |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5283 } |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5284 # endif |
| 7 | 5285 } |
| 5286 #endif | |
| 5287 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5288 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5289 #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
|
5290 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
|
5291 && (wp != curwin || lnum != wp->w_cursor.lnum || |
| 6947 | 5292 conceal_cursor_line(wp) ) |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5293 && ( (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
|
5294 && !(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
|
5295 && 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
|
5296 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5297 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5298 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5299 && (syn_get_sub_char() != NUL || match_conc |
| 5300 || 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
|
5301 && 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
|
5302 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5303 /* 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
|
5304 * character. */ |
| 6947 | 5305 if (match_conc) |
| 5306 c = match_conc; | |
| 5307 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
|
5308 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5309 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5310 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5311 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5312 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5313 |
|
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
|
5314 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5315 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5316 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5317 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5318 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5319 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
|
5320 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5321 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5322 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5323 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5324 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5325 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5326 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5327 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5328 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5329 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5330 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5331 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5332 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5333 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5334 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5335 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5336 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5337 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5338 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5339 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5340 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5341 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5342 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5343 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
|
5344 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
|
5345 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5346 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5347 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5348 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5349 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5350 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5351 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
|
5352 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5353 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5354 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5355 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5356 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
|
5357 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5358 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5359 #endif /* FEAT_CONCEAL */ |
| 7 | 5360 } |
| 5361 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5362 #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
|
5363 /* 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
|
5364 * 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
|
5365 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
|
5366 && 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
|
5367 && 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
|
5368 && (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
|
5369 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5370 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5371 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
|
5372 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
|
5373 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5374 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5375 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
|
5376 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
|
5377 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
|
5378 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5379 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5380 |
| 7 | 5381 /* Don't override visual selection highlighting. */ |
| 5382 if (n_attr > 0 | |
| 5383 && draw_state == WL_LINE | |
| 674 | 5384 && !attr_pri) |
| 7 | 5385 char_attr = extra_attr; |
| 5386 | |
| 42 | 5387 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5388 /* XIM don't send preedit_start and preedit_end, but they send |
| 5389 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5390 * 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
|
5391 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
|
5392 && xic != NULL |
| 1850 | 5393 && lnum == wp->w_cursor.lnum |
| 7 | 5394 && (State & INSERT) |
| 5395 && !p_imdisable | |
| 5396 && im_is_preediting() | |
| 5397 && draw_state == WL_LINE) | |
| 5398 { | |
| 5399 colnr_T tcol; | |
| 5400 | |
| 5401 if (preedit_end_col == MAXCOL) | |
| 1850 | 5402 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5403 else |
| 5404 tcol = preedit_end_col; | |
| 5405 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5406 { | |
| 5407 if (feedback_old_attr < 0) | |
| 5408 { | |
| 5409 feedback_col = 0; | |
| 5410 feedback_old_attr = char_attr; | |
| 5411 } | |
| 5412 char_attr = im_get_feedback_attr(feedback_col); | |
| 5413 if (char_attr < 0) | |
| 5414 char_attr = feedback_old_attr; | |
| 5415 feedback_col++; | |
| 5416 } | |
| 5417 else if (feedback_old_attr >= 0) | |
| 5418 { | |
| 5419 char_attr = feedback_old_attr; | |
| 5420 feedback_old_attr = -1; | |
| 5421 feedback_col = 0; | |
| 5422 } | |
| 5423 } | |
| 5424 #endif | |
| 5425 /* | |
| 5426 * Handle the case where we are in column 0 but not on the first | |
| 5427 * character of the line and the user wants us to show us a | |
| 5428 * special character (via 'listchars' option "precedes:<char>". | |
| 5429 */ | |
| 5430 if (lcs_prec_todo != NUL | |
| 6276 | 5431 && wp->w_p_list |
| 7 | 5432 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5433 #ifdef FEAT_DIFF | |
| 5434 && filler_todo <= 0 | |
| 5435 #endif | |
| 5436 && draw_state > WL_NR | |
| 5437 && c != NUL) | |
| 5438 { | |
| 5439 c = lcs_prec; | |
| 5440 lcs_prec_todo = NUL; | |
| 5441 #ifdef FEAT_MBYTE | |
| 3586 | 5442 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5443 { | |
| 5444 /* Double-width character being overwritten by the "precedes" | |
| 5445 * character, need to fill up half the character. */ | |
| 5446 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
|
5447 c_final = NUL; |
| 3586 | 5448 n_extra = 1; |
| 5449 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
|
5450 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5451 } |
| 7 | 5452 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
|
5453 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5454 { |
| 5455 mb_utf8 = TRUE; | |
| 714 | 5456 u8cc[0] = 0; |
| 819 | 5457 c = 0xc0; |
| 7 | 5458 } |
| 5459 else | |
| 5460 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5461 #endif | |
| 674 | 5462 if (!attr_pri) |
| 7 | 5463 { |
| 5464 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
|
5465 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5466 n_attr3 = 1; |
| 5467 } | |
| 5468 } | |
| 5469 | |
| 5470 /* | |
| 867 | 5471 * At end of the text line or just after the last character. |
| 7 | 5472 */ |
| 867 | 5473 if (c == NUL |
| 910 | 5474 #if defined(LINE_ATTR) |
| 867 | 5475 || did_line_attr == 1 |
| 5476 #endif | |
| 5477 ) | |
| 5478 { | |
| 5479 #ifdef FEAT_SEARCH_EXTRA | |
| 5480 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5481 |
| 5482 /* we're not really at that column when skipping some text */ | |
| 1439 | 5483 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5484 ++prevcol; |
| 867 | 5485 #endif |
| 5486 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5487 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5488 * highlight match at end of line. If it's beyond the last |
| 5489 * char on the screen, just overwrite that one (tricky!) Not | |
| 5490 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5491 #ifdef FEAT_SEARCH_EXTRA |
| 5492 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5493 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5494 prevcol_hl_flag = TRUE; |
| 5495 else | |
| 5496 { | |
| 5497 cur = wp->w_match_head; | |
| 5498 while (cur != NULL) | |
| 5499 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5500 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5501 { |
| 5502 prevcol_hl_flag = TRUE; | |
| 5503 break; | |
| 5504 } | |
| 5505 cur = cur->next; | |
| 5506 } | |
| 5507 } | |
| 5508 #endif | |
| 7 | 5509 if (lcs_eol == lcs_eol_one |
| 1850 | 5510 && ((area_attr != 0 && vcol == fromcol |
| 5511 && (VIsual_mode != Ctrl_V | |
| 5512 || lnum == VIsual.lnum | |
| 5513 || lnum == curwin->w_cursor.lnum) | |
| 5514 && c == NUL) | |
| 7 | 5515 #ifdef FEAT_SEARCH_EXTRA |
| 5516 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5517 || (prevcol_hl_flag == TRUE |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5518 # 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
|
5519 && !(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
|
5520 && !(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
|
5521 # endif |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5522 # 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
|
5523 && 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
|
5524 # endif |
| 910 | 5525 # if defined(LINE_ATTR) |
| 867 | 5526 && did_line_attr <= 1 |
| 5527 # endif | |
| 5528 ) | |
| 7 | 5529 #endif |
| 5530 )) | |
| 5531 { | |
| 5532 int n = 0; | |
| 5533 | |
| 5534 #ifdef FEAT_RIGHTLEFT | |
| 5535 if (wp->w_p_rl) | |
| 5536 { | |
| 5537 if (col < 0) | |
| 5538 n = 1; | |
| 5539 } | |
| 5540 else | |
| 5541 #endif | |
| 5542 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5543 if (col >= wp->w_width) |
| 7 | 5544 n = -1; |
| 5545 } | |
| 5546 if (n != 0) | |
| 5547 { | |
| 5548 /* At the window boundary, highlight the last character | |
| 5549 * instead (better than nothing). */ | |
| 5550 off += n; | |
| 5551 col += n; | |
| 5552 } | |
| 5553 else | |
| 5554 { | |
| 5555 /* Add a blank character to highlight. */ | |
| 5556 ScreenLines[off] = ' '; | |
| 5557 #ifdef FEAT_MBYTE | |
| 5558 if (enc_utf8) | |
| 5559 ScreenLinesUC[off] = 0; | |
| 5560 #endif | |
| 5561 } | |
| 5562 #ifdef FEAT_SEARCH_EXTRA | |
| 5563 if (area_attr == 0) | |
| 5564 { | |
| 1326 | 5565 /* Use attributes from match with highest priority among |
| 5566 * 'search_hl' and the match list. */ | |
| 5567 char_attr = search_hl.attr; | |
| 5568 cur = wp->w_match_head; | |
| 5569 shl_flag = FALSE; | |
| 5570 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5571 { |
| 1326 | 5572 if (shl_flag == FALSE |
| 5573 && ((cur != NULL | |
| 5574 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5575 || cur == NULL)) | |
| 699 | 5576 { |
| 1326 | 5577 shl = &search_hl; |
| 5578 shl_flag = TRUE; | |
| 699 | 5579 } |
| 1326 | 5580 else |
| 5581 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5582 if ((ptr - line) - 1 == (long)shl->startcol |
|
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5583 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5584 char_attr = shl->attr; |
| 5585 if (shl != &search_hl && cur != NULL) | |
| 5586 cur = cur->next; | |
| 699 | 5587 } |
| 7 | 5588 } |
| 5589 #endif | |
| 5590 ScreenAttrs[off] = char_attr; | |
| 5591 #ifdef FEAT_RIGHTLEFT | |
| 5592 if (wp->w_p_rl) | |
| 1437 | 5593 { |
| 7 | 5594 --col; |
| 1437 | 5595 --off; |
| 5596 } | |
| 7 | 5597 else |
| 5598 #endif | |
| 1437 | 5599 { |
| 7 | 5600 ++col; |
| 1437 | 5601 ++off; |
| 5602 } | |
| 743 | 5603 ++vcol; |
| 1437 | 5604 #ifdef FEAT_SYN_HL |
| 5605 eol_hl_off = 1; | |
| 5606 #endif | |
| 743 | 5607 } |
| 867 | 5608 } |
| 5609 | |
| 5610 /* | |
| 5611 * At end of the text line. | |
| 5612 */ | |
| 5613 if (c == NUL) | |
| 5614 { | |
| 743 | 5615 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5616 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5617 if (wp->w_p_wrap) |
| 5618 v = wp->w_skipcol; | |
| 5619 else | |
| 5620 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5621 |
| 820 | 5622 /* check if line ends before left margin */ |
| 5623 if (vcol < v + col - win_col_off(wp)) | |
| 5624 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
|
5625 #ifdef FEAT_CONCEAL |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5626 /* Get rid of the boguscols now, we want to draw until the right |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5627 * edge for 'cursorcolumn'. */ |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5628 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5629 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5630 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5631 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5632 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5633 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
|
5634 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5635 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5636 && (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
|
5637 && (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
|
5638 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
|
5639 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5640 || draw_color_col) |
| 743 | 5641 # ifdef FEAT_RIGHTLEFT |
| 5642 && !wp->w_p_rl | |
| 5643 # endif | |
| 5644 ) | |
| 5645 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5646 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5647 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5648 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5649 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5650 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5651 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5652 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5653 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
|
5654 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5655 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5656 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5657 while (col < wp->w_width) |
| 743 | 5658 { |
| 5659 ScreenLines[off] = ' '; | |
| 5660 #ifdef FEAT_MBYTE | |
| 5661 if (enc_utf8) | |
| 5662 ScreenLinesUC[off] = 0; | |
| 5663 #endif | |
| 5664 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5665 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5666 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
|
5667 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5668 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5669 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
|
5670 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
|
5671 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
|
5672 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5673 else |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5674 ScreenAttrs[off++] = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5675 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5676 if (VCOL_HLC >= rightmost_vcol) |
| 743 | 5677 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5678 |
| 743 | 5679 ++vcol; |
| 5680 } | |
| 5681 } | |
| 5682 #endif | |
| 7 | 5683 |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5684 screen_line(screen_row, wp->w_wincol, col, |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5685 (int)wp->w_width, HAS_RIGHTLEFT(wp->w_p_rl)); |
| 7 | 5686 row++; |
| 5687 | |
| 5688 /* | |
| 5689 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5690 * updated (saves a call to plines() later). | |
| 5691 */ | |
| 5692 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5693 { | |
| 5694 curwin->w_cline_row = startrow; | |
| 5695 curwin->w_cline_height = row - startrow; | |
| 5696 #ifdef FEAT_FOLDING | |
| 5697 curwin->w_cline_folded = FALSE; | |
| 5698 #endif | |
| 5699 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5700 } | |
| 5701 | |
| 5702 break; | |
| 5703 } | |
| 5704 | |
| 5705 /* line continues beyond line end */ | |
| 5706 if (lcs_ext | |
| 5707 && !wp->w_p_wrap | |
| 5708 #ifdef FEAT_DIFF | |
| 5709 && filler_todo <= 0 | |
| 5710 #endif | |
| 5711 && ( | |
| 5712 #ifdef FEAT_RIGHTLEFT | |
| 5713 wp->w_p_rl ? col == 0 : | |
| 5714 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5715 col == wp->w_width - 1) |
| 7 | 5716 && (*ptr != NUL |
| 1555 | 5717 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5718 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5719 { | |
| 5720 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
|
5721 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5722 #ifdef FEAT_MBYTE |
| 5723 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
|
5724 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5725 { |
| 5726 mb_utf8 = TRUE; | |
| 714 | 5727 u8cc[0] = 0; |
| 819 | 5728 c = 0xc0; |
| 7 | 5729 } |
| 5730 else | |
| 5731 mb_utf8 = FALSE; | |
| 5732 #endif | |
| 5733 } | |
| 5734 | |
| 743 | 5735 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5736 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5737 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5738 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
|
5739 |
| 743 | 5740 /* 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
|
5741 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5742 * 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
|
5743 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5744 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
|
5745 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
|
5746 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5747 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5748 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
|
5749 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5750 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5751 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
|
5752 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
|
5753 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5754 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
|
5755 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5756 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
|
5757 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
|
5758 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5759 } |
| 743 | 5760 #endif |
| 5761 | |
| 7 | 5762 /* |
| 5763 * Store character to be displayed. | |
| 5764 * Skip characters that are left of the screen for 'nowrap'. | |
| 5765 */ | |
| 5766 vcol_prev = vcol; | |
| 5767 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5768 { | |
| 5769 /* | |
| 5770 * Store the character. | |
| 5771 */ | |
| 5772 #if defined(FEAT_RIGHTLEFT) && defined(FEAT_MBYTE) | |
| 5773 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) | |
| 5774 { | |
| 5775 /* A double-wide character is: put first halve in left cell. */ | |
| 5776 --off; | |
| 5777 --col; | |
| 5778 } | |
| 5779 #endif | |
| 5780 ScreenLines[off] = c; | |
| 5781 #ifdef FEAT_MBYTE | |
| 5782 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5783 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5784 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5785 ScreenLines[off] = 0x8e; |
| 7 | 5786 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5787 } |
| 7 | 5788 else if (enc_utf8) |
| 5789 { | |
| 5790 if (mb_utf8) | |
| 5791 { | |
| 1326 | 5792 int i; |
| 5793 | |
| 7 | 5794 ScreenLinesUC[off] = mb_c; |
| 819 | 5795 if ((c & 0xff) == 0) |
| 5796 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5797 for (i = 0; i < Screen_mco; ++i) |
| 5798 { | |
| 5799 ScreenLinesC[i][off] = u8cc[i]; | |
| 5800 if (u8cc[i] == 0) | |
| 5801 break; | |
| 5802 } | |
| 7 | 5803 } |
| 5804 else | |
| 5805 ScreenLinesUC[off] = 0; | |
| 5806 } | |
| 5807 if (multi_attr) | |
| 5808 { | |
| 5809 ScreenAttrs[off] = multi_attr; | |
| 5810 multi_attr = 0; | |
| 5811 } | |
| 5812 else | |
| 5813 #endif | |
| 5814 ScreenAttrs[off] = char_attr; | |
| 5815 | |
| 5816 #ifdef FEAT_MBYTE | |
| 5817 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5818 { | |
| 5819 /* Need to fill two screen columns. */ | |
| 5820 ++off; | |
| 5821 ++col; | |
| 5822 if (enc_utf8) | |
| 5823 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5824 ScreenLines[off] = 0; | |
| 5825 else | |
| 5826 /* DBCS: Put second byte in the second screen char. */ | |
| 5827 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5828 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5829 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5830 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5831 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5832 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5833 ++vcol; |
| 7 | 5834 /* When "tocol" is halfway a character, set it to the end of |
| 5835 * the character, otherwise highlighting won't stop. */ | |
| 5836 if (tocol == vcol) | |
| 5837 ++tocol; | |
| 5838 #ifdef FEAT_RIGHTLEFT | |
| 5839 if (wp->w_p_rl) | |
| 5840 { | |
| 5841 /* now it's time to backup one cell */ | |
| 5842 --off; | |
| 5843 --col; | |
| 5844 } | |
| 5845 #endif | |
| 5846 } | |
| 5847 #endif | |
| 5848 #ifdef FEAT_RIGHTLEFT | |
| 5849 if (wp->w_p_rl) | |
| 5850 { | |
| 5851 --off; | |
| 5852 --col; | |
| 5853 } | |
| 5854 else | |
| 5855 #endif | |
| 5856 { | |
| 5857 ++off; | |
| 5858 ++col; | |
| 5859 } | |
| 5860 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5861 #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
|
5862 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
|
5863 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5864 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5865 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5866 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5867 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5868 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5869 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5870 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5871 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5872 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5873 * 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
|
5874 * 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
|
5875 * 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
|
5876 * 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
|
5877 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5878 * 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
|
5879 * 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
|
5880 * 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
|
5881 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5882 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5883 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5884 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5885 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5886 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5887 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5888 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5889 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5890 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5891 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5892 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5893 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5894 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5895 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5896 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5897 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5898 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5899 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5900 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5901 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5902 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5903 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5904 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
|
5905 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5906 /* Need to fill two screen columns. */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5907 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5908 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5909 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5910 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5911 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5912 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5913 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5914 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5915 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5916 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5917 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5918 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5919 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5920 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5921 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5922 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5923 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5924 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5925 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5926 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5927 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5928 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5929 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5930 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5931 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5932 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5933 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5934 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5935 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5936 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5937 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5938 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5939 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5940 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5941 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5942 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5943 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5944 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5945 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5946 #endif /* FEAT_CONCEAL */ |
| 7 | 5947 else |
| 5948 --n_skip; | |
| 5949 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5950 /* 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
|
5951 * column. */ |
| 1849 | 5952 if (draw_state > WL_NR |
| 7 | 5953 #ifdef FEAT_DIFF |
| 5954 && filler_todo <= 0 | |
| 5955 #endif | |
| 5956 ) | |
| 5957 ++vcol; | |
| 5958 | |
| 743 | 5959 #ifdef FEAT_SYN_HL |
| 5960 if (vcol_save_attr >= 0) | |
| 5961 char_attr = vcol_save_attr; | |
| 5962 #endif | |
| 5963 | |
| 7 | 5964 /* restore attributes after "predeces" in 'listchars' */ |
| 5965 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5966 char_attr = saved_attr3; | |
| 5967 | |
| 5968 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5969 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5970 char_attr = saved_attr2; | |
| 5971 | |
| 5972 /* | |
| 5973 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5974 * so far. If there is no more to display it is caught above. |
| 7 | 5975 */ |
| 5976 if (( | |
| 5977 #ifdef FEAT_RIGHTLEFT | |
| 5978 wp->w_p_rl ? (col < 0) : | |
| 5979 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5980 (col >= wp->w_width)) |
| 7 | 5981 && (*ptr != NUL |
| 5982 #ifdef FEAT_DIFF | |
| 5983 || filler_todo > 0 | |
| 5984 #endif | |
| 2724 | 5985 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5986 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5987 ) | |
| 5988 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5989 #ifdef FEAT_CONCEAL |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5990 screen_line(screen_row, wp->w_wincol, col - boguscols, |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5991 (int)wp->w_width, HAS_RIGHTLEFT(wp->w_p_rl)); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5992 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5993 #else |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5994 screen_line(screen_row, wp->w_wincol, col, |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5995 (int)wp->w_width, HAS_RIGHTLEFT(wp->w_p_rl)); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5996 #endif |
| 7 | 5997 ++row; |
| 5998 ++screen_row; | |
| 5999 | |
| 6000 /* When not wrapping and finished diff lines, or when displayed | |
| 6001 * '$' and highlighting until last column, break here. */ | |
| 6002 if ((!wp->w_p_wrap | |
| 6003 #ifdef FEAT_DIFF | |
| 6004 && filler_todo <= 0 | |
| 6005 #endif | |
| 6006 ) || lcs_eol_one == -1) | |
| 6007 break; | |
| 6008 | |
| 6009 /* When the window is too narrow draw all "@" lines. */ | |
| 6010 if (draw_state != WL_LINE | |
| 6011 #ifdef FEAT_DIFF | |
| 6012 && filler_todo <= 0 | |
| 6013 #endif | |
| 6014 ) | |
| 6015 { | |
| 6016 win_draw_end(wp, '@', ' ', row, wp->w_height, HLF_AT); | |
| 6017 draw_vsep_win(wp, row); | |
| 6018 row = endrow; | |
| 6019 } | |
| 6020 | |
| 6021 /* When line got too long for screen break here. */ | |
| 6022 if (row == endrow) | |
| 6023 { | |
| 6024 ++row; | |
| 6025 break; | |
| 6026 } | |
| 6027 | |
| 6028 if (screen_cur_row == screen_row - 1 | |
| 6029 #ifdef FEAT_DIFF | |
| 6030 && filler_todo <= 0 | |
| 6031 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6032 && wp->w_width == Columns) |
| 7 | 6033 { |
| 6034 /* Remember that the line wraps, used for modeless copy. */ | |
| 6035 LineWraps[screen_row - 1] = TRUE; | |
| 6036 | |
| 6037 /* | |
| 6038 * Special trick to make copy/paste of wrapped lines work with | |
| 6039 * xterm/screen: write an extra character beyond the end of | |
| 6040 * the line. This will work with all terminal types | |
| 6041 * (regardless of the xn,am settings). | |
| 6042 * Only do this on a fast tty. | |
| 6043 * Only do this if the cursor is on the current line | |
| 6044 * (something has been written in it). | |
| 6045 * Don't do this for the GUI. | |
| 6046 * Don't do this for double-width characters. | |
| 6047 * Don't do this for a window not at the right screen border. | |
| 6048 */ | |
| 6049 if (p_tf | |
| 6050 #ifdef FEAT_GUI | |
| 6051 && !gui.in_use | |
| 6052 #endif | |
| 6053 #ifdef FEAT_MBYTE | |
| 6054 && !(has_mbyte | |
| 1378 | 6055 && ((*mb_off2cells)(LineOffset[screen_row], |
| 6056 LineOffset[screen_row] + screen_Columns) | |
| 6057 == 2 | |
| 7 | 6058 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 6059 + (int)Columns - 2, |
| 6060 LineOffset[screen_row] + screen_Columns) | |
| 6061 == 2)) | |
| 7 | 6062 #endif |
| 6063 ) | |
| 6064 { | |
| 6065 /* First make sure we are at the end of the screen line, | |
| 6066 * then output the same character again to let the | |
| 6067 * terminal know about the wrap. If the terminal doesn't | |
| 6068 * 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
|
6069 if (screen_cur_col != wp->w_width) |
| 7 | 6070 screen_char(LineOffset[screen_row - 1] |
| 6071 + (unsigned)Columns - 1, | |
| 6072 screen_row - 1, (int)(Columns - 1)); | |
| 6073 | |
| 6074 #ifdef FEAT_MBYTE | |
| 6075 /* When there is a multi-byte character, just output a | |
| 6076 * space to keep it simple. */ | |
| 148 | 6077 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 6078 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 6079 out_char(' '); |
| 6080 else | |
| 6081 #endif | |
| 6082 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 6083 + (Columns - 1)]); | |
| 6084 /* force a redraw of the first char on the next line */ | |
| 6085 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 6086 screen_start(); /* don't know where cursor is now */ | |
| 6087 } | |
| 6088 } | |
| 6089 | |
| 6090 col = 0; | |
| 6091 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6092 #ifdef FEAT_RIGHTLEFT | |
| 6093 if (wp->w_p_rl) | |
| 6094 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6095 col = wp->w_width - 1; /* col is not used if breaking! */ |
| 7 | 6096 off += col; |
| 6097 } | |
| 6098 #endif | |
| 6099 | |
| 6100 /* reset the drawing state for the start of a wrapped line */ | |
| 6101 draw_state = WL_START; | |
| 6102 saved_n_extra = n_extra; | |
| 6103 saved_p_extra = p_extra; | |
| 6104 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
|
6105 saved_c_final = c_final; |
| 7 | 6106 saved_char_attr = char_attr; |
| 6107 n_extra = 0; | |
| 6108 lcs_prec_todo = lcs_prec; | |
| 6109 #ifdef FEAT_LINEBREAK | |
| 6110 # ifdef FEAT_DIFF | |
| 6111 if (filler_todo <= 0) | |
| 6112 # endif | |
| 6113 need_showbreak = TRUE; | |
| 6114 #endif | |
| 6115 #ifdef FEAT_DIFF | |
| 6116 --filler_todo; | |
| 6117 /* When the filler lines are actually below the last line of the | |
| 6118 * file, don't draw the line itself, break here. */ | |
| 6119 if (filler_todo == 0 && wp->w_botfill) | |
| 6120 break; | |
| 6121 #endif | |
| 6122 } | |
| 6123 | |
| 6124 } /* for every character in the line */ | |
| 6125 | |
| 743 | 6126 #ifdef FEAT_SPELL |
| 386 | 6127 /* After an empty line check first word for capital. */ |
| 6128 if (*skipwhite(line) == NUL) | |
| 6129 { | |
| 6130 capcol_lnum = lnum + 1; | |
| 6131 cap_col = 0; | |
| 6132 } | |
| 6133 #endif | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6134 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6135 vim_free(text_props); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6136 vim_free(text_prop_idxs); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6137 #endif |
| 386 | 6138 |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
6139 vim_free(p_extra_free); |
| 7 | 6140 return row; |
| 6141 } | |
| 6142 | |
| 714 | 6143 #ifdef FEAT_MBYTE |
| 6144 /* | |
| 6145 * 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
|
6146 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 6147 */ |
| 6148 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6149 comp_char_differs(int off_from, int off_to) |
| 714 | 6150 { |
| 6151 int i; | |
| 6152 | |
| 6153 for (i = 0; i < Screen_mco; ++i) | |
| 6154 { | |
| 6155 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 6156 return TRUE; | |
| 6157 if (ScreenLinesC[i][off_from] == 0) | |
| 6158 break; | |
| 6159 } | |
| 6160 return FALSE; | |
| 6161 } | |
| 6162 #endif | |
| 6163 | |
| 7 | 6164 /* |
| 6165 * Check whether the given character needs redrawing: | |
| 6166 * - the (first byte of the) character is different | |
| 6167 * - the attributes are different | |
| 6168 * - the character is multi-byte and the next byte is different | |
| 1616 | 6169 * - the character is two cells wide and the second cell differs. |
| 7 | 6170 */ |
| 6171 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6172 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 6173 { |
| 6174 if (cols > 0 | |
| 6175 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 6176 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6177 | |
| 6178 #ifdef FEAT_MBYTE | |
| 6179 || (enc_dbcs != 0 | |
| 6180 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 6181 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 6182 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 6183 : (cols > 1 && ScreenLines[off_from + 1] | |
| 6184 != ScreenLines[off_to + 1]))) | |
| 6185 || (enc_utf8 | |
| 6186 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 6187 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 6188 && comp_char_differs(off_from, off_to)) |
| 3759 | 6189 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6190 && ScreenLines[off_from + 1] | |
| 6191 != ScreenLines[off_to + 1]))) | |
| 7 | 6192 #endif |
| 6193 )) | |
| 6194 return TRUE; | |
| 6195 return FALSE; | |
| 6196 } | |
| 6197 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6198 #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
|
6199 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6200 * 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
|
6201 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6202 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6203 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
|
6204 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6205 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
|
6206 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6207 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6208 |
| 7 | 6209 /* |
| 6210 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6211 * have actually changed. Handle insert/delete character. | |
| 6212 * "coloff" gives the first column on the screen for this line. | |
| 6213 * "endcol" gives the columns where valid characters are. | |
| 6214 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6215 * needs to be cleared, negative otherwise. | |
| 6216 * "rlflag" is TRUE in a rightleft window: | |
| 6217 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" | |
| 6218 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6219 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6220 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6221 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6222 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6223 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6224 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
|
6225 int clear_width, |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6226 int rlflag UNUSED) |
| 7 | 6227 { |
| 6228 unsigned off_from; | |
| 6229 unsigned off_to; | |
| 1378 | 6230 #ifdef FEAT_MBYTE |
| 6231 unsigned max_off_from; | |
| 6232 unsigned max_off_to; | |
| 6233 #endif | |
| 7 | 6234 int col = 0; |
| 6235 int hl; | |
| 6236 int force = FALSE; /* force update rest of the line */ | |
| 6237 int redraw_this /* bool: does character need redraw? */ | |
| 6238 #ifdef FEAT_GUI | |
| 6239 = TRUE /* For GUI when while-loop empty */ | |
| 6240 #endif | |
| 6241 ; | |
| 6242 int redraw_next; /* redraw_this for next character */ | |
| 6243 #ifdef FEAT_MBYTE | |
| 6244 int clear_next = FALSE; | |
| 6245 int char_cells; /* 1: normal char */ | |
| 6246 /* 2: occupies two display cells */ | |
| 6247 # define CHAR_CELLS char_cells | |
| 6248 #else | |
| 6249 # define CHAR_CELLS 1 | |
| 6250 #endif | |
| 6251 | |
| 3413 | 6252 /* Check for illegal row and col, just in case. */ |
| 6253 if (row >= Rows) | |
| 6254 row = Rows - 1; | |
| 6255 if (endcol > Columns) | |
| 6256 endcol = Columns; | |
| 6257 | |
| 7 | 6258 # ifdef FEAT_CLIPBOARD |
| 6259 clip_may_clear_selection(row, row); | |
| 6260 # endif | |
| 6261 | |
| 6262 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6263 off_to = LineOffset[row] + coloff; | |
| 1378 | 6264 #ifdef FEAT_MBYTE |
| 6265 max_off_from = off_from + screen_Columns; | |
| 6266 max_off_to = LineOffset[row] + screen_Columns; | |
| 6267 #endif | |
| 7 | 6268 |
| 6269 #ifdef FEAT_RIGHTLEFT | |
| 6270 if (rlflag) | |
| 6271 { | |
| 6272 /* Clear rest first, because it's left of the text. */ | |
| 6273 if (clear_width > 0) | |
| 6274 { | |
| 6275 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6276 && ScreenAttrs[off_to] == 0 | |
| 6277 # ifdef FEAT_MBYTE | |
| 6278 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6279 # endif | |
| 6280 ) | |
| 6281 { | |
| 6282 ++off_to; | |
| 6283 ++col; | |
| 6284 } | |
| 6285 if (col <= endcol) | |
| 6286 screen_fill(row, row + 1, col + coloff, | |
| 6287 endcol + coloff + 1, ' ', ' ', 0); | |
| 6288 } | |
| 6289 col = endcol + 1; | |
| 6290 off_to = LineOffset[row] + col + coloff; | |
| 6291 off_from += col; | |
| 6292 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6293 } | |
| 6294 #endif /* FEAT_RIGHTLEFT */ | |
| 6295 | |
| 6296 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6297 | |
| 6298 while (col < endcol) | |
| 6299 { | |
| 6300 #ifdef FEAT_MBYTE | |
| 6301 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6302 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6303 else |
| 6304 char_cells = 1; | |
| 6305 #endif | |
| 6306 | |
| 6307 redraw_this = redraw_next; | |
| 6308 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6309 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6310 | |
| 6311 #ifdef FEAT_GUI | |
| 6312 /* If the next character was bold, then redraw the current character to | |
| 6313 * remove any pixels that might have spilt over into us. This only | |
| 6314 * happens in the GUI. | |
| 6315 */ | |
| 6316 if (redraw_next && gui.in_use) | |
| 6317 { | |
| 6318 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6319 if (hl > HL_ALL) |
| 6320 hl = syn_attr2attr(hl); | |
| 6321 if (hl & HL_BOLD) | |
| 7 | 6322 redraw_this = TRUE; |
| 6323 } | |
| 6324 #endif | |
| 6325 | |
| 6326 if (redraw_this) | |
| 6327 { | |
| 6328 /* | |
| 6329 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6330 * Attributes for characters are stored at the position where the | |
| 6331 * cursor is when writing the highlighting code. The | |
| 6332 * start-highlighting code must be written with the cursor on the | |
| 6333 * first highlighted character. The stop-highlighting code must | |
| 6334 * be written with the cursor just after the last highlighted | |
| 6335 * character. | |
|
15034
6e4e0d43b20b
patch 8.1.0528: various typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
14877
diff
changeset
|
6336 * Overwriting a character doesn't remove its highlighting. Need |
| 7 | 6337 * to clear the rest of the line, and force redrawing it |
| 6338 * completely. | |
| 6339 */ | |
| 6340 if ( p_wiv | |
| 6341 && !force | |
| 6342 #ifdef FEAT_GUI | |
| 6343 && !gui.in_use | |
| 6344 #endif | |
| 6345 && ScreenAttrs[off_to] != 0 | |
| 6346 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6347 { | |
| 6348 /* | |
| 6349 * Need to remove highlighting attributes here. | |
| 6350 */ | |
| 6351 windgoto(row, col + coloff); | |
| 6352 out_str(T_CE); /* clear rest of this screen line */ | |
| 6353 screen_start(); /* don't know where cursor is now */ | |
| 6354 force = TRUE; /* force redraw of rest of the line */ | |
| 6355 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6356 | |
| 6357 /* | |
| 6358 * If the previous character was highlighted, need to stop | |
| 6359 * highlighting at this character. | |
| 6360 */ | |
| 6361 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6362 { | |
| 6363 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6364 term_windgoto(row, col + coloff); | |
| 6365 screen_stop_highlight(); | |
| 6366 } | |
| 6367 else | |
| 6368 screen_attr = 0; /* highlighting has stopped */ | |
| 6369 } | |
| 6370 #ifdef FEAT_MBYTE | |
| 6371 if (enc_dbcs != 0) | |
| 6372 { | |
| 6373 /* Check if overwriting a double-byte with a single-byte or | |
| 6374 * the other way around requires another character to be | |
| 6375 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6376 * ScreenLinesUC[] is sufficient. */ | |
| 6377 if (char_cells == 1 | |
| 6378 && col + 1 < endcol | |
| 1378 | 6379 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6380 { |
| 6381 /* Writing a single-cell character over a double-cell | |
| 6382 * character: need to redraw the next cell. */ | |
| 6383 ScreenLines[off_to + 1] = 0; | |
| 6384 redraw_next = TRUE; | |
| 6385 } | |
| 6386 else if (char_cells == 2 | |
| 6387 && col + 2 < endcol | |
| 1378 | 6388 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6389 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6390 { |
| 6391 /* Writing the second half of a double-cell character over | |
| 6392 * a double-cell character: need to redraw the second | |
| 6393 * cell. */ | |
| 6394 ScreenLines[off_to + 2] = 0; | |
| 6395 redraw_next = TRUE; | |
| 6396 } | |
| 6397 | |
| 6398 if (enc_dbcs == DBCS_JPNU) | |
| 6399 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6400 } | |
| 6401 /* When writing a single-width character over a double-width | |
| 6402 * character and at the end of the redrawn text, need to clear out | |
| 6403 * the right halve of the old character. | |
| 6404 * Also required when writing the right halve of a double-width | |
| 6405 * char over the left halve of an existing one. */ | |
| 6406 if (has_mbyte && col + char_cells == endcol | |
| 6407 && ((char_cells == 1 | |
| 1378 | 6408 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6409 || (char_cells == 2 |
| 1378 | 6410 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6411 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6412 clear_next = TRUE; |
| 6413 #endif | |
| 6414 | |
| 6415 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6416 #ifdef FEAT_MBYTE | |
| 6417 if (enc_utf8) | |
| 6418 { | |
| 6419 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6420 if (ScreenLinesUC[off_from] != 0) | |
| 6421 { | |
| 714 | 6422 int i; |
| 6423 | |
| 6424 for (i = 0; i < Screen_mco; ++i) | |
| 6425 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6426 } |
| 6427 } | |
| 6428 if (char_cells == 2) | |
| 6429 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6430 #endif | |
| 6431 | |
| 6432 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6433 /* The bold trick makes a single column of pixels appear in the |
| 6434 * next character. When a bold character is removed, the next | |
| 7 | 6435 * character should be redrawn too. This happens for our own GUI |
| 6436 * and for some xterms. */ | |
| 6437 if ( | |
| 6438 # ifdef FEAT_GUI | |
| 6439 gui.in_use | |
| 6440 # endif | |
| 6441 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6442 || | |
| 6443 # endif | |
| 6444 # ifdef UNIX | |
| 6445 term_is_xterm | |
| 6446 # endif | |
| 6447 ) | |
| 6448 { | |
| 6449 hl = ScreenAttrs[off_to]; | |
| 743 | 6450 if (hl > HL_ALL) |
| 6451 hl = syn_attr2attr(hl); | |
| 6452 if (hl & HL_BOLD) | |
| 7 | 6453 redraw_next = TRUE; |
| 6454 } | |
| 6455 #endif | |
| 6456 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
| 6457 #ifdef FEAT_MBYTE | |
| 819 | 6458 /* For simplicity set the attributes of second half of a |
| 6459 * double-wide character equal to the first half. */ | |
| 6460 if (char_cells == 2) | |
| 6461 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6462 | |
| 7 | 6463 if (enc_dbcs != 0 && char_cells == 2) |
| 6464 screen_char_2(off_to, row, col + coloff); | |
| 6465 else | |
| 6466 #endif | |
| 6467 screen_char(off_to, row, col + coloff); | |
| 6468 } | |
| 6469 else if ( p_wiv | |
| 6470 #ifdef FEAT_GUI | |
| 6471 && !gui.in_use | |
| 6472 #endif | |
| 6473 && col + coloff > 0) | |
| 6474 { | |
| 6475 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6476 { | |
| 6477 /* | |
| 6478 * Don't output stop-highlight when moving the cursor, it will | |
| 6479 * stop the highlighting when it should continue. | |
| 6480 */ | |
| 6481 screen_attr = 0; | |
| 6482 } | |
| 6483 else if (screen_attr != 0) | |
| 6484 screen_stop_highlight(); | |
| 6485 } | |
| 6486 | |
| 6487 off_to += CHAR_CELLS; | |
| 6488 off_from += CHAR_CELLS; | |
| 6489 col += CHAR_CELLS; | |
| 6490 } | |
| 6491 | |
| 6492 #ifdef FEAT_MBYTE | |
| 6493 if (clear_next) | |
| 6494 { | |
| 6495 /* Clear the second half of a double-wide character of which the left | |
| 6496 * half was overwritten with a single-wide character. */ | |
| 6497 ScreenLines[off_to] = ' '; | |
| 6498 if (enc_utf8) | |
| 6499 ScreenLinesUC[off_to] = 0; | |
| 6500 screen_char(off_to, row, col + coloff); | |
| 6501 } | |
| 6502 #endif | |
| 6503 | |
| 6504 if (clear_width > 0 | |
| 6505 #ifdef FEAT_RIGHTLEFT | |
| 6506 && !rlflag | |
| 6507 #endif | |
| 6508 ) | |
| 6509 { | |
| 6510 #ifdef FEAT_GUI | |
| 6511 int startCol = col; | |
| 6512 #endif | |
| 6513 | |
| 6514 /* blank out the rest of the line */ | |
| 6515 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6516 && ScreenAttrs[off_to] == 0 | |
| 6517 #ifdef FEAT_MBYTE | |
| 6518 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6519 #endif | |
| 6520 ) | |
| 6521 { | |
| 6522 ++off_to; | |
| 6523 ++col; | |
| 6524 } | |
| 6525 if (col < clear_width) | |
| 6526 { | |
| 6527 #ifdef FEAT_GUI | |
| 6528 /* | |
| 6529 * In the GUI, clearing the rest of the line may leave pixels | |
| 6530 * behind if the first character cleared was bold. Some bold | |
| 6531 * fonts spill over the left. In this case we redraw the previous | |
| 6532 * character too. If we didn't skip any blanks above, then we | |
| 6533 * only redraw if the character wasn't already redrawn anyway. | |
| 6534 */ | |
| 996 | 6535 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6536 { |
| 6537 hl = ScreenAttrs[off_to]; | |
| 6538 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6539 { |
| 6540 int prev_cells = 1; | |
| 6541 # ifdef FEAT_MBYTE | |
| 6542 if (enc_utf8) | |
| 6543 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6544 * that its width is 2. */ | |
| 6545 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6546 else if (enc_dbcs != 0) | |
| 6547 { | |
| 6548 /* find previous character by counting from first | |
| 6549 * column and get its width. */ | |
| 6550 unsigned off = LineOffset[row]; | |
| 1378 | 6551 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6552 |
| 6553 while (off < off_to) | |
| 6554 { | |
| 1378 | 6555 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6556 off += prev_cells; |
| 6557 } | |
| 6558 } | |
| 6559 | |
| 6560 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6561 screen_char_2(off_to - prev_cells, row, | |
| 6562 col + coloff - prev_cells); | |
| 6563 else | |
| 6564 # endif | |
| 6565 screen_char(off_to - prev_cells, row, | |
| 6566 col + coloff - prev_cells); | |
| 6567 } | |
| 7 | 6568 } |
| 6569 #endif | |
| 6570 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6571 ' ', ' ', 0); | |
| 6572 off_to += clear_width - col; | |
| 6573 col = clear_width; | |
| 6574 } | |
| 6575 } | |
| 6576 | |
| 6577 if (clear_width > 0) | |
| 6578 { | |
| 6579 /* For a window that's left of another, draw the separator char. */ | |
| 6580 if (col + coloff < Columns) | |
| 6581 { | |
| 6582 int c; | |
| 6583 | |
| 6584 c = fillchar_vsep(&hl); | |
| 6477 | 6585 if (ScreenLines[off_to] != (schar_T)c |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6586 #ifdef FEAT_MBYTE |
| 714 | 6587 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6588 != (c >= 0x80 ? c : 0)) | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6589 #endif |
| 7 | 6590 || ScreenAttrs[off_to] != hl) |
| 6591 { | |
| 6592 ScreenLines[off_to] = c; | |
| 6593 ScreenAttrs[off_to] = hl; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6594 #ifdef FEAT_MBYTE |
| 7 | 6595 if (enc_utf8) |
| 6596 { | |
| 6597 if (c >= 0x80) | |
| 6598 { | |
| 6599 ScreenLinesUC[off_to] = c; | |
| 714 | 6600 ScreenLinesC[0][off_to] = 0; |
| 7 | 6601 } |
| 6602 else | |
| 6603 ScreenLinesUC[off_to] = 0; | |
| 6604 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6605 #endif |
| 7 | 6606 screen_char(off_to, row, col + coloff); |
| 6607 } | |
| 6608 } | |
| 6609 else | |
| 6610 LineWraps[row] = FALSE; | |
| 6611 } | |
| 6612 } | |
| 6613 | |
| 474 | 6614 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6615 /* |
| 474 | 6616 * Mirror text "str" for right-left displaying. |
| 6617 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6618 */ |
| 474 | 6619 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6620 rl_mirror(char_u *str) |
| 7 | 6621 { |
| 6622 char_u *p1, *p2; | |
| 6623 int t; | |
| 6624 | |
| 6625 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6626 { | |
| 6627 t = *p1; | |
| 6628 *p1 = *p2; | |
| 6629 *p2 = t; | |
| 6630 } | |
| 6631 } | |
| 6632 #endif | |
| 6633 | |
| 6634 /* | |
| 6635 * mark all status lines for redraw; used after first :cd | |
| 6636 */ | |
| 6637 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6638 status_redraw_all(void) |
| 7 | 6639 { |
| 6640 win_T *wp; | |
| 6641 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6642 FOR_ALL_WINDOWS(wp) |
| 7 | 6643 if (wp->w_status_height) |
| 6644 { | |
| 6645 wp->w_redr_status = TRUE; | |
| 6646 redraw_later(VALID); | |
| 6647 } | |
| 6648 } | |
| 6649 | |
| 6650 /* | |
| 6651 * mark all status lines of the current buffer for redraw | |
| 6652 */ | |
| 6653 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6654 status_redraw_curbuf(void) |
| 7 | 6655 { |
| 6656 win_T *wp; | |
| 6657 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6658 FOR_ALL_WINDOWS(wp) |
| 7 | 6659 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6660 { | |
| 6661 wp->w_redr_status = TRUE; | |
| 6662 redraw_later(VALID); | |
| 6663 } | |
| 6664 } | |
| 6665 | |
| 6666 /* | |
| 6667 * Redraw all status lines that need to be redrawn. | |
| 6668 */ | |
| 6669 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6670 redraw_statuslines(void) |
| 7 | 6671 { |
| 6672 win_T *wp; | |
| 6673 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6674 FOR_ALL_WINDOWS(wp) |
| 7 | 6675 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
|
6676 win_redr_status(wp, FALSE); |
| 673 | 6677 if (redraw_tabline) |
| 677 | 6678 draw_tabline(); |
| 7 | 6679 } |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6680 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6681 #if defined(FEAT_WILDMENU) || defined(PROTO) |
| 7 | 6682 /* |
| 6683 * Redraw all status lines at the bottom of frame "frp". | |
| 6684 */ | |
| 6685 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6686 win_redraw_last_status(frame_T *frp) |
| 7 | 6687 { |
| 6688 if (frp->fr_layout == FR_LEAF) | |
| 6689 frp->fr_win->w_redr_status = TRUE; | |
| 6690 else if (frp->fr_layout == FR_ROW) | |
| 6691 { | |
|
15227
95678f27a704
patch 8.1.0623: iterating through window frames is repeated
Bram Moolenaar <Bram@vim.org>
parents:
15138
diff
changeset
|
6692 FOR_ALL_FRAMES(frp, frp->fr_child) |
| 7 | 6693 win_redraw_last_status(frp); |
| 6694 } | |
| 6695 else /* frp->fr_layout == FR_COL */ | |
| 6696 { | |
| 6697 frp = frp->fr_child; | |
| 6698 while (frp->fr_next != NULL) | |
| 6699 frp = frp->fr_next; | |
| 6700 win_redraw_last_status(frp); | |
| 6701 } | |
| 6702 } | |
| 6703 #endif | |
| 6704 | |
| 6705 /* | |
| 6706 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6707 */ | |
| 6708 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6709 draw_vsep_win(win_T *wp, int row) |
| 7 | 6710 { |
| 6711 int hl; | |
| 6712 int c; | |
| 6713 | |
| 6714 if (wp->w_vsep_width) | |
| 6715 { | |
| 6716 /* draw the vertical separator right of this window */ | |
| 6717 c = fillchar_vsep(&hl); | |
| 6718 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6719 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6720 c, ' ', hl); | |
| 6721 } | |
| 6722 } | |
| 6723 | |
| 6724 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6725 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6726 |
| 6727 /* | |
| 1378 | 6728 * Get the length of an item as it will be shown in the status line. |
| 7 | 6729 */ |
| 6730 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6731 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6732 { |
| 6733 int len = 0; | |
| 6734 | |
| 6735 #ifdef FEAT_MENU | |
| 6736 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6737 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6738 | |
| 6739 /* Check for menu separators - replace with '|'. */ | |
| 6740 if (emenu && menu_is_separator(s)) | |
| 6741 return 1; | |
| 6742 #endif | |
| 6743 | |
| 6744 while (*s != NUL) | |
| 6745 { | |
| 1685 | 6746 s += skip_status_match_char(xp, s); |
| 42 | 6747 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6748 MB_PTR_ADV(s); |
| 7 | 6749 } |
| 6750 | |
| 6751 return len; | |
| 6752 } | |
| 6753 | |
| 6754 /* | |
| 1685 | 6755 * Return the number of characters that should be skipped in a status match. |
| 277 | 6756 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6757 */ | |
| 6758 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6759 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6760 { |
| 1685 | 6761 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6762 #ifdef FEAT_MENU |
| 6763 || ((xp->xp_context == EXPAND_MENUS | |
| 6764 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6765 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6766 #endif | |
| 1685 | 6767 ) |
| 6768 { | |
| 6769 #ifndef BACKSLASH_IN_FILENAME | |
| 6770 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6771 return 2; | |
| 6772 #endif | |
| 6773 return 1; | |
| 6774 } | |
| 6775 return 0; | |
| 277 | 6776 } |
| 6777 | |
| 6778 /* | |
| 7 | 6779 * Show wildchar matches in the status line. |
| 6780 * Show at least the "match" item. | |
| 6781 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6782 * | |
| 6783 * If inversion is possible we use it. Else '=' characters are used. | |
| 6784 */ | |
| 6785 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6786 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6787 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6788 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6789 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6790 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6791 int showtail) |
| 7 | 6792 { |
| 6793 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6794 int row; | |
| 6795 char_u *buf; | |
| 6796 int len; | |
| 1378 | 6797 int clen; /* length in screen cells */ |
| 7 | 6798 int fillchar; |
| 6799 int attr; | |
| 6800 int i; | |
| 6801 int highlight = TRUE; | |
| 6802 char_u *selstart = NULL; | |
| 6803 int selstart_col = 0; | |
| 6804 char_u *selend = NULL; | |
| 6805 static int first_match = 0; | |
| 6806 int add_left = FALSE; | |
| 6807 char_u *s; | |
| 6808 #ifdef FEAT_MENU | |
| 6809 int emenu; | |
| 6810 #endif | |
| 6811 #if defined(FEAT_MBYTE) || defined(FEAT_MENU) | |
| 6812 int l; | |
| 6813 #endif | |
| 6814 | |
| 6815 if (matches == NULL) /* interrupted completion? */ | |
| 6816 return; | |
| 6817 | |
| 39 | 6818 #ifdef FEAT_MBYTE |
| 6819 if (has_mbyte) | |
| 6820 buf = alloc((unsigned)Columns * MB_MAXBYTES + 1); | |
| 6821 else | |
| 6822 #endif | |
| 6823 buf = alloc((unsigned)Columns + 1); | |
| 7 | 6824 if (buf == NULL) |
| 6825 return; | |
| 6826 | |
| 6827 if (match == -1) /* don't show match but original text */ | |
| 6828 { | |
| 6829 match = 0; | |
| 6830 highlight = FALSE; | |
| 6831 } | |
| 6832 /* count 1 for the ending ">" */ | |
| 6833 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6834 if (match == 0) | |
| 6835 first_match = 0; | |
| 6836 else if (match < first_match) | |
| 6837 { | |
| 6838 /* jumping left, as far as we can go */ | |
| 6839 first_match = match; | |
| 6840 add_left = TRUE; | |
| 6841 } | |
| 6842 else | |
| 6843 { | |
| 6844 /* check if match fits on the screen */ | |
| 6845 for (i = first_match; i < match; ++i) | |
| 6846 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6847 if (first_match > 0) | |
| 6848 clen += 2; | |
| 6849 /* jumping right, put match at the left */ | |
| 6850 if ((long)clen > Columns) | |
| 6851 { | |
| 6852 first_match = match; | |
| 6853 /* if showing the last match, we can add some on the left */ | |
| 6854 clen = 2; | |
| 6855 for (i = match; i < num_matches; ++i) | |
| 6856 { | |
| 6857 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6858 if ((long)clen >= Columns) | |
| 6859 break; | |
| 6860 } | |
| 6861 if (i == num_matches) | |
| 6862 add_left = TRUE; | |
| 6863 } | |
| 6864 } | |
| 6865 if (add_left) | |
| 6866 while (first_match > 0) | |
| 6867 { | |
| 6868 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6869 if ((long)clen >= Columns) | |
| 6870 break; | |
| 6871 --first_match; | |
| 6872 } | |
| 6873 | |
|
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
|
6874 fillchar = fillchar_status(&attr, curwin); |
| 7 | 6875 |
| 6876 if (first_match == 0) | |
| 6877 { | |
| 6878 *buf = NUL; | |
| 6879 len = 0; | |
| 6880 } | |
| 6881 else | |
| 6882 { | |
| 6883 STRCPY(buf, "< "); | |
| 6884 len = 2; | |
| 6885 } | |
| 6886 clen = len; | |
| 6887 | |
| 6888 i = first_match; | |
| 6889 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6890 { | |
| 6891 if (i == match) | |
| 6892 { | |
| 6893 selstart = buf + len; | |
| 6894 selstart_col = clen; | |
| 6895 } | |
| 6896 | |
| 6897 s = L_MATCH(i); | |
| 6898 /* Check for menu separators - replace with '|' */ | |
| 6899 #ifdef FEAT_MENU | |
| 6900 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6901 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6902 if (emenu && menu_is_separator(s)) | |
| 6903 { | |
| 6904 STRCPY(buf + len, transchar('|')); | |
| 6905 l = (int)STRLEN(buf + len); | |
| 6906 len += l; | |
| 6907 clen += l; | |
| 6908 } | |
| 6909 else | |
| 6910 #endif | |
| 6911 for ( ; *s != NUL; ++s) | |
| 6912 { | |
| 1685 | 6913 s += skip_status_match_char(xp, s); |
| 7 | 6914 clen += ptr2cells(s); |
| 6915 #ifdef FEAT_MBYTE | |
| 474 | 6916 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6917 { |
| 6918 STRNCPY(buf + len, s, l); | |
| 6919 s += l - 1; | |
| 6920 len += l; | |
| 6921 } | |
| 6922 else | |
| 6923 #endif | |
| 6924 { | |
| 6925 STRCPY(buf + len, transchar_byte(*s)); | |
| 6926 len += (int)STRLEN(buf + len); | |
| 6927 } | |
| 6928 } | |
| 6929 if (i == match) | |
| 6930 selend = buf + len; | |
| 6931 | |
| 6932 *(buf + len++) = ' '; | |
| 6933 *(buf + len++) = ' '; | |
| 6934 clen += 2; | |
| 6935 if (++i == num_matches) | |
| 6936 break; | |
| 6937 } | |
| 6938 | |
| 6939 if (i != num_matches) | |
| 6940 { | |
| 6941 *(buf + len++) = '>'; | |
| 6942 ++clen; | |
| 6943 } | |
| 6944 | |
| 6945 buf[len] = NUL; | |
| 6946 | |
| 6947 row = cmdline_row - 1; | |
| 6948 if (row >= 0) | |
| 6949 { | |
| 6950 if (wild_menu_showing == 0) | |
| 6951 { | |
| 6952 if (msg_scrolled > 0) | |
| 6953 { | |
| 6954 /* Put the wildmenu just above the command line. If there is | |
| 6955 * no room, scroll the screen one line up. */ | |
| 6956 if (cmdline_row == Rows - 1) | |
| 6957 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
6958 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 6959 ++msg_scrolled; |
| 6960 } | |
| 6961 else | |
| 6962 { | |
| 6963 ++cmdline_row; | |
| 6964 ++row; | |
| 6965 } | |
| 6966 wild_menu_showing = WM_SCROLLED; | |
| 6967 } | |
| 6968 else | |
| 6969 { | |
| 6970 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6971 * Set 'winminheight' to zero to avoid that the window is | |
| 6972 * resized. */ | |
| 6973 if (lastwin->w_status_height == 0) | |
| 6974 { | |
| 6975 save_p_ls = p_ls; | |
| 6976 save_p_wmh = p_wmh; | |
| 6977 p_ls = 2; | |
| 6978 p_wmh = 0; | |
| 6979 last_status(FALSE); | |
| 6980 } | |
| 6981 wild_menu_showing = WM_SHOWN; | |
| 6982 } | |
| 6983 } | |
| 6984 | |
| 6985 screen_puts(buf, row, 0, attr); | |
| 6986 if (selstart != NULL && highlight) | |
| 6987 { | |
| 6988 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
6989 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 6990 } |
| 6991 | |
| 6992 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6993 } | |
| 6994 | |
| 6995 win_redraw_last_status(topframe); | |
| 6996 vim_free(buf); | |
| 6997 } | |
| 6998 #endif | |
| 6999 | |
| 7000 /* | |
| 7001 * Redraw the status line of window wp. | |
| 7002 * | |
| 7003 * 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
|
7004 * 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
|
7005 * displayed. |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7006 */ |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7007 static void |
|
14191
ec39f281e3e8
patch 8.1.0113: compiler warning for unused variable
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
7008 win_redr_status(win_T *wp, int ignore_pum UNUSED) |
| 7 | 7009 { |
| 7010 int row; | |
| 7011 char_u *p; | |
| 7012 int len; | |
| 7013 int fillchar; | |
| 7014 int attr; | |
| 7015 int this_ru_col; | |
| 1910 | 7016 static int busy = FALSE; |
| 7017 | |
| 7018 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 7019 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 7020 if (busy) | |
| 7021 return; | |
| 7022 busy = TRUE; | |
| 7 | 7023 |
| 7024 wp->w_redr_status = FALSE; | |
| 7025 if (wp->w_status_height == 0) | |
| 7026 { | |
| 7027 /* no status line, can only be last window */ | |
| 7028 redraw_cmdline = TRUE; | |
| 7029 } | |
| 540 | 7030 else if (!redrawing() |
| 7031 #ifdef FEAT_INS_EXPAND | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7032 // 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
|
7033 // drawn over it, unless it will be redrawn later |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7034 || (!ignore_pum && pum_visible()) |
| 540 | 7035 #endif |
| 7036 ) | |
| 7 | 7037 { |
| 7038 /* Don't redraw right now, do it later. */ | |
| 7039 wp->w_redr_status = TRUE; | |
| 7040 } | |
| 7041 #ifdef FEAT_STL_OPT | |
| 40 | 7042 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 7043 { |
| 7044 /* redraw custom status line */ | |
| 1983 | 7045 redraw_custom_statusline(wp); |
| 7 | 7046 } |
| 7047 #endif | |
| 7048 else | |
| 7049 { | |
|
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
|
7050 fillchar = fillchar_status(&attr, wp); |
| 7 | 7051 |
| 685 | 7052 get_trans_bufname(wp->w_buffer); |
| 7 | 7053 p = NameBuff; |
| 7054 len = (int)STRLEN(p); | |
| 7055 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
7056 if (bt_help(wp->w_buffer) |
| 7 | 7057 #ifdef FEAT_QUICKFIX |
| 7058 || wp->w_p_pvw | |
| 7059 #endif | |
| 7060 || bufIsChanged(wp->w_buffer) | |
| 7061 || wp->w_buffer->b_p_ro) | |
| 7062 *(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
|
7063 if (bt_help(wp->w_buffer)) |
| 7 | 7064 { |
| 809 | 7065 STRCPY(p + len, _("[Help]")); |
| 7 | 7066 len += (int)STRLEN(p + len); |
| 7067 } | |
| 7068 #ifdef FEAT_QUICKFIX | |
| 7069 if (wp->w_p_pvw) | |
| 7070 { | |
| 7071 STRCPY(p + len, _("[Preview]")); | |
| 7072 len += (int)STRLEN(p + len); | |
| 7073 } | |
| 7074 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7075 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
|
7076 #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
|
7077 && !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
|
7078 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7079 ) |
| 7 | 7080 { |
| 7081 STRCPY(p + len, "[+]"); | |
| 7082 len += 3; | |
| 7083 } | |
| 7084 if (wp->w_buffer->b_p_ro) | |
| 7085 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
7086 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
|
7087 len += (int)STRLEN(p + len); |
| 7 | 7088 } |
| 7089 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7090 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
|
7091 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
|
7092 this_ru_col = (wp->w_width + 1) / 2; |
| 7 | 7093 if (this_ru_col <= 1) |
| 7094 { | |
| 7095 p = (char_u *)"<"; /* No room for file name! */ | |
| 7096 len = 1; | |
| 7097 } | |
| 7098 else | |
| 7099 #ifdef FEAT_MBYTE | |
| 7100 if (has_mbyte) | |
| 7101 { | |
| 7102 int clen = 0, i; | |
| 7103 | |
| 7104 /* Count total number of display cells. */ | |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
7105 clen = mb_string2cells(p, -1); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
7106 |
| 7 | 7107 /* Find first character that will fit. |
| 7108 * Going from start to end is much faster for DBCS. */ | |
| 7109 for (i = 0; p[i] != NUL && clen >= this_ru_col - 1; | |
| 474 | 7110 i += (*mb_ptr2len)(p + i)) |
| 7 | 7111 clen -= (*mb_ptr2cells)(p + i); |
| 7112 len = clen; | |
| 7113 if (i > 0) | |
| 7114 { | |
| 7115 p = p + i - 1; | |
| 7116 *p = '<'; | |
| 7117 ++len; | |
| 7118 } | |
| 7119 | |
| 7120 } | |
| 7121 else | |
| 7122 #endif | |
| 7123 if (len > this_ru_col - 1) | |
| 7124 { | |
| 7125 p += len - (this_ru_col - 1); | |
| 7126 *p = '<'; | |
| 7127 len = this_ru_col - 1; | |
| 7128 } | |
| 7129 | |
| 7130 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
|
7131 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
|
7132 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
|
7133 this_ru_col + wp->w_wincol, fillchar, fillchar, attr); |
| 7 | 7134 |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7135 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 7136 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 7137 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
|
7138 - 1 + wp->w_wincol), attr); |
| 7 | 7139 |
| 7140 #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
|
7141 win_redr_ruler(wp, TRUE, ignore_pum); |
| 7 | 7142 #endif |
| 7143 } | |
| 7144 | |
| 7145 /* | |
| 7146 * May need to draw the character below the vertical separator. | |
| 7147 */ | |
| 7148 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 7149 { | |
| 7150 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
|
7151 fillchar = fillchar_status(&attr, wp); |
| 7 | 7152 else |
| 7153 fillchar = fillchar_vsep(&attr); | |
| 7154 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 7155 attr); | |
| 7156 } | |
| 1910 | 7157 busy = FALSE; |
| 7 | 7158 } |
| 7159 | |
| 680 | 7160 #ifdef FEAT_STL_OPT |
| 7161 /* | |
| 7162 * Redraw the status line according to 'statusline' and take care of any | |
| 7163 * errors encountered. | |
| 7164 */ | |
| 7165 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7166 redraw_custom_statusline(win_T *wp) |
| 680 | 7167 { |
| 1983 | 7168 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7169 int saved_did_emsg = did_emsg; |
| 1983 | 7170 |
| 7171 /* When called recursively return. This can happen when the statusline | |
| 7172 * contains an expression that triggers a redraw. */ | |
| 7173 if (entered) | |
| 7174 return; | |
| 7175 entered = TRUE; | |
| 680 | 7176 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7177 did_emsg = FALSE; |
| 680 | 7178 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7179 if (did_emsg) |
| 1983 | 7180 { |
| 7181 /* When there is an error disable the statusline, otherwise the | |
| 7182 * display is messed up with errors and a redraw triggers the problem | |
| 7183 * again and again. */ | |
| 680 | 7184 set_string_option_direct((char_u *)"statusline", -1, |
| 7185 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7186 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7187 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7188 did_emsg |= saved_did_emsg; |
| 1983 | 7189 entered = FALSE; |
| 680 | 7190 } |
| 7191 #endif | |
| 7192 | |
| 7 | 7193 /* |
| 7194 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7195 * line of the window right of it. If not, then it's a vertical separator. | |
| 7196 * Only call if (wp->w_vsep_width != 0). | |
| 7197 */ | |
| 7198 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7199 stl_connected(win_T *wp) |
| 7 | 7200 { |
| 7201 frame_T *fr; | |
| 7202 | |
| 7203 fr = wp->w_frame; | |
| 7204 while (fr->fr_parent != NULL) | |
| 7205 { | |
| 7206 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7207 { | |
| 7208 if (fr->fr_next != NULL) | |
| 7209 break; | |
| 7210 } | |
| 7211 else | |
| 7212 { | |
| 7213 if (fr->fr_next != NULL) | |
| 7214 return TRUE; | |
| 7215 } | |
| 7216 fr = fr->fr_parent; | |
| 7217 } | |
| 7218 return FALSE; | |
| 7219 } | |
| 7220 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7221 |
| 7 | 7222 /* |
| 7223 * Get the value to show for the language mappings, active 'keymap'. | |
| 7224 */ | |
| 7225 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7226 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7227 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7228 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
|
7229 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
|
7230 int len) /* length of buffer */ |
| 7 | 7231 { |
| 7232 char_u *p; | |
| 7233 | |
| 7234 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7235 return FALSE; | |
| 7236 | |
| 7237 { | |
| 7238 #ifdef FEAT_EVAL | |
| 7239 buf_T *old_curbuf = curbuf; | |
| 7240 win_T *old_curwin = curwin; | |
| 7241 char_u *s; | |
| 7242 | |
| 7243 curbuf = wp->w_buffer; | |
| 7244 curwin = wp; | |
| 7245 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7246 ++emsg_skip; | |
| 714 | 7247 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7248 --emsg_skip; |
| 7249 curbuf = old_curbuf; | |
| 7250 curwin = old_curwin; | |
| 7251 if (p == NULL || *p == NUL) | |
| 7252 #endif | |
| 7253 { | |
| 7254 #ifdef FEAT_KEYMAP | |
| 7255 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7256 p = wp->w_buffer->b_p_keymap; | |
| 7257 else | |
| 7258 #endif | |
| 7259 p = (char_u *)"lang"; | |
| 7260 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7261 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7262 buf[0] = NUL; |
| 7263 #ifdef FEAT_EVAL | |
| 7264 vim_free(s); | |
| 7265 #endif | |
| 7266 } | |
| 7267 return buf[0] != NUL; | |
| 7268 } | |
| 7269 | |
| 7270 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7271 /* | |
| 677 | 7272 * Redraw the status line or ruler of window "wp". |
| 7273 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7274 */ |
| 7275 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7276 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7277 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7278 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7279 { |
| 5539 | 7280 static int entered = FALSE; |
| 7 | 7281 int attr; |
| 7282 int curattr; | |
| 7283 int row; | |
| 7284 int col = 0; | |
| 7285 int maxwidth; | |
| 7286 int width; | |
| 7287 int n; | |
| 7288 int len; | |
| 7289 int fillchar; | |
| 7290 char_u buf[MAXPATHL]; | |
| 1983 | 7291 char_u *stl; |
| 7 | 7292 char_u *p; |
| 681 | 7293 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7294 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7295 int use_sandbox = FALSE; |
| 2693 | 7296 win_T *ewp; |
| 7297 int p_crb_save; | |
| 7 | 7298 |
| 5539 | 7299 /* There is a tiny chance that this gets called recursively: When |
| 7300 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7301 * Avoid trouble by not allowing recursion. */ | |
| 7302 if (entered) | |
| 7303 return; | |
| 7304 entered = TRUE; | |
| 7305 | |
| 7 | 7306 /* setup environment for the task at hand */ |
| 677 | 7307 if (wp == NULL) |
| 7308 { | |
| 7309 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7310 stl = p_tal; |
| 677 | 7311 row = 0; |
| 707 | 7312 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7313 attr = HL_ATTR(HLF_TPF); |
| 677 | 7314 maxwidth = Columns; |
| 7315 # ifdef FEAT_EVAL | |
| 681 | 7316 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7317 # endif |
| 7318 } | |
| 40 | 7319 else |
| 677 | 7320 { |
| 7321 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
|
7322 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
|
7323 maxwidth = wp->w_width; |
| 677 | 7324 |
| 7325 if (draw_ruler) | |
| 7326 { | |
| 1983 | 7327 stl = p_ruf; |
| 677 | 7328 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7329 if (*stl == '%') |
| 7330 { | |
| 7331 if (*++stl == '-') | |
| 7332 stl++; | |
| 7333 if (atoi((char *)stl)) | |
| 7334 while (VIM_ISDIGIT(*stl)) | |
| 7335 stl++; | |
| 7336 if (*stl++ != '(') | |
| 7337 stl = p_ruf; | |
| 677 | 7338 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7339 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
|
7340 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
|
7341 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
|
7342 maxwidth = wp->w_width - col; |
| 677 | 7343 if (!wp->w_status_height) |
| 7344 { | |
| 7345 row = Rows - 1; | |
| 7346 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7347 fillchar = ' '; | |
| 7348 attr = 0; | |
| 7349 } | |
| 7350 | |
| 7351 # ifdef FEAT_EVAL | |
| 681 | 7352 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7353 # endif |
| 7354 } | |
| 7355 else | |
| 7356 { | |
| 7357 if (*wp->w_p_stl != NUL) | |
| 1983 | 7358 stl = wp->w_p_stl; |
| 677 | 7359 else |
| 1983 | 7360 stl = p_stl; |
| 677 | 7361 # ifdef FEAT_EVAL |
| 681 | 7362 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7363 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7364 # endif |
| 7365 } | |
| 7366 | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7367 col += wp->w_wincol; |
| 677 | 7368 } |
| 7369 | |
| 7 | 7370 if (maxwidth <= 0) |
| 5539 | 7371 goto theend; |
| 677 | 7372 |
| 2693 | 7373 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7374 * the cursor away and back. */ | |
| 7375 ewp = wp == NULL ? curwin : wp; | |
| 7376 p_crb_save = ewp->w_p_crb; | |
| 7377 ewp->w_p_crb = FALSE; | |
| 7378 | |
| 1983 | 7379 /* Make a copy, because the statusline may include a function call that |
| 7380 * might change the option value and free the memory. */ | |
| 7381 stl = vim_strsave(stl); | |
| 2693 | 7382 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7383 stl, use_sandbox, |
| 681 | 7384 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7385 vim_free(stl); |
| 2693 | 7386 ewp->w_p_crb = p_crb_save; |
| 2661 | 7387 |
| 7388 /* Make all characters printable. */ | |
| 7389 p = transstr(buf); | |
| 7390 if (p != NULL) | |
| 7391 { | |
| 7392 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7393 vim_free(p); | |
| 7394 } | |
| 7395 | |
| 7396 /* fill up with "fillchar" */ | |
| 835 | 7397 len = (int)STRLEN(buf); |
| 1883 | 7398 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7399 { |
| 7400 #ifdef FEAT_MBYTE | |
| 7401 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7402 #else | |
| 7403 buf[len++] = fillchar; | |
| 7404 #endif | |
| 7405 ++width; | |
| 7406 } | |
| 7407 buf[len] = NUL; | |
| 7408 | |
| 681 | 7409 /* |
| 7410 * Draw each snippet with the specified highlighting. | |
| 7411 */ | |
| 7 | 7412 curattr = attr; |
| 7413 p = buf; | |
| 681 | 7414 for (n = 0; hltab[n].start != NULL; n++) |
| 7415 { | |
| 7416 len = (int)(hltab[n].start - p); | |
| 7 | 7417 screen_puts_len(p, len, row, col, curattr); |
| 7418 col += vim_strnsize(p, len); | |
| 681 | 7419 p = hltab[n].start; |
| 7420 | |
| 7421 if (hltab[n].userhl == 0) | |
| 7 | 7422 curattr = attr; |
| 681 | 7423 else if (hltab[n].userhl < 0) |
| 7424 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
|
7425 #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
|
7426 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
|
7427 && 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
|
7428 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
|
7429 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
|
7430 && 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
|
7431 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
|
7432 #endif |
| 680 | 7433 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7434 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7435 else |
| 681 | 7436 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7437 } |
| 7438 screen_puts(p, row, col, curattr); | |
| 681 | 7439 |
| 7440 if (wp == NULL) | |
| 7441 { | |
| 7442 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7443 col = 0; | |
| 7444 len = 0; | |
| 7445 p = buf; | |
| 7446 fillchar = 0; | |
| 7447 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7448 { | |
| 7449 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7450 while (col < len) | |
| 7451 TabPageIdxs[col++] = fillchar; | |
| 7452 p = tabtab[n].start; | |
| 7453 fillchar = tabtab[n].userhl; | |
| 7454 } | |
| 7455 while (col < Columns) | |
| 7456 TabPageIdxs[col++] = fillchar; | |
| 7457 } | |
| 5539 | 7458 |
| 7459 theend: | |
| 7460 entered = FALSE; | |
| 7 | 7461 } |
| 7462 | |
| 7463 #endif /* FEAT_STL_OPT */ | |
| 7464 | |
| 7465 /* | |
| 7466 * Output a single character directly to the screen and update ScreenLines. | |
| 7467 */ | |
| 7468 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7469 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7470 { |
| 3549 | 7471 char_u buf[MB_MAXBYTES + 1]; |
| 7472 | |
| 7 | 7473 #ifdef FEAT_MBYTE |
| 3549 | 7474 if (has_mbyte) |
| 7475 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7476 else | |
| 7477 #endif | |
| 7478 { | |
| 7479 buf[0] = c; | |
| 7480 buf[1] = NUL; | |
| 7481 } | |
| 7 | 7482 screen_puts(buf, row, col, attr); |
| 7483 } | |
| 7484 | |
| 7485 /* | |
| 7486 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7487 * Also return its attribute in *attrp; | |
| 7488 */ | |
| 7489 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7490 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7491 { |
| 7492 unsigned off; | |
| 7493 | |
| 7494 /* safety check */ | |
| 7495 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7496 { | |
| 7497 off = LineOffset[row] + col; | |
| 7498 *attrp = ScreenAttrs[off]; | |
| 7499 bytes[0] = ScreenLines[off]; | |
| 7500 bytes[1] = NUL; | |
| 7501 | |
| 7502 #ifdef FEAT_MBYTE | |
| 7503 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7504 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7505 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7506 { | |
| 7507 bytes[0] = ScreenLines[off]; | |
| 7508 bytes[1] = ScreenLines2[off]; | |
| 7509 bytes[2] = NUL; | |
| 7510 } | |
| 7511 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7512 { | |
| 7513 bytes[1] = ScreenLines[off + 1]; | |
| 7514 bytes[2] = NUL; | |
| 7515 } | |
| 7516 #endif | |
| 7517 } | |
| 7518 } | |
| 7519 | |
| 714 | 7520 #ifdef FEAT_MBYTE |
| 7521 /* | |
| 7522 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7523 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7524 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7525 */ |
| 7526 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7527 screen_comp_differs(int off, int *u8cc) |
| 714 | 7528 { |
| 7529 int i; | |
| 7530 | |
| 7531 for (i = 0; i < Screen_mco; ++i) | |
| 7532 { | |
| 7533 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7534 return TRUE; | |
| 7535 if (u8cc[i] == 0) | |
| 7536 break; | |
| 7537 } | |
| 7538 return FALSE; | |
| 7539 } | |
| 7540 #endif | |
| 7541 | |
| 7 | 7542 /* |
| 7543 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7544 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7545 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7546 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7547 */ | |
| 7548 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7549 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7550 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7551 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7552 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7553 int attr) |
| 7 | 7554 { |
| 7555 screen_puts_len(text, -1, row, col, attr); | |
| 7556 } | |
| 7557 | |
| 7558 /* | |
| 7559 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7560 * a NUL. | |
| 7561 */ | |
| 7562 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7563 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7564 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7565 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7566 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7567 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7568 int attr) |
| 7 | 7569 { |
| 7570 unsigned off; | |
| 7571 char_u *ptr = text; | |
| 5923 | 7572 int len = textlen; |
| 7 | 7573 int c; |
| 7574 #ifdef FEAT_MBYTE | |
| 1378 | 7575 unsigned max_off; |
| 7 | 7576 int mbyte_blen = 1; |
| 7577 int mbyte_cells = 1; | |
| 7578 int u8c = 0; | |
| 714 | 7579 int u8cc[MAX_MCO]; |
| 7 | 7580 int clear_next_cell = FALSE; |
| 7581 # ifdef FEAT_ARABIC | |
| 7582 int prev_c = 0; /* previous Arabic character */ | |
| 714 | 7583 int pc, nc, nc1; |
| 7584 int pcc[MAX_MCO]; | |
| 7 | 7585 # endif |
| 7586 #endif | |
| 1843 | 7587 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7588 int force_redraw_this; | |
| 7589 int force_redraw_next = FALSE; | |
| 7590 #endif | |
| 7591 int need_redraw; | |
| 7 | 7592 |
| 7593 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7594 return; | |
| 1843 | 7595 off = LineOffset[row] + col; |
| 7 | 7596 |
| 1668 | 7597 #ifdef FEAT_MBYTE |
| 7598 /* When drawing over the right halve of a double-wide char clear out the | |
| 7599 * left halve. Only needed in a terminal. */ | |
| 1685 | 7600 if (has_mbyte && col > 0 && col < screen_Columns |
| 1668 | 7601 # ifdef FEAT_GUI |
| 7602 && !gui.in_use | |
| 7603 # endif | |
| 7604 && mb_fix_col(col, row) != col) | |
| 1843 | 7605 { |
| 7606 ScreenLines[off - 1] = ' '; | |
| 7607 ScreenAttrs[off - 1] = 0; | |
| 7608 if (enc_utf8) | |
| 7609 { | |
| 7610 ScreenLinesUC[off - 1] = 0; | |
| 7611 ScreenLinesC[0][off - 1] = 0; | |
| 7612 } | |
| 7613 /* redraw the previous cell, make it empty */ | |
| 7614 screen_char(off - 1, row, col - 1); | |
| 7615 /* force the cell at "col" to be redrawn */ | |
| 7616 force_redraw_next = TRUE; | |
| 7617 } | |
| 7618 #endif | |
| 7619 | |
| 1378 | 7620 #ifdef FEAT_MBYTE |
| 7621 max_off = LineOffset[row] + screen_Columns; | |
| 7622 #endif | |
| 1340 | 7623 while (col < screen_Columns |
| 7624 && (len < 0 || (int)(ptr - text) < len) | |
| 7625 && *ptr != NUL) | |
| 7 | 7626 { |
| 7627 c = *ptr; | |
| 7628 #ifdef FEAT_MBYTE | |
| 7629 /* check if this is the first byte of a multibyte */ | |
| 7630 if (has_mbyte) | |
| 7631 { | |
| 7632 if (enc_utf8 && len > 0) | |
| 474 | 7633 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7634 else |
| 474 | 7635 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7636 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7637 mbyte_cells = 1; | |
| 7638 else if (enc_dbcs != 0) | |
| 7639 mbyte_cells = mbyte_blen; | |
| 7640 else /* enc_utf8 */ | |
| 7641 { | |
| 7642 if (len >= 0) | |
| 714 | 7643 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7644 (int)((text + len) - ptr)); |
| 7645 else | |
| 714 | 7646 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7647 mbyte_cells = utf_char2cells(u8c); |
| 1401 | 7648 # ifdef UNICODE16 |
| 7 | 7649 /* Non-BMP character: display as ? or fullwidth ?. */ |
| 7650 if (u8c >= 0x10000) | |
| 7651 { | |
| 7652 u8c = (mbyte_cells == 2) ? 0xff1f : (int)'?'; | |
| 7653 if (attr == 0) | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7654 attr = HL_ATTR(HLF_8); |
| 7 | 7655 } |
| 1401 | 7656 # endif |
| 7 | 7657 # ifdef FEAT_ARABIC |
| 7658 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 7659 { | |
| 7660 /* Do Arabic shaping. */ | |
| 7661 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7662 { | |
| 7663 /* Past end of string to be displayed. */ | |
| 7664 nc = NUL; | |
| 7665 nc1 = NUL; | |
| 7666 } | |
| 7667 else | |
| 714 | 7668 { |
| 1994 | 7669 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7670 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7671 nc1 = pcc[0]; |
| 7672 } | |
| 7 | 7673 pc = prev_c; |
| 7674 prev_c = u8c; | |
| 714 | 7675 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7676 } |
| 7677 else | |
| 7678 prev_c = u8c; | |
| 7679 # endif | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7680 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7681 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7682 /* 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
|
7683 * 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
|
7684 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7685 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7686 } |
| 7 | 7687 } |
| 7688 } | |
| 7689 #endif | |
| 7690 | |
| 1843 | 7691 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7692 force_redraw_this = force_redraw_next; | |
| 7693 force_redraw_next = FALSE; | |
| 7694 #endif | |
| 7695 | |
| 7696 need_redraw = ScreenLines[off] != c | |
| 7 | 7697 #ifdef FEAT_MBYTE |
| 7698 || (mbyte_cells == 2 | |
| 7699 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7700 || (enc_dbcs == DBCS_JPNU | |
| 7701 && c == 0x8e | |
| 7702 && ScreenLines2[off] != ptr[1]) | |
| 7703 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7704 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7705 (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
|
7706 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7707 && screen_comp_differs(off, u8cc)))) |
| 7 | 7708 #endif |
| 7709 || ScreenAttrs[off] != attr | |
| 1843 | 7710 || exmode_active; |
| 7711 | |
| 7712 if (need_redraw | |
| 7713 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7714 || force_redraw_this | |
| 7715 #endif | |
| 7 | 7716 ) |
| 7717 { | |
| 7718 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7719 /* The bold trick makes a single row of pixels appear in the next | |
| 7720 * character. When a bold character is removed, the next | |
| 7721 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7722 * and for some xterms. */ |
| 7723 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7724 # ifdef FEAT_GUI |
| 7725 gui.in_use | |
| 7726 # endif | |
| 7727 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7728 || | |
| 7729 # endif | |
| 7730 # ifdef UNIX | |
| 7731 term_is_xterm | |
| 7732 # endif | |
| 1843 | 7733 )) |
| 7734 { | |
| 7735 int n = ScreenAttrs[off]; | |
| 7736 | |
| 7737 if (n > HL_ALL) | |
| 7738 n = syn_attr2attr(n); | |
| 7739 if (n & HL_BOLD) | |
| 7740 force_redraw_next = TRUE; | |
| 7 | 7741 } |
| 7742 #endif | |
| 7743 #ifdef FEAT_MBYTE | |
| 7744 /* When at the end of the text and overwriting a two-cell | |
| 7745 * character with a one-cell character, need to clear the next | |
| 7746 * cell. Also when overwriting the left halve of a two-cell char | |
| 7747 * with the right halve of a two-cell char. Do this only once | |
| 7748 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7749 if (clear_next_cell) | |
| 7750 clear_next_cell = FALSE; | |
| 7751 else if (has_mbyte | |
| 7752 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7753 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7754 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7755 || (mbyte_cells == 2 |
| 1378 | 7756 && (*mb_off2cells)(off, max_off) == 1 |
| 7757 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7758 clear_next_cell = TRUE; |
| 7759 | |
| 7760 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7761 * it confuses mb_off2cells(). */ | |
| 7762 if (enc_dbcs | |
| 1378 | 7763 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7764 || (mbyte_cells == 2 |
| 1378 | 7765 && (*mb_off2cells)(off, max_off) == 1 |
| 7766 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7767 ScreenLines[off + mbyte_blen] = 0; |
| 7768 #endif | |
| 7769 ScreenLines[off] = c; | |
| 7770 ScreenAttrs[off] = attr; | |
| 7771 #ifdef FEAT_MBYTE | |
| 7772 if (enc_utf8) | |
| 7773 { | |
| 714 | 7774 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7775 ScreenLinesUC[off] = 0; |
| 7776 else | |
| 7777 { | |
| 714 | 7778 int i; |
| 7779 | |
| 7 | 7780 ScreenLinesUC[off] = u8c; |
| 714 | 7781 for (i = 0; i < Screen_mco; ++i) |
| 7782 { | |
| 7783 ScreenLinesC[i][off] = u8cc[i]; | |
| 7784 if (u8cc[i] == 0) | |
| 7785 break; | |
| 7786 } | |
| 7 | 7787 } |
| 7788 if (mbyte_cells == 2) | |
| 7789 { | |
| 7790 ScreenLines[off + 1] = 0; | |
| 7791 ScreenAttrs[off + 1] = attr; | |
| 7792 } | |
| 7793 screen_char(off, row, col); | |
| 7794 } | |
| 7795 else if (mbyte_cells == 2) | |
| 7796 { | |
| 7797 ScreenLines[off + 1] = ptr[1]; | |
| 7798 ScreenAttrs[off + 1] = attr; | |
| 7799 screen_char_2(off, row, col); | |
| 7800 } | |
| 7801 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7802 { | |
| 7803 ScreenLines2[off] = ptr[1]; | |
| 7804 screen_char(off, row, col); | |
| 7805 } | |
| 7806 else | |
| 7807 #endif | |
| 7808 screen_char(off, row, col); | |
| 7809 } | |
| 7810 #ifdef FEAT_MBYTE | |
| 7811 if (has_mbyte) | |
| 7812 { | |
| 7813 off += mbyte_cells; | |
| 7814 col += mbyte_cells; | |
| 7815 ptr += mbyte_blen; | |
| 7816 if (clear_next_cell) | |
| 5923 | 7817 { |
| 7818 /* This only happens at the end, display one space next. */ | |
| 7 | 7819 ptr = (char_u *)" "; |
| 5923 | 7820 len = -1; |
| 7821 } | |
| 7 | 7822 } |
| 7823 else | |
| 7824 #endif | |
| 7825 { | |
| 7826 ++off; | |
| 7827 ++col; | |
| 7828 ++ptr; | |
| 7829 } | |
| 7830 } | |
| 1843 | 7831 |
| 7832 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7833 /* If we detected the next character needs to be redrawn, but the text | |
| 7834 * doesn't extend up to there, update the character here. */ | |
| 7835 if (force_redraw_next && col < screen_Columns) | |
| 7836 { | |
| 7837 # ifdef FEAT_MBYTE | |
| 7838 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7839 screen_char_2(off, row, col); | |
| 7840 else | |
| 7841 # endif | |
| 7842 screen_char(off, row, col); | |
| 7843 } | |
| 7844 #endif | |
| 7 | 7845 } |
| 7846 | |
| 7847 #ifdef FEAT_SEARCH_EXTRA | |
| 7848 /* | |
| 1326 | 7849 * Prepare for 'hlsearch' highlighting. |
| 7 | 7850 */ |
| 7851 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7852 start_search_hl(void) |
| 7 | 7853 { |
| 7854 if (p_hls && !no_hlsearch) | |
| 7855 { | |
| 7856 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
|
7857 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7858 # ifdef FEAT_RELTIME |
| 7859 /* Set the time limit to 'redrawtime'. */ | |
| 7860 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7861 # endif | |
| 7 | 7862 } |
| 7863 } | |
| 7864 | |
| 7865 /* | |
| 1326 | 7866 * Clean up for 'hlsearch' highlighting. |
| 7 | 7867 */ |
| 7868 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7869 end_search_hl(void) |
| 7 | 7870 { |
| 7871 if (search_hl.rm.regprog != NULL) | |
| 7872 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7873 vim_regfree(search_hl.rm.regprog); |
| 7 | 7874 search_hl.rm.regprog = NULL; |
| 7875 } | |
| 7876 } | |
| 7877 | |
| 7878 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7879 * Init for calling prepare_search_hl(). |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7880 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7881 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7882 init_search_hl(win_T *wp) |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7883 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7884 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7885 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7886 /* Setup for match and 'hlsearch' highlighting. Disable any previous |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7887 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7888 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7889 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7890 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7891 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7892 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7893 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7894 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7895 cur->hl.attr = syn_id2attr(cur->hlg_id); |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7896 cur->hl.buf = wp->w_buffer; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7897 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7898 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7899 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7900 /* Set the time limit to 'redrawtime'. */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7901 profile_setlimit(p_rdt, &(cur->hl.tm)); |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7902 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7903 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7904 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7905 search_hl.buf = wp->w_buffer; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7906 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7907 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7908 /* time limit is set at the toplevel, for all windows */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7909 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7910 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7911 /* |
| 7 | 7912 * Advance to the match in window "wp" line "lnum" or past it. |
| 7913 */ | |
| 7914 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7915 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7916 { |
| 1326 | 7917 matchitem_T *cur; /* points to the match list */ |
| 7918 match_T *shl; /* points to search_hl or a match */ | |
| 7919 int shl_flag; /* flag to indicate whether search_hl | |
| 7920 has been processed or not */ | |
| 5979 | 7921 int pos_inprogress; /* marks that position match search is |
| 7922 in progress */ | |
| 7 | 7923 int n; |
| 7924 | |
| 7925 /* | |
| 7926 * When using a multi-line pattern, start searching at the top | |
| 7927 * of the window or just after a closed fold. | |
| 1326 | 7928 * Do this both for search_hl and the match list. |
| 7 | 7929 */ |
| 1326 | 7930 cur = wp->w_match_head; |
| 7931 shl_flag = FALSE; | |
| 7932 while (cur != NULL || shl_flag == FALSE) | |
| 7933 { | |
| 7934 if (shl_flag == FALSE) | |
| 7935 { | |
| 7936 shl = &search_hl; | |
| 7937 shl_flag = TRUE; | |
| 7938 } | |
| 7939 else | |
| 7940 shl = &cur->hl; | |
| 7 | 7941 if (shl->rm.regprog != NULL |
| 7942 && shl->lnum == 0 | |
| 7943 && re_multiline(shl->rm.regprog)) | |
| 7944 { | |
| 7945 if (shl->first_lnum == 0) | |
| 7946 { | |
| 7947 # ifdef FEAT_FOLDING | |
| 7948 for (shl->first_lnum = lnum; | |
| 7949 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7950 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7951 NULL, NULL, TRUE, NULL)) | |
| 7952 break; | |
| 7953 # else | |
| 7954 shl->first_lnum = wp->w_topline; | |
| 7955 # endif | |
| 7956 } | |
| 5979 | 7957 if (cur != NULL) |
| 7958 cur->pos.cur = 0; | |
| 7959 pos_inprogress = TRUE; | |
| 7 | 7960 n = 0; |
| 5979 | 7961 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7962 || (cur != NULL && pos_inprogress))) | |
| 7963 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7964 next_search_hl(wp, shl, shl->first_lnum, (colnr_T)n, |
|
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7965 shl == &search_hl ? NULL : cur); |
| 5979 | 7966 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 7967 ? FALSE : TRUE; | |
| 7 | 7968 if (shl->lnum != 0) |
| 7969 { | |
| 7970 shl->first_lnum = shl->lnum | |
| 7971 + shl->rm.endpos[0].lnum | |
| 7972 - shl->rm.startpos[0].lnum; | |
| 7973 n = shl->rm.endpos[0].col; | |
| 7974 } | |
| 7975 else | |
| 7976 { | |
| 7977 ++shl->first_lnum; | |
| 7978 n = 0; | |
| 7979 } | |
| 7980 } | |
| 7981 } | |
| 1326 | 7982 if (shl != &search_hl && cur != NULL) |
| 7983 cur = cur->next; | |
| 7 | 7984 } |
| 7985 } | |
| 7986 | |
| 7987 /* | |
| 1326 | 7988 * Search for a next 'hlsearch' or match. |
| 7 | 7989 * Uses shl->buf. |
| 7990 * Sets shl->lnum and shl->rm contents. | |
| 7991 * Note: Assumes a previous match is always before "lnum", unless | |
| 7992 * shl->lnum is zero. | |
| 7993 * Careful: Any pointers for buffer lines will become invalid. | |
| 7994 */ | |
| 7995 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7996 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7997 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7998 match_T *shl, /* points to search_hl or a match */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7999 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8000 colnr_T mincol, /* minimal column for a match */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8001 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 8002 { |
| 8003 linenr_T l; | |
| 8004 colnr_T matchcol; | |
| 8005 long nmatched; | |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8006 int save_called_emsg = called_emsg; |
| 7 | 8007 |
|
14515
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8008 // for :{range}s/pat only highlight inside the range |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8009 if (lnum < search_first_line || lnum > search_last_line) |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8010 { |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8011 shl->lnum = 0; |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8012 return; |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8013 } |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8014 |
| 7 | 8015 if (shl->lnum != 0) |
| 8016 { | |
| 8017 /* Check for three situations: | |
| 8018 * 1. If the "lnum" is below a previous match, start a new search. | |
| 8019 * 2. If the previous match includes "mincol", use it. | |
| 8020 * 3. Continue after the previous match. | |
| 8021 */ | |
| 8022 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 8023 if (lnum > l) | |
| 8024 shl->lnum = 0; | |
| 8025 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 8026 return; | |
| 8027 } | |
| 8028 | |
| 8029 /* | |
| 8030 * Repeat searching for a match until one is found that includes "mincol" | |
| 8031 * or none is found in this line. | |
| 8032 */ | |
| 8033 called_emsg = FALSE; | |
| 8034 for (;;) | |
| 8035 { | |
| 1521 | 8036 #ifdef FEAT_RELTIME |
| 8037 /* Stop searching after passing the time limit. */ | |
| 8038 if (profile_passed_limit(&(shl->tm))) | |
| 8039 { | |
| 8040 shl->lnum = 0; /* no match found in time */ | |
| 8041 break; | |
| 8042 } | |
| 8043 #endif | |
| 7 | 8044 /* Three situations: |
| 8045 * 1. No useful previous match: search from start of line. | |
| 8046 * 2. Not Vi compatible or empty match: continue at next character. | |
| 8047 * Break the loop if this is beyond the end of the line. | |
| 8048 * 3. Vi compatible searching: continue at end of previous match. | |
| 8049 */ | |
| 8050 if (shl->lnum == 0) | |
| 8051 matchcol = 0; | |
| 8052 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 8053 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 8054 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 8055 { | |
| 688 | 8056 char_u *ml; |
| 685 | 8057 |
| 8058 matchcol = shl->rm.startpos[0].col; | |
| 688 | 8059 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 8060 if (*ml == NUL) |
| 8061 { | |
| 8062 ++matchcol; | |
| 7 | 8063 shl->lnum = 0; |
| 8064 break; | |
| 8065 } | |
| 685 | 8066 #ifdef FEAT_MBYTE |
| 8067 if (has_mbyte) | |
| 8068 matchcol += mb_ptr2len(ml); | |
| 8069 else | |
| 8070 #endif | |
| 8071 ++matchcol; | |
| 7 | 8072 } |
| 8073 else | |
| 8074 matchcol = shl->rm.endpos[0].col; | |
| 8075 | |
| 8076 shl->lnum = lnum; | |
| 5979 | 8077 if (shl->rm.regprog != NULL) |
| 8078 { | |
| 6394 | 8079 /* Remember whether shl->rm is using a copy of the regprog in |
| 8080 * cur->match. */ | |
| 8081 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 8082 && shl == &cur->hl | |
| 8083 && cur->match.regprog == cur->hl.rm.regprog); | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
8084 int timed_out = FALSE; |
| 6394 | 8085 |
| 5979 | 8086 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 8087 matchcol, | |
| 1521 | 8088 #ifdef FEAT_RELTIME |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
8089 &(shl->tm), &timed_out |
| 1521 | 8090 #else |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
8091 NULL, NULL |
| 5979 | 8092 #endif |
| 8093 ); | |
| 6394 | 8094 /* Copy the regprog, in case it got freed and recompiled. */ |
| 8095 if (regprog_is_copy) | |
| 8096 cur->match.regprog = cur->hl.rm.regprog; | |
| 8097 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
8098 if (called_emsg || got_int || timed_out) |
| 5979 | 8099 { |
| 8100 /* Error while handling regexp: stop using this regexp. */ | |
| 8101 if (shl == &search_hl) | |
| 8102 { | |
| 8103 /* don't free regprog in the match list, it's a copy */ | |
| 8104 vim_regfree(shl->rm.regprog); | |
|
13792
0e9b2971d7c3
patch 8.0.1768: SET_NO_HLSEARCH() used in a wrong way
Christian Brabandt <cb@256bit.org>
parents:
13666
diff
changeset
|
8105 set_no_hlsearch(TRUE); |
| 5979 | 8106 } |
| 8107 shl->rm.regprog = NULL; | |
| 8108 shl->lnum = 0; | |
| 8109 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 8110 message */ | |
| 8111 break; | |
| 8112 } | |
| 8113 } | |
| 8114 else if (cur != NULL) | |
| 8115 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 8116 else |
| 8117 nmatched = 0; | |
| 7 | 8118 if (nmatched == 0) |
| 8119 { | |
| 8120 shl->lnum = 0; /* no match found */ | |
| 8121 break; | |
| 8122 } | |
| 8123 if (shl->rm.startpos[0].lnum > 0 | |
| 8124 || shl->rm.startpos[0].col >= mincol | |
| 8125 || nmatched > 1 | |
| 8126 || shl->rm.endpos[0].col > mincol) | |
| 8127 { | |
| 8128 shl->lnum += shl->rm.startpos[0].lnum; | |
| 8129 break; /* useful match found */ | |
| 8130 } | |
| 8131 } | |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8132 |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8133 // Restore called_emsg for assert_fails(). |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8134 called_emsg = save_called_emsg; |
| 7 | 8135 } |
| 8136 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8137 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8138 * If there is a match fill "shl" and return one. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8139 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8140 */ |
| 5979 | 8141 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8142 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8143 match_T *shl, /* points to a match */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8144 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8145 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8146 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 8147 { |
| 8148 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8149 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8150 |
| 5979 | 8151 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 8152 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8153 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8154 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8155 if (pos->lnum == 0) |
| 5979 | 8156 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8157 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 8158 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8159 if (pos->lnum == lnum) |
| 5979 | 8160 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8161 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8162 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8163 /* if this match comes before the one at "found" then swap |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8164 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8165 if (pos->col < posmatch->pos[found].col) |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8166 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8167 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8168 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8169 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8170 posmatch->pos[found] = tmp; |
| 5979 | 8171 } |
| 8172 } | |
| 8173 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8174 found = i; |
| 5979 | 8175 } |
| 8176 } | |
| 8177 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8178 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8179 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8180 colnr_T start = posmatch->pos[found].col == 0 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8181 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8182 colnr_T end = posmatch->pos[found].col == 0 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8183 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8184 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8185 shl->lnum = lnum; |
| 5979 | 8186 shl->rm.startpos[0].lnum = 0; |
| 8187 shl->rm.startpos[0].col = start; | |
| 8188 shl->rm.endpos[0].lnum = 0; | |
| 8189 shl->rm.endpos[0].col = end; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
8190 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8191 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8192 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8193 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8194 return 0; |
| 5979 | 8195 } |
| 5985 | 8196 #endif |
| 5979 | 8197 |
| 7 | 8198 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8199 screen_start_highlight(int attr) |
| 7 | 8200 { |
| 8201 attrentry_T *aep = NULL; | |
| 8202 | |
| 8203 screen_attr = attr; | |
| 8204 if (full_screen | |
| 8205 #ifdef WIN3264 | |
| 8206 && termcap_active | |
| 8207 #endif | |
| 8208 ) | |
| 8209 { | |
| 8210 #ifdef FEAT_GUI | |
| 8211 if (gui.in_use) | |
| 8212 { | |
| 8213 char buf[20]; | |
| 8214 | |
| 681 | 8215 /* The GUI handles this internally. */ |
| 8216 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 8217 OUT_STR(buf); |
| 8218 } | |
| 8219 else | |
| 8220 #endif | |
| 8221 { | |
| 8222 if (attr > HL_ALL) /* special HL attr. */ | |
| 8223 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8224 if (IS_CTERM) |
| 7 | 8225 aep = syn_cterm_attr2entry(attr); |
| 8226 else | |
| 8227 aep = syn_term_attr2entry(attr); | |
| 8228 if (aep == NULL) /* did ":syntax clear" */ | |
| 8229 attr = 0; | |
| 8230 else | |
| 8231 attr = aep->ae_attr; | |
| 8232 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8233 if ((attr & HL_BOLD) && *T_MD != NUL) /* bold */ |
| 7 | 8234 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
|
8235 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
|
8236 #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
|
8237 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
|
8238 ? 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
|
8239 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8240 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8241 t_colors > 1 && aep->ae_u.cterm.fg_color)) |
| 681 | 8242 /* If the Normal FG color has BOLD attribute and the new HL |
| 8243 * has a FG color defined, clear BOLD. */ | |
| 8244 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
|
8245 if ((attr & HL_STANDOUT) && *T_SO != NUL) /* standout */ |
| 7 | 8246 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
|
8247 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
|
8248 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
|
8249 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
|
8250 || ((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
|
8251 && *T_US != NUL) |
| 7 | 8252 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
|
8253 if ((attr & HL_ITALIC) && *T_CZH != NUL) /* italic */ |
| 7 | 8254 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
|
8255 if ((attr & HL_INVERSE) && *T_MR != NUL) /* inverse (reverse) */ |
| 7 | 8256 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
|
8257 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
|
8258 out_str(T_STS); |
| 7 | 8259 |
| 8260 /* | |
| 8261 * Output the color or start string after bold etc., in case the | |
| 8262 * bold etc. override the color setting. | |
| 8263 */ | |
| 8264 if (aep != NULL) | |
| 8265 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8266 #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
|
8267 /* 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
|
8268 * 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
|
8269 * 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
|
8270 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
|
8271 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8272 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
|
8273 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
|
8274 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8275 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8276 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8277 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
|
8278 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8279 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
|
8280 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
|
8281 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8282 #ifdef FEAT_TERMGUICOLORS |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8283 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
|
8284 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8285 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
|
8286 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8287 } |
| 8288 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8289 #endif |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8290 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
|
8291 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8292 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
|
8293 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
|
8294 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8295 |
|
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
|
8296 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
|
8297 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8298 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
|
8299 out_str(aep->ae_u.term.start); |
| 7 | 8300 } |
| 8301 } | |
| 8302 } | |
| 8303 } | |
| 8304 } | |
| 8305 | |
| 8306 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8307 screen_stop_highlight(void) |
| 7 | 8308 { |
| 8309 int do_ME = FALSE; /* output T_ME code */ | |
| 8310 | |
| 8311 if (screen_attr != 0 | |
| 8312 #ifdef WIN3264 | |
| 8313 && termcap_active | |
| 8314 #endif | |
| 8315 ) | |
| 8316 { | |
| 8317 #ifdef FEAT_GUI | |
| 8318 if (gui.in_use) | |
| 8319 { | |
| 8320 char buf[20]; | |
| 8321 | |
| 8322 /* use internal GUI code */ | |
| 8323 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8324 OUT_STR(buf); | |
| 8325 } | |
| 8326 else | |
| 8327 #endif | |
| 8328 { | |
| 8329 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8330 { | |
| 8331 attrentry_T *aep; | |
| 8332 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8333 if (IS_CTERM) |
| 7 | 8334 { |
| 8335 /* | |
| 8336 * Assume that t_me restores the original colors! | |
| 8337 */ | |
| 8338 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
|
8339 if (aep != NULL && (( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8340 #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
|
8341 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
|
8342 ? 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
|
8343 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8344 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8345 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
|
8346 #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
|
8347 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
|
8348 ? 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
|
8349 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8350 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8351 aep->ae_u.cterm.bg_color))) |
| 7 | 8352 do_ME = TRUE; |
| 8353 } | |
| 8354 else | |
| 8355 { | |
| 8356 aep = syn_term_attr2entry(screen_attr); | |
| 8357 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8358 { | |
| 8359 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8360 do_ME = TRUE; | |
| 8361 else | |
| 8362 out_str(aep->ae_u.term.stop); | |
| 8363 } | |
| 8364 } | |
| 8365 if (aep == NULL) /* did ":syntax clear" */ | |
| 8366 screen_attr = 0; | |
| 8367 else | |
| 8368 screen_attr = aep->ae_attr; | |
| 8369 } | |
| 8370 | |
| 8371 /* | |
| 8372 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8373 * same sequence several times. | |
| 8374 */ | |
| 8375 if (screen_attr & HL_STANDOUT) | |
| 8376 { | |
| 8377 if (STRCMP(T_SE, T_ME) == 0) | |
| 8378 do_ME = TRUE; | |
| 8379 else | |
| 8380 out_str(T_SE); | |
| 8381 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8382 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
|
8383 { |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8384 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
|
8385 do_ME = TRUE; |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8386 else |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8387 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
|
8388 } |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8389 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
|
8390 || ((screen_attr & HL_UNDERCURL) && *T_UCE == NUL)) |
| 7 | 8391 { |
| 8392 if (STRCMP(T_UE, T_ME) == 0) | |
| 8393 do_ME = TRUE; | |
| 8394 else | |
| 8395 out_str(T_UE); | |
| 8396 } | |
| 8397 if (screen_attr & HL_ITALIC) | |
| 8398 { | |
| 8399 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8400 do_ME = TRUE; | |
| 8401 else | |
| 8402 out_str(T_CZR); | |
| 8403 } | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8404 if (screen_attr & HL_STRIKETHROUGH) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8405 { |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8406 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
|
8407 do_ME = TRUE; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8408 else |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8409 out_str(T_STE); |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8410 } |
| 7 | 8411 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) |
| 8412 out_str(T_ME); | |
| 8413 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8414 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8415 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8416 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8417 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
|
8418 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
|
8419 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
|
8420 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
|
8421 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8422 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8423 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8424 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8425 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8426 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8427 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8428 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8429 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
|
8430 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8431 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
|
8432 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8433 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8434 } |
| 7 | 8435 } |
| 8436 } | |
| 8437 } | |
| 8438 screen_attr = 0; | |
| 8439 } | |
| 8440 | |
| 8441 /* | |
| 8442 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8443 * The machine specific code may override this again. | |
| 8444 */ | |
| 8445 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8446 reset_cterm_colors(void) |
| 7 | 8447 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8448 if (IS_CTERM) |
| 7 | 8449 { |
| 8450 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8451 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8452 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
|
8453 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8454 : (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
|
8455 #else |
| 7 | 8456 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
|
8457 #endif |
| 7 | 8458 { |
| 8459 out_str(T_OP); | |
| 8460 screen_attr = -1; | |
| 8461 } | |
| 8462 if (cterm_normal_fg_bold) | |
| 8463 { | |
| 8464 out_str(T_ME); | |
| 8465 screen_attr = -1; | |
| 8466 } | |
| 8467 } | |
| 8468 } | |
| 8469 | |
| 8470 /* | |
| 8471 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8472 * using the attributes from ScreenAttrs["off"]. | |
| 8473 */ | |
| 8474 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8475 screen_char(unsigned off, int row, int col) |
| 7 | 8476 { |
| 8477 int attr; | |
| 8478 | |
| 8479 /* Check for illegal values, just in case (could happen just after | |
| 8480 * resizing). */ | |
| 8481 if (row >= screen_Rows || col >= screen_Columns) | |
| 8482 return; | |
| 8483 | |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8484 #ifdef FEAT_INS_EXPAND |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8485 if (pum_under_menu(row, col)) |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8486 return; |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8487 #endif |
| 6602 | 8488 /* Outputting a character in the last cell on the screen may scroll the |
| 8489 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8490 * mark the character invalid (update it when scrolled up). */ | |
| 8491 if (*T_XN == NUL | |
| 8492 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8493 #ifdef FEAT_RIGHTLEFT |
| 8494 /* account for first command-line character in rightleft mode */ | |
| 8495 && !cmdmsg_rl | |
| 8496 #endif | |
| 8497 ) | |
| 8498 { | |
| 8499 ScreenAttrs[off] = (sattr_T)-1; | |
| 8500 return; | |
| 8501 } | |
| 8502 | |
| 8503 /* | |
| 8504 * Stop highlighting first, so it's easier to move the cursor. | |
| 8505 */ | |
| 8506 if (screen_char_attr != 0) | |
| 8507 attr = screen_char_attr; | |
| 8508 else | |
| 8509 attr = ScreenAttrs[off]; | |
| 8510 if (screen_attr != attr) | |
| 8511 screen_stop_highlight(); | |
| 8512 | |
| 8513 windgoto(row, col); | |
| 8514 | |
| 8515 if (screen_attr != attr) | |
| 8516 screen_start_highlight(attr); | |
| 8517 | |
| 8518 #ifdef FEAT_MBYTE | |
| 8519 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8520 { | |
| 8521 char_u buf[MB_MAXBYTES + 1]; | |
| 8522 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8523 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
|
8524 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8525 if (*p_ambw == 'd' |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8526 # ifdef FEAT_GUI |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8527 && !gui.in_use |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8528 # endif |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8529 ) |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8530 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8531 /* 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
|
8532 * 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
|
8533 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
|
8534 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
|
8535 } |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8536 /* 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
|
8537 * character */ |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8538 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
|
8539 } |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8540 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8541 ++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
|
8542 |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8543 /* 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
|
8544 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
|
8545 out_str(buf); |
| 7 | 8546 } |
| 8547 else | |
| 8548 #endif | |
| 8549 { | |
| 8550 #ifdef FEAT_MBYTE | |
| 8551 out_flush_check(); | |
| 8552 #endif | |
| 8553 out_char(ScreenLines[off]); | |
| 8554 #ifdef FEAT_MBYTE | |
| 8555 /* double-byte character in single-width cell */ | |
| 8556 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8557 out_char(ScreenLines2[off]); | |
| 8558 #endif | |
| 8559 } | |
| 8560 | |
| 8561 screen_cur_col++; | |
| 8562 } | |
| 8563 | |
| 8564 #ifdef FEAT_MBYTE | |
| 8565 | |
| 8566 /* | |
| 8567 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8568 * on the screen at position 'row' and 'col'. | |
| 8569 * The attributes of the first byte is used for all. This is required to | |
| 8570 * output the two bytes of a double-byte character with nothing in between. | |
| 8571 */ | |
| 8572 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8573 screen_char_2(unsigned off, int row, int col) |
| 7 | 8574 { |
| 8575 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8576 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8577 return; | |
| 8578 | |
| 8579 /* Outputting the last character on the screen may scrollup the screen. | |
| 8580 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8581 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8582 { | |
| 8583 ScreenAttrs[off] = (sattr_T)-1; | |
| 8584 return; | |
| 8585 } | |
| 8586 | |
| 8587 /* Output the first byte normally (positions the cursor), then write the | |
| 8588 * second byte directly. */ | |
| 8589 screen_char(off, row, col); | |
| 8590 out_char(ScreenLines[off + 1]); | |
| 8591 ++screen_cur_col; | |
| 8592 } | |
| 8593 #endif | |
| 8594 | |
| 8595 /* | |
| 8596 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8597 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8598 */ | |
| 8599 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8600 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8601 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8602 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8603 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8604 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8605 int invert) |
| 7 | 8606 { |
| 8607 int r, c; | |
| 8608 int off; | |
| 1378 | 8609 #ifdef FEAT_MBYTE |
| 8610 int max_off; | |
| 8611 #endif | |
| 7 | 8612 |
| 534 | 8613 /* Can't use ScreenLines unless initialized */ |
| 8614 if (ScreenLines == NULL) | |
| 8615 return; | |
| 8616 | |
| 7 | 8617 if (invert) |
| 8618 screen_char_attr = HL_INVERSE; | |
| 8619 for (r = row; r < row + height; ++r) | |
| 8620 { | |
| 8621 off = LineOffset[r]; | |
| 1378 | 8622 #ifdef FEAT_MBYTE |
| 8623 max_off = off + screen_Columns; | |
| 8624 #endif | |
| 7 | 8625 for (c = col; c < col + width; ++c) |
| 8626 { | |
| 8627 #ifdef FEAT_MBYTE | |
| 1378 | 8628 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8629 { |
| 8630 screen_char_2(off + c, r, c); | |
| 8631 ++c; | |
| 8632 } | |
| 8633 else | |
| 8634 #endif | |
| 8635 { | |
| 8636 screen_char(off + c, r, c); | |
| 8637 #ifdef FEAT_MBYTE | |
| 1378 | 8638 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8639 ++c; |
| 8640 #endif | |
| 8641 } | |
| 8642 } | |
| 8643 } | |
| 8644 screen_char_attr = 0; | |
| 8645 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
8646 |
| 7 | 8647 /* |
| 8648 * Redraw the characters for a vertically split window. | |
| 8649 */ | |
| 8650 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8651 redraw_block(int row, int end, win_T *wp) |
| 7 | 8652 { |
| 8653 int col; | |
| 8654 int width; | |
| 8655 | |
| 8656 # ifdef FEAT_CLIPBOARD | |
| 8657 clip_may_clear_selection(row, end - 1); | |
| 8658 # endif | |
| 8659 | |
| 8660 if (wp == NULL) | |
| 8661 { | |
| 8662 col = 0; | |
| 8663 width = Columns; | |
| 8664 } | |
| 8665 else | |
| 8666 { | |
| 8667 col = wp->w_wincol; | |
| 8668 width = wp->w_width; | |
| 8669 } | |
| 8670 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8671 } | |
| 8672 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8673 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8674 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
|
8675 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8676 ScreenLines[off] = ' '; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8677 ScreenAttrs[off] = attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8678 # ifdef FEAT_MBYTE |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8679 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8680 ScreenLinesUC[off] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8681 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8682 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8683 |
| 7 | 8684 /* |
| 8685 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8686 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8687 * Use attributes 'attr'. | |
| 8688 */ | |
| 8689 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8690 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8691 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8692 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8693 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8694 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8695 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8696 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8697 int attr) |
| 7 | 8698 { |
| 8699 int row; | |
| 8700 int col; | |
| 8701 int off; | |
| 8702 int end_off; | |
| 8703 int did_delete; | |
| 8704 int c; | |
| 8705 int norm_term; | |
| 8706 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8707 int force_next = FALSE; | |
| 8708 #endif | |
| 8709 | |
| 8710 if (end_row > screen_Rows) /* safety check */ | |
| 8711 end_row = screen_Rows; | |
| 8712 if (end_col > screen_Columns) /* safety check */ | |
| 8713 end_col = screen_Columns; | |
| 8714 if (ScreenLines == NULL | |
| 8715 || start_row >= end_row | |
| 8716 || start_col >= end_col) /* nothing to do */ | |
| 8717 return; | |
| 8718 | |
| 8719 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8720 norm_term = ( | |
| 8721 #ifdef FEAT_GUI | |
| 8722 !gui.in_use && | |
| 8723 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8724 !IS_CTERM); |
| 7 | 8725 for (row = start_row; row < end_row; ++row) |
| 8726 { | |
| 1668 | 8727 #ifdef FEAT_MBYTE |
| 8728 if (has_mbyte | |
| 8729 # ifdef FEAT_GUI | |
| 8730 && !gui.in_use | |
| 8731 # endif | |
| 8732 ) | |
| 8733 { | |
| 8734 /* When drawing over the right halve of a double-wide char clear | |
| 8735 * out the left halve. When drawing over the left halve of a | |
| 8736 * double wide-char clear out the right halve. Only needed in a | |
| 8737 * terminal. */ | |
| 1685 | 8738 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8739 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8740 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8741 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8742 } |
| 8743 #endif | |
| 7 | 8744 /* |
| 8745 * Try to use delete-line termcap code, when no attributes or in a | |
| 8746 * "normal" terminal, where a bold/italic space is just a | |
| 8747 * space. | |
| 8748 */ | |
| 8749 did_delete = FALSE; | |
| 8750 if (c2 == ' ' | |
| 8751 && end_col == Columns | |
| 8752 && can_clear(T_CE) | |
| 8753 && (attr == 0 | |
| 8754 || (norm_term | |
| 8755 && attr <= HL_ALL | |
| 8756 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8757 { | |
| 8758 /* | |
| 8759 * check if we really need to clear something | |
| 8760 */ | |
| 8761 col = start_col; | |
| 8762 if (c1 != ' ') /* don't clear first char */ | |
| 8763 ++col; | |
| 8764 | |
| 8765 off = LineOffset[row] + col; | |
| 8766 end_off = LineOffset[row] + end_col; | |
| 8767 | |
| 8768 /* skip blanks (used often, keep it fast!) */ | |
| 8769 #ifdef FEAT_MBYTE | |
| 8770 if (enc_utf8) | |
| 8771 while (off < end_off && ScreenLines[off] == ' ' | |
| 8772 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8773 ++off; | |
| 8774 else | |
| 8775 #endif | |
| 8776 while (off < end_off && ScreenLines[off] == ' ' | |
| 8777 && ScreenAttrs[off] == 0) | |
| 8778 ++off; | |
| 8779 if (off < end_off) /* something to be cleared */ | |
| 8780 { | |
| 8781 col = off - LineOffset[row]; | |
| 8782 screen_stop_highlight(); | |
| 8783 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8784 out_str(T_CE); | |
| 8785 screen_start(); /* don't know where cursor is now */ | |
| 8786 col = end_col - col; | |
| 8787 while (col--) /* clear chars in ScreenLines */ | |
| 8788 { | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8789 space_to_screenline(off, 0); |
| 7 | 8790 ++off; |
| 8791 } | |
| 8792 } | |
| 8793 did_delete = TRUE; /* the chars are cleared now */ | |
| 8794 } | |
| 8795 | |
| 8796 off = LineOffset[row] + start_col; | |
| 8797 c = c1; | |
| 8798 for (col = start_col; col < end_col; ++col) | |
| 8799 { | |
| 8800 if (ScreenLines[off] != c | |
| 8801 #ifdef FEAT_MBYTE | |
| 714 | 8802 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8803 != (c >= 0x80 ? c : 0)) | |
| 7 | 8804 #endif |
| 8805 || ScreenAttrs[off] != attr | |
| 8806 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8807 || force_next | |
| 8808 #endif | |
| 8809 ) | |
| 8810 { | |
| 8811 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8812 /* The bold trick may make a single row of pixels appear in | |
| 8813 * the next character. When a bold character is removed, the | |
| 8814 * next character should be redrawn too. This happens for our | |
| 8815 * own GUI and for some xterms. */ | |
| 8816 if ( | |
| 8817 # ifdef FEAT_GUI | |
| 8818 gui.in_use | |
| 8819 # endif | |
| 8820 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8821 || | |
| 8822 # endif | |
| 8823 # ifdef UNIX | |
| 8824 term_is_xterm | |
| 8825 # endif | |
| 8826 ) | |
| 8827 { | |
| 8828 if (ScreenLines[off] != ' ' | |
| 8829 && (ScreenAttrs[off] > HL_ALL | |
| 8830 || ScreenAttrs[off] & HL_BOLD)) | |
| 8831 force_next = TRUE; | |
| 8832 else | |
| 8833 force_next = FALSE; | |
| 8834 } | |
| 8835 #endif | |
| 8836 ScreenLines[off] = c; | |
| 8837 #ifdef FEAT_MBYTE | |
| 8838 if (enc_utf8) | |
| 8839 { | |
| 8840 if (c >= 0x80) | |
| 8841 { | |
| 8842 ScreenLinesUC[off] = c; | |
| 714 | 8843 ScreenLinesC[0][off] = 0; |
| 7 | 8844 } |
| 8845 else | |
| 8846 ScreenLinesUC[off] = 0; | |
| 8847 } | |
| 8848 #endif | |
| 8849 ScreenAttrs[off] = attr; | |
| 8850 if (!did_delete || c != ' ') | |
| 8851 screen_char(off, row, col); | |
| 8852 } | |
| 8853 ++off; | |
| 8854 if (col == start_col) | |
| 8855 { | |
| 8856 if (did_delete) | |
| 8857 break; | |
| 8858 c = c2; | |
| 8859 } | |
| 8860 } | |
| 8861 if (end_col == Columns) | |
| 8862 LineWraps[row] = FALSE; | |
| 8863 if (row == Rows - 1) /* overwritten the command line */ | |
| 8864 { | |
| 8865 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
|
8866 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
|
8867 && c1 == ' ' && c2 == ' ' && attr == 0) |
| 7 | 8868 clear_cmdline = FALSE; /* command line has been cleared */ |
| 644 | 8869 if (start_col == 0) |
| 8870 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8871 } |
| 8872 } | |
| 8873 } | |
| 8874 | |
| 8875 /* | |
| 8876 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8877 * screen or the command line. | |
| 8878 */ | |
| 8879 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8880 check_for_delay(int check_msg_scroll) |
| 7 | 8881 { |
| 8882 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8883 && !did_wait_return | |
| 8884 && emsg_silent == 0) | |
| 8885 { | |
| 8886 out_flush(); | |
| 8887 ui_delay(1000L, TRUE); | |
| 8888 emsg_on_display = FALSE; | |
| 8889 if (check_msg_scroll) | |
| 8890 msg_scroll = FALSE; | |
| 8891 } | |
| 8892 } | |
| 8893 | |
| 8894 /* | |
| 8895 * screen_valid - allocate screen buffers if size changed | |
| 3263 | 8896 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8897 * Returns TRUE if there is a valid screen to write to. |
| 8898 * Returns FALSE when starting up and screen not initialized yet. | |
| 8899 */ | |
| 8900 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8901 screen_valid(int doclear) |
| 7 | 8902 { |
| 3263 | 8903 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8904 return (ScreenLines != NULL); |
| 8905 } | |
| 8906 | |
| 8907 /* | |
| 8908 * Resize the shell to Rows and Columns. | |
| 8909 * Allocate ScreenLines[] and associated items. | |
| 8910 * | |
| 8911 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8912 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8913 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8914 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8915 * final size of the shell is needed. | |
| 8916 */ | |
| 8917 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8918 screenalloc(int doclear) |
| 7 | 8919 { |
| 8920 int new_row, old_row; | |
| 8921 #ifdef FEAT_GUI | |
| 8922 int old_Rows; | |
| 8923 #endif | |
| 8924 win_T *wp; | |
| 8925 int outofmem = FALSE; | |
| 8926 int len; | |
| 8927 schar_T *new_ScreenLines; | |
| 8928 #ifdef FEAT_MBYTE | |
| 8929 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8930 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8931 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8932 int i; |
| 7 | 8933 #endif |
| 8934 sattr_T *new_ScreenAttrs; | |
| 8935 unsigned *new_LineOffset; | |
| 8936 char_u *new_LineWraps; | |
| 681 | 8937 short *new_TabPageIdxs; |
| 671 | 8938 tabpage_T *tp; |
| 7 | 8939 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8940 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8941 int retry_count = 0; |
| 8942 | |
| 8943 retry: | |
| 7 | 8944 /* |
| 8945 * Allocation of the screen buffers is done only when the size changes and | |
| 8946 * when Rows and Columns have been set and we have started doing full | |
| 8947 * screen stuff. | |
| 8948 */ | |
| 8949 if ((ScreenLines != NULL | |
| 8950 && Rows == screen_Rows | |
| 8951 && Columns == screen_Columns | |
| 8952 #ifdef FEAT_MBYTE | |
| 8953 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8954 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
| 714 | 8955 && p_mco == Screen_mco |
| 7 | 8956 #endif |
| 8957 ) | |
| 8958 || Rows == 0 | |
| 8959 || Columns == 0 | |
| 8960 || (!full_screen && ScreenLines == NULL)) | |
| 8961 return; | |
| 8962 | |
| 8963 /* | |
| 8964 * It's possible that we produce an out-of-memory message below, which | |
| 8965 * will cause this function to be called again. To break the loop, just | |
| 8966 * return here. | |
| 8967 */ | |
| 8968 if (entered) | |
| 8969 return; | |
| 8970 entered = TRUE; | |
| 8971 | |
| 911 | 8972 /* |
| 8973 * Note that the window sizes are updated before reallocating the arrays, | |
| 8974 * thus we must not redraw here! | |
| 8975 */ | |
| 8976 ++RedrawingDisabled; | |
| 8977 | |
| 7 | 8978 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8979 | |
| 8980 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8981 | |
| 8982 /* | |
| 8983 * We're changing the size of the screen. | |
| 8984 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8985 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8986 * lines (unless the screen is going to be cleared). | |
| 8987 * - Free the old arrays. | |
| 8988 * | |
| 8989 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8990 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8991 * size is wrong. | |
| 8992 */ | |
| 671 | 8993 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8994 win_free_lsize(wp); |
| 1946 | 8995 if (aucmd_win != NULL) |
| 8996 win_free_lsize(aucmd_win); | |
| 7 | 8997 |
| 8998 new_ScreenLines = (schar_T *)lalloc((long_u)( | |
| 8999 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 9000 #ifdef FEAT_MBYTE | |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
9001 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 9002 if (enc_utf8) |
| 9003 { | |
| 9004 new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( | |
| 9005 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); | |
| 714 | 9006 for (i = 0; i < p_mco; ++i) |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
9007 new_ScreenLinesC[i] = (u8char_T *)lalloc_clear((long_u)( |
| 7 | 9008 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); |
| 9009 } | |
| 9010 if (enc_dbcs == DBCS_JPNU) | |
| 9011 new_ScreenLines2 = (schar_T *)lalloc((long_u)( | |
| 9012 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 9013 #endif | |
| 9014 new_ScreenAttrs = (sattr_T *)lalloc((long_u)( | |
| 9015 (Rows + 1) * Columns * sizeof(sattr_T)), FALSE); | |
| 9016 new_LineOffset = (unsigned *)lalloc((long_u)( | |
| 9017 Rows * sizeof(unsigned)), FALSE); | |
| 9018 new_LineWraps = (char_u *)lalloc((long_u)(Rows * sizeof(char_u)), FALSE); | |
| 681 | 9019 new_TabPageIdxs = (short *)lalloc((long_u)(Columns * sizeof(short)), FALSE); |
| 7 | 9020 |
| 677 | 9021 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 9022 { |
| 9023 if (win_alloc_lines(wp) == FAIL) | |
| 9024 { | |
| 9025 outofmem = TRUE; | |
| 1819 | 9026 goto give_up; |
| 9027 } | |
| 9028 } | |
| 1946 | 9029 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 9030 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 9031 outofmem = TRUE; |
| 1819 | 9032 give_up: |
| 7 | 9033 |
| 714 | 9034 #ifdef FEAT_MBYTE |
| 9035 for (i = 0; i < p_mco; ++i) | |
| 9036 if (new_ScreenLinesC[i] == NULL) | |
| 9037 break; | |
| 9038 #endif | |
| 7 | 9039 if (new_ScreenLines == NULL |
| 9040 #ifdef FEAT_MBYTE | |
| 714 | 9041 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 9042 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 9043 #endif | |
| 9044 || new_ScreenAttrs == NULL | |
| 9045 || new_LineOffset == NULL | |
| 9046 || new_LineWraps == NULL | |
| 671 | 9047 || new_TabPageIdxs == NULL |
| 7 | 9048 || outofmem) |
| 9049 { | |
| 944 | 9050 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 9051 { |
| 9052 /* guess the size */ | |
| 9053 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 9054 | |
| 9055 /* Remember we did this to avoid getting outofmem messages over | |
| 9056 * and over again. */ | |
| 944 | 9057 done_outofmem_msg = TRUE; |
| 534 | 9058 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9059 VIM_CLEAR(new_ScreenLines); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9060 #ifdef FEAT_MBYTE |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9061 VIM_CLEAR(new_ScreenLinesUC); |
| 714 | 9062 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
|
9063 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
|
9064 VIM_CLEAR(new_ScreenLines2); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9065 #endif |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9066 VIM_CLEAR(new_ScreenAttrs); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9067 VIM_CLEAR(new_LineOffset); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9068 VIM_CLEAR(new_LineWraps); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9069 VIM_CLEAR(new_TabPageIdxs); |
| 7 | 9070 } |
| 9071 else | |
| 9072 { | |
| 944 | 9073 done_outofmem_msg = FALSE; |
| 534 | 9074 |
| 7 | 9075 for (new_row = 0; new_row < Rows; ++new_row) |
| 9076 { | |
| 9077 new_LineOffset[new_row] = new_row * Columns; | |
| 9078 new_LineWraps[new_row] = FALSE; | |
| 9079 | |
| 9080 /* | |
| 9081 * If the screen is not going to be cleared, copy as much as | |
| 9082 * possible from the old screen to the new one and clear the rest | |
| 9083 * (used when resizing the window at the "--more--" prompt or when | |
| 9084 * executing an external command, for the GUI). | |
| 9085 */ | |
| 3263 | 9086 if (!doclear) |
| 7 | 9087 { |
| 9088 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 9089 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 9090 #ifdef FEAT_MBYTE | |
| 9091 if (enc_utf8) | |
| 9092 { | |
| 9093 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 9094 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 9095 for (i = 0; i < p_mco; ++i) |
| 9096 (void)vim_memset(new_ScreenLinesC[i] | |
| 9097 + new_row * Columns, | |
| 7 | 9098 0, (size_t)Columns * sizeof(u8char_T)); |
| 9099 } | |
| 9100 if (enc_dbcs == DBCS_JPNU) | |
| 9101 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 9102 0, (size_t)Columns * sizeof(schar_T)); | |
| 9103 #endif | |
| 9104 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 9105 0, (size_t)Columns * sizeof(sattr_T)); | |
| 9106 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 9107 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 9108 { |
| 9109 if (screen_Columns < Columns) | |
| 9110 len = screen_Columns; | |
| 9111 else | |
| 9112 len = Columns; | |
| 26 | 9113 #ifdef FEAT_MBYTE |
| 571 | 9114 /* When switching to utf-8 don't copy characters, they |
| 714 | 9115 * may be invalid now. Also when p_mco changes. */ |
| 9116 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 9117 && p_mco == Screen_mco) | |
| 26 | 9118 #endif |
| 9119 mch_memmove(new_ScreenLines + new_LineOffset[new_row], | |
| 9120 ScreenLines + LineOffset[old_row], | |
| 9121 (size_t)len * sizeof(schar_T)); | |
| 7 | 9122 #ifdef FEAT_MBYTE |
| 714 | 9123 if (enc_utf8 && ScreenLinesUC != NULL |
| 9124 && p_mco == Screen_mco) | |
| 7 | 9125 { |
| 9126 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 9127 ScreenLinesUC + LineOffset[old_row], | |
| 9128 (size_t)len * sizeof(u8char_T)); | |
| 714 | 9129 for (i = 0; i < p_mco; ++i) |
| 9130 mch_memmove(new_ScreenLinesC[i] | |
| 9131 + new_LineOffset[new_row], | |
| 9132 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 9133 (size_t)len * sizeof(u8char_T)); |
| 9134 } | |
| 9135 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 9136 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 9137 ScreenLines2 + LineOffset[old_row], | |
| 9138 (size_t)len * sizeof(schar_T)); | |
| 9139 #endif | |
| 9140 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 9141 ScreenAttrs + LineOffset[old_row], | |
| 9142 (size_t)len * sizeof(sattr_T)); | |
| 9143 } | |
| 9144 } | |
| 9145 } | |
| 9146 /* Use the last line of the screen for the current line. */ | |
| 9147 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 9148 } | |
| 9149 | |
| 356 | 9150 free_screenlines(); |
| 9151 | |
| 7 | 9152 ScreenLines = new_ScreenLines; |
| 9153 #ifdef FEAT_MBYTE | |
| 9154 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 9155 for (i = 0; i < p_mco; ++i) |
| 9156 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 9157 Screen_mco = p_mco; | |
| 7 | 9158 ScreenLines2 = new_ScreenLines2; |
| 9159 #endif | |
| 9160 ScreenAttrs = new_ScreenAttrs; | |
| 9161 LineOffset = new_LineOffset; | |
| 9162 LineWraps = new_LineWraps; | |
| 671 | 9163 TabPageIdxs = new_TabPageIdxs; |
| 7 | 9164 |
| 9165 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 9166 * size of ScreenLines[]. Set them before calling anything. */ | |
| 9167 #ifdef FEAT_GUI | |
| 9168 old_Rows = screen_Rows; | |
| 9169 #endif | |
| 9170 screen_Rows = Rows; | |
| 9171 screen_Columns = Columns; | |
| 9172 | |
| 9173 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 9174 if (doclear) |
| 7 | 9175 screenclear2(); |
| 9176 | |
| 9177 #ifdef FEAT_GUI | |
| 9178 else if (gui.in_use | |
| 9179 && !gui.starting | |
| 9180 && ScreenLines != NULL | |
| 9181 && old_Rows != Rows) | |
| 9182 { | |
| 9183 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 9184 /* | |
| 9185 * Adjust the position of the cursor, for when executing an external | |
| 9186 * command. | |
| 9187 */ | |
| 9188 if (msg_row >= Rows) /* Rows got smaller */ | |
| 9189 msg_row = Rows - 1; /* put cursor at last row */ | |
| 9190 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 9191 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 9192 if (msg_col >= Columns) /* Columns got smaller */ | |
| 9193 msg_col = Columns - 1; /* put cursor at last column */ | |
| 9194 } | |
| 9195 #endif | |
| 9196 | |
| 9197 entered = FALSE; | |
| 911 | 9198 --RedrawingDisabled; |
| 766 | 9199 |
| 1824 | 9200 /* |
| 9201 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 9202 * in case applying autocommands always changes Rows or Columns. | |
| 9203 */ | |
| 9204 if (starting == 0 && ++retry_count <= 3) | |
| 9205 { | |
| 766 | 9206 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 9207 /* In rare cases, autocommands may have altered Rows or Columns, |
| 9208 * jump back to check if we need to allocate the screen again. */ | |
| 9209 goto retry; | |
| 9210 } | |
| 7 | 9211 } |
| 9212 | |
| 9213 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9214 free_screenlines(void) |
| 356 | 9215 { |
| 9216 #ifdef FEAT_MBYTE | |
| 714 | 9217 int i; |
| 9218 | |
| 356 | 9219 vim_free(ScreenLinesUC); |
| 714 | 9220 for (i = 0; i < Screen_mco; ++i) |
| 9221 vim_free(ScreenLinesC[i]); | |
| 356 | 9222 vim_free(ScreenLines2); |
| 9223 #endif | |
| 714 | 9224 vim_free(ScreenLines); |
| 356 | 9225 vim_free(ScreenAttrs); |
| 9226 vim_free(LineOffset); | |
| 9227 vim_free(LineWraps); | |
| 671 | 9228 vim_free(TabPageIdxs); |
| 356 | 9229 } |
| 9230 | |
| 9231 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9232 screenclear(void) |
| 7 | 9233 { |
| 9234 check_for_delay(FALSE); | |
| 9235 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 9236 screenclear2(); /* clear the screen */ | |
| 9237 } | |
| 9238 | |
| 9239 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9240 screenclear2(void) |
| 7 | 9241 { |
| 9242 int i; | |
| 9243 | |
| 9244 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 9245 #ifdef FEAT_GUI | |
| 9246 || (gui.in_use && gui.starting) | |
| 9247 #endif | |
| 9248 ) | |
| 9249 return; | |
| 9250 | |
| 9251 #ifdef FEAT_GUI | |
| 9252 if (!gui.in_use) | |
| 9253 #endif | |
| 9254 screen_attr = -1; /* force setting the Normal colors */ | |
| 9255 screen_stop_highlight(); /* don't want highlighting here */ | |
| 9256 | |
| 9257 #ifdef FEAT_CLIPBOARD | |
| 9258 /* disable selection without redrawing it */ | |
| 9259 clip_scroll_selection(9999); | |
| 9260 #endif | |
| 9261 | |
| 9262 /* blank out ScreenLines */ | |
| 9263 for (i = 0; i < Rows; ++i) | |
| 9264 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9265 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 9266 LineWraps[i] = FALSE; |
| 9267 } | |
| 9268 | |
| 9269 if (can_clear(T_CL)) | |
| 9270 { | |
| 9271 out_str(T_CL); /* clear the display */ | |
| 9272 clear_cmdline = FALSE; | |
| 644 | 9273 mode_displayed = FALSE; |
| 7 | 9274 } |
| 9275 else | |
| 9276 { | |
| 9277 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9278 for (i = 0; i < Rows; ++i) | |
| 9279 lineinvalid(LineOffset[i], (int)Columns); | |
| 9280 clear_cmdline = TRUE; | |
| 9281 } | |
| 9282 | |
| 9283 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9284 | |
| 9285 win_rest_invalid(firstwin); | |
| 9286 redraw_cmdline = TRUE; | |
| 673 | 9287 redraw_tabline = TRUE; |
| 7 | 9288 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9289 must_redraw = NOT_VALID; | |
| 9290 compute_cmdrow(); | |
| 9291 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9292 msg_col = 0; | |
| 9293 screen_start(); /* don't know where cursor is now */ | |
| 9294 msg_scrolled = 0; /* can't scroll back */ | |
| 9295 msg_didany = FALSE; | |
| 9296 msg_didout = FALSE; | |
| 9297 } | |
| 9298 | |
| 9299 /* | |
| 9300 * Clear one line in ScreenLines. | |
| 9301 */ | |
| 9302 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9303 lineclear(unsigned off, int width, int attr) |
| 7 | 9304 { |
| 9305 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9306 #ifdef FEAT_MBYTE | |
| 9307 if (enc_utf8) | |
| 9308 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9309 (size_t)width * sizeof(u8char_T)); | |
| 9310 #endif | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9311 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 9312 } |
| 9313 | |
| 9314 /* | |
| 9315 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9316 * invalid value. | |
| 9317 */ | |
| 9318 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9319 lineinvalid(unsigned off, int width) |
| 7 | 9320 { |
| 9321 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9322 } | |
| 9323 | |
| 9324 /* | |
| 9325 * Copy part of a Screenline for vertically split window "wp". | |
| 9326 */ | |
| 9327 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9328 linecopy(int to, int from, win_T *wp) |
| 7 | 9329 { |
| 9330 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9331 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9332 | |
| 9333 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9334 wp->w_width * sizeof(schar_T)); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9335 #ifdef FEAT_MBYTE |
| 7 | 9336 if (enc_utf8) |
| 9337 { | |
| 714 | 9338 int i; |
| 9339 | |
| 7 | 9340 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9341 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9342 for (i = 0; i < p_mco; ++i) |
| 9343 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9344 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9345 } |
| 9346 if (enc_dbcs == DBCS_JPNU) | |
| 9347 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9348 wp->w_width * sizeof(schar_T)); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9349 #endif |
| 7 | 9350 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, |
| 9351 wp->w_width * sizeof(sattr_T)); | |
| 9352 } | |
| 9353 | |
| 9354 /* | |
| 9355 * Return TRUE if clearing with term string "p" would work. | |
| 9356 * It can't work when the string is empty or it won't set the right background. | |
| 9357 */ | |
| 9358 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9359 can_clear(char_u *p) |
| 7 | 9360 { |
| 9361 return (*p != NUL && (t_colors <= 1 | |
| 9362 #ifdef FEAT_GUI | |
| 9363 || gui.in_use | |
| 9364 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9365 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9366 || (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
|
9367 || (!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
|
9368 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9369 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9370 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9371 || *T_UT != NUL)); |
| 7 | 9372 } |
| 9373 | |
| 9374 /* | |
| 9375 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9376 * something directly to the screen (shell commands) or a terminal control | |
| 9377 * code. | |
| 9378 */ | |
| 9379 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9380 screen_start(void) |
| 7 | 9381 { |
| 9382 screen_cur_row = screen_cur_col = 9999; | |
| 9383 } | |
| 9384 | |
| 9385 /* | |
| 9386 * Move the cursor to position "row","col" in the screen. | |
| 9387 * This tries to find the most efficient way to move, minimizing the number of | |
| 9388 * characters sent to the terminal. | |
| 9389 */ | |
| 9390 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9391 windgoto(int row, int col) |
| 7 | 9392 { |
| 205 | 9393 sattr_T *p; |
| 7 | 9394 int i; |
| 9395 int plan; | |
| 9396 int cost; | |
| 9397 int wouldbe_col; | |
| 9398 int noinvcurs; | |
| 9399 char_u *bs; | |
| 9400 int goto_cost; | |
| 9401 int attr; | |
| 9402 | |
| 1213 | 9403 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9404 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9405 | |
| 9406 #define PLAN_LE 1 | |
| 9407 #define PLAN_CR 2 | |
| 9408 #define PLAN_NL 3 | |
| 9409 #define PLAN_WRITE 4 | |
| 9410 /* Can't use ScreenLines unless initialized */ | |
| 9411 if (ScreenLines == NULL) | |
| 9412 return; | |
| 9413 | |
| 9414 if (col != screen_cur_col || row != screen_cur_row) | |
| 9415 { | |
| 9416 /* Check for valid position. */ | |
| 9417 if (row < 0) /* window without text lines? */ | |
| 9418 row = 0; | |
| 9419 if (row >= screen_Rows) | |
| 9420 row = screen_Rows - 1; | |
| 9421 if (col >= screen_Columns) | |
| 9422 col = screen_Columns - 1; | |
| 9423 | |
| 9424 /* check if no cursor movement is allowed in highlight mode */ | |
| 9425 if (screen_attr && *T_MS == NUL) | |
| 9426 noinvcurs = HIGHL_COST; | |
| 9427 else | |
| 9428 noinvcurs = 0; | |
| 9429 goto_cost = GOTO_COST + noinvcurs; | |
| 9430 | |
| 9431 /* | |
| 9432 * Plan how to do the positioning: | |
| 9433 * 1. Use CR to move it to column 0, same row. | |
| 9434 * 2. Use T_LE to move it a few columns to the left. | |
| 9435 * 3. Use NL to move a few lines down, column 0. | |
| 9436 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9437 * | |
| 9438 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9439 * position is unknown then (some terminals wrap, some don't ) | |
| 9440 * | |
| 1213 | 9441 * First check if the highlighting attributes allow us to write |
| 7 | 9442 * characters to move the cursor to the right. |
| 9443 */ | |
| 9444 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9445 { | |
| 9446 /* | |
| 9447 * If the cursor is in the same row, bigger col, we can use CR | |
| 9448 * or T_LE. | |
| 9449 */ | |
| 9450 bs = NULL; /* init for GCC */ | |
| 9451 attr = screen_attr; | |
| 9452 if (row == screen_cur_row && col < screen_cur_col) | |
| 9453 { | |
| 9454 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9455 if (*T_LE) | |
| 9456 bs = T_LE; /* "cursor left" */ | |
| 9457 else | |
| 9458 bs = T_BC; /* "backspace character (old) */ | |
| 9459 if (*bs) | |
| 9460 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9461 else | |
| 9462 cost = 999; | |
| 9463 if (col + 1 < cost) /* using CR is less characters */ | |
| 9464 { | |
| 9465 plan = PLAN_CR; | |
| 9466 wouldbe_col = 0; | |
| 9467 cost = 1; /* CR is just one character */ | |
| 9468 } | |
| 9469 else | |
| 9470 { | |
| 9471 plan = PLAN_LE; | |
| 9472 wouldbe_col = col; | |
| 9473 } | |
| 9474 if (noinvcurs) /* will stop highlighting */ | |
| 9475 { | |
| 9476 cost += noinvcurs; | |
| 9477 attr = 0; | |
| 9478 } | |
| 9479 } | |
| 9480 | |
| 9481 /* | |
| 9482 * If the cursor is above where we want to be, we can use CR LF. | |
| 9483 */ | |
| 9484 else if (row > screen_cur_row) | |
| 9485 { | |
| 9486 plan = PLAN_NL; | |
| 9487 wouldbe_col = 0; | |
| 9488 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9489 if (noinvcurs) /* will stop highlighting */ | |
| 9490 { | |
| 9491 cost += noinvcurs; | |
| 9492 attr = 0; | |
| 9493 } | |
| 9494 } | |
| 9495 | |
| 9496 /* | |
| 9497 * If the cursor is in the same row, smaller col, just use write. | |
| 9498 */ | |
| 9499 else | |
| 9500 { | |
| 9501 plan = PLAN_WRITE; | |
| 9502 wouldbe_col = screen_cur_col; | |
| 9503 cost = 0; | |
| 9504 } | |
| 9505 | |
| 9506 /* | |
| 9507 * Check if any characters that need to be written have the | |
| 9508 * correct attributes. Also avoid UTF-8 characters. | |
| 9509 */ | |
| 9510 i = col - wouldbe_col; | |
| 9511 if (i > 0) | |
| 9512 cost += i; | |
| 9513 if (cost < goto_cost && i > 0) | |
| 9514 { | |
| 9515 /* | |
| 9516 * Check if the attributes are correct without additionally | |
| 9517 * stopping highlighting. | |
| 9518 */ | |
| 9519 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9520 while (i && *p++ == attr) | |
| 9521 --i; | |
| 9522 if (i != 0) | |
| 9523 { | |
| 9524 /* | |
| 9525 * Try if it works when highlighting is stopped here. | |
| 9526 */ | |
| 9527 if (*--p == 0) | |
| 9528 { | |
| 9529 cost += noinvcurs; | |
| 9530 while (i && *p++ == 0) | |
| 9531 --i; | |
| 9532 } | |
| 9533 if (i != 0) | |
| 9534 cost = 999; /* different attributes, don't do it */ | |
| 9535 } | |
| 9536 #ifdef FEAT_MBYTE | |
| 9537 if (enc_utf8) | |
| 9538 { | |
| 9539 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9540 for (i = wouldbe_col; i < col; ++i) | |
| 9541 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9542 { | |
| 9543 cost = 999; | |
| 9544 break; | |
| 9545 } | |
| 9546 } | |
| 9547 #endif | |
| 9548 } | |
| 9549 | |
| 9550 /* | |
| 9551 * We can do it without term_windgoto()! | |
| 9552 */ | |
| 9553 if (cost < goto_cost) | |
| 9554 { | |
| 9555 if (plan == PLAN_LE) | |
| 9556 { | |
| 9557 if (noinvcurs) | |
| 9558 screen_stop_highlight(); | |
| 9559 while (screen_cur_col > col) | |
| 9560 { | |
| 9561 out_str(bs); | |
| 9562 --screen_cur_col; | |
| 9563 } | |
| 9564 } | |
| 9565 else if (plan == PLAN_CR) | |
| 9566 { | |
| 9567 if (noinvcurs) | |
| 9568 screen_stop_highlight(); | |
| 9569 out_char('\r'); | |
| 9570 screen_cur_col = 0; | |
| 9571 } | |
| 9572 else if (plan == PLAN_NL) | |
| 9573 { | |
| 9574 if (noinvcurs) | |
| 9575 screen_stop_highlight(); | |
| 9576 while (screen_cur_row < row) | |
| 9577 { | |
| 9578 out_char('\n'); | |
| 9579 ++screen_cur_row; | |
| 9580 } | |
| 9581 screen_cur_col = 0; | |
| 9582 } | |
| 9583 | |
| 9584 i = col - screen_cur_col; | |
| 9585 if (i > 0) | |
| 9586 { | |
| 9587 /* | |
| 9588 * Use cursor-right if it's one character only. Avoids | |
| 9589 * removing a line of pixels from the last bold char, when | |
| 9590 * using the bold trick in the GUI. | |
| 9591 */ | |
| 9592 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9593 { | |
| 9594 while (i-- > 0) | |
| 9595 out_char(*T_ND); | |
| 9596 } | |
| 9597 else | |
| 9598 { | |
| 9599 int off; | |
| 9600 | |
| 9601 off = LineOffset[row] + screen_cur_col; | |
| 9602 while (i-- > 0) | |
| 9603 { | |
| 9604 if (ScreenAttrs[off] != screen_attr) | |
| 9605 screen_stop_highlight(); | |
| 9606 #ifdef FEAT_MBYTE | |
| 9607 out_flush_check(); | |
| 9608 #endif | |
| 9609 out_char(ScreenLines[off]); | |
| 9610 #ifdef FEAT_MBYTE | |
| 9611 if (enc_dbcs == DBCS_JPNU | |
| 9612 && ScreenLines[off] == 0x8e) | |
| 9613 out_char(ScreenLines2[off]); | |
| 9614 #endif | |
| 9615 ++off; | |
| 9616 } | |
| 9617 } | |
| 9618 } | |
| 9619 } | |
| 9620 } | |
| 9621 else | |
| 9622 cost = 999; | |
| 9623 | |
| 9624 if (cost >= goto_cost) | |
| 9625 { | |
| 9626 if (noinvcurs) | |
| 9627 screen_stop_highlight(); | |
| 5995 | 9628 if (row == screen_cur_row && (col > screen_cur_col) |
| 9629 && *T_CRI != NUL) | |
| 7 | 9630 term_cursor_right(col - screen_cur_col); |
| 9631 else | |
| 9632 term_windgoto(row, col); | |
| 9633 } | |
| 9634 screen_cur_row = row; | |
| 9635 screen_cur_col = col; | |
| 9636 } | |
| 9637 } | |
| 9638 | |
| 9639 /* | |
| 9640 * Set cursor to its position in the current window. | |
| 9641 */ | |
| 9642 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9643 setcursor(void) |
| 7 | 9644 { |
|
13400
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9645 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
|
9646 } |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9647 |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9648 /* |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9649 * 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
|
9650 * 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
|
9651 */ |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9652 void |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9653 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
|
9654 { |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9655 if (force || redrawing()) |
| 7 | 9656 { |
| 9657 validate_cursor(); | |
| 9658 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
|
9659 curwin->w_wincol + ( |
| 7 | 9660 #ifdef FEAT_RIGHTLEFT |
| 1545 | 9661 /* With 'rightleft' set and the cursor on a double-wide |
| 9662 * character, position it on the leftmost column. */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9663 curwin->w_p_rl ? ((int)curwin->w_width - curwin->w_wcol - ( |
| 7 | 9664 # ifdef FEAT_MBYTE |
| 1545 | 9665 (has_mbyte |
| 9666 && (*mb_ptr2cells)(ml_get_cursor()) == 2 | |
| 9667 && vim_isprintc(gchar_cursor())) ? 2 : | |
| 7 | 9668 # endif |
| 9669 1)) : | |
| 9670 #endif | |
| 9671 curwin->w_wcol)); | |
| 9672 } | |
| 9673 } | |
| 9674 | |
| 9675 | |
| 9676 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9677 * 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
|
9678 * 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
|
9679 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9680 * scrolling. |
| 9681 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9682 */ | |
| 9683 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9684 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9685 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9686 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9687 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9688 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9689 int mayclear) |
| 7 | 9690 { |
| 9691 int did_delete; | |
| 9692 int nextrow; | |
| 9693 int lastrow; | |
| 9694 int retval; | |
| 9695 | |
| 9696 if (invalid) | |
| 9697 wp->w_lines_valid = 0; | |
| 9698 | |
| 9699 if (wp->w_height < 5) | |
| 9700 return FAIL; | |
| 9701 | |
| 9702 if (line_count > wp->w_height - row) | |
| 9703 line_count = wp->w_height - row; | |
| 9704 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9705 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9706 if (retval != MAYBE) |
| 9707 return retval; | |
| 9708 | |
| 9709 /* | |
| 9710 * If there is a next window or a status line, we first try to delete the | |
| 9711 * lines at the bottom to avoid messing what is after the window. | |
| 9712 * If this fails and there are following windows, don't do anything to avoid | |
| 9713 * messing up those windows, better just redraw. | |
| 9714 */ | |
| 9715 did_delete = FALSE; | |
| 9716 if (wp->w_next != NULL || wp->w_status_height) | |
| 9717 { | |
| 9718 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
|
9719 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9720 did_delete = TRUE; |
| 9721 else if (wp->w_next) | |
| 9722 return FAIL; | |
| 9723 } | |
| 9724 /* | |
| 9725 * if no lines deleted, blank the lines that will end up below the window | |
| 9726 */ | |
| 9727 if (!did_delete) | |
| 9728 { | |
| 9729 wp->w_redr_status = TRUE; | |
| 9730 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
|
9731 nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height; |
| 7 | 9732 lastrow = nextrow + line_count; |
| 9733 if (lastrow > Rows) | |
| 9734 lastrow = Rows; | |
| 9735 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
|
9736 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9737 ' ', ' ', 0); |
| 9738 } | |
| 9739 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9740 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9741 == FAIL) |
| 9742 { | |
| 9743 /* deletion will have messed up other windows */ | |
| 9744 if (did_delete) | |
| 9745 { | |
| 9746 wp->w_redr_status = TRUE; | |
| 9747 win_rest_invalid(W_NEXT(wp)); | |
| 9748 } | |
| 9749 return FAIL; | |
| 9750 } | |
| 9751 | |
| 9752 return OK; | |
| 9753 } | |
| 9754 | |
| 9755 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9756 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9757 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9758 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9759 * scrolling | |
| 9760 * Return OK for success, FAIL if the lines are not deleted. | |
| 9761 */ | |
| 9762 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9763 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9764 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9765 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9766 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9767 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9768 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9769 int clear_attr) /* for clearing lines */ |
| 7 | 9770 { |
| 9771 int retval; | |
| 9772 | |
| 9773 if (invalid) | |
| 9774 wp->w_lines_valid = 0; | |
| 9775 | |
| 9776 if (line_count > wp->w_height - row) | |
| 9777 line_count = wp->w_height - row; | |
| 9778 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9779 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9780 if (retval != MAYBE) |
| 9781 return retval; | |
| 9782 | |
| 9783 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
|
9784 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9785 return FAIL; |
| 9786 | |
| 9787 /* | |
| 9788 * If there are windows or status lines below, try to put them at the | |
| 9789 * correct place. If we can't do that, they have to be redrawn. | |
| 9790 */ | |
| 9791 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9792 { | |
| 9793 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
|
9794 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9795 { |
| 9796 wp->w_redr_status = TRUE; | |
| 9797 win_rest_invalid(wp->w_next); | |
| 9798 } | |
| 9799 } | |
| 9800 /* | |
| 9801 * If this is the last window and there is no status line, redraw the | |
| 9802 * command line later. | |
| 9803 */ | |
| 9804 else | |
| 9805 redraw_cmdline = TRUE; | |
| 9806 return OK; | |
| 9807 } | |
| 9808 | |
| 9809 /* | |
| 9810 * Common code for win_ins_lines() and win_del_lines(). | |
| 9811 * Returns OK or FAIL when the work has been done. | |
| 9812 * Returns MAYBE when not finished yet. | |
| 9813 */ | |
| 9814 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9815 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9816 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9817 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9818 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9819 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9820 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9821 int clear_attr) |
| 7 | 9822 { |
| 9823 int retval; | |
| 9824 | |
| 9825 if (!redrawing() || line_count <= 0) | |
| 9826 return FAIL; | |
| 9827 | |
|
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
|
9828 /* When inserting lines would result in loss of command output, just redraw |
|
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
|
9829 * the lines. */ |
|
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
|
9830 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
|
9831 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
|
9832 |
| 7 | 9833 /* 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
|
9834 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) |
| 7 | 9835 { |
|
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
|
9836 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
|
9837 screenclear(); /* will set wp->w_lines_valid to 0 */ |
| 7 | 9838 return FAIL; |
| 9839 } | |
| 9840 | |
| 9841 /* | |
| 9842 * Delete all remaining lines | |
| 9843 */ | |
| 9844 if (row + line_count >= wp->w_height) | |
| 9845 { | |
| 9846 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
|
9847 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9848 ' ', ' ', 0); |
| 9849 return OK; | |
| 9850 } | |
| 9851 | |
| 9852 /* | |
|
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
|
9853 * When scrolling, the message on the command line should be cleared, |
| 7 | 9854 * 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
|
9855 * Don't do this when avoiding to insert lines. |
| 7 | 9856 */ |
|
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
|
9857 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
|
9858 clear_cmdline = TRUE; |
| 7 | 9859 |
| 9860 /* | |
| 9861 * If the terminal can set a scroll region, use that. | |
| 9862 * Always do this in a vertically split window. This will redraw from | |
| 9863 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9864 * win_line(). | |
| 9865 * 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
|
9866 * 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
|
9867 * scroll-up . |
| 7 | 9868 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9869 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
|
9870 { |
| 7 | 9871 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9872 scroll_region_set(wp, row); | |
| 9873 if (del) | |
| 9874 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
|
9875 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 9876 else |
| 9877 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
|
9878 wp->w_height - row, clear_attr, wp); |
| 7 | 9879 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9880 scroll_region_reset(); | |
| 9881 return retval; | |
| 9882 } | |
| 9883 | |
| 9884 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9885 return FAIL; | |
| 9886 | |
| 9887 return MAYBE; | |
| 9888 } | |
| 9889 | |
| 9890 /* | |
| 9891 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9892 */ | |
| 9893 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9894 win_rest_invalid(win_T *wp) |
| 7 | 9895 { |
| 9896 while (wp != NULL) | |
| 9897 { | |
| 9898 redraw_win_later(wp, NOT_VALID); | |
| 9899 wp->w_redr_status = TRUE; | |
| 9900 wp = wp->w_next; | |
| 9901 } | |
| 9902 redraw_cmdline = TRUE; | |
| 9903 } | |
| 9904 | |
| 9905 /* | |
| 9906 * The rest of the routines in this file perform screen manipulations. The | |
| 9907 * given operation is performed physically on the screen. The corresponding | |
| 9908 * change is also made to the internal screen image. In this way, the editor | |
| 9909 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9910 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9911 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9912 * screen changes, and in the meantime, everything still works. | |
| 9913 */ | |
| 9914 | |
| 9915 /* | |
| 9916 * types for inserting or deleting lines | |
| 9917 */ | |
| 9918 #define USE_T_CAL 1 | |
| 9919 #define USE_T_CDL 2 | |
| 9920 #define USE_T_AL 3 | |
| 9921 #define USE_T_CE 4 | |
| 9922 #define USE_T_DL 5 | |
| 9923 #define USE_T_SR 6 | |
| 9924 #define USE_NL 7 | |
| 9925 #define USE_T_CD 8 | |
| 9926 #define USE_REDRAW 9 | |
| 9927 | |
| 9928 /* | |
| 9929 * insert lines on the screen and update ScreenLines[] | |
| 9930 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9931 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9932 * 'row' and 'end' are relative to the start of the region. | |
| 9933 * | |
| 9934 * return FAIL for failure, OK for success. | |
| 9935 */ | |
| 446 | 9936 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9937 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9938 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9939 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9940 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9941 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9942 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9943 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9944 { |
| 9945 int i; | |
| 9946 int j; | |
| 9947 unsigned temp; | |
| 9948 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9949 int cursor_col = 0; |
| 7 | 9950 int type; |
| 9951 int result_empty; | |
| 9952 int can_ce = can_clear(T_CE); | |
| 9953 | |
| 9954 /* | |
| 9955 * FAIL if | |
| 9956 * - there is no valid screen | |
| 9957 * - the screen has to be redrawn completely | |
| 9958 * - the line count is less than one | |
| 9959 * - 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
|
9960 * - redrawing for a callback and there is a modeless selection |
| 7 | 9961 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9962 if (!screen_valid(TRUE) || line_count <= 0 || 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
|
9963 #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
|
9964 || (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
|
9965 && 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
|
9966 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9967 ) |
| 7 | 9968 return FAIL; |
| 9969 | |
| 9970 /* | |
| 9971 * There are seven ways to insert lines: | |
| 9972 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9973 * characters from ScreenLines[]. | |
| 9974 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9975 * the insert is just empty lines | |
| 9976 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9977 * present or line_count > 1. It looks better if we do all the inserts | |
| 9978 * at once. | |
| 9979 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9980 * insert is just empty lines and T_CE is not present or line_count > | |
| 9981 * 1. | |
| 9982 * 4. Use T_AL (insert line) if it exists. | |
| 9983 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9984 * just empty lines. | |
| 9985 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9986 * just empty lines. | |
| 9987 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9988 * the 'da' flag is not set or we have clear line capability. | |
| 9989 * 8. redraw the characters from ScreenLines[]. | |
| 9990 * | |
| 9991 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9992 * the scrollbar for the window. It does have insert line, use that if it | |
| 9993 * exists. | |
| 9994 */ | |
| 9995 result_empty = (row + line_count >= end); | |
| 9996 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 9997 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
|
9998 else if (can_clear(T_CD) && result_empty) |
| 7 | 9999 type = USE_T_CD; |
| 10000 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 10001 type = USE_T_CAL; | |
| 10002 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 10003 type = USE_T_CDL; | |
| 10004 else if (*T_AL != NUL) | |
| 10005 type = USE_T_AL; | |
| 10006 else if (can_ce && result_empty) | |
| 10007 type = USE_T_CE; | |
| 10008 else if (*T_DL != NUL && result_empty) | |
| 10009 type = USE_T_DL; | |
| 10010 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 10011 type = USE_T_SR; | |
| 10012 else | |
| 10013 return FAIL; | |
| 10014 | |
| 10015 /* | |
| 10016 * For clearing the lines screen_del_lines() is used. This will also take | |
| 10017 * care of t_db if necessary. | |
| 10018 */ | |
| 10019 if (type == USE_T_CD || type == USE_T_CDL || | |
| 10020 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
|
10021 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 10022 |
| 10023 /* | |
| 10024 * If text is retained below the screen, first clear or delete as many | |
| 10025 * lines at the bottom of the window as are about to be inserted so that | |
| 10026 * the deleted lines won't later surface during a screen_del_lines. | |
| 10027 */ | |
| 10028 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
|
10029 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 10030 |
| 10031 #ifdef FEAT_CLIPBOARD | |
| 10032 /* Remove a modeless selection when inserting lines halfway the screen | |
| 10033 * 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
|
10034 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10035 clip_clear_selection(&clip_star); |
| 7 | 10036 else |
| 10037 clip_scroll_selection(-line_count); | |
| 10038 #endif | |
| 10039 | |
| 10040 #ifdef FEAT_GUI | |
| 10041 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10042 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10043 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 10044 #endif |
| 10045 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10046 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
|
10047 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
|
10048 |
| 7 | 10049 if (*T_CCS != NUL) /* cursor relative to region */ |
| 10050 cursor_row = row; | |
| 10051 else | |
| 10052 cursor_row = row + off; | |
| 10053 | |
| 10054 /* | |
| 10055 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 10056 * Clear the inserted lines in ScreenLines[]. | |
| 10057 */ | |
| 10058 row += off; | |
| 10059 end += off; | |
| 10060 for (i = 0; i < line_count; ++i) | |
| 10061 { | |
| 10062 if (wp != NULL && wp->w_width != Columns) | |
| 10063 { | |
| 10064 /* need to copy part of a line */ | |
| 10065 j = end - 1 - i; | |
| 10066 while ((j -= line_count) >= row) | |
| 10067 linecopy(j + line_count, j, wp); | |
| 10068 j += line_count; | |
| 10069 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
|
10070 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
|
10071 clear_attr); |
| 7 | 10072 else |
| 10073 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10074 LineWraps[j] = FALSE; | |
| 10075 } | |
| 10076 else | |
| 10077 { | |
| 10078 j = end - 1 - i; | |
| 10079 temp = LineOffset[j]; | |
| 10080 while ((j -= line_count) >= row) | |
| 10081 { | |
| 10082 LineOffset[j + line_count] = LineOffset[j]; | |
| 10083 LineWraps[j + line_count] = LineWraps[j]; | |
| 10084 } | |
| 10085 LineOffset[j + line_count] = temp; | |
| 10086 LineWraps[j + line_count] = FALSE; | |
| 10087 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
|
10088 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10089 else |
| 10090 lineinvalid(temp, (int)Columns); | |
| 10091 } | |
| 10092 } | |
| 10093 | |
| 10094 screen_stop_highlight(); | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10095 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
|
10096 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
|
10097 screen_start_highlight(clear_attr); |
| 7 | 10098 |
| 10099 /* redraw the characters */ | |
| 10100 if (type == USE_REDRAW) | |
| 10101 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
|
10102 else if (type == USE_T_CAL) |
| 7 | 10103 { |
| 10104 term_append_lines(line_count); | |
| 10105 screen_start(); /* don't know where cursor is now */ | |
| 10106 } | |
| 10107 else | |
| 10108 { | |
| 10109 for (i = 0; i < line_count; i++) | |
| 10110 { | |
| 10111 if (type == USE_T_AL) | |
| 10112 { | |
| 10113 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
|
10114 windgoto(cursor_row, cursor_col); |
| 7 | 10115 out_str(T_AL); |
| 10116 } | |
| 10117 else /* type == USE_T_SR */ | |
| 10118 out_str(T_SR); | |
| 10119 screen_start(); /* don't know where cursor is now */ | |
| 10120 } | |
| 10121 } | |
| 10122 | |
| 10123 /* | |
| 10124 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 10125 * have been scrolled down into the region. | |
| 10126 */ | |
| 10127 if (type == USE_T_SR && *T_DA) | |
| 10128 { | |
| 10129 for (i = 0; i < line_count; ++i) | |
| 10130 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10131 windgoto(off + i, cursor_col); |
| 7 | 10132 out_str(T_CE); |
| 10133 screen_start(); /* don't know where cursor is now */ | |
| 10134 } | |
| 10135 } | |
| 10136 | |
| 10137 #ifdef FEAT_GUI | |
| 10138 gui_can_update_cursor(); | |
| 10139 if (gui.in_use) | |
| 10140 out_flush(); /* always flush after a scroll */ | |
| 10141 #endif | |
| 10142 return OK; | |
| 10143 } | |
| 10144 | |
| 10145 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10146 * 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
|
10147 * "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
|
10148 * 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
|
10149 * "row" and "end" are relative to the start of the region. |
| 7 | 10150 * |
| 10151 * Return OK for success, FAIL if the lines are not deleted. | |
| 10152 */ | |
| 10153 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10154 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10155 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10156 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10157 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10158 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10159 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
|
10160 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
|
10161 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 10162 { |
| 10163 int j; | |
| 10164 int i; | |
| 10165 unsigned temp; | |
| 10166 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10167 int cursor_col = 0; |
| 7 | 10168 int cursor_end; |
| 10169 int result_empty; /* result is empty until end of region */ | |
| 10170 int can_delete; /* deleting line codes can be used */ | |
| 10171 int type; | |
| 10172 | |
| 10173 /* | |
| 10174 * FAIL if | |
| 10175 * - there is no valid screen | |
| 10176 * - the screen has to be redrawn completely | |
| 10177 * - the line count is less than one | |
| 10178 * - 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
|
10179 * - redrawing for a callback and there is a modeless selection |
| 7 | 10180 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10181 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
|
10182 || (!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
|
10183 #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
|
10184 || (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
|
10185 && 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
|
10186 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10187 ) |
| 7 | 10188 return FAIL; |
| 10189 | |
| 10190 /* | |
| 10191 * Check if the rest of the current region will become empty. | |
| 10192 */ | |
| 10193 result_empty = row + line_count >= end; | |
| 10194 | |
| 10195 /* | |
| 10196 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 10197 * available. | |
| 10198 */ | |
| 10199 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 10200 | |
| 10201 /* | |
| 10202 * There are six ways to delete lines: | |
| 10203 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10204 * characters from ScreenLines[]. | |
| 10205 * 1. Use T_CD if it exists and the result is empty. | |
| 10206 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 10207 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 10208 * none of the other ways work. | |
| 10209 * 4. Use T_CE (erase line) if the result is empty. | |
| 10210 * 5. Use T_DL (delete line) if it exists. | |
| 10211 * 6. redraw the characters from ScreenLines[]. | |
| 10212 */ | |
| 10213 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10214 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
|
10215 else if (can_clear(T_CD) && result_empty) |
| 7 | 10216 type = USE_T_CD; |
| 10217 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 10218 /* | |
| 10219 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 10220 * its internal termcap... this works okay for tests which test *T_DB != | |
| 10221 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 10222 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 10223 * the trick... | |
| 10224 * Anyway, this hack will hopefully go away with the next OS release. | |
| 10225 * (Olaf Seibert) | |
| 10226 */ | |
| 10227 else if (row == 0 && T_DB == empty_option | |
| 10228 && (line_count == 1 || *T_CDL == NUL)) | |
| 10229 #else | |
| 10230 else if (row == 0 && ( | |
| 10231 #ifndef AMIGA | |
| 10232 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 10233 * up, so use delete-line command */ | |
| 10234 line_count == 1 || | |
| 10235 #endif | |
| 10236 *T_CDL == NUL)) | |
| 10237 #endif | |
| 10238 type = USE_NL; | |
| 10239 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 10240 type = USE_T_CDL; | |
| 10241 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
|
10242 && (wp == NULL || wp->w_width == Columns)) |
| 7 | 10243 type = USE_T_CE; |
| 10244 else if (*T_DL != NUL && can_delete) | |
| 10245 type = USE_T_DL; | |
| 10246 else if (*T_CDL != NUL && can_delete) | |
| 10247 type = USE_T_CDL; | |
| 10248 else | |
| 10249 return FAIL; | |
| 10250 | |
| 10251 #ifdef FEAT_CLIPBOARD | |
| 10252 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 10253 * 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
|
10254 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10255 clip_clear_selection(&clip_star); |
| 7 | 10256 else |
| 10257 clip_scroll_selection(line_count); | |
| 10258 #endif | |
| 10259 | |
| 10260 #ifdef FEAT_GUI | |
| 10261 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10262 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10263 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
|
10264 && gui.cursor_row < end + off); |
| 7 | 10265 #endif |
| 10266 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10267 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
|
10268 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
|
10269 |
| 7 | 10270 if (*T_CCS != NUL) /* cursor relative to region */ |
| 10271 { | |
| 10272 cursor_row = row; | |
| 10273 cursor_end = end; | |
| 10274 } | |
| 10275 else | |
| 10276 { | |
| 10277 cursor_row = row + off; | |
| 10278 cursor_end = end + off; | |
| 10279 } | |
| 10280 | |
| 10281 /* | |
| 10282 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10283 * Clear the inserted lines in ScreenLines[]. | |
| 10284 */ | |
| 10285 row += off; | |
| 10286 end += off; | |
| 10287 for (i = 0; i < line_count; ++i) | |
| 10288 { | |
| 10289 if (wp != NULL && wp->w_width != Columns) | |
| 10290 { | |
| 10291 /* need to copy part of a line */ | |
| 10292 j = row + i; | |
| 10293 while ((j += line_count) <= end - 1) | |
| 10294 linecopy(j - line_count, j, wp); | |
| 10295 j -= line_count; | |
| 10296 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
|
10297 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
|
10298 clear_attr); |
| 7 | 10299 else |
| 10300 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10301 LineWraps[j] = FALSE; | |
| 10302 } | |
| 10303 else | |
| 10304 { | |
| 10305 /* whole width, moving the line pointers is faster */ | |
| 10306 j = row + i; | |
| 10307 temp = LineOffset[j]; | |
| 10308 while ((j += line_count) <= end - 1) | |
| 10309 { | |
| 10310 LineOffset[j - line_count] = LineOffset[j]; | |
| 10311 LineWraps[j - line_count] = LineWraps[j]; | |
| 10312 } | |
| 10313 LineOffset[j - line_count] = temp; | |
| 10314 LineWraps[j - line_count] = FALSE; | |
| 10315 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
|
10316 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10317 else |
| 10318 lineinvalid(temp, (int)Columns); | |
| 10319 } | |
| 10320 } | |
| 10321 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10322 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
|
10323 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10324 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
|
10325 screen_start_highlight(clear_attr); |
| 7 | 10326 |
| 10327 /* redraw the characters */ | |
| 10328 if (type == USE_REDRAW) | |
| 10329 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
|
10330 else if (type == USE_T_CD) /* delete the lines */ |
| 7 | 10331 { |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10332 windgoto(cursor_row, cursor_col); |
| 7 | 10333 out_str(T_CD); |
| 10334 screen_start(); /* don't know where cursor is now */ | |
| 10335 } | |
| 10336 else if (type == USE_T_CDL) | |
| 10337 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10338 windgoto(cursor_row, cursor_col); |
| 7 | 10339 term_delete_lines(line_count); |
| 10340 screen_start(); /* don't know where cursor is now */ | |
| 10341 } | |
| 10342 /* | |
| 10343 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10344 * the whole screen (scroll region) up by outputting newlines on the | |
| 10345 * last line. | |
| 10346 */ | |
| 10347 else if (type == USE_NL) | |
| 10348 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10349 windgoto(cursor_end - 1, cursor_col); |
| 7 | 10350 for (i = line_count; --i >= 0; ) |
| 10351 out_char('\n'); /* cursor will remain on same line */ | |
| 10352 } | |
| 10353 else | |
| 10354 { | |
| 10355 for (i = line_count; --i >= 0; ) | |
| 10356 { | |
| 10357 if (type == USE_T_DL) | |
| 10358 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10359 windgoto(cursor_row, cursor_col); |
| 7 | 10360 out_str(T_DL); /* delete a line */ |
| 10361 } | |
| 10362 else /* type == USE_T_CE */ | |
| 10363 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10364 windgoto(cursor_row + i, cursor_col); |
| 7 | 10365 out_str(T_CE); /* erase a line */ |
| 10366 } | |
| 10367 screen_start(); /* don't know where cursor is now */ | |
| 10368 } | |
| 10369 } | |
| 10370 | |
| 10371 /* | |
| 10372 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10373 * scrolled up at the bottom of the region. | |
| 10374 */ | |
| 10375 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10376 { | |
| 10377 for (i = line_count; i > 0; --i) | |
| 10378 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10379 windgoto(cursor_end - i, cursor_col); |
| 7 | 10380 out_str(T_CE); /* erase a line */ |
| 10381 screen_start(); /* don't know where cursor is now */ | |
| 10382 } | |
| 10383 } | |
| 10384 | |
| 10385 #ifdef FEAT_GUI | |
| 10386 gui_can_update_cursor(); | |
| 10387 if (gui.in_use) | |
| 10388 out_flush(); /* always flush after a scroll */ | |
| 10389 #endif | |
| 10390 | |
| 10391 return OK; | |
| 10392 } | |
| 10393 | |
| 10394 /* | |
|
13308
ae312df8d0ab
patch 8.0.1528: dead code found
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
10395 * Show the current mode and ruler. |
| 7 | 10396 * |
| 10397 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10398 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10399 * cleared only if a mode is shown. | |
| 10400 * Return the length of the message (0 if no message). | |
| 10401 */ | |
| 10402 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10403 showmode(void) |
| 7 | 10404 { |
| 10405 int need_clear; | |
| 10406 int length = 0; | |
| 10407 int do_mode; | |
| 10408 int attr; | |
| 10409 int nwr_save; | |
| 10410 #ifdef FEAT_INS_EXPAND | |
| 10411 int sub_attr; | |
| 10412 #endif | |
| 10413 | |
| 642 | 10414 do_mode = ((p_smd && msg_silent == 0) |
| 10415 && ((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
|
10416 || restart_edit != NUL |
| 5735 | 10417 || 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
|
10418 if (do_mode || reg_recording != 0) |
| 7 | 10419 { |
| 10420 /* | |
| 10421 * Don't show mode right now, when not redrawing or inside a mapping. | |
| 10422 * Call char_avail() only when we are going to show something, because | |
| 10423 * it takes a bit of time. | |
| 10424 */ | |
| 10425 if (!redrawing() || (char_avail() && !KeyTyped) || msg_silent != 0) | |
| 10426 { | |
| 10427 redraw_cmdline = TRUE; /* show mode later */ | |
| 10428 return 0; | |
| 10429 } | |
| 10430 | |
| 10431 nwr_save = need_wait_return; | |
| 10432 | |
| 10433 /* wait a bit before overwriting an important message */ | |
| 10434 check_for_delay(FALSE); | |
| 10435 | |
| 10436 /* if the cmdline is more than one line high, erase top lines */ | |
| 10437 need_clear = clear_cmdline; | |
| 10438 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10439 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10440 | |
| 10441 /* Position on the last line in the window, column 0 */ | |
| 10442 msg_pos_mode(); | |
| 10443 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10444 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10445 if (do_mode) |
| 10446 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10447 msg_puts_attr("--", attr); |
| 7 | 10448 #if defined(FEAT_XIM) |
| 2520 | 10449 if ( |
| 10450 # ifdef FEAT_GUI_GTK | |
| 10451 preedit_get_status() | |
| 1668 | 10452 # else |
| 10453 im_get_status() | |
| 2520 | 10454 # endif |
| 1668 | 10455 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10456 # 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
|
10457 msg_puts_attr(" IM", attr); |
| 7 | 10458 # else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10459 msg_puts_attr(" XIM", attr); |
| 7 | 10460 # endif |
| 10461 #endif | |
| 10462 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10463 if (gui.in_use) | |
| 10464 { | |
| 10465 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10466 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10467 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10468 if (enc_utf8) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10469 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
|
10470 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10471 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
|
10472 } |
| 7 | 10473 } |
| 10474 #endif | |
| 10475 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10476 /* CTRL-X in Insert mode */ |
| 10477 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10478 { |
| 10479 /* These messages can get long, avoid a wrap in a narrow | |
| 10480 * window. Prefer showing edit_submode_extra. */ | |
| 10481 length = (Rows - msg_row) * Columns - 3; | |
| 10482 if (edit_submode_extra != NULL) | |
| 10483 length -= vim_strsize(edit_submode_extra); | |
| 10484 if (length > 0) | |
| 10485 { | |
| 10486 if (edit_submode_pre != NULL) | |
| 10487 length -= vim_strsize(edit_submode_pre); | |
| 10488 if (length - vim_strsize(edit_submode) > 0) | |
| 10489 { | |
| 10490 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
|
10491 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
|
10492 msg_puts_attr((char *)edit_submode, attr); |
| 7 | 10493 } |
| 10494 if (edit_submode_extra != NULL) | |
| 10495 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10496 msg_puts_attr(" ", attr); /* add a space in between */ |
| 7 | 10497 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
|
10498 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10499 else |
| 10500 sub_attr = attr; | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10501 msg_puts_attr((char *)edit_submode_extra, sub_attr); |
| 7 | 10502 } |
| 10503 } | |
| 10504 } | |
| 10505 else | |
| 10506 #endif | |
| 10507 { | |
| 10508 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
|
10509 msg_puts_attr(_(" VREPLACE"), attr); |
|
14424
0a69e6e708f9
patch 8.1.0226: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
14218
diff
changeset
|
10510 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
|
10511 msg_puts_attr(_(" REPLACE"), attr); |
| 7 | 10512 else if (State & INSERT) |
| 10513 { | |
| 10514 #ifdef FEAT_RIGHTLEFT | |
| 10515 if (p_ri) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10516 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
|
10517 #endif |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10518 msg_puts_attr(_(" INSERT"), attr); |
| 7 | 10519 } |
|
14093
a9d94f10ecef
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Christian Brabandt <cb@256bit.org>
parents:
14089
diff
changeset
|
10520 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
|
10521 msg_puts_attr(_(" (insert)"), attr); |
| 7 | 10522 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
|
10523 msg_puts_attr(_(" (replace)"), attr); |
| 7 | 10524 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
|
10525 msg_puts_attr(_(" (vreplace)"), attr); |
| 7 | 10526 #ifdef FEAT_RIGHTLEFT |
| 10527 if (p_hkmap) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10528 msg_puts_attr(_(" Hebrew"), attr); |
| 7 | 10529 # ifdef FEAT_FKMAP |
| 10530 if (p_fkmap) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10531 msg_puts_attr(farsi_text_5, attr); |
| 7 | 10532 # endif |
| 10533 #endif | |
| 10534 #ifdef FEAT_KEYMAP | |
| 10535 if (State & LANGMAP) | |
| 10536 { | |
| 10537 # ifdef FEAT_ARABIC | |
| 10538 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
|
10539 msg_puts_attr(_(" Arabic"), attr); |
| 7 | 10540 else |
| 10541 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10542 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
|
10543 NameBuff, MAXPATHL)) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10544 msg_puts_attr((char *)NameBuff, attr); |
| 7 | 10545 } |
| 10546 #endif | |
| 10547 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
|
10548 msg_puts_attr(_(" (paste)"), attr); |
| 7 | 10549 |
| 10550 if (VIsual_active) | |
| 10551 { | |
| 10552 char *p; | |
| 10553 | |
| 10554 /* Don't concatenate separate words to avoid translation | |
| 10555 * problems. */ | |
| 10556 switch ((VIsual_select ? 4 : 0) | |
| 10557 + (VIsual_mode == Ctrl_V) * 2 | |
| 10558 + (VIsual_mode == 'V')) | |
| 10559 { | |
| 10560 case 0: p = N_(" VISUAL"); break; | |
| 10561 case 1: p = N_(" VISUAL LINE"); break; | |
| 10562 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10563 case 4: p = N_(" SELECT"); break; | |
| 10564 case 5: p = N_(" SELECT LINE"); break; | |
| 10565 default: p = N_(" SELECT BLOCK"); break; | |
| 10566 } | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10567 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
|
10568 } |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10569 msg_puts_attr(" --", attr); |
| 7 | 10570 } |
| 644 | 10571 |
| 7 | 10572 need_clear = TRUE; |
| 10573 } | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10574 if (reg_recording != 0 |
| 7 | 10575 #ifdef FEAT_INS_EXPAND |
| 10576 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10577 #endif | |
| 10578 ) | |
| 10579 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10580 recording_mode(attr); |
| 7 | 10581 need_clear = TRUE; |
| 10582 } | |
| 644 | 10583 |
| 10584 mode_displayed = TRUE; | |
| 7 | 10585 if (need_clear || clear_cmdline) |
| 10586 msg_clr_eos(); | |
| 10587 msg_didout = FALSE; /* overwrite this message */ | |
| 10588 length = msg_col; | |
| 10589 msg_col = 0; | |
| 10590 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10591 } | |
| 10592 else if (clear_cmdline && msg_silent == 0) | |
| 10593 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10594 msg_clr_cmdline(); | |
| 10595 | |
| 10596 #ifdef FEAT_CMDL_INFO | |
| 10597 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10598 if (VIsual_active) | |
| 10599 clear_showcmd(); | |
| 10600 | |
| 10601 /* If the last window has no status line, the ruler is after the mode | |
| 10602 * 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
|
10603 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
|
10604 win_redr_ruler(lastwin, TRUE, FALSE); |
| 7 | 10605 #endif |
| 10606 redraw_cmdline = FALSE; | |
| 10607 clear_cmdline = FALSE; | |
| 10608 | |
| 10609 return length; | |
| 10610 } | |
| 10611 | |
| 10612 /* | |
| 10613 * Position for a mode message. | |
| 10614 */ | |
| 10615 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10616 msg_pos_mode(void) |
| 7 | 10617 { |
| 10618 msg_col = 0; | |
| 10619 msg_row = Rows - 1; | |
| 10620 } | |
| 10621 | |
| 10622 /* | |
| 10623 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10624 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10625 * Caller should check "mode_displayed". |
| 7 | 10626 */ |
| 10627 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10628 unshowmode(int force) |
| 7 | 10629 { |
| 10630 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10631 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10632 */ |
| 10633 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10634 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10635 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10636 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10637 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10638 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10639 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10640 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10641 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10642 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10643 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10644 { |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10645 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
|
10646 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
|
10647 |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10648 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
|
10649 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
|
10650 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
|
10651 msg_clr_eos(); |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10652 |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10653 msg_col = save_msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10654 msg_row = save_msg_row; |
| 7 | 10655 } |
| 10656 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10657 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10658 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10659 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10660 msg_puts_attr(_("recording"), attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10661 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10662 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10663 char s[4]; |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10664 |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10665 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
|
10666 msg_puts_attr(s, attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10667 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10668 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10669 |
| 667 | 10670 /* |
| 10671 * Draw the tab pages line at the top of the Vim window. | |
| 10672 */ | |
|
15396
325e4a8ba1b6
patch 8.1.0706: tabline is not always redrawn
Bram Moolenaar <Bram@vim.org>
parents:
15384
diff
changeset
|
10673 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10674 draw_tabline(void) |
| 667 | 10675 { |
| 10676 int tabcount = 0; | |
| 10677 tabpage_T *tp; | |
| 10678 int tabwidth; | |
| 10679 int col = 0; | |
| 673 | 10680 int scol = 0; |
| 667 | 10681 int attr; |
| 10682 win_T *wp; | |
| 671 | 10683 win_T *cwp; |
| 10684 int wincount; | |
| 10685 int modified; | |
| 667 | 10686 int c; |
| 10687 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10688 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
|
10689 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
|
10690 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10691 char_u *p; |
| 677 | 10692 int room; |
| 10693 int use_sep_chars = (t_colors < 8 | |
| 10694 #ifdef FEAT_GUI | |
| 10695 && !gui.in_use | |
| 10696 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10697 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10698 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10699 #endif |
| 677 | 10700 ); |
| 673 | 10701 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10702 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10703 return; |
| 673 | 10704 redraw_tabline = FALSE; |
| 667 | 10705 |
| 685 | 10706 #ifdef FEAT_GUI_TABLINE |
| 798 | 10707 /* Take care of a GUI tabline. */ |
| 685 | 10708 if (gui_use_tabline()) |
| 10709 { | |
| 10710 gui_update_tabline(); | |
| 10711 return; | |
| 10712 } | |
| 10713 #endif | |
| 10714 | |
| 10715 if (tabline_height() < 1) | |
| 667 | 10716 return; |
| 10717 | |
| 677 | 10718 #if defined(FEAT_STL_OPT) |
| 681 | 10719 |
| 10720 /* Init TabPageIdxs[] to zero: Clicking outside of tabs has no effect. */ | |
| 10721 for (scol = 0; scol < Columns; ++scol) | |
| 10722 TabPageIdxs[scol] = 0; | |
| 10723 | |
| 677 | 10724 /* Use the 'tabline' option if it's set. */ |
| 10725 if (*p_tal != NUL) | |
| 10726 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10727 int saved_did_emsg = did_emsg; |
| 680 | 10728 |
| 10729 /* Check for an error. If there is one we would loop in redrawing the | |
| 10730 * 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
|
10731 did_emsg = FALSE; |
| 677 | 10732 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10733 if (did_emsg) |
| 680 | 10734 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10735 (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
|
10736 did_emsg |= saved_did_emsg; |
| 680 | 10737 } |
| 10738 else | |
| 10739 #endif | |
| 10740 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10741 FOR_ALL_TABPAGES(tp) |
| 680 | 10742 ++tabcount; |
| 10743 | |
| 10744 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10745 if (tabwidth < 6) | |
| 10746 tabwidth = 6; | |
| 10747 | |
| 10748 attr = attr_nosel; | |
| 10749 tabcount = 0; | |
| 681 | 10750 scol = 0; |
| 699 | 10751 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10752 tp = tp->tp_next) | |
| 680 | 10753 { |
| 10754 scol = col; | |
| 10755 | |
| 10756 if (tp->tp_topframe == topframe) | |
| 10757 attr = attr_sel; | |
| 10758 if (use_sep_chars && col > 0) | |
| 10759 screen_putchar('|', 0, col++, attr); | |
| 10760 | |
| 10761 if (tp->tp_topframe != topframe) | |
| 10762 attr = attr_nosel; | |
| 10763 | |
| 10764 screen_putchar(' ', 0, col++, attr); | |
| 10765 | |
| 10766 if (tp == curtab) | |
| 10767 { | |
| 10768 cwp = curwin; | |
| 10769 wp = firstwin; | |
| 10770 } | |
| 10771 else | |
| 10772 { | |
| 10773 cwp = tp->tp_curwin; | |
| 10774 wp = tp->tp_firstwin; | |
| 10775 } | |
| 10776 | |
| 10777 modified = FALSE; | |
| 10778 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10779 if (bufIsChanged(wp->w_buffer)) | |
| 10780 modified = TRUE; | |
| 10781 if (modified || wincount > 1) | |
| 10782 { | |
| 10783 if (wincount > 1) | |
| 10784 { | |
| 10785 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10786 len = (int)STRLEN(NameBuff); |
| 699 | 10787 if (col + len >= Columns - 3) |
| 10788 break; | |
| 680 | 10789 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10790 #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
|
10791 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10792 #else |
| 6106 | 10793 attr |
| 680 | 10794 #endif |
| 10795 ); | |
| 10796 col += len; | |
| 10797 } | |
| 10798 if (modified) | |
| 10799 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10800 screen_putchar(' ', 0, col++, attr); | |
| 10801 } | |
| 10802 | |
| 10803 room = scol - col + tabwidth - 1; | |
| 10804 if (room > 0) | |
| 10805 { | |
| 685 | 10806 /* Get buffer name in NameBuff[] */ |
| 10807 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10808 shorten_dir(NameBuff); |
| 680 | 10809 len = vim_strsize(NameBuff); |
| 10810 p = NameBuff; | |
| 677 | 10811 #ifdef FEAT_MBYTE |
| 680 | 10812 if (has_mbyte) |
| 10813 while (len > room) | |
| 10814 { | |
| 10815 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10816 MB_PTR_ADV(p); |
| 680 | 10817 } |
| 10818 else | |
| 10819 #endif | |
| 10820 if (len > room) | |
| 677 | 10821 { |
| 680 | 10822 p += len - room; |
| 10823 len = room; | |
| 677 | 10824 } |
| 699 | 10825 if (len > Columns - col - 1) |
| 10826 len = Columns - col - 1; | |
| 680 | 10827 |
| 835 | 10828 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10829 col += len; |
| 10830 } | |
| 10831 screen_putchar(' ', 0, col++, attr); | |
| 10832 | |
| 10833 /* Store the tab page number in TabPageIdxs[], so that | |
| 10834 * jump_to_mouse() knows where each one is. */ | |
| 10835 ++tabcount; | |
| 10836 while (scol < col) | |
| 10837 TabPageIdxs[scol++] = tabcount; | |
| 10838 } | |
| 10839 | |
| 10840 if (use_sep_chars) | |
| 10841 c = '_'; | |
| 10842 else | |
| 10843 c = ' '; | |
| 10844 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10845 |
| 10846 /* Put an "X" for closing the current tab if there are several. */ | |
| 10847 if (first_tabpage->tp_next != NULL) | |
| 10848 { | |
| 10849 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10850 TabPageIdxs[Columns - 1] = -999; | |
| 10851 } | |
| 10852 } | |
| 834 | 10853 |
| 10854 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10855 * set. */ | |
| 10856 redraw_tabline = FALSE; | |
| 667 | 10857 } |
| 685 | 10858 |
| 10859 /* | |
| 10860 * Get buffer name for "buf" into NameBuff[]. | |
| 10861 * Takes care of special buffer names and translates special characters. | |
| 10862 */ | |
| 10863 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10864 get_trans_bufname(buf_T *buf) |
| 685 | 10865 { |
| 10866 if (buf_spname(buf) != NULL) | |
| 3839 | 10867 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10868 else |
| 10869 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10870 trans_characters(NameBuff, MAXPATHL); | |
| 10871 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10872 |
| 7 | 10873 /* |
| 10874 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10875 */ | |
| 10876 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
|
10877 fillchar_status(int *attr, win_T *wp) |
| 7 | 10878 { |
| 10879 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
|
10880 |
|
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
|
10881 #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
|
10882 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
|
10883 { |
|
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
|
10884 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
|
10885 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10886 *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
|
10887 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
|
10888 } |
|
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
|
10889 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10890 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10891 *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
|
10892 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
|
10893 } |
|
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
|
10894 } |
|
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
|
10895 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
|
10896 #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
|
10897 if (wp == curwin) |
| 7 | 10898 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10899 *attr = HL_ATTR(HLF_S); |
| 7 | 10900 fill = fill_stl; |
| 10901 } | |
| 10902 else | |
| 10903 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10904 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10905 fill = fill_stlnc; |
| 10906 } | |
| 10907 /* Use fill when there is highlighting, and highlighting of current | |
| 10908 * window differs, or the fillchars differ, or this is not the | |
| 10909 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10910 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
|
10911 || wp != curwin || ONE_WINDOW) |
| 7 | 10912 || (fill_stl != fill_stlnc))) |
| 10913 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
|
10914 if (wp == curwin) |
| 7 | 10915 return '^'; |
| 10916 return '='; | |
| 10917 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10918 |
| 7 | 10919 /* |
| 10920 * Get the character to use in a separator between vertically split windows. | |
| 10921 * Get its attributes in "*attr". | |
| 10922 */ | |
| 10923 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10924 fillchar_vsep(int *attr) |
| 7 | 10925 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10926 *attr = HL_ATTR(HLF_C); |
| 7 | 10927 if (*attr == 0 && fill_vert == ' ') |
| 10928 return '|'; | |
| 10929 else | |
| 10930 return fill_vert; | |
| 10931 } | |
| 10932 | |
| 10933 /* | |
| 10934 * Return TRUE if redrawing should currently be done. | |
| 10935 */ | |
| 10936 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10937 redrawing(void) |
| 7 | 10938 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10939 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10940 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
|
10941 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10942 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10943 #endif |
|
14673
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10944 return ((!RedrawingDisabled |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10945 #ifdef FEAT_EVAL |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10946 || 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
|
10947 #endif |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10948 ) && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 7 | 10949 } |
| 10950 | |
| 10951 /* | |
| 10952 * Return TRUE if printing messages should currently be done. | |
| 10953 */ | |
| 10954 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10955 messaging(void) |
| 7 | 10956 { |
| 10957 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10958 } | |
| 10959 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10960 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10961 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10962 * 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
|
10963 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10964 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10965 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
|
10966 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10967 vimmenu_T *menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10968 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
|
10969 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
|
10970 int col = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10971 int next_col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10972 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
|
10973 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
|
10974 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
|
10975 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10976 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
|
10977 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
|
10978 ++item_count; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10979 wp->w_winbar_items = (winbar_item_T *)alloc_clear( |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10980 (unsigned)sizeof(winbar_item_T) * (item_count + 1)); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10981 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10982 /* 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
|
10983 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
|
10984 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
|
10985 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10986 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
|
10987 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
|
10988 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10989 if (col > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10990 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10991 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
|
10992 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
|
10993 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10994 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10995 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10996 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
|
10997 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
|
10998 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
|
10999 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11000 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11001 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
|
11002 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
|
11003 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11004 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
|
11005 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11006 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11007 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
|
11008 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
|
11009 ++item_idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11010 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11011 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
|
11012 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11013 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
|
11014 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11015 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11016 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
|
11017 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11018 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
|
11019 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11020 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11021 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
|
11022 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11023 screen_line(wp->w_winrow, wp->w_wincol, (int)wp->w_width, |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11024 (int)wp->w_width, FALSE); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11025 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11026 #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
|
11027 |
| 7 | 11028 /* |
| 11029 * Show current status info in ruler and various other places | |
| 11030 * If always is FALSE, only show ruler if position has changed. | |
| 11031 */ | |
| 11032 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11033 showruler(int always) |
| 7 | 11034 { |
| 11035 if (!always && !redrawing()) | |
| 11036 return; | |
| 574 | 11037 #ifdef FEAT_INS_EXPAND |
| 11038 if (pum_visible()) | |
| 11039 { | |
| 11040 /* Don't redraw right now, do it later. */ | |
| 11041 curwin->w_redr_status = TRUE; | |
| 11042 return; | |
| 11043 } | |
| 11044 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11045 #if defined(FEAT_STL_OPT) |
| 40 | 11046 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 680 | 11047 { |
| 1983 | 11048 redraw_custom_statusline(curwin); |
| 680 | 11049 } |
| 7 | 11050 else |
| 11051 #endif | |
| 11052 #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
|
11053 win_redr_ruler(curwin, always, FALSE); |
| 7 | 11054 #endif |
| 11055 | |
| 11056 #ifdef FEAT_TITLE | |
| 11057 if (need_maketitle | |
| 11058 # ifdef FEAT_STL_OPT | |
| 11059 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 11060 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 11061 # endif | |
| 11062 ) | |
| 11063 maketitle(); | |
| 11064 #endif | |
| 1588 | 11065 /* Redraw the tab pages line if needed. */ |
| 11066 if (redraw_tabline) | |
| 11067 draw_tabline(); | |
| 7 | 11068 } |
| 11069 | |
| 11070 #ifdef FEAT_CMDL_INFO | |
| 11071 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
|
11072 win_redr_ruler(win_T *wp, int always, int ignore_pum) |
| 7 | 11073 { |
| 1869 | 11074 #define RULER_BUF_LEN 70 |
| 11075 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 11076 int row; |
| 11077 int fillchar; | |
| 11078 int attr; | |
| 11079 int empty_line = FALSE; | |
| 11080 colnr_T virtcol; | |
| 11081 int i; | |
| 1869 | 11082 size_t len; |
| 7 | 11083 int o; |
| 11084 int this_ru_col; | |
| 11085 int off = 0; | |
| 11086 int width = Columns; | |
| 11087 | |
| 11088 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 11089 if (!p_ru) | |
| 11090 return; | |
| 11091 | |
| 11092 /* | |
| 11093 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 11094 * after deleting lines, before cursor.lnum is corrected. | |
| 11095 */ | |
| 11096 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 11097 return; | |
| 11098 | |
| 11099 #ifdef FEAT_INS_EXPAND | |
| 11100 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 11101 * the (long) mode message. */ | |
| 11102 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 11103 if (edit_submode != NULL) | |
| 11104 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
|
11105 // 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
|
11106 // 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
|
11107 if (!ignore_pum && pum_visible()) |
| 540 | 11108 return; |
| 7 | 11109 #endif |
| 11110 | |
| 11111 #ifdef FEAT_STL_OPT | |
| 11112 if (*p_ruf) | |
| 11113 { | |
| 680 | 11114 int save_called_emsg = called_emsg; |
| 11115 | |
| 11116 called_emsg = FALSE; | |
| 7 | 11117 win_redr_custom(wp, TRUE); |
| 680 | 11118 if (called_emsg) |
| 11119 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 11120 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 11121 called_emsg |= save_called_emsg; |
| 7 | 11122 return; |
| 11123 } | |
| 11124 #endif | |
| 11125 | |
| 11126 /* | |
| 11127 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 11128 */ | |
| 11129 if (!(State & INSERT) | |
| 11130 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 11131 empty_line = TRUE; | |
| 11132 | |
| 11133 /* | |
| 11134 * Only draw the ruler when something changed. | |
| 11135 */ | |
| 11136 validate_virtcol_win(wp); | |
| 11137 if ( redraw_cmdline | |
| 11138 || always | |
| 11139 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 11140 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 11141 || wp->w_virtcol != wp->w_ru_virtcol | |
| 11142 #ifdef FEAT_VIRTUALEDIT | |
| 11143 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 11144 #endif | |
| 11145 || wp->w_topline != wp->w_ru_topline | |
| 11146 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 11147 #ifdef FEAT_DIFF | |
| 11148 || wp->w_topfill != wp->w_ru_topfill | |
| 11149 #endif | |
| 11150 || empty_line != wp->w_ru_empty) | |
| 11151 { | |
| 11152 cursor_off(); | |
| 11153 if (wp->w_status_height) | |
| 11154 { | |
| 11155 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
|
11156 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
|
11157 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
|
11158 width = wp->w_width; |
| 7 | 11159 } |
| 11160 else | |
| 11161 { | |
| 11162 row = Rows - 1; | |
| 11163 fillchar = ' '; | |
| 11164 attr = 0; | |
| 11165 width = Columns; | |
| 11166 off = 0; | |
| 11167 } | |
| 11168 | |
| 11169 /* In list mode virtcol needs to be recomputed */ | |
| 11170 virtcol = wp->w_virtcol; | |
| 11171 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 11172 { | |
| 11173 wp->w_p_list = FALSE; | |
| 11174 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 11175 wp->w_p_list = TRUE; | |
| 11176 } | |
| 11177 | |
| 11178 /* | |
| 11179 * Some sprintfs return the length, some return a pointer. | |
| 11180 * To avoid portability problems we use strlen() here. | |
| 11181 */ | |
| 1869 | 11182 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 11183 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 11184 ? 0L | |
| 11185 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 11186 len = STRLEN(buffer); |
| 11187 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 11188 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 11189 (int)virtcol + 1); | |
| 11190 | |
| 11191 /* | |
| 11192 * Add a "50%" if there is room for it. | |
| 11193 * On the last line, don't print in the last column (scrolls the | |
| 11194 * screen up on some terminals). | |
| 11195 */ | |
| 11196 i = (int)STRLEN(buffer); | |
| 1869 | 11197 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 11198 o = i + vim_strsize(buffer + i + 1); |
| 11199 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 11200 ++o; | |
| 11201 this_ru_col = ru_col - (Columns - width); | |
| 11202 if (this_ru_col < 0) | |
| 11203 this_ru_col = 0; | |
| 11204 /* Never use more than half the window/screen width, leave the other | |
| 11205 * 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
|
11206 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
|
11207 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
|
11208 if (this_ru_col + o < width) |
| 7 | 11209 { |
| 6466 | 11210 /* 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
|
11211 while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) |
| 7 | 11212 { |
| 11213 #ifdef FEAT_MBYTE | |
| 11214 if (has_mbyte) | |
| 11215 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 11216 else | |
| 11217 #endif | |
| 11218 buffer[i++] = fillchar; | |
| 11219 ++o; | |
| 11220 } | |
| 1869 | 11221 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 11222 } |
| 11223 /* Truncate at window boundary. */ | |
| 11224 #ifdef FEAT_MBYTE | |
| 11225 if (has_mbyte) | |
| 11226 { | |
| 11227 o = 0; | |
| 474 | 11228 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 11229 { |
| 11230 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
|
11231 if (this_ru_col + o > width) |
| 7 | 11232 { |
| 11233 buffer[i] = NUL; | |
| 11234 break; | |
| 11235 } | |
| 11236 } | |
| 11237 } | |
| 11238 else | |
| 11239 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11240 if (this_ru_col + (int)STRLEN(buffer) > width) |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11241 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
|
11242 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11243 screen_puts(buffer, row, this_ru_col + off, attr); |
| 7 | 11244 i = redraw_cmdline; |
| 11245 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
|
11246 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
|
11247 (int)(off + width), |
| 7 | 11248 fillchar, fillchar, attr); |
| 11249 /* don't redraw the cmdline because of showing the ruler */ | |
| 11250 redraw_cmdline = i; | |
| 11251 wp->w_ru_cursor = wp->w_cursor; | |
| 11252 wp->w_ru_virtcol = wp->w_virtcol; | |
| 11253 wp->w_ru_empty = empty_line; | |
| 11254 wp->w_ru_topline = wp->w_topline; | |
| 11255 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 11256 #ifdef FEAT_DIFF | |
| 11257 wp->w_ru_topfill = wp->w_topfill; | |
| 11258 #endif | |
| 11259 } | |
| 11260 } | |
| 11261 #endif | |
| 13 | 11262 |
| 11263 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 11264 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
11265 * 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
|
11266 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 11267 * Otherwise it depends on 'numberwidth' and the line count. |
| 11268 */ | |
| 11269 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11270 number_width(win_T *wp) |
| 13 | 11271 { |
| 11272 int n; | |
| 11273 linenr_T lnum; | |
| 11274 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11275 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
|
11276 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11277 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11278 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11279 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11280 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
|
11281 |
| 6679 | 11282 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 11283 return wp->w_nrwidth_width; |
| 11284 wp->w_nrwidth_line_count = lnum; | |
| 11285 | |
| 11286 n = 0; | |
| 11287 do | |
| 11288 { | |
| 856 | 11289 lnum /= 10; |
| 11290 ++n; | |
| 13 | 11291 } while (lnum > 0); |
| 11292 | |
| 11293 /* 'numberwidth' gives the minimal width plus one */ | |
| 11294 if (n < wp->w_p_nuw - 1) | |
| 11295 n = wp->w_p_nuw - 1; | |
| 11296 | |
| 11297 wp->w_nrwidth_width = n; | |
| 6679 | 11298 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11299 return n; |
| 11300 } | |
| 11301 #endif | |
| 3986 | 11302 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11303 #if defined(FEAT_EVAL) || defined(PROTO) |
| 3986 | 11304 /* |
| 11305 * Return the current cursor column. This is the actual position on the | |
| 11306 * screen. First column is 0. | |
| 11307 */ | |
| 11308 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11309 screen_screencol(void) |
| 3986 | 11310 { |
| 11311 return screen_cur_col; | |
| 11312 } | |
| 11313 | |
| 11314 /* | |
| 11315 * Return the current cursor row. This is the actual position on the screen. | |
| 11316 * First row is 0. | |
| 11317 */ | |
| 11318 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11319 screen_screenrow(void) |
| 3986 | 11320 { |
| 11321 return screen_cur_row; | |
| 11322 } | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11323 #endif |