Mercurial > vim
annotate src/screen.c @ 9649:fd9727ae3c49 v7.4.2101
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jul 24 22:04:11 2016 +0200
patch 7.4.2101
Problem: Looping over windows, buffers and tab pages is inconsistant.
Solution: Use FOR_ALL_ macros everywhere. (Yegappan Lakshmanan)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 24 Jul 2016 22:15:07 +0200 |
| parents | 123d3c102035 |
| children | b193bdb6ea25 |
| rev | line source |
|---|---|
| 7 | 1 /* vi:set ts=8 sts=4 sw=4: |
| 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 | |
| 115 /* | |
| 116 * Buffer for one screen line (characters and attributes). | |
| 117 */ | |
| 118 static schar_T *current_ScreenLine; | |
| 119 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
120 static void win_update(win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
121 static void win_draw_end(win_T *wp, int c1, int c2, int row, int endrow, hlf_T hl); |
| 7 | 122 #ifdef FEAT_FOLDING |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
123 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
|
124 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
|
125 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
|
126 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
127 static int win_line(win_T *, linenr_T, int, int, int nochange); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
128 static int char_needs_redraw(int off_from, int off_to, int cols); |
| 7 | 129 #ifdef FEAT_RIGHTLEFT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
130 static void screen_line(int row, int coloff, int endcol, int clear_width, int rlflag); |
| 7 | 131 # define SCREEN_LINE(r, o, e, c, rl) screen_line((r), (o), (e), (c), (rl)) |
| 132 #else | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
133 static void screen_line(int row, int coloff, int endcol, int clear_width); |
| 7 | 134 # define SCREEN_LINE(r, o, e, c, rl) screen_line((r), (o), (e), (c)) |
| 135 #endif | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
136 #ifdef FEAT_WINDOWS |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
137 static void draw_vsep_win(win_T *wp, int row); |
| 7 | 138 #endif |
| 680 | 139 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
140 static void redraw_custom_statusline(win_T *wp); |
| 680 | 141 #endif |
| 7 | 142 #ifdef FEAT_SEARCH_EXTRA |
| 5985 | 143 # define SEARCH_HL_PRIORITY 0 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
144 static void start_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
145 static void end_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
146 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
|
147 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
|
148 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
|
149 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
|
150 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
151 static void screen_start_highlight(int attr); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
152 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
|
153 #ifdef FEAT_MBYTE |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
154 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
|
155 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
156 static void screenclear2(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
157 static void lineclear(unsigned off, int width); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
158 static void lineinvalid(unsigned off, int width); |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
159 #ifdef FEAT_WINDOWS |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
160 static void linecopy(int to, int from, win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
161 static void redraw_block(int row, int end, win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
162 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
163 static int win_do_lines(win_T *wp, int row, int line_count, int mayclear, int del); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
164 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
|
165 static void msg_pos_mode(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
166 static void recording_mode(int attr); |
| 667 | 167 #if defined(FEAT_WINDOWS) |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
168 static void draw_tabline(void); |
| 667 | 169 #endif |
| 7 | 170 #if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
171 static int fillchar_status(int *attr, int is_curwin); |
| 7 | 172 #endif |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
173 #ifdef FEAT_WINDOWS |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
174 static int fillchar_vsep(int *attr); |
| 7 | 175 #endif |
| 176 #ifdef FEAT_STL_OPT | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
177 static void win_redr_custom(win_T *wp, int draw_ruler); |
| 7 | 178 #endif |
| 179 #ifdef FEAT_CMDL_INFO | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
180 static void win_redr_ruler(win_T *wp, int always); |
| 7 | 181 #endif |
| 182 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
183 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) |
| 7 | 184 /* Ugly global: overrule attribute used by screen_char() */ |
| 185 static int screen_char_attr = 0; | |
| 186 #endif | |
| 187 | |
| 188 /* | |
| 189 * Redraw the current window later, with update_screen(type). | |
| 190 * Set must_redraw only if not already set to a higher value. | |
| 191 * e.g. if must_redraw is CLEAR, type NOT_VALID will do nothing. | |
| 192 */ | |
| 193 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
194 redraw_later(int type) |
| 7 | 195 { |
| 196 redraw_win_later(curwin, type); | |
| 197 } | |
| 198 | |
| 199 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
200 redraw_win_later( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
201 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
202 int type) |
| 7 | 203 { |
| 204 if (wp->w_redr_type < type) | |
| 205 { | |
| 206 wp->w_redr_type = type; | |
| 207 if (type >= NOT_VALID) | |
| 208 wp->w_lines_valid = 0; | |
| 209 if (must_redraw < type) /* must_redraw is the maximum of all windows */ | |
| 210 must_redraw = type; | |
| 211 } | |
| 212 } | |
| 213 | |
| 214 /* | |
| 215 * Force a complete redraw later. Also resets the highlighting. To be used | |
| 216 * after executing a shell command that messes up the screen. | |
| 217 */ | |
| 218 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
219 redraw_later_clear(void) |
| 7 | 220 { |
| 221 redraw_all_later(CLEAR); | |
| 826 | 222 #ifdef FEAT_GUI |
| 223 if (gui.in_use) | |
| 224 /* Use a code that will reset gui.highlight_mask in | |
| 225 * gui_stop_highlight(). */ | |
| 226 screen_attr = HL_ALL + 1; | |
| 227 else | |
| 228 #endif | |
| 229 /* Use attributes that is very unlikely to appear in text. */ | |
| 230 screen_attr = HL_BOLD | HL_UNDERLINE | HL_INVERSE; | |
| 7 | 231 } |
| 232 | |
| 233 /* | |
| 234 * Mark all windows to be redrawn later. | |
| 235 */ | |
| 236 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
237 redraw_all_later(int type) |
| 7 | 238 { |
| 239 win_T *wp; | |
| 240 | |
| 241 FOR_ALL_WINDOWS(wp) | |
| 242 { | |
| 243 redraw_win_later(wp, type); | |
| 244 } | |
| 245 } | |
| 246 | |
| 247 /* | |
| 301 | 248 * Mark all windows that are editing the current buffer to be updated later. |
| 7 | 249 */ |
| 250 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
251 redraw_curbuf_later(int type) |
| 7 | 252 { |
| 253 redraw_buf_later(curbuf, type); | |
| 254 } | |
| 255 | |
| 256 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
257 redraw_buf_later(buf_T *buf, int type) |
| 7 | 258 { |
| 259 win_T *wp; | |
| 260 | |
| 261 FOR_ALL_WINDOWS(wp) | |
| 262 { | |
| 263 if (wp->w_buffer == buf) | |
| 264 redraw_win_later(wp, type); | |
| 265 } | |
| 266 } | |
| 267 | |
| 268 /* | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
269 * 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
|
270 * 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
|
271 * Return a code indicating what happened. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
272 */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
273 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
274 redraw_asap(int type) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
275 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
276 int rows; |
| 6959 | 277 int cols = screen_Columns; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
278 int r; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
279 int ret = 0; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
280 schar_T *screenline; /* copy from ScreenLines[] */ |
|
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
281 sattr_T *screenattr; /* copy from ScreenAttrs[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
282 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
283 int i; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
284 u8char_T *screenlineUC = NULL; /* copy from ScreenLinesUC[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
285 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
|
286 schar_T *screenline2 = NULL; /* copy from ScreenLines2[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
287 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
288 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
289 redraw_later(type); |
| 6959 | 290 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
|
291 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
292 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
293 /* Allocate space to save the text displayed in the command line area. */ |
| 6959 | 294 rows = screen_Rows - cmdline_row; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
295 screenline = (schar_T *)lalloc( |
| 6959 | 296 (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
|
297 screenattr = (sattr_T *)lalloc( |
| 6959 | 298 (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
|
299 if (screenline == NULL || screenattr == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
300 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
301 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
302 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
303 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
304 screenlineUC = (u8char_T *)lalloc( |
| 6959 | 305 (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
|
306 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
307 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
308 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
309 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
310 screenlineC[i] = (u8char_T *)lalloc( |
| 6959 | 311 (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
|
312 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
313 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
314 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
315 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
316 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
317 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
318 screenline2 = (schar_T *)lalloc( |
| 6959 | 319 (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
|
320 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
321 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
322 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
323 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
324 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
325 if (ret != 2) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
326 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
327 /* 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
|
328 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
329 { |
| 6959 | 330 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
331 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 332 (size_t)cols * sizeof(schar_T)); |
| 333 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
334 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 335 (size_t)cols * sizeof(sattr_T)); |
|
5090
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 { |
| 6959 | 339 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
340 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 341 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
342 for (i = 0; i < p_mco; ++i) |
| 6959 | 343 mch_memmove(screenlineC[i] + r * cols, |
| 344 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 345 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
346 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
347 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 348 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
349 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 350 (size_t)cols * sizeof(schar_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
351 #endif |
|
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 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
354 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
355 ret = 3; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
356 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
357 if (must_redraw == 0) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
358 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
359 int off = (int)(current_ScreenLine - ScreenLines); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
360 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
361 /* 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
|
362 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
363 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
364 mch_memmove(current_ScreenLine, |
| 6959 | 365 screenline + r * cols, |
| 366 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
367 mch_memmove(ScreenAttrs + off, |
| 6959 | 368 screenattr + r * cols, |
| 369 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
370 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
371 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
372 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
373 mch_memmove(ScreenLinesUC + off, |
| 6959 | 374 screenlineUC + r * cols, |
| 375 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
376 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
377 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 378 screenlineC[i] + r * cols, |
| 379 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
380 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
381 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
382 mch_memmove(ScreenLines2 + off, |
| 6959 | 383 screenline2 + r * cols, |
| 384 (size_t)cols * sizeof(schar_T)); | |
| 385 #endif | |
| 386 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
|
387 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
388 ret = 4; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
389 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
390 } |
|
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 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
393 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
394 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
395 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
396 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
397 vim_free(screenlineUC); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
398 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
399 vim_free(screenlineC[i]); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
400 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
401 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
402 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
403 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
404 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
405 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
406 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
407 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
408 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
409 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
410 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
411 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
412 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
413 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
414 * 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
|
415 * 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
|
416 * it belongs. If highlighting was changed a redraw is needed. |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
417 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
418 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
419 redraw_after_callback(void) |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
420 { |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
421 if (State == HITRETURN || State == ASKMORE) |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
422 ; /* do nothing */ |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
423 else if (State & CMDLINE) |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
424 redrawcmdline(); |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
425 else if (State & (NORMAL | INSERT)) |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
426 { |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
427 update_screen(0); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
428 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
429 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
430 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
431 out_flush(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
432 #ifdef FEAT_GUI |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
433 if (gui.in_use) |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
434 { |
|
9428
0c7f47088e55
commit https://github.com/vim/vim/commit/9d5d3c9c4468ad76f16b50eabd3d9e7eab2ed44d
Christian Brabandt <cb@256bit.org>
parents:
9320
diff
changeset
|
435 /* Don't update the cursor when it is blinking and off to avoid |
|
0c7f47088e55
commit https://github.com/vim/vim/commit/9d5d3c9c4468ad76f16b50eabd3d9e7eab2ed44d
Christian Brabandt <cb@256bit.org>
parents:
9320
diff
changeset
|
436 * flicker. */ |
|
0c7f47088e55
commit https://github.com/vim/vim/commit/9d5d3c9c4468ad76f16b50eabd3d9e7eab2ed44d
Christian Brabandt <cb@256bit.org>
parents:
9320
diff
changeset
|
437 if (!gui_mch_is_blink_off()) |
|
9213
bb86514cad15
commit https://github.com/vim/vim/commit/703a8044b5393d37d355b0b1054a9a5a13912a3f
Christian Brabandt <cb@256bit.org>
parents:
9100
diff
changeset
|
438 gui_update_cursor(FALSE, FALSE); |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
439 gui_mch_flush(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
440 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
441 #endif |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
442 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
443 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
444 /* |
| 7 | 445 * Changed something in the current window, at buffer line "lnum", that |
| 446 * requires that line and possibly other lines to be redrawn. | |
| 447 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 448 * Used to remove the "$" from a change command. | |
| 449 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 450 * may become invalid and the whole window will have to be redrawn. | |
| 451 */ | |
| 452 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
453 redrawWinline( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
454 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
455 int invalid UNUSED) /* window line height is invalid now */ |
| 7 | 456 { |
| 457 #ifdef FEAT_FOLDING | |
| 458 int i; | |
| 459 #endif | |
| 460 | |
| 461 if (curwin->w_redraw_top == 0 || curwin->w_redraw_top > lnum) | |
| 462 curwin->w_redraw_top = lnum; | |
| 463 if (curwin->w_redraw_bot == 0 || curwin->w_redraw_bot < lnum) | |
| 464 curwin->w_redraw_bot = lnum; | |
| 465 redraw_later(VALID); | |
| 466 | |
| 467 #ifdef FEAT_FOLDING | |
| 468 if (invalid) | |
| 469 { | |
| 470 /* A w_lines[] entry for this lnum has become invalid. */ | |
| 471 i = find_wl_entry(curwin, lnum); | |
| 472 if (i >= 0) | |
| 473 curwin->w_lines[i].wl_valid = FALSE; | |
| 474 } | |
| 475 #endif | |
| 476 } | |
| 477 | |
| 478 /* | |
| 479 * update all windows that are editing the current buffer | |
| 480 */ | |
| 481 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
482 update_curbuf(int type) |
| 7 | 483 { |
| 484 redraw_curbuf_later(type); | |
| 485 update_screen(type); | |
| 486 } | |
| 487 | |
| 488 /* | |
| 489 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 490 * of stuff from Filemem to ScreenLines[], and update curwin->w_botline. | |
| 491 */ | |
| 492 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
493 update_screen(int type) |
| 7 | 494 { |
| 495 win_T *wp; | |
| 496 static int did_intro = FALSE; | |
| 497 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 498 int did_one; | |
| 499 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
500 #ifdef FEAT_GUI |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
501 int gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
502 int gui_cursor_row; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
503 #endif |
| 7 | 504 |
| 2008 | 505 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 506 if (!screen_valid(TRUE)) |
| 507 return; | |
| 508 | |
| 509 if (must_redraw) | |
| 510 { | |
| 511 if (type < must_redraw) /* use maximal type */ | |
| 512 type = must_redraw; | |
| 1331 | 513 |
| 514 /* must_redraw is reset here, so that when we run into some weird | |
| 515 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 516 * scrolling), or update_topline() in win_update() will cause a | |
| 517 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 518 must_redraw = 0; |
| 519 } | |
| 520 | |
| 521 /* Need to update w_lines[]. */ | |
| 522 if (curwin->w_lines_valid == 0 && type < NOT_VALID) | |
| 523 type = NOT_VALID; | |
| 524 | |
| 2008 | 525 /* Postpone the redrawing when it's not needed and when being called |
| 526 * recursively. */ | |
| 527 if (!redrawing() || updating_screen) | |
| 7 | 528 { |
| 529 redraw_later(type); /* remember type for next time */ | |
| 530 must_redraw = type; | |
| 531 if (type > INVERTED_ALL) | |
| 532 curwin->w_lines_valid = 0; /* don't use w_lines[].wl_size now */ | |
| 533 return; | |
| 534 } | |
| 535 | |
| 536 updating_screen = TRUE; | |
| 537 #ifdef FEAT_SYN_HL | |
| 538 ++display_tick; /* let syntax code know we're in a next round of | |
| 539 * display updating */ | |
| 540 #endif | |
| 541 | |
| 542 /* | |
| 543 * if the screen was scrolled up when displaying a message, scroll it down | |
| 544 */ | |
| 545 if (msg_scrolled) | |
| 546 { | |
| 547 clear_cmdline = TRUE; | |
| 548 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 549 type = CLEAR; | |
| 550 else if (type != CLEAR) | |
| 551 { | |
| 552 check_for_delay(FALSE); | |
| 553 if (screen_ins_lines(0, 0, msg_scrolled, (int)Rows, NULL) == FAIL) | |
| 554 type = CLEAR; | |
| 555 FOR_ALL_WINDOWS(wp) | |
| 556 { | |
| 557 if (W_WINROW(wp) < msg_scrolled) | |
| 558 { | |
| 559 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 560 && wp->w_redr_type < REDRAW_TOP | |
| 561 && wp->w_lines_valid > 0 | |
| 562 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 563 { | |
| 564 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 565 wp->w_redr_type = REDRAW_TOP; | |
| 566 } | |
| 567 else | |
| 568 { | |
| 569 wp->w_redr_type = NOT_VALID; | |
| 570 #ifdef FEAT_WINDOWS | |
| 571 if (W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp) | |
| 572 <= msg_scrolled) | |
| 573 wp->w_redr_status = TRUE; | |
| 574 #endif | |
| 575 } | |
| 576 } | |
| 577 } | |
| 578 redraw_cmdline = TRUE; | |
| 667 | 579 #ifdef FEAT_WINDOWS |
| 673 | 580 redraw_tabline = TRUE; |
| 667 | 581 #endif |
| 7 | 582 } |
| 583 msg_scrolled = 0; | |
| 584 need_wait_return = FALSE; | |
| 585 } | |
| 586 | |
| 587 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 588 compute_cmdrow(); | |
| 589 | |
| 590 /* Check for changed highlighting */ | |
| 591 if (need_highlight_changed) | |
| 592 highlight_changed(); | |
| 593 | |
| 594 if (type == CLEAR) /* first clear screen */ | |
| 595 { | |
| 596 screenclear(); /* will reset clear_cmdline */ | |
| 597 type = NOT_VALID; | |
| 598 } | |
| 599 | |
| 600 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 601 check_for_delay(FALSE); | |
| 602 | |
| 13 | 603 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
604 /* 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
|
605 * changes. */ |
| 13 | 606 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
607 && 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
|
608 ? number_width(curwin) : 0)) |
| 13 | 609 curwin->w_redr_type = NOT_VALID; |
| 610 #endif | |
| 611 | |
| 7 | 612 /* |
| 613 * Only start redrawing if there is really something to do. | |
| 614 */ | |
| 615 if (type == INVERTED) | |
| 616 update_curswant(); | |
| 617 if (curwin->w_redr_type < type | |
| 618 && !((type == VALID | |
| 619 && curwin->w_lines[0].wl_valid | |
| 620 #ifdef FEAT_DIFF | |
| 621 && curwin->w_topfill == curwin->w_old_topfill | |
| 622 && curwin->w_botfill == curwin->w_old_botfill | |
| 623 #endif | |
| 624 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 625 || (type == INVERTED | |
| 1043 | 626 && VIsual_active |
| 7 | 627 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 628 && curwin->w_old_visual_mode == VIsual_mode | |
| 629 && (curwin->w_valid & VALID_VIRTCOL) | |
| 630 && curwin->w_old_curswant == curwin->w_curswant) | |
| 631 )) | |
| 632 curwin->w_redr_type = type; | |
| 633 | |
| 849 | 634 #ifdef FEAT_WINDOWS |
| 635 /* Redraw the tab pages line if needed. */ | |
| 636 if (redraw_tabline || type >= NOT_VALID) | |
| 637 draw_tabline(); | |
| 638 #endif | |
| 639 | |
| 7 | 640 #ifdef FEAT_SYN_HL |
| 641 /* | |
| 642 * Correct stored syntax highlighting info for changes in each displayed | |
| 643 * buffer. Each buffer must only be done once. | |
| 644 */ | |
| 645 FOR_ALL_WINDOWS(wp) | |
| 646 { | |
| 647 if (wp->w_buffer->b_mod_set) | |
| 648 { | |
| 649 # ifdef FEAT_WINDOWS | |
| 650 win_T *wwp; | |
| 651 | |
| 652 /* Check if we already did this buffer. */ | |
| 653 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 654 if (wwp->w_buffer == wp->w_buffer) | |
| 655 break; | |
| 656 # endif | |
| 657 if ( | |
| 658 # ifdef FEAT_WINDOWS | |
| 659 wwp == wp && | |
| 660 # endif | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
661 syntax_present(wp)) |
| 7 | 662 syn_stack_apply_changes(wp->w_buffer); |
| 663 } | |
| 664 } | |
| 665 #endif | |
| 666 | |
| 667 /* | |
| 668 * Go from top to bottom through the windows, redrawing the ones that need | |
| 669 * it. | |
| 670 */ | |
| 671 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 672 did_one = FALSE; | |
| 673 #endif | |
| 674 #ifdef FEAT_SEARCH_EXTRA | |
| 675 search_hl.rm.regprog = NULL; | |
| 676 #endif | |
| 677 FOR_ALL_WINDOWS(wp) | |
| 678 { | |
| 679 if (wp->w_redr_type != 0) | |
| 680 { | |
| 681 cursor_off(); | |
| 682 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 683 if (!did_one) | |
| 684 { | |
| 685 did_one = TRUE; | |
| 686 # ifdef FEAT_SEARCH_EXTRA | |
| 687 start_search_hl(); | |
| 688 # endif | |
| 689 # ifdef FEAT_CLIPBOARD | |
| 690 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 691 if (clip_star.available && clip_isautosel_star()) |
| 692 clip_update_selection(&clip_star); | |
| 693 if (clip_plus.available && clip_isautosel_plus()) | |
| 694 clip_update_selection(&clip_plus); | |
| 7 | 695 # endif |
| 696 #ifdef FEAT_GUI | |
| 697 /* Remove the cursor before starting to do anything, because | |
| 698 * scrolling may make it difficult to redraw the text under | |
| 699 * it. */ | |
| 700 if (gui.in_use) | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
701 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
702 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
703 gui_cursor_row = gui.cursor_row; |
| 7 | 704 gui_undraw_cursor(); |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
705 } |
| 7 | 706 #endif |
| 707 } | |
| 708 #endif | |
| 709 win_update(wp); | |
| 710 } | |
| 711 | |
| 712 #ifdef FEAT_WINDOWS | |
| 713 /* redraw status line after the window to minimize cursor movement */ | |
| 714 if (wp->w_redr_status) | |
| 715 { | |
| 716 cursor_off(); | |
| 717 win_redr_status(wp); | |
| 718 } | |
| 719 #endif | |
| 720 } | |
| 721 #if defined(FEAT_SEARCH_EXTRA) | |
| 722 end_search_hl(); | |
| 723 #endif | |
| 4107 | 724 #ifdef FEAT_INS_EXPAND |
| 725 /* May need to redraw the popup menu. */ | |
| 726 if (pum_visible()) | |
| 727 pum_redraw(); | |
| 728 #endif | |
| 7 | 729 |
| 730 #ifdef FEAT_WINDOWS | |
| 731 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 732 * 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
|
733 FOR_ALL_WINDOWS(wp) |
| 7 | 734 wp->w_buffer->b_mod_set = FALSE; |
| 735 #else | |
| 736 curbuf->b_mod_set = FALSE; | |
| 737 #endif | |
| 738 | |
| 739 updating_screen = FALSE; | |
| 740 #ifdef FEAT_GUI | |
| 741 gui_may_resize_shell(); | |
| 742 #endif | |
| 743 | |
| 744 /* Clear or redraw the command line. Done last, because scrolling may | |
| 745 * mess up the command line. */ | |
| 746 if (clear_cmdline || redraw_cmdline) | |
| 747 showmode(); | |
| 748 | |
| 749 /* 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
|
750 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
751 maybe_intro_message(); |
| 7 | 752 did_intro = TRUE; |
| 753 | |
| 754 #ifdef FEAT_GUI | |
| 755 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 756 * done. */ | |
| 757 if (gui.in_use) | |
| 758 { | |
| 759 out_flush(); /* required before updating the cursor */ | |
|
9489
c5f40fc2e3e0
commit https://github.com/vim/vim/commit/da3a77d9ec28407b8fa2aa014e76944d0a525662
Christian Brabandt <cb@256bit.org>
parents:
9446
diff
changeset
|
760 if (did_one && !gui_mch_is_blink_off()) |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
761 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
762 /* 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
|
763 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
764 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
765 gui.row = gui_cursor_row; |
| 7 | 766 gui_update_cursor(FALSE, FALSE); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
767 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
768 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
769 } |
| 7 | 770 gui_update_scrollbars(FALSE); |
| 771 } | |
| 772 #endif | |
| 773 } | |
| 774 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
775 #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
|
776 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
777 * 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
|
778 * 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
|
779 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
780 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
781 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
|
782 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
783 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
|
784 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
785 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
|
786 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
|
787 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
|
788 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
|
789 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
|
790 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
|
791 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
|
792 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
793 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
794 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
|
795 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
796 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
|
797 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
|
798 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
799 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
800 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
801 * 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
|
802 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
803 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
804 conceal_check_cursur_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
|
805 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
806 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
|
807 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
808 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
|
809 /* 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
|
810 * 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
|
811 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
|
812 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
813 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
814 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
815 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
816 update_single_line(win_T *wp, linenr_T lnum) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
817 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
818 int row; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
819 int j; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
820 |
|
9100
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
821 /* Don't do anything if the screen structures are (not yet) valid. */ |
|
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
822 if (!screen_valid(TRUE)) |
|
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
823 return; |
|
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
824 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
825 if (lnum >= wp->w_topline && lnum < wp->w_botline |
|
2269
fb627e94e6c6
Couple of small fixes for conceal feature. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2255
diff
changeset
|
826 && foldedCount(wp, lnum, &win_foldinfo) == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
827 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
828 # ifdef FEAT_GUI |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
829 /* Remove the cursor before starting to do anything, because scrolling |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
830 * may make it difficult to redraw the text under it. */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
831 if (gui.in_use) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
832 gui_undraw_cursor(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
833 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
834 row = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
835 for (j = 0; j < wp->w_lines_valid; ++j) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
836 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
837 if (lnum == wp->w_lines[j].wl_lnum) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
838 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
839 screen_start(); /* not sure of screen cursor */ |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
840 # ifdef FEAT_SEARCH_EXTRA |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
841 init_search_hl(wp); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
842 start_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
843 prepare_search_hl(wp, lnum); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
844 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
845 win_line(wp, lnum, row, row + wp->w_lines[j].wl_size, FALSE); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
846 # if defined(FEAT_SEARCH_EXTRA) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
847 end_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
848 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
849 break; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
850 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
851 row += wp->w_lines[j].wl_size; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
852 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
853 # ifdef FEAT_GUI |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
854 /* Redraw the cursor */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
855 if (gui.in_use) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
856 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
857 out_flush(); /* required before updating the cursor */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
858 gui_update_cursor(FALSE, FALSE); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
859 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
860 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
861 } |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
862 need_cursor_line_redraw = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
863 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
864 #endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
865 |
| 7 | 866 #if defined(FEAT_SIGNS) || defined(FEAT_GUI) |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
867 static void update_prepare(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
868 static void update_finish(void); |
| 7 | 869 |
| 870 /* | |
| 871 * Prepare for updating one or more windows. | |
| 2008 | 872 * Caller must check for "updating_screen" already set to avoid recursiveness. |
| 7 | 873 */ |
| 874 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
875 update_prepare(void) |
| 7 | 876 { |
| 877 cursor_off(); | |
| 878 updating_screen = TRUE; | |
| 879 #ifdef FEAT_GUI | |
| 880 /* Remove the cursor before starting to do anything, because scrolling may | |
| 881 * make it difficult to redraw the text under it. */ | |
| 882 if (gui.in_use) | |
| 883 gui_undraw_cursor(); | |
| 884 #endif | |
| 885 #ifdef FEAT_SEARCH_EXTRA | |
| 886 start_search_hl(); | |
| 887 #endif | |
| 888 } | |
| 889 | |
| 890 /* | |
| 891 * Finish updating one or more windows. | |
| 892 */ | |
| 893 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
894 update_finish(void) |
| 7 | 895 { |
| 896 if (redraw_cmdline) | |
| 897 showmode(); | |
| 898 | |
| 899 # ifdef FEAT_SEARCH_EXTRA | |
| 900 end_search_hl(); | |
| 901 # endif | |
| 902 | |
| 903 updating_screen = FALSE; | |
| 904 | |
| 905 # ifdef FEAT_GUI | |
| 906 gui_may_resize_shell(); | |
| 907 | |
| 908 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 909 * done. */ | |
| 910 if (gui.in_use) | |
| 911 { | |
| 912 out_flush(); /* required before updating the cursor */ | |
| 913 gui_update_cursor(FALSE, FALSE); | |
| 914 gui_update_scrollbars(FALSE); | |
| 915 } | |
| 916 # endif | |
| 917 } | |
| 918 #endif | |
| 919 | |
| 920 #if defined(FEAT_SIGNS) || defined(PROTO) | |
| 921 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
922 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 923 { |
| 924 win_T *wp; | |
| 925 int doit = FALSE; | |
| 926 | |
| 927 # ifdef FEAT_FOLDING | |
| 928 win_foldinfo.fi_level = 0; | |
| 929 # endif | |
| 930 | |
| 931 /* update/delete a specific mark */ | |
| 932 FOR_ALL_WINDOWS(wp) | |
| 933 { | |
| 934 if (buf != NULL && lnum > 0) | |
| 935 { | |
| 936 if (wp->w_buffer == buf && lnum >= wp->w_topline | |
| 937 && lnum < wp->w_botline) | |
| 938 { | |
| 939 if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) | |
| 940 wp->w_redraw_top = lnum; | |
| 941 if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) | |
| 942 wp->w_redraw_bot = lnum; | |
| 943 redraw_win_later(wp, VALID); | |
| 944 } | |
| 945 } | |
| 946 else | |
| 947 redraw_win_later(wp, VALID); | |
| 948 if (wp->w_redr_type != 0) | |
| 949 doit = TRUE; | |
| 950 } | |
| 951 | |
| 3250 | 952 /* Return when there is nothing to do, screen updating is already |
| 953 * happening (recursive call) or still starting up. */ | |
| 954 if (!doit || updating_screen | |
| 955 #ifdef FEAT_GUI | |
| 956 || gui.starting | |
| 957 #endif | |
| 958 || starting) | |
| 7 | 959 return; |
| 960 | |
| 961 /* update all windows that need updating */ | |
| 962 update_prepare(); | |
| 963 | |
| 964 # ifdef FEAT_WINDOWS | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
965 FOR_ALL_WINDOWS(wp) |
| 7 | 966 { |
| 967 if (wp->w_redr_type != 0) | |
| 968 win_update(wp); | |
| 969 if (wp->w_redr_status) | |
| 970 win_redr_status(wp); | |
| 971 } | |
| 972 # else | |
| 973 if (curwin->w_redr_type != 0) | |
| 974 win_update(curwin); | |
| 975 # endif | |
| 976 | |
| 977 update_finish(); | |
| 978 } | |
| 979 #endif | |
| 980 | |
| 981 | |
| 982 #if defined(FEAT_GUI) || defined(PROTO) | |
| 983 /* | |
| 984 * Update a single window, its status line and maybe the command line msg. | |
| 985 * Used for the GUI scrollbar. | |
| 986 */ | |
| 987 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
988 updateWindow(win_T *wp) |
| 7 | 989 { |
| 2008 | 990 /* return if already busy updating */ |
| 991 if (updating_screen) | |
| 992 return; | |
| 993 | |
| 7 | 994 update_prepare(); |
| 995 | |
| 996 #ifdef FEAT_CLIPBOARD | |
| 997 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 998 if (clip_star.available && clip_isautosel_star()) |
| 999 clip_update_selection(&clip_star); | |
| 1000 if (clip_plus.available && clip_isautosel_plus()) | |
| 1001 clip_update_selection(&clip_plus); | |
| 7 | 1002 #endif |
| 670 | 1003 |
| 7 | 1004 win_update(wp); |
| 670 | 1005 |
| 7 | 1006 #ifdef FEAT_WINDOWS |
| 670 | 1007 /* When the screen was cleared redraw the tab pages line. */ |
| 673 | 1008 if (redraw_tabline) |
| 677 | 1009 draw_tabline(); |
| 670 | 1010 |
| 7 | 1011 if (wp->w_redr_status |
| 1012 # ifdef FEAT_CMDL_INFO | |
| 1013 || p_ru | |
| 1014 # endif | |
| 1015 # ifdef FEAT_STL_OPT | |
| 40 | 1016 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1017 # endif |
| 1018 ) | |
| 1019 win_redr_status(wp); | |
| 1020 #endif | |
| 1021 | |
| 1022 update_finish(); | |
| 1023 } | |
| 1024 #endif | |
| 1025 | |
| 1026 /* | |
| 1027 * Update a single window. | |
| 1028 * | |
| 1029 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1030 * screen or scrolling lines). | |
| 1031 * | |
| 1032 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1033 * implies the one below it. | |
| 1034 * NOT_VALID redraw the whole window | |
| 743 | 1035 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1036 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1037 * INVERTED redraw the changed part of the Visual area | |
| 1038 * INVERTED_ALL redraw the whole Visual area | |
| 1039 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1040 * 2. update lines at the top when scrolled down | |
| 1041 * 3. redraw changed text: | |
| 301 | 1042 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1043 * b_mod_top and b_mod_bot. |
| 1044 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1045 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1046 * - continue redrawing when syntax status is invalid. | |
| 1047 * 4. if scrolled up, update lines at the bottom. | |
| 1048 * This results in three areas that may need updating: | |
| 1049 * top: from first row to top_end (when scrolled down) | |
| 1050 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1051 * bot: from bot_start to last row (when scrolled up) | |
| 1052 */ | |
| 1053 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1054 win_update(win_T *wp) |
| 7 | 1055 { |
| 1056 buf_T *buf = wp->w_buffer; | |
| 1057 int type; | |
| 1058 int top_end = 0; /* Below last row of the top area that needs | |
| 1059 updating. 0 when no top area updating. */ | |
| 1060 int mid_start = 999;/* first row of the mid area that needs | |
| 1061 updating. 999 when no mid area updating. */ | |
| 1062 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1063 updating. 0 when no mid area updating. */ | |
| 1064 int bot_start = 999;/* first row of the bot area that needs | |
| 1065 updating. 999 when no bot area updating */ | |
| 1066 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1067 w_topline got smaller a bit */ | |
| 1068 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1069 matchitem_T *cur; /* points to the match list */ |
| 7 | 1070 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1071 #endif | |
| 1072 | |
| 1073 int row; /* current window row to display */ | |
| 1074 linenr_T lnum; /* current buffer lnum to display */ | |
| 1075 int idx; /* current index in w_lines[] */ | |
| 1076 int srow; /* starting row of the current line */ | |
| 1077 | |
| 1078 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1079 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1080 int i; | |
| 1081 long j; | |
| 1082 static int recursive = FALSE; /* being called recursively */ | |
| 1083 int old_botline = wp->w_botline; | |
| 1084 #ifdef FEAT_FOLDING | |
| 1085 long fold_count; | |
| 1086 #endif | |
| 1087 #ifdef FEAT_SYN_HL | |
| 1088 /* remember what happened to the previous line, to know if | |
| 1089 * check_visual_highlight() can be used */ | |
| 1090 #define DID_NONE 1 /* didn't update a line */ | |
| 1091 #define DID_LINE 2 /* updated a normal line */ | |
| 1092 #define DID_FOLD 3 /* updated a folded line */ | |
| 1093 int did_update = DID_NONE; | |
| 1094 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1095 #endif | |
| 1096 linenr_T mod_top = 0; | |
| 1097 linenr_T mod_bot = 0; | |
| 1098 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1099 int save_got_int; | |
| 1100 #endif | |
| 1101 | |
| 1102 type = wp->w_redr_type; | |
| 1103 | |
| 1104 if (type == NOT_VALID) | |
| 1105 { | |
| 1106 #ifdef FEAT_WINDOWS | |
| 1107 wp->w_redr_status = TRUE; | |
| 1108 #endif | |
| 1109 wp->w_lines_valid = 0; | |
| 1110 } | |
| 1111 | |
| 1112 /* Window is zero-height: nothing to draw. */ | |
| 1113 if (wp->w_height == 0) | |
| 1114 { | |
| 1115 wp->w_redr_type = 0; | |
| 1116 return; | |
| 1117 } | |
| 1118 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
1119 #ifdef FEAT_WINDOWS |
| 7 | 1120 /* Window is zero-width: Only need to draw the separator. */ |
| 1121 if (wp->w_width == 0) | |
| 1122 { | |
| 1123 /* draw the vertical separator right of this window */ | |
| 1124 draw_vsep_win(wp, 0); | |
| 1125 wp->w_redr_type = 0; | |
| 1126 return; | |
| 1127 } | |
| 1128 #endif | |
| 1129 | |
| 1130 #ifdef FEAT_SEARCH_EXTRA | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1131 init_search_hl(wp); |
| 7 | 1132 #endif |
| 1133 | |
| 13 | 1134 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1135 /* 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
|
1136 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1137 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1138 if (wp->w_nrwidth != i) |
| 13 | 1139 { |
| 1140 type = NOT_VALID; | |
| 677 | 1141 wp->w_nrwidth = i; |
| 13 | 1142 } |
| 1143 else | |
| 1144 #endif | |
| 1145 | |
| 7 | 1146 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1147 { | |
| 1148 /* | |
| 1149 * When there are both inserted/deleted lines and specific lines to be | |
| 1150 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1151 * everything (only happens when redrawing is off for while). | |
| 1152 */ | |
| 1153 type = NOT_VALID; | |
| 1154 } | |
| 1155 else | |
| 1156 { | |
| 1157 /* | |
| 1158 * Set mod_top to the first line that needs displaying because of | |
| 1159 * changes. Set mod_bot to the first line after the changes. | |
| 1160 */ | |
| 1161 mod_top = wp->w_redraw_top; | |
| 1162 if (wp->w_redraw_bot != 0) | |
| 1163 mod_bot = wp->w_redraw_bot + 1; | |
| 1164 else | |
| 1165 mod_bot = 0; | |
| 1166 wp->w_redraw_top = 0; /* reset for next time */ | |
| 1167 wp->w_redraw_bot = 0; | |
| 1168 if (buf->b_mod_set) | |
| 1169 { | |
| 1170 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1171 { | |
| 1172 mod_top = buf->b_mod_top; | |
| 1173 #ifdef FEAT_SYN_HL | |
| 1174 /* Need to redraw lines above the change that may be included | |
| 1175 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1176 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1177 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1178 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1179 if (mod_top < 1) |
| 1180 mod_top = 1; | |
| 1181 } | |
| 1182 #endif | |
| 1183 } | |
| 1184 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1185 mod_bot = buf->b_mod_bot; | |
| 1186 | |
| 1187 #ifdef FEAT_SEARCH_EXTRA | |
| 1188 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1189 * change in one line may make the Search highlighting in a | |
| 1190 * previous line invalid. Simple solution: redraw all visible | |
| 1191 * lines above the change. | |
| 1326 | 1192 * Same for a match pattern. |
| 7 | 1193 */ |
| 699 | 1194 if (search_hl.rm.regprog != NULL |
| 1195 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1196 top_to_mod = TRUE; |
| 699 | 1197 else |
| 1326 | 1198 { |
| 1199 cur = wp->w_match_head; | |
| 1200 while (cur != NULL) | |
| 1201 { | |
| 1202 if (cur->match.regprog != NULL | |
| 1203 && re_multiline(cur->match.regprog)) | |
| 699 | 1204 { |
| 1205 top_to_mod = TRUE; | |
| 1206 break; | |
| 1207 } | |
| 1326 | 1208 cur = cur->next; |
| 1209 } | |
| 1210 } | |
| 7 | 1211 #endif |
| 1212 } | |
| 1213 #ifdef FEAT_FOLDING | |
| 1214 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1215 { | |
| 1216 linenr_T lnumt, lnumb; | |
| 1217 | |
| 1218 /* | |
| 1219 * A change in a line can cause lines above it to become folded or | |
| 1220 * unfolded. Find the top most buffer line that may be affected. | |
| 1221 * If the line was previously folded and displayed, get the first | |
| 1222 * line of that fold. If the line is folded now, get the first | |
| 1223 * folded line. Use the minimum of these two. | |
| 1224 */ | |
| 1225 | |
| 1226 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1227 * the line below it. If there is no valid entry, use w_topline. | |
| 1228 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1229 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1230 lnumt = wp->w_topline; | |
| 1231 lnumb = MAXLNUM; | |
| 1232 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1233 if (wp->w_lines[i].wl_valid) | |
| 1234 { | |
| 1235 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1236 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1237 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1238 { | |
| 1239 lnumb = wp->w_lines[i].wl_lnum; | |
| 1240 /* When there is a fold column it might need updating | |
| 1241 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1242 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1243 ++lnumb; |
| 1244 } | |
| 1245 } | |
| 1246 | |
| 1247 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1248 if (mod_top > lnumt) | |
| 1249 mod_top = lnumt; | |
| 1250 | |
| 1251 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1252 --mod_bot; | |
| 1253 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1254 ++mod_bot; | |
| 1255 if (mod_bot < lnumb) | |
| 1256 mod_bot = lnumb; | |
| 1257 } | |
| 1258 #endif | |
| 1259 | |
| 1260 /* When a change starts above w_topline and the end is below | |
| 1261 * w_topline, start redrawing at w_topline. | |
| 36 | 1262 * If the end of the change is above w_topline: do like no change was |
| 1263 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1264 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1265 { | |
| 1266 if (mod_bot > wp->w_topline) | |
| 1267 mod_top = wp->w_topline; | |
| 1268 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1269 else if (syntax_present(wp)) |
| 7 | 1270 top_end = 1; |
| 1271 #endif | |
| 1272 } | |
| 36 | 1273 |
| 1274 /* When line numbers are displayed need to redraw all lines below | |
| 1275 * inserted/deleted lines. */ | |
| 1276 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1277 mod_bot = MAXLNUM; | |
| 7 | 1278 } |
| 1279 | |
| 1280 /* | |
| 1281 * When only displaying the lines at the top, set top_end. Used when | |
| 1282 * window has scrolled down for msg_scrolled. | |
| 1283 */ | |
| 1284 if (type == REDRAW_TOP) | |
| 1285 { | |
| 1286 j = 0; | |
| 1287 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1288 { | |
| 1289 j += wp->w_lines[i].wl_size; | |
| 1290 if (j >= wp->w_upd_rows) | |
| 1291 { | |
| 1292 top_end = j; | |
| 1293 break; | |
| 1294 } | |
| 1295 } | |
| 1296 if (top_end == 0) | |
| 1297 /* not found (cannot happen?): redraw everything */ | |
| 1298 type = NOT_VALID; | |
| 1299 else | |
| 1300 /* top area defined, the rest is VALID */ | |
| 1301 type = VALID; | |
| 1302 } | |
| 1303 | |
| 1378 | 1304 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1305 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1306 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1307 * called. */ | |
| 1308 if (screen_cleared) | |
| 1309 screen_cleared = MAYBE; | |
| 1310 | |
| 7 | 1311 /* |
| 1312 * If there are no changes on the screen that require a complete redraw, | |
| 1313 * handle three cases: | |
| 1314 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1315 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1316 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1317 * w_lines[] that needs updating. | |
| 1318 */ | |
| 743 | 1319 if ((type == VALID || type == SOME_VALID |
| 1320 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1321 #ifdef FEAT_DIFF |
| 1322 && !wp->w_botfill && !wp->w_old_botfill | |
| 1323 #endif | |
| 1324 ) | |
| 1325 { | |
| 1326 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1327 { | |
| 1328 /* | |
| 1329 * w_topline is the first changed line, the scrolling will be done | |
| 1330 * further down. | |
| 1331 */ | |
| 1332 } | |
| 1333 else if (wp->w_lines[0].wl_valid | |
| 1334 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1335 #ifdef FEAT_DIFF | |
| 1336 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1337 && wp->w_topfill > wp->w_old_topfill) | |
| 1338 #endif | |
| 1339 )) | |
| 1340 { | |
| 1341 /* | |
| 1342 * New topline is above old topline: May scroll down. | |
| 1343 */ | |
| 1344 #ifdef FEAT_FOLDING | |
| 1345 if (hasAnyFolding(wp)) | |
| 1346 { | |
| 1347 linenr_T ln; | |
| 1348 | |
| 1349 /* count the number of lines we are off, counting a sequence | |
| 1350 * of folded lines as one */ | |
| 1351 j = 0; | |
| 1352 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1353 { | |
| 1354 ++j; | |
| 1355 if (j >= wp->w_height - 2) | |
| 1356 break; | |
| 1357 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1358 } | |
| 1359 } | |
| 1360 else | |
| 1361 #endif | |
| 1362 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1363 if (j < wp->w_height - 2) /* not too far off */ | |
| 1364 { | |
| 1365 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1366 #ifdef FEAT_DIFF | |
| 1367 /* insert extra lines for previously invisible filler lines */ | |
| 1368 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1369 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1370 - wp->w_old_topfill; | |
| 1371 #endif | |
| 1372 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1373 { | |
| 1374 /* | |
| 1375 * Try to insert the correct number of lines. | |
| 1376 * If not the last window, delete the lines at the bottom. | |
| 1377 * win_ins_lines may fail when the terminal can't do it. | |
| 1378 */ | |
| 1379 if (i > 0) | |
| 1380 check_for_delay(FALSE); | |
| 1381 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1382 { | |
| 1383 if (wp->w_lines_valid != 0) | |
| 1384 { | |
| 1385 /* Need to update rows that are new, stop at the | |
| 1386 * first one that scrolled down. */ | |
| 1387 top_end = i; | |
| 1388 scrolled_down = TRUE; | |
| 1389 | |
| 1390 /* Move the entries that were scrolled, disable | |
| 1391 * the entries for the lines to be redrawn. */ | |
| 1392 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1393 wp->w_lines_valid = wp->w_height; | |
| 1394 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1395 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1396 while (idx >= 0) | |
| 1397 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1398 } | |
| 1399 } | |
| 1400 else | |
| 1401 mid_start = 0; /* redraw all lines */ | |
| 1402 } | |
| 1403 else | |
| 1404 mid_start = 0; /* redraw all lines */ | |
| 1405 } | |
| 1406 else | |
| 1407 mid_start = 0; /* redraw all lines */ | |
| 1408 } | |
| 1409 else | |
| 1410 { | |
| 1411 /* | |
| 1412 * New topline is at or below old topline: May scroll up. | |
| 1413 * When topline didn't change, find first entry in w_lines[] that | |
| 1414 * needs updating. | |
| 1415 */ | |
| 1416 | |
| 1417 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1418 j = -1; | |
| 1419 row = 0; | |
| 1420 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1421 { | |
| 1422 if (wp->w_lines[i].wl_valid | |
| 1423 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1424 { | |
| 1425 j = i; | |
| 1426 break; | |
| 1427 } | |
| 1428 row += wp->w_lines[i].wl_size; | |
| 1429 } | |
| 1430 if (j == -1) | |
| 1431 { | |
| 1432 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1433 * lines */ | |
| 1434 mid_start = 0; | |
| 1435 } | |
| 1436 else | |
| 1437 { | |
| 1438 /* | |
| 1439 * Try to delete the correct number of lines. | |
| 1440 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1441 */ | |
| 1442 #ifdef FEAT_DIFF | |
| 1443 /* If the topline didn't change, delete old filler lines, | |
| 1444 * otherwise delete filler lines of the new topline... */ | |
| 1445 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1446 row += wp->w_old_topfill; | |
| 1447 else | |
| 1448 row += diff_check_fill(wp, wp->w_topline); | |
| 1449 /* ... but don't delete new filler lines. */ | |
| 1450 row -= wp->w_topfill; | |
| 1451 #endif | |
| 1452 if (row > 0) | |
| 1453 { | |
| 1454 check_for_delay(FALSE); | |
| 1455 if (win_del_lines(wp, 0, row, FALSE, wp == firstwin) == OK) | |
| 1456 bot_start = wp->w_height - row; | |
| 1457 else | |
| 1458 mid_start = 0; /* redraw all lines */ | |
| 1459 } | |
| 1460 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1461 { | |
| 1462 /* | |
| 1463 * Skip the lines (below the deleted lines) that are still | |
| 1464 * valid and don't need redrawing. Copy their info | |
| 1465 * upwards, to compensate for the deleted lines. Set | |
| 1466 * bot_start to the first row that needs redrawing. | |
| 1467 */ | |
| 1468 bot_start = 0; | |
| 1469 idx = 0; | |
| 1470 for (;;) | |
| 1471 { | |
| 1472 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1473 /* stop at line that didn't fit, unless it is still | |
| 1474 * valid (no lines deleted) */ | |
| 1475 if (row > 0 && bot_start + row | |
| 1476 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1477 { | |
| 1478 wp->w_lines_valid = idx + 1; | |
| 1479 break; | |
| 1480 } | |
| 1481 bot_start += wp->w_lines[idx++].wl_size; | |
| 1482 | |
| 1483 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1484 if (++j >= wp->w_lines_valid) | |
| 1485 { | |
| 1486 wp->w_lines_valid = idx; | |
| 1487 break; | |
| 1488 } | |
| 1489 } | |
| 1490 #ifdef FEAT_DIFF | |
| 1491 /* Correct the first entry for filler lines at the top | |
| 1492 * when it won't get updated below. */ | |
| 1493 if (wp->w_p_diff && bot_start > 0) | |
| 1494 wp->w_lines[0].wl_size = | |
| 1495 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1496 + wp->w_topfill; | |
| 1497 #endif | |
| 1498 } | |
| 1499 } | |
| 1500 } | |
| 1501 | |
| 1502 /* When starting redraw in the first line, redraw all lines. When | |
| 1503 * there is only one window it's probably faster to clear the screen | |
| 1504 * first. */ | |
| 1505 if (mid_start == 0) | |
| 1506 { | |
| 1507 mid_end = wp->w_height; | |
| 1508 if (lastwin == firstwin) | |
| 981 | 1509 { |
| 1331 | 1510 /* Clear the screen when it was not done by win_del_lines() or |
| 1511 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1512 * then. */ | |
| 1513 if (screen_cleared != TRUE) | |
| 1514 screenclear(); | |
| 981 | 1515 #ifdef FEAT_WINDOWS |
| 1516 /* The screen was cleared, redraw the tab pages line. */ | |
| 1517 if (redraw_tabline) | |
| 1518 draw_tabline(); | |
| 1519 #endif | |
| 1520 } | |
| 7 | 1521 } |
| 1331 | 1522 |
| 1523 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1524 * cleared (only happens for the first window) or when screenclear() | |
| 1525 * was called directly above, "must_redraw" will have been set to | |
| 1526 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1527 if (screen_cleared == TRUE) | |
| 1528 must_redraw = 0; | |
| 7 | 1529 } |
| 1530 else | |
| 1531 { | |
| 1532 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1533 mid_start = 0; | |
| 1534 mid_end = wp->w_height; | |
| 1535 } | |
| 1536 | |
| 743 | 1537 if (type == SOME_VALID) |
| 1538 { | |
| 1539 /* SOME_VALID: redraw all lines. */ | |
| 1540 mid_start = 0; | |
| 1541 mid_end = wp->w_height; | |
| 1542 type = NOT_VALID; | |
| 1543 } | |
| 1544 | |
| 7 | 1545 /* check if we are updating or removing the inverted part */ |
| 1546 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1547 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1548 { | |
| 1549 linenr_T from, to; | |
| 1550 | |
| 1551 if (VIsual_active) | |
| 1552 { | |
| 1553 if (VIsual_active | |
| 1554 && (VIsual_mode != wp->w_old_visual_mode | |
| 1555 || type == INVERTED_ALL)) | |
| 1556 { | |
| 1557 /* | |
| 1558 * If the type of Visual selection changed, redraw the whole | |
| 1559 * selection. Also when the ownership of the X selection is | |
| 1560 * gained or lost. | |
| 1561 */ | |
| 1562 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1563 { | |
| 1564 from = curwin->w_cursor.lnum; | |
| 1565 to = VIsual.lnum; | |
| 1566 } | |
| 1567 else | |
| 1568 { | |
| 1569 from = VIsual.lnum; | |
| 1570 to = curwin->w_cursor.lnum; | |
| 1571 } | |
| 1572 /* redraw more when the cursor moved as well */ | |
| 1573 if (wp->w_old_cursor_lnum < from) | |
| 1574 from = wp->w_old_cursor_lnum; | |
| 1575 if (wp->w_old_cursor_lnum > to) | |
| 1576 to = wp->w_old_cursor_lnum; | |
| 1577 if (wp->w_old_visual_lnum < from) | |
| 1578 from = wp->w_old_visual_lnum; | |
| 1579 if (wp->w_old_visual_lnum > to) | |
| 1580 to = wp->w_old_visual_lnum; | |
| 1581 } | |
| 1582 else | |
| 1583 { | |
| 1584 /* | |
| 1585 * Find the line numbers that need to be updated: The lines | |
| 1586 * between the old cursor position and the current cursor | |
| 1587 * position. Also check if the Visual position changed. | |
| 1588 */ | |
| 1589 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1590 { | |
| 1591 from = curwin->w_cursor.lnum; | |
| 1592 to = wp->w_old_cursor_lnum; | |
| 1593 } | |
| 1594 else | |
| 1595 { | |
| 1596 from = wp->w_old_cursor_lnum; | |
| 1597 to = curwin->w_cursor.lnum; | |
| 1598 if (from == 0) /* Visual mode just started */ | |
| 1599 from = to; | |
| 1600 } | |
| 1601 | |
| 422 | 1602 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1603 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1604 { |
| 1605 if (wp->w_old_visual_lnum < from | |
| 1606 && wp->w_old_visual_lnum != 0) | |
| 1607 from = wp->w_old_visual_lnum; | |
| 1608 if (wp->w_old_visual_lnum > to) | |
| 1609 to = wp->w_old_visual_lnum; | |
| 1610 if (VIsual.lnum < from) | |
| 1611 from = VIsual.lnum; | |
| 1612 if (VIsual.lnum > to) | |
| 1613 to = VIsual.lnum; | |
| 1614 } | |
| 1615 } | |
| 1616 | |
| 1617 /* | |
| 1618 * If in block mode and changed column or curwin->w_curswant: | |
| 1619 * update all lines. | |
| 1620 * First compute the actual start and end column. | |
| 1621 */ | |
| 1622 if (VIsual_mode == Ctrl_V) | |
| 1623 { | |
| 6266 | 1624 colnr_T fromc, toc; |
| 1625 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) | |
| 1626 int save_ve_flags = ve_flags; | |
| 1627 | |
| 1628 if (curwin->w_p_lbr) | |
| 1629 ve_flags = VE_ALL; | |
| 1630 #endif | |
| 7 | 1631 getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); |
| 6266 | 1632 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) |
| 1633 ve_flags = save_ve_flags; | |
| 1634 #endif | |
| 7 | 1635 ++toc; |
| 1636 if (curwin->w_curswant == MAXCOL) | |
| 1637 toc = MAXCOL; | |
| 1638 | |
| 1639 if (fromc != wp->w_old_cursor_fcol | |
| 1640 || toc != wp->w_old_cursor_lcol) | |
| 1641 { | |
| 1642 if (from > VIsual.lnum) | |
| 1643 from = VIsual.lnum; | |
| 1644 if (to < VIsual.lnum) | |
| 1645 to = VIsual.lnum; | |
| 1646 } | |
| 1647 wp->w_old_cursor_fcol = fromc; | |
| 1648 wp->w_old_cursor_lcol = toc; | |
| 1649 } | |
| 1650 } | |
| 1651 else | |
| 1652 { | |
| 1653 /* Use the line numbers of the old Visual area. */ | |
| 1654 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1655 { | |
| 1656 from = wp->w_old_cursor_lnum; | |
| 1657 to = wp->w_old_visual_lnum; | |
| 1658 } | |
| 1659 else | |
| 1660 { | |
| 1661 from = wp->w_old_visual_lnum; | |
| 1662 to = wp->w_old_cursor_lnum; | |
| 1663 } | |
| 1664 } | |
| 1665 | |
| 1666 /* | |
| 1667 * There is no need to update lines above the top of the window. | |
| 1668 */ | |
| 1669 if (from < wp->w_topline) | |
| 1670 from = wp->w_topline; | |
| 1671 | |
| 1672 /* | |
| 1673 * If we know the value of w_botline, use it to restrict the update to | |
| 1674 * the lines that are visible in the window. | |
| 1675 */ | |
| 1676 if (wp->w_valid & VALID_BOTLINE) | |
| 1677 { | |
| 1678 if (from >= wp->w_botline) | |
| 1679 from = wp->w_botline - 1; | |
| 1680 if (to >= wp->w_botline) | |
| 1681 to = wp->w_botline - 1; | |
| 1682 } | |
| 1683 | |
| 1684 /* | |
| 1685 * Find the minimal part to be updated. | |
| 1686 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1687 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1688 * top_end; need to redraw from top_end to the "to" line. | |
| 1689 * A middle mouse click with a Visual selection may change the text | |
| 1690 * above the Visual area and reset wl_valid, do count these for | |
| 1691 * mid_end (in srow). | |
| 1692 */ | |
| 1693 if (mid_start > 0) | |
| 1694 { | |
| 1695 lnum = wp->w_topline; | |
| 1696 idx = 0; | |
| 1697 srow = 0; | |
| 1698 if (scrolled_down) | |
| 1699 mid_start = top_end; | |
| 1700 else | |
| 1701 mid_start = 0; | |
| 1702 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1703 { | |
| 1704 if (wp->w_lines[idx].wl_valid) | |
| 1705 mid_start += wp->w_lines[idx].wl_size; | |
| 1706 else if (!scrolled_down) | |
| 1707 srow += wp->w_lines[idx].wl_size; | |
| 1708 ++idx; | |
| 1709 # ifdef FEAT_FOLDING | |
| 1710 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1711 lnum = wp->w_lines[idx].wl_lnum; | |
| 1712 else | |
| 1713 # endif | |
| 1714 ++lnum; | |
| 1715 } | |
| 1716 srow += mid_start; | |
| 1717 mid_end = wp->w_height; | |
| 1718 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1719 { | |
| 1720 if (wp->w_lines[idx].wl_valid | |
| 1721 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1722 { | |
| 1723 /* Only update until first row of this line */ | |
| 1724 mid_end = srow; | |
| 1725 break; | |
| 1726 } | |
| 1727 srow += wp->w_lines[idx].wl_size; | |
| 1728 } | |
| 1729 } | |
| 1730 } | |
| 1731 | |
| 1732 if (VIsual_active && buf == curwin->w_buffer) | |
| 1733 { | |
| 1734 wp->w_old_visual_mode = VIsual_mode; | |
| 1735 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1736 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1737 wp->w_old_visual_col = VIsual.col; |
| 7 | 1738 wp->w_old_curswant = curwin->w_curswant; |
| 1739 } | |
| 1740 else | |
| 1741 { | |
| 1742 wp->w_old_visual_mode = 0; | |
| 1743 wp->w_old_cursor_lnum = 0; | |
| 1744 wp->w_old_visual_lnum = 0; | |
| 422 | 1745 wp->w_old_visual_col = 0; |
| 7 | 1746 } |
| 1747 | |
| 1748 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1749 /* reset got_int, otherwise regexp won't work */ | |
| 1750 save_got_int = got_int; | |
| 1751 got_int = 0; | |
| 1752 #endif | |
| 1753 #ifdef FEAT_FOLDING | |
| 1754 win_foldinfo.fi_level = 0; | |
| 1755 #endif | |
| 1756 | |
| 1757 /* | |
| 1758 * Update all the window rows. | |
| 1759 */ | |
| 1760 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1761 row = 0; | |
| 1762 srow = 0; | |
| 1763 lnum = wp->w_topline; /* first line shown in window */ | |
| 1764 for (;;) | |
| 1765 { | |
| 1766 /* stop updating when reached the end of the window (check for _past_ | |
| 1767 * the end of the window is at the end of the loop) */ | |
| 1768 if (row == wp->w_height) | |
| 1769 { | |
| 1770 didline = TRUE; | |
| 1771 break; | |
| 1772 } | |
| 1773 | |
| 1774 /* stop updating when hit the end of the file */ | |
| 1775 if (lnum > buf->b_ml.ml_line_count) | |
| 1776 { | |
| 1777 eof = TRUE; | |
| 1778 break; | |
| 1779 } | |
| 1780 | |
| 1781 /* Remember the starting row of the line that is going to be dealt | |
| 1782 * with. It is used further down when the line doesn't fit. */ | |
| 1783 srow = row; | |
| 1784 | |
| 1785 /* | |
| 1786 * Update a line when it is in an area that needs updating, when it | |
| 1787 * has changes or w_lines[idx] is invalid. | |
| 1788 * bot_start may be halfway a wrapped line after using | |
| 1789 * win_del_lines(), check if the current line includes it. | |
| 1790 * When syntax folding is being used, the saved syntax states will | |
| 1791 * already have been updated, we can't see where the syntax state is | |
| 1792 * the same again, just update until the end of the window. | |
| 1793 */ | |
| 1794 if (row < top_end | |
| 1795 || (row >= mid_start && row < mid_end) | |
| 1796 #ifdef FEAT_SEARCH_EXTRA | |
| 1797 || top_to_mod | |
| 1798 #endif | |
| 1799 || idx >= wp->w_lines_valid | |
| 1800 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1801 || (mod_top != 0 | |
| 1802 && (lnum == mod_top | |
| 1803 || (lnum >= mod_top | |
| 1804 && (lnum < mod_bot | |
| 1805 #ifdef FEAT_SYN_HL | |
| 1806 || did_update == DID_FOLD | |
| 1807 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1808 && syntax_present(wp) |
| 7 | 1809 && ( |
| 1810 # ifdef FEAT_FOLDING | |
| 1811 (foldmethodIsSyntax(wp) | |
| 1812 && hasAnyFolding(wp)) || | |
| 1813 # endif | |
| 1814 syntax_check_changed(lnum))) | |
| 1815 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1816 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1817 /* match in fixed position might need redraw |
| 1818 * if lines were inserted or deleted */ | |
| 1819 || (wp->w_match_head != NULL | |
| 1820 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1821 #endif |
| 7 | 1822 ))))) |
| 1823 { | |
| 1824 #ifdef FEAT_SEARCH_EXTRA | |
| 1825 if (lnum == mod_top) | |
| 1826 top_to_mod = FALSE; | |
| 1827 #endif | |
| 1828 | |
| 1829 /* | |
| 1830 * When at start of changed lines: May scroll following lines | |
| 1831 * up or down to minimize redrawing. | |
| 1832 * Don't do this when the change continues until the end. | |
| 3318 | 1833 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1834 */ |
| 1835 if (lnum == mod_top | |
| 1836 && mod_bot != MAXLNUM | |
| 3318 | 1837 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1838 { |
| 1839 int old_rows = 0; | |
| 1840 int new_rows = 0; | |
| 1841 int xtra_rows; | |
| 1842 linenr_T l; | |
| 1843 | |
| 1844 /* Count the old number of window rows, using w_lines[], which | |
| 1845 * should still contain the sizes for the lines as they are | |
| 1846 * currently displayed. */ | |
| 1847 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1848 { | |
| 1849 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1850 * lines are part of the changed area. */ | |
| 1851 if (wp->w_lines[i].wl_valid | |
| 1852 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1853 break; | |
| 1854 old_rows += wp->w_lines[i].wl_size; | |
| 1855 #ifdef FEAT_FOLDING | |
| 1856 if (wp->w_lines[i].wl_valid | |
| 1857 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1858 { | |
| 1859 /* Must have found the last valid entry above mod_bot. | |
| 1860 * Add following invalid entries. */ | |
| 1861 ++i; | |
| 1862 while (i < wp->w_lines_valid | |
| 1863 && !wp->w_lines[i].wl_valid) | |
| 1864 old_rows += wp->w_lines[i++].wl_size; | |
| 1865 break; | |
| 1866 } | |
| 1867 #endif | |
| 1868 } | |
| 1869 | |
| 1870 if (i >= wp->w_lines_valid) | |
| 1871 { | |
| 1872 /* We can't find a valid line below the changed lines, | |
| 1873 * need to redraw until the end of the window. | |
| 1874 * Inserting/deleting lines has no use. */ | |
| 1875 bot_start = 0; | |
| 1876 } | |
| 1877 else | |
| 1878 { | |
| 1879 /* Able to count old number of rows: Count new window | |
| 1880 * rows, and may insert/delete lines */ | |
| 1881 j = idx; | |
| 1882 for (l = lnum; l < mod_bot; ++l) | |
| 1883 { | |
| 1884 #ifdef FEAT_FOLDING | |
| 1885 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1886 ++new_rows; | |
| 1887 else | |
| 1888 #endif | |
| 1889 #ifdef FEAT_DIFF | |
| 1890 if (l == wp->w_topline) | |
| 1891 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1892 + wp->w_topfill; | |
| 1893 else | |
| 1894 #endif | |
| 1895 new_rows += plines_win(wp, l, TRUE); | |
| 1896 ++j; | |
| 1897 if (new_rows > wp->w_height - row - 2) | |
| 1898 { | |
| 1899 /* it's getting too much, must redraw the rest */ | |
| 1900 new_rows = 9999; | |
| 1901 break; | |
| 1902 } | |
| 1903 } | |
| 1904 xtra_rows = new_rows - old_rows; | |
| 1905 if (xtra_rows < 0) | |
| 1906 { | |
| 1907 /* May scroll text up. If there is not enough | |
| 1908 * remaining text or scrolling fails, must redraw the | |
| 1909 * rest. If scrolling works, must redraw the text | |
| 1910 * below the scrolled text. */ | |
| 1911 if (row - xtra_rows >= wp->w_height - 2) | |
| 1912 mod_bot = MAXLNUM; | |
| 1913 else | |
| 1914 { | |
| 1915 check_for_delay(FALSE); | |
| 1916 if (win_del_lines(wp, row, | |
| 1917 -xtra_rows, FALSE, FALSE) == FAIL) | |
| 1918 mod_bot = MAXLNUM; | |
| 1919 else | |
| 1920 bot_start = wp->w_height + xtra_rows; | |
| 1921 } | |
| 1922 } | |
| 1923 else if (xtra_rows > 0) | |
| 1924 { | |
| 1925 /* May scroll text down. If there is not enough | |
| 1926 * remaining text of scrolling fails, must redraw the | |
| 1927 * rest. */ | |
| 1928 if (row + xtra_rows >= wp->w_height - 2) | |
| 1929 mod_bot = MAXLNUM; | |
| 1930 else | |
| 1931 { | |
| 1932 check_for_delay(FALSE); | |
| 1933 if (win_ins_lines(wp, row + old_rows, | |
| 1934 xtra_rows, FALSE, FALSE) == FAIL) | |
| 1935 mod_bot = MAXLNUM; | |
| 1936 else if (top_end > row + old_rows) | |
| 1937 /* Scrolled the part at the top that requires | |
| 1938 * updating down. */ | |
| 1939 top_end += xtra_rows; | |
| 1940 } | |
| 1941 } | |
| 1942 | |
| 1943 /* When not updating the rest, may need to move w_lines[] | |
| 1944 * entries. */ | |
| 1945 if (mod_bot != MAXLNUM && i != j) | |
| 1946 { | |
| 1947 if (j < i) | |
| 1948 { | |
| 1949 int x = row + new_rows; | |
| 1950 | |
| 1951 /* move entries in w_lines[] upwards */ | |
| 1952 for (;;) | |
| 1953 { | |
| 1954 /* stop at last valid entry in w_lines[] */ | |
| 1955 if (i >= wp->w_lines_valid) | |
| 1956 { | |
| 1957 wp->w_lines_valid = j; | |
| 1958 break; | |
| 1959 } | |
| 1960 wp->w_lines[j] = wp->w_lines[i]; | |
| 1961 /* stop at a line that won't fit */ | |
| 1962 if (x + (int)wp->w_lines[j].wl_size | |
| 1963 > wp->w_height) | |
| 1964 { | |
| 1965 wp->w_lines_valid = j + 1; | |
| 1966 break; | |
| 1967 } | |
| 1968 x += wp->w_lines[j++].wl_size; | |
| 1969 ++i; | |
| 1970 } | |
| 1971 if (bot_start > x) | |
| 1972 bot_start = x; | |
| 1973 } | |
| 1974 else /* j > i */ | |
| 1975 { | |
| 1976 /* move entries in w_lines[] downwards */ | |
| 1977 j -= i; | |
| 1978 wp->w_lines_valid += j; | |
| 1979 if (wp->w_lines_valid > wp->w_height) | |
| 1980 wp->w_lines_valid = wp->w_height; | |
| 1981 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 1982 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 1983 | |
| 1984 /* The w_lines[] entries for inserted lines are | |
| 1985 * now invalid, but wl_size may be used above. | |
| 1986 * Reset to zero. */ | |
| 1987 while (i >= idx) | |
| 1988 { | |
| 1989 wp->w_lines[i].wl_size = 0; | |
| 1990 wp->w_lines[i--].wl_valid = FALSE; | |
| 1991 } | |
| 1992 } | |
| 1993 } | |
| 1994 } | |
| 1995 } | |
| 1996 | |
| 1997 #ifdef FEAT_FOLDING | |
| 1998 /* | |
| 1999 * When lines are folded, display one line for all of them. | |
| 2000 * Otherwise, display normally (can be several display lines when | |
| 2001 * 'wrap' is on). | |
| 2002 */ | |
| 2003 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2004 if (fold_count != 0) | |
| 2005 { | |
| 2006 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2007 ++row; | |
| 2008 --fold_count; | |
| 2009 wp->w_lines[idx].wl_folded = TRUE; | |
| 2010 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2011 # ifdef FEAT_SYN_HL | |
| 2012 did_update = DID_FOLD; | |
| 2013 # endif | |
| 2014 } | |
| 2015 else | |
| 2016 #endif | |
| 2017 if (idx < wp->w_lines_valid | |
| 2018 && wp->w_lines[idx].wl_valid | |
| 2019 && wp->w_lines[idx].wl_lnum == lnum | |
| 2020 && lnum > wp->w_topline | |
| 2021 && !(dy_flags & DY_LASTLINE) | |
| 2022 && srow + wp->w_lines[idx].wl_size > wp->w_height | |
| 2023 #ifdef FEAT_DIFF | |
| 2024 && diff_check_fill(wp, lnum) == 0 | |
| 2025 #endif | |
| 2026 ) | |
| 2027 { | |
| 2028 /* This line is not going to fit. Don't draw anything here, | |
| 2029 * will draw "@ " lines below. */ | |
| 2030 row = wp->w_height + 1; | |
| 2031 } | |
| 2032 else | |
| 2033 { | |
| 2034 #ifdef FEAT_SEARCH_EXTRA | |
| 2035 prepare_search_hl(wp, lnum); | |
| 2036 #endif | |
| 2037 #ifdef FEAT_SYN_HL | |
| 2038 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2039 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
|
2040 && syntax_present(wp)) |
| 7 | 2041 syntax_end_parsing(syntax_last_parsed + 1); |
| 2042 #endif | |
| 2043 | |
| 2044 /* | |
| 2045 * Display one line. | |
| 2046 */ | |
| 625 | 2047 row = win_line(wp, lnum, srow, wp->w_height, mod_top == 0); |
| 7 | 2048 |
| 2049 #ifdef FEAT_FOLDING | |
| 2050 wp->w_lines[idx].wl_folded = FALSE; | |
| 2051 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2052 #endif | |
| 2053 #ifdef FEAT_SYN_HL | |
| 2054 did_update = DID_LINE; | |
| 2055 syntax_last_parsed = lnum; | |
| 2056 #endif | |
| 2057 } | |
| 2058 | |
| 2059 wp->w_lines[idx].wl_lnum = lnum; | |
| 2060 wp->w_lines[idx].wl_valid = TRUE; | |
| 2061 if (row > wp->w_height) /* past end of screen */ | |
| 2062 { | |
| 2063 /* we may need the size of that too long line later on */ | |
| 3318 | 2064 if (dollar_vcol == -1) |
| 7 | 2065 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2066 ++idx; | |
| 2067 break; | |
| 2068 } | |
| 3318 | 2069 if (dollar_vcol == -1) |
| 7 | 2070 wp->w_lines[idx].wl_size = row - srow; |
| 2071 ++idx; | |
| 2072 #ifdef FEAT_FOLDING | |
| 2073 lnum += fold_count + 1; | |
| 2074 #else | |
| 2075 ++lnum; | |
| 2076 #endif | |
| 2077 } | |
| 2078 else | |
| 2079 { | |
| 2080 /* This line does not need updating, advance to the next one */ | |
| 2081 row += wp->w_lines[idx++].wl_size; | |
| 2082 if (row > wp->w_height) /* past end of screen */ | |
| 2083 break; | |
| 2084 #ifdef FEAT_FOLDING | |
| 2085 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2086 #else | |
| 2087 ++lnum; | |
| 2088 #endif | |
| 2089 #ifdef FEAT_SYN_HL | |
| 2090 did_update = DID_NONE; | |
| 2091 #endif | |
| 2092 } | |
| 2093 | |
| 2094 if (lnum > buf->b_ml.ml_line_count) | |
| 2095 { | |
| 2096 eof = TRUE; | |
| 2097 break; | |
| 2098 } | |
| 2099 } | |
| 2100 /* | |
| 2101 * End of loop over all window lines. | |
| 2102 */ | |
| 2103 | |
| 2104 | |
| 2105 if (idx > wp->w_lines_valid) | |
| 2106 wp->w_lines_valid = idx; | |
| 2107 | |
| 2108 #ifdef FEAT_SYN_HL | |
| 2109 /* | |
| 2110 * Let the syntax stuff know we stop parsing here. | |
| 2111 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2112 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2113 syntax_end_parsing(syntax_last_parsed + 1); |
| 2114 #endif | |
| 2115 | |
| 2116 /* | |
| 2117 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2118 * line we were working on, then the line didn't fit. | |
| 2119 */ | |
| 2120 wp->w_empty_rows = 0; | |
| 2121 #ifdef FEAT_DIFF | |
| 2122 wp->w_filler_rows = 0; | |
| 2123 #endif | |
| 2124 if (!eof && !didline) | |
| 2125 { | |
| 2126 if (lnum == wp->w_topline) | |
| 2127 { | |
| 2128 /* | |
| 2129 * Single line that does not fit! | |
| 2130 * Don't overwrite it, it can be edited. | |
| 2131 */ | |
| 2132 wp->w_botline = lnum + 1; | |
| 2133 } | |
| 2134 #ifdef FEAT_DIFF | |
| 2135 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2136 { | |
| 2137 /* Window ends in filler lines. */ | |
| 2138 wp->w_botline = lnum; | |
| 2139 wp->w_filler_rows = wp->w_height - srow; | |
| 2140 } | |
| 2141 #endif | |
| 2142 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ | |
| 2143 { | |
| 2144 /* | |
| 2145 * Last line isn't finished: Display "@@@" at the end. | |
| 2146 */ | |
| 2147 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2148 W_WINROW(wp) + wp->w_height, | |
| 2149 (int)W_ENDCOL(wp) - 3, (int)W_ENDCOL(wp), | |
| 2150 '@', '@', hl_attr(HLF_AT)); | |
| 2151 set_empty_rows(wp, srow); | |
| 2152 wp->w_botline = lnum; | |
| 2153 } | |
| 2154 else | |
| 2155 { | |
| 2156 win_draw_end(wp, '@', ' ', srow, wp->w_height, HLF_AT); | |
| 2157 wp->w_botline = lnum; | |
| 2158 } | |
| 2159 } | |
| 2160 else | |
| 2161 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
2162 #ifdef FEAT_WINDOWS |
| 7 | 2163 draw_vsep_win(wp, row); |
| 2164 #endif | |
| 2165 if (eof) /* we hit the end of the file */ | |
| 2166 { | |
| 2167 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2168 #ifdef FEAT_DIFF | |
| 2169 j = diff_check_fill(wp, wp->w_botline); | |
| 2170 if (j > 0 && !wp->w_botfill) | |
| 2171 { | |
| 2172 /* | |
| 2173 * Display filler lines at the end of the file | |
| 2174 */ | |
| 2175 if (char2cells(fill_diff) > 1) | |
| 2176 i = '-'; | |
| 2177 else | |
| 2178 i = fill_diff; | |
| 2179 if (row + j > wp->w_height) | |
| 2180 j = wp->w_height - row; | |
| 2181 win_draw_end(wp, i, i, row, row + (int)j, HLF_DED); | |
| 2182 row += j; | |
| 2183 } | |
| 2184 #endif | |
| 2185 } | |
| 3318 | 2186 else if (dollar_vcol == -1) |
| 7 | 2187 wp->w_botline = lnum; |
| 2188 | |
| 2189 /* make sure the rest of the screen is blank */ | |
| 2190 /* put '~'s on rows that aren't part of the file. */ | |
| 2191 win_draw_end(wp, '~', ' ', row, wp->w_height, HLF_AT); | |
| 2192 } | |
| 2193 | |
| 2194 /* Reset the type of redrawing required, the window has been updated. */ | |
| 2195 wp->w_redr_type = 0; | |
| 2196 #ifdef FEAT_DIFF | |
| 2197 wp->w_old_topfill = wp->w_topfill; | |
| 2198 wp->w_old_botfill = wp->w_botfill; | |
| 2199 #endif | |
| 2200 | |
| 3318 | 2201 if (dollar_vcol == -1) |
| 7 | 2202 { |
| 2203 /* | |
| 2204 * There is a trick with w_botline. If we invalidate it on each | |
| 2205 * change that might modify it, this will cause a lot of expensive | |
| 2206 * calls to plines() in update_topline() each time. Therefore the | |
| 2207 * value of w_botline is often approximated, and this value is used to | |
| 2208 * compute the value of w_topline. If the value of w_botline was | |
| 2209 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2210 * the visible part of the text). If it's not, we need to redraw | |
| 2211 * again. Mostly this just means scrolling up a few lines, so it | |
| 2212 * doesn't look too bad. Only do this for the current window (where | |
| 2213 * changes are relevant). | |
| 2214 */ | |
| 2215 wp->w_valid |= VALID_BOTLINE; | |
| 2216 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2217 { | |
| 2218 recursive = TRUE; | |
| 2219 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2220 update_topline(); /* may invalidate w_botline again */ | |
| 2221 if (must_redraw != 0) | |
| 2222 { | |
| 2223 /* Don't update for changes in buffer again. */ | |
| 2224 i = curbuf->b_mod_set; | |
| 2225 curbuf->b_mod_set = FALSE; | |
| 2226 win_update(curwin); | |
| 2227 must_redraw = 0; | |
| 2228 curbuf->b_mod_set = i; | |
| 2229 } | |
| 2230 recursive = FALSE; | |
| 2231 } | |
| 2232 } | |
| 2233 | |
| 2234 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2235 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2236 if (!got_int) | |
| 2237 got_int = save_got_int; | |
| 2238 #endif | |
| 2239 } | |
| 2240 | |
| 2241 #ifdef FEAT_SIGNS | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
2242 static int draw_signcolumn(win_T *wp); |
| 7 | 2243 |
| 2244 /* | |
| 2245 * Return TRUE when window "wp" has a column to draw signs in. | |
| 2246 */ | |
| 2247 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2248 draw_signcolumn(win_T *wp) |
| 7 | 2249 { |
| 2250 return (wp->w_buffer->b_signlist != NULL | |
| 2251 # ifdef FEAT_NETBEANS_INTG | |
| 6689 | 2252 || wp->w_buffer->b_has_sign_column |
| 7 | 2253 # endif |
| 2254 ); | |
| 2255 } | |
| 2256 #endif | |
| 2257 | |
| 2258 /* | |
| 2259 * Clear the rest of the window and mark the unused lines with "c1". use "c2" | |
| 2260 * as the filler character. | |
| 2261 */ | |
| 2262 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2263 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2264 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2265 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2266 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2267 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2268 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2269 hlf_T hl) |
| 7 | 2270 { |
| 2271 #if defined(FEAT_FOLDING) || defined(FEAT_SIGNS) || defined(FEAT_CMDWIN) | |
| 2272 int n = 0; | |
| 2273 # define FDC_OFF n | |
| 2274 #else | |
| 2275 # define FDC_OFF 0 | |
| 2276 #endif | |
| 6553 | 2277 #ifdef FEAT_FOLDING |
| 2278 int fdc = compute_foldcolumn(wp, 0); | |
| 2279 #endif | |
| 7 | 2280 |
| 2281 #ifdef FEAT_RIGHTLEFT | |
| 2282 if (wp->w_p_rl) | |
| 2283 { | |
| 2284 /* No check for cmdline window: should never be right-left. */ | |
| 2285 # ifdef FEAT_FOLDING | |
| 6553 | 2286 n = fdc; |
| 7 | 2287 |
| 2288 if (n > 0) | |
| 2289 { | |
| 2290 /* draw the fold column at the right */ | |
| 119 | 2291 if (n > W_WIDTH(wp)) |
| 2292 n = W_WIDTH(wp); | |
| 7 | 2293 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2294 W_ENDCOL(wp) - n, (int)W_ENDCOL(wp), | |
| 2295 ' ', ' ', hl_attr(HLF_FC)); | |
| 2296 } | |
| 2297 # endif | |
| 2298 # ifdef FEAT_SIGNS | |
| 2299 if (draw_signcolumn(wp)) | |
| 2300 { | |
| 2301 int nn = n + 2; | |
| 2302 | |
| 2303 /* draw the sign column left of the fold column */ | |
| 119 | 2304 if (nn > W_WIDTH(wp)) |
| 2305 nn = W_WIDTH(wp); | |
| 7 | 2306 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2307 W_ENDCOL(wp) - nn, (int)W_ENDCOL(wp) - n, | |
| 2308 ' ', ' ', hl_attr(HLF_SC)); | |
| 2309 n = nn; | |
| 2310 } | |
| 2311 # endif | |
| 2312 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2313 W_WINCOL(wp), W_ENDCOL(wp) - 1 - FDC_OFF, | |
| 2314 c2, c2, hl_attr(hl)); | |
| 2315 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2316 W_ENDCOL(wp) - 1 - FDC_OFF, W_ENDCOL(wp) - FDC_OFF, | |
| 2317 c1, c2, hl_attr(hl)); | |
| 2318 } | |
| 2319 else | |
| 2320 #endif | |
| 2321 { | |
| 2322 #ifdef FEAT_CMDWIN | |
| 2323 if (cmdwin_type != 0 && wp == curwin) | |
| 2324 { | |
| 2325 /* draw the cmdline character in the leftmost column */ | |
| 2326 n = 1; | |
| 2327 if (n > wp->w_width) | |
| 2328 n = wp->w_width; | |
| 2329 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2330 W_WINCOL(wp), (int)W_WINCOL(wp) + n, | |
| 2331 cmdwin_type, ' ', hl_attr(HLF_AT)); | |
| 2332 } | |
| 2333 #endif | |
| 2334 #ifdef FEAT_FOLDING | |
| 6553 | 2335 if (fdc > 0) |
| 2336 { | |
| 2337 int nn = n + fdc; | |
| 7 | 2338 |
| 2339 /* draw the fold column at the left */ | |
| 2340 if (nn > W_WIDTH(wp)) | |
| 2341 nn = W_WIDTH(wp); | |
| 2342 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2343 W_WINCOL(wp) + n, (int)W_WINCOL(wp) + nn, | |
| 2344 ' ', ' ', hl_attr(HLF_FC)); | |
| 2345 n = nn; | |
| 2346 } | |
| 2347 #endif | |
| 2348 #ifdef FEAT_SIGNS | |
| 2349 if (draw_signcolumn(wp)) | |
| 2350 { | |
| 2351 int nn = n + 2; | |
| 2352 | |
| 2353 /* draw the sign column after the fold column */ | |
| 2354 if (nn > W_WIDTH(wp)) | |
| 2355 nn = W_WIDTH(wp); | |
| 2356 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2357 W_WINCOL(wp) + n, (int)W_WINCOL(wp) + nn, | |
| 2358 ' ', ' ', hl_attr(HLF_SC)); | |
| 2359 n = nn; | |
| 2360 } | |
| 2361 #endif | |
| 2362 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2363 W_WINCOL(wp) + FDC_OFF, (int)W_ENDCOL(wp), | |
| 2364 c1, c2, hl_attr(hl)); | |
| 2365 } | |
| 2366 set_empty_rows(wp, row); | |
| 2367 } | |
| 2368 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2369 #ifdef FEAT_SYN_HL |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
2370 static int 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
|
2371 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2372 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2373 * 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
|
2374 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2375 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2376 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
|
2377 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2378 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2379 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2380 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2381 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2382 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2383 |
| 7 | 2384 #ifdef FEAT_FOLDING |
| 2385 /* | |
| 6553 | 2386 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2387 * space is available for window "wp", minus "col". | |
| 2388 */ | |
| 2389 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2390 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2391 { |
| 2392 int fdc = wp->w_p_fdc; | |
| 2393 int wmw = wp == curwin && p_wmw == 0 ? 1 : p_wmw; | |
| 2394 int wwidth = W_WIDTH(wp); | |
| 2395 | |
| 2396 if (fdc > wwidth - (col + wmw)) | |
| 2397 fdc = wwidth - (col + wmw); | |
| 2398 return fdc; | |
| 2399 } | |
| 2400 | |
| 2401 /* | |
| 7 | 2402 * Display one folded line. |
| 2403 */ | |
| 2404 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2405 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2406 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2407 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2408 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2409 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2410 int row) |
| 7 | 2411 { |
| 2412 char_u buf[51]; | |
| 2413 pos_T *top, *bot; | |
| 2414 linenr_T lnume = lnum + fold_count - 1; | |
| 2415 int len; | |
| 29 | 2416 char_u *text; |
| 7 | 2417 int fdc; |
| 2418 int col; | |
| 2419 int txtcol; | |
| 2420 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2421 int ri; |
| 7 | 2422 |
| 2423 /* Build the fold line: | |
| 2424 * 1. Add the cmdwin_type for the command-line window | |
| 2425 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2426 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2427 * 4. Compose the text |
| 2428 * 5. Add the text | |
| 2429 * 6. set highlighting for the Visual area an other text | |
| 2430 */ | |
| 2431 col = 0; | |
| 2432 | |
| 2433 /* | |
| 2434 * 1. Add the cmdwin_type for the command-line window | |
| 2435 * Ignores 'rightleft', this window is never right-left. | |
| 2436 */ | |
| 2437 #ifdef FEAT_CMDWIN | |
| 2438 if (cmdwin_type != 0 && wp == curwin) | |
| 2439 { | |
| 2440 ScreenLines[off] = cmdwin_type; | |
| 2441 ScreenAttrs[off] = hl_attr(HLF_AT); | |
| 2442 #ifdef FEAT_MBYTE | |
| 2443 if (enc_utf8) | |
| 2444 ScreenLinesUC[off] = 0; | |
| 2445 #endif | |
| 2446 ++col; | |
| 2447 } | |
| 2448 #endif | |
| 2449 | |
| 2450 /* | |
| 2451 * 2. Add the 'foldcolumn' | |
| 6553 | 2452 * Reduce the width when there is not enough space. |
| 7 | 2453 */ |
| 6553 | 2454 fdc = compute_foldcolumn(wp, col); |
| 7 | 2455 if (fdc > 0) |
| 2456 { | |
| 2457 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2458 #ifdef FEAT_RIGHTLEFT | |
| 2459 if (wp->w_p_rl) | |
| 2460 { | |
| 2461 int i; | |
| 2462 | |
| 2463 copy_text_attr(off + W_WIDTH(wp) - fdc - col, buf, fdc, | |
| 2464 hl_attr(HLF_FC)); | |
| 2465 /* reverse the fold column */ | |
| 2466 for (i = 0; i < fdc; ++i) | |
| 2467 ScreenLines[off + W_WIDTH(wp) - i - 1 - col] = buf[i]; | |
| 2468 } | |
| 2469 else | |
| 2470 #endif | |
| 2471 copy_text_attr(off + col, buf, fdc, hl_attr(HLF_FC)); | |
| 2472 col += fdc; | |
| 2473 } | |
| 2474 | |
| 2475 #ifdef FEAT_RIGHTLEFT | |
| 216 | 2476 # define RL_MEMSET(p, v, l) if (wp->w_p_rl) \ |
| 2477 for (ri = 0; ri < l; ++ri) \ | |
| 2478 ScreenAttrs[off + (W_WIDTH(wp) - (p) - (l)) + ri] = v; \ | |
| 2479 else \ | |
| 2480 for (ri = 0; ri < l; ++ri) \ | |
| 2481 ScreenAttrs[off + (p) + ri] = v | |
| 7 | 2482 #else |
| 216 | 2483 # define RL_MEMSET(p, v, l) for (ri = 0; ri < l; ++ri) \ |
| 2484 ScreenAttrs[off + (p) + ri] = v | |
| 7 | 2485 #endif |
| 2486 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2487 /* 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
|
2488 * text */ |
| 216 | 2489 RL_MEMSET(col, hl_attr(HLF_FL), W_WIDTH(wp) - col); |
| 7 | 2490 |
| 2491 #ifdef FEAT_SIGNS | |
| 2492 /* If signs are being displayed, add two spaces. */ | |
| 2493 if (draw_signcolumn(wp)) | |
| 2494 { | |
| 2495 len = W_WIDTH(wp) - col; | |
| 2496 if (len > 0) | |
| 2497 { | |
| 2498 if (len > 2) | |
| 2499 len = 2; | |
| 2500 # ifdef FEAT_RIGHTLEFT | |
| 2501 if (wp->w_p_rl) | |
| 2502 /* the line number isn't reversed */ | |
| 2503 copy_text_attr(off + W_WIDTH(wp) - len - col, | |
| 2504 (char_u *)" ", len, hl_attr(HLF_FL)); | |
| 2505 else | |
| 2506 # endif | |
| 2507 copy_text_attr(off + col, (char_u *)" ", len, hl_attr(HLF_FL)); | |
| 2508 col += len; | |
| 2509 } | |
| 2510 } | |
| 2511 #endif | |
| 2512 | |
| 2513 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2514 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2515 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2516 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2517 { |
| 2518 len = W_WIDTH(wp) - col; | |
| 2519 if (len > 0) | |
| 2520 { | |
| 13 | 2521 int w = number_width(wp); |
| 5905 | 2522 long num; |
| 2523 char *fmt = "%*ld "; | |
| 13 | 2524 |
| 2525 if (len > w + 1) | |
| 2526 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2527 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2528 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
|
2529 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2530 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2531 else |
| 4065 | 2532 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2533 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2534 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
|
2535 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
|
2536 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2537 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2538 * line number */ |
| 4065 | 2539 num = lnum; |
| 2540 fmt = "%-*ld "; | |
| 2541 } | |
| 2542 } | |
| 2543 | |
| 2544 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2545 #ifdef FEAT_RIGHTLEFT |
| 2546 if (wp->w_p_rl) | |
| 2547 /* the line number isn't reversed */ | |
| 2548 copy_text_attr(off + W_WIDTH(wp) - len - col, buf, len, | |
| 2549 hl_attr(HLF_FL)); | |
| 2550 else | |
| 2551 #endif | |
| 2552 copy_text_attr(off + col, buf, len, hl_attr(HLF_FL)); | |
| 2553 col += len; | |
| 2554 } | |
| 2555 } | |
| 2556 | |
| 2557 /* | |
| 2558 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2559 */ | |
| 29 | 2560 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2561 |
| 2562 txtcol = col; /* remember where text starts */ | |
| 2563 | |
| 2564 /* | |
| 2565 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2566 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2567 * in columns number-col - window-width. | |
| 2568 */ | |
| 2569 #ifdef FEAT_MBYTE | |
| 2570 if (has_mbyte) | |
| 2571 { | |
| 2572 int cells; | |
| 714 | 2573 int u8c, u8cc[MAX_MCO]; |
| 2574 int i; | |
| 7 | 2575 int idx; |
| 2576 int c_len; | |
| 33 | 2577 char_u *p; |
| 7 | 2578 # ifdef FEAT_ARABIC |
| 2579 int prev_c = 0; /* previous Arabic character */ | |
| 2580 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 2581 # endif | |
| 2582 | |
| 2583 # ifdef FEAT_RIGHTLEFT | |
| 2584 if (wp->w_p_rl) | |
| 2585 idx = off; | |
| 2586 else | |
| 2587 # endif | |
| 2588 idx = off + col; | |
| 2589 | |
| 2590 /* Store multibyte characters in ScreenLines[] et al. correctly. */ | |
| 2591 for (p = text; *p != NUL; ) | |
| 2592 { | |
| 2593 cells = (*mb_ptr2cells)(p); | |
| 474 | 2594 c_len = (*mb_ptr2len)(p); |
| 7 | 2595 if (col + cells > W_WIDTH(wp) |
| 2596 # ifdef FEAT_RIGHTLEFT | |
| 2597 - (wp->w_p_rl ? col : 0) | |
| 2598 # endif | |
| 2599 ) | |
| 2600 break; | |
| 2601 ScreenLines[idx] = *p; | |
| 2602 if (enc_utf8) | |
| 2603 { | |
| 714 | 2604 u8c = utfc_ptr2char(p, u8cc); |
| 2605 if (*p < 0x80 && u8cc[0] == 0) | |
| 7 | 2606 { |
| 2607 ScreenLinesUC[idx] = 0; | |
| 2608 #ifdef FEAT_ARABIC | |
| 2609 prev_c = u8c; | |
| 2610 #endif | |
| 2611 } | |
| 2612 else | |
| 2613 { | |
| 2614 #ifdef FEAT_ARABIC | |
| 2615 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 2616 { | |
| 2617 /* Do Arabic shaping. */ | |
| 714 | 2618 int pc, pc1, nc; |
| 2619 int pcc[MAX_MCO]; | |
| 7 | 2620 int firstbyte = *p; |
| 2621 | |
| 2622 /* The idea of what is the previous and next | |
| 2623 * character depends on 'rightleft'. */ | |
| 2624 if (wp->w_p_rl) | |
| 2625 { | |
| 2626 pc = prev_c; | |
| 2627 pc1 = prev_c1; | |
| 2628 nc = utf_ptr2char(p + c_len); | |
| 714 | 2629 prev_c1 = u8cc[0]; |
| 7 | 2630 } |
| 2631 else | |
| 2632 { | |
| 714 | 2633 pc = utfc_ptr2char(p + c_len, pcc); |
| 7 | 2634 nc = prev_c; |
| 714 | 2635 pc1 = pcc[0]; |
| 7 | 2636 } |
| 2637 prev_c = u8c; | |
| 2638 | |
| 714 | 2639 u8c = arabic_shape(u8c, &firstbyte, &u8cc[0], |
| 7 | 2640 pc, pc1, nc); |
| 2641 ScreenLines[idx] = firstbyte; | |
| 2642 } | |
| 2643 else | |
| 2644 prev_c = u8c; | |
| 2645 #endif | |
| 2646 /* Non-BMP character: display as ? or fullwidth ?. */ | |
| 1401 | 2647 #ifdef UNICODE16 |
| 7 | 2648 if (u8c >= 0x10000) |
| 2649 ScreenLinesUC[idx] = (cells == 2) ? 0xff1f : (int)'?'; | |
| 2650 else | |
| 1401 | 2651 #endif |
| 7 | 2652 ScreenLinesUC[idx] = u8c; |
| 714 | 2653 for (i = 0; i < Screen_mco; ++i) |
| 2654 { | |
| 2655 ScreenLinesC[i][idx] = u8cc[i]; | |
| 2656 if (u8cc[i] == 0) | |
| 2657 break; | |
| 2658 } | |
| 7 | 2659 } |
| 2660 if (cells > 1) | |
| 2661 ScreenLines[idx + 1] = 0; | |
| 2662 } | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2663 else if (enc_dbcs == DBCS_JPNU && *p == 0x8e) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2664 /* double-byte single width character */ |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2665 ScreenLines2[idx] = p[1]; |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2666 else if (cells > 1) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2667 /* double-width character */ |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2668 ScreenLines[idx + 1] = p[1]; |
| 7 | 2669 col += cells; |
| 2670 idx += cells; | |
| 2671 p += c_len; | |
| 2672 } | |
| 2673 } | |
| 2674 else | |
| 2675 #endif | |
| 2676 { | |
| 2677 len = (int)STRLEN(text); | |
| 2678 if (len > W_WIDTH(wp) - col) | |
| 2679 len = W_WIDTH(wp) - col; | |
| 2680 if (len > 0) | |
| 2681 { | |
| 2682 #ifdef FEAT_RIGHTLEFT | |
| 2683 if (wp->w_p_rl) | |
| 2684 STRNCPY(current_ScreenLine, text, len); | |
| 2685 else | |
| 2686 #endif | |
| 2687 STRNCPY(current_ScreenLine + col, text, len); | |
| 2688 col += len; | |
| 2689 } | |
| 2690 } | |
| 2691 | |
| 2692 /* Fill the rest of the line with the fold filler */ | |
| 2693 #ifdef FEAT_RIGHTLEFT | |
| 2694 if (wp->w_p_rl) | |
| 2695 col -= txtcol; | |
| 2696 #endif | |
| 2697 while (col < W_WIDTH(wp) | |
| 2698 #ifdef FEAT_RIGHTLEFT | |
| 2699 - (wp->w_p_rl ? txtcol : 0) | |
| 2700 #endif | |
| 2701 ) | |
| 2702 { | |
| 2703 #ifdef FEAT_MBYTE | |
| 2704 if (enc_utf8) | |
| 2705 { | |
| 2706 if (fill_fold >= 0x80) | |
| 2707 { | |
| 2708 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2709 ScreenLinesC[0][off + col] = 0; |
| 7 | 2710 } |
| 2711 else | |
| 2712 ScreenLinesUC[off + col] = 0; | |
| 2713 } | |
| 2714 #endif | |
| 2715 ScreenLines[off + col++] = fill_fold; | |
| 2716 } | |
| 2717 | |
| 2718 if (text != buf) | |
| 2719 vim_free(text); | |
| 2720 | |
| 2721 /* | |
| 2722 * 6. set highlighting for the Visual area an other text. | |
| 2723 * If all folded lines are in the Visual area, highlight the line. | |
| 2724 */ | |
| 2725 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2726 { | |
| 2727 if (ltoreq(curwin->w_cursor, VIsual)) | |
| 2728 { | |
| 2729 /* Visual is after curwin->w_cursor */ | |
| 2730 top = &curwin->w_cursor; | |
| 2731 bot = &VIsual; | |
| 2732 } | |
| 2733 else | |
| 2734 { | |
| 2735 /* Visual is before curwin->w_cursor */ | |
| 2736 top = &VIsual; | |
| 2737 bot = &curwin->w_cursor; | |
| 2738 } | |
| 2739 if (lnum >= top->lnum | |
| 2740 && lnume <= bot->lnum | |
| 2741 && (VIsual_mode != 'v' | |
| 2742 || ((lnum > top->lnum | |
| 2743 || (lnum == top->lnum | |
| 2744 && top->col == 0)) | |
| 2745 && (lnume < bot->lnum | |
| 2746 || (lnume == bot->lnum | |
| 2747 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2748 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2749 { |
| 2750 if (VIsual_mode == Ctrl_V) | |
| 2751 { | |
| 2752 /* Visual block mode: highlight the chars part of the block */ | |
| 2753 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)W_WIDTH(wp)) | |
| 2754 { | |
| 3040 | 2755 if (wp->w_old_cursor_lcol != MAXCOL |
| 2756 && wp->w_old_cursor_lcol + txtcol | |
| 2757 < (colnr_T)W_WIDTH(wp)) | |
| 7 | 2758 len = wp->w_old_cursor_lcol; |
| 2759 else | |
| 2760 len = W_WIDTH(wp) - txtcol; | |
| 2761 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, hl_attr(HLF_V), | |
| 230 | 2762 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2763 } |
| 2764 } | |
| 2765 else | |
| 216 | 2766 { |
| 7 | 2767 /* Set all attributes of the text */ |
| 216 | 2768 RL_MEMSET(txtcol, hl_attr(HLF_V), W_WIDTH(wp) - txtcol); |
| 2769 } | |
| 7 | 2770 } |
| 2771 } | |
| 2772 | |
| 743 | 2773 #ifdef FEAT_SYN_HL |
| 6685 | 2774 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2775 if (wp->w_p_cc_cols) | |
| 2776 { | |
| 2777 int i = 0; | |
| 2778 int j = wp->w_p_cc_cols[i]; | |
| 2779 int old_txtcol = txtcol; | |
| 2780 | |
| 2781 while (j > -1) | |
| 2782 { | |
| 2783 txtcol += j; | |
| 2784 if (wp->w_p_wrap) | |
| 2785 txtcol -= wp->w_skipcol; | |
| 2786 else | |
| 2787 txtcol -= wp->w_leftcol; | |
| 2788 if (txtcol >= 0 && txtcol < W_WIDTH(wp)) | |
| 2789 ScreenAttrs[off + txtcol] = hl_combine_attr( | |
| 2790 ScreenAttrs[off + txtcol], hl_attr(HLF_MC)); | |
| 2791 txtcol = old_txtcol; | |
| 2792 j = wp->w_p_cc_cols[++i]; | |
| 2793 } | |
| 2794 } | |
| 2795 | |
| 743 | 2796 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2797 if (wp->w_p_cuc) |
| 2798 { | |
| 2799 txtcol += wp->w_virtcol; | |
| 2800 if (wp->w_p_wrap) | |
| 2801 txtcol -= wp->w_skipcol; | |
| 2802 else | |
| 2803 txtcol -= wp->w_leftcol; | |
| 2804 if (txtcol >= 0 && txtcol < W_WIDTH(wp)) | |
| 2805 ScreenAttrs[off + txtcol] = hl_combine_attr( | |
| 2806 ScreenAttrs[off + txtcol], hl_attr(HLF_CUC)); | |
| 2807 } | |
| 743 | 2808 #endif |
| 7 | 2809 |
| 2810 SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp), | |
| 2811 (int)W_WIDTH(wp), FALSE); | |
| 2812 | |
| 2813 /* | |
| 2814 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2815 * updated (saves a call to plines() later). | |
| 2816 */ | |
| 2817 if (wp == curwin | |
| 2818 && lnum <= curwin->w_cursor.lnum | |
| 2819 && lnume >= curwin->w_cursor.lnum) | |
| 2820 { | |
| 2821 curwin->w_cline_row = row; | |
| 2822 curwin->w_cline_height = 1; | |
| 2823 curwin->w_cline_folded = TRUE; | |
| 2824 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2825 } | |
| 2826 } | |
| 2827 | |
| 2828 /* | |
| 2829 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2830 */ | |
| 2831 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2832 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2833 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2834 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2835 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2836 int attr) |
| 7 | 2837 { |
| 216 | 2838 int i; |
| 2839 | |
| 7 | 2840 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2841 # ifdef FEAT_MBYTE | |
| 2842 if (enc_utf8) | |
| 2843 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 2844 # endif | |
| 216 | 2845 for (i = 0; i < len; ++i) |
| 2846 ScreenAttrs[off + i] = attr; | |
| 7 | 2847 } |
| 2848 | |
| 2849 /* | |
| 2850 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2851 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2852 */ |
| 2853 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2854 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2855 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2856 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2857 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2858 linenr_T lnum) /* current line number */ |
| 7 | 2859 { |
| 2860 int i = 0; | |
| 2861 int level; | |
| 2862 int first_level; | |
| 519 | 2863 int empty; |
| 6553 | 2864 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2865 |
| 2866 /* Init to all spaces. */ | |
| 6929 | 2867 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2868 |
| 2869 level = win_foldinfo.fi_level; | |
| 2870 if (level > 0) | |
| 2871 { | |
| 519 | 2872 /* If there is only one column put more info in it. */ |
| 6553 | 2873 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2874 |
| 7 | 2875 /* If the column is too narrow, we start at the lowest level that |
| 2876 * fits and use numbers to indicated the depth. */ | |
| 6553 | 2877 first_level = level - fdc - closed + 1 + empty; |
| 7 | 2878 if (first_level < 1) |
| 2879 first_level = 1; | |
| 2880 | |
| 6553 | 2881 for (i = 0; i + empty < fdc; ++i) |
| 7 | 2882 { |
| 2883 if (win_foldinfo.fi_lnum == lnum | |
| 2884 && first_level + i >= win_foldinfo.fi_low_level) | |
| 2885 p[i] = '-'; | |
| 2886 else if (first_level == 1) | |
| 2887 p[i] = '|'; | |
| 2888 else if (first_level + i <= 9) | |
| 2889 p[i] = '0' + first_level + i; | |
| 2890 else | |
| 2891 p[i] = '>'; | |
| 2892 if (first_level + i == level) | |
| 2893 break; | |
| 2894 } | |
| 2895 } | |
| 2896 if (closed) | |
| 6553 | 2897 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 2898 } |
| 2899 #endif /* FEAT_FOLDING */ | |
| 2900 | |
| 2901 /* | |
| 2902 * Display line "lnum" of window 'wp' on the screen. | |
| 2903 * Start at row "startrow", stop when "endrow" is reached. | |
| 2904 * wp->w_virtcol needs to be valid. | |
| 2905 * | |
| 2906 * Return the number of last row the line occupies. | |
| 2907 */ | |
| 2908 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2909 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2910 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2911 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2912 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2913 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2914 int nochange UNUSED) /* not updating for changed text */ |
| 7 | 2915 { |
| 2916 int col; /* visual column on screen */ | |
| 2917 unsigned off; /* offset in ScreenLines/ScreenAttrs */ | |
| 2918 int c = 0; /* init for GCC */ | |
| 2919 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 2920 #ifdef FEAT_LINEBREAK |
| 2921 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 2922 #endif | |
| 7 | 2923 long vcol_prev = -1; /* "vcol" of previous character */ |
| 2924 char_u *line; /* current line */ | |
| 2925 char_u *ptr; /* current position in "line" */ | |
| 2926 int row; /* row in the window, excl w_winrow */ | |
| 2927 int screen_row; /* row on the screen, incl w_winrow */ | |
| 2928 | |
| 2929 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 2930 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 2931 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 2932 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 2933 int c_extra = NUL; /* extra chars, all the same */ |
| 2934 int extra_attr = 0; /* attributes when n_extra != 0 */ | |
| 2935 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 2936 displaying lcs_eol at end-of-line */ | |
| 2937 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 2938 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 2939 | |
| 2940 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 2941 int saved_n_extra = 0; | |
| 2942 char_u *saved_p_extra = NULL; | |
| 2943 int saved_c_extra = 0; | |
| 2944 int saved_char_attr = 0; | |
| 2945 | |
| 2946 int n_attr = 0; /* chars with special attr */ | |
| 2947 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 2948 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 2949 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 2950 | |
| 2951 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 2952 | |
| 2953 int fromcol, tocol; /* start/end of inverting */ | |
| 2954 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 2955 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 2956 pos_T *top, *bot; | |
| 1813 | 2957 int lnum_in_visual_area = FALSE; |
| 7 | 2958 pos_T pos; |
| 2959 long v; | |
| 2960 | |
| 2961 int char_attr = 0; /* attributes for next character */ | |
| 674 | 2962 int attr_pri = FALSE; /* char_attr has priority */ |
| 7 | 2963 int area_highlighting = FALSE; /* Visual or incsearch highlighting |
| 2964 in this line */ | |
| 2965 int attr = 0; /* attributes for area highlighting */ | |
| 2966 int area_attr = 0; /* attributes desired by highlighting */ | |
| 2967 int search_attr = 0; /* attributes desired by 'hlsearch' */ | |
| 2968 #ifdef FEAT_SYN_HL | |
| 743 | 2969 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 2970 int syntax_attr = 0; /* attributes desired by syntax */ |
| 2971 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 2972 int save_did_emsg; | |
| 1437 | 2973 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
|
2974 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2975 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 2976 #endif |
| 2977 #ifdef FEAT_SPELL | |
| 221 | 2978 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 2979 # define SPWORDLEN 150 |
| 2980 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 2981 int nextlinecol = 0; /* column where nextline[] starts */ |
| 2982 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 2983 starts */ |
| 221 | 2984 int spell_attr = 0; /* attributes desired by spelling */ |
| 2985 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 2986 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 2987 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 2988 * there are no spell errors */ |
| 386 | 2989 static int cap_col = -1; /* column to check for Cap word */ |
| 2990 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 2991 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 2992 #endif |
| 2993 int extra_check; /* has syntax or linebreak */ | |
| 2994 #ifdef FEAT_MBYTE | |
| 2995 int multi_attr = 0; /* attributes desired by multibyte */ | |
| 2996 int mb_l = 1; /* multi-byte byte length */ | |
| 2997 int mb_c = 0; /* decoded multi-byte character */ | |
| 2998 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 2999 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3000 #endif |
| 3001 #ifdef FEAT_DIFF | |
| 3002 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3003 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3004 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3005 int change_start = MAXCOL; /* first col of changed area */ |
| 3006 int change_end = -1; /* last col of changed area */ | |
| 3007 #endif | |
| 3008 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3009 #ifdef FEAT_LINEBREAK | |
| 3010 int need_showbreak = FALSE; | |
| 3011 #endif | |
| 910 | 3012 #if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \ |
| 3013 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) | |
| 7 | 3014 # define LINE_ATTR |
| 1536 | 3015 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3016 #endif |
| 3017 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3018 matchitem_T *cur; /* points to the match list */ |
| 3019 match_T *shl; /* points to search_hl or a match */ | |
| 3020 int shl_flag; /* flag to indicate whether search_hl | |
| 3021 has been processed or not */ | |
| 5979 | 3022 int pos_inprogress; /* marks that position match search is |
| 3023 in progress */ | |
| 1326 | 3024 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3025 equals startcol of search_hl or one | |
| 3026 of the matches */ | |
| 7 | 3027 #endif |
| 3028 #ifdef FEAT_ARABIC | |
| 3029 int prev_c = 0; /* previous Arabic character */ | |
| 3030 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3031 #endif | |
| 910 | 3032 #if defined(LINE_ATTR) |
| 867 | 3033 int did_line_attr = 0; |
| 3034 #endif | |
| 7 | 3035 |
| 3036 /* draw_state: items that are drawn in sequence: */ | |
| 3037 #define WL_START 0 /* nothing done yet */ | |
| 3038 #ifdef FEAT_CMDWIN | |
| 3039 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3040 #else | |
| 3041 # define WL_CMDLINE WL_START | |
| 3042 #endif | |
| 3043 #ifdef FEAT_FOLDING | |
| 3044 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3045 #else | |
| 3046 # define WL_FOLD WL_CMDLINE | |
| 3047 #endif | |
| 3048 #ifdef FEAT_SIGNS | |
| 3049 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3050 #else | |
| 3051 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3052 #endif | |
| 3053 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3054 #ifdef FEAT_LINEBREAK |
| 3055 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3056 #else | |
| 3057 # define WL_BRI WL_NR | |
| 3058 #endif | |
| 7 | 3059 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3060 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3061 #else |
| 5995 | 3062 # define WL_SBR WL_BRI |
| 7 | 3063 #endif |
| 3064 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3065 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3066 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3067 int feedback_col = 0; |
| 3068 int feedback_old_attr = -1; | |
| 3069 #endif | |
| 3070 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3071 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3072 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
|
3073 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
|
3074 int prev_syntax_id = 0; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3075 int conceal_attr = hl_attr(HLF_CONCEAL); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3076 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3077 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
|
3078 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3079 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
|
3080 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3081 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
|
3082 int has_match_conc = 0; /* match wants to conceal */ |
| 6520 | 3083 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3084 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3085 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3086 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3087 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3088 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3089 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3090 col -= boguscols; \ |
| 6520 | 3091 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3092 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3093 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3094 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3095 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3096 #endif |
| 7 | 3097 |
| 3098 if (startrow > endrow) /* past the end already! */ | |
| 3099 return startrow; | |
| 3100 | |
| 3101 row = startrow; | |
| 3102 screen_row = row + W_WINROW(wp); | |
| 3103 | |
| 3104 /* | |
| 3105 * To speed up the loop below, set extra_check when there is linebreak, | |
| 3106 * trailing white space and/or syntax processing to be done. | |
| 3107 */ | |
| 3108 #ifdef FEAT_LINEBREAK | |
| 3109 extra_check = wp->w_p_lbr; | |
| 3110 #else | |
| 3111 extra_check = 0; | |
| 3112 #endif | |
| 3113 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3114 if (syntax_present(wp) && !wp->w_s->b_syn_error) |
| 7 | 3115 { |
| 3116 /* Prepare for syntax highlighting in this line. When there is an | |
| 3117 * error, stop syntax highlighting. */ | |
| 3118 save_did_emsg = did_emsg; | |
| 3119 did_emsg = FALSE; | |
| 3120 syntax_start(wp, lnum); | |
| 3121 if (did_emsg) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3122 wp->w_s->b_syn_error = TRUE; |
| 7 | 3123 else |
| 3124 { | |
| 3125 did_emsg = save_did_emsg; | |
| 3126 has_syntax = TRUE; | |
| 3127 extra_check = TRUE; | |
| 3128 } | |
| 3129 } | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3130 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3131 /* Check for columns to display for 'colorcolumn'. */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3132 color_cols = wp->w_p_cc_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3133 if (color_cols != NULL) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3134 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3135 #endif |
| 3136 | |
| 3137 #ifdef FEAT_SPELL | |
| 258 | 3138 if (wp->w_p_spell |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3139 && *wp->w_s->b_p_spl != NUL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3140 && wp->w_s->b_langp.ga_len > 0 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3141 && *(char **)(wp->w_s->b_langp.ga_data) != NULL) |
| 221 | 3142 { |
| 3143 /* Prepare for spell checking. */ | |
| 3144 has_spell = TRUE; | |
| 3145 extra_check = TRUE; | |
| 348 | 3146 |
| 3147 /* Get the start of the next line, so that words that wrap to the next | |
| 3148 * line are found too: "et<line-break>al.". | |
| 3149 * Trick: skip a few chars for C/shell/Vim comments */ | |
| 3150 nextline[SPWORDLEN] = NUL; | |
| 3151 if (lnum < wp->w_buffer->b_ml.ml_line_count) | |
| 3152 { | |
| 3153 line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE); | |
| 3154 spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN); | |
| 3155 } | |
| 3156 | |
| 3157 /* When a word wrapped from the previous line the start of the current | |
| 3158 * line is valid. */ | |
| 3159 if (lnum == checked_lnum) | |
| 3160 cur_checked_col = checked_col; | |
| 3161 checked_lnum = 0; | |
| 386 | 3162 |
| 3163 /* When there was a sentence end in the previous line may require a | |
| 3164 * word starting with capital in this line. In line 1 always check | |
| 3165 * the first word. */ | |
| 3166 if (lnum != capcol_lnum) | |
| 3167 cap_col = -1; | |
| 3168 if (lnum == 1) | |
| 3169 cap_col = 0; | |
| 3170 capcol_lnum = 0; | |
| 221 | 3171 } |
| 7 | 3172 #endif |
| 3173 | |
| 3174 /* | |
| 3175 * handle visual active in this window | |
| 3176 */ | |
| 3177 fromcol = -10; | |
| 3178 tocol = MAXCOL; | |
| 3179 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 3180 { | |
| 3181 /* Visual is after curwin->w_cursor */ | |
| 3182 if (ltoreq(curwin->w_cursor, VIsual)) | |
| 3183 { | |
| 3184 top = &curwin->w_cursor; | |
| 3185 bot = &VIsual; | |
| 3186 } | |
| 3187 else /* Visual is before curwin->w_cursor */ | |
| 3188 { | |
| 3189 top = &VIsual; | |
| 3190 bot = &curwin->w_cursor; | |
| 3191 } | |
| 1813 | 3192 lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum); |
| 7 | 3193 if (VIsual_mode == Ctrl_V) /* block mode */ |
| 3194 { | |
| 1813 | 3195 if (lnum_in_visual_area) |
| 7 | 3196 { |
| 3197 fromcol = wp->w_old_cursor_fcol; | |
| 3198 tocol = wp->w_old_cursor_lcol; | |
| 3199 } | |
| 3200 } | |
| 3201 else /* non-block mode */ | |
| 3202 { | |
| 3203 if (lnum > top->lnum && lnum <= bot->lnum) | |
| 3204 fromcol = 0; | |
| 3205 else if (lnum == top->lnum) | |
| 3206 { | |
| 3207 if (VIsual_mode == 'V') /* linewise */ | |
| 3208 fromcol = 0; | |
| 3209 else | |
| 3210 { | |
| 3211 getvvcol(wp, top, (colnr_T *)&fromcol, NULL, NULL); | |
| 3212 if (gchar_pos(top) == NUL) | |
| 3213 tocol = fromcol + 1; | |
| 3214 } | |
| 3215 } | |
| 3216 if (VIsual_mode != 'V' && lnum == bot->lnum) | |
| 3217 { | |
| 3218 if (*p_sel == 'e' && bot->col == 0 | |
| 3219 #ifdef FEAT_VIRTUALEDIT | |
| 3220 && bot->coladd == 0 | |
| 3221 #endif | |
| 3222 ) | |
| 3223 { | |
| 3224 fromcol = -10; | |
| 3225 tocol = MAXCOL; | |
| 3226 } | |
| 36 | 3227 else if (bot->col == MAXCOL) |
| 3228 tocol = MAXCOL; | |
| 7 | 3229 else |
| 3230 { | |
| 3231 pos = *bot; | |
| 3232 if (*p_sel == 'e') | |
| 3233 getvvcol(wp, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3234 else | |
| 3235 { | |
| 3236 getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol); | |
| 3237 ++tocol; | |
| 3238 } | |
| 3239 } | |
| 3240 } | |
| 3241 } | |
| 3242 | |
| 3243 /* Check if the character under the cursor should not be inverted */ | |
| 3244 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
|
3245 #ifdef FEAT_GUI |
| 7 | 3246 && !gui.in_use |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
3247 #endif |
| 7 | 3248 ) |
| 3249 noinvcur = TRUE; | |
| 3250 | |
| 3251 /* if inverting in this line set area_highlighting */ | |
| 3252 if (fromcol >= 0) | |
| 3253 { | |
| 3254 area_highlighting = TRUE; | |
| 3255 attr = hl_attr(HLF_V); | |
| 3256 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) | |
| 3674 | 3257 if ((clip_star.available && !clip_star.owned |
| 3258 && clip_isautosel_star()) | |
| 3259 || (clip_plus.available && !clip_plus.owned | |
| 3260 && clip_isautosel_plus())) | |
| 7 | 3261 attr = hl_attr(HLF_VNC); |
| 3262 #endif | |
| 3263 } | |
| 3264 } | |
| 3265 | |
| 3266 /* | |
| 674 | 3267 * handle 'incsearch' and ":s///c" highlighting |
| 7 | 3268 */ |
| 5735 | 3269 else if (highlight_match |
| 7 | 3270 && wp == curwin |
| 3271 && lnum >= curwin->w_cursor.lnum | |
| 3272 && lnum <= curwin->w_cursor.lnum + search_match_lines) | |
| 3273 { | |
| 3274 if (lnum == curwin->w_cursor.lnum) | |
| 3275 getvcol(curwin, &(curwin->w_cursor), | |
| 3276 (colnr_T *)&fromcol, NULL, NULL); | |
| 3277 else | |
| 3278 fromcol = 0; | |
| 3279 if (lnum == curwin->w_cursor.lnum + search_match_lines) | |
| 3280 { | |
| 3281 pos.lnum = lnum; | |
| 3282 pos.col = search_match_endcol; | |
| 3283 getvcol(curwin, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3284 } | |
| 3285 else | |
| 3286 tocol = MAXCOL; | |
| 1850 | 3287 /* do at least one character; happens when past end of line */ |
| 3288 if (fromcol == tocol) | |
| 3289 tocol = fromcol + 1; | |
| 7 | 3290 area_highlighting = TRUE; |
| 3291 attr = hl_attr(HLF_I); | |
| 3292 } | |
| 3293 | |
| 3294 #ifdef FEAT_DIFF | |
| 3295 filler_lines = diff_check(wp, lnum); | |
| 3296 if (filler_lines < 0) | |
| 3297 { | |
| 3298 if (filler_lines == -1) | |
| 3299 { | |
| 3300 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3301 diff_hlf = HLF_ADD; /* added line */ | |
| 3302 else if (change_start == 0) | |
| 3303 diff_hlf = HLF_TXD; /* changed text */ | |
| 3304 else | |
| 3305 diff_hlf = HLF_CHD; /* changed line */ | |
| 3306 } | |
| 3307 else | |
| 3308 diff_hlf = HLF_ADD; /* added line */ | |
| 3309 filler_lines = 0; | |
| 3310 area_highlighting = TRUE; | |
| 3311 } | |
| 3312 if (lnum == wp->w_topline) | |
| 3313 filler_lines = wp->w_topfill; | |
| 3314 filler_todo = filler_lines; | |
| 3315 #endif | |
| 3316 | |
| 3317 #ifdef LINE_ATTR | |
| 3318 # ifdef FEAT_SIGNS | |
| 3319 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3320 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3321 if (v != 0) | |
| 3322 line_attr = sign_get_attr((int)v, TRUE); | |
| 3323 # endif | |
| 3324 # if defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS) | |
| 3325 /* Highlight the current line in the quickfix window. */ | |
| 644 | 3326 if (bt_quickfix(wp->w_buffer) && qf_current_entry(wp) == lnum) |
| 7 | 3327 line_attr = hl_attr(HLF_L); |
| 3328 # endif | |
| 3329 if (line_attr != 0) | |
| 3330 area_highlighting = TRUE; | |
| 3331 #endif | |
| 3332 | |
| 3333 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3334 ptr = line; | |
| 3335 | |
| 743 | 3336 #ifdef FEAT_SPELL |
| 348 | 3337 if (has_spell) |
| 3338 { | |
| 386 | 3339 /* For checking first word with a capital skip white space. */ |
| 3340 if (cap_col == 0) | |
| 835 | 3341 cap_col = (int)(skipwhite(line) - line); |
| 386 | 3342 |
| 348 | 3343 /* To be able to spell-check over line boundaries copy the end of the |
| 3344 * current line into nextline[]. Above the start of the next line was | |
| 3345 * copied to nextline[SPWORDLEN]. */ | |
| 3346 if (nextline[SPWORDLEN] == NUL) | |
| 3347 { | |
| 3348 /* No next line or it is empty. */ | |
| 3349 nextlinecol = MAXCOL; | |
| 3350 nextline_idx = 0; | |
| 3351 } | |
| 3352 else | |
| 3353 { | |
| 835 | 3354 v = (long)STRLEN(line); |
| 348 | 3355 if (v < SPWORDLEN) |
| 3356 { | |
| 3357 /* Short line, use it completely and append the start of the | |
| 3358 * next line. */ | |
| 3359 nextlinecol = 0; | |
| 3360 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3361 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3362 nextline_idx = v + 1; |
| 3363 } | |
| 3364 else | |
| 3365 { | |
| 3366 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3367 nextlinecol = v - SPWORDLEN; | |
| 3368 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3369 nextline_idx = SPWORDLEN + 1; | |
| 3370 } | |
| 3371 } | |
| 3372 } | |
| 3373 #endif | |
| 3374 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3375 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3376 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3377 if (lcs_space || lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3378 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3379 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3380 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3381 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3382 trailcol = (colnr_T)STRLEN(ptr); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3383 while (trailcol > (colnr_T)0 && vim_iswhite(ptr[trailcol - 1])) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3384 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3385 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3386 } |
| 7 | 3387 } |
| 3388 | |
| 3389 /* | |
| 3390 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3391 * first character to be displayed. | |
| 3392 */ | |
| 3393 if (wp->w_p_wrap) | |
| 3394 v = wp->w_skipcol; | |
| 3395 else | |
| 3396 v = wp->w_leftcol; | |
| 3397 if (v > 0) | |
| 3398 { | |
| 3399 #ifdef FEAT_MBYTE | |
| 3400 char_u *prev_ptr = ptr; | |
| 3401 #endif | |
| 3402 while (vcol < v && *ptr != NUL) | |
| 3403 { | |
| 5995 | 3404 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3405 vcol += c; |
| 3406 #ifdef FEAT_MBYTE | |
| 3407 prev_ptr = ptr; | |
| 39 | 3408 #endif |
| 3409 mb_ptr_adv(ptr); | |
| 7 | 3410 } |
| 3411 | |
| 1984 | 3412 /* When: |
| 3413 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3414 * - 'colorcolumn' is set, or |
| 1984 | 3415 * - 'virtualedit' is set, or |
| 3416 * - the visual mode is active, | |
| 3417 * the end of the line may be before the start of the displayed part. | |
| 3418 */ | |
| 3419 if (vcol < v && ( | |
| 5735 | 3420 #ifdef FEAT_SYN_HL |
| 3421 wp->w_p_cuc || draw_color_col || | |
| 3422 #endif | |
| 3423 #ifdef FEAT_VIRTUALEDIT | |
| 3424 virtual_active() || | |
| 3425 #endif | |
| 3426 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 1984 | 3427 { |
| 7 | 3428 vcol = v; |
| 1984 | 3429 } |
| 7 | 3430 |
| 3431 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3432 * that character but skip the first few screen characters. */ | |
| 3433 if (vcol > v) | |
| 3434 { | |
| 3435 vcol -= c; | |
| 3436 #ifdef FEAT_MBYTE | |
| 3437 ptr = prev_ptr; | |
| 3438 #else | |
| 3439 --ptr; | |
| 3440 #endif | |
| 3441 n_skip = v - vcol; | |
| 3442 } | |
| 3443 | |
| 3444 /* | |
| 3445 * Adjust for when the inverted text is before the screen, | |
| 3446 * and when the start of the inverted text is before the screen. | |
| 3447 */ | |
| 3448 if (tocol <= vcol) | |
| 3449 fromcol = 0; | |
| 3450 else if (fromcol >= 0 && fromcol < vcol) | |
| 3451 fromcol = vcol; | |
| 3452 | |
| 3453 #ifdef FEAT_LINEBREAK | |
| 3454 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3455 if (wp->w_p_wrap) | |
| 3456 need_showbreak = TRUE; | |
| 3457 #endif | |
| 743 | 3458 #ifdef FEAT_SPELL |
| 499 | 3459 /* When spell checking a word we need to figure out the start of the |
| 3460 * word and if it's badly spelled or not. */ | |
| 3461 if (has_spell) | |
| 3462 { | |
| 3463 int len; | |
| 1536 | 3464 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3465 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3466 |
| 3467 pos = wp->w_cursor; | |
| 3468 wp->w_cursor.lnum = lnum; | |
| 1536 | 3469 wp->w_cursor.col = linecol; |
| 534 | 3470 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3471 |
| 3472 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3473 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3474 ptr = line + linecol; | |
| 3475 | |
| 530 | 3476 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3477 { |
| 3478 /* no bad word found at line start, don't check until end of a | |
| 3479 * word */ | |
| 534 | 3480 spell_hlf = HLF_COUNT; |
| 3572 | 3481 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3482 } |
| 3483 else | |
| 534 | 3484 { |
| 499 | 3485 /* bad word found, use attributes until end of word */ |
| 3486 word_end = wp->w_cursor.col + len + 1; | |
| 3487 | |
| 534 | 3488 /* Turn index into actual attributes. */ |
| 3489 if (spell_hlf != HLF_COUNT) | |
| 3490 spell_attr = highlight_attr[spell_hlf]; | |
| 3491 } | |
| 499 | 3492 wp->w_cursor = pos; |
| 501 | 3493 |
| 743 | 3494 # ifdef FEAT_SYN_HL |
| 501 | 3495 /* Need to restart syntax highlighting for this line. */ |
| 3496 if (has_syntax) | |
| 3497 syntax_start(wp, lnum); | |
| 743 | 3498 # endif |
| 499 | 3499 } |
| 3500 #endif | |
| 7 | 3501 } |
| 3502 | |
| 3503 /* | |
| 3504 * Correct highlighting for cursor that can't be disabled. | |
| 3505 * Avoids having to check this for each character. | |
| 3506 */ | |
| 3507 if (fromcol >= 0) | |
| 3508 { | |
| 3509 if (noinvcur) | |
| 3510 { | |
| 3511 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3512 { | |
| 3513 /* highlighting starts at cursor, let it start just after the | |
| 3514 * cursor */ | |
| 3515 fromcol_prev = fromcol; | |
| 3516 fromcol = -1; | |
| 3517 } | |
| 3518 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3519 /* restart highlighting after the cursor */ | |
| 3520 fromcol_prev = wp->w_virtcol; | |
| 3521 } | |
| 3522 if (fromcol >= tocol) | |
| 3523 fromcol = -1; | |
| 3524 } | |
| 3525 | |
| 3526 #ifdef FEAT_SEARCH_EXTRA | |
| 3527 /* | |
| 1326 | 3528 * Handle highlighting the last used search pattern and matches. |
| 3529 * Do this for both search_hl and the match list. | |
| 7 | 3530 */ |
| 1326 | 3531 cur = wp->w_match_head; |
| 3532 shl_flag = FALSE; | |
| 3533 while (cur != NULL || shl_flag == FALSE) | |
| 3534 { | |
| 3535 if (shl_flag == FALSE) | |
| 3536 { | |
| 3537 shl = &search_hl; | |
| 3538 shl_flag = TRUE; | |
| 3539 } | |
| 3540 else | |
| 3541 shl = &cur->hl; | |
| 36 | 3542 shl->startcol = MAXCOL; |
| 3543 shl->endcol = MAXCOL; | |
| 7 | 3544 shl->attr_cur = 0; |
| 5979 | 3545 v = (long)(ptr - line); |
| 3546 if (cur != NULL) | |
| 3547 cur->pos.cur = 0; | |
| 3548 next_search_hl(wp, shl, lnum, (colnr_T)v, cur); | |
| 3549 | |
| 3550 /* Need to get the line again, a multi-line regexp may have made it | |
| 3551 * invalid. */ | |
| 3552 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3553 ptr = line + v; | |
| 3554 | |
| 3555 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3556 { | |
| 3557 if (shl->lnum == lnum) | |
| 3558 shl->startcol = shl->rm.startpos[0].col; | |
| 3559 else | |
| 3560 shl->startcol = 0; | |
| 3561 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3562 - shl->rm.startpos[0].lnum) | |
| 3563 shl->endcol = shl->rm.endpos[0].col; | |
| 3564 else | |
| 3565 shl->endcol = MAXCOL; | |
| 3566 /* Highlight one character for an empty match. */ | |
| 3567 if (shl->startcol == shl->endcol) | |
| 3568 { | |
| 3569 #ifdef FEAT_MBYTE | |
| 3570 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3571 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3572 else |
| 5979 | 3573 #endif |
| 3574 ++shl->endcol; | |
| 3575 } | |
| 3576 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3577 { | |
| 3578 shl->attr_cur = shl->attr; | |
| 3579 search_attr = shl->attr; | |
| 3580 } | |
| 3581 area_highlighting = TRUE; | |
| 7 | 3582 } |
| 1326 | 3583 if (shl != &search_hl && cur != NULL) |
| 3584 cur = cur->next; | |
| 7 | 3585 } |
| 3586 #endif | |
| 3587 | |
| 743 | 3588 #ifdef FEAT_SYN_HL |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3589 /* 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
|
3590 * 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
|
3591 * then. */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3592 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
| 5979 | 3593 && !(wp == curwin && VIsual_active)) |
| 743 | 3594 { |
| 3595 line_attr = hl_attr(HLF_CUL); | |
| 3596 area_highlighting = TRUE; | |
| 3597 } | |
| 3598 #endif | |
| 3599 | |
| 504 | 3600 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3601 col = 0; |
| 3602 #ifdef FEAT_RIGHTLEFT | |
| 3603 if (wp->w_p_rl) | |
| 3604 { | |
| 3605 /* Rightleft window: process the text in the normal direction, but put | |
| 3606 * it in current_ScreenLine[] from right to left. Start at the | |
| 3607 * rightmost column of the window. */ | |
| 3608 col = W_WIDTH(wp) - 1; | |
| 3609 off += col; | |
| 3610 } | |
| 3611 #endif | |
| 3612 | |
| 3613 /* | |
| 3614 * Repeat for the whole displayed line. | |
| 3615 */ | |
| 3616 for (;;) | |
| 3617 { | |
| 6947 | 3618 #ifdef FEAT_CONCEAL |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3619 has_match_conc = 0; |
| 6947 | 3620 #endif |
| 7 | 3621 /* Skip this quickly when working on the text. */ |
| 3622 if (draw_state != WL_LINE) | |
| 3623 { | |
| 3624 #ifdef FEAT_CMDWIN | |
| 3625 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3626 { | |
| 3627 draw_state = WL_CMDLINE; | |
| 3628 if (cmdwin_type != 0 && wp == curwin) | |
| 3629 { | |
| 3630 /* Draw the cmdline character. */ | |
| 3631 n_extra = 1; | |
| 1340 | 3632 c_extra = cmdwin_type; |
| 7 | 3633 char_attr = hl_attr(HLF_AT); |
| 3634 } | |
| 3635 } | |
| 3636 #endif | |
| 3637 | |
| 3638 #ifdef FEAT_FOLDING | |
| 3639 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3640 { | |
| 6553 | 3641 int fdc = compute_foldcolumn(wp, 0); |
| 3642 | |
| 7 | 3643 draw_state = WL_FOLD; |
| 6553 | 3644 if (fdc > 0) |
| 7 | 3645 { |
| 3646 /* Draw the 'foldcolumn'. */ | |
| 3647 fill_foldcolumn(extra, wp, FALSE, lnum); | |
| 6553 | 3648 n_extra = fdc; |
| 7 | 3649 p_extra = extra; |
| 1340 | 3650 p_extra[n_extra] = NUL; |
| 7 | 3651 c_extra = NUL; |
| 3652 char_attr = hl_attr(HLF_FC); | |
| 3653 } | |
| 3654 } | |
| 3655 #endif | |
| 3656 | |
| 3657 #ifdef FEAT_SIGNS | |
| 3658 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3659 { | |
| 3660 draw_state = WL_SIGN; | |
| 3661 /* Show the sign column when there are any signs in this | |
| 3662 * buffer or when using Netbeans. */ | |
| 5921 | 3663 if (draw_signcolumn(wp)) |
| 7 | 3664 { |
| 2661 | 3665 int text_sign; |
| 7 | 3666 # ifdef FEAT_SIGN_ICONS |
| 2661 | 3667 int icon_sign; |
| 7 | 3668 # endif |
| 3669 | |
| 3670 /* Draw two cells with the sign value or blank. */ | |
| 3671 c_extra = ' '; | |
| 3672 char_attr = hl_attr(HLF_SC); | |
| 3673 n_extra = 2; | |
| 3674 | |
| 5921 | 3675 if (row == startrow |
| 3676 #ifdef FEAT_DIFF | |
| 3677 + filler_lines && filler_todo <= 0 | |
| 3678 #endif | |
| 3679 ) | |
| 7 | 3680 { |
| 3681 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3682 SIGN_TEXT); | |
| 3683 # ifdef FEAT_SIGN_ICONS | |
| 3684 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3685 SIGN_ICON); | |
| 3686 if (gui.in_use && icon_sign != 0) | |
| 3687 { | |
| 3688 /* Use the image in this position. */ | |
| 3689 c_extra = SIGN_BYTE; | |
| 3690 # ifdef FEAT_NETBEANS_INTG | |
| 3691 if (buf_signcount(wp->w_buffer, lnum) > 1) | |
| 3692 c_extra = MULTISIGN_BYTE; | |
| 3693 # endif | |
| 3694 char_attr = icon_sign; | |
| 3695 } | |
| 3696 else | |
| 3697 # endif | |
| 3698 if (text_sign != 0) | |
| 3699 { | |
| 3700 p_extra = sign_get_text(text_sign); | |
| 3701 if (p_extra != NULL) | |
| 3702 { | |
| 3703 c_extra = NUL; | |
| 835 | 3704 n_extra = (int)STRLEN(p_extra); |
| 7 | 3705 } |
| 3706 char_attr = sign_get_attr(text_sign, FALSE); | |
| 3707 } | |
| 3708 } | |
| 3709 } | |
| 3710 } | |
| 3711 #endif | |
| 3712 | |
| 3713 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3714 { | |
| 3715 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3716 /* 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
|
3717 * 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
|
3718 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3719 && (row == startrow |
| 3720 #ifdef FEAT_DIFF | |
| 3721 + filler_lines | |
| 3722 #endif | |
| 3723 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3724 { | |
| 3725 /* Draw the line number (empty space after wrapping). */ | |
| 3726 if (row == startrow | |
| 3727 #ifdef FEAT_DIFF | |
| 3728 + filler_lines | |
| 3729 #endif | |
| 3730 ) | |
| 3731 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3732 long num; |
| 4065 | 3733 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3734 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3735 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
|
3736 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3737 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3738 else |
| 4065 | 3739 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3740 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3741 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
|
3742 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3743 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3744 /* 'number' + 'relativenumber' */ |
| 4065 | 3745 num = lnum; |
| 3746 fmt = "%-*ld "; | |
| 3747 } | |
| 3748 } | |
| 3749 | |
| 3750 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3751 number_width(wp), num); |
| 7 | 3752 if (wp->w_skipcol > 0) |
| 3753 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3754 *p_extra = '-'; | |
| 3755 #ifdef FEAT_RIGHTLEFT | |
| 3756 if (wp->w_p_rl) /* reverse line numbers */ | |
| 3757 rl_mirror(extra); | |
| 3758 #endif | |
| 3759 p_extra = extra; | |
| 3760 c_extra = NUL; | |
| 3761 } | |
| 3762 else | |
| 3763 c_extra = ' '; | |
| 13 | 3764 n_extra = number_width(wp) + 1; |
| 7 | 3765 char_attr = hl_attr(HLF_N); |
| 743 | 3766 #ifdef FEAT_SYN_HL |
| 3767 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 3768 * the current line differently. |
| 3769 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 3770 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3771 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 3772 && lnum == wp->w_cursor.lnum) |
| 3427 | 3773 char_attr = hl_attr(HLF_CLN); |
| 743 | 3774 #endif |
| 7 | 3775 } |
| 3776 } | |
| 3777 | |
| 5995 | 3778 #ifdef FEAT_LINEBREAK |
| 3779 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 3780 && n_extra == 0 && *p_sbr != NUL) | |
| 3781 /* draw indent after showbreak value */ | |
| 3782 draw_state = WL_BRI; | |
| 3783 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 3784 /* After the showbreak, draw the breakindent */ | |
| 3785 draw_state = WL_BRI - 1; | |
| 3786 | |
| 3787 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 3788 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 3789 { | |
| 3790 draw_state = WL_BRI; | |
| 6834 | 3791 if (wp->w_p_bri && n_extra == 0 && row != startrow |
| 5995 | 3792 # ifdef FEAT_DIFF |
| 3793 && filler_lines == 0 | |
| 6834 | 3794 # endif |
| 5995 | 3795 ) |
| 3796 { | |
| 3797 char_attr = 0; /* was: hl_attr(HLF_AT); */ | |
| 6834 | 3798 # ifdef FEAT_DIFF |
| 5995 | 3799 if (diff_hlf != (hlf_T)0) |
| 6106 | 3800 { |
| 5995 | 3801 char_attr = hl_attr(diff_hlf); |
| 6834 | 3802 # ifdef FEAT_SYN_HL |
| 6106 | 3803 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 3804 char_attr = hl_combine_attr(char_attr, | |
| 3805 hl_attr(HLF_CUL)); | |
| 6834 | 3806 # endif |
| 6106 | 3807 } |
| 6834 | 3808 # endif |
| 6028 | 3809 p_extra = NULL; |
| 5995 | 3810 c_extra = ' '; |
| 3811 n_extra = get_breakindent_win(wp, | |
| 3812 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 3813 /* Correct end of highlighted area for 'breakindent', | |
| 3814 * required when 'linebreak' is also set. */ | |
| 3815 if (tocol == vcol) | |
| 3816 tocol += n_extra; | |
| 3817 } | |
| 3818 } | |
| 3819 #endif | |
| 3820 | |
| 7 | 3821 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 3822 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 3823 { | |
| 3824 draw_state = WL_SBR; | |
| 3825 # ifdef FEAT_DIFF | |
| 3826 if (filler_todo > 0) | |
| 3827 { | |
| 3828 /* Draw "deleted" diff line(s). */ | |
| 3829 if (char2cells(fill_diff) > 1) | |
| 3830 c_extra = '-'; | |
| 3831 else | |
| 3832 c_extra = fill_diff; | |
| 3833 # ifdef FEAT_RIGHTLEFT | |
| 3834 if (wp->w_p_rl) | |
| 3835 n_extra = col + 1; | |
| 3836 else | |
| 3837 # endif | |
| 3838 n_extra = W_WIDTH(wp) - col; | |
| 3839 char_attr = hl_attr(HLF_DED); | |
| 3840 } | |
| 3841 # endif | |
| 3842 # ifdef FEAT_LINEBREAK | |
| 3843 if (*p_sbr != NUL && need_showbreak) | |
| 3844 { | |
| 3845 /* Draw 'showbreak' at the start of each broken line. */ | |
| 3846 p_extra = p_sbr; | |
| 3847 c_extra = NUL; | |
| 3848 n_extra = (int)STRLEN(p_sbr); | |
| 3849 char_attr = hl_attr(HLF_AT); | |
| 3850 need_showbreak = FALSE; | |
| 6503 | 3851 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 3852 /* Correct end of highlighted area for 'showbreak', |
| 3853 * required when 'linebreak' is also set. */ | |
| 3854 if (tocol == vcol) | |
| 3855 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3856 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3857 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3858 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 3859 char_attr = hl_combine_attr(char_attr, |
| 3860 hl_attr(HLF_CUL)); | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3861 #endif |
| 7 | 3862 } |
| 3863 # endif | |
| 3864 } | |
| 3865 #endif | |
| 3866 | |
| 3867 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 3868 { | |
| 3869 draw_state = WL_LINE; | |
| 3870 if (saved_n_extra) | |
| 3871 { | |
| 3872 /* Continue item from end of wrapped line. */ | |
| 3873 n_extra = saved_n_extra; | |
| 3874 c_extra = saved_c_extra; | |
| 3875 p_extra = saved_p_extra; | |
| 3876 char_attr = saved_char_attr; | |
| 3877 } | |
| 3878 else | |
| 3879 char_attr = 0; | |
| 3880 } | |
| 3881 } | |
| 3882 | |
| 3883 /* When still displaying '$' of change command, stop at cursor */ | |
| 3318 | 3884 if (dollar_vcol >= 0 && wp == curwin |
| 819 | 3885 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 3886 #ifdef FEAT_DIFF |
| 3887 && filler_todo <= 0 | |
| 3888 #endif | |
| 3889 ) | |
| 3890 { | |
| 3891 SCREEN_LINE(screen_row, W_WINCOL(wp), col, -(int)W_WIDTH(wp), | |
| 3892 wp->w_p_rl); | |
| 819 | 3893 /* Pretend we have finished updating the window. Except when |
| 3894 * 'cursorcolumn' is set. */ | |
| 3895 #ifdef FEAT_SYN_HL | |
| 3896 if (wp->w_p_cuc) | |
| 3897 row = wp->w_cline_row + wp->w_cline_height; | |
| 3898 else | |
| 3899 #endif | |
| 3900 row = wp->w_height; | |
| 7 | 3901 break; |
| 3902 } | |
| 3903 | |
| 3904 if (draw_state == WL_LINE && area_highlighting) | |
| 3905 { | |
| 3906 /* handle Visual or match highlighting in this line */ | |
| 3907 if (vcol == fromcol | |
| 3908 #ifdef FEAT_MBYTE | |
| 3909 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 3910 && (*mb_ptr2cells)(ptr) > 1) | |
| 3911 #endif | |
| 3912 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 3913 && vcol_prev < vcol /* not at margin */ |
| 7 | 3914 && vcol < tocol)) |
| 3915 area_attr = attr; /* start highlighting */ | |
| 3916 else if (area_attr != 0 | |
| 3917 && (vcol == tocol | |
| 3918 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 3919 area_attr = 0; /* stop highlighting */ | |
| 3920 | |
| 3921 #ifdef FEAT_SEARCH_EXTRA | |
| 3922 if (!n_extra) | |
| 3923 { | |
| 3924 /* | |
| 3925 * Check for start/end of search pattern match. | |
| 3926 * After end, check for start/end of next match. | |
| 3927 * When another match, have to check for start again. | |
| 3928 * Watch out for matching an empty string! | |
| 1326 | 3929 * Do this for 'search_hl' and the match list (ordered by |
| 3930 * priority). | |
| 7 | 3931 */ |
| 36 | 3932 v = (long)(ptr - line); |
| 1326 | 3933 cur = wp->w_match_head; |
| 3934 shl_flag = FALSE; | |
| 3935 while (cur != NULL || shl_flag == FALSE) | |
| 3936 { | |
| 3937 if (shl_flag == FALSE | |
| 3938 && ((cur != NULL | |
| 3939 && cur->priority > SEARCH_HL_PRIORITY) | |
| 3940 || cur == NULL)) | |
| 3941 { | |
| 3942 shl = &search_hl; | |
| 3943 shl_flag = TRUE; | |
| 3944 } | |
| 3945 else | |
| 3946 shl = &cur->hl; | |
| 5979 | 3947 if (cur != NULL) |
| 3948 cur->pos.cur = 0; | |
| 3949 pos_inprogress = TRUE; | |
| 3950 while (shl->rm.regprog != NULL | |
| 3951 || (cur != NULL && pos_inprogress)) | |
| 7 | 3952 { |
| 36 | 3953 if (shl->startcol != MAXCOL |
| 3954 && v >= (long)shl->startcol | |
| 3955 && v < (long)shl->endcol) | |
| 7 | 3956 { |
| 6430 | 3957 #ifdef FEAT_MBYTE |
| 3958 int tmp_col = v + MB_PTR2LEN(ptr); | |
| 3959 | |
| 3960 if (shl->endcol < tmp_col) | |
| 3961 shl->endcol = tmp_col; | |
| 3962 #endif | |
| 7 | 3963 shl->attr_cur = shl->attr; |
| 6947 | 3964 #ifdef FEAT_CONCEAL |
| 3965 if (cur != NULL && syn_name2id((char_u *)"Conceal") | |
| 3966 == cur->hlg_id) | |
| 3967 { | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3968 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3969 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 3970 match_conc = cur->conceal_char; |
| 3971 } | |
| 3972 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3973 has_match_conc = match_conc = 0; |
| 6947 | 3974 #endif |
| 7 | 3975 } |
| 6430 | 3976 else if (v == (long)shl->endcol) |
| 7 | 3977 { |
| 3978 shl->attr_cur = 0; | |
| 6947 | 3979 #ifdef FEAT_CONCEAL |
| 3980 prev_syntax_id = 0; | |
| 3981 #endif | |
| 5979 | 3982 next_search_hl(wp, shl, lnum, (colnr_T)v, cur); |
| 3983 pos_inprogress = cur == NULL || cur->pos.cur == 0 | |
| 6947 | 3984 ? FALSE : TRUE; |
| 7 | 3985 |
| 3986 /* Need to get the line again, a multi-line regexp | |
| 3987 * may have made it invalid. */ | |
| 3988 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3989 ptr = line + v; | |
| 3990 | |
| 3991 if (shl->lnum == lnum) | |
| 3992 { | |
| 36 | 3993 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 3994 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 3995 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 3996 else |
| 36 | 3997 shl->endcol = MAXCOL; |
| 3998 | |
| 3999 if (shl->startcol == shl->endcol) | |
| 7 | 4000 { |
| 4001 /* highlight empty match, try again after | |
| 4002 * it */ | |
| 4003 #ifdef FEAT_MBYTE | |
| 4004 if (has_mbyte) | |
| 474 | 4005 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4006 + shl->endcol); |
| 7 | 4007 else |
| 4008 #endif | |
| 36 | 4009 ++shl->endcol; |
| 7 | 4010 } |
| 4011 | |
| 4012 /* Loop to check if the match starts at the | |
| 4013 * current position */ | |
| 4014 continue; | |
| 4015 } | |
| 4016 } | |
| 4017 break; | |
| 4018 } | |
| 1326 | 4019 if (shl != &search_hl && cur != NULL) |
| 4020 cur = cur->next; | |
| 4021 } | |
| 4022 | |
| 4023 /* Use attributes from match with highest priority among | |
| 4024 * 'search_hl' and the match list. */ | |
| 4025 search_attr = search_hl.attr_cur; | |
| 4026 cur = wp->w_match_head; | |
| 4027 shl_flag = FALSE; | |
| 4028 while (cur != NULL || shl_flag == FALSE) | |
| 4029 { | |
| 4030 if (shl_flag == FALSE | |
| 4031 && ((cur != NULL | |
| 4032 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4033 || cur == NULL)) | |
| 699 | 4034 { |
| 1326 | 4035 shl = &search_hl; |
| 4036 shl_flag = TRUE; | |
| 699 | 4037 } |
| 1326 | 4038 else |
| 4039 shl = &cur->hl; | |
| 4040 if (shl->attr_cur != 0) | |
| 4041 search_attr = shl->attr_cur; | |
| 4042 if (shl != &search_hl && cur != NULL) | |
| 4043 cur = cur->next; | |
| 4044 } | |
| 7 | 4045 } |
| 4046 #endif | |
| 4047 | |
| 4048 #ifdef FEAT_DIFF | |
| 674 | 4049 if (diff_hlf != (hlf_T)0) |
| 7 | 4050 { |
| 1295 | 4051 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4052 && n_extra == 0) | |
| 7 | 4053 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4054 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4055 && n_extra == 0) | |
| 7 | 4056 diff_hlf = HLF_CHD; /* changed line */ |
| 674 | 4057 line_attr = hl_attr(diff_hlf); |
| 6106 | 4058 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4059 line_attr = hl_combine_attr(line_attr, hl_attr(HLF_CUL)); | |
| 674 | 4060 } |
| 4061 #endif | |
| 4062 | |
| 4063 /* Decide which of the highlight attributes to use. */ | |
| 4064 attr_pri = TRUE; | |
| 6717 | 4065 #ifdef LINE_ATTR |
| 674 | 4066 if (area_attr != 0) |
| 6717 | 4067 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4068 else if (search_attr != 0) |
| 6717 | 4069 char_attr = hl_combine_attr(line_attr, search_attr); |
| 674 | 4070 /* Use line_attr when not in the Visual or 'incsearch' area |
| 4071 * (area_attr may be 0 when "noinvcur" is set). */ | |
| 4072 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) | |
| 1842 | 4073 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4074 || vcol >= tocol)) | |
| 674 | 4075 char_attr = line_attr; |
| 6717 | 4076 #else |
| 4077 if (area_attr != 0) | |
| 4078 char_attr = area_attr; | |
| 4079 else if (search_attr != 0) | |
| 4080 char_attr = search_attr; | |
| 674 | 4081 #endif |
| 4082 else | |
| 4083 { | |
| 4084 attr_pri = FALSE; | |
| 4085 #ifdef FEAT_SYN_HL | |
| 4086 if (has_syntax) | |
| 4087 char_attr = syntax_attr; | |
| 4088 else | |
| 4089 #endif | |
| 4090 char_attr = 0; | |
| 4091 } | |
| 7 | 4092 } |
| 4093 | |
| 4094 /* | |
| 4095 * Get the next character to put on the screen. | |
| 4096 */ | |
| 4097 /* | |
| 1340 | 4098 * The "p_extra" points to the extra stuff that is inserted to |
| 4099 * represent special characters (non-printable stuff) and other | |
| 4100 * things. When all characters are the same, c_extra is used. | |
| 4101 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past | |
| 4102 * "p_extra[n_extra]". | |
| 7 | 4103 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4104 */ | |
| 4105 if (n_extra > 0) | |
| 4106 { | |
| 4107 if (c_extra != NUL) | |
| 4108 { | |
| 4109 c = c_extra; | |
| 4110 #ifdef FEAT_MBYTE | |
| 4111 mb_c = c; /* doesn't handle non-utf-8 multi-byte! */ | |
| 4112 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 4113 { | |
| 4114 mb_utf8 = TRUE; | |
| 714 | 4115 u8cc[0] = 0; |
| 819 | 4116 c = 0xc0; |
| 7 | 4117 } |
| 4118 else | |
| 4119 mb_utf8 = FALSE; | |
| 4120 #endif | |
| 4121 } | |
| 4122 else | |
| 4123 { | |
| 4124 c = *p_extra; | |
| 4125 #ifdef FEAT_MBYTE | |
| 4126 if (has_mbyte) | |
| 4127 { | |
| 4128 mb_c = c; | |
| 4129 if (enc_utf8) | |
| 4130 { | |
| 4131 /* If the UTF-8 character is more than one byte: | |
| 4132 * Decode it into "mb_c". */ | |
| 474 | 4133 mb_l = (*mb_ptr2len)(p_extra); |
| 7 | 4134 mb_utf8 = FALSE; |
| 4135 if (mb_l > n_extra) | |
| 4136 mb_l = 1; | |
| 4137 else if (mb_l > 1) | |
| 4138 { | |
| 714 | 4139 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4140 mb_utf8 = TRUE; |
| 819 | 4141 c = 0xc0; |
| 7 | 4142 } |
| 4143 } | |
| 4144 else | |
| 4145 { | |
| 4146 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4147 mb_l = MB_BYTE2LEN(c); | |
| 4148 if (mb_l >= n_extra) | |
| 4149 mb_l = 1; | |
| 4150 else if (mb_l > 1) | |
| 4151 mb_c = (c << 8) + p_extra[1]; | |
| 4152 } | |
| 504 | 4153 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4154 mb_l = 1; | |
| 4155 | |
| 7 | 4156 /* If a double-width char doesn't fit display a '>' in the |
| 4157 * last column. */ | |
| 504 | 4158 if (( |
| 7 | 4159 # ifdef FEAT_RIGHTLEFT |
| 4160 wp->w_p_rl ? (col <= 0) : | |
| 4161 # endif | |
| 504 | 4162 (col >= W_WIDTH(wp) - 1)) |
| 7 | 4163 && (*mb_char2cells)(mb_c) == 2) |
| 4164 { | |
| 4165 c = '>'; | |
| 4166 mb_c = c; | |
| 4167 mb_l = 1; | |
| 4168 mb_utf8 = FALSE; | |
| 4169 multi_attr = hl_attr(HLF_AT); | |
| 4170 /* put the pointer back to output the double-width | |
| 4171 * character at the start of the next line. */ | |
| 4172 ++n_extra; | |
| 4173 --p_extra; | |
| 4174 } | |
| 4175 else | |
| 4176 { | |
| 4177 n_extra -= mb_l - 1; | |
| 4178 p_extra += mb_l - 1; | |
| 4179 } | |
| 4180 } | |
| 4181 #endif | |
| 4182 ++p_extra; | |
| 4183 } | |
| 4184 --n_extra; | |
| 4185 } | |
| 4186 else | |
| 4187 { | |
| 6026 | 4188 if (p_extra_free != NULL) |
| 4189 { | |
| 4190 vim_free(p_extra_free); | |
| 4191 p_extra_free = NULL; | |
| 4192 } | |
| 7 | 4193 /* |
| 4194 * Get a character from the line itself. | |
| 4195 */ | |
| 4196 c = *ptr; | |
| 4197 #ifdef FEAT_MBYTE | |
| 4198 if (has_mbyte) | |
| 4199 { | |
| 4200 mb_c = c; | |
| 4201 if (enc_utf8) | |
| 4202 { | |
| 4203 /* If the UTF-8 character is more than one byte: Decode it | |
| 4204 * into "mb_c". */ | |
| 474 | 4205 mb_l = (*mb_ptr2len)(ptr); |
| 7 | 4206 mb_utf8 = FALSE; |
| 4207 if (mb_l > 1) | |
| 4208 { | |
| 714 | 4209 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4210 /* Overlong encoded ASCII or ASCII with composing char |
| 4211 * is displayed normally, except a NUL. */ | |
| 4212 if (mb_c < 0x80) | |
| 4213 c = mb_c; | |
| 4214 mb_utf8 = TRUE; | |
| 507 | 4215 |
| 4216 /* At start of the line we can have a composing char. | |
| 4217 * Draw it as a space with a composing char. */ | |
| 4218 if (utf_iscomposing(mb_c)) | |
| 4219 { | |
| 1326 | 4220 int i; |
| 4221 | |
| 714 | 4222 for (i = Screen_mco - 1; i > 0; --i) |
| 4223 u8cc[i] = u8cc[i - 1]; | |
| 4224 u8cc[0] = mb_c; | |
| 507 | 4225 mb_c = ' '; |
| 4226 } | |
| 7 | 4227 } |
| 4228 | |
| 4229 if ((mb_l == 1 && c >= 0x80) | |
| 4230 || (mb_l >= 1 && mb_c == 0) | |
| 4231 || (mb_l > 1 && (!vim_isprintc(mb_c) | |
| 1401 | 4232 # ifdef UNICODE16 |
| 4233 || mb_c >= 0x10000 | |
| 4234 # endif | |
| 4235 ))) | |
| 7 | 4236 { |
| 4237 /* | |
| 4238 * Illegal UTF-8 byte: display as <xx>. | |
| 4239 * Non-BMP character : display as ? or fullwidth ?. | |
| 4240 */ | |
| 1401 | 4241 # ifdef UNICODE16 |
| 7 | 4242 if (mb_c < 0x10000) |
| 1401 | 4243 # endif |
| 7 | 4244 { |
| 4245 transchar_hex(extra, mb_c); | |
| 714 | 4246 # ifdef FEAT_RIGHTLEFT |
| 7 | 4247 if (wp->w_p_rl) /* reverse */ |
| 4248 rl_mirror(extra); | |
| 714 | 4249 # endif |
| 7 | 4250 } |
| 1401 | 4251 # ifdef UNICODE16 |
| 7 | 4252 else if (utf_char2cells(mb_c) != 2) |
| 4253 STRCPY(extra, "?"); | |
| 4254 else | |
| 4255 /* 0xff1f in UTF-8: full-width '?' */ | |
| 4256 STRCPY(extra, "\357\274\237"); | |
| 1401 | 4257 # endif |
| 7 | 4258 |
| 4259 p_extra = extra; | |
| 4260 c = *p_extra; | |
| 4261 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4262 mb_utf8 = (c >= 0x80); | |
| 4263 n_extra = (int)STRLEN(p_extra); | |
| 4264 c_extra = NUL; | |
| 4265 if (area_attr == 0 && search_attr == 0) | |
| 4266 { | |
| 4267 n_attr = n_extra + 1; | |
| 4268 extra_attr = hl_attr(HLF_8); | |
| 4269 saved_attr2 = char_attr; /* save current attr */ | |
| 4270 } | |
| 4271 } | |
| 4272 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4273 mb_l = 1; | |
| 4274 #ifdef FEAT_ARABIC | |
| 4275 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4276 { | |
| 4277 /* Do Arabic shaping. */ | |
| 714 | 4278 int pc, pc1, nc; |
| 4279 int pcc[MAX_MCO]; | |
| 7 | 4280 |
| 4281 /* The idea of what is the previous and next | |
| 4282 * character depends on 'rightleft'. */ | |
| 4283 if (wp->w_p_rl) | |
| 4284 { | |
| 4285 pc = prev_c; | |
| 4286 pc1 = prev_c1; | |
| 4287 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4288 prev_c1 = u8cc[0]; |
| 7 | 4289 } |
| 4290 else | |
| 4291 { | |
| 714 | 4292 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4293 nc = prev_c; |
| 714 | 4294 pc1 = pcc[0]; |
| 7 | 4295 } |
| 4296 prev_c = mb_c; | |
| 4297 | |
| 714 | 4298 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4299 } |
| 4300 else | |
| 4301 prev_c = mb_c; | |
| 4302 #endif | |
| 4303 } | |
| 4304 else /* enc_dbcs */ | |
| 4305 { | |
| 4306 mb_l = MB_BYTE2LEN(c); | |
| 4307 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4308 mb_l = 1; | |
| 4309 else if (mb_l > 1) | |
| 4310 { | |
| 4311 /* We assume a second byte below 32 is illegal. | |
| 4312 * Hopefully this is OK for all double-byte encodings! | |
| 4313 */ | |
| 4314 if (ptr[1] >= 32) | |
| 4315 mb_c = (c << 8) + ptr[1]; | |
| 4316 else | |
| 4317 { | |
| 4318 if (ptr[1] == NUL) | |
| 4319 { | |
| 4320 /* head byte at end of line */ | |
| 4321 mb_l = 1; | |
| 4322 transchar_nonprint(extra, c); | |
| 4323 } | |
| 4324 else | |
| 4325 { | |
| 4326 /* illegal tail byte */ | |
| 4327 mb_l = 2; | |
| 4328 STRCPY(extra, "XX"); | |
| 4329 } | |
| 4330 p_extra = extra; | |
| 4331 n_extra = (int)STRLEN(extra) - 1; | |
| 4332 c_extra = NUL; | |
| 4333 c = *p_extra++; | |
| 4334 if (area_attr == 0 && search_attr == 0) | |
| 4335 { | |
| 4336 n_attr = n_extra + 1; | |
| 4337 extra_attr = hl_attr(HLF_8); | |
| 4338 saved_attr2 = char_attr; /* save current attr */ | |
| 4339 } | |
| 4340 mb_c = c; | |
| 4341 } | |
| 4342 } | |
| 4343 } | |
| 4344 /* If a double-width char doesn't fit display a '>' in the | |
| 4345 * last column; the character is displayed at the start of the | |
| 4346 * next line. */ | |
| 4347 if (( | |
| 4348 # ifdef FEAT_RIGHTLEFT | |
| 4349 wp->w_p_rl ? (col <= 0) : | |
| 4350 # endif | |
| 4351 (col >= W_WIDTH(wp) - 1)) | |
| 4352 && (*mb_char2cells)(mb_c) == 2) | |
| 4353 { | |
| 4354 c = '>'; | |
| 4355 mb_c = c; | |
| 4356 mb_utf8 = FALSE; | |
| 4357 mb_l = 1; | |
| 4358 multi_attr = hl_attr(HLF_AT); | |
| 4359 /* Put pointer back so that the character will be | |
| 4360 * displayed at the start of the next line. */ | |
| 4361 --ptr; | |
| 4362 } | |
| 4363 else if (*ptr != NUL) | |
| 4364 ptr += mb_l - 1; | |
| 4365 | |
| 4366 /* 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
|
4367 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4368 * 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
|
4369 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4370 { |
| 4371 n_extra = 1; | |
| 3586 | 4372 c_extra = MB_FILLER_CHAR; |
| 7 | 4373 c = ' '; |
| 4374 if (area_attr == 0 && search_attr == 0) | |
| 4375 { | |
| 4376 n_attr = n_extra + 1; | |
| 4377 extra_attr = hl_attr(HLF_AT); | |
| 4378 saved_attr2 = char_attr; /* save current attr */ | |
| 4379 } | |
| 4380 mb_c = c; | |
| 4381 mb_utf8 = FALSE; | |
| 4382 mb_l = 1; | |
| 4383 } | |
| 4384 | |
| 4385 } | |
| 4386 #endif | |
| 4387 ++ptr; | |
| 4388 | |
| 4389 if (extra_check) | |
| 4390 { | |
| 743 | 4391 #ifdef FEAT_SPELL |
| 221 | 4392 int can_spell = TRUE; |
| 743 | 4393 #endif |
| 4394 | |
| 4395 #ifdef FEAT_SYN_HL | |
| 7 | 4396 /* Get syntax attribute, unless still at the start of the line |
| 4397 * (double-wide char that doesn't fit). */ | |
| 221 | 4398 v = (long)(ptr - line); |
| 4399 if (has_syntax && v > 0) | |
| 7 | 4400 { |
| 4401 /* Get the syntax attribute for the character. If there | |
| 4402 * is an error, disable syntax highlighting. */ | |
| 4403 save_did_emsg = did_emsg; | |
| 4404 did_emsg = FALSE; | |
| 4405 | |
| 221 | 4406 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4407 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4408 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4409 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4410 NULL, FALSE); |
| 7 | 4411 |
| 4412 if (did_emsg) | |
| 482 | 4413 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4414 wp->w_s->b_syn_error = TRUE; |
| 482 | 4415 has_syntax = FALSE; |
| 4416 } | |
| 7 | 4417 else |
| 4418 did_emsg = save_did_emsg; | |
| 4419 | |
| 4420 /* Need to get the line again, a multi-line regexp may | |
| 4421 * have made it invalid. */ | |
| 4422 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4423 ptr = line + v; | |
| 4424 | |
| 674 | 4425 if (!attr_pri) |
| 7 | 4426 char_attr = syntax_attr; |
| 301 | 4427 else |
| 303 | 4428 char_attr = hl_combine_attr(syntax_attr, char_attr); |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4429 # 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
|
4430 /* 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
|
4431 * 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
|
4432 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
|
4433 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
|
4434 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
|
4435 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
|
4436 # endif |
| 7 | 4437 } |
| 743 | 4438 #endif |
| 4439 | |
| 4440 #ifdef FEAT_SPELL | |
| 301 | 4441 /* Check spelling (unless at the end of the line). |
| 319 | 4442 * Only do this when there is no syntax highlighting, the |
| 4443 * @Spell cluster is not used or the current syntax item | |
| 4444 * contains the @Spell cluster. */ | |
| 348 | 4445 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4446 { |
| 230 | 4447 spell_attr = 0; |
| 743 | 4448 # ifdef FEAT_SYN_HL |
| 674 | 4449 if (!attr_pri) |
| 230 | 4450 char_attr = syntax_attr; |
| 743 | 4451 # endif |
| 4452 if (c != 0 && ( | |
| 4453 # ifdef FEAT_SYN_HL | |
| 4454 !has_syntax || | |
| 4455 # endif | |
| 4456 can_spell)) | |
| 221 | 4457 { |
| 348 | 4458 char_u *prev_ptr, *p; |
| 4459 int len; | |
| 534 | 4460 hlf_T spell_hlf = HLF_COUNT; |
| 221 | 4461 # ifdef FEAT_MBYTE |
| 336 | 4462 if (has_mbyte) |
| 4463 { | |
| 4464 prev_ptr = ptr - mb_l; | |
| 4465 v -= mb_l - 1; | |
| 4466 } | |
| 4467 else | |
| 221 | 4468 # endif |
| 336 | 4469 prev_ptr = ptr - 1; |
| 348 | 4470 |
| 4471 /* Use nextline[] if possible, it has the start of the | |
| 4472 * next line concatenated. */ | |
| 4473 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4474 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4475 else | |
| 4476 p = prev_ptr; | |
| 835 | 4477 cap_col -= (int)(prev_ptr - line); |
| 625 | 4478 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4479 nochange); | |
| 348 | 4480 word_end = v + len; |
| 301 | 4481 |
| 4482 /* In Insert mode only highlight a word that | |
| 4483 * doesn't touch the cursor. */ | |
| 534 | 4484 if (spell_hlf != HLF_COUNT |
| 301 | 4485 && (State & INSERT) != 0 |
| 4486 && wp->w_cursor.lnum == lnum | |
| 4487 && wp->w_cursor.col >= | |
| 4488 (colnr_T)(prev_ptr - line) | |
| 4489 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4490 { |
| 534 | 4491 spell_hlf = HLF_COUNT; |
| 301 | 4492 spell_redraw_lnum = lnum; |
| 221 | 4493 } |
| 348 | 4494 |
| 534 | 4495 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4496 && (p - nextline) + len > nextline_idx) |
| 4497 { | |
| 4498 /* Remember that the good word continues at the | |
| 4499 * start of the next line. */ | |
| 4500 checked_lnum = lnum + 1; | |
| 835 | 4501 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4502 } |
| 386 | 4503 |
| 534 | 4504 /* Turn index into actual attributes. */ |
| 4505 if (spell_hlf != HLF_COUNT) | |
| 4506 spell_attr = highlight_attr[spell_hlf]; | |
| 4507 | |
| 386 | 4508 if (cap_col > 0) |
| 4509 { | |
| 4510 if (p != prev_ptr | |
| 4511 && (p - nextline) + cap_col >= nextline_idx) | |
| 4512 { | |
| 4513 /* Remember that the word in the next line | |
| 4514 * must start with a capital. */ | |
| 4515 capcol_lnum = lnum + 1; | |
| 835 | 4516 cap_col = (int)((p - nextline) + cap_col |
| 4517 - nextline_idx); | |
| 386 | 4518 } |
| 4519 else | |
| 4520 /* Compute the actual column. */ | |
| 835 | 4521 cap_col += (int)(prev_ptr - line); |
| 386 | 4522 } |
| 221 | 4523 } |
| 4524 } | |
| 4525 if (spell_attr != 0) | |
| 348 | 4526 { |
| 674 | 4527 if (!attr_pri) |
| 348 | 4528 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4529 else | |
| 4530 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4531 } | |
| 7 | 4532 #endif |
| 4533 #ifdef FEAT_LINEBREAK | |
| 4534 /* | |
| 221 | 4535 * Found last space before word: check for line break. |
| 7 | 4536 */ |
| 6026 | 4537 if (wp->w_p_lbr && vim_isbreak(c) && !vim_isbreak(*ptr)) |
| 7 | 4538 { |
| 6681 | 4539 # ifdef FEAT_MBYTE |
| 6693 | 4540 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
| 6681 | 4541 # endif |
| 5995 | 4542 char_u *p = ptr - ( |
| 7 | 4543 # ifdef FEAT_MBYTE |
| 6693 | 4544 mb_off + |
| 7 | 4545 # endif |
| 5995 | 4546 1); |
| 6681 | 4547 |
| 5995 | 4548 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4549 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4550 NULL) - 1; |
| 6371 | 4551 if (c == TAB && n_extra + col > W_WIDTH(wp)) |
| 4552 n_extra = (int)wp->w_buffer->b_p_ts | |
| 4553 - vcol % (int)wp->w_buffer->b_p_ts - 1; | |
| 4554 | |
| 6681 | 4555 # ifdef FEAT_MBYTE |
| 6693 | 4556 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; |
| 6681 | 4557 # else |
| 7 | 4558 c_extra = ' '; |
| 6681 | 4559 # endif |
| 7 | 4560 if (vim_iswhite(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4561 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4562 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4563 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4564 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4565 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4566 #endif |
| 6026 | 4567 if (!wp->w_p_list) |
| 4568 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4569 } |
| 7 | 4570 } |
| 4571 #endif | |
| 4572 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4573 /* '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
|
4574 */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4575 if (wp->w_p_list |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4576 && (((c == 160 |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4577 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4578 || (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
|
4579 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4580 ) && lcs_nbsp) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4581 || (c == ' ' && lcs_space && ptr - line <= trailcol))) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4582 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4583 c = (c == ' ') ? lcs_space : lcs_nbsp; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4584 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
|
4585 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4586 n_attr = 1; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4587 extra_attr = hl_attr(HLF_8); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4588 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
|
4589 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4590 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4591 mb_c = c; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4592 if (enc_utf8 && (*mb_char2len)(c) > 1) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4593 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4594 mb_utf8 = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4595 u8cc[0] = 0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4596 c = 0xc0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4597 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4598 else |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4599 mb_utf8 = FALSE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4600 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4601 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4602 |
| 7 | 4603 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4604 { | |
| 4605 c = lcs_trail; | |
| 674 | 4606 if (!attr_pri) |
| 7 | 4607 { |
| 4608 n_attr = 1; | |
| 4609 extra_attr = hl_attr(HLF_8); | |
| 4610 saved_attr2 = char_attr; /* save current attr */ | |
| 4611 } | |
| 4612 #ifdef FEAT_MBYTE | |
| 4613 mb_c = c; | |
| 4614 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 4615 { | |
| 4616 mb_utf8 = TRUE; | |
| 714 | 4617 u8cc[0] = 0; |
| 819 | 4618 c = 0xc0; |
| 7 | 4619 } |
| 4620 else | |
| 4621 mb_utf8 = FALSE; | |
| 4622 #endif | |
| 4623 } | |
| 4624 } | |
| 4625 | |
| 4626 /* | |
| 4627 * Handling of non-printable characters. | |
| 4628 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4629 if (!vim_isprintc(c)) |
| 7 | 4630 { |
| 4631 /* | |
| 4632 * when getting a character from the file, we may have to | |
| 4633 * turn it into something else on the way to putting it | |
| 4634 * into "ScreenLines". | |
| 4635 */ | |
| 4636 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4637 { | |
| 6026 | 4638 int tab_len = 0; |
| 6503 | 4639 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 4640 #ifdef FEAT_LINEBREAK | |
| 4641 /* only adjust the tab_len, when at the first column | |
| 4642 * after the showbreak value was drawn */ | |
| 4643 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 4644 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 4645 #endif | |
| 7 | 4646 /* tab amount depends on current column */ |
| 6026 | 4647 tab_len = (int)wp->w_buffer->b_p_ts |
| 6503 | 4648 - vcol_adjusted % (int)wp->w_buffer->b_p_ts - 1; |
| 4649 | |
| 6026 | 4650 #ifdef FEAT_LINEBREAK |
| 6100 | 4651 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 4652 #endif |
| 4653 /* tab amount depends on current column */ | |
| 4654 n_extra = tab_len; | |
| 4655 #ifdef FEAT_LINEBREAK | |
| 4656 else | |
| 4657 { | |
| 4658 char_u *p; | |
| 4659 int len = n_extra; | |
| 4660 int i; | |
| 4661 int saved_nextra = n_extra; | |
| 4662 | |
| 6172 | 4663 #ifdef FEAT_CONCEAL |
| 6627 | 4664 if (vcol_off > 0) |
| 6172 | 4665 /* there are characters to conceal */ |
| 4666 tab_len += vcol_off; | |
| 6520 | 4667 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 4668 */ | |
| 4669 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 4670 && n_extra > tab_len) | |
| 4671 tab_len += n_extra - tab_len; | |
| 4672 #endif | |
| 4673 | |
| 6026 | 4674 /* if n_extra > 0, it gives the number of chars, to |
| 4675 * use for a tab, else we need to calculate the width | |
| 4676 * for a tab */ | |
| 4677 #ifdef FEAT_MBYTE | |
| 4678 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 4679 if (n_extra > 0) | |
| 4680 len += n_extra - tab_len; | |
| 4681 #endif | |
| 4682 c = lcs_tab1; | |
| 4683 p = alloc((unsigned)(len + 1)); | |
| 4684 vim_memset(p, ' ', len); | |
| 4685 p[len] = NUL; | |
| 4686 p_extra_free = p; | |
| 4687 for (i = 0; i < tab_len; i++) | |
| 4688 { | |
| 4689 #ifdef FEAT_MBYTE | |
| 4690 mb_char2bytes(lcs_tab2, p); | |
| 4691 p += mb_char2len(lcs_tab2); | |
| 4692 n_extra += mb_char2len(lcs_tab2) | |
| 4693 - (saved_nextra > 0 ? 1 : 0); | |
| 4694 #else | |
| 4695 p[i] = lcs_tab2; | |
| 4696 #endif | |
| 4697 } | |
| 4698 p_extra = p_extra_free; | |
| 6172 | 4699 #ifdef FEAT_CONCEAL |
| 4700 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 4701 * macro below, so need to adjust for that here */ | |
| 6627 | 4702 if (vcol_off > 0) |
| 6172 | 4703 n_extra -= vcol_off; |
| 4704 #endif | |
| 6026 | 4705 } |
| 4706 #endif | |
| 3984 | 4707 #ifdef FEAT_CONCEAL |
| 6627 | 4708 { |
| 4709 int vc_saved = vcol_off; | |
| 4710 | |
| 4711 /* Tab alignment should be identical regardless of | |
| 4712 * 'conceallevel' value. So tab compensates of all | |
| 4713 * previous concealed characters, and thus resets | |
| 4714 * vcol_off and boguscols accumulated so far in the | |
| 4715 * line. Note that the tab can be longer than | |
| 4716 * 'tabstop' when there are concealed characters. */ | |
| 4717 FIX_FOR_BOGUSCOLS; | |
| 4718 | |
| 4719 /* Make sure, the highlighting for the tab char will be | |
| 4720 * correctly set further below (effectively reverts the | |
| 4721 * FIX_FOR_BOGSUCOLS macro */ | |
| 4722 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 4723 && lcs_tab1) |
| 6627 | 4724 tab_len += vc_saved; |
| 4725 } | |
| 3984 | 4726 #endif |
| 7 | 4727 #ifdef FEAT_MBYTE |
| 4728 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4729 #endif | |
| 4730 if (wp->w_p_list) | |
| 4731 { | |
| 4732 c = lcs_tab1; | |
| 6026 | 4733 #ifdef FEAT_LINEBREAK |
| 4734 if (wp->w_p_lbr) | |
| 4735 c_extra = NUL; /* using p_extra from above */ | |
| 4736 else | |
| 4737 #endif | |
| 4738 c_extra = lcs_tab2; | |
| 4739 n_attr = tab_len + 1; | |
| 7 | 4740 extra_attr = hl_attr(HLF_8); |
| 4741 saved_attr2 = char_attr; /* save current attr */ | |
| 4742 #ifdef FEAT_MBYTE | |
| 4743 mb_c = c; | |
| 4744 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 4745 { | |
| 4746 mb_utf8 = TRUE; | |
| 714 | 4747 u8cc[0] = 0; |
| 819 | 4748 c = 0xc0; |
| 7 | 4749 } |
| 4750 #endif | |
| 4751 } | |
| 4752 else | |
| 4753 { | |
| 4754 c_extra = ' '; | |
| 4755 c = ' '; | |
| 4756 } | |
| 4757 } | |
| 36 | 4758 else if (c == NUL |
| 6799 | 4759 && (wp->w_p_list |
| 36 | 4760 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 4761 && tocol > vcol | |
| 4762 && VIsual_mode != Ctrl_V | |
| 4763 && ( | |
| 4764 # ifdef FEAT_RIGHTLEFT | |
| 4765 wp->w_p_rl ? (col >= 0) : | |
| 4766 # endif | |
| 4767 (col < W_WIDTH(wp))) | |
| 4768 && !(noinvcur | |
| 1850 | 4769 && lnum == wp->w_cursor.lnum |
| 36 | 4770 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 4771 && lcs_eol_one > 0) |
| 7 | 4772 { |
| 36 | 4773 /* Display a '$' after the line or highlight an extra |
| 4774 * character if the line break is included. */ | |
| 7 | 4775 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 4776 /* For a diff line the highlighting continues after the | |
| 4777 * "$". */ | |
| 4778 if ( | |
| 4779 # ifdef FEAT_DIFF | |
| 534 | 4780 diff_hlf == (hlf_T)0 |
| 7 | 4781 # ifdef LINE_ATTR |
| 4782 && | |
| 4783 # endif | |
| 4784 # endif | |
| 4785 # ifdef LINE_ATTR | |
| 4786 line_attr == 0 | |
| 4787 # endif | |
| 4788 ) | |
| 4789 #endif | |
| 4790 { | |
| 4791 #ifdef FEAT_VIRTUALEDIT | |
| 4792 /* In virtualedit, visual selections may extend | |
| 4793 * beyond end of line. */ | |
| 4794 if (area_highlighting && virtual_active() | |
| 4795 && tocol != MAXCOL && vcol < tocol) | |
| 4796 n_extra = 0; | |
| 4797 else | |
| 4798 #endif | |
| 4799 { | |
| 4800 p_extra = at_end_str; | |
| 4801 n_extra = 1; | |
| 4802 c_extra = NUL; | |
| 4803 } | |
| 4804 } | |
| 6799 | 4805 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 4806 c = lcs_eol; |
| 4807 else | |
| 4808 c = ' '; | |
| 7 | 4809 lcs_eol_one = -1; |
| 4810 --ptr; /* put it back at the NUL */ | |
| 674 | 4811 if (!attr_pri) |
| 7 | 4812 { |
| 4813 extra_attr = hl_attr(HLF_AT); | |
| 4814 n_attr = 1; | |
| 4815 } | |
| 4816 #ifdef FEAT_MBYTE | |
| 4817 mb_c = c; | |
| 4818 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 4819 { | |
| 4820 mb_utf8 = TRUE; | |
| 714 | 4821 u8cc[0] = 0; |
| 819 | 4822 c = 0xc0; |
| 7 | 4823 } |
| 4824 else | |
| 4825 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4826 #endif | |
| 4827 } | |
| 4828 else if (c != NUL) | |
| 4829 { | |
| 4830 p_extra = transchar(c); | |
| 6064 | 4831 if (n_extra == 0) |
| 4832 n_extra = byte2cells(c) - 1; | |
| 7 | 4833 #ifdef FEAT_RIGHTLEFT |
| 4834 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 4835 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 4836 #endif | |
| 4837 c_extra = NUL; | |
| 6026 | 4838 #ifdef FEAT_LINEBREAK |
| 4839 if (wp->w_p_lbr) | |
| 4840 { | |
| 4841 char_u *p; | |
| 4842 | |
| 4843 c = *p_extra; | |
| 4844 p = alloc((unsigned)n_extra + 1); | |
| 4845 vim_memset(p, ' ', n_extra); | |
| 4846 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 4847 p[n_extra] = NUL; | |
| 4848 p_extra_free = p_extra = p; | |
| 4849 } | |
| 4850 else | |
| 4851 #endif | |
| 4852 { | |
| 4853 n_extra = byte2cells(c) - 1; | |
| 4854 c = *p_extra++; | |
| 4855 } | |
| 674 | 4856 if (!attr_pri) |
| 7 | 4857 { |
| 4858 n_attr = n_extra + 1; | |
| 4859 extra_attr = hl_attr(HLF_8); | |
| 4860 saved_attr2 = char_attr; /* save current attr */ | |
| 4861 } | |
| 4862 #ifdef FEAT_MBYTE | |
| 4863 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4864 #endif | |
| 4865 } | |
| 4866 #ifdef FEAT_VIRTUALEDIT | |
| 4867 else if (VIsual_active | |
| 4868 && (VIsual_mode == Ctrl_V | |
| 4869 || VIsual_mode == 'v') | |
| 4870 && virtual_active() | |
| 4871 && tocol != MAXCOL | |
| 4872 && vcol < tocol | |
| 4873 && ( | |
| 4874 # ifdef FEAT_RIGHTLEFT | |
| 4875 wp->w_p_rl ? (col >= 0) : | |
| 4876 # endif | |
| 4877 (col < W_WIDTH(wp)))) | |
| 4878 { | |
| 4879 c = ' '; | |
| 4880 --ptr; /* put it back at the NUL */ | |
| 4881 } | |
| 4882 #endif | |
| 910 | 4883 #if defined(LINE_ATTR) |
| 7 | 4884 else if (( |
| 4885 # ifdef FEAT_DIFF | |
| 910 | 4886 diff_hlf != (hlf_T)0 || |
| 7 | 4887 # endif |
| 4888 line_attr != 0 | |
| 4889 ) && ( | |
| 4890 # ifdef FEAT_RIGHTLEFT | |
| 4891 wp->w_p_rl ? (col >= 0) : | |
| 4892 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4893 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4894 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4895 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4896 # endif |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4897 < W_WIDTH(wp)))) |
| 7 | 4898 { |
| 4899 /* Highlight until the right side of the window */ | |
| 4900 c = ' '; | |
| 4901 --ptr; /* put it back at the NUL */ | |
| 867 | 4902 |
| 4903 /* Remember we do the char for line highlighting. */ | |
| 4904 ++did_line_attr; | |
| 4905 | |
| 4906 /* don't do search HL for the rest of the line */ | |
| 4907 if (line_attr != 0 && char_attr == search_attr && col > 0) | |
| 4908 char_attr = line_attr; | |
| 7 | 4909 # ifdef FEAT_DIFF |
| 4910 if (diff_hlf == HLF_TXD) | |
| 4911 { | |
| 4912 diff_hlf = HLF_CHD; | |
| 4913 if (attr == 0 || char_attr != attr) | |
| 6106 | 4914 { |
| 7 | 4915 char_attr = hl_attr(diff_hlf); |
| 6106 | 4916 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4917 char_attr = hl_combine_attr(char_attr, | |
| 4918 hl_attr(HLF_CUL)); | |
| 4919 } | |
| 7 | 4920 } |
| 4921 # endif | |
| 4922 } | |
| 4923 #endif | |
| 4924 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4925 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4926 #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
|
4927 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
|
4928 && (wp != curwin || lnum != wp->w_cursor.lnum || |
| 6947 | 4929 conceal_cursor_line(wp) ) |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4930 && ( (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
|
4931 && !(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
|
4932 && 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
|
4933 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4934 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4935 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 4936 && (syn_get_sub_char() != NUL || match_conc |
| 4937 || 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
|
4938 && 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
|
4939 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
4940 /* 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
|
4941 * character. */ |
| 6947 | 4942 if (match_conc) |
| 4943 c = match_conc; | |
| 4944 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
|
4945 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4946 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4947 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4948 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4949 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4950 |
|
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
|
4951 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4952 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
4953 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
4954 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4955 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4956 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
|
4957 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4958 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4959 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4960 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4961 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4962 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4963 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4964 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4965 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4966 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4967 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4968 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4969 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4970 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4971 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4972 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4973 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4974 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4975 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4976 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4977 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4978 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4979 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4980 mb_c = c; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4981 if (enc_utf8 && (*mb_char2len)(c) > 1) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4982 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4983 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4984 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4985 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4986 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4987 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4988 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
|
4989 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4990 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4991 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4992 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
4993 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
|
4994 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4995 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4996 #endif /* FEAT_CONCEAL */ |
| 7 | 4997 } |
| 4998 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
4999 #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
|
5000 /* 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
|
5001 * 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
|
5002 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
|
5003 && 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
|
5004 && 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
|
5005 && (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
|
5006 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5007 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5008 if (wp->w_p_rl) |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5009 wp->w_wcol = W_WIDTH(wp) - col + boguscols - 1; |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5010 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5011 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5012 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
|
5013 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
|
5014 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
|
5015 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5016 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5017 |
| 7 | 5018 /* Don't override visual selection highlighting. */ |
| 5019 if (n_attr > 0 | |
| 5020 && draw_state == WL_LINE | |
| 674 | 5021 && !attr_pri) |
| 7 | 5022 char_attr = extra_attr; |
| 5023 | |
| 42 | 5024 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5025 /* XIM don't send preedit_start and preedit_end, but they send |
| 5026 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5027 * im_is_preediting() here. */ | |
| 5028 if (xic != NULL | |
| 1850 | 5029 && lnum == wp->w_cursor.lnum |
| 7 | 5030 && (State & INSERT) |
| 5031 && !p_imdisable | |
| 5032 && im_is_preediting() | |
| 5033 && draw_state == WL_LINE) | |
| 5034 { | |
| 5035 colnr_T tcol; | |
| 5036 | |
| 5037 if (preedit_end_col == MAXCOL) | |
| 1850 | 5038 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5039 else |
| 5040 tcol = preedit_end_col; | |
| 5041 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5042 { | |
| 5043 if (feedback_old_attr < 0) | |
| 5044 { | |
| 5045 feedback_col = 0; | |
| 5046 feedback_old_attr = char_attr; | |
| 5047 } | |
| 5048 char_attr = im_get_feedback_attr(feedback_col); | |
| 5049 if (char_attr < 0) | |
| 5050 char_attr = feedback_old_attr; | |
| 5051 feedback_col++; | |
| 5052 } | |
| 5053 else if (feedback_old_attr >= 0) | |
| 5054 { | |
| 5055 char_attr = feedback_old_attr; | |
| 5056 feedback_old_attr = -1; | |
| 5057 feedback_col = 0; | |
| 5058 } | |
| 5059 } | |
| 5060 #endif | |
| 5061 /* | |
| 5062 * Handle the case where we are in column 0 but not on the first | |
| 5063 * character of the line and the user wants us to show us a | |
| 5064 * special character (via 'listchars' option "precedes:<char>". | |
| 5065 */ | |
| 5066 if (lcs_prec_todo != NUL | |
| 6276 | 5067 && wp->w_p_list |
| 7 | 5068 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5069 #ifdef FEAT_DIFF | |
| 5070 && filler_todo <= 0 | |
| 5071 #endif | |
| 5072 && draw_state > WL_NR | |
| 5073 && c != NUL) | |
| 5074 { | |
| 5075 c = lcs_prec; | |
| 5076 lcs_prec_todo = NUL; | |
| 5077 #ifdef FEAT_MBYTE | |
| 3586 | 5078 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5079 { | |
| 5080 /* Double-width character being overwritten by the "precedes" | |
| 5081 * character, need to fill up half the character. */ | |
| 5082 c_extra = MB_FILLER_CHAR; | |
| 5083 n_extra = 1; | |
| 5084 n_attr = 2; | |
| 5085 extra_attr = hl_attr(HLF_AT); | |
| 5086 } | |
| 7 | 5087 mb_c = c; |
| 5088 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 5089 { | |
| 5090 mb_utf8 = TRUE; | |
| 714 | 5091 u8cc[0] = 0; |
| 819 | 5092 c = 0xc0; |
| 7 | 5093 } |
| 5094 else | |
| 5095 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5096 #endif | |
| 674 | 5097 if (!attr_pri) |
| 7 | 5098 { |
| 5099 saved_attr3 = char_attr; /* save current attr */ | |
| 5100 char_attr = hl_attr(HLF_AT); /* later copied to char_attr */ | |
| 5101 n_attr3 = 1; | |
| 5102 } | |
| 5103 } | |
| 5104 | |
| 5105 /* | |
| 867 | 5106 * At end of the text line or just after the last character. |
| 7 | 5107 */ |
| 867 | 5108 if (c == NUL |
| 910 | 5109 #if defined(LINE_ATTR) |
| 867 | 5110 || did_line_attr == 1 |
| 5111 #endif | |
| 5112 ) | |
| 5113 { | |
| 5114 #ifdef FEAT_SEARCH_EXTRA | |
| 5115 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5116 |
| 5117 /* we're not really at that column when skipping some text */ | |
| 1439 | 5118 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5119 ++prevcol; |
| 867 | 5120 #endif |
| 5121 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5122 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5123 * highlight match at end of line. If it's beyond the last |
| 5124 * char on the screen, just overwrite that one (tricky!) Not | |
| 5125 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5126 #ifdef FEAT_SEARCH_EXTRA |
| 5127 prevcol_hl_flag = FALSE; | |
| 5128 if (prevcol == (long)search_hl.startcol) | |
| 5129 prevcol_hl_flag = TRUE; | |
| 5130 else | |
| 5131 { | |
| 5132 cur = wp->w_match_head; | |
| 5133 while (cur != NULL) | |
| 5134 { | |
| 5135 if (prevcol == (long)cur->hl.startcol) | |
| 5136 { | |
| 5137 prevcol_hl_flag = TRUE; | |
| 5138 break; | |
| 5139 } | |
| 5140 cur = cur->next; | |
| 5141 } | |
| 5142 } | |
| 5143 #endif | |
| 7 | 5144 if (lcs_eol == lcs_eol_one |
| 1850 | 5145 && ((area_attr != 0 && vcol == fromcol |
| 5146 && (VIsual_mode != Ctrl_V | |
| 5147 || lnum == VIsual.lnum | |
| 5148 || lnum == curwin->w_cursor.lnum) | |
| 5149 && c == NUL) | |
| 7 | 5150 #ifdef FEAT_SEARCH_EXTRA |
| 5151 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5152 || (prevcol_hl_flag == TRUE |
| 910 | 5153 # if defined(LINE_ATTR) |
| 867 | 5154 && did_line_attr <= 1 |
| 5155 # endif | |
| 5156 ) | |
| 7 | 5157 #endif |
| 5158 )) | |
| 5159 { | |
| 5160 int n = 0; | |
| 5161 | |
| 5162 #ifdef FEAT_RIGHTLEFT | |
| 5163 if (wp->w_p_rl) | |
| 5164 { | |
| 5165 if (col < 0) | |
| 5166 n = 1; | |
| 5167 } | |
| 5168 else | |
| 5169 #endif | |
| 5170 { | |
| 5171 if (col >= W_WIDTH(wp)) | |
| 5172 n = -1; | |
| 5173 } | |
| 5174 if (n != 0) | |
| 5175 { | |
| 5176 /* At the window boundary, highlight the last character | |
| 5177 * instead (better than nothing). */ | |
| 5178 off += n; | |
| 5179 col += n; | |
| 5180 } | |
| 5181 else | |
| 5182 { | |
| 5183 /* Add a blank character to highlight. */ | |
| 5184 ScreenLines[off] = ' '; | |
| 5185 #ifdef FEAT_MBYTE | |
| 5186 if (enc_utf8) | |
| 5187 ScreenLinesUC[off] = 0; | |
| 5188 #endif | |
| 5189 } | |
| 5190 #ifdef FEAT_SEARCH_EXTRA | |
| 5191 if (area_attr == 0) | |
| 5192 { | |
| 1326 | 5193 /* Use attributes from match with highest priority among |
| 5194 * 'search_hl' and the match list. */ | |
| 5195 char_attr = search_hl.attr; | |
| 5196 cur = wp->w_match_head; | |
| 5197 shl_flag = FALSE; | |
| 5198 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5199 { |
| 1326 | 5200 if (shl_flag == FALSE |
| 5201 && ((cur != NULL | |
| 5202 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5203 || cur == NULL)) | |
| 699 | 5204 { |
| 1326 | 5205 shl = &search_hl; |
| 5206 shl_flag = TRUE; | |
| 699 | 5207 } |
| 1326 | 5208 else |
| 5209 shl = &cur->hl; | |
| 5210 if ((ptr - line) - 1 == (long)shl->startcol) | |
| 5211 char_attr = shl->attr; | |
| 5212 if (shl != &search_hl && cur != NULL) | |
| 5213 cur = cur->next; | |
| 699 | 5214 } |
| 7 | 5215 } |
| 5216 #endif | |
| 5217 ScreenAttrs[off] = char_attr; | |
| 5218 #ifdef FEAT_RIGHTLEFT | |
| 5219 if (wp->w_p_rl) | |
| 1437 | 5220 { |
| 7 | 5221 --col; |
| 1437 | 5222 --off; |
| 5223 } | |
| 7 | 5224 else |
| 5225 #endif | |
| 1437 | 5226 { |
| 7 | 5227 ++col; |
| 1437 | 5228 ++off; |
| 5229 } | |
| 743 | 5230 ++vcol; |
| 1437 | 5231 #ifdef FEAT_SYN_HL |
| 5232 eol_hl_off = 1; | |
| 5233 #endif | |
| 743 | 5234 } |
| 867 | 5235 } |
| 5236 | |
| 5237 /* | |
| 5238 * At end of the text line. | |
| 5239 */ | |
| 5240 if (c == NUL) | |
| 5241 { | |
| 743 | 5242 #ifdef FEAT_SYN_HL |
| 1850 | 5243 if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol |
| 5244 && lnum == wp->w_cursor.lnum) | |
| 1437 | 5245 { |
| 5246 /* highlight last char after line */ | |
| 5247 --col; | |
| 5248 --off; | |
| 5249 --vcol; | |
| 5250 } | |
| 5251 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5252 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5253 if (wp->w_p_wrap) |
| 5254 v = wp->w_skipcol; | |
| 5255 else | |
| 5256 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5257 |
| 820 | 5258 /* check if line ends before left margin */ |
| 5259 if (vcol < v + col - win_col_off(wp)) | |
| 5260 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
|
5261 #ifdef FEAT_CONCEAL |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5262 /* 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
|
5263 * edge for 'cursorcolumn'. */ |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5264 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5265 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5266 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5267 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5268 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5269 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
|
5270 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5271 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5272 && (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
|
5273 && (int)wp->w_virtcol < |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5274 W_WIDTH(wp) * (row - startrow + 1) + v |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5275 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5276 || draw_color_col) |
| 743 | 5277 # ifdef FEAT_RIGHTLEFT |
| 5278 && !wp->w_p_rl | |
| 5279 # endif | |
| 5280 ) | |
| 5281 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5282 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5283 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5284 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5285 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5286 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5287 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5288 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5289 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
|
5290 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5291 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5292 |
| 743 | 5293 while (col < W_WIDTH(wp)) |
| 5294 { | |
| 5295 ScreenLines[off] = ' '; | |
| 5296 #ifdef FEAT_MBYTE | |
| 5297 if (enc_utf8) | |
| 5298 ScreenLinesUC[off] = 0; | |
| 5299 #endif | |
| 5300 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5301 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5302 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
|
5303 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5304 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5305 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
|
5306 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
|
5307 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
|
5308 ScreenAttrs[off++] = hl_attr(HLF_MC); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5309 else |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5310 ScreenAttrs[off++] = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5311 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5312 if (VCOL_HLC >= rightmost_vcol) |
| 743 | 5313 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5314 |
| 743 | 5315 ++vcol; |
| 5316 } | |
| 5317 } | |
| 5318 #endif | |
| 7 | 5319 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5320 SCREEN_LINE(screen_row, W_WINCOL(wp), col, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5321 (int)W_WIDTH(wp), wp->w_p_rl); |
| 7 | 5322 row++; |
| 5323 | |
| 5324 /* | |
| 5325 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5326 * updated (saves a call to plines() later). | |
| 5327 */ | |
| 5328 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5329 { | |
| 5330 curwin->w_cline_row = startrow; | |
| 5331 curwin->w_cline_height = row - startrow; | |
| 5332 #ifdef FEAT_FOLDING | |
| 5333 curwin->w_cline_folded = FALSE; | |
| 5334 #endif | |
| 5335 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5336 } | |
| 5337 | |
| 5338 break; | |
| 5339 } | |
| 5340 | |
| 5341 /* line continues beyond line end */ | |
| 5342 if (lcs_ext | |
| 5343 && !wp->w_p_wrap | |
| 5344 #ifdef FEAT_DIFF | |
| 5345 && filler_todo <= 0 | |
| 5346 #endif | |
| 5347 && ( | |
| 5348 #ifdef FEAT_RIGHTLEFT | |
| 5349 wp->w_p_rl ? col == 0 : | |
| 5350 #endif | |
| 5351 col == W_WIDTH(wp) - 1) | |
| 5352 && (*ptr != NUL | |
| 1555 | 5353 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5354 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5355 { | |
| 5356 c = lcs_ext; | |
| 5357 char_attr = hl_attr(HLF_AT); | |
| 5358 #ifdef FEAT_MBYTE | |
| 5359 mb_c = c; | |
| 5360 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 5361 { | |
| 5362 mb_utf8 = TRUE; | |
| 714 | 5363 u8cc[0] = 0; |
| 819 | 5364 c = 0xc0; |
| 7 | 5365 } |
| 5366 else | |
| 5367 mb_utf8 = FALSE; | |
| 5368 #endif | |
| 5369 } | |
| 5370 | |
| 743 | 5371 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5372 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5373 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5374 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
|
5375 |
| 743 | 5376 /* 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
|
5377 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5378 * 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
|
5379 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5380 vcol_save_attr = -1; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5381 if (draw_state == WL_LINE && !lnum_in_visual_area) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5382 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5383 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
|
5384 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5385 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5386 vcol_save_attr = char_attr; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5387 char_attr = hl_combine_attr(char_attr, hl_attr(HLF_CUC)); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5388 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5389 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
|
5390 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5391 vcol_save_attr = char_attr; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5392 char_attr = hl_combine_attr(char_attr, hl_attr(HLF_MC)); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5393 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5394 } |
| 743 | 5395 #endif |
| 5396 | |
| 7 | 5397 /* |
| 5398 * Store character to be displayed. | |
| 5399 * Skip characters that are left of the screen for 'nowrap'. | |
| 5400 */ | |
| 5401 vcol_prev = vcol; | |
| 5402 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5403 { | |
| 5404 /* | |
| 5405 * Store the character. | |
| 5406 */ | |
| 5407 #if defined(FEAT_RIGHTLEFT) && defined(FEAT_MBYTE) | |
| 5408 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) | |
| 5409 { | |
| 5410 /* A double-wide character is: put first halve in left cell. */ | |
| 5411 --off; | |
| 5412 --col; | |
| 5413 } | |
| 5414 #endif | |
| 5415 ScreenLines[off] = c; | |
| 5416 #ifdef FEAT_MBYTE | |
| 5417 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5418 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5419 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5420 ScreenLines[off] = 0x8e; |
| 7 | 5421 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5422 } |
| 7 | 5423 else if (enc_utf8) |
| 5424 { | |
| 5425 if (mb_utf8) | |
| 5426 { | |
| 1326 | 5427 int i; |
| 5428 | |
| 7 | 5429 ScreenLinesUC[off] = mb_c; |
| 819 | 5430 if ((c & 0xff) == 0) |
| 5431 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5432 for (i = 0; i < Screen_mco; ++i) |
| 5433 { | |
| 5434 ScreenLinesC[i][off] = u8cc[i]; | |
| 5435 if (u8cc[i] == 0) | |
| 5436 break; | |
| 5437 } | |
| 7 | 5438 } |
| 5439 else | |
| 5440 ScreenLinesUC[off] = 0; | |
| 5441 } | |
| 5442 if (multi_attr) | |
| 5443 { | |
| 5444 ScreenAttrs[off] = multi_attr; | |
| 5445 multi_attr = 0; | |
| 5446 } | |
| 5447 else | |
| 5448 #endif | |
| 5449 ScreenAttrs[off] = char_attr; | |
| 5450 | |
| 5451 #ifdef FEAT_MBYTE | |
| 5452 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5453 { | |
| 5454 /* Need to fill two screen columns. */ | |
| 5455 ++off; | |
| 5456 ++col; | |
| 5457 if (enc_utf8) | |
| 5458 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5459 ScreenLines[off] = 0; | |
| 5460 else | |
| 5461 /* DBCS: Put second byte in the second screen char. */ | |
| 5462 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5463 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5464 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5465 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5466 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5467 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5468 ++vcol; |
| 7 | 5469 /* When "tocol" is halfway a character, set it to the end of |
| 5470 * the character, otherwise highlighting won't stop. */ | |
| 5471 if (tocol == vcol) | |
| 5472 ++tocol; | |
| 5473 #ifdef FEAT_RIGHTLEFT | |
| 5474 if (wp->w_p_rl) | |
| 5475 { | |
| 5476 /* now it's time to backup one cell */ | |
| 5477 --off; | |
| 5478 --col; | |
| 5479 } | |
| 5480 #endif | |
| 5481 } | |
| 5482 #endif | |
| 5483 #ifdef FEAT_RIGHTLEFT | |
| 5484 if (wp->w_p_rl) | |
| 5485 { | |
| 5486 --off; | |
| 5487 --col; | |
| 5488 } | |
| 5489 else | |
| 5490 #endif | |
| 5491 { | |
| 5492 ++off; | |
| 5493 ++col; | |
| 5494 } | |
| 5495 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5496 #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
|
5497 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
|
5498 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5499 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5500 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5501 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5502 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5503 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5504 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5505 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5506 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5507 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5508 * 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
|
5509 * 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
|
5510 * 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
|
5511 * 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
|
5512 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5513 * 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
|
5514 * 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
|
5515 * 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
|
5516 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5517 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5518 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5519 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5520 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5521 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5522 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5523 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5524 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5525 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5526 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5527 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5528 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5529 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5530 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5531 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5532 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5533 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5534 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5535 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5536 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5537 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5538 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5539 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
|
5540 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5541 /* Need to fill two screen columns. */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5542 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5543 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5544 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5545 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5546 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5547 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5548 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5549 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5550 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5551 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5552 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5553 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5554 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5555 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5556 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5557 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5558 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5559 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5560 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5561 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5562 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5563 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5564 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5565 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5566 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5567 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5568 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5569 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5570 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5571 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5572 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5573 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5574 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5575 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5576 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5577 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5578 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5579 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5580 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5581 #endif /* FEAT_CONCEAL */ |
| 7 | 5582 else |
| 5583 --n_skip; | |
| 5584 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5585 /* 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
|
5586 * column. */ |
| 1849 | 5587 if (draw_state > WL_NR |
| 7 | 5588 #ifdef FEAT_DIFF |
| 5589 && filler_todo <= 0 | |
| 5590 #endif | |
| 5591 ) | |
| 5592 ++vcol; | |
| 5593 | |
| 743 | 5594 #ifdef FEAT_SYN_HL |
| 5595 if (vcol_save_attr >= 0) | |
| 5596 char_attr = vcol_save_attr; | |
| 5597 #endif | |
| 5598 | |
| 7 | 5599 /* restore attributes after "predeces" in 'listchars' */ |
| 5600 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5601 char_attr = saved_attr3; | |
| 5602 | |
| 5603 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5604 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5605 char_attr = saved_attr2; | |
| 5606 | |
| 5607 /* | |
| 5608 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5609 * so far. If there is no more to display it is caught above. |
| 7 | 5610 */ |
| 5611 if (( | |
| 5612 #ifdef FEAT_RIGHTLEFT | |
| 5613 wp->w_p_rl ? (col < 0) : | |
| 5614 #endif | |
| 5615 (col >= W_WIDTH(wp))) | |
| 5616 && (*ptr != NUL | |
| 5617 #ifdef FEAT_DIFF | |
| 5618 || filler_todo > 0 | |
| 5619 #endif | |
| 2724 | 5620 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5621 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5622 ) | |
| 5623 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5624 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5625 SCREEN_LINE(screen_row, W_WINCOL(wp), col - boguscols, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5626 (int)W_WIDTH(wp), wp->w_p_rl); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5627 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5628 #else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5629 SCREEN_LINE(screen_row, W_WINCOL(wp), col, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5630 (int)W_WIDTH(wp), wp->w_p_rl); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5631 #endif |
| 7 | 5632 ++row; |
| 5633 ++screen_row; | |
| 5634 | |
| 5635 /* When not wrapping and finished diff lines, or when displayed | |
| 5636 * '$' and highlighting until last column, break here. */ | |
| 5637 if ((!wp->w_p_wrap | |
| 5638 #ifdef FEAT_DIFF | |
| 5639 && filler_todo <= 0 | |
| 5640 #endif | |
| 5641 ) || lcs_eol_one == -1) | |
| 5642 break; | |
| 5643 | |
| 5644 /* When the window is too narrow draw all "@" lines. */ | |
| 5645 if (draw_state != WL_LINE | |
| 5646 #ifdef FEAT_DIFF | |
| 5647 && filler_todo <= 0 | |
| 5648 #endif | |
| 5649 ) | |
| 5650 { | |
| 5651 win_draw_end(wp, '@', ' ', row, wp->w_height, HLF_AT); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
5652 #ifdef FEAT_WINDOWS |
| 7 | 5653 draw_vsep_win(wp, row); |
| 5654 #endif | |
| 5655 row = endrow; | |
| 5656 } | |
| 5657 | |
| 5658 /* When line got too long for screen break here. */ | |
| 5659 if (row == endrow) | |
| 5660 { | |
| 5661 ++row; | |
| 5662 break; | |
| 5663 } | |
| 5664 | |
| 5665 if (screen_cur_row == screen_row - 1 | |
| 5666 #ifdef FEAT_DIFF | |
| 5667 && filler_todo <= 0 | |
| 5668 #endif | |
| 5669 && W_WIDTH(wp) == Columns) | |
| 5670 { | |
| 5671 /* Remember that the line wraps, used for modeless copy. */ | |
| 5672 LineWraps[screen_row - 1] = TRUE; | |
| 5673 | |
| 5674 /* | |
| 5675 * Special trick to make copy/paste of wrapped lines work with | |
| 5676 * xterm/screen: write an extra character beyond the end of | |
| 5677 * the line. This will work with all terminal types | |
| 5678 * (regardless of the xn,am settings). | |
| 5679 * Only do this on a fast tty. | |
| 5680 * Only do this if the cursor is on the current line | |
| 5681 * (something has been written in it). | |
| 5682 * Don't do this for the GUI. | |
| 5683 * Don't do this for double-width characters. | |
| 5684 * Don't do this for a window not at the right screen border. | |
| 5685 */ | |
| 5686 if (p_tf | |
| 5687 #ifdef FEAT_GUI | |
| 5688 && !gui.in_use | |
| 5689 #endif | |
| 5690 #ifdef FEAT_MBYTE | |
| 5691 && !(has_mbyte | |
| 1378 | 5692 && ((*mb_off2cells)(LineOffset[screen_row], |
| 5693 LineOffset[screen_row] + screen_Columns) | |
| 5694 == 2 | |
| 7 | 5695 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 5696 + (int)Columns - 2, |
| 5697 LineOffset[screen_row] + screen_Columns) | |
| 5698 == 2)) | |
| 7 | 5699 #endif |
| 5700 ) | |
| 5701 { | |
| 5702 /* First make sure we are at the end of the screen line, | |
| 5703 * then output the same character again to let the | |
| 5704 * terminal know about the wrap. If the terminal doesn't | |
| 5705 * auto-wrap, we overwrite the character. */ | |
| 5706 if (screen_cur_col != W_WIDTH(wp)) | |
| 5707 screen_char(LineOffset[screen_row - 1] | |
| 5708 + (unsigned)Columns - 1, | |
| 5709 screen_row - 1, (int)(Columns - 1)); | |
| 5710 | |
| 5711 #ifdef FEAT_MBYTE | |
| 5712 /* When there is a multi-byte character, just output a | |
| 5713 * space to keep it simple. */ | |
| 148 | 5714 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 5715 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 5716 out_char(' '); |
| 5717 else | |
| 5718 #endif | |
| 5719 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 5720 + (Columns - 1)]); | |
| 5721 /* force a redraw of the first char on the next line */ | |
| 5722 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 5723 screen_start(); /* don't know where cursor is now */ | |
| 5724 } | |
| 5725 } | |
| 5726 | |
| 5727 col = 0; | |
| 5728 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5729 #ifdef FEAT_RIGHTLEFT | |
| 5730 if (wp->w_p_rl) | |
| 5731 { | |
| 5732 col = W_WIDTH(wp) - 1; /* col is not used if breaking! */ | |
| 5733 off += col; | |
| 5734 } | |
| 5735 #endif | |
| 5736 | |
| 5737 /* reset the drawing state for the start of a wrapped line */ | |
| 5738 draw_state = WL_START; | |
| 5739 saved_n_extra = n_extra; | |
| 5740 saved_p_extra = p_extra; | |
| 5741 saved_c_extra = c_extra; | |
| 5742 saved_char_attr = char_attr; | |
| 5743 n_extra = 0; | |
| 5744 lcs_prec_todo = lcs_prec; | |
| 5745 #ifdef FEAT_LINEBREAK | |
| 5746 # ifdef FEAT_DIFF | |
| 5747 if (filler_todo <= 0) | |
| 5748 # endif | |
| 5749 need_showbreak = TRUE; | |
| 5750 #endif | |
| 5751 #ifdef FEAT_DIFF | |
| 5752 --filler_todo; | |
| 5753 /* When the filler lines are actually below the last line of the | |
| 5754 * file, don't draw the line itself, break here. */ | |
| 5755 if (filler_todo == 0 && wp->w_botfill) | |
| 5756 break; | |
| 5757 #endif | |
| 5758 } | |
| 5759 | |
| 5760 } /* for every character in the line */ | |
| 5761 | |
| 743 | 5762 #ifdef FEAT_SPELL |
| 386 | 5763 /* After an empty line check first word for capital. */ |
| 5764 if (*skipwhite(line) == NUL) | |
| 5765 { | |
| 5766 capcol_lnum = lnum + 1; | |
| 5767 cap_col = 0; | |
| 5768 } | |
| 5769 #endif | |
| 5770 | |
| 7 | 5771 return row; |
| 5772 } | |
| 5773 | |
| 714 | 5774 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
5775 static int comp_char_differs(int, int); |
| 714 | 5776 |
| 5777 /* | |
| 5778 * 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
|
5779 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 5780 */ |
| 5781 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5782 comp_char_differs(int off_from, int off_to) |
| 714 | 5783 { |
| 5784 int i; | |
| 5785 | |
| 5786 for (i = 0; i < Screen_mco; ++i) | |
| 5787 { | |
| 5788 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 5789 return TRUE; | |
| 5790 if (ScreenLinesC[i][off_from] == 0) | |
| 5791 break; | |
| 5792 } | |
| 5793 return FALSE; | |
| 5794 } | |
| 5795 #endif | |
| 5796 | |
| 7 | 5797 /* |
| 5798 * Check whether the given character needs redrawing: | |
| 5799 * - the (first byte of the) character is different | |
| 5800 * - the attributes are different | |
| 5801 * - the character is multi-byte and the next byte is different | |
| 1616 | 5802 * - the character is two cells wide and the second cell differs. |
| 7 | 5803 */ |
| 5804 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5805 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 5806 { |
| 5807 if (cols > 0 | |
| 5808 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 5809 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 5810 | |
| 5811 #ifdef FEAT_MBYTE | |
| 5812 || (enc_dbcs != 0 | |
| 5813 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 5814 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 5815 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 5816 : (cols > 1 && ScreenLines[off_from + 1] | |
| 5817 != ScreenLines[off_to + 1]))) | |
| 5818 || (enc_utf8 | |
| 5819 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 5820 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 5821 && comp_char_differs(off_from, off_to)) |
| 3759 | 5822 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 5823 && ScreenLines[off_from + 1] | |
| 5824 != ScreenLines[off_to + 1]))) | |
| 7 | 5825 #endif |
| 5826 )) | |
| 5827 return TRUE; | |
| 5828 return FALSE; | |
| 5829 } | |
| 5830 | |
| 5831 /* | |
| 5832 * Move one "cooked" screen line to the screen, but only the characters that | |
| 5833 * have actually changed. Handle insert/delete character. | |
| 5834 * "coloff" gives the first column on the screen for this line. | |
| 5835 * "endcol" gives the columns where valid characters are. | |
| 5836 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 5837 * needs to be cleared, negative otherwise. | |
| 5838 * "rlflag" is TRUE in a rightleft window: | |
| 5839 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" | |
| 5840 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 5841 */ | |
| 5842 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5843 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5844 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5845 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5846 int endcol, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5847 int clear_width |
| 7 | 5848 #ifdef FEAT_RIGHTLEFT |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5849 , int rlflag |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5850 #endif |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5851 ) |
| 7 | 5852 { |
| 5853 unsigned off_from; | |
| 5854 unsigned off_to; | |
| 1378 | 5855 #ifdef FEAT_MBYTE |
| 5856 unsigned max_off_from; | |
| 5857 unsigned max_off_to; | |
| 5858 #endif | |
| 7 | 5859 int col = 0; |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
5860 #if defined(FEAT_GUI) || defined(UNIX) || defined(FEAT_WINDOWS) |
| 7 | 5861 int hl; |
| 5862 #endif | |
| 5863 int force = FALSE; /* force update rest of the line */ | |
| 5864 int redraw_this /* bool: does character need redraw? */ | |
| 5865 #ifdef FEAT_GUI | |
| 5866 = TRUE /* For GUI when while-loop empty */ | |
| 5867 #endif | |
| 5868 ; | |
| 5869 int redraw_next; /* redraw_this for next character */ | |
| 5870 #ifdef FEAT_MBYTE | |
| 5871 int clear_next = FALSE; | |
| 5872 int char_cells; /* 1: normal char */ | |
| 5873 /* 2: occupies two display cells */ | |
| 5874 # define CHAR_CELLS char_cells | |
| 5875 #else | |
| 5876 # define CHAR_CELLS 1 | |
| 5877 #endif | |
| 5878 | |
| 3413 | 5879 /* Check for illegal row and col, just in case. */ |
| 5880 if (row >= Rows) | |
| 5881 row = Rows - 1; | |
| 5882 if (endcol > Columns) | |
| 5883 endcol = Columns; | |
| 5884 | |
| 7 | 5885 # ifdef FEAT_CLIPBOARD |
| 5886 clip_may_clear_selection(row, row); | |
| 5887 # endif | |
| 5888 | |
| 5889 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5890 off_to = LineOffset[row] + coloff; | |
| 1378 | 5891 #ifdef FEAT_MBYTE |
| 5892 max_off_from = off_from + screen_Columns; | |
| 5893 max_off_to = LineOffset[row] + screen_Columns; | |
| 5894 #endif | |
| 7 | 5895 |
| 5896 #ifdef FEAT_RIGHTLEFT | |
| 5897 if (rlflag) | |
| 5898 { | |
| 5899 /* Clear rest first, because it's left of the text. */ | |
| 5900 if (clear_width > 0) | |
| 5901 { | |
| 5902 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 5903 && ScreenAttrs[off_to] == 0 | |
| 5904 # ifdef FEAT_MBYTE | |
| 5905 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 5906 # endif | |
| 5907 ) | |
| 5908 { | |
| 5909 ++off_to; | |
| 5910 ++col; | |
| 5911 } | |
| 5912 if (col <= endcol) | |
| 5913 screen_fill(row, row + 1, col + coloff, | |
| 5914 endcol + coloff + 1, ' ', ' ', 0); | |
| 5915 } | |
| 5916 col = endcol + 1; | |
| 5917 off_to = LineOffset[row] + col + coloff; | |
| 5918 off_from += col; | |
| 5919 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 5920 } | |
| 5921 #endif /* FEAT_RIGHTLEFT */ | |
| 5922 | |
| 5923 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 5924 | |
| 5925 while (col < endcol) | |
| 5926 { | |
| 5927 #ifdef FEAT_MBYTE | |
| 5928 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 5929 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 5930 else |
| 5931 char_cells = 1; | |
| 5932 #endif | |
| 5933 | |
| 5934 redraw_this = redraw_next; | |
| 5935 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 5936 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 5937 | |
| 5938 #ifdef FEAT_GUI | |
| 5939 /* If the next character was bold, then redraw the current character to | |
| 5940 * remove any pixels that might have spilt over into us. This only | |
| 5941 * happens in the GUI. | |
| 5942 */ | |
| 5943 if (redraw_next && gui.in_use) | |
| 5944 { | |
| 5945 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 5946 if (hl > HL_ALL) |
| 5947 hl = syn_attr2attr(hl); | |
| 5948 if (hl & HL_BOLD) | |
| 7 | 5949 redraw_this = TRUE; |
| 5950 } | |
| 5951 #endif | |
| 5952 | |
| 5953 if (redraw_this) | |
| 5954 { | |
| 5955 /* | |
| 5956 * Special handling when 'xs' termcap flag set (hpterm): | |
| 5957 * Attributes for characters are stored at the position where the | |
| 5958 * cursor is when writing the highlighting code. The | |
| 5959 * start-highlighting code must be written with the cursor on the | |
| 5960 * first highlighted character. The stop-highlighting code must | |
| 5961 * be written with the cursor just after the last highlighted | |
| 5962 * character. | |
| 5963 * Overwriting a character doesn't remove it's highlighting. Need | |
| 5964 * to clear the rest of the line, and force redrawing it | |
| 5965 * completely. | |
| 5966 */ | |
| 5967 if ( p_wiv | |
| 5968 && !force | |
| 5969 #ifdef FEAT_GUI | |
| 5970 && !gui.in_use | |
| 5971 #endif | |
| 5972 && ScreenAttrs[off_to] != 0 | |
| 5973 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 5974 { | |
| 5975 /* | |
| 5976 * Need to remove highlighting attributes here. | |
| 5977 */ | |
| 5978 windgoto(row, col + coloff); | |
| 5979 out_str(T_CE); /* clear rest of this screen line */ | |
| 5980 screen_start(); /* don't know where cursor is now */ | |
| 5981 force = TRUE; /* force redraw of rest of the line */ | |
| 5982 redraw_next = TRUE; /* or else next char would miss out */ | |
| 5983 | |
| 5984 /* | |
| 5985 * If the previous character was highlighted, need to stop | |
| 5986 * highlighting at this character. | |
| 5987 */ | |
| 5988 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 5989 { | |
| 5990 screen_attr = ScreenAttrs[off_to - 1]; | |
| 5991 term_windgoto(row, col + coloff); | |
| 5992 screen_stop_highlight(); | |
| 5993 } | |
| 5994 else | |
| 5995 screen_attr = 0; /* highlighting has stopped */ | |
| 5996 } | |
| 5997 #ifdef FEAT_MBYTE | |
| 5998 if (enc_dbcs != 0) | |
| 5999 { | |
| 6000 /* Check if overwriting a double-byte with a single-byte or | |
| 6001 * the other way around requires another character to be | |
| 6002 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6003 * ScreenLinesUC[] is sufficient. */ | |
| 6004 if (char_cells == 1 | |
| 6005 && col + 1 < endcol | |
| 1378 | 6006 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6007 { |
| 6008 /* Writing a single-cell character over a double-cell | |
| 6009 * character: need to redraw the next cell. */ | |
| 6010 ScreenLines[off_to + 1] = 0; | |
| 6011 redraw_next = TRUE; | |
| 6012 } | |
| 6013 else if (char_cells == 2 | |
| 6014 && col + 2 < endcol | |
| 1378 | 6015 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6016 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6017 { |
| 6018 /* Writing the second half of a double-cell character over | |
| 6019 * a double-cell character: need to redraw the second | |
| 6020 * cell. */ | |
| 6021 ScreenLines[off_to + 2] = 0; | |
| 6022 redraw_next = TRUE; | |
| 6023 } | |
| 6024 | |
| 6025 if (enc_dbcs == DBCS_JPNU) | |
| 6026 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6027 } | |
| 6028 /* When writing a single-width character over a double-width | |
| 6029 * character and at the end of the redrawn text, need to clear out | |
| 6030 * the right halve of the old character. | |
| 6031 * Also required when writing the right halve of a double-width | |
| 6032 * char over the left halve of an existing one. */ | |
| 6033 if (has_mbyte && col + char_cells == endcol | |
| 6034 && ((char_cells == 1 | |
| 1378 | 6035 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6036 || (char_cells == 2 |
| 1378 | 6037 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6038 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6039 clear_next = TRUE; |
| 6040 #endif | |
| 6041 | |
| 6042 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6043 #ifdef FEAT_MBYTE | |
| 6044 if (enc_utf8) | |
| 6045 { | |
| 6046 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6047 if (ScreenLinesUC[off_from] != 0) | |
| 6048 { | |
| 714 | 6049 int i; |
| 6050 | |
| 6051 for (i = 0; i < Screen_mco; ++i) | |
| 6052 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6053 } |
| 6054 } | |
| 6055 if (char_cells == 2) | |
| 6056 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6057 #endif | |
| 6058 | |
| 6059 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6060 /* The bold trick makes a single column of pixels appear in the |
| 6061 * next character. When a bold character is removed, the next | |
| 7 | 6062 * character should be redrawn too. This happens for our own GUI |
| 6063 * and for some xterms. */ | |
| 6064 if ( | |
| 6065 # ifdef FEAT_GUI | |
| 6066 gui.in_use | |
| 6067 # endif | |
| 6068 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6069 || | |
| 6070 # endif | |
| 6071 # ifdef UNIX | |
| 6072 term_is_xterm | |
| 6073 # endif | |
| 6074 ) | |
| 6075 { | |
| 6076 hl = ScreenAttrs[off_to]; | |
| 743 | 6077 if (hl > HL_ALL) |
| 6078 hl = syn_attr2attr(hl); | |
| 6079 if (hl & HL_BOLD) | |
| 7 | 6080 redraw_next = TRUE; |
| 6081 } | |
| 6082 #endif | |
| 6083 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
| 6084 #ifdef FEAT_MBYTE | |
| 819 | 6085 /* For simplicity set the attributes of second half of a |
| 6086 * double-wide character equal to the first half. */ | |
| 6087 if (char_cells == 2) | |
| 6088 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6089 | |
| 7 | 6090 if (enc_dbcs != 0 && char_cells == 2) |
| 6091 screen_char_2(off_to, row, col + coloff); | |
| 6092 else | |
| 6093 #endif | |
| 6094 screen_char(off_to, row, col + coloff); | |
| 6095 } | |
| 6096 else if ( p_wiv | |
| 6097 #ifdef FEAT_GUI | |
| 6098 && !gui.in_use | |
| 6099 #endif | |
| 6100 && col + coloff > 0) | |
| 6101 { | |
| 6102 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6103 { | |
| 6104 /* | |
| 6105 * Don't output stop-highlight when moving the cursor, it will | |
| 6106 * stop the highlighting when it should continue. | |
| 6107 */ | |
| 6108 screen_attr = 0; | |
| 6109 } | |
| 6110 else if (screen_attr != 0) | |
| 6111 screen_stop_highlight(); | |
| 6112 } | |
| 6113 | |
| 6114 off_to += CHAR_CELLS; | |
| 6115 off_from += CHAR_CELLS; | |
| 6116 col += CHAR_CELLS; | |
| 6117 } | |
| 6118 | |
| 6119 #ifdef FEAT_MBYTE | |
| 6120 if (clear_next) | |
| 6121 { | |
| 6122 /* Clear the second half of a double-wide character of which the left | |
| 6123 * half was overwritten with a single-wide character. */ | |
| 6124 ScreenLines[off_to] = ' '; | |
| 6125 if (enc_utf8) | |
| 6126 ScreenLinesUC[off_to] = 0; | |
| 6127 screen_char(off_to, row, col + coloff); | |
| 6128 } | |
| 6129 #endif | |
| 6130 | |
| 6131 if (clear_width > 0 | |
| 6132 #ifdef FEAT_RIGHTLEFT | |
| 6133 && !rlflag | |
| 6134 #endif | |
| 6135 ) | |
| 6136 { | |
| 6137 #ifdef FEAT_GUI | |
| 6138 int startCol = col; | |
| 6139 #endif | |
| 6140 | |
| 6141 /* blank out the rest of the line */ | |
| 6142 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6143 && ScreenAttrs[off_to] == 0 | |
| 6144 #ifdef FEAT_MBYTE | |
| 6145 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6146 #endif | |
| 6147 ) | |
| 6148 { | |
| 6149 ++off_to; | |
| 6150 ++col; | |
| 6151 } | |
| 6152 if (col < clear_width) | |
| 6153 { | |
| 6154 #ifdef FEAT_GUI | |
| 6155 /* | |
| 6156 * In the GUI, clearing the rest of the line may leave pixels | |
| 6157 * behind if the first character cleared was bold. Some bold | |
| 6158 * fonts spill over the left. In this case we redraw the previous | |
| 6159 * character too. If we didn't skip any blanks above, then we | |
| 6160 * only redraw if the character wasn't already redrawn anyway. | |
| 6161 */ | |
| 996 | 6162 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6163 { |
| 6164 hl = ScreenAttrs[off_to]; | |
| 6165 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6166 { |
| 6167 int prev_cells = 1; | |
| 6168 # ifdef FEAT_MBYTE | |
| 6169 if (enc_utf8) | |
| 6170 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6171 * that its width is 2. */ | |
| 6172 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6173 else if (enc_dbcs != 0) | |
| 6174 { | |
| 6175 /* find previous character by counting from first | |
| 6176 * column and get its width. */ | |
| 6177 unsigned off = LineOffset[row]; | |
| 1378 | 6178 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6179 |
| 6180 while (off < off_to) | |
| 6181 { | |
| 1378 | 6182 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6183 off += prev_cells; |
| 6184 } | |
| 6185 } | |
| 6186 | |
| 6187 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6188 screen_char_2(off_to - prev_cells, row, | |
| 6189 col + coloff - prev_cells); | |
| 6190 else | |
| 6191 # endif | |
| 6192 screen_char(off_to - prev_cells, row, | |
| 6193 col + coloff - prev_cells); | |
| 6194 } | |
| 7 | 6195 } |
| 6196 #endif | |
| 6197 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6198 ' ', ' ', 0); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6199 #ifdef FEAT_WINDOWS |
| 7 | 6200 off_to += clear_width - col; |
| 6201 col = clear_width; | |
| 6202 #endif | |
| 6203 } | |
| 6204 } | |
| 6205 | |
| 6206 if (clear_width > 0) | |
| 6207 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6208 #ifdef FEAT_WINDOWS |
| 7 | 6209 /* For a window that's left of another, draw the separator char. */ |
| 6210 if (col + coloff < Columns) | |
| 6211 { | |
| 6212 int c; | |
| 6213 | |
| 6214 c = fillchar_vsep(&hl); | |
| 6477 | 6215 if (ScreenLines[off_to] != (schar_T)c |
| 7 | 6216 # ifdef FEAT_MBYTE |
| 714 | 6217 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6218 != (c >= 0x80 ? c : 0)) | |
| 7 | 6219 # endif |
| 6220 || ScreenAttrs[off_to] != hl) | |
| 6221 { | |
| 6222 ScreenLines[off_to] = c; | |
| 6223 ScreenAttrs[off_to] = hl; | |
| 6224 # ifdef FEAT_MBYTE | |
| 6225 if (enc_utf8) | |
| 6226 { | |
| 6227 if (c >= 0x80) | |
| 6228 { | |
| 6229 ScreenLinesUC[off_to] = c; | |
| 714 | 6230 ScreenLinesC[0][off_to] = 0; |
| 7 | 6231 } |
| 6232 else | |
| 6233 ScreenLinesUC[off_to] = 0; | |
| 6234 } | |
| 6235 # endif | |
| 6236 screen_char(off_to, row, col + coloff); | |
| 6237 } | |
| 6238 } | |
| 6239 else | |
| 6240 #endif | |
| 6241 LineWraps[row] = FALSE; | |
| 6242 } | |
| 6243 } | |
| 6244 | |
| 474 | 6245 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6246 /* |
| 474 | 6247 * Mirror text "str" for right-left displaying. |
| 6248 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6249 */ |
| 474 | 6250 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6251 rl_mirror(char_u *str) |
| 7 | 6252 { |
| 6253 char_u *p1, *p2; | |
| 6254 int t; | |
| 6255 | |
| 6256 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6257 { | |
| 6258 t = *p1; | |
| 6259 *p1 = *p2; | |
| 6260 *p2 = t; | |
| 6261 } | |
| 6262 } | |
| 6263 #endif | |
| 6264 | |
| 6265 #if defined(FEAT_WINDOWS) || defined(PROTO) | |
| 6266 /* | |
| 6267 * mark all status lines for redraw; used after first :cd | |
| 6268 */ | |
| 6269 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6270 status_redraw_all(void) |
| 7 | 6271 { |
| 6272 win_T *wp; | |
| 6273 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6274 FOR_ALL_WINDOWS(wp) |
| 7 | 6275 if (wp->w_status_height) |
| 6276 { | |
| 6277 wp->w_redr_status = TRUE; | |
| 6278 redraw_later(VALID); | |
| 6279 } | |
| 6280 } | |
| 6281 | |
| 6282 /* | |
| 6283 * mark all status lines of the current buffer for redraw | |
| 6284 */ | |
| 6285 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6286 status_redraw_curbuf(void) |
| 7 | 6287 { |
| 6288 win_T *wp; | |
| 6289 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6290 FOR_ALL_WINDOWS(wp) |
| 7 | 6291 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6292 { | |
| 6293 wp->w_redr_status = TRUE; | |
| 6294 redraw_later(VALID); | |
| 6295 } | |
| 6296 } | |
| 6297 | |
| 6298 /* | |
| 6299 * Redraw all status lines that need to be redrawn. | |
| 6300 */ | |
| 6301 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6302 redraw_statuslines(void) |
| 7 | 6303 { |
| 6304 win_T *wp; | |
| 6305 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6306 FOR_ALL_WINDOWS(wp) |
| 7 | 6307 if (wp->w_redr_status) |
| 6308 win_redr_status(wp); | |
| 673 | 6309 if (redraw_tabline) |
| 677 | 6310 draw_tabline(); |
| 7 | 6311 } |
| 6312 #endif | |
| 6313 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6314 #if (defined(FEAT_WILDMENU) && defined(FEAT_WINDOWS)) || defined(PROTO) |
| 7 | 6315 /* |
| 6316 * Redraw all status lines at the bottom of frame "frp". | |
| 6317 */ | |
| 6318 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6319 win_redraw_last_status(frame_T *frp) |
| 7 | 6320 { |
| 6321 if (frp->fr_layout == FR_LEAF) | |
| 6322 frp->fr_win->w_redr_status = TRUE; | |
| 6323 else if (frp->fr_layout == FR_ROW) | |
| 6324 { | |
| 6325 for (frp = frp->fr_child; frp != NULL; frp = frp->fr_next) | |
| 6326 win_redraw_last_status(frp); | |
| 6327 } | |
| 6328 else /* frp->fr_layout == FR_COL */ | |
| 6329 { | |
| 6330 frp = frp->fr_child; | |
| 6331 while (frp->fr_next != NULL) | |
| 6332 frp = frp->fr_next; | |
| 6333 win_redraw_last_status(frp); | |
| 6334 } | |
| 6335 } | |
| 6336 #endif | |
| 6337 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6338 #ifdef FEAT_WINDOWS |
| 7 | 6339 /* |
| 6340 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6341 */ | |
| 6342 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6343 draw_vsep_win(win_T *wp, int row) |
| 7 | 6344 { |
| 6345 int hl; | |
| 6346 int c; | |
| 6347 | |
| 6348 if (wp->w_vsep_width) | |
| 6349 { | |
| 6350 /* draw the vertical separator right of this window */ | |
| 6351 c = fillchar_vsep(&hl); | |
| 6352 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6353 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6354 c, ' ', hl); | |
| 6355 } | |
| 6356 } | |
| 6357 #endif | |
| 6358 | |
| 6359 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6360 static int status_match_len(expand_T *xp, char_u *s); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6361 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6362 |
| 6363 /* | |
| 1378 | 6364 * Get the length of an item as it will be shown in the status line. |
| 7 | 6365 */ |
| 6366 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6367 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6368 { |
| 6369 int len = 0; | |
| 6370 | |
| 6371 #ifdef FEAT_MENU | |
| 6372 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6373 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6374 | |
| 6375 /* Check for menu separators - replace with '|'. */ | |
| 6376 if (emenu && menu_is_separator(s)) | |
| 6377 return 1; | |
| 6378 #endif | |
| 6379 | |
| 6380 while (*s != NUL) | |
| 6381 { | |
| 1685 | 6382 s += skip_status_match_char(xp, s); |
| 42 | 6383 len += ptr2cells(s); |
| 39 | 6384 mb_ptr_adv(s); |
| 7 | 6385 } |
| 6386 | |
| 6387 return len; | |
| 6388 } | |
| 6389 | |
| 6390 /* | |
| 1685 | 6391 * Return the number of characters that should be skipped in a status match. |
| 277 | 6392 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6393 */ | |
| 6394 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6395 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6396 { |
| 1685 | 6397 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6398 #ifdef FEAT_MENU |
| 6399 || ((xp->xp_context == EXPAND_MENUS | |
| 6400 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6401 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6402 #endif | |
| 1685 | 6403 ) |
| 6404 { | |
| 6405 #ifndef BACKSLASH_IN_FILENAME | |
| 6406 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6407 return 2; | |
| 6408 #endif | |
| 6409 return 1; | |
| 6410 } | |
| 6411 return 0; | |
| 277 | 6412 } |
| 6413 | |
| 6414 /* | |
| 7 | 6415 * Show wildchar matches in the status line. |
| 6416 * Show at least the "match" item. | |
| 6417 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6418 * | |
| 6419 * If inversion is possible we use it. Else '=' characters are used. | |
| 6420 */ | |
| 6421 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6422 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6423 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6424 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6425 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6426 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6427 int showtail) |
| 7 | 6428 { |
| 6429 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6430 int row; | |
| 6431 char_u *buf; | |
| 6432 int len; | |
| 1378 | 6433 int clen; /* length in screen cells */ |
| 7 | 6434 int fillchar; |
| 6435 int attr; | |
| 6436 int i; | |
| 6437 int highlight = TRUE; | |
| 6438 char_u *selstart = NULL; | |
| 6439 int selstart_col = 0; | |
| 6440 char_u *selend = NULL; | |
| 6441 static int first_match = 0; | |
| 6442 int add_left = FALSE; | |
| 6443 char_u *s; | |
| 6444 #ifdef FEAT_MENU | |
| 6445 int emenu; | |
| 6446 #endif | |
| 6447 #if defined(FEAT_MBYTE) || defined(FEAT_MENU) | |
| 6448 int l; | |
| 6449 #endif | |
| 6450 | |
| 6451 if (matches == NULL) /* interrupted completion? */ | |
| 6452 return; | |
| 6453 | |
| 39 | 6454 #ifdef FEAT_MBYTE |
| 6455 if (has_mbyte) | |
| 6456 buf = alloc((unsigned)Columns * MB_MAXBYTES + 1); | |
| 6457 else | |
| 6458 #endif | |
| 6459 buf = alloc((unsigned)Columns + 1); | |
| 7 | 6460 if (buf == NULL) |
| 6461 return; | |
| 6462 | |
| 6463 if (match == -1) /* don't show match but original text */ | |
| 6464 { | |
| 6465 match = 0; | |
| 6466 highlight = FALSE; | |
| 6467 } | |
| 6468 /* count 1 for the ending ">" */ | |
| 6469 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6470 if (match == 0) | |
| 6471 first_match = 0; | |
| 6472 else if (match < first_match) | |
| 6473 { | |
| 6474 /* jumping left, as far as we can go */ | |
| 6475 first_match = match; | |
| 6476 add_left = TRUE; | |
| 6477 } | |
| 6478 else | |
| 6479 { | |
| 6480 /* check if match fits on the screen */ | |
| 6481 for (i = first_match; i < match; ++i) | |
| 6482 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6483 if (first_match > 0) | |
| 6484 clen += 2; | |
| 6485 /* jumping right, put match at the left */ | |
| 6486 if ((long)clen > Columns) | |
| 6487 { | |
| 6488 first_match = match; | |
| 6489 /* if showing the last match, we can add some on the left */ | |
| 6490 clen = 2; | |
| 6491 for (i = match; i < num_matches; ++i) | |
| 6492 { | |
| 6493 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6494 if ((long)clen >= Columns) | |
| 6495 break; | |
| 6496 } | |
| 6497 if (i == num_matches) | |
| 6498 add_left = TRUE; | |
| 6499 } | |
| 6500 } | |
| 6501 if (add_left) | |
| 6502 while (first_match > 0) | |
| 6503 { | |
| 6504 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6505 if ((long)clen >= Columns) | |
| 6506 break; | |
| 6507 --first_match; | |
| 6508 } | |
| 6509 | |
| 6510 fillchar = fillchar_status(&attr, TRUE); | |
| 6511 | |
| 6512 if (first_match == 0) | |
| 6513 { | |
| 6514 *buf = NUL; | |
| 6515 len = 0; | |
| 6516 } | |
| 6517 else | |
| 6518 { | |
| 6519 STRCPY(buf, "< "); | |
| 6520 len = 2; | |
| 6521 } | |
| 6522 clen = len; | |
| 6523 | |
| 6524 i = first_match; | |
| 6525 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6526 { | |
| 6527 if (i == match) | |
| 6528 { | |
| 6529 selstart = buf + len; | |
| 6530 selstart_col = clen; | |
| 6531 } | |
| 6532 | |
| 6533 s = L_MATCH(i); | |
| 6534 /* Check for menu separators - replace with '|' */ | |
| 6535 #ifdef FEAT_MENU | |
| 6536 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6537 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6538 if (emenu && menu_is_separator(s)) | |
| 6539 { | |
| 6540 STRCPY(buf + len, transchar('|')); | |
| 6541 l = (int)STRLEN(buf + len); | |
| 6542 len += l; | |
| 6543 clen += l; | |
| 6544 } | |
| 6545 else | |
| 6546 #endif | |
| 6547 for ( ; *s != NUL; ++s) | |
| 6548 { | |
| 1685 | 6549 s += skip_status_match_char(xp, s); |
| 7 | 6550 clen += ptr2cells(s); |
| 6551 #ifdef FEAT_MBYTE | |
| 474 | 6552 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6553 { |
| 6554 STRNCPY(buf + len, s, l); | |
| 6555 s += l - 1; | |
| 6556 len += l; | |
| 6557 } | |
| 6558 else | |
| 6559 #endif | |
| 6560 { | |
| 6561 STRCPY(buf + len, transchar_byte(*s)); | |
| 6562 len += (int)STRLEN(buf + len); | |
| 6563 } | |
| 6564 } | |
| 6565 if (i == match) | |
| 6566 selend = buf + len; | |
| 6567 | |
| 6568 *(buf + len++) = ' '; | |
| 6569 *(buf + len++) = ' '; | |
| 6570 clen += 2; | |
| 6571 if (++i == num_matches) | |
| 6572 break; | |
| 6573 } | |
| 6574 | |
| 6575 if (i != num_matches) | |
| 6576 { | |
| 6577 *(buf + len++) = '>'; | |
| 6578 ++clen; | |
| 6579 } | |
| 6580 | |
| 6581 buf[len] = NUL; | |
| 6582 | |
| 6583 row = cmdline_row - 1; | |
| 6584 if (row >= 0) | |
| 6585 { | |
| 6586 if (wild_menu_showing == 0) | |
| 6587 { | |
| 6588 if (msg_scrolled > 0) | |
| 6589 { | |
| 6590 /* Put the wildmenu just above the command line. If there is | |
| 6591 * no room, scroll the screen one line up. */ | |
| 6592 if (cmdline_row == Rows - 1) | |
| 6593 { | |
| 6594 screen_del_lines(0, 0, 1, (int)Rows, TRUE, NULL); | |
| 6595 ++msg_scrolled; | |
| 6596 } | |
| 6597 else | |
| 6598 { | |
| 6599 ++cmdline_row; | |
| 6600 ++row; | |
| 6601 } | |
| 6602 wild_menu_showing = WM_SCROLLED; | |
| 6603 } | |
| 6604 else | |
| 6605 { | |
| 6606 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6607 * Set 'winminheight' to zero to avoid that the window is | |
| 6608 * resized. */ | |
| 6609 if (lastwin->w_status_height == 0) | |
| 6610 { | |
| 6611 save_p_ls = p_ls; | |
| 6612 save_p_wmh = p_wmh; | |
| 6613 p_ls = 2; | |
| 6614 p_wmh = 0; | |
| 6615 last_status(FALSE); | |
| 6616 } | |
| 6617 wild_menu_showing = WM_SHOWN; | |
| 6618 } | |
| 6619 } | |
| 6620 | |
| 6621 screen_puts(buf, row, 0, attr); | |
| 6622 if (selstart != NULL && highlight) | |
| 6623 { | |
| 6624 *selend = NUL; | |
| 6625 screen_puts(selstart, row, selstart_col, hl_attr(HLF_WM)); | |
| 6626 } | |
| 6627 | |
| 6628 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6629 } | |
| 6630 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6631 #ifdef FEAT_WINDOWS |
| 7 | 6632 win_redraw_last_status(topframe); |
| 6633 #else | |
| 6634 lastwin->w_redr_status = TRUE; | |
| 6635 #endif | |
| 6636 vim_free(buf); | |
| 6637 } | |
| 6638 #endif | |
| 6639 | |
| 6640 #if defined(FEAT_WINDOWS) || defined(PROTO) | |
| 6641 /* | |
| 6642 * Redraw the status line of window wp. | |
| 6643 * | |
| 6644 * If inversion is possible we use it. Else '=' characters are used. | |
| 6645 */ | |
| 6646 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6647 win_redr_status(win_T *wp) |
| 7 | 6648 { |
| 6649 int row; | |
| 6650 char_u *p; | |
| 6651 int len; | |
| 6652 int fillchar; | |
| 6653 int attr; | |
| 6654 int this_ru_col; | |
| 1910 | 6655 static int busy = FALSE; |
| 6656 | |
| 6657 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6658 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6659 if (busy) | |
| 6660 return; | |
| 6661 busy = TRUE; | |
| 7 | 6662 |
| 6663 wp->w_redr_status = FALSE; | |
| 6664 if (wp->w_status_height == 0) | |
| 6665 { | |
| 6666 /* no status line, can only be last window */ | |
| 6667 redraw_cmdline = TRUE; | |
| 6668 } | |
| 540 | 6669 else if (!redrawing() |
| 6670 #ifdef FEAT_INS_EXPAND | |
| 6671 /* don't update status line when popup menu is visible and may be | |
| 6672 * drawn over it */ | |
| 6673 || pum_visible() | |
| 6674 #endif | |
| 6675 ) | |
| 7 | 6676 { |
| 6677 /* Don't redraw right now, do it later. */ | |
| 6678 wp->w_redr_status = TRUE; | |
| 6679 } | |
| 6680 #ifdef FEAT_STL_OPT | |
| 40 | 6681 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 6682 { |
| 6683 /* redraw custom status line */ | |
| 1983 | 6684 redraw_custom_statusline(wp); |
| 7 | 6685 } |
| 6686 #endif | |
| 6687 else | |
| 6688 { | |
| 6689 fillchar = fillchar_status(&attr, wp == curwin); | |
| 6690 | |
| 685 | 6691 get_trans_bufname(wp->w_buffer); |
| 7 | 6692 p = NameBuff; |
| 6693 len = (int)STRLEN(p); | |
| 6694 | |
| 6695 if (wp->w_buffer->b_help | |
| 6696 #ifdef FEAT_QUICKFIX | |
| 6697 || wp->w_p_pvw | |
| 6698 #endif | |
| 6699 || bufIsChanged(wp->w_buffer) | |
| 6700 || wp->w_buffer->b_p_ro) | |
| 6701 *(p + len++) = ' '; | |
| 6702 if (wp->w_buffer->b_help) | |
| 6703 { | |
| 809 | 6704 STRCPY(p + len, _("[Help]")); |
| 7 | 6705 len += (int)STRLEN(p + len); |
| 6706 } | |
| 6707 #ifdef FEAT_QUICKFIX | |
| 6708 if (wp->w_p_pvw) | |
| 6709 { | |
| 6710 STRCPY(p + len, _("[Preview]")); | |
| 6711 len += (int)STRLEN(p + len); | |
| 6712 } | |
| 6713 #endif | |
| 6714 if (bufIsChanged(wp->w_buffer)) | |
| 6715 { | |
| 6716 STRCPY(p + len, "[+]"); | |
| 6717 len += 3; | |
| 6718 } | |
| 6719 if (wp->w_buffer->b_p_ro) | |
| 6720 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
6721 STRCPY(p + len, _("[RO]")); |
| 7 | 6722 len += 4; |
| 6723 } | |
| 6724 | |
| 6725 this_ru_col = ru_col - (Columns - W_WIDTH(wp)); | |
| 6726 if (this_ru_col < (W_WIDTH(wp) + 1) / 2) | |
| 6727 this_ru_col = (W_WIDTH(wp) + 1) / 2; | |
| 6728 if (this_ru_col <= 1) | |
| 6729 { | |
| 6730 p = (char_u *)"<"; /* No room for file name! */ | |
| 6731 len = 1; | |
| 6732 } | |
| 6733 else | |
| 6734 #ifdef FEAT_MBYTE | |
| 6735 if (has_mbyte) | |
| 6736 { | |
| 6737 int clen = 0, i; | |
| 6738 | |
| 6739 /* Count total number of display cells. */ | |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6740 clen = mb_string2cells(p, -1); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6741 |
| 7 | 6742 /* Find first character that will fit. |
| 6743 * Going from start to end is much faster for DBCS. */ | |
| 6744 for (i = 0; p[i] != NUL && clen >= this_ru_col - 1; | |
| 474 | 6745 i += (*mb_ptr2len)(p + i)) |
| 7 | 6746 clen -= (*mb_ptr2cells)(p + i); |
| 6747 len = clen; | |
| 6748 if (i > 0) | |
| 6749 { | |
| 6750 p = p + i - 1; | |
| 6751 *p = '<'; | |
| 6752 ++len; | |
| 6753 } | |
| 6754 | |
| 6755 } | |
| 6756 else | |
| 6757 #endif | |
| 6758 if (len > this_ru_col - 1) | |
| 6759 { | |
| 6760 p += len - (this_ru_col - 1); | |
| 6761 *p = '<'; | |
| 6762 len = this_ru_col - 1; | |
| 6763 } | |
| 6764 | |
| 6765 row = W_WINROW(wp) + wp->w_height; | |
| 6766 screen_puts(p, row, W_WINCOL(wp), attr); | |
| 6767 screen_fill(row, row + 1, len + W_WINCOL(wp), | |
| 6768 this_ru_col + W_WINCOL(wp), fillchar, fillchar, attr); | |
| 6769 | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6770 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 6771 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 6772 screen_puts(NameBuff, row, (int)(this_ru_col - STRLEN(NameBuff) | |
| 6773 - 1 + W_WINCOL(wp)), attr); | |
| 6774 | |
| 6775 #ifdef FEAT_CMDL_INFO | |
| 6776 win_redr_ruler(wp, TRUE); | |
| 6777 #endif | |
| 6778 } | |
| 6779 | |
| 6780 /* | |
| 6781 * May need to draw the character below the vertical separator. | |
| 6782 */ | |
| 6783 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 6784 { | |
| 6785 if (stl_connected(wp)) | |
| 6786 fillchar = fillchar_status(&attr, wp == curwin); | |
| 6787 else | |
| 6788 fillchar = fillchar_vsep(&attr); | |
| 6789 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 6790 attr); | |
| 6791 } | |
| 1910 | 6792 busy = FALSE; |
| 7 | 6793 } |
| 6794 | |
| 680 | 6795 #ifdef FEAT_STL_OPT |
| 6796 /* | |
| 6797 * Redraw the status line according to 'statusline' and take care of any | |
| 6798 * errors encountered. | |
| 6799 */ | |
| 6800 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6801 redraw_custom_statusline(win_T *wp) |
| 680 | 6802 { |
| 1983 | 6803 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6804 int saved_did_emsg = did_emsg; |
| 1983 | 6805 |
| 6806 /* When called recursively return. This can happen when the statusline | |
| 6807 * contains an expression that triggers a redraw. */ | |
| 6808 if (entered) | |
| 6809 return; | |
| 6810 entered = TRUE; | |
| 680 | 6811 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6812 did_emsg = FALSE; |
| 680 | 6813 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6814 if (did_emsg) |
| 1983 | 6815 { |
| 6816 /* When there is an error disable the statusline, otherwise the | |
| 6817 * display is messed up with errors and a redraw triggers the problem | |
| 6818 * again and again. */ | |
| 680 | 6819 set_string_option_direct((char_u *)"statusline", -1, |
| 6820 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 6821 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 6822 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6823 did_emsg |= saved_did_emsg; |
| 1983 | 6824 entered = FALSE; |
| 680 | 6825 } |
| 6826 #endif | |
| 6827 | |
| 7 | 6828 /* |
| 6829 * Return TRUE if the status line of window "wp" is connected to the status | |
| 6830 * line of the window right of it. If not, then it's a vertical separator. | |
| 6831 * Only call if (wp->w_vsep_width != 0). | |
| 6832 */ | |
| 6833 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6834 stl_connected(win_T *wp) |
| 7 | 6835 { |
| 6836 frame_T *fr; | |
| 6837 | |
| 6838 fr = wp->w_frame; | |
| 6839 while (fr->fr_parent != NULL) | |
| 6840 { | |
| 6841 if (fr->fr_parent->fr_layout == FR_COL) | |
| 6842 { | |
| 6843 if (fr->fr_next != NULL) | |
| 6844 break; | |
| 6845 } | |
| 6846 else | |
| 6847 { | |
| 6848 if (fr->fr_next != NULL) | |
| 6849 return TRUE; | |
| 6850 } | |
| 6851 fr = fr->fr_parent; | |
| 6852 } | |
| 6853 return FALSE; | |
| 6854 } | |
| 6855 | |
| 6856 #endif /* FEAT_WINDOWS */ | |
| 6857 | |
| 6858 #if defined(FEAT_WINDOWS) || defined(FEAT_STL_OPT) || defined(PROTO) | |
| 6859 /* | |
| 6860 * Get the value to show for the language mappings, active 'keymap'. | |
| 6861 */ | |
| 6862 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6863 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6864 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6865 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
|
6866 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
|
6867 int len) /* length of buffer */ |
| 7 | 6868 { |
| 6869 char_u *p; | |
| 6870 | |
| 6871 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 6872 return FALSE; | |
| 6873 | |
| 6874 { | |
| 6875 #ifdef FEAT_EVAL | |
| 6876 buf_T *old_curbuf = curbuf; | |
| 6877 win_T *old_curwin = curwin; | |
| 6878 char_u *s; | |
| 6879 | |
| 6880 curbuf = wp->w_buffer; | |
| 6881 curwin = wp; | |
| 6882 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 6883 ++emsg_skip; | |
| 714 | 6884 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 6885 --emsg_skip; |
| 6886 curbuf = old_curbuf; | |
| 6887 curwin = old_curwin; | |
| 6888 if (p == NULL || *p == NUL) | |
| 6889 #endif | |
| 6890 { | |
| 6891 #ifdef FEAT_KEYMAP | |
| 6892 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 6893 p = wp->w_buffer->b_p_keymap; | |
| 6894 else | |
| 6895 #endif | |
| 6896 p = (char_u *)"lang"; | |
| 6897 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6898 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 6899 buf[0] = NUL; |
| 6900 #ifdef FEAT_EVAL | |
| 6901 vim_free(s); | |
| 6902 #endif | |
| 6903 } | |
| 6904 return buf[0] != NUL; | |
| 6905 } | |
| 6906 #endif | |
| 6907 | |
| 6908 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 6909 /* | |
| 677 | 6910 * Redraw the status line or ruler of window "wp". |
| 6911 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 6912 */ |
| 6913 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6914 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6915 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6916 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 6917 { |
| 5539 | 6918 static int entered = FALSE; |
| 7 | 6919 int attr; |
| 6920 int curattr; | |
| 6921 int row; | |
| 6922 int col = 0; | |
| 6923 int maxwidth; | |
| 6924 int width; | |
| 6925 int n; | |
| 6926 int len; | |
| 6927 int fillchar; | |
| 6928 char_u buf[MAXPATHL]; | |
| 1983 | 6929 char_u *stl; |
| 7 | 6930 char_u *p; |
| 681 | 6931 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 6932 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 6933 int use_sandbox = FALSE; |
| 2693 | 6934 win_T *ewp; |
| 6935 int p_crb_save; | |
| 7 | 6936 |
| 5539 | 6937 /* There is a tiny chance that this gets called recursively: When |
| 6938 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 6939 * Avoid trouble by not allowing recursion. */ | |
| 6940 if (entered) | |
| 6941 return; | |
| 6942 entered = TRUE; | |
| 6943 | |
| 7 | 6944 /* setup environment for the task at hand */ |
| 677 | 6945 if (wp == NULL) |
| 6946 { | |
| 6947 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 6948 stl = p_tal; |
| 677 | 6949 row = 0; |
| 707 | 6950 fillchar = ' '; |
| 677 | 6951 attr = hl_attr(HLF_TPF); |
| 6952 maxwidth = Columns; | |
| 6953 # ifdef FEAT_EVAL | |
| 681 | 6954 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 6955 # endif |
| 6956 } | |
| 40 | 6957 else |
| 677 | 6958 { |
| 6959 row = W_WINROW(wp) + wp->w_height; | |
| 6960 fillchar = fillchar_status(&attr, wp == curwin); | |
| 6961 maxwidth = W_WIDTH(wp); | |
| 6962 | |
| 6963 if (draw_ruler) | |
| 6964 { | |
| 1983 | 6965 stl = p_ruf; |
| 677 | 6966 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 6967 if (*stl == '%') |
| 6968 { | |
| 6969 if (*++stl == '-') | |
| 6970 stl++; | |
| 6971 if (atoi((char *)stl)) | |
| 6972 while (VIM_ISDIGIT(*stl)) | |
| 6973 stl++; | |
| 6974 if (*stl++ != '(') | |
| 6975 stl = p_ruf; | |
| 677 | 6976 } |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6977 #ifdef FEAT_WINDOWS |
| 677 | 6978 col = ru_col - (Columns - W_WIDTH(wp)); |
| 6979 if (col < (W_WIDTH(wp) + 1) / 2) | |
| 6980 col = (W_WIDTH(wp) + 1) / 2; | |
| 7 | 6981 #else |
| 677 | 6982 col = ru_col; |
| 6983 if (col > (Columns + 1) / 2) | |
| 6984 col = (Columns + 1) / 2; | |
| 6985 #endif | |
| 6986 maxwidth = W_WIDTH(wp) - col; | |
| 7 | 6987 #ifdef FEAT_WINDOWS |
| 677 | 6988 if (!wp->w_status_height) |
| 6989 #endif | |
| 6990 { | |
| 6991 row = Rows - 1; | |
| 6992 --maxwidth; /* writing in last column may cause scrolling */ | |
| 6993 fillchar = ' '; | |
| 6994 attr = 0; | |
| 6995 } | |
| 6996 | |
| 6997 # ifdef FEAT_EVAL | |
| 681 | 6998 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 6999 # endif |
| 7000 } | |
| 7001 else | |
| 7002 { | |
| 7003 if (*wp->w_p_stl != NUL) | |
| 1983 | 7004 stl = wp->w_p_stl; |
| 677 | 7005 else |
| 1983 | 7006 stl = p_stl; |
| 677 | 7007 # ifdef FEAT_EVAL |
| 681 | 7008 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7009 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7010 # endif |
| 7011 } | |
| 7012 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
7013 #ifdef FEAT_WINDOWS |
| 677 | 7014 col += W_WINCOL(wp); |
| 7015 #endif | |
| 7016 } | |
| 7017 | |
| 7 | 7018 if (maxwidth <= 0) |
| 5539 | 7019 goto theend; |
| 677 | 7020 |
| 2693 | 7021 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7022 * the cursor away and back. */ | |
| 7023 ewp = wp == NULL ? curwin : wp; | |
| 7024 p_crb_save = ewp->w_p_crb; | |
| 7025 ewp->w_p_crb = FALSE; | |
| 7026 | |
| 1983 | 7027 /* Make a copy, because the statusline may include a function call that |
| 7028 * might change the option value and free the memory. */ | |
| 7029 stl = vim_strsave(stl); | |
| 2693 | 7030 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7031 stl, use_sandbox, |
| 681 | 7032 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7033 vim_free(stl); |
| 2693 | 7034 ewp->w_p_crb = p_crb_save; |
| 2661 | 7035 |
| 7036 /* Make all characters printable. */ | |
| 7037 p = transstr(buf); | |
| 7038 if (p != NULL) | |
| 7039 { | |
| 7040 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7041 vim_free(p); | |
| 7042 } | |
| 7043 | |
| 7044 /* fill up with "fillchar" */ | |
| 835 | 7045 len = (int)STRLEN(buf); |
| 1883 | 7046 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7047 { |
| 7048 #ifdef FEAT_MBYTE | |
| 7049 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7050 #else | |
| 7051 buf[len++] = fillchar; | |
| 7052 #endif | |
| 7053 ++width; | |
| 7054 } | |
| 7055 buf[len] = NUL; | |
| 7056 | |
| 681 | 7057 /* |
| 7058 * Draw each snippet with the specified highlighting. | |
| 7059 */ | |
| 7 | 7060 curattr = attr; |
| 7061 p = buf; | |
| 681 | 7062 for (n = 0; hltab[n].start != NULL; n++) |
| 7063 { | |
| 7064 len = (int)(hltab[n].start - p); | |
| 7 | 7065 screen_puts_len(p, len, row, col, curattr); |
| 7066 col += vim_strnsize(p, len); | |
| 681 | 7067 p = hltab[n].start; |
| 7068 | |
| 7069 if (hltab[n].userhl == 0) | |
| 7 | 7070 curattr = attr; |
| 681 | 7071 else if (hltab[n].userhl < 0) |
| 7072 curattr = syn_id2attr(-hltab[n].userhl); | |
| 7 | 7073 #ifdef FEAT_WINDOWS |
| 680 | 7074 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7075 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7076 #endif |
| 7077 else | |
| 681 | 7078 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7079 } |
| 7080 screen_puts(p, row, col, curattr); | |
| 681 | 7081 |
| 7082 if (wp == NULL) | |
| 7083 { | |
| 7084 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7085 col = 0; | |
| 7086 len = 0; | |
| 7087 p = buf; | |
| 7088 fillchar = 0; | |
| 7089 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7090 { | |
| 7091 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7092 while (col < len) | |
| 7093 TabPageIdxs[col++] = fillchar; | |
| 7094 p = tabtab[n].start; | |
| 7095 fillchar = tabtab[n].userhl; | |
| 7096 } | |
| 7097 while (col < Columns) | |
| 7098 TabPageIdxs[col++] = fillchar; | |
| 7099 } | |
| 5539 | 7100 |
| 7101 theend: | |
| 7102 entered = FALSE; | |
| 7 | 7103 } |
| 7104 | |
| 7105 #endif /* FEAT_STL_OPT */ | |
| 7106 | |
| 7107 /* | |
| 7108 * Output a single character directly to the screen and update ScreenLines. | |
| 7109 */ | |
| 7110 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7111 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7112 { |
| 3549 | 7113 char_u buf[MB_MAXBYTES + 1]; |
| 7114 | |
| 7 | 7115 #ifdef FEAT_MBYTE |
| 3549 | 7116 if (has_mbyte) |
| 7117 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7118 else | |
| 7119 #endif | |
| 7120 { | |
| 7121 buf[0] = c; | |
| 7122 buf[1] = NUL; | |
| 7123 } | |
| 7 | 7124 screen_puts(buf, row, col, attr); |
| 7125 } | |
| 7126 | |
| 7127 /* | |
| 7128 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7129 * Also return its attribute in *attrp; | |
| 7130 */ | |
| 7131 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7132 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7133 { |
| 7134 unsigned off; | |
| 7135 | |
| 7136 /* safety check */ | |
| 7137 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7138 { | |
| 7139 off = LineOffset[row] + col; | |
| 7140 *attrp = ScreenAttrs[off]; | |
| 7141 bytes[0] = ScreenLines[off]; | |
| 7142 bytes[1] = NUL; | |
| 7143 | |
| 7144 #ifdef FEAT_MBYTE | |
| 7145 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7146 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7147 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7148 { | |
| 7149 bytes[0] = ScreenLines[off]; | |
| 7150 bytes[1] = ScreenLines2[off]; | |
| 7151 bytes[2] = NUL; | |
| 7152 } | |
| 7153 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7154 { | |
| 7155 bytes[1] = ScreenLines[off + 1]; | |
| 7156 bytes[2] = NUL; | |
| 7157 } | |
| 7158 #endif | |
| 7159 } | |
| 7160 } | |
| 7161 | |
| 714 | 7162 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
7163 static int screen_comp_differs(int, int*); |
| 714 | 7164 |
| 7165 /* | |
| 7166 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7167 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7168 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7169 */ |
| 7170 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7171 screen_comp_differs(int off, int *u8cc) |
| 714 | 7172 { |
| 7173 int i; | |
| 7174 | |
| 7175 for (i = 0; i < Screen_mco; ++i) | |
| 7176 { | |
| 7177 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7178 return TRUE; | |
| 7179 if (u8cc[i] == 0) | |
| 7180 break; | |
| 7181 } | |
| 7182 return FALSE; | |
| 7183 } | |
| 7184 #endif | |
| 7185 | |
| 7 | 7186 /* |
| 7187 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7188 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7189 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7190 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7191 */ | |
| 7192 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7193 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7194 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7195 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7196 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7197 int attr) |
| 7 | 7198 { |
| 7199 screen_puts_len(text, -1, row, col, attr); | |
| 7200 } | |
| 7201 | |
| 7202 /* | |
| 7203 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7204 * a NUL. | |
| 7205 */ | |
| 7206 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7207 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7208 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7209 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7210 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7211 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7212 int attr) |
| 7 | 7213 { |
| 7214 unsigned off; | |
| 7215 char_u *ptr = text; | |
| 5923 | 7216 int len = textlen; |
| 7 | 7217 int c; |
| 7218 #ifdef FEAT_MBYTE | |
| 1378 | 7219 unsigned max_off; |
| 7 | 7220 int mbyte_blen = 1; |
| 7221 int mbyte_cells = 1; | |
| 7222 int u8c = 0; | |
| 714 | 7223 int u8cc[MAX_MCO]; |
| 7 | 7224 int clear_next_cell = FALSE; |
| 7225 # ifdef FEAT_ARABIC | |
| 7226 int prev_c = 0; /* previous Arabic character */ | |
| 714 | 7227 int pc, nc, nc1; |
| 7228 int pcc[MAX_MCO]; | |
| 7 | 7229 # endif |
| 7230 #endif | |
| 1843 | 7231 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7232 int force_redraw_this; | |
| 7233 int force_redraw_next = FALSE; | |
| 7234 #endif | |
| 7235 int need_redraw; | |
| 7 | 7236 |
| 7237 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7238 return; | |
| 1843 | 7239 off = LineOffset[row] + col; |
| 7 | 7240 |
| 1668 | 7241 #ifdef FEAT_MBYTE |
| 7242 /* When drawing over the right halve of a double-wide char clear out the | |
| 7243 * left halve. Only needed in a terminal. */ | |
| 1685 | 7244 if (has_mbyte && col > 0 && col < screen_Columns |
| 1668 | 7245 # ifdef FEAT_GUI |
| 7246 && !gui.in_use | |
| 7247 # endif | |
| 7248 && mb_fix_col(col, row) != col) | |
| 1843 | 7249 { |
| 7250 ScreenLines[off - 1] = ' '; | |
| 7251 ScreenAttrs[off - 1] = 0; | |
| 7252 if (enc_utf8) | |
| 7253 { | |
| 7254 ScreenLinesUC[off - 1] = 0; | |
| 7255 ScreenLinesC[0][off - 1] = 0; | |
| 7256 } | |
| 7257 /* redraw the previous cell, make it empty */ | |
| 7258 screen_char(off - 1, row, col - 1); | |
| 7259 /* force the cell at "col" to be redrawn */ | |
| 7260 force_redraw_next = TRUE; | |
| 7261 } | |
| 7262 #endif | |
| 7263 | |
| 1378 | 7264 #ifdef FEAT_MBYTE |
| 7265 max_off = LineOffset[row] + screen_Columns; | |
| 7266 #endif | |
| 1340 | 7267 while (col < screen_Columns |
| 7268 && (len < 0 || (int)(ptr - text) < len) | |
| 7269 && *ptr != NUL) | |
| 7 | 7270 { |
| 7271 c = *ptr; | |
| 7272 #ifdef FEAT_MBYTE | |
| 7273 /* check if this is the first byte of a multibyte */ | |
| 7274 if (has_mbyte) | |
| 7275 { | |
| 7276 if (enc_utf8 && len > 0) | |
| 474 | 7277 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7278 else |
| 474 | 7279 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7280 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7281 mbyte_cells = 1; | |
| 7282 else if (enc_dbcs != 0) | |
| 7283 mbyte_cells = mbyte_blen; | |
| 7284 else /* enc_utf8 */ | |
| 7285 { | |
| 7286 if (len >= 0) | |
| 714 | 7287 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7288 (int)((text + len) - ptr)); |
| 7289 else | |
| 714 | 7290 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7291 mbyte_cells = utf_char2cells(u8c); |
| 1401 | 7292 # ifdef UNICODE16 |
| 7 | 7293 /* Non-BMP character: display as ? or fullwidth ?. */ |
| 7294 if (u8c >= 0x10000) | |
| 7295 { | |
| 7296 u8c = (mbyte_cells == 2) ? 0xff1f : (int)'?'; | |
| 7297 if (attr == 0) | |
| 7298 attr = hl_attr(HLF_8); | |
| 7299 } | |
| 1401 | 7300 # endif |
| 7 | 7301 # ifdef FEAT_ARABIC |
| 7302 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 7303 { | |
| 7304 /* Do Arabic shaping. */ | |
| 7305 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7306 { | |
| 7307 /* Past end of string to be displayed. */ | |
| 7308 nc = NUL; | |
| 7309 nc1 = NUL; | |
| 7310 } | |
| 7311 else | |
| 714 | 7312 { |
| 1994 | 7313 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7314 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7315 nc1 = pcc[0]; |
| 7316 } | |
| 7 | 7317 pc = prev_c; |
| 7318 prev_c = u8c; | |
| 714 | 7319 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7320 } |
| 7321 else | |
| 7322 prev_c = u8c; | |
| 7323 # endif | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7324 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7325 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7326 /* 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
|
7327 * 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
|
7328 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7329 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7330 } |
| 7 | 7331 } |
| 7332 } | |
| 7333 #endif | |
| 7334 | |
| 1843 | 7335 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7336 force_redraw_this = force_redraw_next; | |
| 7337 force_redraw_next = FALSE; | |
| 7338 #endif | |
| 7339 | |
| 7340 need_redraw = ScreenLines[off] != c | |
| 7 | 7341 #ifdef FEAT_MBYTE |
| 7342 || (mbyte_cells == 2 | |
| 7343 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7344 || (enc_dbcs == DBCS_JPNU | |
| 7345 && c == 0x8e | |
| 7346 && ScreenLines2[off] != ptr[1]) | |
| 7347 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7348 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7349 (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
|
7350 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7351 && screen_comp_differs(off, u8cc)))) |
| 7 | 7352 #endif |
| 7353 || ScreenAttrs[off] != attr | |
| 1843 | 7354 || exmode_active; |
| 7355 | |
| 7356 if (need_redraw | |
| 7357 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7358 || force_redraw_this | |
| 7359 #endif | |
| 7 | 7360 ) |
| 7361 { | |
| 7362 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7363 /* The bold trick makes a single row of pixels appear in the next | |
| 7364 * character. When a bold character is removed, the next | |
| 7365 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7366 * and for some xterms. */ |
| 7367 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7368 # ifdef FEAT_GUI |
| 7369 gui.in_use | |
| 7370 # endif | |
| 7371 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7372 || | |
| 7373 # endif | |
| 7374 # ifdef UNIX | |
| 7375 term_is_xterm | |
| 7376 # endif | |
| 1843 | 7377 )) |
| 7378 { | |
| 7379 int n = ScreenAttrs[off]; | |
| 7380 | |
| 7381 if (n > HL_ALL) | |
| 7382 n = syn_attr2attr(n); | |
| 7383 if (n & HL_BOLD) | |
| 7384 force_redraw_next = TRUE; | |
| 7 | 7385 } |
| 7386 #endif | |
| 7387 #ifdef FEAT_MBYTE | |
| 7388 /* When at the end of the text and overwriting a two-cell | |
| 7389 * character with a one-cell character, need to clear the next | |
| 7390 * cell. Also when overwriting the left halve of a two-cell char | |
| 7391 * with the right halve of a two-cell char. Do this only once | |
| 7392 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7393 if (clear_next_cell) | |
| 7394 clear_next_cell = FALSE; | |
| 7395 else if (has_mbyte | |
| 7396 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7397 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7398 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7399 || (mbyte_cells == 2 |
| 1378 | 7400 && (*mb_off2cells)(off, max_off) == 1 |
| 7401 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7402 clear_next_cell = TRUE; |
| 7403 | |
| 7404 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7405 * it confuses mb_off2cells(). */ | |
| 7406 if (enc_dbcs | |
| 1378 | 7407 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7408 || (mbyte_cells == 2 |
| 1378 | 7409 && (*mb_off2cells)(off, max_off) == 1 |
| 7410 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7411 ScreenLines[off + mbyte_blen] = 0; |
| 7412 #endif | |
| 7413 ScreenLines[off] = c; | |
| 7414 ScreenAttrs[off] = attr; | |
| 7415 #ifdef FEAT_MBYTE | |
| 7416 if (enc_utf8) | |
| 7417 { | |
| 714 | 7418 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7419 ScreenLinesUC[off] = 0; |
| 7420 else | |
| 7421 { | |
| 714 | 7422 int i; |
| 7423 | |
| 7 | 7424 ScreenLinesUC[off] = u8c; |
| 714 | 7425 for (i = 0; i < Screen_mco; ++i) |
| 7426 { | |
| 7427 ScreenLinesC[i][off] = u8cc[i]; | |
| 7428 if (u8cc[i] == 0) | |
| 7429 break; | |
| 7430 } | |
| 7 | 7431 } |
| 7432 if (mbyte_cells == 2) | |
| 7433 { | |
| 7434 ScreenLines[off + 1] = 0; | |
| 7435 ScreenAttrs[off + 1] = attr; | |
| 7436 } | |
| 7437 screen_char(off, row, col); | |
| 7438 } | |
| 7439 else if (mbyte_cells == 2) | |
| 7440 { | |
| 7441 ScreenLines[off + 1] = ptr[1]; | |
| 7442 ScreenAttrs[off + 1] = attr; | |
| 7443 screen_char_2(off, row, col); | |
| 7444 } | |
| 7445 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7446 { | |
| 7447 ScreenLines2[off] = ptr[1]; | |
| 7448 screen_char(off, row, col); | |
| 7449 } | |
| 7450 else | |
| 7451 #endif | |
| 7452 screen_char(off, row, col); | |
| 7453 } | |
| 7454 #ifdef FEAT_MBYTE | |
| 7455 if (has_mbyte) | |
| 7456 { | |
| 7457 off += mbyte_cells; | |
| 7458 col += mbyte_cells; | |
| 7459 ptr += mbyte_blen; | |
| 7460 if (clear_next_cell) | |
| 5923 | 7461 { |
| 7462 /* This only happens at the end, display one space next. */ | |
| 7 | 7463 ptr = (char_u *)" "; |
| 5923 | 7464 len = -1; |
| 7465 } | |
| 7 | 7466 } |
| 7467 else | |
| 7468 #endif | |
| 7469 { | |
| 7470 ++off; | |
| 7471 ++col; | |
| 7472 ++ptr; | |
| 7473 } | |
| 7474 } | |
| 1843 | 7475 |
| 7476 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7477 /* If we detected the next character needs to be redrawn, but the text | |
| 7478 * doesn't extend up to there, update the character here. */ | |
| 7479 if (force_redraw_next && col < screen_Columns) | |
| 7480 { | |
| 7481 # ifdef FEAT_MBYTE | |
| 7482 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7483 screen_char_2(off, row, col); | |
| 7484 else | |
| 7485 # endif | |
| 7486 screen_char(off, row, col); | |
| 7487 } | |
| 7488 #endif | |
| 7 | 7489 } |
| 7490 | |
| 7491 #ifdef FEAT_SEARCH_EXTRA | |
| 7492 /* | |
| 1326 | 7493 * Prepare for 'hlsearch' highlighting. |
| 7 | 7494 */ |
| 7495 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7496 start_search_hl(void) |
| 7 | 7497 { |
| 7498 if (p_hls && !no_hlsearch) | |
| 7499 { | |
| 7500 last_pat_prog(&search_hl.rm); | |
| 7501 search_hl.attr = hl_attr(HLF_L); | |
| 1521 | 7502 # ifdef FEAT_RELTIME |
| 7503 /* Set the time limit to 'redrawtime'. */ | |
| 7504 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7505 # endif | |
| 7 | 7506 } |
| 7507 } | |
| 7508 | |
| 7509 /* | |
| 1326 | 7510 * Clean up for 'hlsearch' highlighting. |
| 7 | 7511 */ |
| 7512 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7513 end_search_hl(void) |
| 7 | 7514 { |
| 7515 if (search_hl.rm.regprog != NULL) | |
| 7516 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7517 vim_regfree(search_hl.rm.regprog); |
| 7 | 7518 search_hl.rm.regprog = NULL; |
| 7519 } | |
| 7520 } | |
| 7521 | |
| 7522 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7523 * 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
|
7524 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7525 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7526 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
|
7527 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7528 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7529 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7530 /* 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
|
7531 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7532 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7533 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7534 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7535 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7536 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7537 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7538 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7539 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
|
7540 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
|
7541 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7542 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7543 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7544 /* 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
|
7545 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
|
7546 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7547 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7548 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7549 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
|
7550 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7551 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7552 /* 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
|
7553 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7554 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7555 /* |
| 7 | 7556 * Advance to the match in window "wp" line "lnum" or past it. |
| 7557 */ | |
| 7558 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7559 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7560 { |
| 1326 | 7561 matchitem_T *cur; /* points to the match list */ |
| 7562 match_T *shl; /* points to search_hl or a match */ | |
| 7563 int shl_flag; /* flag to indicate whether search_hl | |
| 7564 has been processed or not */ | |
| 5979 | 7565 int pos_inprogress; /* marks that position match search is |
| 7566 in progress */ | |
| 7 | 7567 int n; |
| 7568 | |
| 7569 /* | |
| 7570 * When using a multi-line pattern, start searching at the top | |
| 7571 * of the window or just after a closed fold. | |
| 1326 | 7572 * Do this both for search_hl and the match list. |
| 7 | 7573 */ |
| 1326 | 7574 cur = wp->w_match_head; |
| 7575 shl_flag = FALSE; | |
| 7576 while (cur != NULL || shl_flag == FALSE) | |
| 7577 { | |
| 7578 if (shl_flag == FALSE) | |
| 7579 { | |
| 7580 shl = &search_hl; | |
| 7581 shl_flag = TRUE; | |
| 7582 } | |
| 7583 else | |
| 7584 shl = &cur->hl; | |
| 7 | 7585 if (shl->rm.regprog != NULL |
| 7586 && shl->lnum == 0 | |
| 7587 && re_multiline(shl->rm.regprog)) | |
| 7588 { | |
| 7589 if (shl->first_lnum == 0) | |
| 7590 { | |
| 7591 # ifdef FEAT_FOLDING | |
| 7592 for (shl->first_lnum = lnum; | |
| 7593 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7594 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7595 NULL, NULL, TRUE, NULL)) | |
| 7596 break; | |
| 7597 # else | |
| 7598 shl->first_lnum = wp->w_topline; | |
| 7599 # endif | |
| 7600 } | |
| 5979 | 7601 if (cur != NULL) |
| 7602 cur->pos.cur = 0; | |
| 7603 pos_inprogress = TRUE; | |
| 7 | 7604 n = 0; |
| 5979 | 7605 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7606 || (cur != NULL && pos_inprogress))) | |
| 7607 { | |
| 7608 next_search_hl(wp, shl, shl->first_lnum, (colnr_T)n, cur); | |
| 7609 pos_inprogress = cur == NULL || cur->pos.cur == 0 | |
| 7610 ? FALSE : TRUE; | |
| 7 | 7611 if (shl->lnum != 0) |
| 7612 { | |
| 7613 shl->first_lnum = shl->lnum | |
| 7614 + shl->rm.endpos[0].lnum | |
| 7615 - shl->rm.startpos[0].lnum; | |
| 7616 n = shl->rm.endpos[0].col; | |
| 7617 } | |
| 7618 else | |
| 7619 { | |
| 7620 ++shl->first_lnum; | |
| 7621 n = 0; | |
| 7622 } | |
| 7623 } | |
| 7624 } | |
| 1326 | 7625 if (shl != &search_hl && cur != NULL) |
| 7626 cur = cur->next; | |
| 7 | 7627 } |
| 7628 } | |
| 7629 | |
| 7630 /* | |
| 1326 | 7631 * Search for a next 'hlsearch' or match. |
| 7 | 7632 * Uses shl->buf. |
| 7633 * Sets shl->lnum and shl->rm contents. | |
| 7634 * Note: Assumes a previous match is always before "lnum", unless | |
| 7635 * shl->lnum is zero. | |
| 7636 * Careful: Any pointers for buffer lines will become invalid. | |
| 7637 */ | |
| 7638 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7639 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7640 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7641 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
|
7642 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7643 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
|
7644 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 7645 { |
| 7646 linenr_T l; | |
| 7647 colnr_T matchcol; | |
| 7648 long nmatched; | |
| 7649 | |
| 7650 if (shl->lnum != 0) | |
| 7651 { | |
| 7652 /* Check for three situations: | |
| 7653 * 1. If the "lnum" is below a previous match, start a new search. | |
| 7654 * 2. If the previous match includes "mincol", use it. | |
| 7655 * 3. Continue after the previous match. | |
| 7656 */ | |
| 7657 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 7658 if (lnum > l) | |
| 7659 shl->lnum = 0; | |
| 7660 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 7661 return; | |
| 7662 } | |
| 7663 | |
| 7664 /* | |
| 7665 * Repeat searching for a match until one is found that includes "mincol" | |
| 7666 * or none is found in this line. | |
| 7667 */ | |
| 7668 called_emsg = FALSE; | |
| 7669 for (;;) | |
| 7670 { | |
| 1521 | 7671 #ifdef FEAT_RELTIME |
| 7672 /* Stop searching after passing the time limit. */ | |
| 7673 if (profile_passed_limit(&(shl->tm))) | |
| 7674 { | |
| 7675 shl->lnum = 0; /* no match found in time */ | |
| 7676 break; | |
| 7677 } | |
| 7678 #endif | |
| 7 | 7679 /* Three situations: |
| 7680 * 1. No useful previous match: search from start of line. | |
| 7681 * 2. Not Vi compatible or empty match: continue at next character. | |
| 7682 * Break the loop if this is beyond the end of the line. | |
| 7683 * 3. Vi compatible searching: continue at end of previous match. | |
| 7684 */ | |
| 7685 if (shl->lnum == 0) | |
| 7686 matchcol = 0; | |
| 7687 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 7688 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 7689 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 7690 { | |
| 688 | 7691 char_u *ml; |
| 685 | 7692 |
| 7693 matchcol = shl->rm.startpos[0].col; | |
| 688 | 7694 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 7695 if (*ml == NUL) |
| 7696 { | |
| 7697 ++matchcol; | |
| 7 | 7698 shl->lnum = 0; |
| 7699 break; | |
| 7700 } | |
| 685 | 7701 #ifdef FEAT_MBYTE |
| 7702 if (has_mbyte) | |
| 7703 matchcol += mb_ptr2len(ml); | |
| 7704 else | |
| 7705 #endif | |
| 7706 ++matchcol; | |
| 7 | 7707 } |
| 7708 else | |
| 7709 matchcol = shl->rm.endpos[0].col; | |
| 7710 | |
| 7711 shl->lnum = lnum; | |
| 5979 | 7712 if (shl->rm.regprog != NULL) |
| 7713 { | |
| 6394 | 7714 /* Remember whether shl->rm is using a copy of the regprog in |
| 7715 * cur->match. */ | |
| 7716 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 7717 && shl == &cur->hl | |
| 7718 && cur->match.regprog == cur->hl.rm.regprog); | |
| 7719 | |
| 5979 | 7720 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 7721 matchcol, | |
| 1521 | 7722 #ifdef FEAT_RELTIME |
| 5979 | 7723 &(shl->tm) |
| 1521 | 7724 #else |
| 5979 | 7725 NULL |
| 7726 #endif | |
| 7727 ); | |
| 6394 | 7728 /* Copy the regprog, in case it got freed and recompiled. */ |
| 7729 if (regprog_is_copy) | |
| 7730 cur->match.regprog = cur->hl.rm.regprog; | |
| 7731 | |
| 5979 | 7732 if (called_emsg || got_int) |
| 7733 { | |
| 7734 /* Error while handling regexp: stop using this regexp. */ | |
| 7735 if (shl == &search_hl) | |
| 7736 { | |
| 7737 /* don't free regprog in the match list, it's a copy */ | |
| 7738 vim_regfree(shl->rm.regprog); | |
| 7739 SET_NO_HLSEARCH(TRUE); | |
| 7740 } | |
| 7741 shl->rm.regprog = NULL; | |
| 7742 shl->lnum = 0; | |
| 7743 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 7744 message */ | |
| 7745 break; | |
| 7746 } | |
| 7747 } | |
| 7748 else if (cur != NULL) | |
| 7749 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 7750 else |
| 7751 nmatched = 0; | |
| 7 | 7752 if (nmatched == 0) |
| 7753 { | |
| 7754 shl->lnum = 0; /* no match found */ | |
| 7755 break; | |
| 7756 } | |
| 7757 if (shl->rm.startpos[0].lnum > 0 | |
| 7758 || shl->rm.startpos[0].col >= mincol | |
| 7759 || nmatched > 1 | |
| 7760 || shl->rm.endpos[0].col > mincol) | |
| 7761 { | |
| 7762 shl->lnum += shl->rm.startpos[0].lnum; | |
| 7763 break; /* useful match found */ | |
| 7764 } | |
| 7765 } | |
| 7766 } | |
| 7767 | |
| 5979 | 7768 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7769 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7770 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
|
7771 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7772 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7773 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 7774 { |
| 7775 int i; | |
| 6007 | 7776 int bot = -1; |
| 5979 | 7777 |
| 7778 shl->lnum = 0; | |
| 7779 for (i = posmatch->cur; i < MAXPOSMATCH; i++) | |
| 7780 { | |
| 7781 if (posmatch->pos[i].lnum == 0) | |
| 7782 break; | |
| 7783 if (posmatch->pos[i].col < mincol) | |
| 7784 continue; | |
| 7785 if (posmatch->pos[i].lnum == lnum) | |
| 7786 { | |
| 7787 if (shl->lnum == lnum) | |
| 7788 { | |
| 7789 /* partially sort positions by column numbers | |
| 7790 * on the same line */ | |
| 7791 if (posmatch->pos[i].col < posmatch->pos[bot].col) | |
| 7792 { | |
| 7793 llpos_T tmp = posmatch->pos[i]; | |
| 7794 | |
| 7795 posmatch->pos[i] = posmatch->pos[bot]; | |
| 7796 posmatch->pos[bot] = tmp; | |
| 7797 } | |
| 7798 } | |
| 7799 else | |
| 7800 { | |
| 7801 bot = i; | |
| 7802 shl->lnum = lnum; | |
| 7803 } | |
| 7804 } | |
| 7805 } | |
| 7806 posmatch->cur = 0; | |
| 7007 | 7807 if (shl->lnum == lnum && bot >= 0) |
| 5979 | 7808 { |
| 7809 colnr_T start = posmatch->pos[bot].col == 0 | |
| 7810 ? 0 : posmatch->pos[bot].col - 1; | |
| 7811 colnr_T end = posmatch->pos[bot].col == 0 | |
| 7812 ? MAXCOL : start + posmatch->pos[bot].len; | |
| 7813 | |
| 7814 shl->rm.startpos[0].lnum = 0; | |
| 7815 shl->rm.startpos[0].col = start; | |
| 7816 shl->rm.endpos[0].lnum = 0; | |
| 7817 shl->rm.endpos[0].col = end; | |
| 7818 posmatch->cur = bot + 1; | |
| 7819 return TRUE; | |
| 7820 } | |
| 7821 return FALSE; | |
| 7822 } | |
| 5985 | 7823 #endif |
| 5979 | 7824 |
| 7 | 7825 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7826 screen_start_highlight(int attr) |
| 7 | 7827 { |
| 7828 attrentry_T *aep = NULL; | |
| 7829 | |
| 7830 screen_attr = attr; | |
| 7831 if (full_screen | |
| 7832 #ifdef WIN3264 | |
| 7833 && termcap_active | |
| 7834 #endif | |
| 7835 ) | |
| 7836 { | |
| 7837 #ifdef FEAT_GUI | |
| 7838 if (gui.in_use) | |
| 7839 { | |
| 7840 char buf[20]; | |
| 7841 | |
| 681 | 7842 /* The GUI handles this internally. */ |
| 7843 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 7844 OUT_STR(buf); |
| 7845 } | |
| 7846 else | |
| 7847 #endif | |
| 7848 { | |
| 7849 if (attr > HL_ALL) /* special HL attr. */ | |
| 7850 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7851 if (IS_CTERM) |
| 7 | 7852 aep = syn_cterm_attr2entry(attr); |
| 7853 else | |
| 7854 aep = syn_term_attr2entry(attr); | |
| 7855 if (aep == NULL) /* did ":syntax clear" */ | |
| 7856 attr = 0; | |
| 7857 else | |
| 7858 attr = aep->ae_attr; | |
| 7859 } | |
| 7860 if ((attr & HL_BOLD) && T_MD != NULL) /* bold */ | |
| 7861 out_str(T_MD); | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7862 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
|
7863 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7864 (p_tgc ? |
|
8977
b3da1ec8d156
commit https://github.com/vim/vim/commit/902647d2dfb42dce8449dfbbc22dab27a528744d
Christian Brabandt <cb@256bit.org>
parents:
8969
diff
changeset
|
7865 (aep->ae_u.cterm.fg_rgb != (long_u)INVALCOLOR): |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7866 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7867 (t_colors > 1 && 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
|
7868 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7869 ) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7870 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7871 ) |
| 681 | 7872 /* If the Normal FG color has BOLD attribute and the new HL |
| 7873 * has a FG color defined, clear BOLD. */ | |
| 7874 out_str(T_ME); | |
| 7 | 7875 if ((attr & HL_STANDOUT) && T_SO != NULL) /* standout */ |
| 7876 out_str(T_SO); | |
| 205 | 7877 if ((attr & (HL_UNDERLINE | HL_UNDERCURL)) && T_US != NULL) |
| 7878 /* underline or undercurl */ | |
| 7 | 7879 out_str(T_US); |
| 7880 if ((attr & HL_ITALIC) && T_CZH != NULL) /* italic */ | |
| 7881 out_str(T_CZH); | |
| 7882 if ((attr & HL_INVERSE) && T_MR != NULL) /* inverse (reverse) */ | |
| 7883 out_str(T_MR); | |
| 7884 | |
| 7885 /* | |
| 7886 * Output the color or start string after bold etc., in case the | |
| 7887 * bold etc. override the color setting. | |
| 7888 */ | |
| 7889 if (aep != NULL) | |
| 7890 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7891 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7892 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7893 { |
|
8977
b3da1ec8d156
commit https://github.com/vim/vim/commit/902647d2dfb42dce8449dfbbc22dab27a528744d
Christian Brabandt <cb@256bit.org>
parents:
8969
diff
changeset
|
7894 if (aep->ae_u.cterm.fg_rgb != (long_u)INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7895 term_fg_rgb_color(aep->ae_u.cterm.fg_rgb); |
|
8977
b3da1ec8d156
commit https://github.com/vim/vim/commit/902647d2dfb42dce8449dfbbc22dab27a528744d
Christian Brabandt <cb@256bit.org>
parents:
8969
diff
changeset
|
7896 if (aep->ae_u.cterm.bg_rgb != (long_u)INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7897 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 7898 } |
| 7899 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7900 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7901 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7902 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7903 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7904 if (aep->ae_u.cterm.fg_color) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7905 term_fg_color(aep->ae_u.cterm.fg_color - 1); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7906 if (aep->ae_u.cterm.bg_color) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7907 term_bg_color(aep->ae_u.cterm.bg_color - 1); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7908 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7909 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7910 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7911 if (aep->ae_u.term.start != NULL) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7912 out_str(aep->ae_u.term.start); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7913 } |
| 7 | 7914 } |
| 7915 } | |
| 7916 } | |
| 7917 } | |
| 7918 } | |
| 7919 | |
| 7920 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7921 screen_stop_highlight(void) |
| 7 | 7922 { |
| 7923 int do_ME = FALSE; /* output T_ME code */ | |
| 7924 | |
| 7925 if (screen_attr != 0 | |
| 7926 #ifdef WIN3264 | |
| 7927 && termcap_active | |
| 7928 #endif | |
| 7929 ) | |
| 7930 { | |
| 7931 #ifdef FEAT_GUI | |
| 7932 if (gui.in_use) | |
| 7933 { | |
| 7934 char buf[20]; | |
| 7935 | |
| 7936 /* use internal GUI code */ | |
| 7937 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 7938 OUT_STR(buf); | |
| 7939 } | |
| 7940 else | |
| 7941 #endif | |
| 7942 { | |
| 7943 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 7944 { | |
| 7945 attrentry_T *aep; | |
| 7946 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7947 if (IS_CTERM) |
| 7 | 7948 { |
| 7949 /* | |
| 7950 * Assume that t_me restores the original colors! | |
| 7951 */ | |
| 7952 aep = syn_cterm_attr2entry(screen_attr); | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7953 if (aep != NULL && |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7954 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7955 (p_tgc ? |
|
8977
b3da1ec8d156
commit https://github.com/vim/vim/commit/902647d2dfb42dce8449dfbbc22dab27a528744d
Christian Brabandt <cb@256bit.org>
parents:
8969
diff
changeset
|
7956 (aep->ae_u.cterm.fg_rgb != (long_u)INVALCOLOR || |
|
b3da1ec8d156
commit https://github.com/vim/vim/commit/902647d2dfb42dce8449dfbbc22dab27a528744d
Christian Brabandt <cb@256bit.org>
parents:
8969
diff
changeset
|
7957 aep->ae_u.cterm.bg_rgb != (long_u)INVALCOLOR): |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7958 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7959 (aep->ae_u.cterm.fg_color || aep->ae_u.cterm.bg_color) |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7960 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7961 ) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7962 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7963 ) |
| 7 | 7964 do_ME = TRUE; |
| 7965 } | |
| 7966 else | |
| 7967 { | |
| 7968 aep = syn_term_attr2entry(screen_attr); | |
| 7969 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 7970 { | |
| 7971 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 7972 do_ME = TRUE; | |
| 7973 else | |
| 7974 out_str(aep->ae_u.term.stop); | |
| 7975 } | |
| 7976 } | |
| 7977 if (aep == NULL) /* did ":syntax clear" */ | |
| 7978 screen_attr = 0; | |
| 7979 else | |
| 7980 screen_attr = aep->ae_attr; | |
| 7981 } | |
| 7982 | |
| 7983 /* | |
| 7984 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 7985 * same sequence several times. | |
| 7986 */ | |
| 7987 if (screen_attr & HL_STANDOUT) | |
| 7988 { | |
| 7989 if (STRCMP(T_SE, T_ME) == 0) | |
| 7990 do_ME = TRUE; | |
| 7991 else | |
| 7992 out_str(T_SE); | |
| 7993 } | |
| 205 | 7994 if (screen_attr & (HL_UNDERLINE | HL_UNDERCURL)) |
| 7 | 7995 { |
| 7996 if (STRCMP(T_UE, T_ME) == 0) | |
| 7997 do_ME = TRUE; | |
| 7998 else | |
| 7999 out_str(T_UE); | |
| 8000 } | |
| 8001 if (screen_attr & HL_ITALIC) | |
| 8002 { | |
| 8003 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8004 do_ME = TRUE; | |
| 8005 else | |
| 8006 out_str(T_CZR); | |
| 8007 } | |
| 8008 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) | |
| 8009 out_str(T_ME); | |
| 8010 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8011 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8012 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8013 { |
|
8977
b3da1ec8d156
commit https://github.com/vim/vim/commit/902647d2dfb42dce8449dfbbc22dab27a528744d
Christian Brabandt <cb@256bit.org>
parents:
8969
diff
changeset
|
8014 if (cterm_normal_fg_gui_color != (long_u)INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8015 term_fg_rgb_color(cterm_normal_fg_gui_color); |
|
8977
b3da1ec8d156
commit https://github.com/vim/vim/commit/902647d2dfb42dce8449dfbbc22dab27a528744d
Christian Brabandt <cb@256bit.org>
parents:
8969
diff
changeset
|
8016 if (cterm_normal_bg_gui_color != (long_u)INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8017 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
|
8018 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8019 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8020 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8021 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8022 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8023 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8024 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8025 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8026 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
|
8027 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8028 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
|
8029 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8030 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8031 } |
| 7 | 8032 } |
| 8033 } | |
| 8034 } | |
| 8035 screen_attr = 0; | |
| 8036 } | |
| 8037 | |
| 8038 /* | |
| 8039 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8040 * The machine specific code may override this again. | |
| 8041 */ | |
| 8042 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8043 reset_cterm_colors(void) |
| 7 | 8044 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8045 if (IS_CTERM) |
| 7 | 8046 { |
| 8047 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8048 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8049 if (p_tgc ? |
|
8977
b3da1ec8d156
commit https://github.com/vim/vim/commit/902647d2dfb42dce8449dfbbc22dab27a528744d
Christian Brabandt <cb@256bit.org>
parents:
8969
diff
changeset
|
8050 (cterm_normal_fg_gui_color != (long_u)INVALCOLOR |
|
b3da1ec8d156
commit https://github.com/vim/vim/commit/902647d2dfb42dce8449dfbbc22dab27a528744d
Christian Brabandt <cb@256bit.org>
parents:
8969
diff
changeset
|
8051 || cterm_normal_bg_gui_color != (long_u)INVALCOLOR): |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8052 (cterm_normal_fg_color > 0 || cterm_normal_bg_color > 0)) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8053 #else |
| 7 | 8054 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
|
8055 #endif |
| 7 | 8056 { |
| 8057 out_str(T_OP); | |
| 8058 screen_attr = -1; | |
| 8059 } | |
| 8060 if (cterm_normal_fg_bold) | |
| 8061 { | |
| 8062 out_str(T_ME); | |
| 8063 screen_attr = -1; | |
| 8064 } | |
| 8065 } | |
| 8066 } | |
| 8067 | |
| 8068 /* | |
| 8069 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8070 * using the attributes from ScreenAttrs["off"]. | |
| 8071 */ | |
| 8072 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8073 screen_char(unsigned off, int row, int col) |
| 7 | 8074 { |
| 8075 int attr; | |
| 8076 | |
| 8077 /* Check for illegal values, just in case (could happen just after | |
| 8078 * resizing). */ | |
| 8079 if (row >= screen_Rows || col >= screen_Columns) | |
| 8080 return; | |
| 8081 | |
| 6602 | 8082 /* Outputting a character in the last cell on the screen may scroll the |
| 8083 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8084 * mark the character invalid (update it when scrolled up). */ | |
| 8085 if (*T_XN == NUL | |
| 8086 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8087 #ifdef FEAT_RIGHTLEFT |
| 8088 /* account for first command-line character in rightleft mode */ | |
| 8089 && !cmdmsg_rl | |
| 8090 #endif | |
| 8091 ) | |
| 8092 { | |
| 8093 ScreenAttrs[off] = (sattr_T)-1; | |
| 8094 return; | |
| 8095 } | |
| 8096 | |
| 8097 /* | |
| 8098 * Stop highlighting first, so it's easier to move the cursor. | |
| 8099 */ | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8100 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) |
| 7 | 8101 if (screen_char_attr != 0) |
| 8102 attr = screen_char_attr; | |
| 8103 else | |
| 8104 #endif | |
| 8105 attr = ScreenAttrs[off]; | |
| 8106 if (screen_attr != attr) | |
| 8107 screen_stop_highlight(); | |
| 8108 | |
| 8109 windgoto(row, col); | |
| 8110 | |
| 8111 if (screen_attr != attr) | |
| 8112 screen_start_highlight(attr); | |
| 8113 | |
| 8114 #ifdef FEAT_MBYTE | |
| 8115 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8116 { | |
| 8117 char_u buf[MB_MAXBYTES + 1]; | |
| 8118 | |
| 8119 /* Convert UTF-8 character to bytes and write it. */ | |
| 8120 | |
| 8121 buf[utfc_char2bytes(off, buf)] = NUL; | |
| 8122 | |
| 8123 out_str(buf); | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8124 if (utf_ambiguous_width(ScreenLinesUC[off])) |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8125 screen_cur_col = 9999; |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8126 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8127 ++screen_cur_col; |
| 8128 } | |
| 8129 else | |
| 8130 #endif | |
| 8131 { | |
| 8132 #ifdef FEAT_MBYTE | |
| 8133 out_flush_check(); | |
| 8134 #endif | |
| 8135 out_char(ScreenLines[off]); | |
| 8136 #ifdef FEAT_MBYTE | |
| 8137 /* double-byte character in single-width cell */ | |
| 8138 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8139 out_char(ScreenLines2[off]); | |
| 8140 #endif | |
| 8141 } | |
| 8142 | |
| 8143 screen_cur_col++; | |
| 8144 } | |
| 8145 | |
| 8146 #ifdef FEAT_MBYTE | |
| 8147 | |
| 8148 /* | |
| 8149 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8150 * on the screen at position 'row' and 'col'. | |
| 8151 * The attributes of the first byte is used for all. This is required to | |
| 8152 * output the two bytes of a double-byte character with nothing in between. | |
| 8153 */ | |
| 8154 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8155 screen_char_2(unsigned off, int row, int col) |
| 7 | 8156 { |
| 8157 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8158 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8159 return; | |
| 8160 | |
| 8161 /* Outputting the last character on the screen may scrollup the screen. | |
| 8162 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8163 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8164 { | |
| 8165 ScreenAttrs[off] = (sattr_T)-1; | |
| 8166 return; | |
| 8167 } | |
| 8168 | |
| 8169 /* Output the first byte normally (positions the cursor), then write the | |
| 8170 * second byte directly. */ | |
| 8171 screen_char(off, row, col); | |
| 8172 out_char(ScreenLines[off + 1]); | |
| 8173 ++screen_cur_col; | |
| 8174 } | |
| 8175 #endif | |
| 8176 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8177 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) || defined(PROTO) |
| 7 | 8178 /* |
| 8179 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8180 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8181 */ | |
| 8182 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8183 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8184 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8185 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8186 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8187 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8188 int invert) |
| 7 | 8189 { |
| 8190 int r, c; | |
| 8191 int off; | |
| 1378 | 8192 #ifdef FEAT_MBYTE |
| 8193 int max_off; | |
| 8194 #endif | |
| 7 | 8195 |
| 534 | 8196 /* Can't use ScreenLines unless initialized */ |
| 8197 if (ScreenLines == NULL) | |
| 8198 return; | |
| 8199 | |
| 7 | 8200 if (invert) |
| 8201 screen_char_attr = HL_INVERSE; | |
| 8202 for (r = row; r < row + height; ++r) | |
| 8203 { | |
| 8204 off = LineOffset[r]; | |
| 1378 | 8205 #ifdef FEAT_MBYTE |
| 8206 max_off = off + screen_Columns; | |
| 8207 #endif | |
| 7 | 8208 for (c = col; c < col + width; ++c) |
| 8209 { | |
| 8210 #ifdef FEAT_MBYTE | |
| 1378 | 8211 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8212 { |
| 8213 screen_char_2(off + c, r, c); | |
| 8214 ++c; | |
| 8215 } | |
| 8216 else | |
| 8217 #endif | |
| 8218 { | |
| 8219 screen_char(off + c, r, c); | |
| 8220 #ifdef FEAT_MBYTE | |
| 1378 | 8221 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8222 ++c; |
| 8223 #endif | |
| 8224 } | |
| 8225 } | |
| 8226 } | |
| 8227 screen_char_attr = 0; | |
| 8228 } | |
| 8229 #endif | |
| 8230 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8231 #ifdef FEAT_WINDOWS |
| 7 | 8232 /* |
| 8233 * Redraw the characters for a vertically split window. | |
| 8234 */ | |
| 8235 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8236 redraw_block(int row, int end, win_T *wp) |
| 7 | 8237 { |
| 8238 int col; | |
| 8239 int width; | |
| 8240 | |
| 8241 # ifdef FEAT_CLIPBOARD | |
| 8242 clip_may_clear_selection(row, end - 1); | |
| 8243 # endif | |
| 8244 | |
| 8245 if (wp == NULL) | |
| 8246 { | |
| 8247 col = 0; | |
| 8248 width = Columns; | |
| 8249 } | |
| 8250 else | |
| 8251 { | |
| 8252 col = wp->w_wincol; | |
| 8253 width = wp->w_width; | |
| 8254 } | |
| 8255 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8256 } | |
| 8257 #endif | |
| 8258 | |
| 8259 /* | |
| 8260 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8261 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8262 * Use attributes 'attr'. | |
| 8263 */ | |
| 8264 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8265 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8266 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8267 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8268 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8269 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8270 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8271 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8272 int attr) |
| 7 | 8273 { |
| 8274 int row; | |
| 8275 int col; | |
| 8276 int off; | |
| 8277 int end_off; | |
| 8278 int did_delete; | |
| 8279 int c; | |
| 8280 int norm_term; | |
| 8281 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8282 int force_next = FALSE; | |
| 8283 #endif | |
| 8284 | |
| 8285 if (end_row > screen_Rows) /* safety check */ | |
| 8286 end_row = screen_Rows; | |
| 8287 if (end_col > screen_Columns) /* safety check */ | |
| 8288 end_col = screen_Columns; | |
| 8289 if (ScreenLines == NULL | |
| 8290 || start_row >= end_row | |
| 8291 || start_col >= end_col) /* nothing to do */ | |
| 8292 return; | |
| 8293 | |
| 8294 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8295 norm_term = ( | |
| 8296 #ifdef FEAT_GUI | |
| 8297 !gui.in_use && | |
| 8298 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8299 !IS_CTERM); |
| 7 | 8300 for (row = start_row; row < end_row; ++row) |
| 8301 { | |
| 1668 | 8302 #ifdef FEAT_MBYTE |
| 8303 if (has_mbyte | |
| 8304 # ifdef FEAT_GUI | |
| 8305 && !gui.in_use | |
| 8306 # endif | |
| 8307 ) | |
| 8308 { | |
| 8309 /* When drawing over the right halve of a double-wide char clear | |
| 8310 * out the left halve. When drawing over the left halve of a | |
| 8311 * double wide-char clear out the right halve. Only needed in a | |
| 8312 * terminal. */ | |
| 1685 | 8313 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8314 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8315 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8316 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8317 } |
| 8318 #endif | |
| 7 | 8319 /* |
| 8320 * Try to use delete-line termcap code, when no attributes or in a | |
| 8321 * "normal" terminal, where a bold/italic space is just a | |
| 8322 * space. | |
| 8323 */ | |
| 8324 did_delete = FALSE; | |
| 8325 if (c2 == ' ' | |
| 8326 && end_col == Columns | |
| 8327 && can_clear(T_CE) | |
| 8328 && (attr == 0 | |
| 8329 || (norm_term | |
| 8330 && attr <= HL_ALL | |
| 8331 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8332 { | |
| 8333 /* | |
| 8334 * check if we really need to clear something | |
| 8335 */ | |
| 8336 col = start_col; | |
| 8337 if (c1 != ' ') /* don't clear first char */ | |
| 8338 ++col; | |
| 8339 | |
| 8340 off = LineOffset[row] + col; | |
| 8341 end_off = LineOffset[row] + end_col; | |
| 8342 | |
| 8343 /* skip blanks (used often, keep it fast!) */ | |
| 8344 #ifdef FEAT_MBYTE | |
| 8345 if (enc_utf8) | |
| 8346 while (off < end_off && ScreenLines[off] == ' ' | |
| 8347 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8348 ++off; | |
| 8349 else | |
| 8350 #endif | |
| 8351 while (off < end_off && ScreenLines[off] == ' ' | |
| 8352 && ScreenAttrs[off] == 0) | |
| 8353 ++off; | |
| 8354 if (off < end_off) /* something to be cleared */ | |
| 8355 { | |
| 8356 col = off - LineOffset[row]; | |
| 8357 screen_stop_highlight(); | |
| 8358 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8359 out_str(T_CE); | |
| 8360 screen_start(); /* don't know where cursor is now */ | |
| 8361 col = end_col - col; | |
| 8362 while (col--) /* clear chars in ScreenLines */ | |
| 8363 { | |
| 8364 ScreenLines[off] = ' '; | |
| 8365 #ifdef FEAT_MBYTE | |
| 8366 if (enc_utf8) | |
| 8367 ScreenLinesUC[off] = 0; | |
| 8368 #endif | |
| 8369 ScreenAttrs[off] = 0; | |
| 8370 ++off; | |
| 8371 } | |
| 8372 } | |
| 8373 did_delete = TRUE; /* the chars are cleared now */ | |
| 8374 } | |
| 8375 | |
| 8376 off = LineOffset[row] + start_col; | |
| 8377 c = c1; | |
| 8378 for (col = start_col; col < end_col; ++col) | |
| 8379 { | |
| 8380 if (ScreenLines[off] != c | |
| 8381 #ifdef FEAT_MBYTE | |
| 714 | 8382 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8383 != (c >= 0x80 ? c : 0)) | |
| 7 | 8384 #endif |
| 8385 || ScreenAttrs[off] != attr | |
| 8386 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8387 || force_next | |
| 8388 #endif | |
| 8389 ) | |
| 8390 { | |
| 8391 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8392 /* The bold trick may make a single row of pixels appear in | |
| 8393 * the next character. When a bold character is removed, the | |
| 8394 * next character should be redrawn too. This happens for our | |
| 8395 * own GUI and for some xterms. */ | |
| 8396 if ( | |
| 8397 # ifdef FEAT_GUI | |
| 8398 gui.in_use | |
| 8399 # endif | |
| 8400 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8401 || | |
| 8402 # endif | |
| 8403 # ifdef UNIX | |
| 8404 term_is_xterm | |
| 8405 # endif | |
| 8406 ) | |
| 8407 { | |
| 8408 if (ScreenLines[off] != ' ' | |
| 8409 && (ScreenAttrs[off] > HL_ALL | |
| 8410 || ScreenAttrs[off] & HL_BOLD)) | |
| 8411 force_next = TRUE; | |
| 8412 else | |
| 8413 force_next = FALSE; | |
| 8414 } | |
| 8415 #endif | |
| 8416 ScreenLines[off] = c; | |
| 8417 #ifdef FEAT_MBYTE | |
| 8418 if (enc_utf8) | |
| 8419 { | |
| 8420 if (c >= 0x80) | |
| 8421 { | |
| 8422 ScreenLinesUC[off] = c; | |
| 714 | 8423 ScreenLinesC[0][off] = 0; |
| 7 | 8424 } |
| 8425 else | |
| 8426 ScreenLinesUC[off] = 0; | |
| 8427 } | |
| 8428 #endif | |
| 8429 ScreenAttrs[off] = attr; | |
| 8430 if (!did_delete || c != ' ') | |
| 8431 screen_char(off, row, col); | |
| 8432 } | |
| 8433 ++off; | |
| 8434 if (col == start_col) | |
| 8435 { | |
| 8436 if (did_delete) | |
| 8437 break; | |
| 8438 c = c2; | |
| 8439 } | |
| 8440 } | |
| 8441 if (end_col == Columns) | |
| 8442 LineWraps[row] = FALSE; | |
| 8443 if (row == Rows - 1) /* overwritten the command line */ | |
| 8444 { | |
| 8445 redraw_cmdline = TRUE; | |
| 8446 if (c1 == ' ' && c2 == ' ') | |
| 8447 clear_cmdline = FALSE; /* command line has been cleared */ | |
| 644 | 8448 if (start_col == 0) |
| 8449 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8450 } |
| 8451 } | |
| 8452 } | |
| 8453 | |
| 8454 /* | |
| 8455 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8456 * screen or the command line. | |
| 8457 */ | |
| 8458 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8459 check_for_delay(int check_msg_scroll) |
| 7 | 8460 { |
| 8461 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8462 && !did_wait_return | |
| 8463 && emsg_silent == 0) | |
| 8464 { | |
| 8465 out_flush(); | |
| 8466 ui_delay(1000L, TRUE); | |
| 8467 emsg_on_display = FALSE; | |
| 8468 if (check_msg_scroll) | |
| 8469 msg_scroll = FALSE; | |
| 8470 } | |
| 8471 } | |
| 8472 | |
| 8473 /* | |
| 8474 * screen_valid - allocate screen buffers if size changed | |
| 3263 | 8475 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8476 * Returns TRUE if there is a valid screen to write to. |
| 8477 * Returns FALSE when starting up and screen not initialized yet. | |
| 8478 */ | |
| 8479 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8480 screen_valid(int doclear) |
| 7 | 8481 { |
| 3263 | 8482 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8483 return (ScreenLines != NULL); |
| 8484 } | |
| 8485 | |
| 8486 /* | |
| 8487 * Resize the shell to Rows and Columns. | |
| 8488 * Allocate ScreenLines[] and associated items. | |
| 8489 * | |
| 8490 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8491 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8492 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8493 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8494 * final size of the shell is needed. | |
| 8495 */ | |
| 8496 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8497 screenalloc(int doclear) |
| 7 | 8498 { |
| 8499 int new_row, old_row; | |
| 8500 #ifdef FEAT_GUI | |
| 8501 int old_Rows; | |
| 8502 #endif | |
| 8503 win_T *wp; | |
| 8504 int outofmem = FALSE; | |
| 8505 int len; | |
| 8506 schar_T *new_ScreenLines; | |
| 8507 #ifdef FEAT_MBYTE | |
| 8508 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8509 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8510 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8511 int i; |
| 7 | 8512 #endif |
| 8513 sattr_T *new_ScreenAttrs; | |
| 8514 unsigned *new_LineOffset; | |
| 8515 char_u *new_LineWraps; | |
| 671 | 8516 #ifdef FEAT_WINDOWS |
| 681 | 8517 short *new_TabPageIdxs; |
| 671 | 8518 tabpage_T *tp; |
| 8519 #endif | |
| 7 | 8520 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8521 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8522 #ifdef FEAT_AUTOCMD |
| 8523 int retry_count = 0; | |
| 8524 | |
| 8525 retry: | |
| 8526 #endif | |
| 7 | 8527 /* |
| 8528 * Allocation of the screen buffers is done only when the size changes and | |
| 8529 * when Rows and Columns have been set and we have started doing full | |
| 8530 * screen stuff. | |
| 8531 */ | |
| 8532 if ((ScreenLines != NULL | |
| 8533 && Rows == screen_Rows | |
| 8534 && Columns == screen_Columns | |
| 8535 #ifdef FEAT_MBYTE | |
| 8536 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8537 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
| 714 | 8538 && p_mco == Screen_mco |
| 7 | 8539 #endif |
| 8540 ) | |
| 8541 || Rows == 0 | |
| 8542 || Columns == 0 | |
| 8543 || (!full_screen && ScreenLines == NULL)) | |
| 8544 return; | |
| 8545 | |
| 8546 /* | |
| 8547 * It's possible that we produce an out-of-memory message below, which | |
| 8548 * will cause this function to be called again. To break the loop, just | |
| 8549 * return here. | |
| 8550 */ | |
| 8551 if (entered) | |
| 8552 return; | |
| 8553 entered = TRUE; | |
| 8554 | |
| 911 | 8555 /* |
| 8556 * Note that the window sizes are updated before reallocating the arrays, | |
| 8557 * thus we must not redraw here! | |
| 8558 */ | |
| 8559 ++RedrawingDisabled; | |
| 8560 | |
| 7 | 8561 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8562 | |
| 8563 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8564 | |
| 8565 /* | |
| 8566 * We're changing the size of the screen. | |
| 8567 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8568 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8569 * lines (unless the screen is going to be cleared). | |
| 8570 * - Free the old arrays. | |
| 8571 * | |
| 8572 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8573 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8574 * size is wrong. | |
| 8575 */ | |
| 671 | 8576 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8577 win_free_lsize(wp); |
| 1946 | 8578 #ifdef FEAT_AUTOCMD |
| 8579 if (aucmd_win != NULL) | |
| 8580 win_free_lsize(aucmd_win); | |
| 8581 #endif | |
| 7 | 8582 |
| 8583 new_ScreenLines = (schar_T *)lalloc((long_u)( | |
| 8584 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8585 #ifdef FEAT_MBYTE | |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
8586 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8587 if (enc_utf8) |
| 8588 { | |
| 8589 new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( | |
| 8590 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); | |
| 714 | 8591 for (i = 0; i < p_mco; ++i) |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
8592 new_ScreenLinesC[i] = (u8char_T *)lalloc_clear((long_u)( |
| 7 | 8593 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); |
| 8594 } | |
| 8595 if (enc_dbcs == DBCS_JPNU) | |
| 8596 new_ScreenLines2 = (schar_T *)lalloc((long_u)( | |
| 8597 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8598 #endif | |
| 8599 new_ScreenAttrs = (sattr_T *)lalloc((long_u)( | |
| 8600 (Rows + 1) * Columns * sizeof(sattr_T)), FALSE); | |
| 8601 new_LineOffset = (unsigned *)lalloc((long_u)( | |
| 8602 Rows * sizeof(unsigned)), FALSE); | |
| 8603 new_LineWraps = (char_u *)lalloc((long_u)(Rows * sizeof(char_u)), FALSE); | |
| 671 | 8604 #ifdef FEAT_WINDOWS |
| 681 | 8605 new_TabPageIdxs = (short *)lalloc((long_u)(Columns * sizeof(short)), FALSE); |
| 671 | 8606 #endif |
| 7 | 8607 |
| 677 | 8608 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8609 { |
| 8610 if (win_alloc_lines(wp) == FAIL) | |
| 8611 { | |
| 8612 outofmem = TRUE; | |
| 8613 #ifdef FEAT_WINDOWS | |
| 1819 | 8614 goto give_up; |
| 8615 #endif | |
| 8616 } | |
| 8617 } | |
| 1906 | 8618 #ifdef FEAT_AUTOCMD |
| 1946 | 8619 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8620 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8621 outofmem = TRUE; |
| 8622 #endif | |
| 1819 | 8623 #ifdef FEAT_WINDOWS |
| 8624 give_up: | |
| 8625 #endif | |
| 7 | 8626 |
| 714 | 8627 #ifdef FEAT_MBYTE |
| 8628 for (i = 0; i < p_mco; ++i) | |
| 8629 if (new_ScreenLinesC[i] == NULL) | |
| 8630 break; | |
| 8631 #endif | |
| 7 | 8632 if (new_ScreenLines == NULL |
| 8633 #ifdef FEAT_MBYTE | |
| 714 | 8634 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8635 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8636 #endif | |
| 8637 || new_ScreenAttrs == NULL | |
| 8638 || new_LineOffset == NULL | |
| 8639 || new_LineWraps == NULL | |
| 671 | 8640 #ifdef FEAT_WINDOWS |
| 8641 || new_TabPageIdxs == NULL | |
| 8642 #endif | |
| 7 | 8643 || outofmem) |
| 8644 { | |
| 944 | 8645 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8646 { |
| 8647 /* guess the size */ | |
| 8648 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8649 | |
| 8650 /* Remember we did this to avoid getting outofmem messages over | |
| 8651 * and over again. */ | |
| 944 | 8652 done_outofmem_msg = TRUE; |
| 534 | 8653 } |
| 7 | 8654 vim_free(new_ScreenLines); |
| 8655 new_ScreenLines = NULL; | |
| 8656 #ifdef FEAT_MBYTE | |
| 8657 vim_free(new_ScreenLinesUC); | |
| 8658 new_ScreenLinesUC = NULL; | |
| 714 | 8659 for (i = 0; i < p_mco; ++i) |
| 8660 { | |
| 8661 vim_free(new_ScreenLinesC[i]); | |
| 8662 new_ScreenLinesC[i] = NULL; | |
| 8663 } | |
| 7 | 8664 vim_free(new_ScreenLines2); |
| 8665 new_ScreenLines2 = NULL; | |
| 8666 #endif | |
| 8667 vim_free(new_ScreenAttrs); | |
| 8668 new_ScreenAttrs = NULL; | |
| 8669 vim_free(new_LineOffset); | |
| 8670 new_LineOffset = NULL; | |
| 8671 vim_free(new_LineWraps); | |
| 8672 new_LineWraps = NULL; | |
| 671 | 8673 #ifdef FEAT_WINDOWS |
| 8674 vim_free(new_TabPageIdxs); | |
| 8675 new_TabPageIdxs = NULL; | |
| 8676 #endif | |
| 7 | 8677 } |
| 8678 else | |
| 8679 { | |
| 944 | 8680 done_outofmem_msg = FALSE; |
| 534 | 8681 |
| 7 | 8682 for (new_row = 0; new_row < Rows; ++new_row) |
| 8683 { | |
| 8684 new_LineOffset[new_row] = new_row * Columns; | |
| 8685 new_LineWraps[new_row] = FALSE; | |
| 8686 | |
| 8687 /* | |
| 8688 * If the screen is not going to be cleared, copy as much as | |
| 8689 * possible from the old screen to the new one and clear the rest | |
| 8690 * (used when resizing the window at the "--more--" prompt or when | |
| 8691 * executing an external command, for the GUI). | |
| 8692 */ | |
| 3263 | 8693 if (!doclear) |
| 7 | 8694 { |
| 8695 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 8696 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 8697 #ifdef FEAT_MBYTE | |
| 8698 if (enc_utf8) | |
| 8699 { | |
| 8700 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 8701 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 8702 for (i = 0; i < p_mco; ++i) |
| 8703 (void)vim_memset(new_ScreenLinesC[i] | |
| 8704 + new_row * Columns, | |
| 7 | 8705 0, (size_t)Columns * sizeof(u8char_T)); |
| 8706 } | |
| 8707 if (enc_dbcs == DBCS_JPNU) | |
| 8708 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 8709 0, (size_t)Columns * sizeof(schar_T)); | |
| 8710 #endif | |
| 8711 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 8712 0, (size_t)Columns * sizeof(sattr_T)); | |
| 8713 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 8714 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 8715 { |
| 8716 if (screen_Columns < Columns) | |
| 8717 len = screen_Columns; | |
| 8718 else | |
| 8719 len = Columns; | |
| 26 | 8720 #ifdef FEAT_MBYTE |
| 571 | 8721 /* When switching to utf-8 don't copy characters, they |
| 714 | 8722 * may be invalid now. Also when p_mco changes. */ |
| 8723 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 8724 && p_mco == Screen_mco) | |
| 26 | 8725 #endif |
| 8726 mch_memmove(new_ScreenLines + new_LineOffset[new_row], | |
| 8727 ScreenLines + LineOffset[old_row], | |
| 8728 (size_t)len * sizeof(schar_T)); | |
| 7 | 8729 #ifdef FEAT_MBYTE |
| 714 | 8730 if (enc_utf8 && ScreenLinesUC != NULL |
| 8731 && p_mco == Screen_mco) | |
| 7 | 8732 { |
| 8733 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 8734 ScreenLinesUC + LineOffset[old_row], | |
| 8735 (size_t)len * sizeof(u8char_T)); | |
| 714 | 8736 for (i = 0; i < p_mco; ++i) |
| 8737 mch_memmove(new_ScreenLinesC[i] | |
| 8738 + new_LineOffset[new_row], | |
| 8739 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 8740 (size_t)len * sizeof(u8char_T)); |
| 8741 } | |
| 8742 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 8743 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 8744 ScreenLines2 + LineOffset[old_row], | |
| 8745 (size_t)len * sizeof(schar_T)); | |
| 8746 #endif | |
| 8747 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 8748 ScreenAttrs + LineOffset[old_row], | |
| 8749 (size_t)len * sizeof(sattr_T)); | |
| 8750 } | |
| 8751 } | |
| 8752 } | |
| 8753 /* Use the last line of the screen for the current line. */ | |
| 8754 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 8755 } | |
| 8756 | |
| 356 | 8757 free_screenlines(); |
| 8758 | |
| 7 | 8759 ScreenLines = new_ScreenLines; |
| 8760 #ifdef FEAT_MBYTE | |
| 8761 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 8762 for (i = 0; i < p_mco; ++i) |
| 8763 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 8764 Screen_mco = p_mco; | |
| 7 | 8765 ScreenLines2 = new_ScreenLines2; |
| 8766 #endif | |
| 8767 ScreenAttrs = new_ScreenAttrs; | |
| 8768 LineOffset = new_LineOffset; | |
| 8769 LineWraps = new_LineWraps; | |
| 671 | 8770 #ifdef FEAT_WINDOWS |
| 8771 TabPageIdxs = new_TabPageIdxs; | |
| 8772 #endif | |
| 7 | 8773 |
| 8774 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 8775 * size of ScreenLines[]. Set them before calling anything. */ | |
| 8776 #ifdef FEAT_GUI | |
| 8777 old_Rows = screen_Rows; | |
| 8778 #endif | |
| 8779 screen_Rows = Rows; | |
| 8780 screen_Columns = Columns; | |
| 8781 | |
| 8782 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 8783 if (doclear) |
| 7 | 8784 screenclear2(); |
| 8785 | |
| 8786 #ifdef FEAT_GUI | |
| 8787 else if (gui.in_use | |
| 8788 && !gui.starting | |
| 8789 && ScreenLines != NULL | |
| 8790 && old_Rows != Rows) | |
| 8791 { | |
| 8792 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 8793 /* | |
| 8794 * Adjust the position of the cursor, for when executing an external | |
| 8795 * command. | |
| 8796 */ | |
| 8797 if (msg_row >= Rows) /* Rows got smaller */ | |
| 8798 msg_row = Rows - 1; /* put cursor at last row */ | |
| 8799 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 8800 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 8801 if (msg_col >= Columns) /* Columns got smaller */ | |
| 8802 msg_col = Columns - 1; /* put cursor at last column */ | |
| 8803 } | |
| 8804 #endif | |
| 8805 | |
| 8806 entered = FALSE; | |
| 911 | 8807 --RedrawingDisabled; |
| 766 | 8808 |
| 8809 #ifdef FEAT_AUTOCMD | |
| 1824 | 8810 /* |
| 8811 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 8812 * in case applying autocommands always changes Rows or Columns. | |
| 8813 */ | |
| 8814 if (starting == 0 && ++retry_count <= 3) | |
| 8815 { | |
| 766 | 8816 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 8817 /* In rare cases, autocommands may have altered Rows or Columns, |
| 8818 * jump back to check if we need to allocate the screen again. */ | |
| 8819 goto retry; | |
| 8820 } | |
| 766 | 8821 #endif |
| 7 | 8822 } |
| 8823 | |
| 8824 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8825 free_screenlines(void) |
| 356 | 8826 { |
| 8827 #ifdef FEAT_MBYTE | |
| 714 | 8828 int i; |
| 8829 | |
| 356 | 8830 vim_free(ScreenLinesUC); |
| 714 | 8831 for (i = 0; i < Screen_mco; ++i) |
| 8832 vim_free(ScreenLinesC[i]); | |
| 356 | 8833 vim_free(ScreenLines2); |
| 8834 #endif | |
| 714 | 8835 vim_free(ScreenLines); |
| 356 | 8836 vim_free(ScreenAttrs); |
| 8837 vim_free(LineOffset); | |
| 8838 vim_free(LineWraps); | |
| 671 | 8839 #ifdef FEAT_WINDOWS |
| 8840 vim_free(TabPageIdxs); | |
| 8841 #endif | |
| 356 | 8842 } |
| 8843 | |
| 8844 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8845 screenclear(void) |
| 7 | 8846 { |
| 8847 check_for_delay(FALSE); | |
| 8848 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 8849 screenclear2(); /* clear the screen */ | |
| 8850 } | |
| 8851 | |
| 8852 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8853 screenclear2(void) |
| 7 | 8854 { |
| 8855 int i; | |
| 8856 | |
| 8857 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 8858 #ifdef FEAT_GUI | |
| 8859 || (gui.in_use && gui.starting) | |
| 8860 #endif | |
| 8861 ) | |
| 8862 return; | |
| 8863 | |
| 8864 #ifdef FEAT_GUI | |
| 8865 if (!gui.in_use) | |
| 8866 #endif | |
| 8867 screen_attr = -1; /* force setting the Normal colors */ | |
| 8868 screen_stop_highlight(); /* don't want highlighting here */ | |
| 8869 | |
| 8870 #ifdef FEAT_CLIPBOARD | |
| 8871 /* disable selection without redrawing it */ | |
| 8872 clip_scroll_selection(9999); | |
| 8873 #endif | |
| 8874 | |
| 8875 /* blank out ScreenLines */ | |
| 8876 for (i = 0; i < Rows; ++i) | |
| 8877 { | |
| 8878 lineclear(LineOffset[i], (int)Columns); | |
| 8879 LineWraps[i] = FALSE; | |
| 8880 } | |
| 8881 | |
| 8882 if (can_clear(T_CL)) | |
| 8883 { | |
| 8884 out_str(T_CL); /* clear the display */ | |
| 8885 clear_cmdline = FALSE; | |
| 644 | 8886 mode_displayed = FALSE; |
| 7 | 8887 } |
| 8888 else | |
| 8889 { | |
| 8890 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 8891 for (i = 0; i < Rows; ++i) | |
| 8892 lineinvalid(LineOffset[i], (int)Columns); | |
| 8893 clear_cmdline = TRUE; | |
| 8894 } | |
| 8895 | |
| 8896 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 8897 | |
| 8898 win_rest_invalid(firstwin); | |
| 8899 redraw_cmdline = TRUE; | |
| 670 | 8900 #ifdef FEAT_WINDOWS |
| 673 | 8901 redraw_tabline = TRUE; |
| 670 | 8902 #endif |
| 7 | 8903 if (must_redraw == CLEAR) /* no need to clear again */ |
| 8904 must_redraw = NOT_VALID; | |
| 8905 compute_cmdrow(); | |
| 8906 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 8907 msg_col = 0; | |
| 8908 screen_start(); /* don't know where cursor is now */ | |
| 8909 msg_scrolled = 0; /* can't scroll back */ | |
| 8910 msg_didany = FALSE; | |
| 8911 msg_didout = FALSE; | |
| 8912 } | |
| 8913 | |
| 8914 /* | |
| 8915 * Clear one line in ScreenLines. | |
| 8916 */ | |
| 8917 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8918 lineclear(unsigned off, int width) |
| 7 | 8919 { |
| 8920 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 8921 #ifdef FEAT_MBYTE | |
| 8922 if (enc_utf8) | |
| 8923 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 8924 (size_t)width * sizeof(u8char_T)); | |
| 8925 #endif | |
| 8926 (void)vim_memset(ScreenAttrs + off, 0, (size_t)width * sizeof(sattr_T)); | |
| 8927 } | |
| 8928 | |
| 8929 /* | |
| 8930 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 8931 * invalid value. | |
| 8932 */ | |
| 8933 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8934 lineinvalid(unsigned off, int width) |
| 7 | 8935 { |
| 8936 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 8937 } | |
| 8938 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8939 #ifdef FEAT_WINDOWS |
| 7 | 8940 /* |
| 8941 * Copy part of a Screenline for vertically split window "wp". | |
| 8942 */ | |
| 8943 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8944 linecopy(int to, int from, win_T *wp) |
| 7 | 8945 { |
| 8946 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 8947 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 8948 | |
| 8949 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 8950 wp->w_width * sizeof(schar_T)); | |
| 8951 # ifdef FEAT_MBYTE | |
| 8952 if (enc_utf8) | |
| 8953 { | |
| 714 | 8954 int i; |
| 8955 | |
| 7 | 8956 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 8957 wp->w_width * sizeof(u8char_T)); | |
| 714 | 8958 for (i = 0; i < p_mco; ++i) |
| 8959 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 8960 wp->w_width * sizeof(u8char_T)); | |
| 7 | 8961 } |
| 8962 if (enc_dbcs == DBCS_JPNU) | |
| 8963 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 8964 wp->w_width * sizeof(schar_T)); | |
| 8965 # endif | |
| 8966 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 8967 wp->w_width * sizeof(sattr_T)); | |
| 8968 } | |
| 8969 #endif | |
| 8970 | |
| 8971 /* | |
| 8972 * Return TRUE if clearing with term string "p" would work. | |
| 8973 * It can't work when the string is empty or it won't set the right background. | |
| 8974 */ | |
| 8975 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8976 can_clear(char_u *p) |
| 7 | 8977 { |
| 8978 return (*p != NUL && (t_colors <= 1 | |
| 8979 #ifdef FEAT_GUI | |
| 8980 || gui.in_use | |
| 8981 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8982 #ifdef FEAT_TERMGUICOLORS |
|
9320
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
8983 || (p_tgc && cterm_normal_bg_gui_color == (long_u)INVALCOLOR) |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
8984 || (!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
|
8985 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
8986 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
8987 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
8988 || *T_UT != NUL)); |
| 7 | 8989 } |
| 8990 | |
| 8991 /* | |
| 8992 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 8993 * something directly to the screen (shell commands) or a terminal control | |
| 8994 * code. | |
| 8995 */ | |
| 8996 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8997 screen_start(void) |
| 7 | 8998 { |
| 8999 screen_cur_row = screen_cur_col = 9999; | |
| 9000 } | |
| 9001 | |
| 9002 /* | |
| 9003 * Move the cursor to position "row","col" in the screen. | |
| 9004 * This tries to find the most efficient way to move, minimizing the number of | |
| 9005 * characters sent to the terminal. | |
| 9006 */ | |
| 9007 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9008 windgoto(int row, int col) |
| 7 | 9009 { |
| 205 | 9010 sattr_T *p; |
| 7 | 9011 int i; |
| 9012 int plan; | |
| 9013 int cost; | |
| 9014 int wouldbe_col; | |
| 9015 int noinvcurs; | |
| 9016 char_u *bs; | |
| 9017 int goto_cost; | |
| 9018 int attr; | |
| 9019 | |
| 1213 | 9020 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9021 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9022 | |
| 9023 #define PLAN_LE 1 | |
| 9024 #define PLAN_CR 2 | |
| 9025 #define PLAN_NL 3 | |
| 9026 #define PLAN_WRITE 4 | |
| 9027 /* Can't use ScreenLines unless initialized */ | |
| 9028 if (ScreenLines == NULL) | |
| 9029 return; | |
| 9030 | |
| 9031 if (col != screen_cur_col || row != screen_cur_row) | |
| 9032 { | |
| 9033 /* Check for valid position. */ | |
| 9034 if (row < 0) /* window without text lines? */ | |
| 9035 row = 0; | |
| 9036 if (row >= screen_Rows) | |
| 9037 row = screen_Rows - 1; | |
| 9038 if (col >= screen_Columns) | |
| 9039 col = screen_Columns - 1; | |
| 9040 | |
| 9041 /* check if no cursor movement is allowed in highlight mode */ | |
| 9042 if (screen_attr && *T_MS == NUL) | |
| 9043 noinvcurs = HIGHL_COST; | |
| 9044 else | |
| 9045 noinvcurs = 0; | |
| 9046 goto_cost = GOTO_COST + noinvcurs; | |
| 9047 | |
| 9048 /* | |
| 9049 * Plan how to do the positioning: | |
| 9050 * 1. Use CR to move it to column 0, same row. | |
| 9051 * 2. Use T_LE to move it a few columns to the left. | |
| 9052 * 3. Use NL to move a few lines down, column 0. | |
| 9053 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9054 * | |
| 9055 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9056 * position is unknown then (some terminals wrap, some don't ) | |
| 9057 * | |
| 1213 | 9058 * First check if the highlighting attributes allow us to write |
| 7 | 9059 * characters to move the cursor to the right. |
| 9060 */ | |
| 9061 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9062 { | |
| 9063 /* | |
| 9064 * If the cursor is in the same row, bigger col, we can use CR | |
| 9065 * or T_LE. | |
| 9066 */ | |
| 9067 bs = NULL; /* init for GCC */ | |
| 9068 attr = screen_attr; | |
| 9069 if (row == screen_cur_row && col < screen_cur_col) | |
| 9070 { | |
| 9071 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9072 if (*T_LE) | |
| 9073 bs = T_LE; /* "cursor left" */ | |
| 9074 else | |
| 9075 bs = T_BC; /* "backspace character (old) */ | |
| 9076 if (*bs) | |
| 9077 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9078 else | |
| 9079 cost = 999; | |
| 9080 if (col + 1 < cost) /* using CR is less characters */ | |
| 9081 { | |
| 9082 plan = PLAN_CR; | |
| 9083 wouldbe_col = 0; | |
| 9084 cost = 1; /* CR is just one character */ | |
| 9085 } | |
| 9086 else | |
| 9087 { | |
| 9088 plan = PLAN_LE; | |
| 9089 wouldbe_col = col; | |
| 9090 } | |
| 9091 if (noinvcurs) /* will stop highlighting */ | |
| 9092 { | |
| 9093 cost += noinvcurs; | |
| 9094 attr = 0; | |
| 9095 } | |
| 9096 } | |
| 9097 | |
| 9098 /* | |
| 9099 * If the cursor is above where we want to be, we can use CR LF. | |
| 9100 */ | |
| 9101 else if (row > screen_cur_row) | |
| 9102 { | |
| 9103 plan = PLAN_NL; | |
| 9104 wouldbe_col = 0; | |
| 9105 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9106 if (noinvcurs) /* will stop highlighting */ | |
| 9107 { | |
| 9108 cost += noinvcurs; | |
| 9109 attr = 0; | |
| 9110 } | |
| 9111 } | |
| 9112 | |
| 9113 /* | |
| 9114 * If the cursor is in the same row, smaller col, just use write. | |
| 9115 */ | |
| 9116 else | |
| 9117 { | |
| 9118 plan = PLAN_WRITE; | |
| 9119 wouldbe_col = screen_cur_col; | |
| 9120 cost = 0; | |
| 9121 } | |
| 9122 | |
| 9123 /* | |
| 9124 * Check if any characters that need to be written have the | |
| 9125 * correct attributes. Also avoid UTF-8 characters. | |
| 9126 */ | |
| 9127 i = col - wouldbe_col; | |
| 9128 if (i > 0) | |
| 9129 cost += i; | |
| 9130 if (cost < goto_cost && i > 0) | |
| 9131 { | |
| 9132 /* | |
| 9133 * Check if the attributes are correct without additionally | |
| 9134 * stopping highlighting. | |
| 9135 */ | |
| 9136 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9137 while (i && *p++ == attr) | |
| 9138 --i; | |
| 9139 if (i != 0) | |
| 9140 { | |
| 9141 /* | |
| 9142 * Try if it works when highlighting is stopped here. | |
| 9143 */ | |
| 9144 if (*--p == 0) | |
| 9145 { | |
| 9146 cost += noinvcurs; | |
| 9147 while (i && *p++ == 0) | |
| 9148 --i; | |
| 9149 } | |
| 9150 if (i != 0) | |
| 9151 cost = 999; /* different attributes, don't do it */ | |
| 9152 } | |
| 9153 #ifdef FEAT_MBYTE | |
| 9154 if (enc_utf8) | |
| 9155 { | |
| 9156 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9157 for (i = wouldbe_col; i < col; ++i) | |
| 9158 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9159 { | |
| 9160 cost = 999; | |
| 9161 break; | |
| 9162 } | |
| 9163 } | |
| 9164 #endif | |
| 9165 } | |
| 9166 | |
| 9167 /* | |
| 9168 * We can do it without term_windgoto()! | |
| 9169 */ | |
| 9170 if (cost < goto_cost) | |
| 9171 { | |
| 9172 if (plan == PLAN_LE) | |
| 9173 { | |
| 9174 if (noinvcurs) | |
| 9175 screen_stop_highlight(); | |
| 9176 while (screen_cur_col > col) | |
| 9177 { | |
| 9178 out_str(bs); | |
| 9179 --screen_cur_col; | |
| 9180 } | |
| 9181 } | |
| 9182 else if (plan == PLAN_CR) | |
| 9183 { | |
| 9184 if (noinvcurs) | |
| 9185 screen_stop_highlight(); | |
| 9186 out_char('\r'); | |
| 9187 screen_cur_col = 0; | |
| 9188 } | |
| 9189 else if (plan == PLAN_NL) | |
| 9190 { | |
| 9191 if (noinvcurs) | |
| 9192 screen_stop_highlight(); | |
| 9193 while (screen_cur_row < row) | |
| 9194 { | |
| 9195 out_char('\n'); | |
| 9196 ++screen_cur_row; | |
| 9197 } | |
| 9198 screen_cur_col = 0; | |
| 9199 } | |
| 9200 | |
| 9201 i = col - screen_cur_col; | |
| 9202 if (i > 0) | |
| 9203 { | |
| 9204 /* | |
| 9205 * Use cursor-right if it's one character only. Avoids | |
| 9206 * removing a line of pixels from the last bold char, when | |
| 9207 * using the bold trick in the GUI. | |
| 9208 */ | |
| 9209 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9210 { | |
| 9211 while (i-- > 0) | |
| 9212 out_char(*T_ND); | |
| 9213 } | |
| 9214 else | |
| 9215 { | |
| 9216 int off; | |
| 9217 | |
| 9218 off = LineOffset[row] + screen_cur_col; | |
| 9219 while (i-- > 0) | |
| 9220 { | |
| 9221 if (ScreenAttrs[off] != screen_attr) | |
| 9222 screen_stop_highlight(); | |
| 9223 #ifdef FEAT_MBYTE | |
| 9224 out_flush_check(); | |
| 9225 #endif | |
| 9226 out_char(ScreenLines[off]); | |
| 9227 #ifdef FEAT_MBYTE | |
| 9228 if (enc_dbcs == DBCS_JPNU | |
| 9229 && ScreenLines[off] == 0x8e) | |
| 9230 out_char(ScreenLines2[off]); | |
| 9231 #endif | |
| 9232 ++off; | |
| 9233 } | |
| 9234 } | |
| 9235 } | |
| 9236 } | |
| 9237 } | |
| 9238 else | |
| 9239 cost = 999; | |
| 9240 | |
| 9241 if (cost >= goto_cost) | |
| 9242 { | |
| 9243 if (noinvcurs) | |
| 9244 screen_stop_highlight(); | |
| 5995 | 9245 if (row == screen_cur_row && (col > screen_cur_col) |
| 9246 && *T_CRI != NUL) | |
| 7 | 9247 term_cursor_right(col - screen_cur_col); |
| 9248 else | |
| 9249 term_windgoto(row, col); | |
| 9250 } | |
| 9251 screen_cur_row = row; | |
| 9252 screen_cur_col = col; | |
| 9253 } | |
| 9254 } | |
| 9255 | |
| 9256 /* | |
| 9257 * Set cursor to its position in the current window. | |
| 9258 */ | |
| 9259 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9260 setcursor(void) |
| 7 | 9261 { |
| 9262 if (redrawing()) | |
| 9263 { | |
| 9264 validate_cursor(); | |
| 9265 windgoto(W_WINROW(curwin) + curwin->w_wrow, | |
| 9266 W_WINCOL(curwin) + ( | |
| 9267 #ifdef FEAT_RIGHTLEFT | |
| 1545 | 9268 /* With 'rightleft' set and the cursor on a double-wide |
| 9269 * character, position it on the leftmost column. */ | |
| 7 | 9270 curwin->w_p_rl ? ((int)W_WIDTH(curwin) - curwin->w_wcol - ( |
| 9271 # ifdef FEAT_MBYTE | |
| 1545 | 9272 (has_mbyte |
| 9273 && (*mb_ptr2cells)(ml_get_cursor()) == 2 | |
| 9274 && vim_isprintc(gchar_cursor())) ? 2 : | |
| 7 | 9275 # endif |
| 9276 1)) : | |
| 9277 #endif | |
| 9278 curwin->w_wcol)); | |
| 9279 } | |
| 9280 } | |
| 9281 | |
| 9282 | |
| 9283 /* | |
| 9284 * insert 'line_count' lines at 'row' in window 'wp' | |
| 9285 * if 'invalid' is TRUE the wp->w_lines[].wl_lnum is invalidated. | |
| 9286 * if 'mayclear' is TRUE the screen will be cleared if it is faster than | |
| 9287 * scrolling. | |
| 9288 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9289 */ | |
| 9290 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9291 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9292 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9293 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9294 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9295 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9296 int mayclear) |
| 7 | 9297 { |
| 9298 int did_delete; | |
| 9299 int nextrow; | |
| 9300 int lastrow; | |
| 9301 int retval; | |
| 9302 | |
| 9303 if (invalid) | |
| 9304 wp->w_lines_valid = 0; | |
| 9305 | |
| 9306 if (wp->w_height < 5) | |
| 9307 return FAIL; | |
| 9308 | |
| 9309 if (line_count > wp->w_height - row) | |
| 9310 line_count = wp->w_height - row; | |
| 9311 | |
| 9312 retval = win_do_lines(wp, row, line_count, mayclear, FALSE); | |
| 9313 if (retval != MAYBE) | |
| 9314 return retval; | |
| 9315 | |
| 9316 /* | |
| 9317 * If there is a next window or a status line, we first try to delete the | |
| 9318 * lines at the bottom to avoid messing what is after the window. | |
| 9319 * If this fails and there are following windows, don't do anything to avoid | |
| 9320 * messing up those windows, better just redraw. | |
| 9321 */ | |
| 9322 did_delete = FALSE; | |
| 9323 #ifdef FEAT_WINDOWS | |
| 9324 if (wp->w_next != NULL || wp->w_status_height) | |
| 9325 { | |
| 9326 if (screen_del_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
| 9327 line_count, (int)Rows, FALSE, NULL) == OK) | |
| 9328 did_delete = TRUE; | |
| 9329 else if (wp->w_next) | |
| 9330 return FAIL; | |
| 9331 } | |
| 9332 #endif | |
| 9333 /* | |
| 9334 * if no lines deleted, blank the lines that will end up below the window | |
| 9335 */ | |
| 9336 if (!did_delete) | |
| 9337 { | |
| 9338 #ifdef FEAT_WINDOWS | |
| 9339 wp->w_redr_status = TRUE; | |
| 9340 #endif | |
| 9341 redraw_cmdline = TRUE; | |
| 9342 nextrow = W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp); | |
| 9343 lastrow = nextrow + line_count; | |
| 9344 if (lastrow > Rows) | |
| 9345 lastrow = Rows; | |
| 9346 screen_fill(nextrow - line_count, lastrow - line_count, | |
| 9347 W_WINCOL(wp), (int)W_ENDCOL(wp), | |
| 9348 ' ', ' ', 0); | |
| 9349 } | |
| 9350 | |
| 9351 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, NULL) | |
| 9352 == FAIL) | |
| 9353 { | |
| 9354 /* deletion will have messed up other windows */ | |
| 9355 if (did_delete) | |
| 9356 { | |
| 9357 #ifdef FEAT_WINDOWS | |
| 9358 wp->w_redr_status = TRUE; | |
| 9359 #endif | |
| 9360 win_rest_invalid(W_NEXT(wp)); | |
| 9361 } | |
| 9362 return FAIL; | |
| 9363 } | |
| 9364 | |
| 9365 return OK; | |
| 9366 } | |
| 9367 | |
| 9368 /* | |
| 9369 * delete "line_count" window lines at "row" in window "wp" | |
| 9370 * If "invalid" is TRUE curwin->w_lines[] is invalidated. | |
| 9371 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9372 * scrolling | |
| 9373 * Return OK for success, FAIL if the lines are not deleted. | |
| 9374 */ | |
| 9375 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9376 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9377 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9378 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9379 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9380 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9381 int mayclear) |
| 7 | 9382 { |
| 9383 int retval; | |
| 9384 | |
| 9385 if (invalid) | |
| 9386 wp->w_lines_valid = 0; | |
| 9387 | |
| 9388 if (line_count > wp->w_height - row) | |
| 9389 line_count = wp->w_height - row; | |
| 9390 | |
| 9391 retval = win_do_lines(wp, row, line_count, mayclear, TRUE); | |
| 9392 if (retval != MAYBE) | |
| 9393 return retval; | |
| 9394 | |
| 9395 if (screen_del_lines(0, W_WINROW(wp) + row, line_count, | |
| 9396 (int)Rows, FALSE, NULL) == FAIL) | |
| 9397 return FAIL; | |
| 9398 | |
| 9399 #ifdef FEAT_WINDOWS | |
| 9400 /* | |
| 9401 * If there are windows or status lines below, try to put them at the | |
| 9402 * correct place. If we can't do that, they have to be redrawn. | |
| 9403 */ | |
| 9404 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9405 { | |
| 9406 if (screen_ins_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
| 9407 line_count, (int)Rows, NULL) == FAIL) | |
| 9408 { | |
| 9409 wp->w_redr_status = TRUE; | |
| 9410 win_rest_invalid(wp->w_next); | |
| 9411 } | |
| 9412 } | |
| 9413 /* | |
| 9414 * If this is the last window and there is no status line, redraw the | |
| 9415 * command line later. | |
| 9416 */ | |
| 9417 else | |
| 9418 #endif | |
| 9419 redraw_cmdline = TRUE; | |
| 9420 return OK; | |
| 9421 } | |
| 9422 | |
| 9423 /* | |
| 9424 * Common code for win_ins_lines() and win_del_lines(). | |
| 9425 * Returns OK or FAIL when the work has been done. | |
| 9426 * Returns MAYBE when not finished yet. | |
| 9427 */ | |
| 9428 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9429 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9430 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9431 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9432 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9433 int mayclear, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9434 int del) |
| 7 | 9435 { |
| 9436 int retval; | |
| 9437 | |
| 9438 if (!redrawing() || line_count <= 0) | |
| 9439 return FAIL; | |
| 9440 | |
| 9441 /* only a few lines left: redraw is faster */ | |
| 9442 if (mayclear && Rows - line_count < 5 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9443 #ifdef FEAT_WINDOWS |
| 7 | 9444 && wp->w_width == Columns |
| 9445 #endif | |
| 9446 ) | |
| 9447 { | |
| 9448 screenclear(); /* will set wp->w_lines_valid to 0 */ | |
| 9449 return FAIL; | |
| 9450 } | |
| 9451 | |
| 9452 /* | |
| 9453 * Delete all remaining lines | |
| 9454 */ | |
| 9455 if (row + line_count >= wp->w_height) | |
| 9456 { | |
| 9457 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 9458 W_WINCOL(wp), (int)W_ENDCOL(wp), | |
| 9459 ' ', ' ', 0); | |
| 9460 return OK; | |
| 9461 } | |
| 9462 | |
| 9463 /* | |
| 9464 * when scrolling, the message on the command line should be cleared, | |
| 9465 * otherwise it will stay there forever. | |
| 9466 */ | |
| 9467 clear_cmdline = TRUE; | |
| 9468 | |
| 9469 /* | |
| 9470 * If the terminal can set a scroll region, use that. | |
| 9471 * Always do this in a vertically split window. This will redraw from | |
| 9472 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9473 * win_line(). | |
| 9474 * 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
|
9475 * 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
|
9476 * scroll-up . |
| 7 | 9477 */ |
| 9478 if (scroll_region | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9479 #ifdef FEAT_WINDOWS |
| 7 | 9480 || W_WIDTH(wp) != Columns |
| 9481 #endif | |
| 9482 ) | |
| 9483 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9484 #ifdef FEAT_WINDOWS |
| 7 | 9485 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9486 #endif | |
| 9487 scroll_region_set(wp, row); | |
| 9488 if (del) | |
| 9489 retval = screen_del_lines(W_WINROW(wp) + row, 0, line_count, | |
| 9490 wp->w_height - row, FALSE, wp); | |
| 9491 else | |
| 9492 retval = screen_ins_lines(W_WINROW(wp) + row, 0, line_count, | |
| 9493 wp->w_height - row, wp); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9494 #ifdef FEAT_WINDOWS |
| 7 | 9495 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9496 #endif | |
| 9497 scroll_region_reset(); | |
| 9498 return retval; | |
| 9499 } | |
| 9500 | |
| 9501 #ifdef FEAT_WINDOWS | |
| 9502 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9503 return FAIL; | |
| 9504 #endif | |
| 9505 | |
| 9506 return MAYBE; | |
| 9507 } | |
| 9508 | |
| 9509 /* | |
| 9510 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9511 */ | |
| 9512 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9513 win_rest_invalid(win_T *wp) |
| 7 | 9514 { |
| 9515 #ifdef FEAT_WINDOWS | |
| 9516 while (wp != NULL) | |
| 9517 #else | |
| 9518 if (wp != NULL) | |
| 9519 #endif | |
| 9520 { | |
| 9521 redraw_win_later(wp, NOT_VALID); | |
| 9522 #ifdef FEAT_WINDOWS | |
| 9523 wp->w_redr_status = TRUE; | |
| 9524 wp = wp->w_next; | |
| 9525 #endif | |
| 9526 } | |
| 9527 redraw_cmdline = TRUE; | |
| 9528 } | |
| 9529 | |
| 9530 /* | |
| 9531 * The rest of the routines in this file perform screen manipulations. The | |
| 9532 * given operation is performed physically on the screen. The corresponding | |
| 9533 * change is also made to the internal screen image. In this way, the editor | |
| 9534 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9535 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9536 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9537 * screen changes, and in the meantime, everything still works. | |
| 9538 */ | |
| 9539 | |
| 9540 /* | |
| 9541 * types for inserting or deleting lines | |
| 9542 */ | |
| 9543 #define USE_T_CAL 1 | |
| 9544 #define USE_T_CDL 2 | |
| 9545 #define USE_T_AL 3 | |
| 9546 #define USE_T_CE 4 | |
| 9547 #define USE_T_DL 5 | |
| 9548 #define USE_T_SR 6 | |
| 9549 #define USE_NL 7 | |
| 9550 #define USE_T_CD 8 | |
| 9551 #define USE_REDRAW 9 | |
| 9552 | |
| 9553 /* | |
| 9554 * insert lines on the screen and update ScreenLines[] | |
| 9555 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9556 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9557 * 'row' and 'end' are relative to the start of the region. | |
| 9558 * | |
| 9559 * return FAIL for failure, OK for success. | |
| 9560 */ | |
| 446 | 9561 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9562 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9563 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9564 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9565 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9566 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9567 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9568 { |
| 9569 int i; | |
| 9570 int j; | |
| 9571 unsigned temp; | |
| 9572 int cursor_row; | |
| 9573 int type; | |
| 9574 int result_empty; | |
| 9575 int can_ce = can_clear(T_CE); | |
| 9576 | |
| 9577 /* | |
| 9578 * FAIL if | |
| 9579 * - there is no valid screen | |
| 9580 * - the screen has to be redrawn completely | |
| 9581 * - the line count is less than one | |
| 9582 * - the line count is more than 'ttyscroll' | |
| 9583 */ | |
| 9584 if (!screen_valid(TRUE) || line_count <= 0 || line_count > p_ttyscroll) | |
| 9585 return FAIL; | |
| 9586 | |
| 9587 /* | |
| 9588 * There are seven ways to insert lines: | |
| 9589 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9590 * characters from ScreenLines[]. | |
| 9591 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9592 * the insert is just empty lines | |
| 9593 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9594 * present or line_count > 1. It looks better if we do all the inserts | |
| 9595 * at once. | |
| 9596 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9597 * insert is just empty lines and T_CE is not present or line_count > | |
| 9598 * 1. | |
| 9599 * 4. Use T_AL (insert line) if it exists. | |
| 9600 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9601 * just empty lines. | |
| 9602 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9603 * just empty lines. | |
| 9604 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9605 * the 'da' flag is not set or we have clear line capability. | |
| 9606 * 8. redraw the characters from ScreenLines[]. | |
| 9607 * | |
| 9608 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9609 * the scrollbar for the window. It does have insert line, use that if it | |
| 9610 * exists. | |
| 9611 */ | |
| 9612 result_empty = (row + line_count >= end); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9613 #ifdef FEAT_WINDOWS |
| 7 | 9614 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) |
| 9615 type = USE_REDRAW; | |
| 9616 else | |
| 9617 #endif | |
| 9618 if (can_clear(T_CD) && result_empty) | |
| 9619 type = USE_T_CD; | |
| 9620 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9621 type = USE_T_CAL; | |
| 9622 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9623 type = USE_T_CDL; | |
| 9624 else if (*T_AL != NUL) | |
| 9625 type = USE_T_AL; | |
| 9626 else if (can_ce && result_empty) | |
| 9627 type = USE_T_CE; | |
| 9628 else if (*T_DL != NUL && result_empty) | |
| 9629 type = USE_T_DL; | |
| 9630 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9631 type = USE_T_SR; | |
| 9632 else | |
| 9633 return FAIL; | |
| 9634 | |
| 9635 /* | |
| 9636 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9637 * care of t_db if necessary. | |
| 9638 */ | |
| 9639 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9640 type == USE_T_CE || type == USE_T_DL) | |
| 9641 return screen_del_lines(off, row, line_count, end, FALSE, wp); | |
| 9642 | |
| 9643 /* | |
| 9644 * If text is retained below the screen, first clear or delete as many | |
| 9645 * lines at the bottom of the window as are about to be inserted so that | |
| 9646 * the deleted lines won't later surface during a screen_del_lines. | |
| 9647 */ | |
| 9648 if (*T_DB) | |
| 9649 screen_del_lines(off, end - line_count, line_count, end, FALSE, wp); | |
| 9650 | |
| 9651 #ifdef FEAT_CLIPBOARD | |
| 9652 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9653 * or not the full width of the screen. */ | |
| 9654 if (off + row > 0 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9655 # ifdef FEAT_WINDOWS |
| 7 | 9656 || (wp != NULL && wp->w_width != Columns) |
| 9657 # endif | |
| 9658 ) | |
| 3674 | 9659 clip_clear_selection(&clip_star); |
| 7 | 9660 else |
| 9661 clip_scroll_selection(-line_count); | |
| 9662 #endif | |
| 9663 | |
| 9664 #ifdef FEAT_GUI | |
| 9665 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9666 * scrolling is actually carried out. */ | |
| 9667 gui_dont_update_cursor(); | |
| 9668 #endif | |
| 9669 | |
| 9670 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 9671 cursor_row = row; | |
| 9672 else | |
| 9673 cursor_row = row + off; | |
| 9674 | |
| 9675 /* | |
| 9676 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9677 * Clear the inserted lines in ScreenLines[]. | |
| 9678 */ | |
| 9679 row += off; | |
| 9680 end += off; | |
| 9681 for (i = 0; i < line_count; ++i) | |
| 9682 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9683 #ifdef FEAT_WINDOWS |
| 7 | 9684 if (wp != NULL && wp->w_width != Columns) |
| 9685 { | |
| 9686 /* need to copy part of a line */ | |
| 9687 j = end - 1 - i; | |
| 9688 while ((j -= line_count) >= row) | |
| 9689 linecopy(j + line_count, j, wp); | |
| 9690 j += line_count; | |
| 9691 if (can_clear((char_u *)" ")) | |
| 9692 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9693 else | |
| 9694 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9695 LineWraps[j] = FALSE; | |
| 9696 } | |
| 9697 else | |
| 9698 #endif | |
| 9699 { | |
| 9700 j = end - 1 - i; | |
| 9701 temp = LineOffset[j]; | |
| 9702 while ((j -= line_count) >= row) | |
| 9703 { | |
| 9704 LineOffset[j + line_count] = LineOffset[j]; | |
| 9705 LineWraps[j + line_count] = LineWraps[j]; | |
| 9706 } | |
| 9707 LineOffset[j + line_count] = temp; | |
| 9708 LineWraps[j + line_count] = FALSE; | |
| 9709 if (can_clear((char_u *)" ")) | |
| 9710 lineclear(temp, (int)Columns); | |
| 9711 else | |
| 9712 lineinvalid(temp, (int)Columns); | |
| 9713 } | |
| 9714 } | |
| 9715 | |
| 9716 screen_stop_highlight(); | |
| 9717 windgoto(cursor_row, 0); | |
| 9718 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9719 #ifdef FEAT_WINDOWS |
| 7 | 9720 /* redraw the characters */ |
| 9721 if (type == USE_REDRAW) | |
| 9722 redraw_block(row, end, wp); | |
| 9723 else | |
| 9724 #endif | |
| 9725 if (type == USE_T_CAL) | |
| 9726 { | |
| 9727 term_append_lines(line_count); | |
| 9728 screen_start(); /* don't know where cursor is now */ | |
| 9729 } | |
| 9730 else | |
| 9731 { | |
| 9732 for (i = 0; i < line_count; i++) | |
| 9733 { | |
| 9734 if (type == USE_T_AL) | |
| 9735 { | |
| 9736 if (i && cursor_row != 0) | |
| 9737 windgoto(cursor_row, 0); | |
| 9738 out_str(T_AL); | |
| 9739 } | |
| 9740 else /* type == USE_T_SR */ | |
| 9741 out_str(T_SR); | |
| 9742 screen_start(); /* don't know where cursor is now */ | |
| 9743 } | |
| 9744 } | |
| 9745 | |
| 9746 /* | |
| 9747 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 9748 * have been scrolled down into the region. | |
| 9749 */ | |
| 9750 if (type == USE_T_SR && *T_DA) | |
| 9751 { | |
| 9752 for (i = 0; i < line_count; ++i) | |
| 9753 { | |
| 9754 windgoto(off + i, 0); | |
| 9755 out_str(T_CE); | |
| 9756 screen_start(); /* don't know where cursor is now */ | |
| 9757 } | |
| 9758 } | |
| 9759 | |
| 9760 #ifdef FEAT_GUI | |
| 9761 gui_can_update_cursor(); | |
| 9762 if (gui.in_use) | |
| 9763 out_flush(); /* always flush after a scroll */ | |
| 9764 #endif | |
| 9765 return OK; | |
| 9766 } | |
| 9767 | |
| 9768 /* | |
| 9769 * delete lines on the screen and update ScreenLines[] | |
| 9770 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9771 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9772 * 'row' and 'end' are relative to the start of the region. | |
| 9773 * | |
| 9774 * Return OK for success, FAIL if the lines are not deleted. | |
| 9775 */ | |
| 9776 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9777 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9778 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9779 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9780 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9781 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9782 int force, /* even when line_count > p_ttyscroll */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9783 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 9784 { |
| 9785 int j; | |
| 9786 int i; | |
| 9787 unsigned temp; | |
| 9788 int cursor_row; | |
| 9789 int cursor_end; | |
| 9790 int result_empty; /* result is empty until end of region */ | |
| 9791 int can_delete; /* deleting line codes can be used */ | |
| 9792 int type; | |
| 9793 | |
| 9794 /* | |
| 9795 * FAIL if | |
| 9796 * - there is no valid screen | |
| 9797 * - the screen has to be redrawn completely | |
| 9798 * - the line count is less than one | |
| 9799 * - the line count is more than 'ttyscroll' | |
| 9800 */ | |
| 9801 if (!screen_valid(TRUE) || line_count <= 0 || | |
| 9802 (!force && line_count > p_ttyscroll)) | |
| 9803 return FAIL; | |
| 9804 | |
| 9805 /* | |
| 9806 * Check if the rest of the current region will become empty. | |
| 9807 */ | |
| 9808 result_empty = row + line_count >= end; | |
| 9809 | |
| 9810 /* | |
| 9811 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 9812 * available. | |
| 9813 */ | |
| 9814 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 9815 | |
| 9816 /* | |
| 9817 * There are six ways to delete lines: | |
| 9818 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9819 * characters from ScreenLines[]. | |
| 9820 * 1. Use T_CD if it exists and the result is empty. | |
| 9821 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 9822 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 9823 * none of the other ways work. | |
| 9824 * 4. Use T_CE (erase line) if the result is empty. | |
| 9825 * 5. Use T_DL (delete line) if it exists. | |
| 9826 * 6. redraw the characters from ScreenLines[]. | |
| 9827 */ | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9828 #ifdef FEAT_WINDOWS |
| 7 | 9829 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) |
| 9830 type = USE_REDRAW; | |
| 9831 else | |
| 9832 #endif | |
| 9833 if (can_clear(T_CD) && result_empty) | |
| 9834 type = USE_T_CD; | |
| 9835 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 9836 /* | |
| 9837 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 9838 * its internal termcap... this works okay for tests which test *T_DB != | |
| 9839 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 9840 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 9841 * the trick... | |
| 9842 * Anyway, this hack will hopefully go away with the next OS release. | |
| 9843 * (Olaf Seibert) | |
| 9844 */ | |
| 9845 else if (row == 0 && T_DB == empty_option | |
| 9846 && (line_count == 1 || *T_CDL == NUL)) | |
| 9847 #else | |
| 9848 else if (row == 0 && ( | |
| 9849 #ifndef AMIGA | |
| 9850 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 9851 * up, so use delete-line command */ | |
| 9852 line_count == 1 || | |
| 9853 #endif | |
| 9854 *T_CDL == NUL)) | |
| 9855 #endif | |
| 9856 type = USE_NL; | |
| 9857 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 9858 type = USE_T_CDL; | |
| 9859 else if (can_clear(T_CE) && result_empty | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9860 #ifdef FEAT_WINDOWS |
| 7 | 9861 && (wp == NULL || wp->w_width == Columns) |
| 9862 #endif | |
| 9863 ) | |
| 9864 type = USE_T_CE; | |
| 9865 else if (*T_DL != NUL && can_delete) | |
| 9866 type = USE_T_DL; | |
| 9867 else if (*T_CDL != NUL && can_delete) | |
| 9868 type = USE_T_CDL; | |
| 9869 else | |
| 9870 return FAIL; | |
| 9871 | |
| 9872 #ifdef FEAT_CLIPBOARD | |
| 9873 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 9874 * not the full width of the screen. */ | |
| 9875 if (off + row > 0 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9876 # ifdef FEAT_WINDOWS |
| 7 | 9877 || (wp != NULL && wp->w_width != Columns) |
| 9878 # endif | |
| 9879 ) | |
| 3674 | 9880 clip_clear_selection(&clip_star); |
| 7 | 9881 else |
| 9882 clip_scroll_selection(line_count); | |
| 9883 #endif | |
| 9884 | |
| 9885 #ifdef FEAT_GUI | |
| 9886 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9887 * scrolling is actually carried out. */ | |
| 9888 gui_dont_update_cursor(); | |
| 9889 #endif | |
| 9890 | |
| 9891 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 9892 { | |
| 9893 cursor_row = row; | |
| 9894 cursor_end = end; | |
| 9895 } | |
| 9896 else | |
| 9897 { | |
| 9898 cursor_row = row + off; | |
| 9899 cursor_end = end + off; | |
| 9900 } | |
| 9901 | |
| 9902 /* | |
| 9903 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 9904 * Clear the inserted lines in ScreenLines[]. | |
| 9905 */ | |
| 9906 row += off; | |
| 9907 end += off; | |
| 9908 for (i = 0; i < line_count; ++i) | |
| 9909 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9910 #ifdef FEAT_WINDOWS |
| 7 | 9911 if (wp != NULL && wp->w_width != Columns) |
| 9912 { | |
| 9913 /* need to copy part of a line */ | |
| 9914 j = row + i; | |
| 9915 while ((j += line_count) <= end - 1) | |
| 9916 linecopy(j - line_count, j, wp); | |
| 9917 j -= line_count; | |
| 9918 if (can_clear((char_u *)" ")) | |
| 9919 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9920 else | |
| 9921 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9922 LineWraps[j] = FALSE; | |
| 9923 } | |
| 9924 else | |
| 9925 #endif | |
| 9926 { | |
| 9927 /* whole width, moving the line pointers is faster */ | |
| 9928 j = row + i; | |
| 9929 temp = LineOffset[j]; | |
| 9930 while ((j += line_count) <= end - 1) | |
| 9931 { | |
| 9932 LineOffset[j - line_count] = LineOffset[j]; | |
| 9933 LineWraps[j - line_count] = LineWraps[j]; | |
| 9934 } | |
| 9935 LineOffset[j - line_count] = temp; | |
| 9936 LineWraps[j - line_count] = FALSE; | |
| 9937 if (can_clear((char_u *)" ")) | |
| 9938 lineclear(temp, (int)Columns); | |
| 9939 else | |
| 9940 lineinvalid(temp, (int)Columns); | |
| 9941 } | |
| 9942 } | |
| 9943 | |
| 9944 screen_stop_highlight(); | |
| 9945 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9946 #ifdef FEAT_WINDOWS |
| 7 | 9947 /* redraw the characters */ |
| 9948 if (type == USE_REDRAW) | |
| 9949 redraw_block(row, end, wp); | |
| 9950 else | |
| 9951 #endif | |
| 9952 if (type == USE_T_CD) /* delete the lines */ | |
| 9953 { | |
| 9954 windgoto(cursor_row, 0); | |
| 9955 out_str(T_CD); | |
| 9956 screen_start(); /* don't know where cursor is now */ | |
| 9957 } | |
| 9958 else if (type == USE_T_CDL) | |
| 9959 { | |
| 9960 windgoto(cursor_row, 0); | |
| 9961 term_delete_lines(line_count); | |
| 9962 screen_start(); /* don't know where cursor is now */ | |
| 9963 } | |
| 9964 /* | |
| 9965 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 9966 * the whole screen (scroll region) up by outputting newlines on the | |
| 9967 * last line. | |
| 9968 */ | |
| 9969 else if (type == USE_NL) | |
| 9970 { | |
| 9971 windgoto(cursor_end - 1, 0); | |
| 9972 for (i = line_count; --i >= 0; ) | |
| 9973 out_char('\n'); /* cursor will remain on same line */ | |
| 9974 } | |
| 9975 else | |
| 9976 { | |
| 9977 for (i = line_count; --i >= 0; ) | |
| 9978 { | |
| 9979 if (type == USE_T_DL) | |
| 9980 { | |
| 9981 windgoto(cursor_row, 0); | |
| 9982 out_str(T_DL); /* delete a line */ | |
| 9983 } | |
| 9984 else /* type == USE_T_CE */ | |
| 9985 { | |
| 9986 windgoto(cursor_row + i, 0); | |
| 9987 out_str(T_CE); /* erase a line */ | |
| 9988 } | |
| 9989 screen_start(); /* don't know where cursor is now */ | |
| 9990 } | |
| 9991 } | |
| 9992 | |
| 9993 /* | |
| 9994 * If the 'db' flag is set, we need to clear the lines that have been | |
| 9995 * scrolled up at the bottom of the region. | |
| 9996 */ | |
| 9997 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 9998 { | |
| 9999 for (i = line_count; i > 0; --i) | |
| 10000 { | |
| 10001 windgoto(cursor_end - i, 0); | |
| 10002 out_str(T_CE); /* erase a line */ | |
| 10003 screen_start(); /* don't know where cursor is now */ | |
| 10004 } | |
| 10005 } | |
| 10006 | |
| 10007 #ifdef FEAT_GUI | |
| 10008 gui_can_update_cursor(); | |
| 10009 if (gui.in_use) | |
| 10010 out_flush(); /* always flush after a scroll */ | |
| 10011 #endif | |
| 10012 | |
| 10013 return OK; | |
| 10014 } | |
| 10015 | |
| 10016 /* | |
| 10017 * show the current mode and ruler | |
| 10018 * | |
| 10019 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10020 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10021 * cleared only if a mode is shown. | |
| 10022 * Return the length of the message (0 if no message). | |
| 10023 */ | |
| 10024 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10025 showmode(void) |
| 7 | 10026 { |
| 10027 int need_clear; | |
| 10028 int length = 0; | |
| 10029 int do_mode; | |
| 10030 int attr; | |
| 10031 int nwr_save; | |
| 10032 #ifdef FEAT_INS_EXPAND | |
| 10033 int sub_attr; | |
| 10034 #endif | |
| 10035 | |
| 642 | 10036 do_mode = ((p_smd && msg_silent == 0) |
| 10037 && ((State & INSERT) | |
| 10038 || restart_edit | |
| 5735 | 10039 || VIsual_active)); |
| 7 | 10040 if (do_mode || Recording) |
| 10041 { | |
| 10042 /* | |
| 10043 * Don't show mode right now, when not redrawing or inside a mapping. | |
| 10044 * Call char_avail() only when we are going to show something, because | |
| 10045 * it takes a bit of time. | |
| 10046 */ | |
| 10047 if (!redrawing() || (char_avail() && !KeyTyped) || msg_silent != 0) | |
| 10048 { | |
| 10049 redraw_cmdline = TRUE; /* show mode later */ | |
| 10050 return 0; | |
| 10051 } | |
| 10052 | |
| 10053 nwr_save = need_wait_return; | |
| 10054 | |
| 10055 /* wait a bit before overwriting an important message */ | |
| 10056 check_for_delay(FALSE); | |
| 10057 | |
| 10058 /* if the cmdline is more than one line high, erase top lines */ | |
| 10059 need_clear = clear_cmdline; | |
| 10060 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10061 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10062 | |
| 10063 /* Position on the last line in the window, column 0 */ | |
| 10064 msg_pos_mode(); | |
| 10065 cursor_off(); | |
| 10066 attr = hl_attr(HLF_CM); /* Highlight mode */ | |
| 10067 if (do_mode) | |
| 10068 { | |
| 10069 MSG_PUTS_ATTR("--", attr); | |
| 10070 #if defined(FEAT_XIM) | |
| 2520 | 10071 if ( |
| 10072 # ifdef FEAT_GUI_GTK | |
| 10073 preedit_get_status() | |
| 1668 | 10074 # else |
| 10075 im_get_status() | |
| 2520 | 10076 # endif |
| 1668 | 10077 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10078 # ifdef FEAT_GUI_GTK /* most of the time, it's not XIM being used */ |
| 7 | 10079 MSG_PUTS_ATTR(" IM", attr); |
| 10080 # else | |
| 10081 MSG_PUTS_ATTR(" XIM", attr); | |
| 10082 # endif | |
| 10083 #endif | |
| 10084 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10085 if (gui.in_use) | |
| 10086 { | |
| 10087 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10088 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10089 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10090 if (enc_utf8) |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10091 MSG_PUTS_ATTR(" \355\225\234\352\270\200", attr); |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10092 else |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10093 MSG_PUTS_ATTR(" \307\321\261\333", attr); |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10094 } |
| 7 | 10095 } |
| 10096 #endif | |
| 10097 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10098 /* CTRL-X in Insert mode */ |
| 10099 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10100 { |
| 10101 /* These messages can get long, avoid a wrap in a narrow | |
| 10102 * window. Prefer showing edit_submode_extra. */ | |
| 10103 length = (Rows - msg_row) * Columns - 3; | |
| 10104 if (edit_submode_extra != NULL) | |
| 10105 length -= vim_strsize(edit_submode_extra); | |
| 10106 if (length > 0) | |
| 10107 { | |
| 10108 if (edit_submode_pre != NULL) | |
| 10109 length -= vim_strsize(edit_submode_pre); | |
| 10110 if (length - vim_strsize(edit_submode) > 0) | |
| 10111 { | |
| 10112 if (edit_submode_pre != NULL) | |
| 10113 msg_puts_attr(edit_submode_pre, attr); | |
| 10114 msg_puts_attr(edit_submode, attr); | |
| 10115 } | |
| 10116 if (edit_submode_extra != NULL) | |
| 10117 { | |
| 10118 MSG_PUTS_ATTR(" ", attr); /* add a space in between */ | |
| 10119 if ((int)edit_submode_highl < (int)HLF_COUNT) | |
| 10120 sub_attr = hl_attr(edit_submode_highl); | |
| 10121 else | |
| 10122 sub_attr = attr; | |
| 10123 msg_puts_attr(edit_submode_extra, sub_attr); | |
| 10124 } | |
| 10125 } | |
| 10126 length = 0; | |
| 10127 } | |
| 10128 else | |
| 10129 #endif | |
| 10130 { | |
| 10131 #ifdef FEAT_VREPLACE | |
| 10132 if (State & VREPLACE_FLAG) | |
| 10133 MSG_PUTS_ATTR(_(" VREPLACE"), attr); | |
| 10134 else | |
| 10135 #endif | |
| 10136 if (State & REPLACE_FLAG) | |
| 10137 MSG_PUTS_ATTR(_(" REPLACE"), attr); | |
| 10138 else if (State & INSERT) | |
| 10139 { | |
| 10140 #ifdef FEAT_RIGHTLEFT | |
| 10141 if (p_ri) | |
| 10142 MSG_PUTS_ATTR(_(" REVERSE"), attr); | |
| 10143 #endif | |
| 10144 MSG_PUTS_ATTR(_(" INSERT"), attr); | |
| 10145 } | |
| 10146 else if (restart_edit == 'I') | |
| 10147 MSG_PUTS_ATTR(_(" (insert)"), attr); | |
| 10148 else if (restart_edit == 'R') | |
| 10149 MSG_PUTS_ATTR(_(" (replace)"), attr); | |
| 10150 else if (restart_edit == 'V') | |
| 10151 MSG_PUTS_ATTR(_(" (vreplace)"), attr); | |
| 10152 #ifdef FEAT_RIGHTLEFT | |
| 10153 if (p_hkmap) | |
| 10154 MSG_PUTS_ATTR(_(" Hebrew"), attr); | |
| 10155 # ifdef FEAT_FKMAP | |
| 10156 if (p_fkmap) | |
| 10157 MSG_PUTS_ATTR(farsi_text_5, attr); | |
| 10158 # endif | |
| 10159 #endif | |
| 10160 #ifdef FEAT_KEYMAP | |
| 10161 if (State & LANGMAP) | |
| 10162 { | |
| 10163 # ifdef FEAT_ARABIC | |
| 10164 if (curwin->w_p_arab) | |
| 10165 MSG_PUTS_ATTR(_(" Arabic"), attr); | |
| 10166 else | |
| 10167 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10168 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
|
10169 NameBuff, MAXPATHL)) |
|
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10170 MSG_PUTS_ATTR(NameBuff, attr); |
| 7 | 10171 } |
| 10172 #endif | |
| 10173 if ((State & INSERT) && p_paste) | |
| 10174 MSG_PUTS_ATTR(_(" (paste)"), attr); | |
| 10175 | |
| 10176 if (VIsual_active) | |
| 10177 { | |
| 10178 char *p; | |
| 10179 | |
| 10180 /* Don't concatenate separate words to avoid translation | |
| 10181 * problems. */ | |
| 10182 switch ((VIsual_select ? 4 : 0) | |
| 10183 + (VIsual_mode == Ctrl_V) * 2 | |
| 10184 + (VIsual_mode == 'V')) | |
| 10185 { | |
| 10186 case 0: p = N_(" VISUAL"); break; | |
| 10187 case 1: p = N_(" VISUAL LINE"); break; | |
| 10188 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10189 case 4: p = N_(" SELECT"); break; | |
| 10190 case 5: p = N_(" SELECT LINE"); break; | |
| 10191 default: p = N_(" SELECT BLOCK"); break; | |
| 10192 } | |
| 10193 MSG_PUTS_ATTR(_(p), attr); | |
| 10194 } | |
| 10195 MSG_PUTS_ATTR(" --", attr); | |
| 10196 } | |
| 644 | 10197 |
| 7 | 10198 need_clear = TRUE; |
| 10199 } | |
| 10200 if (Recording | |
| 10201 #ifdef FEAT_INS_EXPAND | |
| 10202 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10203 #endif | |
| 10204 ) | |
| 10205 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10206 recording_mode(attr); |
| 7 | 10207 need_clear = TRUE; |
| 10208 } | |
| 644 | 10209 |
| 10210 mode_displayed = TRUE; | |
| 7 | 10211 if (need_clear || clear_cmdline) |
| 10212 msg_clr_eos(); | |
| 10213 msg_didout = FALSE; /* overwrite this message */ | |
| 10214 length = msg_col; | |
| 10215 msg_col = 0; | |
| 10216 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10217 } | |
| 10218 else if (clear_cmdline && msg_silent == 0) | |
| 10219 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10220 msg_clr_cmdline(); | |
| 10221 | |
| 10222 #ifdef FEAT_CMDL_INFO | |
| 10223 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10224 if (VIsual_active) | |
| 10225 clear_showcmd(); | |
| 10226 | |
| 10227 /* If the last window has no status line, the ruler is after the mode | |
| 10228 * message and must be redrawn */ | |
| 10229 if (redrawing() | |
| 10230 # ifdef FEAT_WINDOWS | |
| 10231 && lastwin->w_status_height == 0 | |
| 10232 # endif | |
| 10233 ) | |
| 10234 win_redr_ruler(lastwin, TRUE); | |
| 10235 #endif | |
| 10236 redraw_cmdline = FALSE; | |
| 10237 clear_cmdline = FALSE; | |
| 10238 | |
| 10239 return length; | |
| 10240 } | |
| 10241 | |
| 10242 /* | |
| 10243 * Position for a mode message. | |
| 10244 */ | |
| 10245 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10246 msg_pos_mode(void) |
| 7 | 10247 { |
| 10248 msg_col = 0; | |
| 10249 msg_row = Rows - 1; | |
| 10250 } | |
| 10251 | |
| 10252 /* | |
| 10253 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10254 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10255 * Caller should check "mode_displayed". |
| 7 | 10256 */ |
| 10257 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10258 unshowmode(int force) |
| 7 | 10259 { |
| 10260 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10261 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10262 */ |
| 10263 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10264 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10265 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10266 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10267 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10268 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10269 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10270 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10271 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10272 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10273 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10274 { |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10275 msg_pos_mode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10276 if (Recording) |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10277 recording_mode(hl_attr(HLF_CM)); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10278 msg_clr_eos(); |
| 7 | 10279 } |
| 10280 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10281 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10282 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10283 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10284 MSG_PUTS_ATTR(_("recording"), attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10285 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10286 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10287 char_u s[4]; |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10288 sprintf((char *)s, " @%c", Recording); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10289 MSG_PUTS_ATTR(s, attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10290 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10291 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10292 |
| 667 | 10293 #if defined(FEAT_WINDOWS) |
| 10294 /* | |
| 10295 * Draw the tab pages line at the top of the Vim window. | |
| 10296 */ | |
| 10297 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10298 draw_tabline(void) |
| 667 | 10299 { |
| 10300 int tabcount = 0; | |
| 10301 tabpage_T *tp; | |
| 10302 int tabwidth; | |
| 10303 int col = 0; | |
| 673 | 10304 int scol = 0; |
| 667 | 10305 int attr; |
| 10306 win_T *wp; | |
| 671 | 10307 win_T *cwp; |
| 10308 int wincount; | |
| 10309 int modified; | |
| 667 | 10310 int c; |
| 10311 int len; | |
| 10312 int attr_sel = hl_attr(HLF_TPS); | |
| 10313 int attr_nosel = hl_attr(HLF_TP); | |
| 10314 int attr_fill = hl_attr(HLF_TPF); | |
| 673 | 10315 char_u *p; |
| 677 | 10316 int room; |
| 10317 int use_sep_chars = (t_colors < 8 | |
| 10318 #ifdef FEAT_GUI | |
| 10319 && !gui.in_use | |
| 10320 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10321 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10322 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10323 #endif |
| 677 | 10324 ); |
| 673 | 10325 |
| 10326 redraw_tabline = FALSE; | |
| 667 | 10327 |
| 685 | 10328 #ifdef FEAT_GUI_TABLINE |
| 798 | 10329 /* Take care of a GUI tabline. */ |
| 685 | 10330 if (gui_use_tabline()) |
| 10331 { | |
| 10332 gui_update_tabline(); | |
| 10333 return; | |
| 10334 } | |
| 10335 #endif | |
| 10336 | |
| 10337 if (tabline_height() < 1) | |
| 667 | 10338 return; |
| 10339 | |
| 677 | 10340 #if defined(FEAT_STL_OPT) |
| 681 | 10341 |
| 10342 /* Init TabPageIdxs[] to zero: Clicking outside of tabs has no effect. */ | |
| 10343 for (scol = 0; scol < Columns; ++scol) | |
| 10344 TabPageIdxs[scol] = 0; | |
| 10345 | |
| 677 | 10346 /* Use the 'tabline' option if it's set. */ |
| 10347 if (*p_tal != NUL) | |
| 10348 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10349 int saved_did_emsg = did_emsg; |
| 680 | 10350 |
| 10351 /* Check for an error. If there is one we would loop in redrawing the | |
| 10352 * 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
|
10353 did_emsg = FALSE; |
| 677 | 10354 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10355 if (did_emsg) |
| 680 | 10356 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10357 (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
|
10358 did_emsg |= saved_did_emsg; |
| 680 | 10359 } |
| 10360 else | |
| 10361 #endif | |
| 10362 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10363 FOR_ALL_TABPAGES(tp) |
| 680 | 10364 ++tabcount; |
| 10365 | |
| 10366 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10367 if (tabwidth < 6) | |
| 10368 tabwidth = 6; | |
| 10369 | |
| 10370 attr = attr_nosel; | |
| 10371 tabcount = 0; | |
| 681 | 10372 scol = 0; |
| 699 | 10373 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10374 tp = tp->tp_next) | |
| 680 | 10375 { |
| 10376 scol = col; | |
| 10377 | |
| 10378 if (tp->tp_topframe == topframe) | |
| 10379 attr = attr_sel; | |
| 10380 if (use_sep_chars && col > 0) | |
| 10381 screen_putchar('|', 0, col++, attr); | |
| 10382 | |
| 10383 if (tp->tp_topframe != topframe) | |
| 10384 attr = attr_nosel; | |
| 10385 | |
| 10386 screen_putchar(' ', 0, col++, attr); | |
| 10387 | |
| 10388 if (tp == curtab) | |
| 10389 { | |
| 10390 cwp = curwin; | |
| 10391 wp = firstwin; | |
| 10392 } | |
| 10393 else | |
| 10394 { | |
| 10395 cwp = tp->tp_curwin; | |
| 10396 wp = tp->tp_firstwin; | |
| 10397 } | |
| 10398 | |
| 10399 modified = FALSE; | |
| 10400 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10401 if (bufIsChanged(wp->w_buffer)) | |
| 10402 modified = TRUE; | |
| 10403 if (modified || wincount > 1) | |
| 10404 { | |
| 10405 if (wincount > 1) | |
| 10406 { | |
| 10407 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10408 len = (int)STRLEN(NameBuff); |
| 699 | 10409 if (col + len >= Columns - 3) |
| 10410 break; | |
| 680 | 10411 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10412 #if defined(FEAT_SYN_HL) |
| 6106 | 10413 hl_combine_attr(attr, hl_attr(HLF_T)) |
| 677 | 10414 #else |
| 6106 | 10415 attr |
| 680 | 10416 #endif |
| 10417 ); | |
| 10418 col += len; | |
| 10419 } | |
| 10420 if (modified) | |
| 10421 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10422 screen_putchar(' ', 0, col++, attr); | |
| 10423 } | |
| 10424 | |
| 10425 room = scol - col + tabwidth - 1; | |
| 10426 if (room > 0) | |
| 10427 { | |
| 685 | 10428 /* Get buffer name in NameBuff[] */ |
| 10429 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10430 shorten_dir(NameBuff); |
| 680 | 10431 len = vim_strsize(NameBuff); |
| 10432 p = NameBuff; | |
| 677 | 10433 #ifdef FEAT_MBYTE |
| 680 | 10434 if (has_mbyte) |
| 10435 while (len > room) | |
| 10436 { | |
| 10437 len -= ptr2cells(p); | |
| 10438 mb_ptr_adv(p); | |
| 10439 } | |
| 10440 else | |
| 10441 #endif | |
| 10442 if (len > room) | |
| 677 | 10443 { |
| 680 | 10444 p += len - room; |
| 10445 len = room; | |
| 677 | 10446 } |
| 699 | 10447 if (len > Columns - col - 1) |
| 10448 len = Columns - col - 1; | |
| 680 | 10449 |
| 835 | 10450 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10451 col += len; |
| 10452 } | |
| 10453 screen_putchar(' ', 0, col++, attr); | |
| 10454 | |
| 10455 /* Store the tab page number in TabPageIdxs[], so that | |
| 10456 * jump_to_mouse() knows where each one is. */ | |
| 10457 ++tabcount; | |
| 10458 while (scol < col) | |
| 10459 TabPageIdxs[scol++] = tabcount; | |
| 10460 } | |
| 10461 | |
| 10462 if (use_sep_chars) | |
| 10463 c = '_'; | |
| 10464 else | |
| 10465 c = ' '; | |
| 10466 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10467 |
| 10468 /* Put an "X" for closing the current tab if there are several. */ | |
| 10469 if (first_tabpage->tp_next != NULL) | |
| 10470 { | |
| 10471 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10472 TabPageIdxs[Columns - 1] = -999; | |
| 10473 } | |
| 10474 } | |
| 834 | 10475 |
| 10476 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10477 * set. */ | |
| 10478 redraw_tabline = FALSE; | |
| 667 | 10479 } |
| 685 | 10480 |
| 10481 /* | |
| 10482 * Get buffer name for "buf" into NameBuff[]. | |
| 10483 * Takes care of special buffer names and translates special characters. | |
| 10484 */ | |
| 10485 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10486 get_trans_bufname(buf_T *buf) |
| 685 | 10487 { |
| 10488 if (buf_spname(buf) != NULL) | |
| 3839 | 10489 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10490 else |
| 10491 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10492 trans_characters(NameBuff, MAXPATHL); | |
| 10493 } | |
| 667 | 10494 #endif |
| 10495 | |
| 7 | 10496 #if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) |
| 10497 /* | |
| 10498 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10499 */ | |
| 10500 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10501 fillchar_status(int *attr, int is_curwin) |
| 7 | 10502 { |
| 10503 int fill; | |
| 10504 if (is_curwin) | |
| 10505 { | |
| 10506 *attr = hl_attr(HLF_S); | |
| 10507 fill = fill_stl; | |
| 10508 } | |
| 10509 else | |
| 10510 { | |
| 10511 *attr = hl_attr(HLF_SNC); | |
| 10512 fill = fill_stlnc; | |
| 10513 } | |
| 10514 /* Use fill when there is highlighting, and highlighting of current | |
| 10515 * window differs, or the fillchars differ, or this is not the | |
| 10516 * current window */ | |
| 10517 if (*attr != 0 && ((hl_attr(HLF_S) != hl_attr(HLF_SNC) | |
| 10518 || !is_curwin || firstwin == lastwin) | |
| 10519 || (fill_stl != fill_stlnc))) | |
| 10520 return fill; | |
| 10521 if (is_curwin) | |
| 10522 return '^'; | |
| 10523 return '='; | |
| 10524 } | |
| 10525 #endif | |
| 10526 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10527 #ifdef FEAT_WINDOWS |
| 7 | 10528 /* |
| 10529 * Get the character to use in a separator between vertically split windows. | |
| 10530 * Get its attributes in "*attr". | |
| 10531 */ | |
| 10532 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10533 fillchar_vsep(int *attr) |
| 7 | 10534 { |
| 10535 *attr = hl_attr(HLF_C); | |
| 10536 if (*attr == 0 && fill_vert == ' ') | |
| 10537 return '|'; | |
| 10538 else | |
| 10539 return fill_vert; | |
| 10540 } | |
| 10541 #endif | |
| 10542 | |
| 10543 /* | |
| 10544 * Return TRUE if redrawing should currently be done. | |
| 10545 */ | |
| 10546 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10547 redrawing(void) |
| 7 | 10548 { |
| 10549 return (!RedrawingDisabled | |
| 10550 && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); | |
| 10551 } | |
| 10552 | |
| 10553 /* | |
| 10554 * Return TRUE if printing messages should currently be done. | |
| 10555 */ | |
| 10556 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10557 messaging(void) |
| 7 | 10558 { |
| 10559 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10560 } | |
| 10561 | |
| 10562 /* | |
| 10563 * Show current status info in ruler and various other places | |
| 10564 * If always is FALSE, only show ruler if position has changed. | |
| 10565 */ | |
| 10566 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10567 showruler(int always) |
| 7 | 10568 { |
| 10569 if (!always && !redrawing()) | |
| 10570 return; | |
| 574 | 10571 #ifdef FEAT_INS_EXPAND |
| 10572 if (pum_visible()) | |
| 10573 { | |
| 639 | 10574 # ifdef FEAT_WINDOWS |
| 574 | 10575 /* Don't redraw right now, do it later. */ |
| 10576 curwin->w_redr_status = TRUE; | |
| 639 | 10577 # endif |
| 574 | 10578 return; |
| 10579 } | |
| 10580 #endif | |
| 7 | 10581 #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS) |
| 40 | 10582 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 680 | 10583 { |
| 1983 | 10584 redraw_custom_statusline(curwin); |
| 680 | 10585 } |
| 7 | 10586 else |
| 10587 #endif | |
| 10588 #ifdef FEAT_CMDL_INFO | |
| 10589 win_redr_ruler(curwin, always); | |
| 10590 #endif | |
| 10591 | |
| 10592 #ifdef FEAT_TITLE | |
| 10593 if (need_maketitle | |
| 10594 # ifdef FEAT_STL_OPT | |
| 10595 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10596 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10597 # endif | |
| 10598 ) | |
| 10599 maketitle(); | |
| 10600 #endif | |
| 1588 | 10601 #ifdef FEAT_WINDOWS |
| 10602 /* Redraw the tab pages line if needed. */ | |
| 10603 if (redraw_tabline) | |
| 10604 draw_tabline(); | |
| 10605 #endif | |
| 7 | 10606 } |
| 10607 | |
| 10608 #ifdef FEAT_CMDL_INFO | |
| 10609 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10610 win_redr_ruler(win_T *wp, int always) |
| 7 | 10611 { |
| 1869 | 10612 #define RULER_BUF_LEN 70 |
| 10613 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10614 int row; |
| 10615 int fillchar; | |
| 10616 int attr; | |
| 10617 int empty_line = FALSE; | |
| 10618 colnr_T virtcol; | |
| 10619 int i; | |
| 1869 | 10620 size_t len; |
| 7 | 10621 int o; |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10622 #ifdef FEAT_WINDOWS |
| 7 | 10623 int this_ru_col; |
| 10624 int off = 0; | |
| 10625 int width = Columns; | |
| 10626 # define WITH_OFF(x) x | |
| 10627 # define WITH_WIDTH(x) x | |
| 10628 #else | |
| 10629 # define WITH_OFF(x) 0 | |
| 10630 # define WITH_WIDTH(x) Columns | |
| 10631 # define this_ru_col ru_col | |
| 10632 #endif | |
| 10633 | |
| 10634 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10635 if (!p_ru) | |
| 10636 return; | |
| 10637 | |
| 10638 /* | |
| 10639 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10640 * after deleting lines, before cursor.lnum is corrected. | |
| 10641 */ | |
| 10642 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10643 return; | |
| 10644 | |
| 10645 #ifdef FEAT_INS_EXPAND | |
| 10646 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 10647 * the (long) mode message. */ | |
| 10648 # ifdef FEAT_WINDOWS | |
| 10649 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 10650 # endif | |
| 10651 if (edit_submode != NULL) | |
| 10652 return; | |
| 540 | 10653 /* Don't draw the ruler when the popup menu is visible, it may overlap. */ |
| 10654 if (pum_visible()) | |
| 10655 return; | |
| 7 | 10656 #endif |
| 10657 | |
| 10658 #ifdef FEAT_STL_OPT | |
| 10659 if (*p_ruf) | |
| 10660 { | |
| 680 | 10661 int save_called_emsg = called_emsg; |
| 10662 | |
| 10663 called_emsg = FALSE; | |
| 7 | 10664 win_redr_custom(wp, TRUE); |
| 680 | 10665 if (called_emsg) |
| 10666 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 10667 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 10668 called_emsg |= save_called_emsg; |
| 7 | 10669 return; |
| 10670 } | |
| 10671 #endif | |
| 10672 | |
| 10673 /* | |
| 10674 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 10675 */ | |
| 10676 if (!(State & INSERT) | |
| 10677 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 10678 empty_line = TRUE; | |
| 10679 | |
| 10680 /* | |
| 10681 * Only draw the ruler when something changed. | |
| 10682 */ | |
| 10683 validate_virtcol_win(wp); | |
| 10684 if ( redraw_cmdline | |
| 10685 || always | |
| 10686 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 10687 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 10688 || wp->w_virtcol != wp->w_ru_virtcol | |
| 10689 #ifdef FEAT_VIRTUALEDIT | |
| 10690 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 10691 #endif | |
| 10692 || wp->w_topline != wp->w_ru_topline | |
| 10693 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 10694 #ifdef FEAT_DIFF | |
| 10695 || wp->w_topfill != wp->w_ru_topfill | |
| 10696 #endif | |
| 10697 || empty_line != wp->w_ru_empty) | |
| 10698 { | |
| 10699 cursor_off(); | |
| 10700 #ifdef FEAT_WINDOWS | |
| 10701 if (wp->w_status_height) | |
| 10702 { | |
| 10703 row = W_WINROW(wp) + wp->w_height; | |
| 10704 fillchar = fillchar_status(&attr, wp == curwin); | |
| 10705 off = W_WINCOL(wp); | |
| 10706 width = W_WIDTH(wp); | |
| 10707 } | |
| 10708 else | |
| 10709 #endif | |
| 10710 { | |
| 10711 row = Rows - 1; | |
| 10712 fillchar = ' '; | |
| 10713 attr = 0; | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10714 #ifdef FEAT_WINDOWS |
| 7 | 10715 width = Columns; |
| 10716 off = 0; | |
| 10717 #endif | |
| 10718 } | |
| 10719 | |
| 10720 /* In list mode virtcol needs to be recomputed */ | |
| 10721 virtcol = wp->w_virtcol; | |
| 10722 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 10723 { | |
| 10724 wp->w_p_list = FALSE; | |
| 10725 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 10726 wp->w_p_list = TRUE; | |
| 10727 } | |
| 10728 | |
| 10729 /* | |
| 10730 * Some sprintfs return the length, some return a pointer. | |
| 10731 * To avoid portability problems we use strlen() here. | |
| 10732 */ | |
| 1869 | 10733 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 10734 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 10735 ? 0L | |
| 10736 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 10737 len = STRLEN(buffer); |
| 10738 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 10739 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 10740 (int)virtcol + 1); | |
| 10741 | |
| 10742 /* | |
| 10743 * Add a "50%" if there is room for it. | |
| 10744 * On the last line, don't print in the last column (scrolls the | |
| 10745 * screen up on some terminals). | |
| 10746 */ | |
| 10747 i = (int)STRLEN(buffer); | |
| 1869 | 10748 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 10749 o = i + vim_strsize(buffer + i + 1); |
| 10750 #ifdef FEAT_WINDOWS | |
| 10751 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 10752 #endif | |
| 10753 ++o; | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10754 #ifdef FEAT_WINDOWS |
| 7 | 10755 this_ru_col = ru_col - (Columns - width); |
| 10756 if (this_ru_col < 0) | |
| 10757 this_ru_col = 0; | |
| 10758 #endif | |
| 10759 /* Never use more than half the window/screen width, leave the other | |
| 10760 * half for the filename. */ | |
| 10761 if (this_ru_col < (WITH_WIDTH(width) + 1) / 2) | |
| 10762 this_ru_col = (WITH_WIDTH(width) + 1) / 2; | |
| 10763 if (this_ru_col + o < WITH_WIDTH(width)) | |
| 10764 { | |
| 6466 | 10765 /* need at least 3 chars left for get_rel_pos() + NUL */ |
| 10766 while (this_ru_col + o < WITH_WIDTH(width) && RULER_BUF_LEN > i + 4) | |
| 7 | 10767 { |
| 10768 #ifdef FEAT_MBYTE | |
| 10769 if (has_mbyte) | |
| 10770 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 10771 else | |
| 10772 #endif | |
| 10773 buffer[i++] = fillchar; | |
| 10774 ++o; | |
| 10775 } | |
| 1869 | 10776 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 10777 } |
| 10778 /* Truncate at window boundary. */ | |
| 10779 #ifdef FEAT_MBYTE | |
| 10780 if (has_mbyte) | |
| 10781 { | |
| 10782 o = 0; | |
| 474 | 10783 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 10784 { |
| 10785 o += (*mb_ptr2cells)(buffer + i); | |
| 10786 if (this_ru_col + o > WITH_WIDTH(width)) | |
| 10787 { | |
| 10788 buffer[i] = NUL; | |
| 10789 break; | |
| 10790 } | |
| 10791 } | |
| 10792 } | |
| 10793 else | |
| 10794 #endif | |
| 10795 if (this_ru_col + (int)STRLEN(buffer) > WITH_WIDTH(width)) | |
| 10796 buffer[WITH_WIDTH(width) - this_ru_col] = NUL; | |
| 10797 | |
| 10798 screen_puts(buffer, row, this_ru_col + WITH_OFF(off), attr); | |
| 10799 i = redraw_cmdline; | |
| 10800 screen_fill(row, row + 1, | |
| 10801 this_ru_col + WITH_OFF(off) + (int)STRLEN(buffer), | |
| 10802 (int)(WITH_OFF(off) + WITH_WIDTH(width)), | |
| 10803 fillchar, fillchar, attr); | |
| 10804 /* don't redraw the cmdline because of showing the ruler */ | |
| 10805 redraw_cmdline = i; | |
| 10806 wp->w_ru_cursor = wp->w_cursor; | |
| 10807 wp->w_ru_virtcol = wp->w_virtcol; | |
| 10808 wp->w_ru_empty = empty_line; | |
| 10809 wp->w_ru_topline = wp->w_topline; | |
| 10810 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 10811 #ifdef FEAT_DIFF | |
| 10812 wp->w_ru_topfill = wp->w_topfill; | |
| 10813 #endif | |
| 10814 } | |
| 10815 } | |
| 10816 #endif | |
| 13 | 10817 |
| 10818 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 10819 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
10820 * 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
|
10821 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 10822 * Otherwise it depends on 'numberwidth' and the line count. |
| 10823 */ | |
| 10824 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10825 number_width(win_T *wp) |
| 13 | 10826 { |
| 10827 int n; | |
| 10828 linenr_T lnum; | |
| 10829 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10830 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
|
10831 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10832 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10833 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10834 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10835 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
|
10836 |
| 6679 | 10837 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 10838 return wp->w_nrwidth_width; |
| 10839 wp->w_nrwidth_line_count = lnum; | |
| 10840 | |
| 10841 n = 0; | |
| 10842 do | |
| 10843 { | |
| 856 | 10844 lnum /= 10; |
| 10845 ++n; | |
| 13 | 10846 } while (lnum > 0); |
| 10847 | |
| 10848 /* 'numberwidth' gives the minimal width plus one */ | |
| 10849 if (n < wp->w_p_nuw - 1) | |
| 10850 n = wp->w_p_nuw - 1; | |
| 10851 | |
| 10852 wp->w_nrwidth_width = n; | |
| 6679 | 10853 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 10854 return n; |
| 10855 } | |
| 10856 #endif | |
| 3986 | 10857 |
| 10858 /* | |
| 10859 * Return the current cursor column. This is the actual position on the | |
| 10860 * screen. First column is 0. | |
| 10861 */ | |
| 10862 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10863 screen_screencol(void) |
| 3986 | 10864 { |
| 10865 return screen_cur_col; | |
| 10866 } | |
| 10867 | |
| 10868 /* | |
| 10869 * Return the current cursor row. This is the actual position on the screen. | |
| 10870 * First row is 0. | |
| 10871 */ | |
| 10872 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10873 screen_screenrow(void) |
| 3986 | 10874 { |
| 10875 return screen_cur_row; | |
| 10876 } |