Mercurial > vim
annotate src/screen.c @ 9885:4e8b05fa12c6 v7.4.2217
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Aug 16 16:08:18 2016 +0200
patch 7.4.2217
Problem: When using matchaddpos() a character after the end of the line can
be highlighted.
Solution: Only highlight existing characters. (Hirohito Higashi)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 16 Aug 2016 16:15:06 +0200 |
| parents | 7da89d9c744b |
| children | ccb6461b82df |
| 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 |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
501 int did_undraw = FALSE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
502 int gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
503 int gui_cursor_row; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
504 #endif |
| 7 | 505 |
| 2008 | 506 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 507 if (!screen_valid(TRUE)) |
| 508 return; | |
| 509 | |
| 510 if (must_redraw) | |
| 511 { | |
| 512 if (type < must_redraw) /* use maximal type */ | |
| 513 type = must_redraw; | |
| 1331 | 514 |
| 515 /* must_redraw is reset here, so that when we run into some weird | |
| 516 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 517 * scrolling), or update_topline() in win_update() will cause a | |
| 518 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 519 must_redraw = 0; |
| 520 } | |
| 521 | |
| 522 /* Need to update w_lines[]. */ | |
| 523 if (curwin->w_lines_valid == 0 && type < NOT_VALID) | |
| 524 type = NOT_VALID; | |
| 525 | |
| 2008 | 526 /* Postpone the redrawing when it's not needed and when being called |
| 527 * recursively. */ | |
| 528 if (!redrawing() || updating_screen) | |
| 7 | 529 { |
| 530 redraw_later(type); /* remember type for next time */ | |
| 531 must_redraw = type; | |
| 532 if (type > INVERTED_ALL) | |
| 533 curwin->w_lines_valid = 0; /* don't use w_lines[].wl_size now */ | |
| 534 return; | |
| 535 } | |
| 536 | |
| 537 updating_screen = TRUE; | |
| 538 #ifdef FEAT_SYN_HL | |
| 539 ++display_tick; /* let syntax code know we're in a next round of | |
| 540 * display updating */ | |
| 541 #endif | |
| 542 | |
| 543 /* | |
| 544 * if the screen was scrolled up when displaying a message, scroll it down | |
| 545 */ | |
| 546 if (msg_scrolled) | |
| 547 { | |
| 548 clear_cmdline = TRUE; | |
| 549 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 550 type = CLEAR; | |
| 551 else if (type != CLEAR) | |
| 552 { | |
| 553 check_for_delay(FALSE); | |
| 554 if (screen_ins_lines(0, 0, msg_scrolled, (int)Rows, NULL) == FAIL) | |
| 555 type = CLEAR; | |
| 556 FOR_ALL_WINDOWS(wp) | |
| 557 { | |
| 558 if (W_WINROW(wp) < msg_scrolled) | |
| 559 { | |
| 560 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 561 && wp->w_redr_type < REDRAW_TOP | |
| 562 && wp->w_lines_valid > 0 | |
| 563 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 564 { | |
| 565 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 566 wp->w_redr_type = REDRAW_TOP; | |
| 567 } | |
| 568 else | |
| 569 { | |
| 570 wp->w_redr_type = NOT_VALID; | |
| 571 #ifdef FEAT_WINDOWS | |
| 572 if (W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp) | |
| 573 <= msg_scrolled) | |
| 574 wp->w_redr_status = TRUE; | |
| 575 #endif | |
| 576 } | |
| 577 } | |
| 578 } | |
| 579 redraw_cmdline = TRUE; | |
| 667 | 580 #ifdef FEAT_WINDOWS |
| 673 | 581 redraw_tabline = TRUE; |
| 667 | 582 #endif |
| 7 | 583 } |
| 584 msg_scrolled = 0; | |
| 585 need_wait_return = FALSE; | |
| 586 } | |
| 587 | |
| 588 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 589 compute_cmdrow(); | |
| 590 | |
| 591 /* Check for changed highlighting */ | |
| 592 if (need_highlight_changed) | |
| 593 highlight_changed(); | |
| 594 | |
| 595 if (type == CLEAR) /* first clear screen */ | |
| 596 { | |
| 597 screenclear(); /* will reset clear_cmdline */ | |
| 598 type = NOT_VALID; | |
| 599 } | |
| 600 | |
| 601 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 602 check_for_delay(FALSE); | |
| 603 | |
| 13 | 604 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
605 /* 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
|
606 * changes. */ |
| 13 | 607 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
608 && 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
|
609 ? number_width(curwin) : 0)) |
| 13 | 610 curwin->w_redr_type = NOT_VALID; |
| 611 #endif | |
| 612 | |
| 7 | 613 /* |
| 614 * Only start redrawing if there is really something to do. | |
| 615 */ | |
| 616 if (type == INVERTED) | |
| 617 update_curswant(); | |
| 618 if (curwin->w_redr_type < type | |
| 619 && !((type == VALID | |
| 620 && curwin->w_lines[0].wl_valid | |
| 621 #ifdef FEAT_DIFF | |
| 622 && curwin->w_topfill == curwin->w_old_topfill | |
| 623 && curwin->w_botfill == curwin->w_old_botfill | |
| 624 #endif | |
| 625 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 626 || (type == INVERTED | |
| 1043 | 627 && VIsual_active |
| 7 | 628 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 629 && curwin->w_old_visual_mode == VIsual_mode | |
| 630 && (curwin->w_valid & VALID_VIRTCOL) | |
| 631 && curwin->w_old_curswant == curwin->w_curswant) | |
| 632 )) | |
| 633 curwin->w_redr_type = type; | |
| 634 | |
| 849 | 635 #ifdef FEAT_WINDOWS |
| 636 /* Redraw the tab pages line if needed. */ | |
| 637 if (redraw_tabline || type >= NOT_VALID) | |
| 638 draw_tabline(); | |
| 639 #endif | |
| 640 | |
| 7 | 641 #ifdef FEAT_SYN_HL |
| 642 /* | |
| 643 * Correct stored syntax highlighting info for changes in each displayed | |
| 644 * buffer. Each buffer must only be done once. | |
| 645 */ | |
| 646 FOR_ALL_WINDOWS(wp) | |
| 647 { | |
| 648 if (wp->w_buffer->b_mod_set) | |
| 649 { | |
| 650 # ifdef FEAT_WINDOWS | |
| 651 win_T *wwp; | |
| 652 | |
| 653 /* Check if we already did this buffer. */ | |
| 654 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 655 if (wwp->w_buffer == wp->w_buffer) | |
| 656 break; | |
| 657 # endif | |
| 658 if ( | |
| 659 # ifdef FEAT_WINDOWS | |
| 660 wwp == wp && | |
| 661 # endif | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
662 syntax_present(wp)) |
| 7 | 663 syn_stack_apply_changes(wp->w_buffer); |
| 664 } | |
| 665 } | |
| 666 #endif | |
| 667 | |
| 668 /* | |
| 669 * Go from top to bottom through the windows, redrawing the ones that need | |
| 670 * it. | |
| 671 */ | |
| 672 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 673 did_one = FALSE; | |
| 674 #endif | |
| 675 #ifdef FEAT_SEARCH_EXTRA | |
| 676 search_hl.rm.regprog = NULL; | |
| 677 #endif | |
| 678 FOR_ALL_WINDOWS(wp) | |
| 679 { | |
| 680 if (wp->w_redr_type != 0) | |
| 681 { | |
| 682 cursor_off(); | |
| 683 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 684 if (!did_one) | |
| 685 { | |
| 686 did_one = TRUE; | |
| 687 # ifdef FEAT_SEARCH_EXTRA | |
| 688 start_search_hl(); | |
| 689 # endif | |
| 690 # ifdef FEAT_CLIPBOARD | |
| 691 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 692 if (clip_star.available && clip_isautosel_star()) |
| 693 clip_update_selection(&clip_star); | |
| 694 if (clip_plus.available && clip_isautosel_plus()) | |
| 695 clip_update_selection(&clip_plus); | |
| 7 | 696 # endif |
| 697 #ifdef FEAT_GUI | |
| 698 /* Remove the cursor before starting to do anything, because | |
| 699 * scrolling may make it difficult to redraw the text under | |
| 700 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
701 if (gui.in_use && wp == curwin) |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
702 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
703 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
704 gui_cursor_row = gui.cursor_row; |
| 7 | 705 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
706 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
707 } |
| 7 | 708 #endif |
| 709 } | |
| 710 #endif | |
| 711 win_update(wp); | |
| 712 } | |
| 713 | |
| 714 #ifdef FEAT_WINDOWS | |
| 715 /* redraw status line after the window to minimize cursor movement */ | |
| 716 if (wp->w_redr_status) | |
| 717 { | |
| 718 cursor_off(); | |
| 719 win_redr_status(wp); | |
| 720 } | |
| 721 #endif | |
| 722 } | |
| 723 #if defined(FEAT_SEARCH_EXTRA) | |
| 724 end_search_hl(); | |
| 725 #endif | |
| 4107 | 726 #ifdef FEAT_INS_EXPAND |
| 727 /* May need to redraw the popup menu. */ | |
| 728 if (pum_visible()) | |
| 729 pum_redraw(); | |
| 730 #endif | |
| 7 | 731 |
| 732 #ifdef FEAT_WINDOWS | |
| 733 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 734 * 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
|
735 FOR_ALL_WINDOWS(wp) |
| 7 | 736 wp->w_buffer->b_mod_set = FALSE; |
| 737 #else | |
| 738 curbuf->b_mod_set = FALSE; | |
| 739 #endif | |
| 740 | |
| 741 updating_screen = FALSE; | |
| 742 #ifdef FEAT_GUI | |
| 743 gui_may_resize_shell(); | |
| 744 #endif | |
| 745 | |
| 746 /* Clear or redraw the command line. Done last, because scrolling may | |
| 747 * mess up the command line. */ | |
| 748 if (clear_cmdline || redraw_cmdline) | |
| 749 showmode(); | |
| 750 | |
| 751 /* 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
|
752 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
753 maybe_intro_message(); |
| 7 | 754 did_intro = TRUE; |
| 755 | |
| 756 #ifdef FEAT_GUI | |
| 757 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 758 * done. */ | |
| 759 if (gui.in_use) | |
| 760 { | |
| 761 out_flush(); /* required before updating the cursor */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
762 if (did_undraw && !gui_mch_is_blink_off()) |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
763 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
764 /* 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
|
765 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
766 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
767 gui.row = gui_cursor_row; |
| 7 | 768 gui_update_cursor(FALSE, FALSE); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
769 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
770 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
771 } |
| 7 | 772 gui_update_scrollbars(FALSE); |
| 773 } | |
| 774 #endif | |
| 775 } | |
| 776 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
777 #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
|
778 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
779 * 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
|
780 * 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
|
781 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
782 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
783 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
|
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 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
|
786 |
|
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 (*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
|
788 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
|
789 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
|
790 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
|
791 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
|
792 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
|
793 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
|
794 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
795 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
796 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
|
797 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
798 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
|
799 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
|
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 |
|
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 * 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
|
804 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
805 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
806 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
|
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 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
|
809 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
810 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
|
811 /* 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
|
812 * 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
|
813 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
|
814 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
815 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
816 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
817 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
818 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
|
819 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
820 int row; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
821 int j; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
822 |
|
9100
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
823 /* 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
|
824 if (!screen_valid(TRUE)) |
|
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
825 return; |
|
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
826 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
827 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
|
828 && foldedCount(wp, lnum, &win_foldinfo) == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
829 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
830 # ifdef FEAT_GUI |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
831 /* 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
|
832 * 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
|
833 if (gui.in_use) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
834 gui_undraw_cursor(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
835 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
836 row = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
837 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
|
838 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
839 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
|
840 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
841 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
|
842 # ifdef FEAT_SEARCH_EXTRA |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
843 init_search_hl(wp); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
844 start_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
845 prepare_search_hl(wp, lnum); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
846 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
847 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
|
848 # if defined(FEAT_SEARCH_EXTRA) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
849 end_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
850 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
851 break; |
|
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 row += wp->w_lines[j].wl_size; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
854 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
855 # ifdef FEAT_GUI |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
856 /* Redraw the cursor */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
857 if (gui.in_use) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
858 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
859 out_flush(); /* required before updating the cursor */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
860 gui_update_cursor(FALSE, FALSE); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
861 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
862 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
863 } |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
864 need_cursor_line_redraw = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
865 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
866 #endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
867 |
| 7 | 868 #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
|
869 static void update_prepare(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
870 static void update_finish(void); |
| 7 | 871 |
| 872 /* | |
| 873 * Prepare for updating one or more windows. | |
| 2008 | 874 * Caller must check for "updating_screen" already set to avoid recursiveness. |
| 7 | 875 */ |
| 876 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
877 update_prepare(void) |
| 7 | 878 { |
| 879 cursor_off(); | |
| 880 updating_screen = TRUE; | |
| 881 #ifdef FEAT_GUI | |
| 882 /* Remove the cursor before starting to do anything, because scrolling may | |
| 883 * make it difficult to redraw the text under it. */ | |
| 884 if (gui.in_use) | |
| 885 gui_undraw_cursor(); | |
| 886 #endif | |
| 887 #ifdef FEAT_SEARCH_EXTRA | |
| 888 start_search_hl(); | |
| 889 #endif | |
| 890 } | |
| 891 | |
| 892 /* | |
| 893 * Finish updating one or more windows. | |
| 894 */ | |
| 895 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
896 update_finish(void) |
| 7 | 897 { |
| 898 if (redraw_cmdline) | |
| 899 showmode(); | |
| 900 | |
| 901 # ifdef FEAT_SEARCH_EXTRA | |
| 902 end_search_hl(); | |
| 903 # endif | |
| 904 | |
| 905 updating_screen = FALSE; | |
| 906 | |
| 907 # ifdef FEAT_GUI | |
| 908 gui_may_resize_shell(); | |
| 909 | |
| 910 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 911 * done. */ | |
| 912 if (gui.in_use) | |
| 913 { | |
| 914 out_flush(); /* required before updating the cursor */ | |
| 915 gui_update_cursor(FALSE, FALSE); | |
| 916 gui_update_scrollbars(FALSE); | |
| 917 } | |
| 918 # endif | |
| 919 } | |
| 920 #endif | |
| 921 | |
| 922 #if defined(FEAT_SIGNS) || defined(PROTO) | |
| 923 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
924 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 925 { |
| 926 win_T *wp; | |
| 927 int doit = FALSE; | |
| 928 | |
| 929 # ifdef FEAT_FOLDING | |
| 930 win_foldinfo.fi_level = 0; | |
| 931 # endif | |
| 932 | |
| 933 /* update/delete a specific mark */ | |
| 934 FOR_ALL_WINDOWS(wp) | |
| 935 { | |
| 936 if (buf != NULL && lnum > 0) | |
| 937 { | |
| 938 if (wp->w_buffer == buf && lnum >= wp->w_topline | |
| 939 && lnum < wp->w_botline) | |
| 940 { | |
| 941 if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) | |
| 942 wp->w_redraw_top = lnum; | |
| 943 if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) | |
| 944 wp->w_redraw_bot = lnum; | |
| 945 redraw_win_later(wp, VALID); | |
| 946 } | |
| 947 } | |
| 948 else | |
| 949 redraw_win_later(wp, VALID); | |
| 950 if (wp->w_redr_type != 0) | |
| 951 doit = TRUE; | |
| 952 } | |
| 953 | |
| 3250 | 954 /* Return when there is nothing to do, screen updating is already |
| 955 * happening (recursive call) or still starting up. */ | |
| 956 if (!doit || updating_screen | |
| 957 #ifdef FEAT_GUI | |
| 958 || gui.starting | |
| 959 #endif | |
| 960 || starting) | |
| 7 | 961 return; |
| 962 | |
| 963 /* update all windows that need updating */ | |
| 964 update_prepare(); | |
| 965 | |
| 966 # ifdef FEAT_WINDOWS | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
967 FOR_ALL_WINDOWS(wp) |
| 7 | 968 { |
| 969 if (wp->w_redr_type != 0) | |
| 970 win_update(wp); | |
| 971 if (wp->w_redr_status) | |
| 972 win_redr_status(wp); | |
| 973 } | |
| 974 # else | |
| 975 if (curwin->w_redr_type != 0) | |
| 976 win_update(curwin); | |
| 977 # endif | |
| 978 | |
| 979 update_finish(); | |
| 980 } | |
| 981 #endif | |
| 982 | |
| 983 | |
| 984 #if defined(FEAT_GUI) || defined(PROTO) | |
| 985 /* | |
| 986 * Update a single window, its status line and maybe the command line msg. | |
| 987 * Used for the GUI scrollbar. | |
| 988 */ | |
| 989 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
990 updateWindow(win_T *wp) |
| 7 | 991 { |
| 2008 | 992 /* return if already busy updating */ |
| 993 if (updating_screen) | |
| 994 return; | |
| 995 | |
| 7 | 996 update_prepare(); |
| 997 | |
| 998 #ifdef FEAT_CLIPBOARD | |
| 999 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1000 if (clip_star.available && clip_isautosel_star()) |
| 1001 clip_update_selection(&clip_star); | |
| 1002 if (clip_plus.available && clip_isautosel_plus()) | |
| 1003 clip_update_selection(&clip_plus); | |
| 7 | 1004 #endif |
| 670 | 1005 |
| 7 | 1006 win_update(wp); |
| 670 | 1007 |
| 7 | 1008 #ifdef FEAT_WINDOWS |
| 670 | 1009 /* When the screen was cleared redraw the tab pages line. */ |
| 673 | 1010 if (redraw_tabline) |
| 677 | 1011 draw_tabline(); |
| 670 | 1012 |
| 7 | 1013 if (wp->w_redr_status |
| 1014 # ifdef FEAT_CMDL_INFO | |
| 1015 || p_ru | |
| 1016 # endif | |
| 1017 # ifdef FEAT_STL_OPT | |
| 40 | 1018 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1019 # endif |
| 1020 ) | |
| 1021 win_redr_status(wp); | |
| 1022 #endif | |
| 1023 | |
| 1024 update_finish(); | |
| 1025 } | |
| 1026 #endif | |
| 1027 | |
| 1028 /* | |
| 1029 * Update a single window. | |
| 1030 * | |
| 1031 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1032 * screen or scrolling lines). | |
| 1033 * | |
| 1034 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1035 * implies the one below it. | |
| 1036 * NOT_VALID redraw the whole window | |
| 743 | 1037 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1038 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1039 * INVERTED redraw the changed part of the Visual area | |
| 1040 * INVERTED_ALL redraw the whole Visual area | |
| 1041 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1042 * 2. update lines at the top when scrolled down | |
| 1043 * 3. redraw changed text: | |
| 301 | 1044 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1045 * b_mod_top and b_mod_bot. |
| 1046 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1047 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1048 * - continue redrawing when syntax status is invalid. | |
| 1049 * 4. if scrolled up, update lines at the bottom. | |
| 1050 * This results in three areas that may need updating: | |
| 1051 * top: from first row to top_end (when scrolled down) | |
| 1052 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1053 * bot: from bot_start to last row (when scrolled up) | |
| 1054 */ | |
| 1055 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1056 win_update(win_T *wp) |
| 7 | 1057 { |
| 1058 buf_T *buf = wp->w_buffer; | |
| 1059 int type; | |
| 1060 int top_end = 0; /* Below last row of the top area that needs | |
| 1061 updating. 0 when no top area updating. */ | |
| 1062 int mid_start = 999;/* first row of the mid area that needs | |
| 1063 updating. 999 when no mid area updating. */ | |
| 1064 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1065 updating. 0 when no mid area updating. */ | |
| 1066 int bot_start = 999;/* first row of the bot area that needs | |
| 1067 updating. 999 when no bot area updating */ | |
| 1068 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1069 w_topline got smaller a bit */ | |
| 1070 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1071 matchitem_T *cur; /* points to the match list */ |
| 7 | 1072 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1073 #endif | |
| 1074 | |
| 1075 int row; /* current window row to display */ | |
| 1076 linenr_T lnum; /* current buffer lnum to display */ | |
| 1077 int idx; /* current index in w_lines[] */ | |
| 1078 int srow; /* starting row of the current line */ | |
| 1079 | |
| 1080 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1081 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1082 int i; | |
| 1083 long j; | |
| 1084 static int recursive = FALSE; /* being called recursively */ | |
| 1085 int old_botline = wp->w_botline; | |
| 1086 #ifdef FEAT_FOLDING | |
| 1087 long fold_count; | |
| 1088 #endif | |
| 1089 #ifdef FEAT_SYN_HL | |
| 1090 /* remember what happened to the previous line, to know if | |
| 1091 * check_visual_highlight() can be used */ | |
| 1092 #define DID_NONE 1 /* didn't update a line */ | |
| 1093 #define DID_LINE 2 /* updated a normal line */ | |
| 1094 #define DID_FOLD 3 /* updated a folded line */ | |
| 1095 int did_update = DID_NONE; | |
| 1096 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1097 #endif | |
| 1098 linenr_T mod_top = 0; | |
| 1099 linenr_T mod_bot = 0; | |
| 1100 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1101 int save_got_int; | |
| 1102 #endif | |
| 1103 | |
| 1104 type = wp->w_redr_type; | |
| 1105 | |
| 1106 if (type == NOT_VALID) | |
| 1107 { | |
| 1108 #ifdef FEAT_WINDOWS | |
| 1109 wp->w_redr_status = TRUE; | |
| 1110 #endif | |
| 1111 wp->w_lines_valid = 0; | |
| 1112 } | |
| 1113 | |
| 1114 /* Window is zero-height: nothing to draw. */ | |
| 1115 if (wp->w_height == 0) | |
| 1116 { | |
| 1117 wp->w_redr_type = 0; | |
| 1118 return; | |
| 1119 } | |
| 1120 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
1121 #ifdef FEAT_WINDOWS |
| 7 | 1122 /* Window is zero-width: Only need to draw the separator. */ |
| 1123 if (wp->w_width == 0) | |
| 1124 { | |
| 1125 /* draw the vertical separator right of this window */ | |
| 1126 draw_vsep_win(wp, 0); | |
| 1127 wp->w_redr_type = 0; | |
| 1128 return; | |
| 1129 } | |
| 1130 #endif | |
| 1131 | |
| 1132 #ifdef FEAT_SEARCH_EXTRA | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1133 init_search_hl(wp); |
| 7 | 1134 #endif |
| 1135 | |
| 13 | 1136 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1137 /* 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
|
1138 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1139 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1140 if (wp->w_nrwidth != i) |
| 13 | 1141 { |
| 1142 type = NOT_VALID; | |
| 677 | 1143 wp->w_nrwidth = i; |
| 13 | 1144 } |
| 1145 else | |
| 1146 #endif | |
| 1147 | |
| 7 | 1148 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1149 { | |
| 1150 /* | |
| 1151 * When there are both inserted/deleted lines and specific lines to be | |
| 1152 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1153 * everything (only happens when redrawing is off for while). | |
| 1154 */ | |
| 1155 type = NOT_VALID; | |
| 1156 } | |
| 1157 else | |
| 1158 { | |
| 1159 /* | |
| 1160 * Set mod_top to the first line that needs displaying because of | |
| 1161 * changes. Set mod_bot to the first line after the changes. | |
| 1162 */ | |
| 1163 mod_top = wp->w_redraw_top; | |
| 1164 if (wp->w_redraw_bot != 0) | |
| 1165 mod_bot = wp->w_redraw_bot + 1; | |
| 1166 else | |
| 1167 mod_bot = 0; | |
| 1168 wp->w_redraw_top = 0; /* reset for next time */ | |
| 1169 wp->w_redraw_bot = 0; | |
| 1170 if (buf->b_mod_set) | |
| 1171 { | |
| 1172 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1173 { | |
| 1174 mod_top = buf->b_mod_top; | |
| 1175 #ifdef FEAT_SYN_HL | |
| 1176 /* Need to redraw lines above the change that may be included | |
| 1177 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1178 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1179 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1180 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1181 if (mod_top < 1) |
| 1182 mod_top = 1; | |
| 1183 } | |
| 1184 #endif | |
| 1185 } | |
| 1186 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1187 mod_bot = buf->b_mod_bot; | |
| 1188 | |
| 1189 #ifdef FEAT_SEARCH_EXTRA | |
| 1190 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1191 * change in one line may make the Search highlighting in a | |
| 1192 * previous line invalid. Simple solution: redraw all visible | |
| 1193 * lines above the change. | |
| 1326 | 1194 * Same for a match pattern. |
| 7 | 1195 */ |
| 699 | 1196 if (search_hl.rm.regprog != NULL |
| 1197 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1198 top_to_mod = TRUE; |
| 699 | 1199 else |
| 1326 | 1200 { |
| 1201 cur = wp->w_match_head; | |
| 1202 while (cur != NULL) | |
| 1203 { | |
| 1204 if (cur->match.regprog != NULL | |
| 1205 && re_multiline(cur->match.regprog)) | |
| 699 | 1206 { |
| 1207 top_to_mod = TRUE; | |
| 1208 break; | |
| 1209 } | |
| 1326 | 1210 cur = cur->next; |
| 1211 } | |
| 1212 } | |
| 7 | 1213 #endif |
| 1214 } | |
| 1215 #ifdef FEAT_FOLDING | |
| 1216 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1217 { | |
| 1218 linenr_T lnumt, lnumb; | |
| 1219 | |
| 1220 /* | |
| 1221 * A change in a line can cause lines above it to become folded or | |
| 1222 * unfolded. Find the top most buffer line that may be affected. | |
| 1223 * If the line was previously folded and displayed, get the first | |
| 1224 * line of that fold. If the line is folded now, get the first | |
| 1225 * folded line. Use the minimum of these two. | |
| 1226 */ | |
| 1227 | |
| 1228 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1229 * the line below it. If there is no valid entry, use w_topline. | |
| 1230 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1231 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1232 lnumt = wp->w_topline; | |
| 1233 lnumb = MAXLNUM; | |
| 1234 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1235 if (wp->w_lines[i].wl_valid) | |
| 1236 { | |
| 1237 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1238 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1239 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1240 { | |
| 1241 lnumb = wp->w_lines[i].wl_lnum; | |
| 1242 /* When there is a fold column it might need updating | |
| 1243 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1244 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1245 ++lnumb; |
| 1246 } | |
| 1247 } | |
| 1248 | |
| 1249 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1250 if (mod_top > lnumt) | |
| 1251 mod_top = lnumt; | |
| 1252 | |
| 1253 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1254 --mod_bot; | |
| 1255 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1256 ++mod_bot; | |
| 1257 if (mod_bot < lnumb) | |
| 1258 mod_bot = lnumb; | |
| 1259 } | |
| 1260 #endif | |
| 1261 | |
| 1262 /* When a change starts above w_topline and the end is below | |
| 1263 * w_topline, start redrawing at w_topline. | |
| 36 | 1264 * If the end of the change is above w_topline: do like no change was |
| 1265 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1266 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1267 { | |
| 1268 if (mod_bot > wp->w_topline) | |
| 1269 mod_top = wp->w_topline; | |
| 1270 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1271 else if (syntax_present(wp)) |
| 7 | 1272 top_end = 1; |
| 1273 #endif | |
| 1274 } | |
| 36 | 1275 |
| 1276 /* When line numbers are displayed need to redraw all lines below | |
| 1277 * inserted/deleted lines. */ | |
| 1278 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1279 mod_bot = MAXLNUM; | |
| 7 | 1280 } |
| 1281 | |
| 1282 /* | |
| 1283 * When only displaying the lines at the top, set top_end. Used when | |
| 1284 * window has scrolled down for msg_scrolled. | |
| 1285 */ | |
| 1286 if (type == REDRAW_TOP) | |
| 1287 { | |
| 1288 j = 0; | |
| 1289 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1290 { | |
| 1291 j += wp->w_lines[i].wl_size; | |
| 1292 if (j >= wp->w_upd_rows) | |
| 1293 { | |
| 1294 top_end = j; | |
| 1295 break; | |
| 1296 } | |
| 1297 } | |
| 1298 if (top_end == 0) | |
| 1299 /* not found (cannot happen?): redraw everything */ | |
| 1300 type = NOT_VALID; | |
| 1301 else | |
| 1302 /* top area defined, the rest is VALID */ | |
| 1303 type = VALID; | |
| 1304 } | |
| 1305 | |
| 1378 | 1306 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1307 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1308 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1309 * called. */ | |
| 1310 if (screen_cleared) | |
| 1311 screen_cleared = MAYBE; | |
| 1312 | |
| 7 | 1313 /* |
| 1314 * If there are no changes on the screen that require a complete redraw, | |
| 1315 * handle three cases: | |
| 1316 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1317 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1318 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1319 * w_lines[] that needs updating. | |
| 1320 */ | |
| 743 | 1321 if ((type == VALID || type == SOME_VALID |
| 1322 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1323 #ifdef FEAT_DIFF |
| 1324 && !wp->w_botfill && !wp->w_old_botfill | |
| 1325 #endif | |
| 1326 ) | |
| 1327 { | |
| 1328 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1329 { | |
| 1330 /* | |
| 1331 * w_topline is the first changed line, the scrolling will be done | |
| 1332 * further down. | |
| 1333 */ | |
| 1334 } | |
| 1335 else if (wp->w_lines[0].wl_valid | |
| 1336 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1337 #ifdef FEAT_DIFF | |
| 1338 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1339 && wp->w_topfill > wp->w_old_topfill) | |
| 1340 #endif | |
| 1341 )) | |
| 1342 { | |
| 1343 /* | |
| 1344 * New topline is above old topline: May scroll down. | |
| 1345 */ | |
| 1346 #ifdef FEAT_FOLDING | |
| 1347 if (hasAnyFolding(wp)) | |
| 1348 { | |
| 1349 linenr_T ln; | |
| 1350 | |
| 1351 /* count the number of lines we are off, counting a sequence | |
| 1352 * of folded lines as one */ | |
| 1353 j = 0; | |
| 1354 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1355 { | |
| 1356 ++j; | |
| 1357 if (j >= wp->w_height - 2) | |
| 1358 break; | |
| 1359 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1360 } | |
| 1361 } | |
| 1362 else | |
| 1363 #endif | |
| 1364 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1365 if (j < wp->w_height - 2) /* not too far off */ | |
| 1366 { | |
| 1367 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1368 #ifdef FEAT_DIFF | |
| 1369 /* insert extra lines for previously invisible filler lines */ | |
| 1370 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1371 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1372 - wp->w_old_topfill; | |
| 1373 #endif | |
| 1374 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1375 { | |
| 1376 /* | |
| 1377 * Try to insert the correct number of lines. | |
| 1378 * If not the last window, delete the lines at the bottom. | |
| 1379 * win_ins_lines may fail when the terminal can't do it. | |
| 1380 */ | |
| 1381 if (i > 0) | |
| 1382 check_for_delay(FALSE); | |
| 1383 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1384 { | |
| 1385 if (wp->w_lines_valid != 0) | |
| 1386 { | |
| 1387 /* Need to update rows that are new, stop at the | |
| 1388 * first one that scrolled down. */ | |
| 1389 top_end = i; | |
| 1390 scrolled_down = TRUE; | |
| 1391 | |
| 1392 /* Move the entries that were scrolled, disable | |
| 1393 * the entries for the lines to be redrawn. */ | |
| 1394 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1395 wp->w_lines_valid = wp->w_height; | |
| 1396 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1397 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1398 while (idx >= 0) | |
| 1399 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1400 } | |
| 1401 } | |
| 1402 else | |
| 1403 mid_start = 0; /* redraw all lines */ | |
| 1404 } | |
| 1405 else | |
| 1406 mid_start = 0; /* redraw all lines */ | |
| 1407 } | |
| 1408 else | |
| 1409 mid_start = 0; /* redraw all lines */ | |
| 1410 } | |
| 1411 else | |
| 1412 { | |
| 1413 /* | |
| 1414 * New topline is at or below old topline: May scroll up. | |
| 1415 * When topline didn't change, find first entry in w_lines[] that | |
| 1416 * needs updating. | |
| 1417 */ | |
| 1418 | |
| 1419 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1420 j = -1; | |
| 1421 row = 0; | |
| 1422 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1423 { | |
| 1424 if (wp->w_lines[i].wl_valid | |
| 1425 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1426 { | |
| 1427 j = i; | |
| 1428 break; | |
| 1429 } | |
| 1430 row += wp->w_lines[i].wl_size; | |
| 1431 } | |
| 1432 if (j == -1) | |
| 1433 { | |
| 1434 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1435 * lines */ | |
| 1436 mid_start = 0; | |
| 1437 } | |
| 1438 else | |
| 1439 { | |
| 1440 /* | |
| 1441 * Try to delete the correct number of lines. | |
| 1442 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1443 */ | |
| 1444 #ifdef FEAT_DIFF | |
| 1445 /* If the topline didn't change, delete old filler lines, | |
| 1446 * otherwise delete filler lines of the new topline... */ | |
| 1447 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1448 row += wp->w_old_topfill; | |
| 1449 else | |
| 1450 row += diff_check_fill(wp, wp->w_topline); | |
| 1451 /* ... but don't delete new filler lines. */ | |
| 1452 row -= wp->w_topfill; | |
| 1453 #endif | |
| 1454 if (row > 0) | |
| 1455 { | |
| 1456 check_for_delay(FALSE); | |
| 1457 if (win_del_lines(wp, 0, row, FALSE, wp == firstwin) == OK) | |
| 1458 bot_start = wp->w_height - row; | |
| 1459 else | |
| 1460 mid_start = 0; /* redraw all lines */ | |
| 1461 } | |
| 1462 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1463 { | |
| 1464 /* | |
| 1465 * Skip the lines (below the deleted lines) that are still | |
| 1466 * valid and don't need redrawing. Copy their info | |
| 1467 * upwards, to compensate for the deleted lines. Set | |
| 1468 * bot_start to the first row that needs redrawing. | |
| 1469 */ | |
| 1470 bot_start = 0; | |
| 1471 idx = 0; | |
| 1472 for (;;) | |
| 1473 { | |
| 1474 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1475 /* stop at line that didn't fit, unless it is still | |
| 1476 * valid (no lines deleted) */ | |
| 1477 if (row > 0 && bot_start + row | |
| 1478 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1479 { | |
| 1480 wp->w_lines_valid = idx + 1; | |
| 1481 break; | |
| 1482 } | |
| 1483 bot_start += wp->w_lines[idx++].wl_size; | |
| 1484 | |
| 1485 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1486 if (++j >= wp->w_lines_valid) | |
| 1487 { | |
| 1488 wp->w_lines_valid = idx; | |
| 1489 break; | |
| 1490 } | |
| 1491 } | |
| 1492 #ifdef FEAT_DIFF | |
| 1493 /* Correct the first entry for filler lines at the top | |
| 1494 * when it won't get updated below. */ | |
| 1495 if (wp->w_p_diff && bot_start > 0) | |
| 1496 wp->w_lines[0].wl_size = | |
| 1497 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1498 + wp->w_topfill; | |
| 1499 #endif | |
| 1500 } | |
| 1501 } | |
| 1502 } | |
| 1503 | |
| 1504 /* When starting redraw in the first line, redraw all lines. When | |
| 1505 * there is only one window it's probably faster to clear the screen | |
| 1506 * first. */ | |
| 1507 if (mid_start == 0) | |
| 1508 { | |
| 1509 mid_end = wp->w_height; | |
| 1510 if (lastwin == firstwin) | |
| 981 | 1511 { |
| 1331 | 1512 /* Clear the screen when it was not done by win_del_lines() or |
| 1513 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1514 * then. */ | |
| 1515 if (screen_cleared != TRUE) | |
| 1516 screenclear(); | |
| 981 | 1517 #ifdef FEAT_WINDOWS |
| 1518 /* The screen was cleared, redraw the tab pages line. */ | |
| 1519 if (redraw_tabline) | |
| 1520 draw_tabline(); | |
| 1521 #endif | |
| 1522 } | |
| 7 | 1523 } |
| 1331 | 1524 |
| 1525 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1526 * cleared (only happens for the first window) or when screenclear() | |
| 1527 * was called directly above, "must_redraw" will have been set to | |
| 1528 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1529 if (screen_cleared == TRUE) | |
| 1530 must_redraw = 0; | |
| 7 | 1531 } |
| 1532 else | |
| 1533 { | |
| 1534 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1535 mid_start = 0; | |
| 1536 mid_end = wp->w_height; | |
| 1537 } | |
| 1538 | |
| 743 | 1539 if (type == SOME_VALID) |
| 1540 { | |
| 1541 /* SOME_VALID: redraw all lines. */ | |
| 1542 mid_start = 0; | |
| 1543 mid_end = wp->w_height; | |
| 1544 type = NOT_VALID; | |
| 1545 } | |
| 1546 | |
| 7 | 1547 /* check if we are updating or removing the inverted part */ |
| 1548 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1549 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1550 { | |
| 1551 linenr_T from, to; | |
| 1552 | |
| 1553 if (VIsual_active) | |
| 1554 { | |
| 1555 if (VIsual_active | |
| 1556 && (VIsual_mode != wp->w_old_visual_mode | |
| 1557 || type == INVERTED_ALL)) | |
| 1558 { | |
| 1559 /* | |
| 1560 * If the type of Visual selection changed, redraw the whole | |
| 1561 * selection. Also when the ownership of the X selection is | |
| 1562 * gained or lost. | |
| 1563 */ | |
| 1564 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1565 { | |
| 1566 from = curwin->w_cursor.lnum; | |
| 1567 to = VIsual.lnum; | |
| 1568 } | |
| 1569 else | |
| 1570 { | |
| 1571 from = VIsual.lnum; | |
| 1572 to = curwin->w_cursor.lnum; | |
| 1573 } | |
| 1574 /* redraw more when the cursor moved as well */ | |
| 1575 if (wp->w_old_cursor_lnum < from) | |
| 1576 from = wp->w_old_cursor_lnum; | |
| 1577 if (wp->w_old_cursor_lnum > to) | |
| 1578 to = wp->w_old_cursor_lnum; | |
| 1579 if (wp->w_old_visual_lnum < from) | |
| 1580 from = wp->w_old_visual_lnum; | |
| 1581 if (wp->w_old_visual_lnum > to) | |
| 1582 to = wp->w_old_visual_lnum; | |
| 1583 } | |
| 1584 else | |
| 1585 { | |
| 1586 /* | |
| 1587 * Find the line numbers that need to be updated: The lines | |
| 1588 * between the old cursor position and the current cursor | |
| 1589 * position. Also check if the Visual position changed. | |
| 1590 */ | |
| 1591 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1592 { | |
| 1593 from = curwin->w_cursor.lnum; | |
| 1594 to = wp->w_old_cursor_lnum; | |
| 1595 } | |
| 1596 else | |
| 1597 { | |
| 1598 from = wp->w_old_cursor_lnum; | |
| 1599 to = curwin->w_cursor.lnum; | |
| 1600 if (from == 0) /* Visual mode just started */ | |
| 1601 from = to; | |
| 1602 } | |
| 1603 | |
| 422 | 1604 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1605 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1606 { |
| 1607 if (wp->w_old_visual_lnum < from | |
| 1608 && wp->w_old_visual_lnum != 0) | |
| 1609 from = wp->w_old_visual_lnum; | |
| 1610 if (wp->w_old_visual_lnum > to) | |
| 1611 to = wp->w_old_visual_lnum; | |
| 1612 if (VIsual.lnum < from) | |
| 1613 from = VIsual.lnum; | |
| 1614 if (VIsual.lnum > to) | |
| 1615 to = VIsual.lnum; | |
| 1616 } | |
| 1617 } | |
| 1618 | |
| 1619 /* | |
| 1620 * If in block mode and changed column or curwin->w_curswant: | |
| 1621 * update all lines. | |
| 1622 * First compute the actual start and end column. | |
| 1623 */ | |
| 1624 if (VIsual_mode == Ctrl_V) | |
| 1625 { | |
| 6266 | 1626 colnr_T fromc, toc; |
| 1627 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) | |
| 1628 int save_ve_flags = ve_flags; | |
| 1629 | |
| 1630 if (curwin->w_p_lbr) | |
| 1631 ve_flags = VE_ALL; | |
| 1632 #endif | |
| 7 | 1633 getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); |
| 6266 | 1634 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) |
| 1635 ve_flags = save_ve_flags; | |
| 1636 #endif | |
| 7 | 1637 ++toc; |
| 1638 if (curwin->w_curswant == MAXCOL) | |
| 1639 toc = MAXCOL; | |
| 1640 | |
| 1641 if (fromc != wp->w_old_cursor_fcol | |
| 1642 || toc != wp->w_old_cursor_lcol) | |
| 1643 { | |
| 1644 if (from > VIsual.lnum) | |
| 1645 from = VIsual.lnum; | |
| 1646 if (to < VIsual.lnum) | |
| 1647 to = VIsual.lnum; | |
| 1648 } | |
| 1649 wp->w_old_cursor_fcol = fromc; | |
| 1650 wp->w_old_cursor_lcol = toc; | |
| 1651 } | |
| 1652 } | |
| 1653 else | |
| 1654 { | |
| 1655 /* Use the line numbers of the old Visual area. */ | |
| 1656 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1657 { | |
| 1658 from = wp->w_old_cursor_lnum; | |
| 1659 to = wp->w_old_visual_lnum; | |
| 1660 } | |
| 1661 else | |
| 1662 { | |
| 1663 from = wp->w_old_visual_lnum; | |
| 1664 to = wp->w_old_cursor_lnum; | |
| 1665 } | |
| 1666 } | |
| 1667 | |
| 1668 /* | |
| 1669 * There is no need to update lines above the top of the window. | |
| 1670 */ | |
| 1671 if (from < wp->w_topline) | |
| 1672 from = wp->w_topline; | |
| 1673 | |
| 1674 /* | |
| 1675 * If we know the value of w_botline, use it to restrict the update to | |
| 1676 * the lines that are visible in the window. | |
| 1677 */ | |
| 1678 if (wp->w_valid & VALID_BOTLINE) | |
| 1679 { | |
| 1680 if (from >= wp->w_botline) | |
| 1681 from = wp->w_botline - 1; | |
| 1682 if (to >= wp->w_botline) | |
| 1683 to = wp->w_botline - 1; | |
| 1684 } | |
| 1685 | |
| 1686 /* | |
| 1687 * Find the minimal part to be updated. | |
| 1688 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1689 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1690 * top_end; need to redraw from top_end to the "to" line. | |
| 1691 * A middle mouse click with a Visual selection may change the text | |
| 1692 * above the Visual area and reset wl_valid, do count these for | |
| 1693 * mid_end (in srow). | |
| 1694 */ | |
| 1695 if (mid_start > 0) | |
| 1696 { | |
| 1697 lnum = wp->w_topline; | |
| 1698 idx = 0; | |
| 1699 srow = 0; | |
| 1700 if (scrolled_down) | |
| 1701 mid_start = top_end; | |
| 1702 else | |
| 1703 mid_start = 0; | |
| 1704 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1705 { | |
| 1706 if (wp->w_lines[idx].wl_valid) | |
| 1707 mid_start += wp->w_lines[idx].wl_size; | |
| 1708 else if (!scrolled_down) | |
| 1709 srow += wp->w_lines[idx].wl_size; | |
| 1710 ++idx; | |
| 1711 # ifdef FEAT_FOLDING | |
| 1712 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1713 lnum = wp->w_lines[idx].wl_lnum; | |
| 1714 else | |
| 1715 # endif | |
| 1716 ++lnum; | |
| 1717 } | |
| 1718 srow += mid_start; | |
| 1719 mid_end = wp->w_height; | |
| 1720 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1721 { | |
| 1722 if (wp->w_lines[idx].wl_valid | |
| 1723 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1724 { | |
| 1725 /* Only update until first row of this line */ | |
| 1726 mid_end = srow; | |
| 1727 break; | |
| 1728 } | |
| 1729 srow += wp->w_lines[idx].wl_size; | |
| 1730 } | |
| 1731 } | |
| 1732 } | |
| 1733 | |
| 1734 if (VIsual_active && buf == curwin->w_buffer) | |
| 1735 { | |
| 1736 wp->w_old_visual_mode = VIsual_mode; | |
| 1737 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1738 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1739 wp->w_old_visual_col = VIsual.col; |
| 7 | 1740 wp->w_old_curswant = curwin->w_curswant; |
| 1741 } | |
| 1742 else | |
| 1743 { | |
| 1744 wp->w_old_visual_mode = 0; | |
| 1745 wp->w_old_cursor_lnum = 0; | |
| 1746 wp->w_old_visual_lnum = 0; | |
| 422 | 1747 wp->w_old_visual_col = 0; |
| 7 | 1748 } |
| 1749 | |
| 1750 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1751 /* reset got_int, otherwise regexp won't work */ | |
| 1752 save_got_int = got_int; | |
| 1753 got_int = 0; | |
| 1754 #endif | |
| 1755 #ifdef FEAT_FOLDING | |
| 1756 win_foldinfo.fi_level = 0; | |
| 1757 #endif | |
| 1758 | |
| 1759 /* | |
| 1760 * Update all the window rows. | |
| 1761 */ | |
| 1762 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1763 row = 0; | |
| 1764 srow = 0; | |
| 1765 lnum = wp->w_topline; /* first line shown in window */ | |
| 1766 for (;;) | |
| 1767 { | |
| 1768 /* stop updating when reached the end of the window (check for _past_ | |
| 1769 * the end of the window is at the end of the loop) */ | |
| 1770 if (row == wp->w_height) | |
| 1771 { | |
| 1772 didline = TRUE; | |
| 1773 break; | |
| 1774 } | |
| 1775 | |
| 1776 /* stop updating when hit the end of the file */ | |
| 1777 if (lnum > buf->b_ml.ml_line_count) | |
| 1778 { | |
| 1779 eof = TRUE; | |
| 1780 break; | |
| 1781 } | |
| 1782 | |
| 1783 /* Remember the starting row of the line that is going to be dealt | |
| 1784 * with. It is used further down when the line doesn't fit. */ | |
| 1785 srow = row; | |
| 1786 | |
| 1787 /* | |
| 1788 * Update a line when it is in an area that needs updating, when it | |
| 1789 * has changes or w_lines[idx] is invalid. | |
| 1790 * bot_start may be halfway a wrapped line after using | |
| 1791 * win_del_lines(), check if the current line includes it. | |
| 1792 * When syntax folding is being used, the saved syntax states will | |
| 1793 * already have been updated, we can't see where the syntax state is | |
| 1794 * the same again, just update until the end of the window. | |
| 1795 */ | |
| 1796 if (row < top_end | |
| 1797 || (row >= mid_start && row < mid_end) | |
| 1798 #ifdef FEAT_SEARCH_EXTRA | |
| 1799 || top_to_mod | |
| 1800 #endif | |
| 1801 || idx >= wp->w_lines_valid | |
| 1802 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1803 || (mod_top != 0 | |
| 1804 && (lnum == mod_top | |
| 1805 || (lnum >= mod_top | |
| 1806 && (lnum < mod_bot | |
| 1807 #ifdef FEAT_SYN_HL | |
| 1808 || did_update == DID_FOLD | |
| 1809 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1810 && syntax_present(wp) |
| 7 | 1811 && ( |
| 1812 # ifdef FEAT_FOLDING | |
| 1813 (foldmethodIsSyntax(wp) | |
| 1814 && hasAnyFolding(wp)) || | |
| 1815 # endif | |
| 1816 syntax_check_changed(lnum))) | |
| 1817 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1818 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1819 /* match in fixed position might need redraw |
| 1820 * if lines were inserted or deleted */ | |
| 1821 || (wp->w_match_head != NULL | |
| 1822 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1823 #endif |
| 7 | 1824 ))))) |
| 1825 { | |
| 1826 #ifdef FEAT_SEARCH_EXTRA | |
| 1827 if (lnum == mod_top) | |
| 1828 top_to_mod = FALSE; | |
| 1829 #endif | |
| 1830 | |
| 1831 /* | |
| 1832 * When at start of changed lines: May scroll following lines | |
| 1833 * up or down to minimize redrawing. | |
| 1834 * Don't do this when the change continues until the end. | |
| 3318 | 1835 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1836 */ |
| 1837 if (lnum == mod_top | |
| 1838 && mod_bot != MAXLNUM | |
| 3318 | 1839 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1840 { |
| 1841 int old_rows = 0; | |
| 1842 int new_rows = 0; | |
| 1843 int xtra_rows; | |
| 1844 linenr_T l; | |
| 1845 | |
| 1846 /* Count the old number of window rows, using w_lines[], which | |
| 1847 * should still contain the sizes for the lines as they are | |
| 1848 * currently displayed. */ | |
| 1849 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1850 { | |
| 1851 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1852 * lines are part of the changed area. */ | |
| 1853 if (wp->w_lines[i].wl_valid | |
| 1854 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1855 break; | |
| 1856 old_rows += wp->w_lines[i].wl_size; | |
| 1857 #ifdef FEAT_FOLDING | |
| 1858 if (wp->w_lines[i].wl_valid | |
| 1859 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1860 { | |
| 1861 /* Must have found the last valid entry above mod_bot. | |
| 1862 * Add following invalid entries. */ | |
| 1863 ++i; | |
| 1864 while (i < wp->w_lines_valid | |
| 1865 && !wp->w_lines[i].wl_valid) | |
| 1866 old_rows += wp->w_lines[i++].wl_size; | |
| 1867 break; | |
| 1868 } | |
| 1869 #endif | |
| 1870 } | |
| 1871 | |
| 1872 if (i >= wp->w_lines_valid) | |
| 1873 { | |
| 1874 /* We can't find a valid line below the changed lines, | |
| 1875 * need to redraw until the end of the window. | |
| 1876 * Inserting/deleting lines has no use. */ | |
| 1877 bot_start = 0; | |
| 1878 } | |
| 1879 else | |
| 1880 { | |
| 1881 /* Able to count old number of rows: Count new window | |
| 1882 * rows, and may insert/delete lines */ | |
| 1883 j = idx; | |
| 1884 for (l = lnum; l < mod_bot; ++l) | |
| 1885 { | |
| 1886 #ifdef FEAT_FOLDING | |
| 1887 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1888 ++new_rows; | |
| 1889 else | |
| 1890 #endif | |
| 1891 #ifdef FEAT_DIFF | |
| 1892 if (l == wp->w_topline) | |
| 1893 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1894 + wp->w_topfill; | |
| 1895 else | |
| 1896 #endif | |
| 1897 new_rows += plines_win(wp, l, TRUE); | |
| 1898 ++j; | |
| 1899 if (new_rows > wp->w_height - row - 2) | |
| 1900 { | |
| 1901 /* it's getting too much, must redraw the rest */ | |
| 1902 new_rows = 9999; | |
| 1903 break; | |
| 1904 } | |
| 1905 } | |
| 1906 xtra_rows = new_rows - old_rows; | |
| 1907 if (xtra_rows < 0) | |
| 1908 { | |
| 1909 /* May scroll text up. If there is not enough | |
| 1910 * remaining text or scrolling fails, must redraw the | |
| 1911 * rest. If scrolling works, must redraw the text | |
| 1912 * below the scrolled text. */ | |
| 1913 if (row - xtra_rows >= wp->w_height - 2) | |
| 1914 mod_bot = MAXLNUM; | |
| 1915 else | |
| 1916 { | |
| 1917 check_for_delay(FALSE); | |
| 1918 if (win_del_lines(wp, row, | |
| 1919 -xtra_rows, FALSE, FALSE) == FAIL) | |
| 1920 mod_bot = MAXLNUM; | |
| 1921 else | |
| 1922 bot_start = wp->w_height + xtra_rows; | |
| 1923 } | |
| 1924 } | |
| 1925 else if (xtra_rows > 0) | |
| 1926 { | |
| 1927 /* May scroll text down. If there is not enough | |
| 1928 * remaining text of scrolling fails, must redraw the | |
| 1929 * rest. */ | |
| 1930 if (row + xtra_rows >= wp->w_height - 2) | |
| 1931 mod_bot = MAXLNUM; | |
| 1932 else | |
| 1933 { | |
| 1934 check_for_delay(FALSE); | |
| 1935 if (win_ins_lines(wp, row + old_rows, | |
| 1936 xtra_rows, FALSE, FALSE) == FAIL) | |
| 1937 mod_bot = MAXLNUM; | |
| 1938 else if (top_end > row + old_rows) | |
| 1939 /* Scrolled the part at the top that requires | |
| 1940 * updating down. */ | |
| 1941 top_end += xtra_rows; | |
| 1942 } | |
| 1943 } | |
| 1944 | |
| 1945 /* When not updating the rest, may need to move w_lines[] | |
| 1946 * entries. */ | |
| 1947 if (mod_bot != MAXLNUM && i != j) | |
| 1948 { | |
| 1949 if (j < i) | |
| 1950 { | |
| 1951 int x = row + new_rows; | |
| 1952 | |
| 1953 /* move entries in w_lines[] upwards */ | |
| 1954 for (;;) | |
| 1955 { | |
| 1956 /* stop at last valid entry in w_lines[] */ | |
| 1957 if (i >= wp->w_lines_valid) | |
| 1958 { | |
| 1959 wp->w_lines_valid = j; | |
| 1960 break; | |
| 1961 } | |
| 1962 wp->w_lines[j] = wp->w_lines[i]; | |
| 1963 /* stop at a line that won't fit */ | |
| 1964 if (x + (int)wp->w_lines[j].wl_size | |
| 1965 > wp->w_height) | |
| 1966 { | |
| 1967 wp->w_lines_valid = j + 1; | |
| 1968 break; | |
| 1969 } | |
| 1970 x += wp->w_lines[j++].wl_size; | |
| 1971 ++i; | |
| 1972 } | |
| 1973 if (bot_start > x) | |
| 1974 bot_start = x; | |
| 1975 } | |
| 1976 else /* j > i */ | |
| 1977 { | |
| 1978 /* move entries in w_lines[] downwards */ | |
| 1979 j -= i; | |
| 1980 wp->w_lines_valid += j; | |
| 1981 if (wp->w_lines_valid > wp->w_height) | |
| 1982 wp->w_lines_valid = wp->w_height; | |
| 1983 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 1984 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 1985 | |
| 1986 /* The w_lines[] entries for inserted lines are | |
| 1987 * now invalid, but wl_size may be used above. | |
| 1988 * Reset to zero. */ | |
| 1989 while (i >= idx) | |
| 1990 { | |
| 1991 wp->w_lines[i].wl_size = 0; | |
| 1992 wp->w_lines[i--].wl_valid = FALSE; | |
| 1993 } | |
| 1994 } | |
| 1995 } | |
| 1996 } | |
| 1997 } | |
| 1998 | |
| 1999 #ifdef FEAT_FOLDING | |
| 2000 /* | |
| 2001 * When lines are folded, display one line for all of them. | |
| 2002 * Otherwise, display normally (can be several display lines when | |
| 2003 * 'wrap' is on). | |
| 2004 */ | |
| 2005 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2006 if (fold_count != 0) | |
| 2007 { | |
| 2008 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2009 ++row; | |
| 2010 --fold_count; | |
| 2011 wp->w_lines[idx].wl_folded = TRUE; | |
| 2012 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2013 # ifdef FEAT_SYN_HL | |
| 2014 did_update = DID_FOLD; | |
| 2015 # endif | |
| 2016 } | |
| 2017 else | |
| 2018 #endif | |
| 2019 if (idx < wp->w_lines_valid | |
| 2020 && wp->w_lines[idx].wl_valid | |
| 2021 && wp->w_lines[idx].wl_lnum == lnum | |
| 2022 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2023 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
| 7 | 2024 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2025 #ifdef FEAT_DIFF | |
| 2026 && diff_check_fill(wp, lnum) == 0 | |
| 2027 #endif | |
| 2028 ) | |
| 2029 { | |
| 2030 /* This line is not going to fit. Don't draw anything here, | |
| 2031 * will draw "@ " lines below. */ | |
| 2032 row = wp->w_height + 1; | |
| 2033 } | |
| 2034 else | |
| 2035 { | |
| 2036 #ifdef FEAT_SEARCH_EXTRA | |
| 2037 prepare_search_hl(wp, lnum); | |
| 2038 #endif | |
| 2039 #ifdef FEAT_SYN_HL | |
| 2040 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2041 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
|
2042 && syntax_present(wp)) |
| 7 | 2043 syntax_end_parsing(syntax_last_parsed + 1); |
| 2044 #endif | |
| 2045 | |
| 2046 /* | |
| 2047 * Display one line. | |
| 2048 */ | |
| 625 | 2049 row = win_line(wp, lnum, srow, wp->w_height, mod_top == 0); |
| 7 | 2050 |
| 2051 #ifdef FEAT_FOLDING | |
| 2052 wp->w_lines[idx].wl_folded = FALSE; | |
| 2053 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2054 #endif | |
| 2055 #ifdef FEAT_SYN_HL | |
| 2056 did_update = DID_LINE; | |
| 2057 syntax_last_parsed = lnum; | |
| 2058 #endif | |
| 2059 } | |
| 2060 | |
| 2061 wp->w_lines[idx].wl_lnum = lnum; | |
| 2062 wp->w_lines[idx].wl_valid = TRUE; | |
| 2063 if (row > wp->w_height) /* past end of screen */ | |
| 2064 { | |
| 2065 /* we may need the size of that too long line later on */ | |
| 3318 | 2066 if (dollar_vcol == -1) |
| 7 | 2067 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2068 ++idx; | |
| 2069 break; | |
| 2070 } | |
| 3318 | 2071 if (dollar_vcol == -1) |
| 7 | 2072 wp->w_lines[idx].wl_size = row - srow; |
| 2073 ++idx; | |
| 2074 #ifdef FEAT_FOLDING | |
| 2075 lnum += fold_count + 1; | |
| 2076 #else | |
| 2077 ++lnum; | |
| 2078 #endif | |
| 2079 } | |
| 2080 else | |
| 2081 { | |
| 2082 /* This line does not need updating, advance to the next one */ | |
| 2083 row += wp->w_lines[idx++].wl_size; | |
| 2084 if (row > wp->w_height) /* past end of screen */ | |
| 2085 break; | |
| 2086 #ifdef FEAT_FOLDING | |
| 2087 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2088 #else | |
| 2089 ++lnum; | |
| 2090 #endif | |
| 2091 #ifdef FEAT_SYN_HL | |
| 2092 did_update = DID_NONE; | |
| 2093 #endif | |
| 2094 } | |
| 2095 | |
| 2096 if (lnum > buf->b_ml.ml_line_count) | |
| 2097 { | |
| 2098 eof = TRUE; | |
| 2099 break; | |
| 2100 } | |
| 2101 } | |
| 2102 /* | |
| 2103 * End of loop over all window lines. | |
| 2104 */ | |
| 2105 | |
| 2106 | |
| 2107 if (idx > wp->w_lines_valid) | |
| 2108 wp->w_lines_valid = idx; | |
| 2109 | |
| 2110 #ifdef FEAT_SYN_HL | |
| 2111 /* | |
| 2112 * Let the syntax stuff know we stop parsing here. | |
| 2113 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2114 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2115 syntax_end_parsing(syntax_last_parsed + 1); |
| 2116 #endif | |
| 2117 | |
| 2118 /* | |
| 2119 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2120 * line we were working on, then the line didn't fit. | |
| 2121 */ | |
| 2122 wp->w_empty_rows = 0; | |
| 2123 #ifdef FEAT_DIFF | |
| 2124 wp->w_filler_rows = 0; | |
| 2125 #endif | |
| 2126 if (!eof && !didline) | |
| 2127 { | |
| 2128 if (lnum == wp->w_topline) | |
| 2129 { | |
| 2130 /* | |
| 2131 * Single line that does not fit! | |
| 2132 * Don't overwrite it, it can be edited. | |
| 2133 */ | |
| 2134 wp->w_botline = lnum + 1; | |
| 2135 } | |
| 2136 #ifdef FEAT_DIFF | |
| 2137 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2138 { | |
| 2139 /* Window ends in filler lines. */ | |
| 2140 wp->w_botline = lnum; | |
| 2141 wp->w_filler_rows = wp->w_height - srow; | |
| 2142 } | |
| 2143 #endif | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2144 else if (dy_flags & DY_TRUNCATE) /* 'display' has "truncate" */ |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2145 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2146 int scr_row = W_WINROW(wp) + wp->w_height - 1; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2147 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2148 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2149 * Last line isn't finished: Display "@@@" in the last screen line. |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2150 */ |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2151 screen_puts_len((char_u *)"@@", 2, scr_row, W_WINCOL(wp), |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2152 hl_attr(HLF_AT)); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2153 screen_fill(scr_row, scr_row + 1, |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2154 (int)W_WINCOL(wp) + 2, (int)W_ENDCOL(wp), |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2155 '@', ' ', hl_attr(HLF_AT)); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2156 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2157 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2158 } |
| 7 | 2159 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2160 { | |
| 2161 /* | |
| 2162 * Last line isn't finished: Display "@@@" at the end. | |
| 2163 */ | |
| 2164 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2165 W_WINROW(wp) + wp->w_height, | |
| 2166 (int)W_ENDCOL(wp) - 3, (int)W_ENDCOL(wp), | |
| 2167 '@', '@', hl_attr(HLF_AT)); | |
| 2168 set_empty_rows(wp, srow); | |
| 2169 wp->w_botline = lnum; | |
| 2170 } | |
| 2171 else | |
| 2172 { | |
| 2173 win_draw_end(wp, '@', ' ', srow, wp->w_height, HLF_AT); | |
| 2174 wp->w_botline = lnum; | |
| 2175 } | |
| 2176 } | |
| 2177 else | |
| 2178 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
2179 #ifdef FEAT_WINDOWS |
| 7 | 2180 draw_vsep_win(wp, row); |
| 2181 #endif | |
| 2182 if (eof) /* we hit the end of the file */ | |
| 2183 { | |
| 2184 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2185 #ifdef FEAT_DIFF | |
| 2186 j = diff_check_fill(wp, wp->w_botline); | |
| 2187 if (j > 0 && !wp->w_botfill) | |
| 2188 { | |
| 2189 /* | |
| 2190 * Display filler lines at the end of the file | |
| 2191 */ | |
| 2192 if (char2cells(fill_diff) > 1) | |
| 2193 i = '-'; | |
| 2194 else | |
| 2195 i = fill_diff; | |
| 2196 if (row + j > wp->w_height) | |
| 2197 j = wp->w_height - row; | |
| 2198 win_draw_end(wp, i, i, row, row + (int)j, HLF_DED); | |
| 2199 row += j; | |
| 2200 } | |
| 2201 #endif | |
| 2202 } | |
| 3318 | 2203 else if (dollar_vcol == -1) |
| 7 | 2204 wp->w_botline = lnum; |
| 2205 | |
| 2206 /* make sure the rest of the screen is blank */ | |
| 2207 /* put '~'s on rows that aren't part of the file. */ | |
|
9877
7da89d9c744b
commit https://github.com/vim/vim/commit/58b853460add42098ab08017df9e030fb14fd34b
Christian Brabandt <cb@256bit.org>
parents:
9852
diff
changeset
|
2208 win_draw_end(wp, '~', ' ', row, wp->w_height, HLF_EOB); |
| 7 | 2209 } |
| 2210 | |
| 2211 /* Reset the type of redrawing required, the window has been updated. */ | |
| 2212 wp->w_redr_type = 0; | |
| 2213 #ifdef FEAT_DIFF | |
| 2214 wp->w_old_topfill = wp->w_topfill; | |
| 2215 wp->w_old_botfill = wp->w_botfill; | |
| 2216 #endif | |
| 2217 | |
| 3318 | 2218 if (dollar_vcol == -1) |
| 7 | 2219 { |
| 2220 /* | |
| 2221 * There is a trick with w_botline. If we invalidate it on each | |
| 2222 * change that might modify it, this will cause a lot of expensive | |
| 2223 * calls to plines() in update_topline() each time. Therefore the | |
| 2224 * value of w_botline is often approximated, and this value is used to | |
| 2225 * compute the value of w_topline. If the value of w_botline was | |
| 2226 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2227 * the visible part of the text). If it's not, we need to redraw | |
| 2228 * again. Mostly this just means scrolling up a few lines, so it | |
| 2229 * doesn't look too bad. Only do this for the current window (where | |
| 2230 * changes are relevant). | |
| 2231 */ | |
| 2232 wp->w_valid |= VALID_BOTLINE; | |
| 2233 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2234 { | |
| 2235 recursive = TRUE; | |
| 2236 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2237 update_topline(); /* may invalidate w_botline again */ | |
| 2238 if (must_redraw != 0) | |
| 2239 { | |
| 2240 /* Don't update for changes in buffer again. */ | |
| 2241 i = curbuf->b_mod_set; | |
| 2242 curbuf->b_mod_set = FALSE; | |
| 2243 win_update(curwin); | |
| 2244 must_redraw = 0; | |
| 2245 curbuf->b_mod_set = i; | |
| 2246 } | |
| 2247 recursive = FALSE; | |
| 2248 } | |
| 2249 } | |
| 2250 | |
| 2251 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2252 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2253 if (!got_int) | |
| 2254 got_int = save_got_int; | |
| 2255 #endif | |
| 2256 } | |
| 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 | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2299 if (signcolumn_on(wp)) |
| 7 | 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 | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2349 if (signcolumn_on(wp)) |
| 7 | 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 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2412 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 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. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2493 if (signcolumn_on(wp)) |
| 7 | 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; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3545 shl->is_addpos = FALSE; |
| 5979 | 3546 v = (long)(ptr - line); |
| 3547 if (cur != NULL) | |
| 3548 cur->pos.cur = 0; | |
| 3549 next_search_hl(wp, shl, lnum, (colnr_T)v, cur); | |
| 3550 | |
| 3551 /* Need to get the line again, a multi-line regexp may have made it | |
| 3552 * invalid. */ | |
| 3553 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3554 ptr = line + v; | |
| 3555 | |
| 3556 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3557 { | |
| 3558 if (shl->lnum == lnum) | |
| 3559 shl->startcol = shl->rm.startpos[0].col; | |
| 3560 else | |
| 3561 shl->startcol = 0; | |
| 3562 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3563 - shl->rm.startpos[0].lnum) | |
| 3564 shl->endcol = shl->rm.endpos[0].col; | |
| 3565 else | |
| 3566 shl->endcol = MAXCOL; | |
| 3567 /* Highlight one character for an empty match. */ | |
| 3568 if (shl->startcol == shl->endcol) | |
| 3569 { | |
| 3570 #ifdef FEAT_MBYTE | |
| 3571 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3572 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3573 else |
| 5979 | 3574 #endif |
| 3575 ++shl->endcol; | |
| 3576 } | |
| 3577 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3578 { | |
| 3579 shl->attr_cur = shl->attr; | |
| 3580 search_attr = shl->attr; | |
| 3581 } | |
| 3582 area_highlighting = TRUE; | |
| 7 | 3583 } |
| 1326 | 3584 if (shl != &search_hl && cur != NULL) |
| 3585 cur = cur->next; | |
| 7 | 3586 } |
| 3587 #endif | |
| 3588 | |
| 743 | 3589 #ifdef FEAT_SYN_HL |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3590 /* 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
|
3591 * 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
|
3592 * then. */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3593 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
| 5979 | 3594 && !(wp == curwin && VIsual_active)) |
| 743 | 3595 { |
| 3596 line_attr = hl_attr(HLF_CUL); | |
| 3597 area_highlighting = TRUE; | |
| 3598 } | |
| 3599 #endif | |
| 3600 | |
| 504 | 3601 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3602 col = 0; |
| 3603 #ifdef FEAT_RIGHTLEFT | |
| 3604 if (wp->w_p_rl) | |
| 3605 { | |
| 3606 /* Rightleft window: process the text in the normal direction, but put | |
| 3607 * it in current_ScreenLine[] from right to left. Start at the | |
| 3608 * rightmost column of the window. */ | |
| 3609 col = W_WIDTH(wp) - 1; | |
| 3610 off += col; | |
| 3611 } | |
| 3612 #endif | |
| 3613 | |
| 3614 /* | |
| 3615 * Repeat for the whole displayed line. | |
| 3616 */ | |
| 3617 for (;;) | |
| 3618 { | |
| 6947 | 3619 #ifdef FEAT_CONCEAL |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3620 has_match_conc = 0; |
| 6947 | 3621 #endif |
| 7 | 3622 /* Skip this quickly when working on the text. */ |
| 3623 if (draw_state != WL_LINE) | |
| 3624 { | |
| 3625 #ifdef FEAT_CMDWIN | |
| 3626 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3627 { | |
| 3628 draw_state = WL_CMDLINE; | |
| 3629 if (cmdwin_type != 0 && wp == curwin) | |
| 3630 { | |
| 3631 /* Draw the cmdline character. */ | |
| 3632 n_extra = 1; | |
| 1340 | 3633 c_extra = cmdwin_type; |
| 7 | 3634 char_attr = hl_attr(HLF_AT); |
| 3635 } | |
| 3636 } | |
| 3637 #endif | |
| 3638 | |
| 3639 #ifdef FEAT_FOLDING | |
| 3640 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3641 { | |
| 6553 | 3642 int fdc = compute_foldcolumn(wp, 0); |
| 3643 | |
| 7 | 3644 draw_state = WL_FOLD; |
| 6553 | 3645 if (fdc > 0) |
| 7 | 3646 { |
| 3647 /* Draw the 'foldcolumn'. */ | |
| 3648 fill_foldcolumn(extra, wp, FALSE, lnum); | |
| 6553 | 3649 n_extra = fdc; |
| 7 | 3650 p_extra = extra; |
| 1340 | 3651 p_extra[n_extra] = NUL; |
| 7 | 3652 c_extra = NUL; |
| 3653 char_attr = hl_attr(HLF_FC); | |
| 3654 } | |
| 3655 } | |
| 3656 #endif | |
| 3657 | |
| 3658 #ifdef FEAT_SIGNS | |
| 3659 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3660 { | |
| 3661 draw_state = WL_SIGN; | |
| 3662 /* Show the sign column when there are any signs in this | |
| 3663 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3664 if (signcolumn_on(wp)) |
| 7 | 3665 { |
| 2661 | 3666 int text_sign; |
| 7 | 3667 # ifdef FEAT_SIGN_ICONS |
| 2661 | 3668 int icon_sign; |
| 7 | 3669 # endif |
| 3670 | |
| 3671 /* Draw two cells with the sign value or blank. */ | |
| 3672 c_extra = ' '; | |
| 3673 char_attr = hl_attr(HLF_SC); | |
| 3674 n_extra = 2; | |
| 3675 | |
| 5921 | 3676 if (row == startrow |
| 3677 #ifdef FEAT_DIFF | |
| 3678 + filler_lines && filler_todo <= 0 | |
| 3679 #endif | |
| 3680 ) | |
| 7 | 3681 { |
| 3682 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3683 SIGN_TEXT); | |
| 3684 # ifdef FEAT_SIGN_ICONS | |
| 3685 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3686 SIGN_ICON); | |
| 3687 if (gui.in_use && icon_sign != 0) | |
| 3688 { | |
| 3689 /* Use the image in this position. */ | |
| 3690 c_extra = SIGN_BYTE; | |
| 3691 # ifdef FEAT_NETBEANS_INTG | |
| 3692 if (buf_signcount(wp->w_buffer, lnum) > 1) | |
| 3693 c_extra = MULTISIGN_BYTE; | |
| 3694 # endif | |
| 3695 char_attr = icon_sign; | |
| 3696 } | |
| 3697 else | |
| 3698 # endif | |
| 3699 if (text_sign != 0) | |
| 3700 { | |
| 3701 p_extra = sign_get_text(text_sign); | |
| 3702 if (p_extra != NULL) | |
| 3703 { | |
| 3704 c_extra = NUL; | |
| 835 | 3705 n_extra = (int)STRLEN(p_extra); |
| 7 | 3706 } |
| 3707 char_attr = sign_get_attr(text_sign, FALSE); | |
| 3708 } | |
| 3709 } | |
| 3710 } | |
| 3711 } | |
| 3712 #endif | |
| 3713 | |
| 3714 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3715 { | |
| 3716 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3717 /* 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
|
3718 * 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
|
3719 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3720 && (row == startrow |
| 3721 #ifdef FEAT_DIFF | |
| 3722 + filler_lines | |
| 3723 #endif | |
| 3724 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3725 { | |
| 3726 /* Draw the line number (empty space after wrapping). */ | |
| 3727 if (row == startrow | |
| 3728 #ifdef FEAT_DIFF | |
| 3729 + filler_lines | |
| 3730 #endif | |
| 3731 ) | |
| 3732 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3733 long num; |
| 4065 | 3734 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3735 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3736 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
|
3737 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3738 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3739 else |
| 4065 | 3740 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3741 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3742 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
|
3743 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3744 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3745 /* 'number' + 'relativenumber' */ |
| 4065 | 3746 num = lnum; |
| 3747 fmt = "%-*ld "; | |
| 3748 } | |
| 3749 } | |
| 3750 | |
| 3751 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3752 number_width(wp), num); |
| 7 | 3753 if (wp->w_skipcol > 0) |
| 3754 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3755 *p_extra = '-'; | |
| 3756 #ifdef FEAT_RIGHTLEFT | |
| 3757 if (wp->w_p_rl) /* reverse line numbers */ | |
| 3758 rl_mirror(extra); | |
| 3759 #endif | |
| 3760 p_extra = extra; | |
| 3761 c_extra = NUL; | |
| 3762 } | |
| 3763 else | |
| 3764 c_extra = ' '; | |
| 13 | 3765 n_extra = number_width(wp) + 1; |
| 7 | 3766 char_attr = hl_attr(HLF_N); |
| 743 | 3767 #ifdef FEAT_SYN_HL |
| 3768 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 3769 * the current line differently. |
| 3770 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 3771 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3772 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 3773 && lnum == wp->w_cursor.lnum) |
| 3427 | 3774 char_attr = hl_attr(HLF_CLN); |
| 743 | 3775 #endif |
| 7 | 3776 } |
| 3777 } | |
| 3778 | |
| 5995 | 3779 #ifdef FEAT_LINEBREAK |
| 3780 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 3781 && n_extra == 0 && *p_sbr != NUL) | |
| 3782 /* draw indent after showbreak value */ | |
| 3783 draw_state = WL_BRI; | |
| 3784 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 3785 /* After the showbreak, draw the breakindent */ | |
| 3786 draw_state = WL_BRI - 1; | |
| 3787 | |
| 3788 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 3789 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 3790 { | |
| 3791 draw_state = WL_BRI; | |
| 6834 | 3792 if (wp->w_p_bri && n_extra == 0 && row != startrow |
| 5995 | 3793 # ifdef FEAT_DIFF |
| 3794 && filler_lines == 0 | |
| 6834 | 3795 # endif |
| 5995 | 3796 ) |
| 3797 { | |
| 3798 char_attr = 0; /* was: hl_attr(HLF_AT); */ | |
| 6834 | 3799 # ifdef FEAT_DIFF |
| 5995 | 3800 if (diff_hlf != (hlf_T)0) |
| 6106 | 3801 { |
| 5995 | 3802 char_attr = hl_attr(diff_hlf); |
| 6834 | 3803 # ifdef FEAT_SYN_HL |
| 6106 | 3804 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 3805 char_attr = hl_combine_attr(char_attr, | |
| 3806 hl_attr(HLF_CUL)); | |
| 6834 | 3807 # endif |
| 6106 | 3808 } |
| 6834 | 3809 # endif |
| 6028 | 3810 p_extra = NULL; |
| 5995 | 3811 c_extra = ' '; |
| 3812 n_extra = get_breakindent_win(wp, | |
| 3813 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 3814 /* Correct end of highlighted area for 'breakindent', | |
| 3815 * required when 'linebreak' is also set. */ | |
| 3816 if (tocol == vcol) | |
| 3817 tocol += n_extra; | |
| 3818 } | |
| 3819 } | |
| 3820 #endif | |
| 3821 | |
| 7 | 3822 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 3823 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 3824 { | |
| 3825 draw_state = WL_SBR; | |
| 3826 # ifdef FEAT_DIFF | |
| 3827 if (filler_todo > 0) | |
| 3828 { | |
| 3829 /* Draw "deleted" diff line(s). */ | |
| 3830 if (char2cells(fill_diff) > 1) | |
| 3831 c_extra = '-'; | |
| 3832 else | |
| 3833 c_extra = fill_diff; | |
| 3834 # ifdef FEAT_RIGHTLEFT | |
| 3835 if (wp->w_p_rl) | |
| 3836 n_extra = col + 1; | |
| 3837 else | |
| 3838 # endif | |
| 3839 n_extra = W_WIDTH(wp) - col; | |
| 3840 char_attr = hl_attr(HLF_DED); | |
| 3841 } | |
| 3842 # endif | |
| 3843 # ifdef FEAT_LINEBREAK | |
| 3844 if (*p_sbr != NUL && need_showbreak) | |
| 3845 { | |
| 3846 /* Draw 'showbreak' at the start of each broken line. */ | |
| 3847 p_extra = p_sbr; | |
| 3848 c_extra = NUL; | |
| 3849 n_extra = (int)STRLEN(p_sbr); | |
| 3850 char_attr = hl_attr(HLF_AT); | |
| 3851 need_showbreak = FALSE; | |
| 6503 | 3852 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 3853 /* Correct end of highlighted area for 'showbreak', |
| 3854 * required when 'linebreak' is also set. */ | |
| 3855 if (tocol == vcol) | |
| 3856 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3857 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3858 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3859 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 3860 char_attr = hl_combine_attr(char_attr, |
| 3861 hl_attr(HLF_CUL)); | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3862 #endif |
| 7 | 3863 } |
| 3864 # endif | |
| 3865 } | |
| 3866 #endif | |
| 3867 | |
| 3868 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 3869 { | |
| 3870 draw_state = WL_LINE; | |
| 3871 if (saved_n_extra) | |
| 3872 { | |
| 3873 /* Continue item from end of wrapped line. */ | |
| 3874 n_extra = saved_n_extra; | |
| 3875 c_extra = saved_c_extra; | |
| 3876 p_extra = saved_p_extra; | |
| 3877 char_attr = saved_char_attr; | |
| 3878 } | |
| 3879 else | |
| 3880 char_attr = 0; | |
| 3881 } | |
| 3882 } | |
| 3883 | |
| 3884 /* When still displaying '$' of change command, stop at cursor */ | |
| 3318 | 3885 if (dollar_vcol >= 0 && wp == curwin |
| 819 | 3886 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 3887 #ifdef FEAT_DIFF |
| 3888 && filler_todo <= 0 | |
| 3889 #endif | |
| 3890 ) | |
| 3891 { | |
| 3892 SCREEN_LINE(screen_row, W_WINCOL(wp), col, -(int)W_WIDTH(wp), | |
| 3893 wp->w_p_rl); | |
| 819 | 3894 /* Pretend we have finished updating the window. Except when |
| 3895 * 'cursorcolumn' is set. */ | |
| 3896 #ifdef FEAT_SYN_HL | |
| 3897 if (wp->w_p_cuc) | |
| 3898 row = wp->w_cline_row + wp->w_cline_height; | |
| 3899 else | |
| 3900 #endif | |
| 3901 row = wp->w_height; | |
| 7 | 3902 break; |
| 3903 } | |
| 3904 | |
| 3905 if (draw_state == WL_LINE && area_highlighting) | |
| 3906 { | |
| 3907 /* handle Visual or match highlighting in this line */ | |
| 3908 if (vcol == fromcol | |
| 3909 #ifdef FEAT_MBYTE | |
| 3910 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 3911 && (*mb_ptr2cells)(ptr) > 1) | |
| 3912 #endif | |
| 3913 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 3914 && vcol_prev < vcol /* not at margin */ |
| 7 | 3915 && vcol < tocol)) |
| 3916 area_attr = attr; /* start highlighting */ | |
| 3917 else if (area_attr != 0 | |
| 3918 && (vcol == tocol | |
| 3919 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 3920 area_attr = 0; /* stop highlighting */ | |
| 3921 | |
| 3922 #ifdef FEAT_SEARCH_EXTRA | |
| 3923 if (!n_extra) | |
| 3924 { | |
| 3925 /* | |
| 3926 * Check for start/end of search pattern match. | |
| 3927 * After end, check for start/end of next match. | |
| 3928 * When another match, have to check for start again. | |
| 3929 * Watch out for matching an empty string! | |
| 1326 | 3930 * Do this for 'search_hl' and the match list (ordered by |
| 3931 * priority). | |
| 7 | 3932 */ |
| 36 | 3933 v = (long)(ptr - line); |
| 1326 | 3934 cur = wp->w_match_head; |
| 3935 shl_flag = FALSE; | |
| 3936 while (cur != NULL || shl_flag == FALSE) | |
| 3937 { | |
| 3938 if (shl_flag == FALSE | |
| 3939 && ((cur != NULL | |
| 3940 && cur->priority > SEARCH_HL_PRIORITY) | |
| 3941 || cur == NULL)) | |
| 3942 { | |
| 3943 shl = &search_hl; | |
| 3944 shl_flag = TRUE; | |
| 3945 } | |
| 3946 else | |
| 3947 shl = &cur->hl; | |
| 5979 | 3948 if (cur != NULL) |
| 3949 cur->pos.cur = 0; | |
| 3950 pos_inprogress = TRUE; | |
| 3951 while (shl->rm.regprog != NULL | |
| 3952 || (cur != NULL && pos_inprogress)) | |
| 7 | 3953 { |
| 36 | 3954 if (shl->startcol != MAXCOL |
| 3955 && v >= (long)shl->startcol | |
| 3956 && v < (long)shl->endcol) | |
| 7 | 3957 { |
| 6430 | 3958 #ifdef FEAT_MBYTE |
| 3959 int tmp_col = v + MB_PTR2LEN(ptr); | |
| 3960 | |
| 3961 if (shl->endcol < tmp_col) | |
| 3962 shl->endcol = tmp_col; | |
| 3963 #endif | |
| 7 | 3964 shl->attr_cur = shl->attr; |
| 6947 | 3965 #ifdef FEAT_CONCEAL |
| 3966 if (cur != NULL && syn_name2id((char_u *)"Conceal") | |
| 3967 == cur->hlg_id) | |
| 3968 { | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3969 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3970 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 3971 match_conc = cur->conceal_char; |
| 3972 } | |
| 3973 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3974 has_match_conc = match_conc = 0; |
| 6947 | 3975 #endif |
| 7 | 3976 } |
| 6430 | 3977 else if (v == (long)shl->endcol) |
| 7 | 3978 { |
| 3979 shl->attr_cur = 0; | |
| 6947 | 3980 #ifdef FEAT_CONCEAL |
| 3981 prev_syntax_id = 0; | |
| 3982 #endif | |
| 5979 | 3983 next_search_hl(wp, shl, lnum, (colnr_T)v, cur); |
| 3984 pos_inprogress = cur == NULL || cur->pos.cur == 0 | |
| 6947 | 3985 ? FALSE : TRUE; |
| 7 | 3986 |
| 3987 /* Need to get the line again, a multi-line regexp | |
| 3988 * may have made it invalid. */ | |
| 3989 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3990 ptr = line + v; | |
| 3991 | |
| 3992 if (shl->lnum == lnum) | |
| 3993 { | |
| 36 | 3994 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 3995 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 3996 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 3997 else |
| 36 | 3998 shl->endcol = MAXCOL; |
| 3999 | |
| 4000 if (shl->startcol == shl->endcol) | |
| 7 | 4001 { |
| 4002 /* highlight empty match, try again after | |
| 4003 * it */ | |
| 4004 #ifdef FEAT_MBYTE | |
| 4005 if (has_mbyte) | |
| 474 | 4006 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4007 + shl->endcol); |
| 7 | 4008 else |
| 4009 #endif | |
| 36 | 4010 ++shl->endcol; |
| 7 | 4011 } |
| 4012 | |
| 4013 /* Loop to check if the match starts at the | |
| 4014 * current position */ | |
| 4015 continue; | |
| 4016 } | |
| 4017 } | |
| 4018 break; | |
| 4019 } | |
| 1326 | 4020 if (shl != &search_hl && cur != NULL) |
| 4021 cur = cur->next; | |
| 4022 } | |
| 4023 | |
| 4024 /* Use attributes from match with highest priority among | |
| 4025 * 'search_hl' and the match list. */ | |
| 4026 search_attr = search_hl.attr_cur; | |
| 4027 cur = wp->w_match_head; | |
| 4028 shl_flag = FALSE; | |
| 4029 while (cur != NULL || shl_flag == FALSE) | |
| 4030 { | |
| 4031 if (shl_flag == FALSE | |
| 4032 && ((cur != NULL | |
| 4033 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4034 || cur == NULL)) | |
| 699 | 4035 { |
| 1326 | 4036 shl = &search_hl; |
| 4037 shl_flag = TRUE; | |
| 699 | 4038 } |
| 1326 | 4039 else |
| 4040 shl = &cur->hl; | |
| 4041 if (shl->attr_cur != 0) | |
| 4042 search_attr = shl->attr_cur; | |
| 4043 if (shl != &search_hl && cur != NULL) | |
| 4044 cur = cur->next; | |
| 4045 } | |
| 7 | 4046 } |
| 4047 #endif | |
| 4048 | |
| 4049 #ifdef FEAT_DIFF | |
| 674 | 4050 if (diff_hlf != (hlf_T)0) |
| 7 | 4051 { |
| 1295 | 4052 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4053 && n_extra == 0) | |
| 7 | 4054 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4055 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4056 && n_extra == 0) | |
| 7 | 4057 diff_hlf = HLF_CHD; /* changed line */ |
| 674 | 4058 line_attr = hl_attr(diff_hlf); |
| 6106 | 4059 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4060 line_attr = hl_combine_attr(line_attr, hl_attr(HLF_CUL)); | |
| 674 | 4061 } |
| 4062 #endif | |
| 4063 | |
| 4064 /* Decide which of the highlight attributes to use. */ | |
| 4065 attr_pri = TRUE; | |
| 6717 | 4066 #ifdef LINE_ATTR |
| 674 | 4067 if (area_attr != 0) |
| 6717 | 4068 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4069 else if (search_attr != 0) |
| 6717 | 4070 char_attr = hl_combine_attr(line_attr, search_attr); |
| 674 | 4071 /* Use line_attr when not in the Visual or 'incsearch' area |
| 4072 * (area_attr may be 0 when "noinvcur" is set). */ | |
| 4073 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) | |
| 1842 | 4074 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4075 || vcol >= tocol)) | |
| 674 | 4076 char_attr = line_attr; |
| 6717 | 4077 #else |
| 4078 if (area_attr != 0) | |
| 4079 char_attr = area_attr; | |
| 4080 else if (search_attr != 0) | |
| 4081 char_attr = search_attr; | |
| 674 | 4082 #endif |
| 4083 else | |
| 4084 { | |
| 4085 attr_pri = FALSE; | |
| 4086 #ifdef FEAT_SYN_HL | |
| 4087 if (has_syntax) | |
| 4088 char_attr = syntax_attr; | |
| 4089 else | |
| 4090 #endif | |
| 4091 char_attr = 0; | |
| 4092 } | |
| 7 | 4093 } |
| 4094 | |
| 4095 /* | |
| 4096 * Get the next character to put on the screen. | |
| 4097 */ | |
| 4098 /* | |
| 1340 | 4099 * The "p_extra" points to the extra stuff that is inserted to |
| 4100 * represent special characters (non-printable stuff) and other | |
| 4101 * things. When all characters are the same, c_extra is used. | |
| 4102 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past | |
| 4103 * "p_extra[n_extra]". | |
| 7 | 4104 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4105 */ | |
| 4106 if (n_extra > 0) | |
| 4107 { | |
| 4108 if (c_extra != NUL) | |
| 4109 { | |
| 4110 c = c_extra; | |
| 4111 #ifdef FEAT_MBYTE | |
| 4112 mb_c = c; /* doesn't handle non-utf-8 multi-byte! */ | |
| 4113 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 4114 { | |
| 4115 mb_utf8 = TRUE; | |
| 714 | 4116 u8cc[0] = 0; |
| 819 | 4117 c = 0xc0; |
| 7 | 4118 } |
| 4119 else | |
| 4120 mb_utf8 = FALSE; | |
| 4121 #endif | |
| 4122 } | |
| 4123 else | |
| 4124 { | |
| 4125 c = *p_extra; | |
| 4126 #ifdef FEAT_MBYTE | |
| 4127 if (has_mbyte) | |
| 4128 { | |
| 4129 mb_c = c; | |
| 4130 if (enc_utf8) | |
| 4131 { | |
| 4132 /* If the UTF-8 character is more than one byte: | |
| 4133 * Decode it into "mb_c". */ | |
| 474 | 4134 mb_l = (*mb_ptr2len)(p_extra); |
| 7 | 4135 mb_utf8 = FALSE; |
| 4136 if (mb_l > n_extra) | |
| 4137 mb_l = 1; | |
| 4138 else if (mb_l > 1) | |
| 4139 { | |
| 714 | 4140 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4141 mb_utf8 = TRUE; |
| 819 | 4142 c = 0xc0; |
| 7 | 4143 } |
| 4144 } | |
| 4145 else | |
| 4146 { | |
| 4147 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4148 mb_l = MB_BYTE2LEN(c); | |
| 4149 if (mb_l >= n_extra) | |
| 4150 mb_l = 1; | |
| 4151 else if (mb_l > 1) | |
| 4152 mb_c = (c << 8) + p_extra[1]; | |
| 4153 } | |
| 504 | 4154 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4155 mb_l = 1; | |
| 4156 | |
| 7 | 4157 /* If a double-width char doesn't fit display a '>' in the |
| 4158 * last column. */ | |
| 504 | 4159 if (( |
| 7 | 4160 # ifdef FEAT_RIGHTLEFT |
| 4161 wp->w_p_rl ? (col <= 0) : | |
| 4162 # endif | |
| 504 | 4163 (col >= W_WIDTH(wp) - 1)) |
| 7 | 4164 && (*mb_char2cells)(mb_c) == 2) |
| 4165 { | |
| 4166 c = '>'; | |
| 4167 mb_c = c; | |
| 4168 mb_l = 1; | |
| 4169 mb_utf8 = FALSE; | |
| 4170 multi_attr = hl_attr(HLF_AT); | |
| 4171 /* put the pointer back to output the double-width | |
| 4172 * character at the start of the next line. */ | |
| 4173 ++n_extra; | |
| 4174 --p_extra; | |
| 4175 } | |
| 4176 else | |
| 4177 { | |
| 4178 n_extra -= mb_l - 1; | |
| 4179 p_extra += mb_l - 1; | |
| 4180 } | |
| 4181 } | |
| 4182 #endif | |
| 4183 ++p_extra; | |
| 4184 } | |
| 4185 --n_extra; | |
| 4186 } | |
| 4187 else | |
| 4188 { | |
| 6026 | 4189 if (p_extra_free != NULL) |
| 4190 { | |
| 4191 vim_free(p_extra_free); | |
| 4192 p_extra_free = NULL; | |
| 4193 } | |
| 7 | 4194 /* |
| 4195 * Get a character from the line itself. | |
| 4196 */ | |
| 4197 c = *ptr; | |
| 4198 #ifdef FEAT_MBYTE | |
| 4199 if (has_mbyte) | |
| 4200 { | |
| 4201 mb_c = c; | |
| 4202 if (enc_utf8) | |
| 4203 { | |
| 4204 /* If the UTF-8 character is more than one byte: Decode it | |
| 4205 * into "mb_c". */ | |
| 474 | 4206 mb_l = (*mb_ptr2len)(ptr); |
| 7 | 4207 mb_utf8 = FALSE; |
| 4208 if (mb_l > 1) | |
| 4209 { | |
| 714 | 4210 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4211 /* Overlong encoded ASCII or ASCII with composing char |
| 4212 * is displayed normally, except a NUL. */ | |
| 4213 if (mb_c < 0x80) | |
| 4214 c = mb_c; | |
| 4215 mb_utf8 = TRUE; | |
| 507 | 4216 |
| 4217 /* At start of the line we can have a composing char. | |
| 4218 * Draw it as a space with a composing char. */ | |
| 4219 if (utf_iscomposing(mb_c)) | |
| 4220 { | |
| 1326 | 4221 int i; |
| 4222 | |
| 714 | 4223 for (i = Screen_mco - 1; i > 0; --i) |
| 4224 u8cc[i] = u8cc[i - 1]; | |
| 4225 u8cc[0] = mb_c; | |
| 507 | 4226 mb_c = ' '; |
| 4227 } | |
| 7 | 4228 } |
| 4229 | |
| 4230 if ((mb_l == 1 && c >= 0x80) | |
| 4231 || (mb_l >= 1 && mb_c == 0) | |
| 4232 || (mb_l > 1 && (!vim_isprintc(mb_c) | |
| 1401 | 4233 # ifdef UNICODE16 |
| 4234 || mb_c >= 0x10000 | |
| 4235 # endif | |
| 4236 ))) | |
| 7 | 4237 { |
| 4238 /* | |
| 4239 * Illegal UTF-8 byte: display as <xx>. | |
| 4240 * Non-BMP character : display as ? or fullwidth ?. | |
| 4241 */ | |
| 1401 | 4242 # ifdef UNICODE16 |
| 7 | 4243 if (mb_c < 0x10000) |
| 1401 | 4244 # endif |
| 7 | 4245 { |
| 4246 transchar_hex(extra, mb_c); | |
| 714 | 4247 # ifdef FEAT_RIGHTLEFT |
| 7 | 4248 if (wp->w_p_rl) /* reverse */ |
| 4249 rl_mirror(extra); | |
| 714 | 4250 # endif |
| 7 | 4251 } |
| 1401 | 4252 # ifdef UNICODE16 |
| 7 | 4253 else if (utf_char2cells(mb_c) != 2) |
| 4254 STRCPY(extra, "?"); | |
| 4255 else | |
| 4256 /* 0xff1f in UTF-8: full-width '?' */ | |
| 4257 STRCPY(extra, "\357\274\237"); | |
| 1401 | 4258 # endif |
| 7 | 4259 |
| 4260 p_extra = extra; | |
| 4261 c = *p_extra; | |
| 4262 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4263 mb_utf8 = (c >= 0x80); | |
| 4264 n_extra = (int)STRLEN(p_extra); | |
| 4265 c_extra = NUL; | |
| 4266 if (area_attr == 0 && search_attr == 0) | |
| 4267 { | |
| 4268 n_attr = n_extra + 1; | |
| 4269 extra_attr = hl_attr(HLF_8); | |
| 4270 saved_attr2 = char_attr; /* save current attr */ | |
| 4271 } | |
| 4272 } | |
| 4273 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4274 mb_l = 1; | |
| 4275 #ifdef FEAT_ARABIC | |
| 4276 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4277 { | |
| 4278 /* Do Arabic shaping. */ | |
| 714 | 4279 int pc, pc1, nc; |
| 4280 int pcc[MAX_MCO]; | |
| 7 | 4281 |
| 4282 /* The idea of what is the previous and next | |
| 4283 * character depends on 'rightleft'. */ | |
| 4284 if (wp->w_p_rl) | |
| 4285 { | |
| 4286 pc = prev_c; | |
| 4287 pc1 = prev_c1; | |
| 4288 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4289 prev_c1 = u8cc[0]; |
| 7 | 4290 } |
| 4291 else | |
| 4292 { | |
| 714 | 4293 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4294 nc = prev_c; |
| 714 | 4295 pc1 = pcc[0]; |
| 7 | 4296 } |
| 4297 prev_c = mb_c; | |
| 4298 | |
| 714 | 4299 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4300 } |
| 4301 else | |
| 4302 prev_c = mb_c; | |
| 4303 #endif | |
| 4304 } | |
| 4305 else /* enc_dbcs */ | |
| 4306 { | |
| 4307 mb_l = MB_BYTE2LEN(c); | |
| 4308 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4309 mb_l = 1; | |
| 4310 else if (mb_l > 1) | |
| 4311 { | |
| 4312 /* We assume a second byte below 32 is illegal. | |
| 4313 * Hopefully this is OK for all double-byte encodings! | |
| 4314 */ | |
| 4315 if (ptr[1] >= 32) | |
| 4316 mb_c = (c << 8) + ptr[1]; | |
| 4317 else | |
| 4318 { | |
| 4319 if (ptr[1] == NUL) | |
| 4320 { | |
| 4321 /* head byte at end of line */ | |
| 4322 mb_l = 1; | |
| 4323 transchar_nonprint(extra, c); | |
| 4324 } | |
| 4325 else | |
| 4326 { | |
| 4327 /* illegal tail byte */ | |
| 4328 mb_l = 2; | |
| 4329 STRCPY(extra, "XX"); | |
| 4330 } | |
| 4331 p_extra = extra; | |
| 4332 n_extra = (int)STRLEN(extra) - 1; | |
| 4333 c_extra = NUL; | |
| 4334 c = *p_extra++; | |
| 4335 if (area_attr == 0 && search_attr == 0) | |
| 4336 { | |
| 4337 n_attr = n_extra + 1; | |
| 4338 extra_attr = hl_attr(HLF_8); | |
| 4339 saved_attr2 = char_attr; /* save current attr */ | |
| 4340 } | |
| 4341 mb_c = c; | |
| 4342 } | |
| 4343 } | |
| 4344 } | |
| 4345 /* If a double-width char doesn't fit display a '>' in the | |
| 4346 * last column; the character is displayed at the start of the | |
| 4347 * next line. */ | |
| 4348 if (( | |
| 4349 # ifdef FEAT_RIGHTLEFT | |
| 4350 wp->w_p_rl ? (col <= 0) : | |
| 4351 # endif | |
| 4352 (col >= W_WIDTH(wp) - 1)) | |
| 4353 && (*mb_char2cells)(mb_c) == 2) | |
| 4354 { | |
| 4355 c = '>'; | |
| 4356 mb_c = c; | |
| 4357 mb_utf8 = FALSE; | |
| 4358 mb_l = 1; | |
| 4359 multi_attr = hl_attr(HLF_AT); | |
| 4360 /* Put pointer back so that the character will be | |
| 4361 * displayed at the start of the next line. */ | |
| 4362 --ptr; | |
| 4363 } | |
| 4364 else if (*ptr != NUL) | |
| 4365 ptr += mb_l - 1; | |
| 4366 | |
| 4367 /* 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
|
4368 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4369 * 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
|
4370 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4371 { |
| 4372 n_extra = 1; | |
| 3586 | 4373 c_extra = MB_FILLER_CHAR; |
| 7 | 4374 c = ' '; |
| 4375 if (area_attr == 0 && search_attr == 0) | |
| 4376 { | |
| 4377 n_attr = n_extra + 1; | |
| 4378 extra_attr = hl_attr(HLF_AT); | |
| 4379 saved_attr2 = char_attr; /* save current attr */ | |
| 4380 } | |
| 4381 mb_c = c; | |
| 4382 mb_utf8 = FALSE; | |
| 4383 mb_l = 1; | |
| 4384 } | |
| 4385 | |
| 4386 } | |
| 4387 #endif | |
| 4388 ++ptr; | |
| 4389 | |
| 4390 if (extra_check) | |
| 4391 { | |
| 743 | 4392 #ifdef FEAT_SPELL |
| 221 | 4393 int can_spell = TRUE; |
| 743 | 4394 #endif |
| 4395 | |
| 4396 #ifdef FEAT_SYN_HL | |
| 7 | 4397 /* Get syntax attribute, unless still at the start of the line |
| 4398 * (double-wide char that doesn't fit). */ | |
| 221 | 4399 v = (long)(ptr - line); |
| 4400 if (has_syntax && v > 0) | |
| 7 | 4401 { |
| 4402 /* Get the syntax attribute for the character. If there | |
| 4403 * is an error, disable syntax highlighting. */ | |
| 4404 save_did_emsg = did_emsg; | |
| 4405 did_emsg = FALSE; | |
| 4406 | |
| 221 | 4407 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4408 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4409 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4410 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4411 NULL, FALSE); |
| 7 | 4412 |
| 4413 if (did_emsg) | |
| 482 | 4414 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4415 wp->w_s->b_syn_error = TRUE; |
| 482 | 4416 has_syntax = FALSE; |
| 4417 } | |
| 7 | 4418 else |
| 4419 did_emsg = save_did_emsg; | |
| 4420 | |
| 4421 /* Need to get the line again, a multi-line regexp may | |
| 4422 * have made it invalid. */ | |
| 4423 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4424 ptr = line + v; | |
| 4425 | |
| 674 | 4426 if (!attr_pri) |
| 7 | 4427 char_attr = syntax_attr; |
| 301 | 4428 else |
| 303 | 4429 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
|
4430 # 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
|
4431 /* 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
|
4432 * 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
|
4433 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
|
4434 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
|
4435 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
|
4436 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
|
4437 # endif |
| 7 | 4438 } |
| 743 | 4439 #endif |
| 4440 | |
| 4441 #ifdef FEAT_SPELL | |
| 301 | 4442 /* Check spelling (unless at the end of the line). |
| 319 | 4443 * Only do this when there is no syntax highlighting, the |
| 4444 * @Spell cluster is not used or the current syntax item | |
| 4445 * contains the @Spell cluster. */ | |
| 348 | 4446 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4447 { |
| 230 | 4448 spell_attr = 0; |
| 743 | 4449 # ifdef FEAT_SYN_HL |
| 674 | 4450 if (!attr_pri) |
| 230 | 4451 char_attr = syntax_attr; |
| 743 | 4452 # endif |
| 4453 if (c != 0 && ( | |
| 4454 # ifdef FEAT_SYN_HL | |
| 4455 !has_syntax || | |
| 4456 # endif | |
| 4457 can_spell)) | |
| 221 | 4458 { |
| 348 | 4459 char_u *prev_ptr, *p; |
| 4460 int len; | |
| 534 | 4461 hlf_T spell_hlf = HLF_COUNT; |
| 221 | 4462 # ifdef FEAT_MBYTE |
| 336 | 4463 if (has_mbyte) |
| 4464 { | |
| 4465 prev_ptr = ptr - mb_l; | |
| 4466 v -= mb_l - 1; | |
| 4467 } | |
| 4468 else | |
| 221 | 4469 # endif |
| 336 | 4470 prev_ptr = ptr - 1; |
| 348 | 4471 |
| 4472 /* Use nextline[] if possible, it has the start of the | |
| 4473 * next line concatenated. */ | |
| 4474 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4475 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4476 else | |
| 4477 p = prev_ptr; | |
| 835 | 4478 cap_col -= (int)(prev_ptr - line); |
| 625 | 4479 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4480 nochange); | |
| 348 | 4481 word_end = v + len; |
| 301 | 4482 |
| 4483 /* In Insert mode only highlight a word that | |
| 4484 * doesn't touch the cursor. */ | |
| 534 | 4485 if (spell_hlf != HLF_COUNT |
| 301 | 4486 && (State & INSERT) != 0 |
| 4487 && wp->w_cursor.lnum == lnum | |
| 4488 && wp->w_cursor.col >= | |
| 4489 (colnr_T)(prev_ptr - line) | |
| 4490 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4491 { |
| 534 | 4492 spell_hlf = HLF_COUNT; |
| 301 | 4493 spell_redraw_lnum = lnum; |
| 221 | 4494 } |
| 348 | 4495 |
| 534 | 4496 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4497 && (p - nextline) + len > nextline_idx) |
| 4498 { | |
| 4499 /* Remember that the good word continues at the | |
| 4500 * start of the next line. */ | |
| 4501 checked_lnum = lnum + 1; | |
| 835 | 4502 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4503 } |
| 386 | 4504 |
| 534 | 4505 /* Turn index into actual attributes. */ |
| 4506 if (spell_hlf != HLF_COUNT) | |
| 4507 spell_attr = highlight_attr[spell_hlf]; | |
| 4508 | |
| 386 | 4509 if (cap_col > 0) |
| 4510 { | |
| 4511 if (p != prev_ptr | |
| 4512 && (p - nextline) + cap_col >= nextline_idx) | |
| 4513 { | |
| 4514 /* Remember that the word in the next line | |
| 4515 * must start with a capital. */ | |
| 4516 capcol_lnum = lnum + 1; | |
| 835 | 4517 cap_col = (int)((p - nextline) + cap_col |
| 4518 - nextline_idx); | |
| 386 | 4519 } |
| 4520 else | |
| 4521 /* Compute the actual column. */ | |
| 835 | 4522 cap_col += (int)(prev_ptr - line); |
| 386 | 4523 } |
| 221 | 4524 } |
| 4525 } | |
| 4526 if (spell_attr != 0) | |
| 348 | 4527 { |
| 674 | 4528 if (!attr_pri) |
| 348 | 4529 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4530 else | |
| 4531 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4532 } | |
| 7 | 4533 #endif |
| 4534 #ifdef FEAT_LINEBREAK | |
| 4535 /* | |
| 221 | 4536 * Found last space before word: check for line break. |
| 7 | 4537 */ |
| 6026 | 4538 if (wp->w_p_lbr && vim_isbreak(c) && !vim_isbreak(*ptr)) |
| 7 | 4539 { |
| 6681 | 4540 # ifdef FEAT_MBYTE |
| 6693 | 4541 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
| 6681 | 4542 # endif |
| 5995 | 4543 char_u *p = ptr - ( |
| 7 | 4544 # ifdef FEAT_MBYTE |
| 6693 | 4545 mb_off + |
| 7 | 4546 # endif |
| 5995 | 4547 1); |
| 6681 | 4548 |
| 5995 | 4549 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4550 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4551 NULL) - 1; |
| 6371 | 4552 if (c == TAB && n_extra + col > W_WIDTH(wp)) |
| 4553 n_extra = (int)wp->w_buffer->b_p_ts | |
| 4554 - vcol % (int)wp->w_buffer->b_p_ts - 1; | |
| 4555 | |
| 6681 | 4556 # ifdef FEAT_MBYTE |
| 6693 | 4557 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; |
| 6681 | 4558 # else |
| 7 | 4559 c_extra = ' '; |
| 6681 | 4560 # endif |
| 7 | 4561 if (vim_iswhite(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4562 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4563 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4564 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4565 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4566 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4567 #endif |
| 6026 | 4568 if (!wp->w_p_list) |
| 4569 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4570 } |
| 7 | 4571 } |
| 4572 #endif | |
| 4573 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4574 /* '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
|
4575 */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4576 if (wp->w_p_list |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4577 && (((c == 160 |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4578 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4579 || (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
|
4580 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4581 ) && lcs_nbsp) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4582 || (c == ' ' && lcs_space && ptr - line <= trailcol))) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4583 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4584 c = (c == ' ') ? lcs_space : lcs_nbsp; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4585 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
|
4586 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4587 n_attr = 1; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4588 extra_attr = hl_attr(HLF_8); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4589 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
|
4590 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4591 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4592 mb_c = c; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4593 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
|
4594 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4595 mb_utf8 = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4596 u8cc[0] = 0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4597 c = 0xc0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4598 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4599 else |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4600 mb_utf8 = FALSE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4601 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4602 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4603 |
| 7 | 4604 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4605 { | |
| 4606 c = lcs_trail; | |
| 674 | 4607 if (!attr_pri) |
| 7 | 4608 { |
| 4609 n_attr = 1; | |
| 4610 extra_attr = hl_attr(HLF_8); | |
| 4611 saved_attr2 = char_attr; /* save current attr */ | |
| 4612 } | |
| 4613 #ifdef FEAT_MBYTE | |
| 4614 mb_c = c; | |
| 4615 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 4616 { | |
| 4617 mb_utf8 = TRUE; | |
| 714 | 4618 u8cc[0] = 0; |
| 819 | 4619 c = 0xc0; |
| 7 | 4620 } |
| 4621 else | |
| 4622 mb_utf8 = FALSE; | |
| 4623 #endif | |
| 4624 } | |
| 4625 } | |
| 4626 | |
| 4627 /* | |
| 4628 * Handling of non-printable characters. | |
| 4629 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4630 if (!vim_isprintc(c)) |
| 7 | 4631 { |
| 4632 /* | |
| 4633 * when getting a character from the file, we may have to | |
| 4634 * turn it into something else on the way to putting it | |
| 4635 * into "ScreenLines". | |
| 4636 */ | |
| 4637 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4638 { | |
| 6026 | 4639 int tab_len = 0; |
| 6503 | 4640 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 4641 #ifdef FEAT_LINEBREAK | |
| 4642 /* only adjust the tab_len, when at the first column | |
| 4643 * after the showbreak value was drawn */ | |
| 4644 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 4645 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 4646 #endif | |
| 7 | 4647 /* tab amount depends on current column */ |
| 6026 | 4648 tab_len = (int)wp->w_buffer->b_p_ts |
| 6503 | 4649 - vcol_adjusted % (int)wp->w_buffer->b_p_ts - 1; |
| 4650 | |
| 6026 | 4651 #ifdef FEAT_LINEBREAK |
| 6100 | 4652 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 4653 #endif |
| 4654 /* tab amount depends on current column */ | |
| 4655 n_extra = tab_len; | |
| 4656 #ifdef FEAT_LINEBREAK | |
| 4657 else | |
| 4658 { | |
| 4659 char_u *p; | |
| 4660 int len = n_extra; | |
| 4661 int i; | |
| 4662 int saved_nextra = n_extra; | |
| 4663 | |
| 6172 | 4664 #ifdef FEAT_CONCEAL |
| 6627 | 4665 if (vcol_off > 0) |
| 6172 | 4666 /* there are characters to conceal */ |
| 4667 tab_len += vcol_off; | |
| 6520 | 4668 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 4669 */ | |
| 4670 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 4671 && n_extra > tab_len) | |
| 4672 tab_len += n_extra - tab_len; | |
| 4673 #endif | |
| 4674 | |
| 6026 | 4675 /* if n_extra > 0, it gives the number of chars, to |
| 4676 * use for a tab, else we need to calculate the width | |
| 4677 * for a tab */ | |
| 4678 #ifdef FEAT_MBYTE | |
| 4679 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 4680 if (n_extra > 0) | |
| 4681 len += n_extra - tab_len; | |
| 4682 #endif | |
| 4683 c = lcs_tab1; | |
| 4684 p = alloc((unsigned)(len + 1)); | |
| 4685 vim_memset(p, ' ', len); | |
| 4686 p[len] = NUL; | |
| 4687 p_extra_free = p; | |
| 4688 for (i = 0; i < tab_len; i++) | |
| 4689 { | |
| 4690 #ifdef FEAT_MBYTE | |
| 4691 mb_char2bytes(lcs_tab2, p); | |
| 4692 p += mb_char2len(lcs_tab2); | |
| 4693 n_extra += mb_char2len(lcs_tab2) | |
| 4694 - (saved_nextra > 0 ? 1 : 0); | |
| 4695 #else | |
| 4696 p[i] = lcs_tab2; | |
| 4697 #endif | |
| 4698 } | |
| 4699 p_extra = p_extra_free; | |
| 6172 | 4700 #ifdef FEAT_CONCEAL |
| 4701 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 4702 * macro below, so need to adjust for that here */ | |
| 6627 | 4703 if (vcol_off > 0) |
| 6172 | 4704 n_extra -= vcol_off; |
| 4705 #endif | |
| 6026 | 4706 } |
| 4707 #endif | |
| 3984 | 4708 #ifdef FEAT_CONCEAL |
| 6627 | 4709 { |
| 4710 int vc_saved = vcol_off; | |
| 4711 | |
| 4712 /* Tab alignment should be identical regardless of | |
| 4713 * 'conceallevel' value. So tab compensates of all | |
| 4714 * previous concealed characters, and thus resets | |
| 4715 * vcol_off and boguscols accumulated so far in the | |
| 4716 * line. Note that the tab can be longer than | |
| 4717 * 'tabstop' when there are concealed characters. */ | |
| 4718 FIX_FOR_BOGUSCOLS; | |
| 4719 | |
| 4720 /* Make sure, the highlighting for the tab char will be | |
| 4721 * correctly set further below (effectively reverts the | |
| 4722 * FIX_FOR_BOGSUCOLS macro */ | |
| 4723 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 4724 && lcs_tab1) |
| 6627 | 4725 tab_len += vc_saved; |
| 4726 } | |
| 3984 | 4727 #endif |
| 7 | 4728 #ifdef FEAT_MBYTE |
| 4729 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4730 #endif | |
| 4731 if (wp->w_p_list) | |
| 4732 { | |
| 4733 c = lcs_tab1; | |
| 6026 | 4734 #ifdef FEAT_LINEBREAK |
| 4735 if (wp->w_p_lbr) | |
| 4736 c_extra = NUL; /* using p_extra from above */ | |
| 4737 else | |
| 4738 #endif | |
| 4739 c_extra = lcs_tab2; | |
| 4740 n_attr = tab_len + 1; | |
| 7 | 4741 extra_attr = hl_attr(HLF_8); |
| 4742 saved_attr2 = char_attr; /* save current attr */ | |
| 4743 #ifdef FEAT_MBYTE | |
| 4744 mb_c = c; | |
| 4745 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 4746 { | |
| 4747 mb_utf8 = TRUE; | |
| 714 | 4748 u8cc[0] = 0; |
| 819 | 4749 c = 0xc0; |
| 7 | 4750 } |
| 4751 #endif | |
| 4752 } | |
| 4753 else | |
| 4754 { | |
| 4755 c_extra = ' '; | |
| 4756 c = ' '; | |
| 4757 } | |
| 4758 } | |
| 36 | 4759 else if (c == NUL |
| 6799 | 4760 && (wp->w_p_list |
| 36 | 4761 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 4762 && tocol > vcol | |
| 4763 && VIsual_mode != Ctrl_V | |
| 4764 && ( | |
| 4765 # ifdef FEAT_RIGHTLEFT | |
| 4766 wp->w_p_rl ? (col >= 0) : | |
| 4767 # endif | |
| 4768 (col < W_WIDTH(wp))) | |
| 4769 && !(noinvcur | |
| 1850 | 4770 && lnum == wp->w_cursor.lnum |
| 36 | 4771 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 4772 && lcs_eol_one > 0) |
| 7 | 4773 { |
| 36 | 4774 /* Display a '$' after the line or highlight an extra |
| 4775 * character if the line break is included. */ | |
| 7 | 4776 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 4777 /* For a diff line the highlighting continues after the | |
| 4778 * "$". */ | |
| 4779 if ( | |
| 4780 # ifdef FEAT_DIFF | |
| 534 | 4781 diff_hlf == (hlf_T)0 |
| 7 | 4782 # ifdef LINE_ATTR |
| 4783 && | |
| 4784 # endif | |
| 4785 # endif | |
| 4786 # ifdef LINE_ATTR | |
| 4787 line_attr == 0 | |
| 4788 # endif | |
| 4789 ) | |
| 4790 #endif | |
| 4791 { | |
| 4792 #ifdef FEAT_VIRTUALEDIT | |
| 4793 /* In virtualedit, visual selections may extend | |
| 4794 * beyond end of line. */ | |
| 4795 if (area_highlighting && virtual_active() | |
| 4796 && tocol != MAXCOL && vcol < tocol) | |
| 4797 n_extra = 0; | |
| 4798 else | |
| 4799 #endif | |
| 4800 { | |
| 4801 p_extra = at_end_str; | |
| 4802 n_extra = 1; | |
| 4803 c_extra = NUL; | |
| 4804 } | |
| 4805 } | |
| 6799 | 4806 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 4807 c = lcs_eol; |
| 4808 else | |
| 4809 c = ' '; | |
| 7 | 4810 lcs_eol_one = -1; |
| 4811 --ptr; /* put it back at the NUL */ | |
| 674 | 4812 if (!attr_pri) |
| 7 | 4813 { |
| 4814 extra_attr = hl_attr(HLF_AT); | |
| 4815 n_attr = 1; | |
| 4816 } | |
| 4817 #ifdef FEAT_MBYTE | |
| 4818 mb_c = c; | |
| 4819 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 4820 { | |
| 4821 mb_utf8 = TRUE; | |
| 714 | 4822 u8cc[0] = 0; |
| 819 | 4823 c = 0xc0; |
| 7 | 4824 } |
| 4825 else | |
| 4826 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4827 #endif | |
| 4828 } | |
| 4829 else if (c != NUL) | |
| 4830 { | |
| 4831 p_extra = transchar(c); | |
| 6064 | 4832 if (n_extra == 0) |
| 4833 n_extra = byte2cells(c) - 1; | |
| 7 | 4834 #ifdef FEAT_RIGHTLEFT |
| 4835 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 4836 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 4837 #endif | |
| 4838 c_extra = NUL; | |
| 6026 | 4839 #ifdef FEAT_LINEBREAK |
| 4840 if (wp->w_p_lbr) | |
| 4841 { | |
| 4842 char_u *p; | |
| 4843 | |
| 4844 c = *p_extra; | |
| 4845 p = alloc((unsigned)n_extra + 1); | |
| 4846 vim_memset(p, ' ', n_extra); | |
| 4847 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 4848 p[n_extra] = NUL; | |
| 4849 p_extra_free = p_extra = p; | |
| 4850 } | |
| 4851 else | |
| 4852 #endif | |
| 4853 { | |
| 4854 n_extra = byte2cells(c) - 1; | |
| 4855 c = *p_extra++; | |
| 4856 } | |
| 674 | 4857 if (!attr_pri) |
| 7 | 4858 { |
| 4859 n_attr = n_extra + 1; | |
| 4860 extra_attr = hl_attr(HLF_8); | |
| 4861 saved_attr2 = char_attr; /* save current attr */ | |
| 4862 } | |
| 4863 #ifdef FEAT_MBYTE | |
| 4864 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4865 #endif | |
| 4866 } | |
| 4867 #ifdef FEAT_VIRTUALEDIT | |
| 4868 else if (VIsual_active | |
| 4869 && (VIsual_mode == Ctrl_V | |
| 4870 || VIsual_mode == 'v') | |
| 4871 && virtual_active() | |
| 4872 && tocol != MAXCOL | |
| 4873 && vcol < tocol | |
| 4874 && ( | |
| 4875 # ifdef FEAT_RIGHTLEFT | |
| 4876 wp->w_p_rl ? (col >= 0) : | |
| 4877 # endif | |
| 4878 (col < W_WIDTH(wp)))) | |
| 4879 { | |
| 4880 c = ' '; | |
| 4881 --ptr; /* put it back at the NUL */ | |
| 4882 } | |
| 4883 #endif | |
| 910 | 4884 #if defined(LINE_ATTR) |
| 7 | 4885 else if (( |
| 4886 # ifdef FEAT_DIFF | |
| 910 | 4887 diff_hlf != (hlf_T)0 || |
| 7 | 4888 # endif |
| 4889 line_attr != 0 | |
| 4890 ) && ( | |
| 4891 # ifdef FEAT_RIGHTLEFT | |
| 4892 wp->w_p_rl ? (col >= 0) : | |
| 4893 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4894 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4895 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4896 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4897 # endif |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4898 < W_WIDTH(wp)))) |
| 7 | 4899 { |
| 4900 /* Highlight until the right side of the window */ | |
| 4901 c = ' '; | |
| 4902 --ptr; /* put it back at the NUL */ | |
| 867 | 4903 |
| 4904 /* Remember we do the char for line highlighting. */ | |
| 4905 ++did_line_attr; | |
| 4906 | |
| 4907 /* don't do search HL for the rest of the line */ | |
| 4908 if (line_attr != 0 && char_attr == search_attr && col > 0) | |
| 4909 char_attr = line_attr; | |
| 7 | 4910 # ifdef FEAT_DIFF |
| 4911 if (diff_hlf == HLF_TXD) | |
| 4912 { | |
| 4913 diff_hlf = HLF_CHD; | |
| 4914 if (attr == 0 || char_attr != attr) | |
| 6106 | 4915 { |
| 7 | 4916 char_attr = hl_attr(diff_hlf); |
| 6106 | 4917 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4918 char_attr = hl_combine_attr(char_attr, | |
| 4919 hl_attr(HLF_CUL)); | |
| 4920 } | |
| 7 | 4921 } |
| 4922 # endif | |
| 4923 } | |
| 4924 #endif | |
| 4925 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4926 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4927 #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
|
4928 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
|
4929 && (wp != curwin || lnum != wp->w_cursor.lnum || |
| 6947 | 4930 conceal_cursor_line(wp) ) |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4931 && ( (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
|
4932 && !(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
|
4933 && 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
|
4934 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4935 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4936 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 4937 && (syn_get_sub_char() != NUL || match_conc |
| 4938 || 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
|
4939 && 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
|
4940 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
4941 /* 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
|
4942 * character. */ |
| 6947 | 4943 if (match_conc) |
| 4944 c = match_conc; | |
| 4945 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
|
4946 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4947 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4948 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4949 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4950 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4951 |
|
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
|
4952 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4953 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
4954 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
4955 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4956 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4957 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
|
4958 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4959 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4960 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4961 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4962 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4963 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4964 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4965 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4966 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4967 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4968 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4969 col += n_extra; |
|
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 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4972 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4973 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4974 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4975 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4976 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4977 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4978 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4979 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4980 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4981 mb_c = c; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4982 if (enc_utf8 && (*mb_char2len)(c) > 1) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4983 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4984 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4985 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4986 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4987 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4988 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4989 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
|
4990 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4991 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4992 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4993 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
4994 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
|
4995 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4996 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4997 #endif /* FEAT_CONCEAL */ |
| 7 | 4998 } |
| 4999 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5000 #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
|
5001 /* 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
|
5002 * 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
|
5003 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
|
5004 && 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
|
5005 && 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
|
5006 && (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
|
5007 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5008 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5009 if (wp->w_p_rl) |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5010 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
|
5011 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5012 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5013 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
|
5014 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
|
5015 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
|
5016 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5017 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5018 |
| 7 | 5019 /* Don't override visual selection highlighting. */ |
| 5020 if (n_attr > 0 | |
| 5021 && draw_state == WL_LINE | |
| 674 | 5022 && !attr_pri) |
| 7 | 5023 char_attr = extra_attr; |
| 5024 | |
| 42 | 5025 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5026 /* XIM don't send preedit_start and preedit_end, but they send |
| 5027 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5028 * im_is_preediting() here. */ | |
| 5029 if (xic != NULL | |
| 1850 | 5030 && lnum == wp->w_cursor.lnum |
| 7 | 5031 && (State & INSERT) |
| 5032 && !p_imdisable | |
| 5033 && im_is_preediting() | |
| 5034 && draw_state == WL_LINE) | |
| 5035 { | |
| 5036 colnr_T tcol; | |
| 5037 | |
| 5038 if (preedit_end_col == MAXCOL) | |
| 1850 | 5039 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5040 else |
| 5041 tcol = preedit_end_col; | |
| 5042 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5043 { | |
| 5044 if (feedback_old_attr < 0) | |
| 5045 { | |
| 5046 feedback_col = 0; | |
| 5047 feedback_old_attr = char_attr; | |
| 5048 } | |
| 5049 char_attr = im_get_feedback_attr(feedback_col); | |
| 5050 if (char_attr < 0) | |
| 5051 char_attr = feedback_old_attr; | |
| 5052 feedback_col++; | |
| 5053 } | |
| 5054 else if (feedback_old_attr >= 0) | |
| 5055 { | |
| 5056 char_attr = feedback_old_attr; | |
| 5057 feedback_old_attr = -1; | |
| 5058 feedback_col = 0; | |
| 5059 } | |
| 5060 } | |
| 5061 #endif | |
| 5062 /* | |
| 5063 * Handle the case where we are in column 0 but not on the first | |
| 5064 * character of the line and the user wants us to show us a | |
| 5065 * special character (via 'listchars' option "precedes:<char>". | |
| 5066 */ | |
| 5067 if (lcs_prec_todo != NUL | |
| 6276 | 5068 && wp->w_p_list |
| 7 | 5069 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5070 #ifdef FEAT_DIFF | |
| 5071 && filler_todo <= 0 | |
| 5072 #endif | |
| 5073 && draw_state > WL_NR | |
| 5074 && c != NUL) | |
| 5075 { | |
| 5076 c = lcs_prec; | |
| 5077 lcs_prec_todo = NUL; | |
| 5078 #ifdef FEAT_MBYTE | |
| 3586 | 5079 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5080 { | |
| 5081 /* Double-width character being overwritten by the "precedes" | |
| 5082 * character, need to fill up half the character. */ | |
| 5083 c_extra = MB_FILLER_CHAR; | |
| 5084 n_extra = 1; | |
| 5085 n_attr = 2; | |
| 5086 extra_attr = hl_attr(HLF_AT); | |
| 5087 } | |
| 7 | 5088 mb_c = c; |
| 5089 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 5090 { | |
| 5091 mb_utf8 = TRUE; | |
| 714 | 5092 u8cc[0] = 0; |
| 819 | 5093 c = 0xc0; |
| 7 | 5094 } |
| 5095 else | |
| 5096 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5097 #endif | |
| 674 | 5098 if (!attr_pri) |
| 7 | 5099 { |
| 5100 saved_attr3 = char_attr; /* save current attr */ | |
| 5101 char_attr = hl_attr(HLF_AT); /* later copied to char_attr */ | |
| 5102 n_attr3 = 1; | |
| 5103 } | |
| 5104 } | |
| 5105 | |
| 5106 /* | |
| 867 | 5107 * At end of the text line or just after the last character. |
| 7 | 5108 */ |
| 867 | 5109 if (c == NUL |
| 910 | 5110 #if defined(LINE_ATTR) |
| 867 | 5111 || did_line_attr == 1 |
| 5112 #endif | |
| 5113 ) | |
| 5114 { | |
| 5115 #ifdef FEAT_SEARCH_EXTRA | |
| 5116 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5117 |
| 5118 /* we're not really at that column when skipping some text */ | |
| 1439 | 5119 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5120 ++prevcol; |
| 867 | 5121 #endif |
| 5122 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5123 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5124 * highlight match at end of line. If it's beyond the last |
| 5125 * char on the screen, just overwrite that one (tricky!) Not | |
| 5126 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5127 #ifdef FEAT_SEARCH_EXTRA |
| 5128 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5129 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5130 prevcol_hl_flag = TRUE; |
| 5131 else | |
| 5132 { | |
| 5133 cur = wp->w_match_head; | |
| 5134 while (cur != NULL) | |
| 5135 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5136 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5137 { |
| 5138 prevcol_hl_flag = TRUE; | |
| 5139 break; | |
| 5140 } | |
| 5141 cur = cur->next; | |
| 5142 } | |
| 5143 } | |
| 5144 #endif | |
| 7 | 5145 if (lcs_eol == lcs_eol_one |
| 1850 | 5146 && ((area_attr != 0 && vcol == fromcol |
| 5147 && (VIsual_mode != Ctrl_V | |
| 5148 || lnum == VIsual.lnum | |
| 5149 || lnum == curwin->w_cursor.lnum) | |
| 5150 && c == NUL) | |
| 7 | 5151 #ifdef FEAT_SEARCH_EXTRA |
| 5152 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5153 || (prevcol_hl_flag == TRUE |
| 910 | 5154 # if defined(LINE_ATTR) |
| 867 | 5155 && did_line_attr <= 1 |
| 5156 # endif | |
| 5157 ) | |
| 7 | 5158 #endif |
| 5159 )) | |
| 5160 { | |
| 5161 int n = 0; | |
| 5162 | |
| 5163 #ifdef FEAT_RIGHTLEFT | |
| 5164 if (wp->w_p_rl) | |
| 5165 { | |
| 5166 if (col < 0) | |
| 5167 n = 1; | |
| 5168 } | |
| 5169 else | |
| 5170 #endif | |
| 5171 { | |
| 5172 if (col >= W_WIDTH(wp)) | |
| 5173 n = -1; | |
| 5174 } | |
| 5175 if (n != 0) | |
| 5176 { | |
| 5177 /* At the window boundary, highlight the last character | |
| 5178 * instead (better than nothing). */ | |
| 5179 off += n; | |
| 5180 col += n; | |
| 5181 } | |
| 5182 else | |
| 5183 { | |
| 5184 /* Add a blank character to highlight. */ | |
| 5185 ScreenLines[off] = ' '; | |
| 5186 #ifdef FEAT_MBYTE | |
| 5187 if (enc_utf8) | |
| 5188 ScreenLinesUC[off] = 0; | |
| 5189 #endif | |
| 5190 } | |
| 5191 #ifdef FEAT_SEARCH_EXTRA | |
| 5192 if (area_attr == 0) | |
| 5193 { | |
| 1326 | 5194 /* Use attributes from match with highest priority among |
| 5195 * 'search_hl' and the match list. */ | |
| 5196 char_attr = search_hl.attr; | |
| 5197 cur = wp->w_match_head; | |
| 5198 shl_flag = FALSE; | |
| 5199 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5200 { |
| 1326 | 5201 if (shl_flag == FALSE |
| 5202 && ((cur != NULL | |
| 5203 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5204 || cur == NULL)) | |
| 699 | 5205 { |
| 1326 | 5206 shl = &search_hl; |
| 5207 shl_flag = TRUE; | |
| 699 | 5208 } |
| 1326 | 5209 else |
| 5210 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5211 if ((ptr - line) - 1 == (long)shl->startcol |
|
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5212 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5213 char_attr = shl->attr; |
| 5214 if (shl != &search_hl && cur != NULL) | |
| 5215 cur = cur->next; | |
| 699 | 5216 } |
| 7 | 5217 } |
| 5218 #endif | |
| 5219 ScreenAttrs[off] = char_attr; | |
| 5220 #ifdef FEAT_RIGHTLEFT | |
| 5221 if (wp->w_p_rl) | |
| 1437 | 5222 { |
| 7 | 5223 --col; |
| 1437 | 5224 --off; |
| 5225 } | |
| 7 | 5226 else |
| 5227 #endif | |
| 1437 | 5228 { |
| 7 | 5229 ++col; |
| 1437 | 5230 ++off; |
| 5231 } | |
| 743 | 5232 ++vcol; |
| 1437 | 5233 #ifdef FEAT_SYN_HL |
| 5234 eol_hl_off = 1; | |
| 5235 #endif | |
| 743 | 5236 } |
| 867 | 5237 } |
| 5238 | |
| 5239 /* | |
| 5240 * At end of the text line. | |
| 5241 */ | |
| 5242 if (c == NUL) | |
| 5243 { | |
| 743 | 5244 #ifdef FEAT_SYN_HL |
| 1850 | 5245 if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol |
| 5246 && lnum == wp->w_cursor.lnum) | |
| 1437 | 5247 { |
| 5248 /* highlight last char after line */ | |
| 5249 --col; | |
| 5250 --off; | |
| 5251 --vcol; | |
| 5252 } | |
| 5253 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5254 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5255 if (wp->w_p_wrap) |
| 5256 v = wp->w_skipcol; | |
| 5257 else | |
| 5258 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5259 |
| 820 | 5260 /* check if line ends before left margin */ |
| 5261 if (vcol < v + col - win_col_off(wp)) | |
| 5262 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
|
5263 #ifdef FEAT_CONCEAL |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5264 /* 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
|
5265 * edge for 'cursorcolumn'. */ |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5266 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5267 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5268 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5269 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5270 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5271 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
|
5272 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5273 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5274 && (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
|
5275 && (int)wp->w_virtcol < |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5276 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
|
5277 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5278 || draw_color_col) |
| 743 | 5279 # ifdef FEAT_RIGHTLEFT |
| 5280 && !wp->w_p_rl | |
| 5281 # endif | |
| 5282 ) | |
| 5283 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5284 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5285 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5286 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5287 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5288 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5289 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5290 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5291 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
|
5292 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5293 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5294 |
| 743 | 5295 while (col < W_WIDTH(wp)) |
| 5296 { | |
| 5297 ScreenLines[off] = ' '; | |
| 5298 #ifdef FEAT_MBYTE | |
| 5299 if (enc_utf8) | |
| 5300 ScreenLinesUC[off] = 0; | |
| 5301 #endif | |
| 5302 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5303 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5304 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
|
5305 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5306 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5307 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
|
5308 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
|
5309 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
|
5310 ScreenAttrs[off++] = hl_attr(HLF_MC); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5311 else |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5312 ScreenAttrs[off++] = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5313 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5314 if (VCOL_HLC >= rightmost_vcol) |
| 743 | 5315 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5316 |
| 743 | 5317 ++vcol; |
| 5318 } | |
| 5319 } | |
| 5320 #endif | |
| 7 | 5321 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5322 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
|
5323 (int)W_WIDTH(wp), wp->w_p_rl); |
| 7 | 5324 row++; |
| 5325 | |
| 5326 /* | |
| 5327 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5328 * updated (saves a call to plines() later). | |
| 5329 */ | |
| 5330 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5331 { | |
| 5332 curwin->w_cline_row = startrow; | |
| 5333 curwin->w_cline_height = row - startrow; | |
| 5334 #ifdef FEAT_FOLDING | |
| 5335 curwin->w_cline_folded = FALSE; | |
| 5336 #endif | |
| 5337 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5338 } | |
| 5339 | |
| 5340 break; | |
| 5341 } | |
| 5342 | |
| 5343 /* line continues beyond line end */ | |
| 5344 if (lcs_ext | |
| 5345 && !wp->w_p_wrap | |
| 5346 #ifdef FEAT_DIFF | |
| 5347 && filler_todo <= 0 | |
| 5348 #endif | |
| 5349 && ( | |
| 5350 #ifdef FEAT_RIGHTLEFT | |
| 5351 wp->w_p_rl ? col == 0 : | |
| 5352 #endif | |
| 5353 col == W_WIDTH(wp) - 1) | |
| 5354 && (*ptr != NUL | |
| 1555 | 5355 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5356 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5357 { | |
| 5358 c = lcs_ext; | |
| 5359 char_attr = hl_attr(HLF_AT); | |
| 5360 #ifdef FEAT_MBYTE | |
| 5361 mb_c = c; | |
| 5362 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 5363 { | |
| 5364 mb_utf8 = TRUE; | |
| 714 | 5365 u8cc[0] = 0; |
| 819 | 5366 c = 0xc0; |
| 7 | 5367 } |
| 5368 else | |
| 5369 mb_utf8 = FALSE; | |
| 5370 #endif | |
| 5371 } | |
| 5372 | |
| 743 | 5373 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5374 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5375 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5376 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
|
5377 |
| 743 | 5378 /* 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
|
5379 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5380 * 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
|
5381 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5382 vcol_save_attr = -1; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5383 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
|
5384 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5385 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
|
5386 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5387 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5388 vcol_save_attr = char_attr; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5389 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
|
5390 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5391 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
|
5392 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5393 vcol_save_attr = char_attr; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5394 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
|
5395 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5396 } |
| 743 | 5397 #endif |
| 5398 | |
| 7 | 5399 /* |
| 5400 * Store character to be displayed. | |
| 5401 * Skip characters that are left of the screen for 'nowrap'. | |
| 5402 */ | |
| 5403 vcol_prev = vcol; | |
| 5404 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5405 { | |
| 5406 /* | |
| 5407 * Store the character. | |
| 5408 */ | |
| 5409 #if defined(FEAT_RIGHTLEFT) && defined(FEAT_MBYTE) | |
| 5410 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) | |
| 5411 { | |
| 5412 /* A double-wide character is: put first halve in left cell. */ | |
| 5413 --off; | |
| 5414 --col; | |
| 5415 } | |
| 5416 #endif | |
| 5417 ScreenLines[off] = c; | |
| 5418 #ifdef FEAT_MBYTE | |
| 5419 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5420 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5421 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5422 ScreenLines[off] = 0x8e; |
| 7 | 5423 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5424 } |
| 7 | 5425 else if (enc_utf8) |
| 5426 { | |
| 5427 if (mb_utf8) | |
| 5428 { | |
| 1326 | 5429 int i; |
| 5430 | |
| 7 | 5431 ScreenLinesUC[off] = mb_c; |
| 819 | 5432 if ((c & 0xff) == 0) |
| 5433 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5434 for (i = 0; i < Screen_mco; ++i) |
| 5435 { | |
| 5436 ScreenLinesC[i][off] = u8cc[i]; | |
| 5437 if (u8cc[i] == 0) | |
| 5438 break; | |
| 5439 } | |
| 7 | 5440 } |
| 5441 else | |
| 5442 ScreenLinesUC[off] = 0; | |
| 5443 } | |
| 5444 if (multi_attr) | |
| 5445 { | |
| 5446 ScreenAttrs[off] = multi_attr; | |
| 5447 multi_attr = 0; | |
| 5448 } | |
| 5449 else | |
| 5450 #endif | |
| 5451 ScreenAttrs[off] = char_attr; | |
| 5452 | |
| 5453 #ifdef FEAT_MBYTE | |
| 5454 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5455 { | |
| 5456 /* Need to fill two screen columns. */ | |
| 5457 ++off; | |
| 5458 ++col; | |
| 5459 if (enc_utf8) | |
| 5460 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5461 ScreenLines[off] = 0; | |
| 5462 else | |
| 5463 /* DBCS: Put second byte in the second screen char. */ | |
| 5464 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5465 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5466 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5467 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5468 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5469 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5470 ++vcol; |
| 7 | 5471 /* When "tocol" is halfway a character, set it to the end of |
| 5472 * the character, otherwise highlighting won't stop. */ | |
| 5473 if (tocol == vcol) | |
| 5474 ++tocol; | |
| 5475 #ifdef FEAT_RIGHTLEFT | |
| 5476 if (wp->w_p_rl) | |
| 5477 { | |
| 5478 /* now it's time to backup one cell */ | |
| 5479 --off; | |
| 5480 --col; | |
| 5481 } | |
| 5482 #endif | |
| 5483 } | |
| 5484 #endif | |
| 5485 #ifdef FEAT_RIGHTLEFT | |
| 5486 if (wp->w_p_rl) | |
| 5487 { | |
| 5488 --off; | |
| 5489 --col; | |
| 5490 } | |
| 5491 else | |
| 5492 #endif | |
| 5493 { | |
| 5494 ++off; | |
| 5495 ++col; | |
| 5496 } | |
| 5497 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5498 #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
|
5499 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
|
5500 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5501 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5502 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5503 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5504 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5505 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5506 { |
|
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 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5509 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5510 * 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
|
5511 * 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
|
5512 * 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
|
5513 * 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
|
5514 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5515 * 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
|
5516 * 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
|
5517 * 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
|
5518 * of bad columns we have advanced. |
|
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 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5521 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5522 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5523 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5524 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5525 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5526 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5527 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5528 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5529 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5530 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5531 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5532 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5533 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5534 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5535 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5536 n_attr = 0; |
|
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 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5539 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5540 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5541 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
|
5542 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5543 /* Need to fill two screen columns. */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5544 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5545 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5546 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5547 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5548 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5549 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5550 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5551 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5552 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5553 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5554 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5555 } |
|
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 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5558 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5559 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5560 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5561 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5562 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5563 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5564 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5565 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5566 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5567 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5568 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5569 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5570 } |
|
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 else |
|
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 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5575 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5576 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5577 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5578 n_attr = 0; |
|
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 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5582 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5583 #endif /* FEAT_CONCEAL */ |
| 7 | 5584 else |
| 5585 --n_skip; | |
| 5586 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5587 /* 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
|
5588 * column. */ |
| 1849 | 5589 if (draw_state > WL_NR |
| 7 | 5590 #ifdef FEAT_DIFF |
| 5591 && filler_todo <= 0 | |
| 5592 #endif | |
| 5593 ) | |
| 5594 ++vcol; | |
| 5595 | |
| 743 | 5596 #ifdef FEAT_SYN_HL |
| 5597 if (vcol_save_attr >= 0) | |
| 5598 char_attr = vcol_save_attr; | |
| 5599 #endif | |
| 5600 | |
| 7 | 5601 /* restore attributes after "predeces" in 'listchars' */ |
| 5602 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5603 char_attr = saved_attr3; | |
| 5604 | |
| 5605 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5606 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5607 char_attr = saved_attr2; | |
| 5608 | |
| 5609 /* | |
| 5610 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5611 * so far. If there is no more to display it is caught above. |
| 7 | 5612 */ |
| 5613 if (( | |
| 5614 #ifdef FEAT_RIGHTLEFT | |
| 5615 wp->w_p_rl ? (col < 0) : | |
| 5616 #endif | |
| 5617 (col >= W_WIDTH(wp))) | |
| 5618 && (*ptr != NUL | |
| 5619 #ifdef FEAT_DIFF | |
| 5620 || filler_todo > 0 | |
| 5621 #endif | |
| 2724 | 5622 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5623 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5624 ) | |
| 5625 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5626 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5627 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
|
5628 (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
|
5629 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5630 #else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5631 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
|
5632 (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
|
5633 #endif |
| 7 | 5634 ++row; |
| 5635 ++screen_row; | |
| 5636 | |
| 5637 /* When not wrapping and finished diff lines, or when displayed | |
| 5638 * '$' and highlighting until last column, break here. */ | |
| 5639 if ((!wp->w_p_wrap | |
| 5640 #ifdef FEAT_DIFF | |
| 5641 && filler_todo <= 0 | |
| 5642 #endif | |
| 5643 ) || lcs_eol_one == -1) | |
| 5644 break; | |
| 5645 | |
| 5646 /* When the window is too narrow draw all "@" lines. */ | |
| 5647 if (draw_state != WL_LINE | |
| 5648 #ifdef FEAT_DIFF | |
| 5649 && filler_todo <= 0 | |
| 5650 #endif | |
| 5651 ) | |
| 5652 { | |
| 5653 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
|
5654 #ifdef FEAT_WINDOWS |
| 7 | 5655 draw_vsep_win(wp, row); |
| 5656 #endif | |
| 5657 row = endrow; | |
| 5658 } | |
| 5659 | |
| 5660 /* When line got too long for screen break here. */ | |
| 5661 if (row == endrow) | |
| 5662 { | |
| 5663 ++row; | |
| 5664 break; | |
| 5665 } | |
| 5666 | |
| 5667 if (screen_cur_row == screen_row - 1 | |
| 5668 #ifdef FEAT_DIFF | |
| 5669 && filler_todo <= 0 | |
| 5670 #endif | |
| 5671 && W_WIDTH(wp) == Columns) | |
| 5672 { | |
| 5673 /* Remember that the line wraps, used for modeless copy. */ | |
| 5674 LineWraps[screen_row - 1] = TRUE; | |
| 5675 | |
| 5676 /* | |
| 5677 * Special trick to make copy/paste of wrapped lines work with | |
| 5678 * xterm/screen: write an extra character beyond the end of | |
| 5679 * the line. This will work with all terminal types | |
| 5680 * (regardless of the xn,am settings). | |
| 5681 * Only do this on a fast tty. | |
| 5682 * Only do this if the cursor is on the current line | |
| 5683 * (something has been written in it). | |
| 5684 * Don't do this for the GUI. | |
| 5685 * Don't do this for double-width characters. | |
| 5686 * Don't do this for a window not at the right screen border. | |
| 5687 */ | |
| 5688 if (p_tf | |
| 5689 #ifdef FEAT_GUI | |
| 5690 && !gui.in_use | |
| 5691 #endif | |
| 5692 #ifdef FEAT_MBYTE | |
| 5693 && !(has_mbyte | |
| 1378 | 5694 && ((*mb_off2cells)(LineOffset[screen_row], |
| 5695 LineOffset[screen_row] + screen_Columns) | |
| 5696 == 2 | |
| 7 | 5697 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 5698 + (int)Columns - 2, |
| 5699 LineOffset[screen_row] + screen_Columns) | |
| 5700 == 2)) | |
| 7 | 5701 #endif |
| 5702 ) | |
| 5703 { | |
| 5704 /* First make sure we are at the end of the screen line, | |
| 5705 * then output the same character again to let the | |
| 5706 * terminal know about the wrap. If the terminal doesn't | |
| 5707 * auto-wrap, we overwrite the character. */ | |
| 5708 if (screen_cur_col != W_WIDTH(wp)) | |
| 5709 screen_char(LineOffset[screen_row - 1] | |
| 5710 + (unsigned)Columns - 1, | |
| 5711 screen_row - 1, (int)(Columns - 1)); | |
| 5712 | |
| 5713 #ifdef FEAT_MBYTE | |
| 5714 /* When there is a multi-byte character, just output a | |
| 5715 * space to keep it simple. */ | |
| 148 | 5716 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 5717 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 5718 out_char(' '); |
| 5719 else | |
| 5720 #endif | |
| 5721 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 5722 + (Columns - 1)]); | |
| 5723 /* force a redraw of the first char on the next line */ | |
| 5724 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 5725 screen_start(); /* don't know where cursor is now */ | |
| 5726 } | |
| 5727 } | |
| 5728 | |
| 5729 col = 0; | |
| 5730 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5731 #ifdef FEAT_RIGHTLEFT | |
| 5732 if (wp->w_p_rl) | |
| 5733 { | |
| 5734 col = W_WIDTH(wp) - 1; /* col is not used if breaking! */ | |
| 5735 off += col; | |
| 5736 } | |
| 5737 #endif | |
| 5738 | |
| 5739 /* reset the drawing state for the start of a wrapped line */ | |
| 5740 draw_state = WL_START; | |
| 5741 saved_n_extra = n_extra; | |
| 5742 saved_p_extra = p_extra; | |
| 5743 saved_c_extra = c_extra; | |
| 5744 saved_char_attr = char_attr; | |
| 5745 n_extra = 0; | |
| 5746 lcs_prec_todo = lcs_prec; | |
| 5747 #ifdef FEAT_LINEBREAK | |
| 5748 # ifdef FEAT_DIFF | |
| 5749 if (filler_todo <= 0) | |
| 5750 # endif | |
| 5751 need_showbreak = TRUE; | |
| 5752 #endif | |
| 5753 #ifdef FEAT_DIFF | |
| 5754 --filler_todo; | |
| 5755 /* When the filler lines are actually below the last line of the | |
| 5756 * file, don't draw the line itself, break here. */ | |
| 5757 if (filler_todo == 0 && wp->w_botfill) | |
| 5758 break; | |
| 5759 #endif | |
| 5760 } | |
| 5761 | |
| 5762 } /* for every character in the line */ | |
| 5763 | |
| 743 | 5764 #ifdef FEAT_SPELL |
| 386 | 5765 /* After an empty line check first word for capital. */ |
| 5766 if (*skipwhite(line) == NUL) | |
| 5767 { | |
| 5768 capcol_lnum = lnum + 1; | |
| 5769 cap_col = 0; | |
| 5770 } | |
| 5771 #endif | |
| 5772 | |
| 7 | 5773 return row; |
| 5774 } | |
| 5775 | |
| 714 | 5776 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
5777 static int comp_char_differs(int, int); |
| 714 | 5778 |
| 5779 /* | |
| 5780 * 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
|
5781 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 5782 */ |
| 5783 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5784 comp_char_differs(int off_from, int off_to) |
| 714 | 5785 { |
| 5786 int i; | |
| 5787 | |
| 5788 for (i = 0; i < Screen_mco; ++i) | |
| 5789 { | |
| 5790 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 5791 return TRUE; | |
| 5792 if (ScreenLinesC[i][off_from] == 0) | |
| 5793 break; | |
| 5794 } | |
| 5795 return FALSE; | |
| 5796 } | |
| 5797 #endif | |
| 5798 | |
| 7 | 5799 /* |
| 5800 * Check whether the given character needs redrawing: | |
| 5801 * - the (first byte of the) character is different | |
| 5802 * - the attributes are different | |
| 5803 * - the character is multi-byte and the next byte is different | |
| 1616 | 5804 * - the character is two cells wide and the second cell differs. |
| 7 | 5805 */ |
| 5806 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5807 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 5808 { |
| 5809 if (cols > 0 | |
| 5810 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 5811 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 5812 | |
| 5813 #ifdef FEAT_MBYTE | |
| 5814 || (enc_dbcs != 0 | |
| 5815 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 5816 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 5817 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 5818 : (cols > 1 && ScreenLines[off_from + 1] | |
| 5819 != ScreenLines[off_to + 1]))) | |
| 5820 || (enc_utf8 | |
| 5821 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 5822 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 5823 && comp_char_differs(off_from, off_to)) |
| 3759 | 5824 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 5825 && ScreenLines[off_from + 1] | |
| 5826 != ScreenLines[off_to + 1]))) | |
| 7 | 5827 #endif |
| 5828 )) | |
| 5829 return TRUE; | |
| 5830 return FALSE; | |
| 5831 } | |
| 5832 | |
| 5833 /* | |
| 5834 * Move one "cooked" screen line to the screen, but only the characters that | |
| 5835 * have actually changed. Handle insert/delete character. | |
| 5836 * "coloff" gives the first column on the screen for this line. | |
| 5837 * "endcol" gives the columns where valid characters are. | |
| 5838 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 5839 * needs to be cleared, negative otherwise. | |
| 5840 * "rlflag" is TRUE in a rightleft window: | |
| 5841 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" | |
| 5842 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 5843 */ | |
| 5844 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5845 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5846 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5847 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5848 int endcol, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5849 int clear_width |
| 7 | 5850 #ifdef FEAT_RIGHTLEFT |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5851 , int rlflag |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5852 #endif |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5853 ) |
| 7 | 5854 { |
| 5855 unsigned off_from; | |
| 5856 unsigned off_to; | |
| 1378 | 5857 #ifdef FEAT_MBYTE |
| 5858 unsigned max_off_from; | |
| 5859 unsigned max_off_to; | |
| 5860 #endif | |
| 7 | 5861 int col = 0; |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
5862 #if defined(FEAT_GUI) || defined(UNIX) || defined(FEAT_WINDOWS) |
| 7 | 5863 int hl; |
| 5864 #endif | |
| 5865 int force = FALSE; /* force update rest of the line */ | |
| 5866 int redraw_this /* bool: does character need redraw? */ | |
| 5867 #ifdef FEAT_GUI | |
| 5868 = TRUE /* For GUI when while-loop empty */ | |
| 5869 #endif | |
| 5870 ; | |
| 5871 int redraw_next; /* redraw_this for next character */ | |
| 5872 #ifdef FEAT_MBYTE | |
| 5873 int clear_next = FALSE; | |
| 5874 int char_cells; /* 1: normal char */ | |
| 5875 /* 2: occupies two display cells */ | |
| 5876 # define CHAR_CELLS char_cells | |
| 5877 #else | |
| 5878 # define CHAR_CELLS 1 | |
| 5879 #endif | |
| 5880 | |
| 3413 | 5881 /* Check for illegal row and col, just in case. */ |
| 5882 if (row >= Rows) | |
| 5883 row = Rows - 1; | |
| 5884 if (endcol > Columns) | |
| 5885 endcol = Columns; | |
| 5886 | |
| 7 | 5887 # ifdef FEAT_CLIPBOARD |
| 5888 clip_may_clear_selection(row, row); | |
| 5889 # endif | |
| 5890 | |
| 5891 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5892 off_to = LineOffset[row] + coloff; | |
| 1378 | 5893 #ifdef FEAT_MBYTE |
| 5894 max_off_from = off_from + screen_Columns; | |
| 5895 max_off_to = LineOffset[row] + screen_Columns; | |
| 5896 #endif | |
| 7 | 5897 |
| 5898 #ifdef FEAT_RIGHTLEFT | |
| 5899 if (rlflag) | |
| 5900 { | |
| 5901 /* Clear rest first, because it's left of the text. */ | |
| 5902 if (clear_width > 0) | |
| 5903 { | |
| 5904 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 5905 && ScreenAttrs[off_to] == 0 | |
| 5906 # ifdef FEAT_MBYTE | |
| 5907 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 5908 # endif | |
| 5909 ) | |
| 5910 { | |
| 5911 ++off_to; | |
| 5912 ++col; | |
| 5913 } | |
| 5914 if (col <= endcol) | |
| 5915 screen_fill(row, row + 1, col + coloff, | |
| 5916 endcol + coloff + 1, ' ', ' ', 0); | |
| 5917 } | |
| 5918 col = endcol + 1; | |
| 5919 off_to = LineOffset[row] + col + coloff; | |
| 5920 off_from += col; | |
| 5921 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 5922 } | |
| 5923 #endif /* FEAT_RIGHTLEFT */ | |
| 5924 | |
| 5925 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 5926 | |
| 5927 while (col < endcol) | |
| 5928 { | |
| 5929 #ifdef FEAT_MBYTE | |
| 5930 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 5931 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 5932 else |
| 5933 char_cells = 1; | |
| 5934 #endif | |
| 5935 | |
| 5936 redraw_this = redraw_next; | |
| 5937 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 5938 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 5939 | |
| 5940 #ifdef FEAT_GUI | |
| 5941 /* If the next character was bold, then redraw the current character to | |
| 5942 * remove any pixels that might have spilt over into us. This only | |
| 5943 * happens in the GUI. | |
| 5944 */ | |
| 5945 if (redraw_next && gui.in_use) | |
| 5946 { | |
| 5947 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 5948 if (hl > HL_ALL) |
| 5949 hl = syn_attr2attr(hl); | |
| 5950 if (hl & HL_BOLD) | |
| 7 | 5951 redraw_this = TRUE; |
| 5952 } | |
| 5953 #endif | |
| 5954 | |
| 5955 if (redraw_this) | |
| 5956 { | |
| 5957 /* | |
| 5958 * Special handling when 'xs' termcap flag set (hpterm): | |
| 5959 * Attributes for characters are stored at the position where the | |
| 5960 * cursor is when writing the highlighting code. The | |
| 5961 * start-highlighting code must be written with the cursor on the | |
| 5962 * first highlighted character. The stop-highlighting code must | |
| 5963 * be written with the cursor just after the last highlighted | |
| 5964 * character. | |
| 5965 * Overwriting a character doesn't remove it's highlighting. Need | |
| 5966 * to clear the rest of the line, and force redrawing it | |
| 5967 * completely. | |
| 5968 */ | |
| 5969 if ( p_wiv | |
| 5970 && !force | |
| 5971 #ifdef FEAT_GUI | |
| 5972 && !gui.in_use | |
| 5973 #endif | |
| 5974 && ScreenAttrs[off_to] != 0 | |
| 5975 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 5976 { | |
| 5977 /* | |
| 5978 * Need to remove highlighting attributes here. | |
| 5979 */ | |
| 5980 windgoto(row, col + coloff); | |
| 5981 out_str(T_CE); /* clear rest of this screen line */ | |
| 5982 screen_start(); /* don't know where cursor is now */ | |
| 5983 force = TRUE; /* force redraw of rest of the line */ | |
| 5984 redraw_next = TRUE; /* or else next char would miss out */ | |
| 5985 | |
| 5986 /* | |
| 5987 * If the previous character was highlighted, need to stop | |
| 5988 * highlighting at this character. | |
| 5989 */ | |
| 5990 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 5991 { | |
| 5992 screen_attr = ScreenAttrs[off_to - 1]; | |
| 5993 term_windgoto(row, col + coloff); | |
| 5994 screen_stop_highlight(); | |
| 5995 } | |
| 5996 else | |
| 5997 screen_attr = 0; /* highlighting has stopped */ | |
| 5998 } | |
| 5999 #ifdef FEAT_MBYTE | |
| 6000 if (enc_dbcs != 0) | |
| 6001 { | |
| 6002 /* Check if overwriting a double-byte with a single-byte or | |
| 6003 * the other way around requires another character to be | |
| 6004 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6005 * ScreenLinesUC[] is sufficient. */ | |
| 6006 if (char_cells == 1 | |
| 6007 && col + 1 < endcol | |
| 1378 | 6008 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6009 { |
| 6010 /* Writing a single-cell character over a double-cell | |
| 6011 * character: need to redraw the next cell. */ | |
| 6012 ScreenLines[off_to + 1] = 0; | |
| 6013 redraw_next = TRUE; | |
| 6014 } | |
| 6015 else if (char_cells == 2 | |
| 6016 && col + 2 < endcol | |
| 1378 | 6017 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6018 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6019 { |
| 6020 /* Writing the second half of a double-cell character over | |
| 6021 * a double-cell character: need to redraw the second | |
| 6022 * cell. */ | |
| 6023 ScreenLines[off_to + 2] = 0; | |
| 6024 redraw_next = TRUE; | |
| 6025 } | |
| 6026 | |
| 6027 if (enc_dbcs == DBCS_JPNU) | |
| 6028 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6029 } | |
| 6030 /* When writing a single-width character over a double-width | |
| 6031 * character and at the end of the redrawn text, need to clear out | |
| 6032 * the right halve of the old character. | |
| 6033 * Also required when writing the right halve of a double-width | |
| 6034 * char over the left halve of an existing one. */ | |
| 6035 if (has_mbyte && col + char_cells == endcol | |
| 6036 && ((char_cells == 1 | |
| 1378 | 6037 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6038 || (char_cells == 2 |
| 1378 | 6039 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6040 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6041 clear_next = TRUE; |
| 6042 #endif | |
| 6043 | |
| 6044 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6045 #ifdef FEAT_MBYTE | |
| 6046 if (enc_utf8) | |
| 6047 { | |
| 6048 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6049 if (ScreenLinesUC[off_from] != 0) | |
| 6050 { | |
| 714 | 6051 int i; |
| 6052 | |
| 6053 for (i = 0; i < Screen_mco; ++i) | |
| 6054 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6055 } |
| 6056 } | |
| 6057 if (char_cells == 2) | |
| 6058 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6059 #endif | |
| 6060 | |
| 6061 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6062 /* The bold trick makes a single column of pixels appear in the |
| 6063 * next character. When a bold character is removed, the next | |
| 7 | 6064 * character should be redrawn too. This happens for our own GUI |
| 6065 * and for some xterms. */ | |
| 6066 if ( | |
| 6067 # ifdef FEAT_GUI | |
| 6068 gui.in_use | |
| 6069 # endif | |
| 6070 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6071 || | |
| 6072 # endif | |
| 6073 # ifdef UNIX | |
| 6074 term_is_xterm | |
| 6075 # endif | |
| 6076 ) | |
| 6077 { | |
| 6078 hl = ScreenAttrs[off_to]; | |
| 743 | 6079 if (hl > HL_ALL) |
| 6080 hl = syn_attr2attr(hl); | |
| 6081 if (hl & HL_BOLD) | |
| 7 | 6082 redraw_next = TRUE; |
| 6083 } | |
| 6084 #endif | |
| 6085 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
| 6086 #ifdef FEAT_MBYTE | |
| 819 | 6087 /* For simplicity set the attributes of second half of a |
| 6088 * double-wide character equal to the first half. */ | |
| 6089 if (char_cells == 2) | |
| 6090 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6091 | |
| 7 | 6092 if (enc_dbcs != 0 && char_cells == 2) |
| 6093 screen_char_2(off_to, row, col + coloff); | |
| 6094 else | |
| 6095 #endif | |
| 6096 screen_char(off_to, row, col + coloff); | |
| 6097 } | |
| 6098 else if ( p_wiv | |
| 6099 #ifdef FEAT_GUI | |
| 6100 && !gui.in_use | |
| 6101 #endif | |
| 6102 && col + coloff > 0) | |
| 6103 { | |
| 6104 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6105 { | |
| 6106 /* | |
| 6107 * Don't output stop-highlight when moving the cursor, it will | |
| 6108 * stop the highlighting when it should continue. | |
| 6109 */ | |
| 6110 screen_attr = 0; | |
| 6111 } | |
| 6112 else if (screen_attr != 0) | |
| 6113 screen_stop_highlight(); | |
| 6114 } | |
| 6115 | |
| 6116 off_to += CHAR_CELLS; | |
| 6117 off_from += CHAR_CELLS; | |
| 6118 col += CHAR_CELLS; | |
| 6119 } | |
| 6120 | |
| 6121 #ifdef FEAT_MBYTE | |
| 6122 if (clear_next) | |
| 6123 { | |
| 6124 /* Clear the second half of a double-wide character of which the left | |
| 6125 * half was overwritten with a single-wide character. */ | |
| 6126 ScreenLines[off_to] = ' '; | |
| 6127 if (enc_utf8) | |
| 6128 ScreenLinesUC[off_to] = 0; | |
| 6129 screen_char(off_to, row, col + coloff); | |
| 6130 } | |
| 6131 #endif | |
| 6132 | |
| 6133 if (clear_width > 0 | |
| 6134 #ifdef FEAT_RIGHTLEFT | |
| 6135 && !rlflag | |
| 6136 #endif | |
| 6137 ) | |
| 6138 { | |
| 6139 #ifdef FEAT_GUI | |
| 6140 int startCol = col; | |
| 6141 #endif | |
| 6142 | |
| 6143 /* blank out the rest of the line */ | |
| 6144 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6145 && ScreenAttrs[off_to] == 0 | |
| 6146 #ifdef FEAT_MBYTE | |
| 6147 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6148 #endif | |
| 6149 ) | |
| 6150 { | |
| 6151 ++off_to; | |
| 6152 ++col; | |
| 6153 } | |
| 6154 if (col < clear_width) | |
| 6155 { | |
| 6156 #ifdef FEAT_GUI | |
| 6157 /* | |
| 6158 * In the GUI, clearing the rest of the line may leave pixels | |
| 6159 * behind if the first character cleared was bold. Some bold | |
| 6160 * fonts spill over the left. In this case we redraw the previous | |
| 6161 * character too. If we didn't skip any blanks above, then we | |
| 6162 * only redraw if the character wasn't already redrawn anyway. | |
| 6163 */ | |
| 996 | 6164 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6165 { |
| 6166 hl = ScreenAttrs[off_to]; | |
| 6167 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6168 { |
| 6169 int prev_cells = 1; | |
| 6170 # ifdef FEAT_MBYTE | |
| 6171 if (enc_utf8) | |
| 6172 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6173 * that its width is 2. */ | |
| 6174 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6175 else if (enc_dbcs != 0) | |
| 6176 { | |
| 6177 /* find previous character by counting from first | |
| 6178 * column and get its width. */ | |
| 6179 unsigned off = LineOffset[row]; | |
| 1378 | 6180 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6181 |
| 6182 while (off < off_to) | |
| 6183 { | |
| 1378 | 6184 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6185 off += prev_cells; |
| 6186 } | |
| 6187 } | |
| 6188 | |
| 6189 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6190 screen_char_2(off_to - prev_cells, row, | |
| 6191 col + coloff - prev_cells); | |
| 6192 else | |
| 6193 # endif | |
| 6194 screen_char(off_to - prev_cells, row, | |
| 6195 col + coloff - prev_cells); | |
| 6196 } | |
| 7 | 6197 } |
| 6198 #endif | |
| 6199 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6200 ' ', ' ', 0); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6201 #ifdef FEAT_WINDOWS |
| 7 | 6202 off_to += clear_width - col; |
| 6203 col = clear_width; | |
| 6204 #endif | |
| 6205 } | |
| 6206 } | |
| 6207 | |
| 6208 if (clear_width > 0) | |
| 6209 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6210 #ifdef FEAT_WINDOWS |
| 7 | 6211 /* For a window that's left of another, draw the separator char. */ |
| 6212 if (col + coloff < Columns) | |
| 6213 { | |
| 6214 int c; | |
| 6215 | |
| 6216 c = fillchar_vsep(&hl); | |
| 6477 | 6217 if (ScreenLines[off_to] != (schar_T)c |
| 7 | 6218 # ifdef FEAT_MBYTE |
| 714 | 6219 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6220 != (c >= 0x80 ? c : 0)) | |
| 7 | 6221 # endif |
| 6222 || ScreenAttrs[off_to] != hl) | |
| 6223 { | |
| 6224 ScreenLines[off_to] = c; | |
| 6225 ScreenAttrs[off_to] = hl; | |
| 6226 # ifdef FEAT_MBYTE | |
| 6227 if (enc_utf8) | |
| 6228 { | |
| 6229 if (c >= 0x80) | |
| 6230 { | |
| 6231 ScreenLinesUC[off_to] = c; | |
| 714 | 6232 ScreenLinesC[0][off_to] = 0; |
| 7 | 6233 } |
| 6234 else | |
| 6235 ScreenLinesUC[off_to] = 0; | |
| 6236 } | |
| 6237 # endif | |
| 6238 screen_char(off_to, row, col + coloff); | |
| 6239 } | |
| 6240 } | |
| 6241 else | |
| 6242 #endif | |
| 6243 LineWraps[row] = FALSE; | |
| 6244 } | |
| 6245 } | |
| 6246 | |
| 474 | 6247 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6248 /* |
| 474 | 6249 * Mirror text "str" for right-left displaying. |
| 6250 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6251 */ |
| 474 | 6252 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6253 rl_mirror(char_u *str) |
| 7 | 6254 { |
| 6255 char_u *p1, *p2; | |
| 6256 int t; | |
| 6257 | |
| 6258 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6259 { | |
| 6260 t = *p1; | |
| 6261 *p1 = *p2; | |
| 6262 *p2 = t; | |
| 6263 } | |
| 6264 } | |
| 6265 #endif | |
| 6266 | |
| 6267 #if defined(FEAT_WINDOWS) || defined(PROTO) | |
| 6268 /* | |
| 6269 * mark all status lines for redraw; used after first :cd | |
| 6270 */ | |
| 6271 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6272 status_redraw_all(void) |
| 7 | 6273 { |
| 6274 win_T *wp; | |
| 6275 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6276 FOR_ALL_WINDOWS(wp) |
| 7 | 6277 if (wp->w_status_height) |
| 6278 { | |
| 6279 wp->w_redr_status = TRUE; | |
| 6280 redraw_later(VALID); | |
| 6281 } | |
| 6282 } | |
| 6283 | |
| 6284 /* | |
| 6285 * mark all status lines of the current buffer for redraw | |
| 6286 */ | |
| 6287 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6288 status_redraw_curbuf(void) |
| 7 | 6289 { |
| 6290 win_T *wp; | |
| 6291 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6292 FOR_ALL_WINDOWS(wp) |
| 7 | 6293 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6294 { | |
| 6295 wp->w_redr_status = TRUE; | |
| 6296 redraw_later(VALID); | |
| 6297 } | |
| 6298 } | |
| 6299 | |
| 6300 /* | |
| 6301 * Redraw all status lines that need to be redrawn. | |
| 6302 */ | |
| 6303 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6304 redraw_statuslines(void) |
| 7 | 6305 { |
| 6306 win_T *wp; | |
| 6307 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6308 FOR_ALL_WINDOWS(wp) |
| 7 | 6309 if (wp->w_redr_status) |
| 6310 win_redr_status(wp); | |
| 673 | 6311 if (redraw_tabline) |
| 677 | 6312 draw_tabline(); |
| 7 | 6313 } |
| 6314 #endif | |
| 6315 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6316 #if (defined(FEAT_WILDMENU) && defined(FEAT_WINDOWS)) || defined(PROTO) |
| 7 | 6317 /* |
| 6318 * Redraw all status lines at the bottom of frame "frp". | |
| 6319 */ | |
| 6320 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6321 win_redraw_last_status(frame_T *frp) |
| 7 | 6322 { |
| 6323 if (frp->fr_layout == FR_LEAF) | |
| 6324 frp->fr_win->w_redr_status = TRUE; | |
| 6325 else if (frp->fr_layout == FR_ROW) | |
| 6326 { | |
| 6327 for (frp = frp->fr_child; frp != NULL; frp = frp->fr_next) | |
| 6328 win_redraw_last_status(frp); | |
| 6329 } | |
| 6330 else /* frp->fr_layout == FR_COL */ | |
| 6331 { | |
| 6332 frp = frp->fr_child; | |
| 6333 while (frp->fr_next != NULL) | |
| 6334 frp = frp->fr_next; | |
| 6335 win_redraw_last_status(frp); | |
| 6336 } | |
| 6337 } | |
| 6338 #endif | |
| 6339 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6340 #ifdef FEAT_WINDOWS |
| 7 | 6341 /* |
| 6342 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6343 */ | |
| 6344 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6345 draw_vsep_win(win_T *wp, int row) |
| 7 | 6346 { |
| 6347 int hl; | |
| 6348 int c; | |
| 6349 | |
| 6350 if (wp->w_vsep_width) | |
| 6351 { | |
| 6352 /* draw the vertical separator right of this window */ | |
| 6353 c = fillchar_vsep(&hl); | |
| 6354 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6355 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6356 c, ' ', hl); | |
| 6357 } | |
| 6358 } | |
| 6359 #endif | |
| 6360 | |
| 6361 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6362 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
|
6363 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6364 |
| 6365 /* | |
| 1378 | 6366 * Get the length of an item as it will be shown in the status line. |
| 7 | 6367 */ |
| 6368 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6369 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6370 { |
| 6371 int len = 0; | |
| 6372 | |
| 6373 #ifdef FEAT_MENU | |
| 6374 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6375 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6376 | |
| 6377 /* Check for menu separators - replace with '|'. */ | |
| 6378 if (emenu && menu_is_separator(s)) | |
| 6379 return 1; | |
| 6380 #endif | |
| 6381 | |
| 6382 while (*s != NUL) | |
| 6383 { | |
| 1685 | 6384 s += skip_status_match_char(xp, s); |
| 42 | 6385 len += ptr2cells(s); |
| 39 | 6386 mb_ptr_adv(s); |
| 7 | 6387 } |
| 6388 | |
| 6389 return len; | |
| 6390 } | |
| 6391 | |
| 6392 /* | |
| 1685 | 6393 * Return the number of characters that should be skipped in a status match. |
| 277 | 6394 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6395 */ | |
| 6396 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6397 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6398 { |
| 1685 | 6399 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6400 #ifdef FEAT_MENU |
| 6401 || ((xp->xp_context == EXPAND_MENUS | |
| 6402 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6403 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6404 #endif | |
| 1685 | 6405 ) |
| 6406 { | |
| 6407 #ifndef BACKSLASH_IN_FILENAME | |
| 6408 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6409 return 2; | |
| 6410 #endif | |
| 6411 return 1; | |
| 6412 } | |
| 6413 return 0; | |
| 277 | 6414 } |
| 6415 | |
| 6416 /* | |
| 7 | 6417 * Show wildchar matches in the status line. |
| 6418 * Show at least the "match" item. | |
| 6419 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6420 * | |
| 6421 * If inversion is possible we use it. Else '=' characters are used. | |
| 6422 */ | |
| 6423 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6424 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6425 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6426 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6427 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6428 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6429 int showtail) |
| 7 | 6430 { |
| 6431 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6432 int row; | |
| 6433 char_u *buf; | |
| 6434 int len; | |
| 1378 | 6435 int clen; /* length in screen cells */ |
| 7 | 6436 int fillchar; |
| 6437 int attr; | |
| 6438 int i; | |
| 6439 int highlight = TRUE; | |
| 6440 char_u *selstart = NULL; | |
| 6441 int selstart_col = 0; | |
| 6442 char_u *selend = NULL; | |
| 6443 static int first_match = 0; | |
| 6444 int add_left = FALSE; | |
| 6445 char_u *s; | |
| 6446 #ifdef FEAT_MENU | |
| 6447 int emenu; | |
| 6448 #endif | |
| 6449 #if defined(FEAT_MBYTE) || defined(FEAT_MENU) | |
| 6450 int l; | |
| 6451 #endif | |
| 6452 | |
| 6453 if (matches == NULL) /* interrupted completion? */ | |
| 6454 return; | |
| 6455 | |
| 39 | 6456 #ifdef FEAT_MBYTE |
| 6457 if (has_mbyte) | |
| 6458 buf = alloc((unsigned)Columns * MB_MAXBYTES + 1); | |
| 6459 else | |
| 6460 #endif | |
| 6461 buf = alloc((unsigned)Columns + 1); | |
| 7 | 6462 if (buf == NULL) |
| 6463 return; | |
| 6464 | |
| 6465 if (match == -1) /* don't show match but original text */ | |
| 6466 { | |
| 6467 match = 0; | |
| 6468 highlight = FALSE; | |
| 6469 } | |
| 6470 /* count 1 for the ending ">" */ | |
| 6471 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6472 if (match == 0) | |
| 6473 first_match = 0; | |
| 6474 else if (match < first_match) | |
| 6475 { | |
| 6476 /* jumping left, as far as we can go */ | |
| 6477 first_match = match; | |
| 6478 add_left = TRUE; | |
| 6479 } | |
| 6480 else | |
| 6481 { | |
| 6482 /* check if match fits on the screen */ | |
| 6483 for (i = first_match; i < match; ++i) | |
| 6484 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6485 if (first_match > 0) | |
| 6486 clen += 2; | |
| 6487 /* jumping right, put match at the left */ | |
| 6488 if ((long)clen > Columns) | |
| 6489 { | |
| 6490 first_match = match; | |
| 6491 /* if showing the last match, we can add some on the left */ | |
| 6492 clen = 2; | |
| 6493 for (i = match; i < num_matches; ++i) | |
| 6494 { | |
| 6495 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6496 if ((long)clen >= Columns) | |
| 6497 break; | |
| 6498 } | |
| 6499 if (i == num_matches) | |
| 6500 add_left = TRUE; | |
| 6501 } | |
| 6502 } | |
| 6503 if (add_left) | |
| 6504 while (first_match > 0) | |
| 6505 { | |
| 6506 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6507 if ((long)clen >= Columns) | |
| 6508 break; | |
| 6509 --first_match; | |
| 6510 } | |
| 6511 | |
| 6512 fillchar = fillchar_status(&attr, TRUE); | |
| 6513 | |
| 6514 if (first_match == 0) | |
| 6515 { | |
| 6516 *buf = NUL; | |
| 6517 len = 0; | |
| 6518 } | |
| 6519 else | |
| 6520 { | |
| 6521 STRCPY(buf, "< "); | |
| 6522 len = 2; | |
| 6523 } | |
| 6524 clen = len; | |
| 6525 | |
| 6526 i = first_match; | |
| 6527 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6528 { | |
| 6529 if (i == match) | |
| 6530 { | |
| 6531 selstart = buf + len; | |
| 6532 selstart_col = clen; | |
| 6533 } | |
| 6534 | |
| 6535 s = L_MATCH(i); | |
| 6536 /* Check for menu separators - replace with '|' */ | |
| 6537 #ifdef FEAT_MENU | |
| 6538 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6539 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6540 if (emenu && menu_is_separator(s)) | |
| 6541 { | |
| 6542 STRCPY(buf + len, transchar('|')); | |
| 6543 l = (int)STRLEN(buf + len); | |
| 6544 len += l; | |
| 6545 clen += l; | |
| 6546 } | |
| 6547 else | |
| 6548 #endif | |
| 6549 for ( ; *s != NUL; ++s) | |
| 6550 { | |
| 1685 | 6551 s += skip_status_match_char(xp, s); |
| 7 | 6552 clen += ptr2cells(s); |
| 6553 #ifdef FEAT_MBYTE | |
| 474 | 6554 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6555 { |
| 6556 STRNCPY(buf + len, s, l); | |
| 6557 s += l - 1; | |
| 6558 len += l; | |
| 6559 } | |
| 6560 else | |
| 6561 #endif | |
| 6562 { | |
| 6563 STRCPY(buf + len, transchar_byte(*s)); | |
| 6564 len += (int)STRLEN(buf + len); | |
| 6565 } | |
| 6566 } | |
| 6567 if (i == match) | |
| 6568 selend = buf + len; | |
| 6569 | |
| 6570 *(buf + len++) = ' '; | |
| 6571 *(buf + len++) = ' '; | |
| 6572 clen += 2; | |
| 6573 if (++i == num_matches) | |
| 6574 break; | |
| 6575 } | |
| 6576 | |
| 6577 if (i != num_matches) | |
| 6578 { | |
| 6579 *(buf + len++) = '>'; | |
| 6580 ++clen; | |
| 6581 } | |
| 6582 | |
| 6583 buf[len] = NUL; | |
| 6584 | |
| 6585 row = cmdline_row - 1; | |
| 6586 if (row >= 0) | |
| 6587 { | |
| 6588 if (wild_menu_showing == 0) | |
| 6589 { | |
| 6590 if (msg_scrolled > 0) | |
| 6591 { | |
| 6592 /* Put the wildmenu just above the command line. If there is | |
| 6593 * no room, scroll the screen one line up. */ | |
| 6594 if (cmdline_row == Rows - 1) | |
| 6595 { | |
| 6596 screen_del_lines(0, 0, 1, (int)Rows, TRUE, NULL); | |
| 6597 ++msg_scrolled; | |
| 6598 } | |
| 6599 else | |
| 6600 { | |
| 6601 ++cmdline_row; | |
| 6602 ++row; | |
| 6603 } | |
| 6604 wild_menu_showing = WM_SCROLLED; | |
| 6605 } | |
| 6606 else | |
| 6607 { | |
| 6608 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6609 * Set 'winminheight' to zero to avoid that the window is | |
| 6610 * resized. */ | |
| 6611 if (lastwin->w_status_height == 0) | |
| 6612 { | |
| 6613 save_p_ls = p_ls; | |
| 6614 save_p_wmh = p_wmh; | |
| 6615 p_ls = 2; | |
| 6616 p_wmh = 0; | |
| 6617 last_status(FALSE); | |
| 6618 } | |
| 6619 wild_menu_showing = WM_SHOWN; | |
| 6620 } | |
| 6621 } | |
| 6622 | |
| 6623 screen_puts(buf, row, 0, attr); | |
| 6624 if (selstart != NULL && highlight) | |
| 6625 { | |
| 6626 *selend = NUL; | |
| 6627 screen_puts(selstart, row, selstart_col, hl_attr(HLF_WM)); | |
| 6628 } | |
| 6629 | |
| 6630 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6631 } | |
| 6632 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6633 #ifdef FEAT_WINDOWS |
| 7 | 6634 win_redraw_last_status(topframe); |
| 6635 #else | |
| 6636 lastwin->w_redr_status = TRUE; | |
| 6637 #endif | |
| 6638 vim_free(buf); | |
| 6639 } | |
| 6640 #endif | |
| 6641 | |
| 6642 #if defined(FEAT_WINDOWS) || defined(PROTO) | |
| 6643 /* | |
| 6644 * Redraw the status line of window wp. | |
| 6645 * | |
| 6646 * If inversion is possible we use it. Else '=' characters are used. | |
| 6647 */ | |
| 6648 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6649 win_redr_status(win_T *wp) |
| 7 | 6650 { |
| 6651 int row; | |
| 6652 char_u *p; | |
| 6653 int len; | |
| 6654 int fillchar; | |
| 6655 int attr; | |
| 6656 int this_ru_col; | |
| 1910 | 6657 static int busy = FALSE; |
| 6658 | |
| 6659 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6660 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6661 if (busy) | |
| 6662 return; | |
| 6663 busy = TRUE; | |
| 7 | 6664 |
| 6665 wp->w_redr_status = FALSE; | |
| 6666 if (wp->w_status_height == 0) | |
| 6667 { | |
| 6668 /* no status line, can only be last window */ | |
| 6669 redraw_cmdline = TRUE; | |
| 6670 } | |
| 540 | 6671 else if (!redrawing() |
| 6672 #ifdef FEAT_INS_EXPAND | |
| 6673 /* don't update status line when popup menu is visible and may be | |
| 6674 * drawn over it */ | |
| 6675 || pum_visible() | |
| 6676 #endif | |
| 6677 ) | |
| 7 | 6678 { |
| 6679 /* Don't redraw right now, do it later. */ | |
| 6680 wp->w_redr_status = TRUE; | |
| 6681 } | |
| 6682 #ifdef FEAT_STL_OPT | |
| 40 | 6683 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 6684 { |
| 6685 /* redraw custom status line */ | |
| 1983 | 6686 redraw_custom_statusline(wp); |
| 7 | 6687 } |
| 6688 #endif | |
| 6689 else | |
| 6690 { | |
| 6691 fillchar = fillchar_status(&attr, wp == curwin); | |
| 6692 | |
| 685 | 6693 get_trans_bufname(wp->w_buffer); |
| 7 | 6694 p = NameBuff; |
| 6695 len = (int)STRLEN(p); | |
| 6696 | |
| 6697 if (wp->w_buffer->b_help | |
| 6698 #ifdef FEAT_QUICKFIX | |
| 6699 || wp->w_p_pvw | |
| 6700 #endif | |
| 6701 || bufIsChanged(wp->w_buffer) | |
| 6702 || wp->w_buffer->b_p_ro) | |
| 6703 *(p + len++) = ' '; | |
| 6704 if (wp->w_buffer->b_help) | |
| 6705 { | |
| 809 | 6706 STRCPY(p + len, _("[Help]")); |
| 7 | 6707 len += (int)STRLEN(p + len); |
| 6708 } | |
| 6709 #ifdef FEAT_QUICKFIX | |
| 6710 if (wp->w_p_pvw) | |
| 6711 { | |
| 6712 STRCPY(p + len, _("[Preview]")); | |
| 6713 len += (int)STRLEN(p + len); | |
| 6714 } | |
| 6715 #endif | |
| 6716 if (bufIsChanged(wp->w_buffer)) | |
| 6717 { | |
| 6718 STRCPY(p + len, "[+]"); | |
| 6719 len += 3; | |
| 6720 } | |
| 6721 if (wp->w_buffer->b_p_ro) | |
| 6722 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
6723 STRCPY(p + len, _("[RO]")); |
| 7 | 6724 len += 4; |
| 6725 } | |
| 6726 | |
| 6727 this_ru_col = ru_col - (Columns - W_WIDTH(wp)); | |
| 6728 if (this_ru_col < (W_WIDTH(wp) + 1) / 2) | |
| 6729 this_ru_col = (W_WIDTH(wp) + 1) / 2; | |
| 6730 if (this_ru_col <= 1) | |
| 6731 { | |
| 6732 p = (char_u *)"<"; /* No room for file name! */ | |
| 6733 len = 1; | |
| 6734 } | |
| 6735 else | |
| 6736 #ifdef FEAT_MBYTE | |
| 6737 if (has_mbyte) | |
| 6738 { | |
| 6739 int clen = 0, i; | |
| 6740 | |
| 6741 /* Count total number of display cells. */ | |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6742 clen = mb_string2cells(p, -1); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6743 |
| 7 | 6744 /* Find first character that will fit. |
| 6745 * Going from start to end is much faster for DBCS. */ | |
| 6746 for (i = 0; p[i] != NUL && clen >= this_ru_col - 1; | |
| 474 | 6747 i += (*mb_ptr2len)(p + i)) |
| 7 | 6748 clen -= (*mb_ptr2cells)(p + i); |
| 6749 len = clen; | |
| 6750 if (i > 0) | |
| 6751 { | |
| 6752 p = p + i - 1; | |
| 6753 *p = '<'; | |
| 6754 ++len; | |
| 6755 } | |
| 6756 | |
| 6757 } | |
| 6758 else | |
| 6759 #endif | |
| 6760 if (len > this_ru_col - 1) | |
| 6761 { | |
| 6762 p += len - (this_ru_col - 1); | |
| 6763 *p = '<'; | |
| 6764 len = this_ru_col - 1; | |
| 6765 } | |
| 6766 | |
| 6767 row = W_WINROW(wp) + wp->w_height; | |
| 6768 screen_puts(p, row, W_WINCOL(wp), attr); | |
| 6769 screen_fill(row, row + 1, len + W_WINCOL(wp), | |
| 6770 this_ru_col + W_WINCOL(wp), fillchar, fillchar, attr); | |
| 6771 | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6772 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 6773 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 6774 screen_puts(NameBuff, row, (int)(this_ru_col - STRLEN(NameBuff) | |
| 6775 - 1 + W_WINCOL(wp)), attr); | |
| 6776 | |
| 6777 #ifdef FEAT_CMDL_INFO | |
| 6778 win_redr_ruler(wp, TRUE); | |
| 6779 #endif | |
| 6780 } | |
| 6781 | |
| 6782 /* | |
| 6783 * May need to draw the character below the vertical separator. | |
| 6784 */ | |
| 6785 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 6786 { | |
| 6787 if (stl_connected(wp)) | |
| 6788 fillchar = fillchar_status(&attr, wp == curwin); | |
| 6789 else | |
| 6790 fillchar = fillchar_vsep(&attr); | |
| 6791 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 6792 attr); | |
| 6793 } | |
| 1910 | 6794 busy = FALSE; |
| 7 | 6795 } |
| 6796 | |
| 680 | 6797 #ifdef FEAT_STL_OPT |
| 6798 /* | |
| 6799 * Redraw the status line according to 'statusline' and take care of any | |
| 6800 * errors encountered. | |
| 6801 */ | |
| 6802 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6803 redraw_custom_statusline(win_T *wp) |
| 680 | 6804 { |
| 1983 | 6805 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6806 int saved_did_emsg = did_emsg; |
| 1983 | 6807 |
| 6808 /* When called recursively return. This can happen when the statusline | |
| 6809 * contains an expression that triggers a redraw. */ | |
| 6810 if (entered) | |
| 6811 return; | |
| 6812 entered = TRUE; | |
| 680 | 6813 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6814 did_emsg = FALSE; |
| 680 | 6815 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6816 if (did_emsg) |
| 1983 | 6817 { |
| 6818 /* When there is an error disable the statusline, otherwise the | |
| 6819 * display is messed up with errors and a redraw triggers the problem | |
| 6820 * again and again. */ | |
| 680 | 6821 set_string_option_direct((char_u *)"statusline", -1, |
| 6822 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 6823 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 6824 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6825 did_emsg |= saved_did_emsg; |
| 1983 | 6826 entered = FALSE; |
| 680 | 6827 } |
| 6828 #endif | |
| 6829 | |
| 7 | 6830 /* |
| 6831 * Return TRUE if the status line of window "wp" is connected to the status | |
| 6832 * line of the window right of it. If not, then it's a vertical separator. | |
| 6833 * Only call if (wp->w_vsep_width != 0). | |
| 6834 */ | |
| 6835 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6836 stl_connected(win_T *wp) |
| 7 | 6837 { |
| 6838 frame_T *fr; | |
| 6839 | |
| 6840 fr = wp->w_frame; | |
| 6841 while (fr->fr_parent != NULL) | |
| 6842 { | |
| 6843 if (fr->fr_parent->fr_layout == FR_COL) | |
| 6844 { | |
| 6845 if (fr->fr_next != NULL) | |
| 6846 break; | |
| 6847 } | |
| 6848 else | |
| 6849 { | |
| 6850 if (fr->fr_next != NULL) | |
| 6851 return TRUE; | |
| 6852 } | |
| 6853 fr = fr->fr_parent; | |
| 6854 } | |
| 6855 return FALSE; | |
| 6856 } | |
| 6857 | |
| 6858 #endif /* FEAT_WINDOWS */ | |
| 6859 | |
| 6860 #if defined(FEAT_WINDOWS) || defined(FEAT_STL_OPT) || defined(PROTO) | |
| 6861 /* | |
| 6862 * Get the value to show for the language mappings, active 'keymap'. | |
| 6863 */ | |
| 6864 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6865 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6866 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6867 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
|
6868 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
|
6869 int len) /* length of buffer */ |
| 7 | 6870 { |
| 6871 char_u *p; | |
| 6872 | |
| 6873 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 6874 return FALSE; | |
| 6875 | |
| 6876 { | |
| 6877 #ifdef FEAT_EVAL | |
| 6878 buf_T *old_curbuf = curbuf; | |
| 6879 win_T *old_curwin = curwin; | |
| 6880 char_u *s; | |
| 6881 | |
| 6882 curbuf = wp->w_buffer; | |
| 6883 curwin = wp; | |
| 6884 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 6885 ++emsg_skip; | |
| 714 | 6886 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 6887 --emsg_skip; |
| 6888 curbuf = old_curbuf; | |
| 6889 curwin = old_curwin; | |
| 6890 if (p == NULL || *p == NUL) | |
| 6891 #endif | |
| 6892 { | |
| 6893 #ifdef FEAT_KEYMAP | |
| 6894 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 6895 p = wp->w_buffer->b_p_keymap; | |
| 6896 else | |
| 6897 #endif | |
| 6898 p = (char_u *)"lang"; | |
| 6899 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6900 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 6901 buf[0] = NUL; |
| 6902 #ifdef FEAT_EVAL | |
| 6903 vim_free(s); | |
| 6904 #endif | |
| 6905 } | |
| 6906 return buf[0] != NUL; | |
| 6907 } | |
| 6908 #endif | |
| 6909 | |
| 6910 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 6911 /* | |
| 677 | 6912 * Redraw the status line or ruler of window "wp". |
| 6913 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 6914 */ |
| 6915 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6916 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6917 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6918 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 6919 { |
| 5539 | 6920 static int entered = FALSE; |
| 7 | 6921 int attr; |
| 6922 int curattr; | |
| 6923 int row; | |
| 6924 int col = 0; | |
| 6925 int maxwidth; | |
| 6926 int width; | |
| 6927 int n; | |
| 6928 int len; | |
| 6929 int fillchar; | |
| 6930 char_u buf[MAXPATHL]; | |
| 1983 | 6931 char_u *stl; |
| 7 | 6932 char_u *p; |
| 681 | 6933 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 6934 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 6935 int use_sandbox = FALSE; |
| 2693 | 6936 win_T *ewp; |
| 6937 int p_crb_save; | |
| 7 | 6938 |
| 5539 | 6939 /* There is a tiny chance that this gets called recursively: When |
| 6940 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 6941 * Avoid trouble by not allowing recursion. */ | |
| 6942 if (entered) | |
| 6943 return; | |
| 6944 entered = TRUE; | |
| 6945 | |
| 7 | 6946 /* setup environment for the task at hand */ |
| 677 | 6947 if (wp == NULL) |
| 6948 { | |
| 6949 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 6950 stl = p_tal; |
| 677 | 6951 row = 0; |
| 707 | 6952 fillchar = ' '; |
| 677 | 6953 attr = hl_attr(HLF_TPF); |
| 6954 maxwidth = Columns; | |
| 6955 # ifdef FEAT_EVAL | |
| 681 | 6956 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 6957 # endif |
| 6958 } | |
| 40 | 6959 else |
| 677 | 6960 { |
| 6961 row = W_WINROW(wp) + wp->w_height; | |
| 6962 fillchar = fillchar_status(&attr, wp == curwin); | |
| 6963 maxwidth = W_WIDTH(wp); | |
| 6964 | |
| 6965 if (draw_ruler) | |
| 6966 { | |
| 1983 | 6967 stl = p_ruf; |
| 677 | 6968 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 6969 if (*stl == '%') |
| 6970 { | |
| 6971 if (*++stl == '-') | |
| 6972 stl++; | |
| 6973 if (atoi((char *)stl)) | |
| 6974 while (VIM_ISDIGIT(*stl)) | |
| 6975 stl++; | |
| 6976 if (*stl++ != '(') | |
| 6977 stl = p_ruf; | |
| 677 | 6978 } |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6979 #ifdef FEAT_WINDOWS |
| 677 | 6980 col = ru_col - (Columns - W_WIDTH(wp)); |
| 6981 if (col < (W_WIDTH(wp) + 1) / 2) | |
| 6982 col = (W_WIDTH(wp) + 1) / 2; | |
| 7 | 6983 #else |
| 677 | 6984 col = ru_col; |
| 6985 if (col > (Columns + 1) / 2) | |
| 6986 col = (Columns + 1) / 2; | |
| 6987 #endif | |
| 6988 maxwidth = W_WIDTH(wp) - col; | |
| 7 | 6989 #ifdef FEAT_WINDOWS |
| 677 | 6990 if (!wp->w_status_height) |
| 6991 #endif | |
| 6992 { | |
| 6993 row = Rows - 1; | |
| 6994 --maxwidth; /* writing in last column may cause scrolling */ | |
| 6995 fillchar = ' '; | |
| 6996 attr = 0; | |
| 6997 } | |
| 6998 | |
| 6999 # ifdef FEAT_EVAL | |
| 681 | 7000 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7001 # endif |
| 7002 } | |
| 7003 else | |
| 7004 { | |
| 7005 if (*wp->w_p_stl != NUL) | |
| 1983 | 7006 stl = wp->w_p_stl; |
| 677 | 7007 else |
| 1983 | 7008 stl = p_stl; |
| 677 | 7009 # ifdef FEAT_EVAL |
| 681 | 7010 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7011 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7012 # endif |
| 7013 } | |
| 7014 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
7015 #ifdef FEAT_WINDOWS |
| 677 | 7016 col += W_WINCOL(wp); |
| 7017 #endif | |
| 7018 } | |
| 7019 | |
| 7 | 7020 if (maxwidth <= 0) |
| 5539 | 7021 goto theend; |
| 677 | 7022 |
| 2693 | 7023 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7024 * the cursor away and back. */ | |
| 7025 ewp = wp == NULL ? curwin : wp; | |
| 7026 p_crb_save = ewp->w_p_crb; | |
| 7027 ewp->w_p_crb = FALSE; | |
| 7028 | |
| 1983 | 7029 /* Make a copy, because the statusline may include a function call that |
| 7030 * might change the option value and free the memory. */ | |
| 7031 stl = vim_strsave(stl); | |
| 2693 | 7032 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7033 stl, use_sandbox, |
| 681 | 7034 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7035 vim_free(stl); |
| 2693 | 7036 ewp->w_p_crb = p_crb_save; |
| 2661 | 7037 |
| 7038 /* Make all characters printable. */ | |
| 7039 p = transstr(buf); | |
| 7040 if (p != NULL) | |
| 7041 { | |
| 7042 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7043 vim_free(p); | |
| 7044 } | |
| 7045 | |
| 7046 /* fill up with "fillchar" */ | |
| 835 | 7047 len = (int)STRLEN(buf); |
| 1883 | 7048 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7049 { |
| 7050 #ifdef FEAT_MBYTE | |
| 7051 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7052 #else | |
| 7053 buf[len++] = fillchar; | |
| 7054 #endif | |
| 7055 ++width; | |
| 7056 } | |
| 7057 buf[len] = NUL; | |
| 7058 | |
| 681 | 7059 /* |
| 7060 * Draw each snippet with the specified highlighting. | |
| 7061 */ | |
| 7 | 7062 curattr = attr; |
| 7063 p = buf; | |
| 681 | 7064 for (n = 0; hltab[n].start != NULL; n++) |
| 7065 { | |
| 7066 len = (int)(hltab[n].start - p); | |
| 7 | 7067 screen_puts_len(p, len, row, col, curattr); |
| 7068 col += vim_strnsize(p, len); | |
| 681 | 7069 p = hltab[n].start; |
| 7070 | |
| 7071 if (hltab[n].userhl == 0) | |
| 7 | 7072 curattr = attr; |
| 681 | 7073 else if (hltab[n].userhl < 0) |
| 7074 curattr = syn_id2attr(-hltab[n].userhl); | |
| 7 | 7075 #ifdef FEAT_WINDOWS |
| 680 | 7076 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7077 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7078 #endif |
| 7079 else | |
| 681 | 7080 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7081 } |
| 7082 screen_puts(p, row, col, curattr); | |
| 681 | 7083 |
| 7084 if (wp == NULL) | |
| 7085 { | |
| 7086 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7087 col = 0; | |
| 7088 len = 0; | |
| 7089 p = buf; | |
| 7090 fillchar = 0; | |
| 7091 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7092 { | |
| 7093 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7094 while (col < len) | |
| 7095 TabPageIdxs[col++] = fillchar; | |
| 7096 p = tabtab[n].start; | |
| 7097 fillchar = tabtab[n].userhl; | |
| 7098 } | |
| 7099 while (col < Columns) | |
| 7100 TabPageIdxs[col++] = fillchar; | |
| 7101 } | |
| 5539 | 7102 |
| 7103 theend: | |
| 7104 entered = FALSE; | |
| 7 | 7105 } |
| 7106 | |
| 7107 #endif /* FEAT_STL_OPT */ | |
| 7108 | |
| 7109 /* | |
| 7110 * Output a single character directly to the screen and update ScreenLines. | |
| 7111 */ | |
| 7112 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7113 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7114 { |
| 3549 | 7115 char_u buf[MB_MAXBYTES + 1]; |
| 7116 | |
| 7 | 7117 #ifdef FEAT_MBYTE |
| 3549 | 7118 if (has_mbyte) |
| 7119 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7120 else | |
| 7121 #endif | |
| 7122 { | |
| 7123 buf[0] = c; | |
| 7124 buf[1] = NUL; | |
| 7125 } | |
| 7 | 7126 screen_puts(buf, row, col, attr); |
| 7127 } | |
| 7128 | |
| 7129 /* | |
| 7130 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7131 * Also return its attribute in *attrp; | |
| 7132 */ | |
| 7133 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7134 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7135 { |
| 7136 unsigned off; | |
| 7137 | |
| 7138 /* safety check */ | |
| 7139 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7140 { | |
| 7141 off = LineOffset[row] + col; | |
| 7142 *attrp = ScreenAttrs[off]; | |
| 7143 bytes[0] = ScreenLines[off]; | |
| 7144 bytes[1] = NUL; | |
| 7145 | |
| 7146 #ifdef FEAT_MBYTE | |
| 7147 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7148 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7149 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7150 { | |
| 7151 bytes[0] = ScreenLines[off]; | |
| 7152 bytes[1] = ScreenLines2[off]; | |
| 7153 bytes[2] = NUL; | |
| 7154 } | |
| 7155 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7156 { | |
| 7157 bytes[1] = ScreenLines[off + 1]; | |
| 7158 bytes[2] = NUL; | |
| 7159 } | |
| 7160 #endif | |
| 7161 } | |
| 7162 } | |
| 7163 | |
| 714 | 7164 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
7165 static int screen_comp_differs(int, int*); |
| 714 | 7166 |
| 7167 /* | |
| 7168 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7169 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7170 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7171 */ |
| 7172 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7173 screen_comp_differs(int off, int *u8cc) |
| 714 | 7174 { |
| 7175 int i; | |
| 7176 | |
| 7177 for (i = 0; i < Screen_mco; ++i) | |
| 7178 { | |
| 7179 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7180 return TRUE; | |
| 7181 if (u8cc[i] == 0) | |
| 7182 break; | |
| 7183 } | |
| 7184 return FALSE; | |
| 7185 } | |
| 7186 #endif | |
| 7187 | |
| 7 | 7188 /* |
| 7189 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7190 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7191 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7192 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7193 */ | |
| 7194 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7195 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7196 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7197 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7198 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7199 int attr) |
| 7 | 7200 { |
| 7201 screen_puts_len(text, -1, row, col, attr); | |
| 7202 } | |
| 7203 | |
| 7204 /* | |
| 7205 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7206 * a NUL. | |
| 7207 */ | |
| 7208 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7209 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7210 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7211 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7212 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7213 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7214 int attr) |
| 7 | 7215 { |
| 7216 unsigned off; | |
| 7217 char_u *ptr = text; | |
| 5923 | 7218 int len = textlen; |
| 7 | 7219 int c; |
| 7220 #ifdef FEAT_MBYTE | |
| 1378 | 7221 unsigned max_off; |
| 7 | 7222 int mbyte_blen = 1; |
| 7223 int mbyte_cells = 1; | |
| 7224 int u8c = 0; | |
| 714 | 7225 int u8cc[MAX_MCO]; |
| 7 | 7226 int clear_next_cell = FALSE; |
| 7227 # ifdef FEAT_ARABIC | |
| 7228 int prev_c = 0; /* previous Arabic character */ | |
| 714 | 7229 int pc, nc, nc1; |
| 7230 int pcc[MAX_MCO]; | |
| 7 | 7231 # endif |
| 7232 #endif | |
| 1843 | 7233 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7234 int force_redraw_this; | |
| 7235 int force_redraw_next = FALSE; | |
| 7236 #endif | |
| 7237 int need_redraw; | |
| 7 | 7238 |
| 7239 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7240 return; | |
| 1843 | 7241 off = LineOffset[row] + col; |
| 7 | 7242 |
| 1668 | 7243 #ifdef FEAT_MBYTE |
| 7244 /* When drawing over the right halve of a double-wide char clear out the | |
| 7245 * left halve. Only needed in a terminal. */ | |
| 1685 | 7246 if (has_mbyte && col > 0 && col < screen_Columns |
| 1668 | 7247 # ifdef FEAT_GUI |
| 7248 && !gui.in_use | |
| 7249 # endif | |
| 7250 && mb_fix_col(col, row) != col) | |
| 1843 | 7251 { |
| 7252 ScreenLines[off - 1] = ' '; | |
| 7253 ScreenAttrs[off - 1] = 0; | |
| 7254 if (enc_utf8) | |
| 7255 { | |
| 7256 ScreenLinesUC[off - 1] = 0; | |
| 7257 ScreenLinesC[0][off - 1] = 0; | |
| 7258 } | |
| 7259 /* redraw the previous cell, make it empty */ | |
| 7260 screen_char(off - 1, row, col - 1); | |
| 7261 /* force the cell at "col" to be redrawn */ | |
| 7262 force_redraw_next = TRUE; | |
| 7263 } | |
| 7264 #endif | |
| 7265 | |
| 1378 | 7266 #ifdef FEAT_MBYTE |
| 7267 max_off = LineOffset[row] + screen_Columns; | |
| 7268 #endif | |
| 1340 | 7269 while (col < screen_Columns |
| 7270 && (len < 0 || (int)(ptr - text) < len) | |
| 7271 && *ptr != NUL) | |
| 7 | 7272 { |
| 7273 c = *ptr; | |
| 7274 #ifdef FEAT_MBYTE | |
| 7275 /* check if this is the first byte of a multibyte */ | |
| 7276 if (has_mbyte) | |
| 7277 { | |
| 7278 if (enc_utf8 && len > 0) | |
| 474 | 7279 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7280 else |
| 474 | 7281 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7282 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7283 mbyte_cells = 1; | |
| 7284 else if (enc_dbcs != 0) | |
| 7285 mbyte_cells = mbyte_blen; | |
| 7286 else /* enc_utf8 */ | |
| 7287 { | |
| 7288 if (len >= 0) | |
| 714 | 7289 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7290 (int)((text + len) - ptr)); |
| 7291 else | |
| 714 | 7292 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7293 mbyte_cells = utf_char2cells(u8c); |
| 1401 | 7294 # ifdef UNICODE16 |
| 7 | 7295 /* Non-BMP character: display as ? or fullwidth ?. */ |
| 7296 if (u8c >= 0x10000) | |
| 7297 { | |
| 7298 u8c = (mbyte_cells == 2) ? 0xff1f : (int)'?'; | |
| 7299 if (attr == 0) | |
| 7300 attr = hl_attr(HLF_8); | |
| 7301 } | |
| 1401 | 7302 # endif |
| 7 | 7303 # ifdef FEAT_ARABIC |
| 7304 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 7305 { | |
| 7306 /* Do Arabic shaping. */ | |
| 7307 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7308 { | |
| 7309 /* Past end of string to be displayed. */ | |
| 7310 nc = NUL; | |
| 7311 nc1 = NUL; | |
| 7312 } | |
| 7313 else | |
| 714 | 7314 { |
| 1994 | 7315 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7316 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7317 nc1 = pcc[0]; |
| 7318 } | |
| 7 | 7319 pc = prev_c; |
| 7320 prev_c = u8c; | |
| 714 | 7321 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7322 } |
| 7323 else | |
| 7324 prev_c = u8c; | |
| 7325 # endif | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7326 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7327 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7328 /* 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
|
7329 * 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
|
7330 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7331 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7332 } |
| 7 | 7333 } |
| 7334 } | |
| 7335 #endif | |
| 7336 | |
| 1843 | 7337 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7338 force_redraw_this = force_redraw_next; | |
| 7339 force_redraw_next = FALSE; | |
| 7340 #endif | |
| 7341 | |
| 7342 need_redraw = ScreenLines[off] != c | |
| 7 | 7343 #ifdef FEAT_MBYTE |
| 7344 || (mbyte_cells == 2 | |
| 7345 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7346 || (enc_dbcs == DBCS_JPNU | |
| 7347 && c == 0x8e | |
| 7348 && ScreenLines2[off] != ptr[1]) | |
| 7349 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7350 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7351 (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
|
7352 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7353 && screen_comp_differs(off, u8cc)))) |
| 7 | 7354 #endif |
| 7355 || ScreenAttrs[off] != attr | |
| 1843 | 7356 || exmode_active; |
| 7357 | |
| 7358 if (need_redraw | |
| 7359 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7360 || force_redraw_this | |
| 7361 #endif | |
| 7 | 7362 ) |
| 7363 { | |
| 7364 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7365 /* The bold trick makes a single row of pixels appear in the next | |
| 7366 * character. When a bold character is removed, the next | |
| 7367 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7368 * and for some xterms. */ |
| 7369 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7370 # ifdef FEAT_GUI |
| 7371 gui.in_use | |
| 7372 # endif | |
| 7373 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7374 || | |
| 7375 # endif | |
| 7376 # ifdef UNIX | |
| 7377 term_is_xterm | |
| 7378 # endif | |
| 1843 | 7379 )) |
| 7380 { | |
| 7381 int n = ScreenAttrs[off]; | |
| 7382 | |
| 7383 if (n > HL_ALL) | |
| 7384 n = syn_attr2attr(n); | |
| 7385 if (n & HL_BOLD) | |
| 7386 force_redraw_next = TRUE; | |
| 7 | 7387 } |
| 7388 #endif | |
| 7389 #ifdef FEAT_MBYTE | |
| 7390 /* When at the end of the text and overwriting a two-cell | |
| 7391 * character with a one-cell character, need to clear the next | |
| 7392 * cell. Also when overwriting the left halve of a two-cell char | |
| 7393 * with the right halve of a two-cell char. Do this only once | |
| 7394 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7395 if (clear_next_cell) | |
| 7396 clear_next_cell = FALSE; | |
| 7397 else if (has_mbyte | |
| 7398 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7399 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7400 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7401 || (mbyte_cells == 2 |
| 1378 | 7402 && (*mb_off2cells)(off, max_off) == 1 |
| 7403 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7404 clear_next_cell = TRUE; |
| 7405 | |
| 7406 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7407 * it confuses mb_off2cells(). */ | |
| 7408 if (enc_dbcs | |
| 1378 | 7409 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7410 || (mbyte_cells == 2 |
| 1378 | 7411 && (*mb_off2cells)(off, max_off) == 1 |
| 7412 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7413 ScreenLines[off + mbyte_blen] = 0; |
| 7414 #endif | |
| 7415 ScreenLines[off] = c; | |
| 7416 ScreenAttrs[off] = attr; | |
| 7417 #ifdef FEAT_MBYTE | |
| 7418 if (enc_utf8) | |
| 7419 { | |
| 714 | 7420 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7421 ScreenLinesUC[off] = 0; |
| 7422 else | |
| 7423 { | |
| 714 | 7424 int i; |
| 7425 | |
| 7 | 7426 ScreenLinesUC[off] = u8c; |
| 714 | 7427 for (i = 0; i < Screen_mco; ++i) |
| 7428 { | |
| 7429 ScreenLinesC[i][off] = u8cc[i]; | |
| 7430 if (u8cc[i] == 0) | |
| 7431 break; | |
| 7432 } | |
| 7 | 7433 } |
| 7434 if (mbyte_cells == 2) | |
| 7435 { | |
| 7436 ScreenLines[off + 1] = 0; | |
| 7437 ScreenAttrs[off + 1] = attr; | |
| 7438 } | |
| 7439 screen_char(off, row, col); | |
| 7440 } | |
| 7441 else if (mbyte_cells == 2) | |
| 7442 { | |
| 7443 ScreenLines[off + 1] = ptr[1]; | |
| 7444 ScreenAttrs[off + 1] = attr; | |
| 7445 screen_char_2(off, row, col); | |
| 7446 } | |
| 7447 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7448 { | |
| 7449 ScreenLines2[off] = ptr[1]; | |
| 7450 screen_char(off, row, col); | |
| 7451 } | |
| 7452 else | |
| 7453 #endif | |
| 7454 screen_char(off, row, col); | |
| 7455 } | |
| 7456 #ifdef FEAT_MBYTE | |
| 7457 if (has_mbyte) | |
| 7458 { | |
| 7459 off += mbyte_cells; | |
| 7460 col += mbyte_cells; | |
| 7461 ptr += mbyte_blen; | |
| 7462 if (clear_next_cell) | |
| 5923 | 7463 { |
| 7464 /* This only happens at the end, display one space next. */ | |
| 7 | 7465 ptr = (char_u *)" "; |
| 5923 | 7466 len = -1; |
| 7467 } | |
| 7 | 7468 } |
| 7469 else | |
| 7470 #endif | |
| 7471 { | |
| 7472 ++off; | |
| 7473 ++col; | |
| 7474 ++ptr; | |
| 7475 } | |
| 7476 } | |
| 1843 | 7477 |
| 7478 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7479 /* If we detected the next character needs to be redrawn, but the text | |
| 7480 * doesn't extend up to there, update the character here. */ | |
| 7481 if (force_redraw_next && col < screen_Columns) | |
| 7482 { | |
| 7483 # ifdef FEAT_MBYTE | |
| 7484 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7485 screen_char_2(off, row, col); | |
| 7486 else | |
| 7487 # endif | |
| 7488 screen_char(off, row, col); | |
| 7489 } | |
| 7490 #endif | |
| 7 | 7491 } |
| 7492 | |
| 7493 #ifdef FEAT_SEARCH_EXTRA | |
| 7494 /* | |
| 1326 | 7495 * Prepare for 'hlsearch' highlighting. |
| 7 | 7496 */ |
| 7497 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7498 start_search_hl(void) |
| 7 | 7499 { |
| 7500 if (p_hls && !no_hlsearch) | |
| 7501 { | |
| 7502 last_pat_prog(&search_hl.rm); | |
| 7503 search_hl.attr = hl_attr(HLF_L); | |
| 1521 | 7504 # ifdef FEAT_RELTIME |
| 7505 /* Set the time limit to 'redrawtime'. */ | |
| 7506 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7507 # endif | |
| 7 | 7508 } |
| 7509 } | |
| 7510 | |
| 7511 /* | |
| 1326 | 7512 * Clean up for 'hlsearch' highlighting. |
| 7 | 7513 */ |
| 7514 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7515 end_search_hl(void) |
| 7 | 7516 { |
| 7517 if (search_hl.rm.regprog != NULL) | |
| 7518 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7519 vim_regfree(search_hl.rm.regprog); |
| 7 | 7520 search_hl.rm.regprog = NULL; |
| 7521 } | |
| 7522 } | |
| 7523 | |
| 7524 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7525 * 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
|
7526 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7527 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7528 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
|
7529 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7530 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7531 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7532 /* 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
|
7533 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7534 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7535 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7536 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7537 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7538 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7539 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7540 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7541 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
|
7542 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
|
7543 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7544 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7545 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7546 /* 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
|
7547 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
|
7548 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7549 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7550 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7551 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
|
7552 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7553 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7554 /* 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
|
7555 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7556 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7557 /* |
| 7 | 7558 * Advance to the match in window "wp" line "lnum" or past it. |
| 7559 */ | |
| 7560 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7561 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7562 { |
| 1326 | 7563 matchitem_T *cur; /* points to the match list */ |
| 7564 match_T *shl; /* points to search_hl or a match */ | |
| 7565 int shl_flag; /* flag to indicate whether search_hl | |
| 7566 has been processed or not */ | |
| 5979 | 7567 int pos_inprogress; /* marks that position match search is |
| 7568 in progress */ | |
| 7 | 7569 int n; |
| 7570 | |
| 7571 /* | |
| 7572 * When using a multi-line pattern, start searching at the top | |
| 7573 * of the window or just after a closed fold. | |
| 1326 | 7574 * Do this both for search_hl and the match list. |
| 7 | 7575 */ |
| 1326 | 7576 cur = wp->w_match_head; |
| 7577 shl_flag = FALSE; | |
| 7578 while (cur != NULL || shl_flag == FALSE) | |
| 7579 { | |
| 7580 if (shl_flag == FALSE) | |
| 7581 { | |
| 7582 shl = &search_hl; | |
| 7583 shl_flag = TRUE; | |
| 7584 } | |
| 7585 else | |
| 7586 shl = &cur->hl; | |
| 7 | 7587 if (shl->rm.regprog != NULL |
| 7588 && shl->lnum == 0 | |
| 7589 && re_multiline(shl->rm.regprog)) | |
| 7590 { | |
| 7591 if (shl->first_lnum == 0) | |
| 7592 { | |
| 7593 # ifdef FEAT_FOLDING | |
| 7594 for (shl->first_lnum = lnum; | |
| 7595 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7596 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7597 NULL, NULL, TRUE, NULL)) | |
| 7598 break; | |
| 7599 # else | |
| 7600 shl->first_lnum = wp->w_topline; | |
| 7601 # endif | |
| 7602 } | |
| 5979 | 7603 if (cur != NULL) |
| 7604 cur->pos.cur = 0; | |
| 7605 pos_inprogress = TRUE; | |
| 7 | 7606 n = 0; |
| 5979 | 7607 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7608 || (cur != NULL && pos_inprogress))) | |
| 7609 { | |
| 7610 next_search_hl(wp, shl, shl->first_lnum, (colnr_T)n, cur); | |
| 7611 pos_inprogress = cur == NULL || cur->pos.cur == 0 | |
| 7612 ? FALSE : TRUE; | |
| 7 | 7613 if (shl->lnum != 0) |
| 7614 { | |
| 7615 shl->first_lnum = shl->lnum | |
| 7616 + shl->rm.endpos[0].lnum | |
| 7617 - shl->rm.startpos[0].lnum; | |
| 7618 n = shl->rm.endpos[0].col; | |
| 7619 } | |
| 7620 else | |
| 7621 { | |
| 7622 ++shl->first_lnum; | |
| 7623 n = 0; | |
| 7624 } | |
| 7625 } | |
| 7626 } | |
| 1326 | 7627 if (shl != &search_hl && cur != NULL) |
| 7628 cur = cur->next; | |
| 7 | 7629 } |
| 7630 } | |
| 7631 | |
| 7632 /* | |
| 1326 | 7633 * Search for a next 'hlsearch' or match. |
| 7 | 7634 * Uses shl->buf. |
| 7635 * Sets shl->lnum and shl->rm contents. | |
| 7636 * Note: Assumes a previous match is always before "lnum", unless | |
| 7637 * shl->lnum is zero. | |
| 7638 * Careful: Any pointers for buffer lines will become invalid. | |
| 7639 */ | |
| 7640 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7641 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7642 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7643 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
|
7644 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7645 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
|
7646 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 7647 { |
| 7648 linenr_T l; | |
| 7649 colnr_T matchcol; | |
| 7650 long nmatched; | |
| 7651 | |
| 7652 if (shl->lnum != 0) | |
| 7653 { | |
| 7654 /* Check for three situations: | |
| 7655 * 1. If the "lnum" is below a previous match, start a new search. | |
| 7656 * 2. If the previous match includes "mincol", use it. | |
| 7657 * 3. Continue after the previous match. | |
| 7658 */ | |
| 7659 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 7660 if (lnum > l) | |
| 7661 shl->lnum = 0; | |
| 7662 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 7663 return; | |
| 7664 } | |
| 7665 | |
| 7666 /* | |
| 7667 * Repeat searching for a match until one is found that includes "mincol" | |
| 7668 * or none is found in this line. | |
| 7669 */ | |
| 7670 called_emsg = FALSE; | |
| 7671 for (;;) | |
| 7672 { | |
| 1521 | 7673 #ifdef FEAT_RELTIME |
| 7674 /* Stop searching after passing the time limit. */ | |
| 7675 if (profile_passed_limit(&(shl->tm))) | |
| 7676 { | |
| 7677 shl->lnum = 0; /* no match found in time */ | |
| 7678 break; | |
| 7679 } | |
| 7680 #endif | |
| 7 | 7681 /* Three situations: |
| 7682 * 1. No useful previous match: search from start of line. | |
| 7683 * 2. Not Vi compatible or empty match: continue at next character. | |
| 7684 * Break the loop if this is beyond the end of the line. | |
| 7685 * 3. Vi compatible searching: continue at end of previous match. | |
| 7686 */ | |
| 7687 if (shl->lnum == 0) | |
| 7688 matchcol = 0; | |
| 7689 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 7690 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 7691 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 7692 { | |
| 688 | 7693 char_u *ml; |
| 685 | 7694 |
| 7695 matchcol = shl->rm.startpos[0].col; | |
| 688 | 7696 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 7697 if (*ml == NUL) |
| 7698 { | |
| 7699 ++matchcol; | |
| 7 | 7700 shl->lnum = 0; |
| 7701 break; | |
| 7702 } | |
| 685 | 7703 #ifdef FEAT_MBYTE |
| 7704 if (has_mbyte) | |
| 7705 matchcol += mb_ptr2len(ml); | |
| 7706 else | |
| 7707 #endif | |
| 7708 ++matchcol; | |
| 7 | 7709 } |
| 7710 else | |
| 7711 matchcol = shl->rm.endpos[0].col; | |
| 7712 | |
| 7713 shl->lnum = lnum; | |
| 5979 | 7714 if (shl->rm.regprog != NULL) |
| 7715 { | |
| 6394 | 7716 /* Remember whether shl->rm is using a copy of the regprog in |
| 7717 * cur->match. */ | |
| 7718 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 7719 && shl == &cur->hl | |
| 7720 && cur->match.regprog == cur->hl.rm.regprog); | |
| 7721 | |
| 5979 | 7722 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 7723 matchcol, | |
| 1521 | 7724 #ifdef FEAT_RELTIME |
| 5979 | 7725 &(shl->tm) |
| 1521 | 7726 #else |
| 5979 | 7727 NULL |
| 7728 #endif | |
| 7729 ); | |
| 6394 | 7730 /* Copy the regprog, in case it got freed and recompiled. */ |
| 7731 if (regprog_is_copy) | |
| 7732 cur->match.regprog = cur->hl.rm.regprog; | |
| 7733 | |
| 5979 | 7734 if (called_emsg || got_int) |
| 7735 { | |
| 7736 /* Error while handling regexp: stop using this regexp. */ | |
| 7737 if (shl == &search_hl) | |
| 7738 { | |
| 7739 /* don't free regprog in the match list, it's a copy */ | |
| 7740 vim_regfree(shl->rm.regprog); | |
| 7741 SET_NO_HLSEARCH(TRUE); | |
| 7742 } | |
| 7743 shl->rm.regprog = NULL; | |
| 7744 shl->lnum = 0; | |
| 7745 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 7746 message */ | |
| 7747 break; | |
| 7748 } | |
| 7749 } | |
| 7750 else if (cur != NULL) | |
| 7751 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 7752 else |
| 7753 nmatched = 0; | |
| 7 | 7754 if (nmatched == 0) |
| 7755 { | |
| 7756 shl->lnum = 0; /* no match found */ | |
| 7757 break; | |
| 7758 } | |
| 7759 if (shl->rm.startpos[0].lnum > 0 | |
| 7760 || shl->rm.startpos[0].col >= mincol | |
| 7761 || nmatched > 1 | |
| 7762 || shl->rm.endpos[0].col > mincol) | |
| 7763 { | |
| 7764 shl->lnum += shl->rm.startpos[0].lnum; | |
| 7765 break; /* useful match found */ | |
| 7766 } | |
| 7767 } | |
| 7768 } | |
| 7769 | |
| 5979 | 7770 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7771 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7772 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
|
7773 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7774 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7775 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 7776 { |
| 7777 int i; | |
| 6007 | 7778 int bot = -1; |
| 5979 | 7779 |
| 7780 shl->lnum = 0; | |
| 7781 for (i = posmatch->cur; i < MAXPOSMATCH; i++) | |
| 7782 { | |
| 7783 if (posmatch->pos[i].lnum == 0) | |
| 7784 break; | |
| 7785 if (posmatch->pos[i].col < mincol) | |
| 7786 continue; | |
| 7787 if (posmatch->pos[i].lnum == lnum) | |
| 7788 { | |
| 7789 if (shl->lnum == lnum) | |
| 7790 { | |
| 7791 /* partially sort positions by column numbers | |
| 7792 * on the same line */ | |
| 7793 if (posmatch->pos[i].col < posmatch->pos[bot].col) | |
| 7794 { | |
| 7795 llpos_T tmp = posmatch->pos[i]; | |
| 7796 | |
| 7797 posmatch->pos[i] = posmatch->pos[bot]; | |
| 7798 posmatch->pos[bot] = tmp; | |
| 7799 } | |
| 7800 } | |
| 7801 else | |
| 7802 { | |
| 7803 bot = i; | |
| 7804 shl->lnum = lnum; | |
| 7805 } | |
| 7806 } | |
| 7807 } | |
| 7808 posmatch->cur = 0; | |
| 7007 | 7809 if (shl->lnum == lnum && bot >= 0) |
| 5979 | 7810 { |
| 7811 colnr_T start = posmatch->pos[bot].col == 0 | |
| 7812 ? 0 : posmatch->pos[bot].col - 1; | |
| 7813 colnr_T end = posmatch->pos[bot].col == 0 | |
| 7814 ? MAXCOL : start + posmatch->pos[bot].len; | |
| 7815 | |
| 7816 shl->rm.startpos[0].lnum = 0; | |
| 7817 shl->rm.startpos[0].col = start; | |
| 7818 shl->rm.endpos[0].lnum = 0; | |
| 7819 shl->rm.endpos[0].col = end; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
7820 shl->is_addpos = TRUE; |
| 5979 | 7821 posmatch->cur = bot + 1; |
| 7822 return TRUE; | |
| 7823 } | |
| 7824 return FALSE; | |
| 7825 } | |
| 5985 | 7826 #endif |
| 5979 | 7827 |
| 7 | 7828 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7829 screen_start_highlight(int attr) |
| 7 | 7830 { |
| 7831 attrentry_T *aep = NULL; | |
| 7832 | |
| 7833 screen_attr = attr; | |
| 7834 if (full_screen | |
| 7835 #ifdef WIN3264 | |
| 7836 && termcap_active | |
| 7837 #endif | |
| 7838 ) | |
| 7839 { | |
| 7840 #ifdef FEAT_GUI | |
| 7841 if (gui.in_use) | |
| 7842 { | |
| 7843 char buf[20]; | |
| 7844 | |
| 681 | 7845 /* The GUI handles this internally. */ |
| 7846 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 7847 OUT_STR(buf); |
| 7848 } | |
| 7849 else | |
| 7850 #endif | |
| 7851 { | |
| 7852 if (attr > HL_ALL) /* special HL attr. */ | |
| 7853 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7854 if (IS_CTERM) |
| 7 | 7855 aep = syn_cterm_attr2entry(attr); |
| 7856 else | |
| 7857 aep = syn_term_attr2entry(attr); | |
| 7858 if (aep == NULL) /* did ":syntax clear" */ | |
| 7859 attr = 0; | |
| 7860 else | |
| 7861 attr = aep->ae_attr; | |
| 7862 } | |
| 7863 if ((attr & HL_BOLD) && T_MD != NULL) /* bold */ | |
| 7864 out_str(T_MD); | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7865 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
|
7866 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7867 (p_tgc ? |
|
8977
b3da1ec8d156
commit https://github.com/vim/vim/commit/902647d2dfb42dce8449dfbbc22dab27a528744d
Christian Brabandt <cb@256bit.org>
parents:
8969
diff
changeset
|
7868 (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
|
7869 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7870 (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
|
7871 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7872 ) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7873 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7874 ) |
| 681 | 7875 /* If the Normal FG color has BOLD attribute and the new HL |
| 7876 * has a FG color defined, clear BOLD. */ | |
| 7877 out_str(T_ME); | |
| 7 | 7878 if ((attr & HL_STANDOUT) && T_SO != NULL) /* standout */ |
| 7879 out_str(T_SO); | |
| 205 | 7880 if ((attr & (HL_UNDERLINE | HL_UNDERCURL)) && T_US != NULL) |
| 7881 /* underline or undercurl */ | |
| 7 | 7882 out_str(T_US); |
| 7883 if ((attr & HL_ITALIC) && T_CZH != NULL) /* italic */ | |
| 7884 out_str(T_CZH); | |
| 7885 if ((attr & HL_INVERSE) && T_MR != NULL) /* inverse (reverse) */ | |
| 7886 out_str(T_MR); | |
| 7887 | |
| 7888 /* | |
| 7889 * Output the color or start string after bold etc., in case the | |
| 7890 * bold etc. override the color setting. | |
| 7891 */ | |
| 7892 if (aep != NULL) | |
| 7893 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7894 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7895 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7896 { |
|
8977
b3da1ec8d156
commit https://github.com/vim/vim/commit/902647d2dfb42dce8449dfbbc22dab27a528744d
Christian Brabandt <cb@256bit.org>
parents:
8969
diff
changeset
|
7897 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
|
7898 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
|
7899 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
|
7900 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 7901 } |
| 7902 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7903 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7904 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7905 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7906 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7907 if (aep->ae_u.cterm.fg_color) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7908 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
|
7909 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
|
7910 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
|
7911 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7912 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7913 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7914 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
|
7915 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
|
7916 } |
| 7 | 7917 } |
| 7918 } | |
| 7919 } | |
| 7920 } | |
| 7921 } | |
| 7922 | |
| 7923 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7924 screen_stop_highlight(void) |
| 7 | 7925 { |
| 7926 int do_ME = FALSE; /* output T_ME code */ | |
| 7927 | |
| 7928 if (screen_attr != 0 | |
| 7929 #ifdef WIN3264 | |
| 7930 && termcap_active | |
| 7931 #endif | |
| 7932 ) | |
| 7933 { | |
| 7934 #ifdef FEAT_GUI | |
| 7935 if (gui.in_use) | |
| 7936 { | |
| 7937 char buf[20]; | |
| 7938 | |
| 7939 /* use internal GUI code */ | |
| 7940 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 7941 OUT_STR(buf); | |
| 7942 } | |
| 7943 else | |
| 7944 #endif | |
| 7945 { | |
| 7946 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 7947 { | |
| 7948 attrentry_T *aep; | |
| 7949 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7950 if (IS_CTERM) |
| 7 | 7951 { |
| 7952 /* | |
| 7953 * Assume that t_me restores the original colors! | |
| 7954 */ | |
| 7955 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
|
7956 if (aep != NULL && |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7957 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7958 (p_tgc ? |
|
8977
b3da1ec8d156
commit https://github.com/vim/vim/commit/902647d2dfb42dce8449dfbbc22dab27a528744d
Christian Brabandt <cb@256bit.org>
parents:
8969
diff
changeset
|
7959 (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
|
7960 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
|
7961 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7962 (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
|
7963 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7964 ) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7965 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7966 ) |
| 7 | 7967 do_ME = TRUE; |
| 7968 } | |
| 7969 else | |
| 7970 { | |
| 7971 aep = syn_term_attr2entry(screen_attr); | |
| 7972 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 7973 { | |
| 7974 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 7975 do_ME = TRUE; | |
| 7976 else | |
| 7977 out_str(aep->ae_u.term.stop); | |
| 7978 } | |
| 7979 } | |
| 7980 if (aep == NULL) /* did ":syntax clear" */ | |
| 7981 screen_attr = 0; | |
| 7982 else | |
| 7983 screen_attr = aep->ae_attr; | |
| 7984 } | |
| 7985 | |
| 7986 /* | |
| 7987 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 7988 * same sequence several times. | |
| 7989 */ | |
| 7990 if (screen_attr & HL_STANDOUT) | |
| 7991 { | |
| 7992 if (STRCMP(T_SE, T_ME) == 0) | |
| 7993 do_ME = TRUE; | |
| 7994 else | |
| 7995 out_str(T_SE); | |
| 7996 } | |
| 205 | 7997 if (screen_attr & (HL_UNDERLINE | HL_UNDERCURL)) |
| 7 | 7998 { |
| 7999 if (STRCMP(T_UE, T_ME) == 0) | |
| 8000 do_ME = TRUE; | |
| 8001 else | |
| 8002 out_str(T_UE); | |
| 8003 } | |
| 8004 if (screen_attr & HL_ITALIC) | |
| 8005 { | |
| 8006 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8007 do_ME = TRUE; | |
| 8008 else | |
| 8009 out_str(T_CZR); | |
| 8010 } | |
| 8011 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) | |
| 8012 out_str(T_ME); | |
| 8013 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8014 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8015 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8016 { |
|
8977
b3da1ec8d156
commit https://github.com/vim/vim/commit/902647d2dfb42dce8449dfbbc22dab27a528744d
Christian Brabandt <cb@256bit.org>
parents:
8969
diff
changeset
|
8017 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
|
8018 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
|
8019 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
|
8020 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
|
8021 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8022 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8023 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8024 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8025 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8026 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8027 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8028 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8029 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
|
8030 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8031 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
|
8032 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8033 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8034 } |
| 7 | 8035 } |
| 8036 } | |
| 8037 } | |
| 8038 screen_attr = 0; | |
| 8039 } | |
| 8040 | |
| 8041 /* | |
| 8042 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8043 * The machine specific code may override this again. | |
| 8044 */ | |
| 8045 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8046 reset_cterm_colors(void) |
| 7 | 8047 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8048 if (IS_CTERM) |
| 7 | 8049 { |
| 8050 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8051 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8052 if (p_tgc ? |
|
8977
b3da1ec8d156
commit https://github.com/vim/vim/commit/902647d2dfb42dce8449dfbbc22dab27a528744d
Christian Brabandt <cb@256bit.org>
parents:
8969
diff
changeset
|
8053 (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
|
8054 || 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
|
8055 (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
|
8056 #else |
| 7 | 8057 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
|
8058 #endif |
| 7 | 8059 { |
| 8060 out_str(T_OP); | |
| 8061 screen_attr = -1; | |
| 8062 } | |
| 8063 if (cterm_normal_fg_bold) | |
| 8064 { | |
| 8065 out_str(T_ME); | |
| 8066 screen_attr = -1; | |
| 8067 } | |
| 8068 } | |
| 8069 } | |
| 8070 | |
| 8071 /* | |
| 8072 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8073 * using the attributes from ScreenAttrs["off"]. | |
| 8074 */ | |
| 8075 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8076 screen_char(unsigned off, int row, int col) |
| 7 | 8077 { |
| 8078 int attr; | |
| 8079 | |
| 8080 /* Check for illegal values, just in case (could happen just after | |
| 8081 * resizing). */ | |
| 8082 if (row >= screen_Rows || col >= screen_Columns) | |
| 8083 return; | |
| 8084 | |
| 6602 | 8085 /* Outputting a character in the last cell on the screen may scroll the |
| 8086 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8087 * mark the character invalid (update it when scrolled up). */ | |
| 8088 if (*T_XN == NUL | |
| 8089 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8090 #ifdef FEAT_RIGHTLEFT |
| 8091 /* account for first command-line character in rightleft mode */ | |
| 8092 && !cmdmsg_rl | |
| 8093 #endif | |
| 8094 ) | |
| 8095 { | |
| 8096 ScreenAttrs[off] = (sattr_T)-1; | |
| 8097 return; | |
| 8098 } | |
| 8099 | |
| 8100 /* | |
| 8101 * Stop highlighting first, so it's easier to move the cursor. | |
| 8102 */ | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8103 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) |
| 7 | 8104 if (screen_char_attr != 0) |
| 8105 attr = screen_char_attr; | |
| 8106 else | |
| 8107 #endif | |
| 8108 attr = ScreenAttrs[off]; | |
| 8109 if (screen_attr != attr) | |
| 8110 screen_stop_highlight(); | |
| 8111 | |
| 8112 windgoto(row, col); | |
| 8113 | |
| 8114 if (screen_attr != attr) | |
| 8115 screen_start_highlight(attr); | |
| 8116 | |
| 8117 #ifdef FEAT_MBYTE | |
| 8118 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8119 { | |
| 8120 char_u buf[MB_MAXBYTES + 1]; | |
| 8121 | |
| 8122 /* Convert UTF-8 character to bytes and write it. */ | |
| 8123 | |
| 8124 buf[utfc_char2bytes(off, buf)] = NUL; | |
| 8125 | |
| 8126 out_str(buf); | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8127 if (utf_ambiguous_width(ScreenLinesUC[off])) |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8128 screen_cur_col = 9999; |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8129 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8130 ++screen_cur_col; |
| 8131 } | |
| 8132 else | |
| 8133 #endif | |
| 8134 { | |
| 8135 #ifdef FEAT_MBYTE | |
| 8136 out_flush_check(); | |
| 8137 #endif | |
| 8138 out_char(ScreenLines[off]); | |
| 8139 #ifdef FEAT_MBYTE | |
| 8140 /* double-byte character in single-width cell */ | |
| 8141 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8142 out_char(ScreenLines2[off]); | |
| 8143 #endif | |
| 8144 } | |
| 8145 | |
| 8146 screen_cur_col++; | |
| 8147 } | |
| 8148 | |
| 8149 #ifdef FEAT_MBYTE | |
| 8150 | |
| 8151 /* | |
| 8152 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8153 * on the screen at position 'row' and 'col'. | |
| 8154 * The attributes of the first byte is used for all. This is required to | |
| 8155 * output the two bytes of a double-byte character with nothing in between. | |
| 8156 */ | |
| 8157 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8158 screen_char_2(unsigned off, int row, int col) |
| 7 | 8159 { |
| 8160 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8161 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8162 return; | |
| 8163 | |
| 8164 /* Outputting the last character on the screen may scrollup the screen. | |
| 8165 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8166 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8167 { | |
| 8168 ScreenAttrs[off] = (sattr_T)-1; | |
| 8169 return; | |
| 8170 } | |
| 8171 | |
| 8172 /* Output the first byte normally (positions the cursor), then write the | |
| 8173 * second byte directly. */ | |
| 8174 screen_char(off, row, col); | |
| 8175 out_char(ScreenLines[off + 1]); | |
| 8176 ++screen_cur_col; | |
| 8177 } | |
| 8178 #endif | |
| 8179 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8180 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) || defined(PROTO) |
| 7 | 8181 /* |
| 8182 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8183 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8184 */ | |
| 8185 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8186 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8187 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8188 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8189 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8190 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8191 int invert) |
| 7 | 8192 { |
| 8193 int r, c; | |
| 8194 int off; | |
| 1378 | 8195 #ifdef FEAT_MBYTE |
| 8196 int max_off; | |
| 8197 #endif | |
| 7 | 8198 |
| 534 | 8199 /* Can't use ScreenLines unless initialized */ |
| 8200 if (ScreenLines == NULL) | |
| 8201 return; | |
| 8202 | |
| 7 | 8203 if (invert) |
| 8204 screen_char_attr = HL_INVERSE; | |
| 8205 for (r = row; r < row + height; ++r) | |
| 8206 { | |
| 8207 off = LineOffset[r]; | |
| 1378 | 8208 #ifdef FEAT_MBYTE |
| 8209 max_off = off + screen_Columns; | |
| 8210 #endif | |
| 7 | 8211 for (c = col; c < col + width; ++c) |
| 8212 { | |
| 8213 #ifdef FEAT_MBYTE | |
| 1378 | 8214 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8215 { |
| 8216 screen_char_2(off + c, r, c); | |
| 8217 ++c; | |
| 8218 } | |
| 8219 else | |
| 8220 #endif | |
| 8221 { | |
| 8222 screen_char(off + c, r, c); | |
| 8223 #ifdef FEAT_MBYTE | |
| 1378 | 8224 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8225 ++c; |
| 8226 #endif | |
| 8227 } | |
| 8228 } | |
| 8229 } | |
| 8230 screen_char_attr = 0; | |
| 8231 } | |
| 8232 #endif | |
| 8233 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8234 #ifdef FEAT_WINDOWS |
| 7 | 8235 /* |
| 8236 * Redraw the characters for a vertically split window. | |
| 8237 */ | |
| 8238 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8239 redraw_block(int row, int end, win_T *wp) |
| 7 | 8240 { |
| 8241 int col; | |
| 8242 int width; | |
| 8243 | |
| 8244 # ifdef FEAT_CLIPBOARD | |
| 8245 clip_may_clear_selection(row, end - 1); | |
| 8246 # endif | |
| 8247 | |
| 8248 if (wp == NULL) | |
| 8249 { | |
| 8250 col = 0; | |
| 8251 width = Columns; | |
| 8252 } | |
| 8253 else | |
| 8254 { | |
| 8255 col = wp->w_wincol; | |
| 8256 width = wp->w_width; | |
| 8257 } | |
| 8258 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8259 } | |
| 8260 #endif | |
| 8261 | |
| 8262 /* | |
| 8263 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8264 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8265 * Use attributes 'attr'. | |
| 8266 */ | |
| 8267 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8268 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8269 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8270 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8271 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8272 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8273 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8274 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8275 int attr) |
| 7 | 8276 { |
| 8277 int row; | |
| 8278 int col; | |
| 8279 int off; | |
| 8280 int end_off; | |
| 8281 int did_delete; | |
| 8282 int c; | |
| 8283 int norm_term; | |
| 8284 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8285 int force_next = FALSE; | |
| 8286 #endif | |
| 8287 | |
| 8288 if (end_row > screen_Rows) /* safety check */ | |
| 8289 end_row = screen_Rows; | |
| 8290 if (end_col > screen_Columns) /* safety check */ | |
| 8291 end_col = screen_Columns; | |
| 8292 if (ScreenLines == NULL | |
| 8293 || start_row >= end_row | |
| 8294 || start_col >= end_col) /* nothing to do */ | |
| 8295 return; | |
| 8296 | |
| 8297 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8298 norm_term = ( | |
| 8299 #ifdef FEAT_GUI | |
| 8300 !gui.in_use && | |
| 8301 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8302 !IS_CTERM); |
| 7 | 8303 for (row = start_row; row < end_row; ++row) |
| 8304 { | |
| 1668 | 8305 #ifdef FEAT_MBYTE |
| 8306 if (has_mbyte | |
| 8307 # ifdef FEAT_GUI | |
| 8308 && !gui.in_use | |
| 8309 # endif | |
| 8310 ) | |
| 8311 { | |
| 8312 /* When drawing over the right halve of a double-wide char clear | |
| 8313 * out the left halve. When drawing over the left halve of a | |
| 8314 * double wide-char clear out the right halve. Only needed in a | |
| 8315 * terminal. */ | |
| 1685 | 8316 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8317 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8318 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8319 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8320 } |
| 8321 #endif | |
| 7 | 8322 /* |
| 8323 * Try to use delete-line termcap code, when no attributes or in a | |
| 8324 * "normal" terminal, where a bold/italic space is just a | |
| 8325 * space. | |
| 8326 */ | |
| 8327 did_delete = FALSE; | |
| 8328 if (c2 == ' ' | |
| 8329 && end_col == Columns | |
| 8330 && can_clear(T_CE) | |
| 8331 && (attr == 0 | |
| 8332 || (norm_term | |
| 8333 && attr <= HL_ALL | |
| 8334 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8335 { | |
| 8336 /* | |
| 8337 * check if we really need to clear something | |
| 8338 */ | |
| 8339 col = start_col; | |
| 8340 if (c1 != ' ') /* don't clear first char */ | |
| 8341 ++col; | |
| 8342 | |
| 8343 off = LineOffset[row] + col; | |
| 8344 end_off = LineOffset[row] + end_col; | |
| 8345 | |
| 8346 /* skip blanks (used often, keep it fast!) */ | |
| 8347 #ifdef FEAT_MBYTE | |
| 8348 if (enc_utf8) | |
| 8349 while (off < end_off && ScreenLines[off] == ' ' | |
| 8350 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8351 ++off; | |
| 8352 else | |
| 8353 #endif | |
| 8354 while (off < end_off && ScreenLines[off] == ' ' | |
| 8355 && ScreenAttrs[off] == 0) | |
| 8356 ++off; | |
| 8357 if (off < end_off) /* something to be cleared */ | |
| 8358 { | |
| 8359 col = off - LineOffset[row]; | |
| 8360 screen_stop_highlight(); | |
| 8361 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8362 out_str(T_CE); | |
| 8363 screen_start(); /* don't know where cursor is now */ | |
| 8364 col = end_col - col; | |
| 8365 while (col--) /* clear chars in ScreenLines */ | |
| 8366 { | |
| 8367 ScreenLines[off] = ' '; | |
| 8368 #ifdef FEAT_MBYTE | |
| 8369 if (enc_utf8) | |
| 8370 ScreenLinesUC[off] = 0; | |
| 8371 #endif | |
| 8372 ScreenAttrs[off] = 0; | |
| 8373 ++off; | |
| 8374 } | |
| 8375 } | |
| 8376 did_delete = TRUE; /* the chars are cleared now */ | |
| 8377 } | |
| 8378 | |
| 8379 off = LineOffset[row] + start_col; | |
| 8380 c = c1; | |
| 8381 for (col = start_col; col < end_col; ++col) | |
| 8382 { | |
| 8383 if (ScreenLines[off] != c | |
| 8384 #ifdef FEAT_MBYTE | |
| 714 | 8385 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8386 != (c >= 0x80 ? c : 0)) | |
| 7 | 8387 #endif |
| 8388 || ScreenAttrs[off] != attr | |
| 8389 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8390 || force_next | |
| 8391 #endif | |
| 8392 ) | |
| 8393 { | |
| 8394 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8395 /* The bold trick may make a single row of pixels appear in | |
| 8396 * the next character. When a bold character is removed, the | |
| 8397 * next character should be redrawn too. This happens for our | |
| 8398 * own GUI and for some xterms. */ | |
| 8399 if ( | |
| 8400 # ifdef FEAT_GUI | |
| 8401 gui.in_use | |
| 8402 # endif | |
| 8403 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8404 || | |
| 8405 # endif | |
| 8406 # ifdef UNIX | |
| 8407 term_is_xterm | |
| 8408 # endif | |
| 8409 ) | |
| 8410 { | |
| 8411 if (ScreenLines[off] != ' ' | |
| 8412 && (ScreenAttrs[off] > HL_ALL | |
| 8413 || ScreenAttrs[off] & HL_BOLD)) | |
| 8414 force_next = TRUE; | |
| 8415 else | |
| 8416 force_next = FALSE; | |
| 8417 } | |
| 8418 #endif | |
| 8419 ScreenLines[off] = c; | |
| 8420 #ifdef FEAT_MBYTE | |
| 8421 if (enc_utf8) | |
| 8422 { | |
| 8423 if (c >= 0x80) | |
| 8424 { | |
| 8425 ScreenLinesUC[off] = c; | |
| 714 | 8426 ScreenLinesC[0][off] = 0; |
| 7 | 8427 } |
| 8428 else | |
| 8429 ScreenLinesUC[off] = 0; | |
| 8430 } | |
| 8431 #endif | |
| 8432 ScreenAttrs[off] = attr; | |
| 8433 if (!did_delete || c != ' ') | |
| 8434 screen_char(off, row, col); | |
| 8435 } | |
| 8436 ++off; | |
| 8437 if (col == start_col) | |
| 8438 { | |
| 8439 if (did_delete) | |
| 8440 break; | |
| 8441 c = c2; | |
| 8442 } | |
| 8443 } | |
| 8444 if (end_col == Columns) | |
| 8445 LineWraps[row] = FALSE; | |
| 8446 if (row == Rows - 1) /* overwritten the command line */ | |
| 8447 { | |
| 8448 redraw_cmdline = TRUE; | |
| 8449 if (c1 == ' ' && c2 == ' ') | |
| 8450 clear_cmdline = FALSE; /* command line has been cleared */ | |
| 644 | 8451 if (start_col == 0) |
| 8452 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8453 } |
| 8454 } | |
| 8455 } | |
| 8456 | |
| 8457 /* | |
| 8458 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8459 * screen or the command line. | |
| 8460 */ | |
| 8461 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8462 check_for_delay(int check_msg_scroll) |
| 7 | 8463 { |
| 8464 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8465 && !did_wait_return | |
| 8466 && emsg_silent == 0) | |
| 8467 { | |
| 8468 out_flush(); | |
| 8469 ui_delay(1000L, TRUE); | |
| 8470 emsg_on_display = FALSE; | |
| 8471 if (check_msg_scroll) | |
| 8472 msg_scroll = FALSE; | |
| 8473 } | |
| 8474 } | |
| 8475 | |
| 8476 /* | |
| 8477 * screen_valid - allocate screen buffers if size changed | |
| 3263 | 8478 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8479 * Returns TRUE if there is a valid screen to write to. |
| 8480 * Returns FALSE when starting up and screen not initialized yet. | |
| 8481 */ | |
| 8482 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8483 screen_valid(int doclear) |
| 7 | 8484 { |
| 3263 | 8485 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8486 return (ScreenLines != NULL); |
| 8487 } | |
| 8488 | |
| 8489 /* | |
| 8490 * Resize the shell to Rows and Columns. | |
| 8491 * Allocate ScreenLines[] and associated items. | |
| 8492 * | |
| 8493 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8494 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8495 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8496 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8497 * final size of the shell is needed. | |
| 8498 */ | |
| 8499 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8500 screenalloc(int doclear) |
| 7 | 8501 { |
| 8502 int new_row, old_row; | |
| 8503 #ifdef FEAT_GUI | |
| 8504 int old_Rows; | |
| 8505 #endif | |
| 8506 win_T *wp; | |
| 8507 int outofmem = FALSE; | |
| 8508 int len; | |
| 8509 schar_T *new_ScreenLines; | |
| 8510 #ifdef FEAT_MBYTE | |
| 8511 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8512 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8513 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8514 int i; |
| 7 | 8515 #endif |
| 8516 sattr_T *new_ScreenAttrs; | |
| 8517 unsigned *new_LineOffset; | |
| 8518 char_u *new_LineWraps; | |
| 671 | 8519 #ifdef FEAT_WINDOWS |
| 681 | 8520 short *new_TabPageIdxs; |
| 671 | 8521 tabpage_T *tp; |
| 8522 #endif | |
| 7 | 8523 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8524 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8525 #ifdef FEAT_AUTOCMD |
| 8526 int retry_count = 0; | |
| 8527 | |
| 8528 retry: | |
| 8529 #endif | |
| 7 | 8530 /* |
| 8531 * Allocation of the screen buffers is done only when the size changes and | |
| 8532 * when Rows and Columns have been set and we have started doing full | |
| 8533 * screen stuff. | |
| 8534 */ | |
| 8535 if ((ScreenLines != NULL | |
| 8536 && Rows == screen_Rows | |
| 8537 && Columns == screen_Columns | |
| 8538 #ifdef FEAT_MBYTE | |
| 8539 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8540 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
| 714 | 8541 && p_mco == Screen_mco |
| 7 | 8542 #endif |
| 8543 ) | |
| 8544 || Rows == 0 | |
| 8545 || Columns == 0 | |
| 8546 || (!full_screen && ScreenLines == NULL)) | |
| 8547 return; | |
| 8548 | |
| 8549 /* | |
| 8550 * It's possible that we produce an out-of-memory message below, which | |
| 8551 * will cause this function to be called again. To break the loop, just | |
| 8552 * return here. | |
| 8553 */ | |
| 8554 if (entered) | |
| 8555 return; | |
| 8556 entered = TRUE; | |
| 8557 | |
| 911 | 8558 /* |
| 8559 * Note that the window sizes are updated before reallocating the arrays, | |
| 8560 * thus we must not redraw here! | |
| 8561 */ | |
| 8562 ++RedrawingDisabled; | |
| 8563 | |
| 7 | 8564 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8565 | |
| 8566 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8567 | |
| 8568 /* | |
| 8569 * We're changing the size of the screen. | |
| 8570 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8571 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8572 * lines (unless the screen is going to be cleared). | |
| 8573 * - Free the old arrays. | |
| 8574 * | |
| 8575 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8576 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8577 * size is wrong. | |
| 8578 */ | |
| 671 | 8579 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8580 win_free_lsize(wp); |
| 1946 | 8581 #ifdef FEAT_AUTOCMD |
| 8582 if (aucmd_win != NULL) | |
| 8583 win_free_lsize(aucmd_win); | |
| 8584 #endif | |
| 7 | 8585 |
| 8586 new_ScreenLines = (schar_T *)lalloc((long_u)( | |
| 8587 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8588 #ifdef FEAT_MBYTE | |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
8589 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8590 if (enc_utf8) |
| 8591 { | |
| 8592 new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( | |
| 8593 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); | |
| 714 | 8594 for (i = 0; i < p_mco; ++i) |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
8595 new_ScreenLinesC[i] = (u8char_T *)lalloc_clear((long_u)( |
| 7 | 8596 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); |
| 8597 } | |
| 8598 if (enc_dbcs == DBCS_JPNU) | |
| 8599 new_ScreenLines2 = (schar_T *)lalloc((long_u)( | |
| 8600 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8601 #endif | |
| 8602 new_ScreenAttrs = (sattr_T *)lalloc((long_u)( | |
| 8603 (Rows + 1) * Columns * sizeof(sattr_T)), FALSE); | |
| 8604 new_LineOffset = (unsigned *)lalloc((long_u)( | |
| 8605 Rows * sizeof(unsigned)), FALSE); | |
| 8606 new_LineWraps = (char_u *)lalloc((long_u)(Rows * sizeof(char_u)), FALSE); | |
| 671 | 8607 #ifdef FEAT_WINDOWS |
| 681 | 8608 new_TabPageIdxs = (short *)lalloc((long_u)(Columns * sizeof(short)), FALSE); |
| 671 | 8609 #endif |
| 7 | 8610 |
| 677 | 8611 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8612 { |
| 8613 if (win_alloc_lines(wp) == FAIL) | |
| 8614 { | |
| 8615 outofmem = TRUE; | |
| 8616 #ifdef FEAT_WINDOWS | |
| 1819 | 8617 goto give_up; |
| 8618 #endif | |
| 8619 } | |
| 8620 } | |
| 1906 | 8621 #ifdef FEAT_AUTOCMD |
| 1946 | 8622 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8623 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8624 outofmem = TRUE; |
| 8625 #endif | |
| 1819 | 8626 #ifdef FEAT_WINDOWS |
| 8627 give_up: | |
| 8628 #endif | |
| 7 | 8629 |
| 714 | 8630 #ifdef FEAT_MBYTE |
| 8631 for (i = 0; i < p_mco; ++i) | |
| 8632 if (new_ScreenLinesC[i] == NULL) | |
| 8633 break; | |
| 8634 #endif | |
| 7 | 8635 if (new_ScreenLines == NULL |
| 8636 #ifdef FEAT_MBYTE | |
| 714 | 8637 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8638 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8639 #endif | |
| 8640 || new_ScreenAttrs == NULL | |
| 8641 || new_LineOffset == NULL | |
| 8642 || new_LineWraps == NULL | |
| 671 | 8643 #ifdef FEAT_WINDOWS |
| 8644 || new_TabPageIdxs == NULL | |
| 8645 #endif | |
| 7 | 8646 || outofmem) |
| 8647 { | |
| 944 | 8648 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8649 { |
| 8650 /* guess the size */ | |
| 8651 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8652 | |
| 8653 /* Remember we did this to avoid getting outofmem messages over | |
| 8654 * and over again. */ | |
| 944 | 8655 done_outofmem_msg = TRUE; |
| 534 | 8656 } |
| 7 | 8657 vim_free(new_ScreenLines); |
| 8658 new_ScreenLines = NULL; | |
| 8659 #ifdef FEAT_MBYTE | |
| 8660 vim_free(new_ScreenLinesUC); | |
| 8661 new_ScreenLinesUC = NULL; | |
| 714 | 8662 for (i = 0; i < p_mco; ++i) |
| 8663 { | |
| 8664 vim_free(new_ScreenLinesC[i]); | |
| 8665 new_ScreenLinesC[i] = NULL; | |
| 8666 } | |
| 7 | 8667 vim_free(new_ScreenLines2); |
| 8668 new_ScreenLines2 = NULL; | |
| 8669 #endif | |
| 8670 vim_free(new_ScreenAttrs); | |
| 8671 new_ScreenAttrs = NULL; | |
| 8672 vim_free(new_LineOffset); | |
| 8673 new_LineOffset = NULL; | |
| 8674 vim_free(new_LineWraps); | |
| 8675 new_LineWraps = NULL; | |
| 671 | 8676 #ifdef FEAT_WINDOWS |
| 8677 vim_free(new_TabPageIdxs); | |
| 8678 new_TabPageIdxs = NULL; | |
| 8679 #endif | |
| 7 | 8680 } |
| 8681 else | |
| 8682 { | |
| 944 | 8683 done_outofmem_msg = FALSE; |
| 534 | 8684 |
| 7 | 8685 for (new_row = 0; new_row < Rows; ++new_row) |
| 8686 { | |
| 8687 new_LineOffset[new_row] = new_row * Columns; | |
| 8688 new_LineWraps[new_row] = FALSE; | |
| 8689 | |
| 8690 /* | |
| 8691 * If the screen is not going to be cleared, copy as much as | |
| 8692 * possible from the old screen to the new one and clear the rest | |
| 8693 * (used when resizing the window at the "--more--" prompt or when | |
| 8694 * executing an external command, for the GUI). | |
| 8695 */ | |
| 3263 | 8696 if (!doclear) |
| 7 | 8697 { |
| 8698 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 8699 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 8700 #ifdef FEAT_MBYTE | |
| 8701 if (enc_utf8) | |
| 8702 { | |
| 8703 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 8704 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 8705 for (i = 0; i < p_mco; ++i) |
| 8706 (void)vim_memset(new_ScreenLinesC[i] | |
| 8707 + new_row * Columns, | |
| 7 | 8708 0, (size_t)Columns * sizeof(u8char_T)); |
| 8709 } | |
| 8710 if (enc_dbcs == DBCS_JPNU) | |
| 8711 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 8712 0, (size_t)Columns * sizeof(schar_T)); | |
| 8713 #endif | |
| 8714 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 8715 0, (size_t)Columns * sizeof(sattr_T)); | |
| 8716 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 8717 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 8718 { |
| 8719 if (screen_Columns < Columns) | |
| 8720 len = screen_Columns; | |
| 8721 else | |
| 8722 len = Columns; | |
| 26 | 8723 #ifdef FEAT_MBYTE |
| 571 | 8724 /* When switching to utf-8 don't copy characters, they |
| 714 | 8725 * may be invalid now. Also when p_mco changes. */ |
| 8726 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 8727 && p_mco == Screen_mco) | |
| 26 | 8728 #endif |
| 8729 mch_memmove(new_ScreenLines + new_LineOffset[new_row], | |
| 8730 ScreenLines + LineOffset[old_row], | |
| 8731 (size_t)len * sizeof(schar_T)); | |
| 7 | 8732 #ifdef FEAT_MBYTE |
| 714 | 8733 if (enc_utf8 && ScreenLinesUC != NULL |
| 8734 && p_mco == Screen_mco) | |
| 7 | 8735 { |
| 8736 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 8737 ScreenLinesUC + LineOffset[old_row], | |
| 8738 (size_t)len * sizeof(u8char_T)); | |
| 714 | 8739 for (i = 0; i < p_mco; ++i) |
| 8740 mch_memmove(new_ScreenLinesC[i] | |
| 8741 + new_LineOffset[new_row], | |
| 8742 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 8743 (size_t)len * sizeof(u8char_T)); |
| 8744 } | |
| 8745 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 8746 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 8747 ScreenLines2 + LineOffset[old_row], | |
| 8748 (size_t)len * sizeof(schar_T)); | |
| 8749 #endif | |
| 8750 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 8751 ScreenAttrs + LineOffset[old_row], | |
| 8752 (size_t)len * sizeof(sattr_T)); | |
| 8753 } | |
| 8754 } | |
| 8755 } | |
| 8756 /* Use the last line of the screen for the current line. */ | |
| 8757 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 8758 } | |
| 8759 | |
| 356 | 8760 free_screenlines(); |
| 8761 | |
| 7 | 8762 ScreenLines = new_ScreenLines; |
| 8763 #ifdef FEAT_MBYTE | |
| 8764 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 8765 for (i = 0; i < p_mco; ++i) |
| 8766 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 8767 Screen_mco = p_mco; | |
| 7 | 8768 ScreenLines2 = new_ScreenLines2; |
| 8769 #endif | |
| 8770 ScreenAttrs = new_ScreenAttrs; | |
| 8771 LineOffset = new_LineOffset; | |
| 8772 LineWraps = new_LineWraps; | |
| 671 | 8773 #ifdef FEAT_WINDOWS |
| 8774 TabPageIdxs = new_TabPageIdxs; | |
| 8775 #endif | |
| 7 | 8776 |
| 8777 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 8778 * size of ScreenLines[]. Set them before calling anything. */ | |
| 8779 #ifdef FEAT_GUI | |
| 8780 old_Rows = screen_Rows; | |
| 8781 #endif | |
| 8782 screen_Rows = Rows; | |
| 8783 screen_Columns = Columns; | |
| 8784 | |
| 8785 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 8786 if (doclear) |
| 7 | 8787 screenclear2(); |
| 8788 | |
| 8789 #ifdef FEAT_GUI | |
| 8790 else if (gui.in_use | |
| 8791 && !gui.starting | |
| 8792 && ScreenLines != NULL | |
| 8793 && old_Rows != Rows) | |
| 8794 { | |
| 8795 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 8796 /* | |
| 8797 * Adjust the position of the cursor, for when executing an external | |
| 8798 * command. | |
| 8799 */ | |
| 8800 if (msg_row >= Rows) /* Rows got smaller */ | |
| 8801 msg_row = Rows - 1; /* put cursor at last row */ | |
| 8802 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 8803 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 8804 if (msg_col >= Columns) /* Columns got smaller */ | |
| 8805 msg_col = Columns - 1; /* put cursor at last column */ | |
| 8806 } | |
| 8807 #endif | |
| 8808 | |
| 8809 entered = FALSE; | |
| 911 | 8810 --RedrawingDisabled; |
| 766 | 8811 |
| 8812 #ifdef FEAT_AUTOCMD | |
| 1824 | 8813 /* |
| 8814 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 8815 * in case applying autocommands always changes Rows or Columns. | |
| 8816 */ | |
| 8817 if (starting == 0 && ++retry_count <= 3) | |
| 8818 { | |
| 766 | 8819 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 8820 /* In rare cases, autocommands may have altered Rows or Columns, |
| 8821 * jump back to check if we need to allocate the screen again. */ | |
| 8822 goto retry; | |
| 8823 } | |
| 766 | 8824 #endif |
| 7 | 8825 } |
| 8826 | |
| 8827 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8828 free_screenlines(void) |
| 356 | 8829 { |
| 8830 #ifdef FEAT_MBYTE | |
| 714 | 8831 int i; |
| 8832 | |
| 356 | 8833 vim_free(ScreenLinesUC); |
| 714 | 8834 for (i = 0; i < Screen_mco; ++i) |
| 8835 vim_free(ScreenLinesC[i]); | |
| 356 | 8836 vim_free(ScreenLines2); |
| 8837 #endif | |
| 714 | 8838 vim_free(ScreenLines); |
| 356 | 8839 vim_free(ScreenAttrs); |
| 8840 vim_free(LineOffset); | |
| 8841 vim_free(LineWraps); | |
| 671 | 8842 #ifdef FEAT_WINDOWS |
| 8843 vim_free(TabPageIdxs); | |
| 8844 #endif | |
| 356 | 8845 } |
| 8846 | |
| 8847 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8848 screenclear(void) |
| 7 | 8849 { |
| 8850 check_for_delay(FALSE); | |
| 8851 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 8852 screenclear2(); /* clear the screen */ | |
| 8853 } | |
| 8854 | |
| 8855 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8856 screenclear2(void) |
| 7 | 8857 { |
| 8858 int i; | |
| 8859 | |
| 8860 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 8861 #ifdef FEAT_GUI | |
| 8862 || (gui.in_use && gui.starting) | |
| 8863 #endif | |
| 8864 ) | |
| 8865 return; | |
| 8866 | |
| 8867 #ifdef FEAT_GUI | |
| 8868 if (!gui.in_use) | |
| 8869 #endif | |
| 8870 screen_attr = -1; /* force setting the Normal colors */ | |
| 8871 screen_stop_highlight(); /* don't want highlighting here */ | |
| 8872 | |
| 8873 #ifdef FEAT_CLIPBOARD | |
| 8874 /* disable selection without redrawing it */ | |
| 8875 clip_scroll_selection(9999); | |
| 8876 #endif | |
| 8877 | |
| 8878 /* blank out ScreenLines */ | |
| 8879 for (i = 0; i < Rows; ++i) | |
| 8880 { | |
| 8881 lineclear(LineOffset[i], (int)Columns); | |
| 8882 LineWraps[i] = FALSE; | |
| 8883 } | |
| 8884 | |
| 8885 if (can_clear(T_CL)) | |
| 8886 { | |
| 8887 out_str(T_CL); /* clear the display */ | |
| 8888 clear_cmdline = FALSE; | |
| 644 | 8889 mode_displayed = FALSE; |
| 7 | 8890 } |
| 8891 else | |
| 8892 { | |
| 8893 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 8894 for (i = 0; i < Rows; ++i) | |
| 8895 lineinvalid(LineOffset[i], (int)Columns); | |
| 8896 clear_cmdline = TRUE; | |
| 8897 } | |
| 8898 | |
| 8899 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 8900 | |
| 8901 win_rest_invalid(firstwin); | |
| 8902 redraw_cmdline = TRUE; | |
| 670 | 8903 #ifdef FEAT_WINDOWS |
| 673 | 8904 redraw_tabline = TRUE; |
| 670 | 8905 #endif |
| 7 | 8906 if (must_redraw == CLEAR) /* no need to clear again */ |
| 8907 must_redraw = NOT_VALID; | |
| 8908 compute_cmdrow(); | |
| 8909 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 8910 msg_col = 0; | |
| 8911 screen_start(); /* don't know where cursor is now */ | |
| 8912 msg_scrolled = 0; /* can't scroll back */ | |
| 8913 msg_didany = FALSE; | |
| 8914 msg_didout = FALSE; | |
| 8915 } | |
| 8916 | |
| 8917 /* | |
| 8918 * Clear one line in ScreenLines. | |
| 8919 */ | |
| 8920 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8921 lineclear(unsigned off, int width) |
| 7 | 8922 { |
| 8923 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 8924 #ifdef FEAT_MBYTE | |
| 8925 if (enc_utf8) | |
| 8926 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 8927 (size_t)width * sizeof(u8char_T)); | |
| 8928 #endif | |
| 8929 (void)vim_memset(ScreenAttrs + off, 0, (size_t)width * sizeof(sattr_T)); | |
| 8930 } | |
| 8931 | |
| 8932 /* | |
| 8933 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 8934 * invalid value. | |
| 8935 */ | |
| 8936 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8937 lineinvalid(unsigned off, int width) |
| 7 | 8938 { |
| 8939 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 8940 } | |
| 8941 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8942 #ifdef FEAT_WINDOWS |
| 7 | 8943 /* |
| 8944 * Copy part of a Screenline for vertically split window "wp". | |
| 8945 */ | |
| 8946 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8947 linecopy(int to, int from, win_T *wp) |
| 7 | 8948 { |
| 8949 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 8950 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 8951 | |
| 8952 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 8953 wp->w_width * sizeof(schar_T)); | |
| 8954 # ifdef FEAT_MBYTE | |
| 8955 if (enc_utf8) | |
| 8956 { | |
| 714 | 8957 int i; |
| 8958 | |
| 7 | 8959 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 8960 wp->w_width * sizeof(u8char_T)); | |
| 714 | 8961 for (i = 0; i < p_mco; ++i) |
| 8962 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 8963 wp->w_width * sizeof(u8char_T)); | |
| 7 | 8964 } |
| 8965 if (enc_dbcs == DBCS_JPNU) | |
| 8966 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 8967 wp->w_width * sizeof(schar_T)); | |
| 8968 # endif | |
| 8969 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 8970 wp->w_width * sizeof(sattr_T)); | |
| 8971 } | |
| 8972 #endif | |
| 8973 | |
| 8974 /* | |
| 8975 * Return TRUE if clearing with term string "p" would work. | |
| 8976 * It can't work when the string is empty or it won't set the right background. | |
| 8977 */ | |
| 8978 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8979 can_clear(char_u *p) |
| 7 | 8980 { |
| 8981 return (*p != NUL && (t_colors <= 1 | |
| 8982 #ifdef FEAT_GUI | |
| 8983 || gui.in_use | |
| 8984 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8985 #ifdef FEAT_TERMGUICOLORS |
|
9320
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
8986 || (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
|
8987 || (!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
|
8988 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
8989 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
8990 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
8991 || *T_UT != NUL)); |
| 7 | 8992 } |
| 8993 | |
| 8994 /* | |
| 8995 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 8996 * something directly to the screen (shell commands) or a terminal control | |
| 8997 * code. | |
| 8998 */ | |
| 8999 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9000 screen_start(void) |
| 7 | 9001 { |
| 9002 screen_cur_row = screen_cur_col = 9999; | |
| 9003 } | |
| 9004 | |
| 9005 /* | |
| 9006 * Move the cursor to position "row","col" in the screen. | |
| 9007 * This tries to find the most efficient way to move, minimizing the number of | |
| 9008 * characters sent to the terminal. | |
| 9009 */ | |
| 9010 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9011 windgoto(int row, int col) |
| 7 | 9012 { |
| 205 | 9013 sattr_T *p; |
| 7 | 9014 int i; |
| 9015 int plan; | |
| 9016 int cost; | |
| 9017 int wouldbe_col; | |
| 9018 int noinvcurs; | |
| 9019 char_u *bs; | |
| 9020 int goto_cost; | |
| 9021 int attr; | |
| 9022 | |
| 1213 | 9023 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9024 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9025 | |
| 9026 #define PLAN_LE 1 | |
| 9027 #define PLAN_CR 2 | |
| 9028 #define PLAN_NL 3 | |
| 9029 #define PLAN_WRITE 4 | |
| 9030 /* Can't use ScreenLines unless initialized */ | |
| 9031 if (ScreenLines == NULL) | |
| 9032 return; | |
| 9033 | |
| 9034 if (col != screen_cur_col || row != screen_cur_row) | |
| 9035 { | |
| 9036 /* Check for valid position. */ | |
| 9037 if (row < 0) /* window without text lines? */ | |
| 9038 row = 0; | |
| 9039 if (row >= screen_Rows) | |
| 9040 row = screen_Rows - 1; | |
| 9041 if (col >= screen_Columns) | |
| 9042 col = screen_Columns - 1; | |
| 9043 | |
| 9044 /* check if no cursor movement is allowed in highlight mode */ | |
| 9045 if (screen_attr && *T_MS == NUL) | |
| 9046 noinvcurs = HIGHL_COST; | |
| 9047 else | |
| 9048 noinvcurs = 0; | |
| 9049 goto_cost = GOTO_COST + noinvcurs; | |
| 9050 | |
| 9051 /* | |
| 9052 * Plan how to do the positioning: | |
| 9053 * 1. Use CR to move it to column 0, same row. | |
| 9054 * 2. Use T_LE to move it a few columns to the left. | |
| 9055 * 3. Use NL to move a few lines down, column 0. | |
| 9056 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9057 * | |
| 9058 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9059 * position is unknown then (some terminals wrap, some don't ) | |
| 9060 * | |
| 1213 | 9061 * First check if the highlighting attributes allow us to write |
| 7 | 9062 * characters to move the cursor to the right. |
| 9063 */ | |
| 9064 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9065 { | |
| 9066 /* | |
| 9067 * If the cursor is in the same row, bigger col, we can use CR | |
| 9068 * or T_LE. | |
| 9069 */ | |
| 9070 bs = NULL; /* init for GCC */ | |
| 9071 attr = screen_attr; | |
| 9072 if (row == screen_cur_row && col < screen_cur_col) | |
| 9073 { | |
| 9074 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9075 if (*T_LE) | |
| 9076 bs = T_LE; /* "cursor left" */ | |
| 9077 else | |
| 9078 bs = T_BC; /* "backspace character (old) */ | |
| 9079 if (*bs) | |
| 9080 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9081 else | |
| 9082 cost = 999; | |
| 9083 if (col + 1 < cost) /* using CR is less characters */ | |
| 9084 { | |
| 9085 plan = PLAN_CR; | |
| 9086 wouldbe_col = 0; | |
| 9087 cost = 1; /* CR is just one character */ | |
| 9088 } | |
| 9089 else | |
| 9090 { | |
| 9091 plan = PLAN_LE; | |
| 9092 wouldbe_col = col; | |
| 9093 } | |
| 9094 if (noinvcurs) /* will stop highlighting */ | |
| 9095 { | |
| 9096 cost += noinvcurs; | |
| 9097 attr = 0; | |
| 9098 } | |
| 9099 } | |
| 9100 | |
| 9101 /* | |
| 9102 * If the cursor is above where we want to be, we can use CR LF. | |
| 9103 */ | |
| 9104 else if (row > screen_cur_row) | |
| 9105 { | |
| 9106 plan = PLAN_NL; | |
| 9107 wouldbe_col = 0; | |
| 9108 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9109 if (noinvcurs) /* will stop highlighting */ | |
| 9110 { | |
| 9111 cost += noinvcurs; | |
| 9112 attr = 0; | |
| 9113 } | |
| 9114 } | |
| 9115 | |
| 9116 /* | |
| 9117 * If the cursor is in the same row, smaller col, just use write. | |
| 9118 */ | |
| 9119 else | |
| 9120 { | |
| 9121 plan = PLAN_WRITE; | |
| 9122 wouldbe_col = screen_cur_col; | |
| 9123 cost = 0; | |
| 9124 } | |
| 9125 | |
| 9126 /* | |
| 9127 * Check if any characters that need to be written have the | |
| 9128 * correct attributes. Also avoid UTF-8 characters. | |
| 9129 */ | |
| 9130 i = col - wouldbe_col; | |
| 9131 if (i > 0) | |
| 9132 cost += i; | |
| 9133 if (cost < goto_cost && i > 0) | |
| 9134 { | |
| 9135 /* | |
| 9136 * Check if the attributes are correct without additionally | |
| 9137 * stopping highlighting. | |
| 9138 */ | |
| 9139 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9140 while (i && *p++ == attr) | |
| 9141 --i; | |
| 9142 if (i != 0) | |
| 9143 { | |
| 9144 /* | |
| 9145 * Try if it works when highlighting is stopped here. | |
| 9146 */ | |
| 9147 if (*--p == 0) | |
| 9148 { | |
| 9149 cost += noinvcurs; | |
| 9150 while (i && *p++ == 0) | |
| 9151 --i; | |
| 9152 } | |
| 9153 if (i != 0) | |
| 9154 cost = 999; /* different attributes, don't do it */ | |
| 9155 } | |
| 9156 #ifdef FEAT_MBYTE | |
| 9157 if (enc_utf8) | |
| 9158 { | |
| 9159 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9160 for (i = wouldbe_col; i < col; ++i) | |
| 9161 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9162 { | |
| 9163 cost = 999; | |
| 9164 break; | |
| 9165 } | |
| 9166 } | |
| 9167 #endif | |
| 9168 } | |
| 9169 | |
| 9170 /* | |
| 9171 * We can do it without term_windgoto()! | |
| 9172 */ | |
| 9173 if (cost < goto_cost) | |
| 9174 { | |
| 9175 if (plan == PLAN_LE) | |
| 9176 { | |
| 9177 if (noinvcurs) | |
| 9178 screen_stop_highlight(); | |
| 9179 while (screen_cur_col > col) | |
| 9180 { | |
| 9181 out_str(bs); | |
| 9182 --screen_cur_col; | |
| 9183 } | |
| 9184 } | |
| 9185 else if (plan == PLAN_CR) | |
| 9186 { | |
| 9187 if (noinvcurs) | |
| 9188 screen_stop_highlight(); | |
| 9189 out_char('\r'); | |
| 9190 screen_cur_col = 0; | |
| 9191 } | |
| 9192 else if (plan == PLAN_NL) | |
| 9193 { | |
| 9194 if (noinvcurs) | |
| 9195 screen_stop_highlight(); | |
| 9196 while (screen_cur_row < row) | |
| 9197 { | |
| 9198 out_char('\n'); | |
| 9199 ++screen_cur_row; | |
| 9200 } | |
| 9201 screen_cur_col = 0; | |
| 9202 } | |
| 9203 | |
| 9204 i = col - screen_cur_col; | |
| 9205 if (i > 0) | |
| 9206 { | |
| 9207 /* | |
| 9208 * Use cursor-right if it's one character only. Avoids | |
| 9209 * removing a line of pixels from the last bold char, when | |
| 9210 * using the bold trick in the GUI. | |
| 9211 */ | |
| 9212 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9213 { | |
| 9214 while (i-- > 0) | |
| 9215 out_char(*T_ND); | |
| 9216 } | |
| 9217 else | |
| 9218 { | |
| 9219 int off; | |
| 9220 | |
| 9221 off = LineOffset[row] + screen_cur_col; | |
| 9222 while (i-- > 0) | |
| 9223 { | |
| 9224 if (ScreenAttrs[off] != screen_attr) | |
| 9225 screen_stop_highlight(); | |
| 9226 #ifdef FEAT_MBYTE | |
| 9227 out_flush_check(); | |
| 9228 #endif | |
| 9229 out_char(ScreenLines[off]); | |
| 9230 #ifdef FEAT_MBYTE | |
| 9231 if (enc_dbcs == DBCS_JPNU | |
| 9232 && ScreenLines[off] == 0x8e) | |
| 9233 out_char(ScreenLines2[off]); | |
| 9234 #endif | |
| 9235 ++off; | |
| 9236 } | |
| 9237 } | |
| 9238 } | |
| 9239 } | |
| 9240 } | |
| 9241 else | |
| 9242 cost = 999; | |
| 9243 | |
| 9244 if (cost >= goto_cost) | |
| 9245 { | |
| 9246 if (noinvcurs) | |
| 9247 screen_stop_highlight(); | |
| 5995 | 9248 if (row == screen_cur_row && (col > screen_cur_col) |
| 9249 && *T_CRI != NUL) | |
| 7 | 9250 term_cursor_right(col - screen_cur_col); |
| 9251 else | |
| 9252 term_windgoto(row, col); | |
| 9253 } | |
| 9254 screen_cur_row = row; | |
| 9255 screen_cur_col = col; | |
| 9256 } | |
| 9257 } | |
| 9258 | |
| 9259 /* | |
| 9260 * Set cursor to its position in the current window. | |
| 9261 */ | |
| 9262 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9263 setcursor(void) |
| 7 | 9264 { |
| 9265 if (redrawing()) | |
| 9266 { | |
| 9267 validate_cursor(); | |
| 9268 windgoto(W_WINROW(curwin) + curwin->w_wrow, | |
| 9269 W_WINCOL(curwin) + ( | |
| 9270 #ifdef FEAT_RIGHTLEFT | |
| 1545 | 9271 /* With 'rightleft' set and the cursor on a double-wide |
| 9272 * character, position it on the leftmost column. */ | |
| 7 | 9273 curwin->w_p_rl ? ((int)W_WIDTH(curwin) - curwin->w_wcol - ( |
| 9274 # ifdef FEAT_MBYTE | |
| 1545 | 9275 (has_mbyte |
| 9276 && (*mb_ptr2cells)(ml_get_cursor()) == 2 | |
| 9277 && vim_isprintc(gchar_cursor())) ? 2 : | |
| 7 | 9278 # endif |
| 9279 1)) : | |
| 9280 #endif | |
| 9281 curwin->w_wcol)); | |
| 9282 } | |
| 9283 } | |
| 9284 | |
| 9285 | |
| 9286 /* | |
| 9287 * insert 'line_count' lines at 'row' in window 'wp' | |
| 9288 * if 'invalid' is TRUE the wp->w_lines[].wl_lnum is invalidated. | |
| 9289 * if 'mayclear' is TRUE the screen will be cleared if it is faster than | |
| 9290 * scrolling. | |
| 9291 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9292 */ | |
| 9293 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9294 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9295 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9296 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9297 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9298 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9299 int mayclear) |
| 7 | 9300 { |
| 9301 int did_delete; | |
| 9302 int nextrow; | |
| 9303 int lastrow; | |
| 9304 int retval; | |
| 9305 | |
| 9306 if (invalid) | |
| 9307 wp->w_lines_valid = 0; | |
| 9308 | |
| 9309 if (wp->w_height < 5) | |
| 9310 return FAIL; | |
| 9311 | |
| 9312 if (line_count > wp->w_height - row) | |
| 9313 line_count = wp->w_height - row; | |
| 9314 | |
| 9315 retval = win_do_lines(wp, row, line_count, mayclear, FALSE); | |
| 9316 if (retval != MAYBE) | |
| 9317 return retval; | |
| 9318 | |
| 9319 /* | |
| 9320 * If there is a next window or a status line, we first try to delete the | |
| 9321 * lines at the bottom to avoid messing what is after the window. | |
| 9322 * If this fails and there are following windows, don't do anything to avoid | |
| 9323 * messing up those windows, better just redraw. | |
| 9324 */ | |
| 9325 did_delete = FALSE; | |
| 9326 #ifdef FEAT_WINDOWS | |
| 9327 if (wp->w_next != NULL || wp->w_status_height) | |
| 9328 { | |
| 9329 if (screen_del_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
| 9330 line_count, (int)Rows, FALSE, NULL) == OK) | |
| 9331 did_delete = TRUE; | |
| 9332 else if (wp->w_next) | |
| 9333 return FAIL; | |
| 9334 } | |
| 9335 #endif | |
| 9336 /* | |
| 9337 * if no lines deleted, blank the lines that will end up below the window | |
| 9338 */ | |
| 9339 if (!did_delete) | |
| 9340 { | |
| 9341 #ifdef FEAT_WINDOWS | |
| 9342 wp->w_redr_status = TRUE; | |
| 9343 #endif | |
| 9344 redraw_cmdline = TRUE; | |
| 9345 nextrow = W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp); | |
| 9346 lastrow = nextrow + line_count; | |
| 9347 if (lastrow > Rows) | |
| 9348 lastrow = Rows; | |
| 9349 screen_fill(nextrow - line_count, lastrow - line_count, | |
| 9350 W_WINCOL(wp), (int)W_ENDCOL(wp), | |
| 9351 ' ', ' ', 0); | |
| 9352 } | |
| 9353 | |
| 9354 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, NULL) | |
| 9355 == FAIL) | |
| 9356 { | |
| 9357 /* deletion will have messed up other windows */ | |
| 9358 if (did_delete) | |
| 9359 { | |
| 9360 #ifdef FEAT_WINDOWS | |
| 9361 wp->w_redr_status = TRUE; | |
| 9362 #endif | |
| 9363 win_rest_invalid(W_NEXT(wp)); | |
| 9364 } | |
| 9365 return FAIL; | |
| 9366 } | |
| 9367 | |
| 9368 return OK; | |
| 9369 } | |
| 9370 | |
| 9371 /* | |
| 9372 * delete "line_count" window lines at "row" in window "wp" | |
| 9373 * If "invalid" is TRUE curwin->w_lines[] is invalidated. | |
| 9374 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9375 * scrolling | |
| 9376 * Return OK for success, FAIL if the lines are not deleted. | |
| 9377 */ | |
| 9378 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9379 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9380 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9381 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9382 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9383 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9384 int mayclear) |
| 7 | 9385 { |
| 9386 int retval; | |
| 9387 | |
| 9388 if (invalid) | |
| 9389 wp->w_lines_valid = 0; | |
| 9390 | |
| 9391 if (line_count > wp->w_height - row) | |
| 9392 line_count = wp->w_height - row; | |
| 9393 | |
| 9394 retval = win_do_lines(wp, row, line_count, mayclear, TRUE); | |
| 9395 if (retval != MAYBE) | |
| 9396 return retval; | |
| 9397 | |
| 9398 if (screen_del_lines(0, W_WINROW(wp) + row, line_count, | |
| 9399 (int)Rows, FALSE, NULL) == FAIL) | |
| 9400 return FAIL; | |
| 9401 | |
| 9402 #ifdef FEAT_WINDOWS | |
| 9403 /* | |
| 9404 * If there are windows or status lines below, try to put them at the | |
| 9405 * correct place. If we can't do that, they have to be redrawn. | |
| 9406 */ | |
| 9407 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9408 { | |
| 9409 if (screen_ins_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
| 9410 line_count, (int)Rows, NULL) == FAIL) | |
| 9411 { | |
| 9412 wp->w_redr_status = TRUE; | |
| 9413 win_rest_invalid(wp->w_next); | |
| 9414 } | |
| 9415 } | |
| 9416 /* | |
| 9417 * If this is the last window and there is no status line, redraw the | |
| 9418 * command line later. | |
| 9419 */ | |
| 9420 else | |
| 9421 #endif | |
| 9422 redraw_cmdline = TRUE; | |
| 9423 return OK; | |
| 9424 } | |
| 9425 | |
| 9426 /* | |
| 9427 * Common code for win_ins_lines() and win_del_lines(). | |
| 9428 * Returns OK or FAIL when the work has been done. | |
| 9429 * Returns MAYBE when not finished yet. | |
| 9430 */ | |
| 9431 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9432 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9433 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9434 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9435 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9436 int mayclear, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9437 int del) |
| 7 | 9438 { |
| 9439 int retval; | |
| 9440 | |
| 9441 if (!redrawing() || line_count <= 0) | |
| 9442 return FAIL; | |
| 9443 | |
| 9444 /* only a few lines left: redraw is faster */ | |
| 9445 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
|
9446 #ifdef FEAT_WINDOWS |
| 7 | 9447 && wp->w_width == Columns |
| 9448 #endif | |
| 9449 ) | |
| 9450 { | |
| 9451 screenclear(); /* will set wp->w_lines_valid to 0 */ | |
| 9452 return FAIL; | |
| 9453 } | |
| 9454 | |
| 9455 /* | |
| 9456 * Delete all remaining lines | |
| 9457 */ | |
| 9458 if (row + line_count >= wp->w_height) | |
| 9459 { | |
| 9460 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 9461 W_WINCOL(wp), (int)W_ENDCOL(wp), | |
| 9462 ' ', ' ', 0); | |
| 9463 return OK; | |
| 9464 } | |
| 9465 | |
| 9466 /* | |
| 9467 * when scrolling, the message on the command line should be cleared, | |
| 9468 * otherwise it will stay there forever. | |
| 9469 */ | |
| 9470 clear_cmdline = TRUE; | |
| 9471 | |
| 9472 /* | |
| 9473 * If the terminal can set a scroll region, use that. | |
| 9474 * Always do this in a vertically split window. This will redraw from | |
| 9475 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9476 * win_line(). | |
| 9477 * 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
|
9478 * 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
|
9479 * scroll-up . |
| 7 | 9480 */ |
| 9481 if (scroll_region | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9482 #ifdef FEAT_WINDOWS |
| 7 | 9483 || W_WIDTH(wp) != Columns |
| 9484 #endif | |
| 9485 ) | |
| 9486 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9487 #ifdef FEAT_WINDOWS |
| 7 | 9488 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9489 #endif | |
| 9490 scroll_region_set(wp, row); | |
| 9491 if (del) | |
| 9492 retval = screen_del_lines(W_WINROW(wp) + row, 0, line_count, | |
| 9493 wp->w_height - row, FALSE, wp); | |
| 9494 else | |
| 9495 retval = screen_ins_lines(W_WINROW(wp) + row, 0, line_count, | |
| 9496 wp->w_height - row, wp); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9497 #ifdef FEAT_WINDOWS |
| 7 | 9498 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9499 #endif | |
| 9500 scroll_region_reset(); | |
| 9501 return retval; | |
| 9502 } | |
| 9503 | |
| 9504 #ifdef FEAT_WINDOWS | |
| 9505 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9506 return FAIL; | |
| 9507 #endif | |
| 9508 | |
| 9509 return MAYBE; | |
| 9510 } | |
| 9511 | |
| 9512 /* | |
| 9513 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9514 */ | |
| 9515 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9516 win_rest_invalid(win_T *wp) |
| 7 | 9517 { |
| 9518 #ifdef FEAT_WINDOWS | |
| 9519 while (wp != NULL) | |
| 9520 #else | |
| 9521 if (wp != NULL) | |
| 9522 #endif | |
| 9523 { | |
| 9524 redraw_win_later(wp, NOT_VALID); | |
| 9525 #ifdef FEAT_WINDOWS | |
| 9526 wp->w_redr_status = TRUE; | |
| 9527 wp = wp->w_next; | |
| 9528 #endif | |
| 9529 } | |
| 9530 redraw_cmdline = TRUE; | |
| 9531 } | |
| 9532 | |
| 9533 /* | |
| 9534 * The rest of the routines in this file perform screen manipulations. The | |
| 9535 * given operation is performed physically on the screen. The corresponding | |
| 9536 * change is also made to the internal screen image. In this way, the editor | |
| 9537 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9538 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9539 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9540 * screen changes, and in the meantime, everything still works. | |
| 9541 */ | |
| 9542 | |
| 9543 /* | |
| 9544 * types for inserting or deleting lines | |
| 9545 */ | |
| 9546 #define USE_T_CAL 1 | |
| 9547 #define USE_T_CDL 2 | |
| 9548 #define USE_T_AL 3 | |
| 9549 #define USE_T_CE 4 | |
| 9550 #define USE_T_DL 5 | |
| 9551 #define USE_T_SR 6 | |
| 9552 #define USE_NL 7 | |
| 9553 #define USE_T_CD 8 | |
| 9554 #define USE_REDRAW 9 | |
| 9555 | |
| 9556 /* | |
| 9557 * insert lines on the screen and update ScreenLines[] | |
| 9558 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9559 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9560 * 'row' and 'end' are relative to the start of the region. | |
| 9561 * | |
| 9562 * return FAIL for failure, OK for success. | |
| 9563 */ | |
| 446 | 9564 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9565 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9566 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9567 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9568 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9569 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9570 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9571 { |
| 9572 int i; | |
| 9573 int j; | |
| 9574 unsigned temp; | |
| 9575 int cursor_row; | |
| 9576 int type; | |
| 9577 int result_empty; | |
| 9578 int can_ce = can_clear(T_CE); | |
| 9579 | |
| 9580 /* | |
| 9581 * FAIL if | |
| 9582 * - there is no valid screen | |
| 9583 * - the screen has to be redrawn completely | |
| 9584 * - the line count is less than one | |
| 9585 * - the line count is more than 'ttyscroll' | |
| 9586 */ | |
| 9587 if (!screen_valid(TRUE) || line_count <= 0 || line_count > p_ttyscroll) | |
| 9588 return FAIL; | |
| 9589 | |
| 9590 /* | |
| 9591 * There are seven ways to insert lines: | |
| 9592 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9593 * characters from ScreenLines[]. | |
| 9594 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9595 * the insert is just empty lines | |
| 9596 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9597 * present or line_count > 1. It looks better if we do all the inserts | |
| 9598 * at once. | |
| 9599 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9600 * insert is just empty lines and T_CE is not present or line_count > | |
| 9601 * 1. | |
| 9602 * 4. Use T_AL (insert line) if it exists. | |
| 9603 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9604 * just empty lines. | |
| 9605 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9606 * just empty lines. | |
| 9607 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9608 * the 'da' flag is not set or we have clear line capability. | |
| 9609 * 8. redraw the characters from ScreenLines[]. | |
| 9610 * | |
| 9611 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9612 * the scrollbar for the window. It does have insert line, use that if it | |
| 9613 * exists. | |
| 9614 */ | |
| 9615 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
|
9616 #ifdef FEAT_WINDOWS |
| 7 | 9617 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) |
| 9618 type = USE_REDRAW; | |
| 9619 else | |
| 9620 #endif | |
| 9621 if (can_clear(T_CD) && result_empty) | |
| 9622 type = USE_T_CD; | |
| 9623 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9624 type = USE_T_CAL; | |
| 9625 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9626 type = USE_T_CDL; | |
| 9627 else if (*T_AL != NUL) | |
| 9628 type = USE_T_AL; | |
| 9629 else if (can_ce && result_empty) | |
| 9630 type = USE_T_CE; | |
| 9631 else if (*T_DL != NUL && result_empty) | |
| 9632 type = USE_T_DL; | |
| 9633 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9634 type = USE_T_SR; | |
| 9635 else | |
| 9636 return FAIL; | |
| 9637 | |
| 9638 /* | |
| 9639 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9640 * care of t_db if necessary. | |
| 9641 */ | |
| 9642 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9643 type == USE_T_CE || type == USE_T_DL) | |
| 9644 return screen_del_lines(off, row, line_count, end, FALSE, wp); | |
| 9645 | |
| 9646 /* | |
| 9647 * If text is retained below the screen, first clear or delete as many | |
| 9648 * lines at the bottom of the window as are about to be inserted so that | |
| 9649 * the deleted lines won't later surface during a screen_del_lines. | |
| 9650 */ | |
| 9651 if (*T_DB) | |
| 9652 screen_del_lines(off, end - line_count, line_count, end, FALSE, wp); | |
| 9653 | |
| 9654 #ifdef FEAT_CLIPBOARD | |
| 9655 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9656 * or not the full width of the screen. */ | |
| 9657 if (off + row > 0 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9658 # ifdef FEAT_WINDOWS |
| 7 | 9659 || (wp != NULL && wp->w_width != Columns) |
| 9660 # endif | |
| 9661 ) | |
| 3674 | 9662 clip_clear_selection(&clip_star); |
| 7 | 9663 else |
| 9664 clip_scroll_selection(-line_count); | |
| 9665 #endif | |
| 9666 | |
| 9667 #ifdef FEAT_GUI | |
| 9668 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9669 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9670 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 9671 #endif |
| 9672 | |
| 9673 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 9674 cursor_row = row; | |
| 9675 else | |
| 9676 cursor_row = row + off; | |
| 9677 | |
| 9678 /* | |
| 9679 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9680 * Clear the inserted lines in ScreenLines[]. | |
| 9681 */ | |
| 9682 row += off; | |
| 9683 end += off; | |
| 9684 for (i = 0; i < line_count; ++i) | |
| 9685 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9686 #ifdef FEAT_WINDOWS |
| 7 | 9687 if (wp != NULL && wp->w_width != Columns) |
| 9688 { | |
| 9689 /* need to copy part of a line */ | |
| 9690 j = end - 1 - i; | |
| 9691 while ((j -= line_count) >= row) | |
| 9692 linecopy(j + line_count, j, wp); | |
| 9693 j += line_count; | |
| 9694 if (can_clear((char_u *)" ")) | |
| 9695 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9696 else | |
| 9697 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9698 LineWraps[j] = FALSE; | |
| 9699 } | |
| 9700 else | |
| 9701 #endif | |
| 9702 { | |
| 9703 j = end - 1 - i; | |
| 9704 temp = LineOffset[j]; | |
| 9705 while ((j -= line_count) >= row) | |
| 9706 { | |
| 9707 LineOffset[j + line_count] = LineOffset[j]; | |
| 9708 LineWraps[j + line_count] = LineWraps[j]; | |
| 9709 } | |
| 9710 LineOffset[j + line_count] = temp; | |
| 9711 LineWraps[j + line_count] = FALSE; | |
| 9712 if (can_clear((char_u *)" ")) | |
| 9713 lineclear(temp, (int)Columns); | |
| 9714 else | |
| 9715 lineinvalid(temp, (int)Columns); | |
| 9716 } | |
| 9717 } | |
| 9718 | |
| 9719 screen_stop_highlight(); | |
| 9720 windgoto(cursor_row, 0); | |
| 9721 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9722 #ifdef FEAT_WINDOWS |
| 7 | 9723 /* redraw the characters */ |
| 9724 if (type == USE_REDRAW) | |
| 9725 redraw_block(row, end, wp); | |
| 9726 else | |
| 9727 #endif | |
| 9728 if (type == USE_T_CAL) | |
| 9729 { | |
| 9730 term_append_lines(line_count); | |
| 9731 screen_start(); /* don't know where cursor is now */ | |
| 9732 } | |
| 9733 else | |
| 9734 { | |
| 9735 for (i = 0; i < line_count; i++) | |
| 9736 { | |
| 9737 if (type == USE_T_AL) | |
| 9738 { | |
| 9739 if (i && cursor_row != 0) | |
| 9740 windgoto(cursor_row, 0); | |
| 9741 out_str(T_AL); | |
| 9742 } | |
| 9743 else /* type == USE_T_SR */ | |
| 9744 out_str(T_SR); | |
| 9745 screen_start(); /* don't know where cursor is now */ | |
| 9746 } | |
| 9747 } | |
| 9748 | |
| 9749 /* | |
| 9750 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 9751 * have been scrolled down into the region. | |
| 9752 */ | |
| 9753 if (type == USE_T_SR && *T_DA) | |
| 9754 { | |
| 9755 for (i = 0; i < line_count; ++i) | |
| 9756 { | |
| 9757 windgoto(off + i, 0); | |
| 9758 out_str(T_CE); | |
| 9759 screen_start(); /* don't know where cursor is now */ | |
| 9760 } | |
| 9761 } | |
| 9762 | |
| 9763 #ifdef FEAT_GUI | |
| 9764 gui_can_update_cursor(); | |
| 9765 if (gui.in_use) | |
| 9766 out_flush(); /* always flush after a scroll */ | |
| 9767 #endif | |
| 9768 return OK; | |
| 9769 } | |
| 9770 | |
| 9771 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9772 * Delete lines on the screen and update ScreenLines[]. |
|
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9773 * "end" is the line after the scrolled part. Normally it is Rows. |
|
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9774 * When scrolling region used "off" is the offset from the top for the region. |
|
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9775 * "row" and "end" are relative to the start of the region. |
| 7 | 9776 * |
| 9777 * Return OK for success, FAIL if the lines are not deleted. | |
| 9778 */ | |
| 9779 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9780 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9781 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9782 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9783 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9784 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9785 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
|
9786 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 9787 { |
| 9788 int j; | |
| 9789 int i; | |
| 9790 unsigned temp; | |
| 9791 int cursor_row; | |
| 9792 int cursor_end; | |
| 9793 int result_empty; /* result is empty until end of region */ | |
| 9794 int can_delete; /* deleting line codes can be used */ | |
| 9795 int type; | |
| 9796 | |
| 9797 /* | |
| 9798 * FAIL if | |
| 9799 * - there is no valid screen | |
| 9800 * - the screen has to be redrawn completely | |
| 9801 * - the line count is less than one | |
| 9802 * - the line count is more than 'ttyscroll' | |
| 9803 */ | |
| 9804 if (!screen_valid(TRUE) || line_count <= 0 || | |
| 9805 (!force && line_count > p_ttyscroll)) | |
| 9806 return FAIL; | |
| 9807 | |
| 9808 /* | |
| 9809 * Check if the rest of the current region will become empty. | |
| 9810 */ | |
| 9811 result_empty = row + line_count >= end; | |
| 9812 | |
| 9813 /* | |
| 9814 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 9815 * available. | |
| 9816 */ | |
| 9817 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 9818 | |
| 9819 /* | |
| 9820 * There are six ways to delete lines: | |
| 9821 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9822 * characters from ScreenLines[]. | |
| 9823 * 1. Use T_CD if it exists and the result is empty. | |
| 9824 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 9825 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 9826 * none of the other ways work. | |
| 9827 * 4. Use T_CE (erase line) if the result is empty. | |
| 9828 * 5. Use T_DL (delete line) if it exists. | |
| 9829 * 6. redraw the characters from ScreenLines[]. | |
| 9830 */ | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9831 #ifdef FEAT_WINDOWS |
| 7 | 9832 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) |
| 9833 type = USE_REDRAW; | |
| 9834 else | |
| 9835 #endif | |
| 9836 if (can_clear(T_CD) && result_empty) | |
| 9837 type = USE_T_CD; | |
| 9838 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 9839 /* | |
| 9840 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 9841 * its internal termcap... this works okay for tests which test *T_DB != | |
| 9842 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 9843 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 9844 * the trick... | |
| 9845 * Anyway, this hack will hopefully go away with the next OS release. | |
| 9846 * (Olaf Seibert) | |
| 9847 */ | |
| 9848 else if (row == 0 && T_DB == empty_option | |
| 9849 && (line_count == 1 || *T_CDL == NUL)) | |
| 9850 #else | |
| 9851 else if (row == 0 && ( | |
| 9852 #ifndef AMIGA | |
| 9853 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 9854 * up, so use delete-line command */ | |
| 9855 line_count == 1 || | |
| 9856 #endif | |
| 9857 *T_CDL == NUL)) | |
| 9858 #endif | |
| 9859 type = USE_NL; | |
| 9860 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 9861 type = USE_T_CDL; | |
| 9862 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
|
9863 #ifdef FEAT_WINDOWS |
| 7 | 9864 && (wp == NULL || wp->w_width == Columns) |
| 9865 #endif | |
| 9866 ) | |
| 9867 type = USE_T_CE; | |
| 9868 else if (*T_DL != NUL && can_delete) | |
| 9869 type = USE_T_DL; | |
| 9870 else if (*T_CDL != NUL && can_delete) | |
| 9871 type = USE_T_CDL; | |
| 9872 else | |
| 9873 return FAIL; | |
| 9874 | |
| 9875 #ifdef FEAT_CLIPBOARD | |
| 9876 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 9877 * not the full width of the screen. */ | |
| 9878 if (off + row > 0 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9879 # ifdef FEAT_WINDOWS |
| 7 | 9880 || (wp != NULL && wp->w_width != Columns) |
| 9881 # endif | |
| 9882 ) | |
| 3674 | 9883 clip_clear_selection(&clip_star); |
| 7 | 9884 else |
| 9885 clip_scroll_selection(line_count); | |
| 9886 #endif | |
| 9887 | |
| 9888 #ifdef FEAT_GUI | |
| 9889 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9890 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9891 gui_dont_update_cursor(gui.cursor_row >= row + off |
|
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9892 && gui.cursor_row < end + off); |
| 7 | 9893 #endif |
| 9894 | |
| 9895 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 9896 { | |
| 9897 cursor_row = row; | |
| 9898 cursor_end = end; | |
| 9899 } | |
| 9900 else | |
| 9901 { | |
| 9902 cursor_row = row + off; | |
| 9903 cursor_end = end + off; | |
| 9904 } | |
| 9905 | |
| 9906 /* | |
| 9907 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 9908 * Clear the inserted lines in ScreenLines[]. | |
| 9909 */ | |
| 9910 row += off; | |
| 9911 end += off; | |
| 9912 for (i = 0; i < line_count; ++i) | |
| 9913 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9914 #ifdef FEAT_WINDOWS |
| 7 | 9915 if (wp != NULL && wp->w_width != Columns) |
| 9916 { | |
| 9917 /* need to copy part of a line */ | |
| 9918 j = row + i; | |
| 9919 while ((j += line_count) <= end - 1) | |
| 9920 linecopy(j - line_count, j, wp); | |
| 9921 j -= line_count; | |
| 9922 if (can_clear((char_u *)" ")) | |
| 9923 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9924 else | |
| 9925 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9926 LineWraps[j] = FALSE; | |
| 9927 } | |
| 9928 else | |
| 9929 #endif | |
| 9930 { | |
| 9931 /* whole width, moving the line pointers is faster */ | |
| 9932 j = row + i; | |
| 9933 temp = LineOffset[j]; | |
| 9934 while ((j += line_count) <= end - 1) | |
| 9935 { | |
| 9936 LineOffset[j - line_count] = LineOffset[j]; | |
| 9937 LineWraps[j - line_count] = LineWraps[j]; | |
| 9938 } | |
| 9939 LineOffset[j - line_count] = temp; | |
| 9940 LineWraps[j - line_count] = FALSE; | |
| 9941 if (can_clear((char_u *)" ")) | |
| 9942 lineclear(temp, (int)Columns); | |
| 9943 else | |
| 9944 lineinvalid(temp, (int)Columns); | |
| 9945 } | |
| 9946 } | |
| 9947 | |
| 9948 screen_stop_highlight(); | |
| 9949 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9950 #ifdef FEAT_WINDOWS |
| 7 | 9951 /* redraw the characters */ |
| 9952 if (type == USE_REDRAW) | |
| 9953 redraw_block(row, end, wp); | |
| 9954 else | |
| 9955 #endif | |
| 9956 if (type == USE_T_CD) /* delete the lines */ | |
| 9957 { | |
| 9958 windgoto(cursor_row, 0); | |
| 9959 out_str(T_CD); | |
| 9960 screen_start(); /* don't know where cursor is now */ | |
| 9961 } | |
| 9962 else if (type == USE_T_CDL) | |
| 9963 { | |
| 9964 windgoto(cursor_row, 0); | |
| 9965 term_delete_lines(line_count); | |
| 9966 screen_start(); /* don't know where cursor is now */ | |
| 9967 } | |
| 9968 /* | |
| 9969 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 9970 * the whole screen (scroll region) up by outputting newlines on the | |
| 9971 * last line. | |
| 9972 */ | |
| 9973 else if (type == USE_NL) | |
| 9974 { | |
| 9975 windgoto(cursor_end - 1, 0); | |
| 9976 for (i = line_count; --i >= 0; ) | |
| 9977 out_char('\n'); /* cursor will remain on same line */ | |
| 9978 } | |
| 9979 else | |
| 9980 { | |
| 9981 for (i = line_count; --i >= 0; ) | |
| 9982 { | |
| 9983 if (type == USE_T_DL) | |
| 9984 { | |
| 9985 windgoto(cursor_row, 0); | |
| 9986 out_str(T_DL); /* delete a line */ | |
| 9987 } | |
| 9988 else /* type == USE_T_CE */ | |
| 9989 { | |
| 9990 windgoto(cursor_row + i, 0); | |
| 9991 out_str(T_CE); /* erase a line */ | |
| 9992 } | |
| 9993 screen_start(); /* don't know where cursor is now */ | |
| 9994 } | |
| 9995 } | |
| 9996 | |
| 9997 /* | |
| 9998 * If the 'db' flag is set, we need to clear the lines that have been | |
| 9999 * scrolled up at the bottom of the region. | |
| 10000 */ | |
| 10001 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10002 { | |
| 10003 for (i = line_count; i > 0; --i) | |
| 10004 { | |
| 10005 windgoto(cursor_end - i, 0); | |
| 10006 out_str(T_CE); /* erase a line */ | |
| 10007 screen_start(); /* don't know where cursor is now */ | |
| 10008 } | |
| 10009 } | |
| 10010 | |
| 10011 #ifdef FEAT_GUI | |
| 10012 gui_can_update_cursor(); | |
| 10013 if (gui.in_use) | |
| 10014 out_flush(); /* always flush after a scroll */ | |
| 10015 #endif | |
| 10016 | |
| 10017 return OK; | |
| 10018 } | |
| 10019 | |
| 10020 /* | |
| 10021 * show the current mode and ruler | |
| 10022 * | |
| 10023 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10024 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10025 * cleared only if a mode is shown. | |
| 10026 * Return the length of the message (0 if no message). | |
| 10027 */ | |
| 10028 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10029 showmode(void) |
| 7 | 10030 { |
| 10031 int need_clear; | |
| 10032 int length = 0; | |
| 10033 int do_mode; | |
| 10034 int attr; | |
| 10035 int nwr_save; | |
| 10036 #ifdef FEAT_INS_EXPAND | |
| 10037 int sub_attr; | |
| 10038 #endif | |
| 10039 | |
| 642 | 10040 do_mode = ((p_smd && msg_silent == 0) |
| 10041 && ((State & INSERT) | |
| 10042 || restart_edit | |
| 5735 | 10043 || VIsual_active)); |
| 7 | 10044 if (do_mode || Recording) |
| 10045 { | |
| 10046 /* | |
| 10047 * Don't show mode right now, when not redrawing or inside a mapping. | |
| 10048 * Call char_avail() only when we are going to show something, because | |
| 10049 * it takes a bit of time. | |
| 10050 */ | |
| 10051 if (!redrawing() || (char_avail() && !KeyTyped) || msg_silent != 0) | |
| 10052 { | |
| 10053 redraw_cmdline = TRUE; /* show mode later */ | |
| 10054 return 0; | |
| 10055 } | |
| 10056 | |
| 10057 nwr_save = need_wait_return; | |
| 10058 | |
| 10059 /* wait a bit before overwriting an important message */ | |
| 10060 check_for_delay(FALSE); | |
| 10061 | |
| 10062 /* if the cmdline is more than one line high, erase top lines */ | |
| 10063 need_clear = clear_cmdline; | |
| 10064 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10065 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10066 | |
| 10067 /* Position on the last line in the window, column 0 */ | |
| 10068 msg_pos_mode(); | |
| 10069 cursor_off(); | |
| 10070 attr = hl_attr(HLF_CM); /* Highlight mode */ | |
| 10071 if (do_mode) | |
| 10072 { | |
| 10073 MSG_PUTS_ATTR("--", attr); | |
| 10074 #if defined(FEAT_XIM) | |
| 2520 | 10075 if ( |
| 10076 # ifdef FEAT_GUI_GTK | |
| 10077 preedit_get_status() | |
| 1668 | 10078 # else |
| 10079 im_get_status() | |
| 2520 | 10080 # endif |
| 1668 | 10081 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10082 # ifdef FEAT_GUI_GTK /* most of the time, it's not XIM being used */ |
| 7 | 10083 MSG_PUTS_ATTR(" IM", attr); |
| 10084 # else | |
| 10085 MSG_PUTS_ATTR(" XIM", attr); | |
| 10086 # endif | |
| 10087 #endif | |
| 10088 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10089 if (gui.in_use) | |
| 10090 { | |
| 10091 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10092 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10093 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10094 if (enc_utf8) |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10095 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
|
10096 else |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10097 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
|
10098 } |
| 7 | 10099 } |
| 10100 #endif | |
| 10101 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10102 /* CTRL-X in Insert mode */ |
| 10103 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10104 { |
| 10105 /* These messages can get long, avoid a wrap in a narrow | |
| 10106 * window. Prefer showing edit_submode_extra. */ | |
| 10107 length = (Rows - msg_row) * Columns - 3; | |
| 10108 if (edit_submode_extra != NULL) | |
| 10109 length -= vim_strsize(edit_submode_extra); | |
| 10110 if (length > 0) | |
| 10111 { | |
| 10112 if (edit_submode_pre != NULL) | |
| 10113 length -= vim_strsize(edit_submode_pre); | |
| 10114 if (length - vim_strsize(edit_submode) > 0) | |
| 10115 { | |
| 10116 if (edit_submode_pre != NULL) | |
| 10117 msg_puts_attr(edit_submode_pre, attr); | |
| 10118 msg_puts_attr(edit_submode, attr); | |
| 10119 } | |
| 10120 if (edit_submode_extra != NULL) | |
| 10121 { | |
| 10122 MSG_PUTS_ATTR(" ", attr); /* add a space in between */ | |
| 10123 if ((int)edit_submode_highl < (int)HLF_COUNT) | |
| 10124 sub_attr = hl_attr(edit_submode_highl); | |
| 10125 else | |
| 10126 sub_attr = attr; | |
| 10127 msg_puts_attr(edit_submode_extra, sub_attr); | |
| 10128 } | |
| 10129 } | |
| 10130 length = 0; | |
| 10131 } | |
| 10132 else | |
| 10133 #endif | |
| 10134 { | |
| 10135 #ifdef FEAT_VREPLACE | |
| 10136 if (State & VREPLACE_FLAG) | |
| 10137 MSG_PUTS_ATTR(_(" VREPLACE"), attr); | |
| 10138 else | |
| 10139 #endif | |
| 10140 if (State & REPLACE_FLAG) | |
| 10141 MSG_PUTS_ATTR(_(" REPLACE"), attr); | |
| 10142 else if (State & INSERT) | |
| 10143 { | |
| 10144 #ifdef FEAT_RIGHTLEFT | |
| 10145 if (p_ri) | |
| 10146 MSG_PUTS_ATTR(_(" REVERSE"), attr); | |
| 10147 #endif | |
| 10148 MSG_PUTS_ATTR(_(" INSERT"), attr); | |
| 10149 } | |
| 10150 else if (restart_edit == 'I') | |
| 10151 MSG_PUTS_ATTR(_(" (insert)"), attr); | |
| 10152 else if (restart_edit == 'R') | |
| 10153 MSG_PUTS_ATTR(_(" (replace)"), attr); | |
| 10154 else if (restart_edit == 'V') | |
| 10155 MSG_PUTS_ATTR(_(" (vreplace)"), attr); | |
| 10156 #ifdef FEAT_RIGHTLEFT | |
| 10157 if (p_hkmap) | |
| 10158 MSG_PUTS_ATTR(_(" Hebrew"), attr); | |
| 10159 # ifdef FEAT_FKMAP | |
| 10160 if (p_fkmap) | |
| 10161 MSG_PUTS_ATTR(farsi_text_5, attr); | |
| 10162 # endif | |
| 10163 #endif | |
| 10164 #ifdef FEAT_KEYMAP | |
| 10165 if (State & LANGMAP) | |
| 10166 { | |
| 10167 # ifdef FEAT_ARABIC | |
| 10168 if (curwin->w_p_arab) | |
| 10169 MSG_PUTS_ATTR(_(" Arabic"), attr); | |
| 10170 else | |
| 10171 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10172 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
|
10173 NameBuff, MAXPATHL)) |
|
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10174 MSG_PUTS_ATTR(NameBuff, attr); |
| 7 | 10175 } |
| 10176 #endif | |
| 10177 if ((State & INSERT) && p_paste) | |
| 10178 MSG_PUTS_ATTR(_(" (paste)"), attr); | |
| 10179 | |
| 10180 if (VIsual_active) | |
| 10181 { | |
| 10182 char *p; | |
| 10183 | |
| 10184 /* Don't concatenate separate words to avoid translation | |
| 10185 * problems. */ | |
| 10186 switch ((VIsual_select ? 4 : 0) | |
| 10187 + (VIsual_mode == Ctrl_V) * 2 | |
| 10188 + (VIsual_mode == 'V')) | |
| 10189 { | |
| 10190 case 0: p = N_(" VISUAL"); break; | |
| 10191 case 1: p = N_(" VISUAL LINE"); break; | |
| 10192 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10193 case 4: p = N_(" SELECT"); break; | |
| 10194 case 5: p = N_(" SELECT LINE"); break; | |
| 10195 default: p = N_(" SELECT BLOCK"); break; | |
| 10196 } | |
| 10197 MSG_PUTS_ATTR(_(p), attr); | |
| 10198 } | |
| 10199 MSG_PUTS_ATTR(" --", attr); | |
| 10200 } | |
| 644 | 10201 |
| 7 | 10202 need_clear = TRUE; |
| 10203 } | |
| 10204 if (Recording | |
| 10205 #ifdef FEAT_INS_EXPAND | |
| 10206 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10207 #endif | |
| 10208 ) | |
| 10209 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10210 recording_mode(attr); |
| 7 | 10211 need_clear = TRUE; |
| 10212 } | |
| 644 | 10213 |
| 10214 mode_displayed = TRUE; | |
| 7 | 10215 if (need_clear || clear_cmdline) |
| 10216 msg_clr_eos(); | |
| 10217 msg_didout = FALSE; /* overwrite this message */ | |
| 10218 length = msg_col; | |
| 10219 msg_col = 0; | |
| 10220 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10221 } | |
| 10222 else if (clear_cmdline && msg_silent == 0) | |
| 10223 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10224 msg_clr_cmdline(); | |
| 10225 | |
| 10226 #ifdef FEAT_CMDL_INFO | |
| 10227 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10228 if (VIsual_active) | |
| 10229 clear_showcmd(); | |
| 10230 | |
| 10231 /* If the last window has no status line, the ruler is after the mode | |
| 10232 * message and must be redrawn */ | |
| 10233 if (redrawing() | |
| 10234 # ifdef FEAT_WINDOWS | |
| 10235 && lastwin->w_status_height == 0 | |
| 10236 # endif | |
| 10237 ) | |
| 10238 win_redr_ruler(lastwin, TRUE); | |
| 10239 #endif | |
| 10240 redraw_cmdline = FALSE; | |
| 10241 clear_cmdline = FALSE; | |
| 10242 | |
| 10243 return length; | |
| 10244 } | |
| 10245 | |
| 10246 /* | |
| 10247 * Position for a mode message. | |
| 10248 */ | |
| 10249 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10250 msg_pos_mode(void) |
| 7 | 10251 { |
| 10252 msg_col = 0; | |
| 10253 msg_row = Rows - 1; | |
| 10254 } | |
| 10255 | |
| 10256 /* | |
| 10257 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10258 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10259 * Caller should check "mode_displayed". |
| 7 | 10260 */ |
| 10261 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10262 unshowmode(int force) |
| 7 | 10263 { |
| 10264 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10265 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10266 */ |
| 10267 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10268 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10269 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10270 clearmode(); |
|
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 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10273 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10274 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10275 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10276 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10277 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10278 { |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10279 msg_pos_mode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10280 if (Recording) |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10281 recording_mode(hl_attr(HLF_CM)); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10282 msg_clr_eos(); |
| 7 | 10283 } |
| 10284 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10285 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10286 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10287 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10288 MSG_PUTS_ATTR(_("recording"), attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10289 if (!shortmess(SHM_RECORDING)) |
|
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 char_u s[4]; |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10292 sprintf((char *)s, " @%c", Recording); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10293 MSG_PUTS_ATTR(s, attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10294 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10295 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10296 |
| 667 | 10297 #if defined(FEAT_WINDOWS) |
| 10298 /* | |
| 10299 * Draw the tab pages line at the top of the Vim window. | |
| 10300 */ | |
| 10301 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10302 draw_tabline(void) |
| 667 | 10303 { |
| 10304 int tabcount = 0; | |
| 10305 tabpage_T *tp; | |
| 10306 int tabwidth; | |
| 10307 int col = 0; | |
| 673 | 10308 int scol = 0; |
| 667 | 10309 int attr; |
| 10310 win_T *wp; | |
| 671 | 10311 win_T *cwp; |
| 10312 int wincount; | |
| 10313 int modified; | |
| 667 | 10314 int c; |
| 10315 int len; | |
| 10316 int attr_sel = hl_attr(HLF_TPS); | |
| 10317 int attr_nosel = hl_attr(HLF_TP); | |
| 10318 int attr_fill = hl_attr(HLF_TPF); | |
| 673 | 10319 char_u *p; |
| 677 | 10320 int room; |
| 10321 int use_sep_chars = (t_colors < 8 | |
| 10322 #ifdef FEAT_GUI | |
| 10323 && !gui.in_use | |
| 10324 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10325 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10326 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10327 #endif |
| 677 | 10328 ); |
| 673 | 10329 |
| 10330 redraw_tabline = FALSE; | |
| 667 | 10331 |
| 685 | 10332 #ifdef FEAT_GUI_TABLINE |
| 798 | 10333 /* Take care of a GUI tabline. */ |
| 685 | 10334 if (gui_use_tabline()) |
| 10335 { | |
| 10336 gui_update_tabline(); | |
| 10337 return; | |
| 10338 } | |
| 10339 #endif | |
| 10340 | |
| 10341 if (tabline_height() < 1) | |
| 667 | 10342 return; |
| 10343 | |
| 677 | 10344 #if defined(FEAT_STL_OPT) |
| 681 | 10345 |
| 10346 /* Init TabPageIdxs[] to zero: Clicking outside of tabs has no effect. */ | |
| 10347 for (scol = 0; scol < Columns; ++scol) | |
| 10348 TabPageIdxs[scol] = 0; | |
| 10349 | |
| 677 | 10350 /* Use the 'tabline' option if it's set. */ |
| 10351 if (*p_tal != NUL) | |
| 10352 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10353 int saved_did_emsg = did_emsg; |
| 680 | 10354 |
| 10355 /* Check for an error. If there is one we would loop in redrawing the | |
| 10356 * 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
|
10357 did_emsg = FALSE; |
| 677 | 10358 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10359 if (did_emsg) |
| 680 | 10360 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10361 (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
|
10362 did_emsg |= saved_did_emsg; |
| 680 | 10363 } |
| 10364 else | |
| 10365 #endif | |
| 10366 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10367 FOR_ALL_TABPAGES(tp) |
| 680 | 10368 ++tabcount; |
| 10369 | |
| 10370 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10371 if (tabwidth < 6) | |
| 10372 tabwidth = 6; | |
| 10373 | |
| 10374 attr = attr_nosel; | |
| 10375 tabcount = 0; | |
| 681 | 10376 scol = 0; |
| 699 | 10377 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10378 tp = tp->tp_next) | |
| 680 | 10379 { |
| 10380 scol = col; | |
| 10381 | |
| 10382 if (tp->tp_topframe == topframe) | |
| 10383 attr = attr_sel; | |
| 10384 if (use_sep_chars && col > 0) | |
| 10385 screen_putchar('|', 0, col++, attr); | |
| 10386 | |
| 10387 if (tp->tp_topframe != topframe) | |
| 10388 attr = attr_nosel; | |
| 10389 | |
| 10390 screen_putchar(' ', 0, col++, attr); | |
| 10391 | |
| 10392 if (tp == curtab) | |
| 10393 { | |
| 10394 cwp = curwin; | |
| 10395 wp = firstwin; | |
| 10396 } | |
| 10397 else | |
| 10398 { | |
| 10399 cwp = tp->tp_curwin; | |
| 10400 wp = tp->tp_firstwin; | |
| 10401 } | |
| 10402 | |
| 10403 modified = FALSE; | |
| 10404 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10405 if (bufIsChanged(wp->w_buffer)) | |
| 10406 modified = TRUE; | |
| 10407 if (modified || wincount > 1) | |
| 10408 { | |
| 10409 if (wincount > 1) | |
| 10410 { | |
| 10411 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10412 len = (int)STRLEN(NameBuff); |
| 699 | 10413 if (col + len >= Columns - 3) |
| 10414 break; | |
| 680 | 10415 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10416 #if defined(FEAT_SYN_HL) |
| 6106 | 10417 hl_combine_attr(attr, hl_attr(HLF_T)) |
| 677 | 10418 #else |
| 6106 | 10419 attr |
| 680 | 10420 #endif |
| 10421 ); | |
| 10422 col += len; | |
| 10423 } | |
| 10424 if (modified) | |
| 10425 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10426 screen_putchar(' ', 0, col++, attr); | |
| 10427 } | |
| 10428 | |
| 10429 room = scol - col + tabwidth - 1; | |
| 10430 if (room > 0) | |
| 10431 { | |
| 685 | 10432 /* Get buffer name in NameBuff[] */ |
| 10433 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10434 shorten_dir(NameBuff); |
| 680 | 10435 len = vim_strsize(NameBuff); |
| 10436 p = NameBuff; | |
| 677 | 10437 #ifdef FEAT_MBYTE |
| 680 | 10438 if (has_mbyte) |
| 10439 while (len > room) | |
| 10440 { | |
| 10441 len -= ptr2cells(p); | |
| 10442 mb_ptr_adv(p); | |
| 10443 } | |
| 10444 else | |
| 10445 #endif | |
| 10446 if (len > room) | |
| 677 | 10447 { |
| 680 | 10448 p += len - room; |
| 10449 len = room; | |
| 677 | 10450 } |
| 699 | 10451 if (len > Columns - col - 1) |
| 10452 len = Columns - col - 1; | |
| 680 | 10453 |
| 835 | 10454 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10455 col += len; |
| 10456 } | |
| 10457 screen_putchar(' ', 0, col++, attr); | |
| 10458 | |
| 10459 /* Store the tab page number in TabPageIdxs[], so that | |
| 10460 * jump_to_mouse() knows where each one is. */ | |
| 10461 ++tabcount; | |
| 10462 while (scol < col) | |
| 10463 TabPageIdxs[scol++] = tabcount; | |
| 10464 } | |
| 10465 | |
| 10466 if (use_sep_chars) | |
| 10467 c = '_'; | |
| 10468 else | |
| 10469 c = ' '; | |
| 10470 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10471 |
| 10472 /* Put an "X" for closing the current tab if there are several. */ | |
| 10473 if (first_tabpage->tp_next != NULL) | |
| 10474 { | |
| 10475 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10476 TabPageIdxs[Columns - 1] = -999; | |
| 10477 } | |
| 10478 } | |
| 834 | 10479 |
| 10480 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10481 * set. */ | |
| 10482 redraw_tabline = FALSE; | |
| 667 | 10483 } |
| 685 | 10484 |
| 10485 /* | |
| 10486 * Get buffer name for "buf" into NameBuff[]. | |
| 10487 * Takes care of special buffer names and translates special characters. | |
| 10488 */ | |
| 10489 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10490 get_trans_bufname(buf_T *buf) |
| 685 | 10491 { |
| 10492 if (buf_spname(buf) != NULL) | |
| 3839 | 10493 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10494 else |
| 10495 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10496 trans_characters(NameBuff, MAXPATHL); | |
| 10497 } | |
| 667 | 10498 #endif |
| 10499 | |
| 7 | 10500 #if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) |
| 10501 /* | |
| 10502 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10503 */ | |
| 10504 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10505 fillchar_status(int *attr, int is_curwin) |
| 7 | 10506 { |
| 10507 int fill; | |
| 10508 if (is_curwin) | |
| 10509 { | |
| 10510 *attr = hl_attr(HLF_S); | |
| 10511 fill = fill_stl; | |
| 10512 } | |
| 10513 else | |
| 10514 { | |
| 10515 *attr = hl_attr(HLF_SNC); | |
| 10516 fill = fill_stlnc; | |
| 10517 } | |
| 10518 /* Use fill when there is highlighting, and highlighting of current | |
| 10519 * window differs, or the fillchars differ, or this is not the | |
| 10520 * current window */ | |
| 10521 if (*attr != 0 && ((hl_attr(HLF_S) != hl_attr(HLF_SNC) | |
| 10522 || !is_curwin || firstwin == lastwin) | |
| 10523 || (fill_stl != fill_stlnc))) | |
| 10524 return fill; | |
| 10525 if (is_curwin) | |
| 10526 return '^'; | |
| 10527 return '='; | |
| 10528 } | |
| 10529 #endif | |
| 10530 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10531 #ifdef FEAT_WINDOWS |
| 7 | 10532 /* |
| 10533 * Get the character to use in a separator between vertically split windows. | |
| 10534 * Get its attributes in "*attr". | |
| 10535 */ | |
| 10536 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10537 fillchar_vsep(int *attr) |
| 7 | 10538 { |
| 10539 *attr = hl_attr(HLF_C); | |
| 10540 if (*attr == 0 && fill_vert == ' ') | |
| 10541 return '|'; | |
| 10542 else | |
| 10543 return fill_vert; | |
| 10544 } | |
| 10545 #endif | |
| 10546 | |
| 10547 /* | |
| 10548 * Return TRUE if redrawing should currently be done. | |
| 10549 */ | |
| 10550 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10551 redrawing(void) |
| 7 | 10552 { |
| 10553 return (!RedrawingDisabled | |
| 10554 && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); | |
| 10555 } | |
| 10556 | |
| 10557 /* | |
| 10558 * Return TRUE if printing messages should currently be done. | |
| 10559 */ | |
| 10560 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10561 messaging(void) |
| 7 | 10562 { |
| 10563 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10564 } | |
| 10565 | |
| 10566 /* | |
| 10567 * Show current status info in ruler and various other places | |
| 10568 * If always is FALSE, only show ruler if position has changed. | |
| 10569 */ | |
| 10570 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10571 showruler(int always) |
| 7 | 10572 { |
| 10573 if (!always && !redrawing()) | |
| 10574 return; | |
| 574 | 10575 #ifdef FEAT_INS_EXPAND |
| 10576 if (pum_visible()) | |
| 10577 { | |
| 639 | 10578 # ifdef FEAT_WINDOWS |
| 574 | 10579 /* Don't redraw right now, do it later. */ |
| 10580 curwin->w_redr_status = TRUE; | |
| 639 | 10581 # endif |
| 574 | 10582 return; |
| 10583 } | |
| 10584 #endif | |
| 7 | 10585 #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS) |
| 40 | 10586 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 680 | 10587 { |
| 1983 | 10588 redraw_custom_statusline(curwin); |
| 680 | 10589 } |
| 7 | 10590 else |
| 10591 #endif | |
| 10592 #ifdef FEAT_CMDL_INFO | |
| 10593 win_redr_ruler(curwin, always); | |
| 10594 #endif | |
| 10595 | |
| 10596 #ifdef FEAT_TITLE | |
| 10597 if (need_maketitle | |
| 10598 # ifdef FEAT_STL_OPT | |
| 10599 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10600 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10601 # endif | |
| 10602 ) | |
| 10603 maketitle(); | |
| 10604 #endif | |
| 1588 | 10605 #ifdef FEAT_WINDOWS |
| 10606 /* Redraw the tab pages line if needed. */ | |
| 10607 if (redraw_tabline) | |
| 10608 draw_tabline(); | |
| 10609 #endif | |
| 7 | 10610 } |
| 10611 | |
| 10612 #ifdef FEAT_CMDL_INFO | |
| 10613 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10614 win_redr_ruler(win_T *wp, int always) |
| 7 | 10615 { |
| 1869 | 10616 #define RULER_BUF_LEN 70 |
| 10617 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10618 int row; |
| 10619 int fillchar; | |
| 10620 int attr; | |
| 10621 int empty_line = FALSE; | |
| 10622 colnr_T virtcol; | |
| 10623 int i; | |
| 1869 | 10624 size_t len; |
| 7 | 10625 int o; |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10626 #ifdef FEAT_WINDOWS |
| 7 | 10627 int this_ru_col; |
| 10628 int off = 0; | |
| 10629 int width = Columns; | |
| 10630 # define WITH_OFF(x) x | |
| 10631 # define WITH_WIDTH(x) x | |
| 10632 #else | |
| 10633 # define WITH_OFF(x) 0 | |
| 10634 # define WITH_WIDTH(x) Columns | |
| 10635 # define this_ru_col ru_col | |
| 10636 #endif | |
| 10637 | |
| 10638 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10639 if (!p_ru) | |
| 10640 return; | |
| 10641 | |
| 10642 /* | |
| 10643 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10644 * after deleting lines, before cursor.lnum is corrected. | |
| 10645 */ | |
| 10646 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10647 return; | |
| 10648 | |
| 10649 #ifdef FEAT_INS_EXPAND | |
| 10650 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 10651 * the (long) mode message. */ | |
| 10652 # ifdef FEAT_WINDOWS | |
| 10653 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 10654 # endif | |
| 10655 if (edit_submode != NULL) | |
| 10656 return; | |
| 540 | 10657 /* Don't draw the ruler when the popup menu is visible, it may overlap. */ |
| 10658 if (pum_visible()) | |
| 10659 return; | |
| 7 | 10660 #endif |
| 10661 | |
| 10662 #ifdef FEAT_STL_OPT | |
| 10663 if (*p_ruf) | |
| 10664 { | |
| 680 | 10665 int save_called_emsg = called_emsg; |
| 10666 | |
| 10667 called_emsg = FALSE; | |
| 7 | 10668 win_redr_custom(wp, TRUE); |
| 680 | 10669 if (called_emsg) |
| 10670 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 10671 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 10672 called_emsg |= save_called_emsg; |
| 7 | 10673 return; |
| 10674 } | |
| 10675 #endif | |
| 10676 | |
| 10677 /* | |
| 10678 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 10679 */ | |
| 10680 if (!(State & INSERT) | |
| 10681 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 10682 empty_line = TRUE; | |
| 10683 | |
| 10684 /* | |
| 10685 * Only draw the ruler when something changed. | |
| 10686 */ | |
| 10687 validate_virtcol_win(wp); | |
| 10688 if ( redraw_cmdline | |
| 10689 || always | |
| 10690 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 10691 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 10692 || wp->w_virtcol != wp->w_ru_virtcol | |
| 10693 #ifdef FEAT_VIRTUALEDIT | |
| 10694 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 10695 #endif | |
| 10696 || wp->w_topline != wp->w_ru_topline | |
| 10697 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 10698 #ifdef FEAT_DIFF | |
| 10699 || wp->w_topfill != wp->w_ru_topfill | |
| 10700 #endif | |
| 10701 || empty_line != wp->w_ru_empty) | |
| 10702 { | |
| 10703 cursor_off(); | |
| 10704 #ifdef FEAT_WINDOWS | |
| 10705 if (wp->w_status_height) | |
| 10706 { | |
| 10707 row = W_WINROW(wp) + wp->w_height; | |
| 10708 fillchar = fillchar_status(&attr, wp == curwin); | |
| 10709 off = W_WINCOL(wp); | |
| 10710 width = W_WIDTH(wp); | |
| 10711 } | |
| 10712 else | |
| 10713 #endif | |
| 10714 { | |
| 10715 row = Rows - 1; | |
| 10716 fillchar = ' '; | |
| 10717 attr = 0; | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10718 #ifdef FEAT_WINDOWS |
| 7 | 10719 width = Columns; |
| 10720 off = 0; | |
| 10721 #endif | |
| 10722 } | |
| 10723 | |
| 10724 /* In list mode virtcol needs to be recomputed */ | |
| 10725 virtcol = wp->w_virtcol; | |
| 10726 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 10727 { | |
| 10728 wp->w_p_list = FALSE; | |
| 10729 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 10730 wp->w_p_list = TRUE; | |
| 10731 } | |
| 10732 | |
| 10733 /* | |
| 10734 * Some sprintfs return the length, some return a pointer. | |
| 10735 * To avoid portability problems we use strlen() here. | |
| 10736 */ | |
| 1869 | 10737 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 10738 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 10739 ? 0L | |
| 10740 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 10741 len = STRLEN(buffer); |
| 10742 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 10743 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 10744 (int)virtcol + 1); | |
| 10745 | |
| 10746 /* | |
| 10747 * Add a "50%" if there is room for it. | |
| 10748 * On the last line, don't print in the last column (scrolls the | |
| 10749 * screen up on some terminals). | |
| 10750 */ | |
| 10751 i = (int)STRLEN(buffer); | |
| 1869 | 10752 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 10753 o = i + vim_strsize(buffer + i + 1); |
| 10754 #ifdef FEAT_WINDOWS | |
| 10755 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 10756 #endif | |
| 10757 ++o; | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10758 #ifdef FEAT_WINDOWS |
| 7 | 10759 this_ru_col = ru_col - (Columns - width); |
| 10760 if (this_ru_col < 0) | |
| 10761 this_ru_col = 0; | |
| 10762 #endif | |
| 10763 /* Never use more than half the window/screen width, leave the other | |
| 10764 * half for the filename. */ | |
| 10765 if (this_ru_col < (WITH_WIDTH(width) + 1) / 2) | |
| 10766 this_ru_col = (WITH_WIDTH(width) + 1) / 2; | |
| 10767 if (this_ru_col + o < WITH_WIDTH(width)) | |
| 10768 { | |
| 6466 | 10769 /* need at least 3 chars left for get_rel_pos() + NUL */ |
| 10770 while (this_ru_col + o < WITH_WIDTH(width) && RULER_BUF_LEN > i + 4) | |
| 7 | 10771 { |
| 10772 #ifdef FEAT_MBYTE | |
| 10773 if (has_mbyte) | |
| 10774 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 10775 else | |
| 10776 #endif | |
| 10777 buffer[i++] = fillchar; | |
| 10778 ++o; | |
| 10779 } | |
| 1869 | 10780 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 10781 } |
| 10782 /* Truncate at window boundary. */ | |
| 10783 #ifdef FEAT_MBYTE | |
| 10784 if (has_mbyte) | |
| 10785 { | |
| 10786 o = 0; | |
| 474 | 10787 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 10788 { |
| 10789 o += (*mb_ptr2cells)(buffer + i); | |
| 10790 if (this_ru_col + o > WITH_WIDTH(width)) | |
| 10791 { | |
| 10792 buffer[i] = NUL; | |
| 10793 break; | |
| 10794 } | |
| 10795 } | |
| 10796 } | |
| 10797 else | |
| 10798 #endif | |
| 10799 if (this_ru_col + (int)STRLEN(buffer) > WITH_WIDTH(width)) | |
| 10800 buffer[WITH_WIDTH(width) - this_ru_col] = NUL; | |
| 10801 | |
| 10802 screen_puts(buffer, row, this_ru_col + WITH_OFF(off), attr); | |
| 10803 i = redraw_cmdline; | |
| 10804 screen_fill(row, row + 1, | |
| 10805 this_ru_col + WITH_OFF(off) + (int)STRLEN(buffer), | |
| 10806 (int)(WITH_OFF(off) + WITH_WIDTH(width)), | |
| 10807 fillchar, fillchar, attr); | |
| 10808 /* don't redraw the cmdline because of showing the ruler */ | |
| 10809 redraw_cmdline = i; | |
| 10810 wp->w_ru_cursor = wp->w_cursor; | |
| 10811 wp->w_ru_virtcol = wp->w_virtcol; | |
| 10812 wp->w_ru_empty = empty_line; | |
| 10813 wp->w_ru_topline = wp->w_topline; | |
| 10814 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 10815 #ifdef FEAT_DIFF | |
| 10816 wp->w_ru_topfill = wp->w_topfill; | |
| 10817 #endif | |
| 10818 } | |
| 10819 } | |
| 10820 #endif | |
| 13 | 10821 |
| 10822 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 10823 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
10824 * 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
|
10825 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 10826 * Otherwise it depends on 'numberwidth' and the line count. |
| 10827 */ | |
| 10828 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10829 number_width(win_T *wp) |
| 13 | 10830 { |
| 10831 int n; | |
| 10832 linenr_T lnum; | |
| 10833 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10834 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
|
10835 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10836 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10837 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10838 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10839 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
|
10840 |
| 6679 | 10841 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 10842 return wp->w_nrwidth_width; |
| 10843 wp->w_nrwidth_line_count = lnum; | |
| 10844 | |
| 10845 n = 0; | |
| 10846 do | |
| 10847 { | |
| 856 | 10848 lnum /= 10; |
| 10849 ++n; | |
| 13 | 10850 } while (lnum > 0); |
| 10851 | |
| 10852 /* 'numberwidth' gives the minimal width plus one */ | |
| 10853 if (n < wp->w_p_nuw - 1) | |
| 10854 n = wp->w_p_nuw - 1; | |
| 10855 | |
| 10856 wp->w_nrwidth_width = n; | |
| 6679 | 10857 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 10858 return n; |
| 10859 } | |
| 10860 #endif | |
| 3986 | 10861 |
| 10862 /* | |
| 10863 * Return the current cursor column. This is the actual position on the | |
| 10864 * screen. First column is 0. | |
| 10865 */ | |
| 10866 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10867 screen_screencol(void) |
| 3986 | 10868 { |
| 10869 return screen_cur_col; | |
| 10870 } | |
| 10871 | |
| 10872 /* | |
| 10873 * Return the current cursor row. This is the actual position on the screen. | |
| 10874 * First row is 0. | |
| 10875 */ | |
| 10876 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10877 screen_screenrow(void) |
| 3986 | 10878 { |
| 10879 return screen_cur_row; | |
| 10880 } |