Mercurial > vim
annotate src/screen.c @ 11416:32aed0993813 v8.0.0592
patch 8.0.0592: if a job writes to a buffer screen is not updated
commit https://github.com/vim/vim/commit/29ae377ea7039874337bc79ace9ab2b37b9056e5
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Apr 30 19:39:39 2017 +0200
patch 8.0.0592: if a job writes to a buffer screen is not updated
Problem: If a job writes to a buffer and the user is typing a command, the
screen isn't updated. When a message is displayed the changed
buffer may cause it to be cleared. (Ramel Eshed)
Solution: Update the screen and then the command line if the screen didn't
scroll. Avoid inserting screen lines, as it clears any message.
Update the status line when the buffer changed.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 30 Apr 2017 19:45:03 +0200 |
| parents | f26a535d9464 |
| children | d1b6cf96882a |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9992
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 | |
| 10 /* | |
| 11 * screen.c: code for displaying on the screen | |
| 12 * | |
| 13 * Output to the screen (console, terminal emulator or GUI window) is minimized | |
| 14 * by remembering what is already on the screen, and only updating the parts | |
| 15 * that changed. | |
| 16 * | |
| 17 * ScreenLines[off] Contains a copy of the whole screen, as it is currently | |
| 18 * displayed (excluding text written by external commands). | |
| 19 * ScreenAttrs[off] Contains the associated attributes. | |
| 20 * LineOffset[row] Contains the offset into ScreenLines*[] and ScreenAttrs[] | |
| 21 * for each line. | |
| 22 * LineWraps[row] Flag for each line whether it wraps to the next line. | |
| 23 * | |
| 24 * For double-byte characters, two consecutive bytes in ScreenLines[] can form | |
| 25 * one character which occupies two display cells. | |
| 26 * For UTF-8 a multi-byte character is converted to Unicode and stored in | |
| 27 * ScreenLinesUC[]. ScreenLines[] contains the first byte only. For an ASCII | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
28 * character without composing chars ScreenLinesUC[] will be 0 and |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
29 * ScreenLinesC[][] is not used. When the character occupies two display |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
30 * cells the next byte in ScreenLines[] is 0. |
| 714 | 31 * ScreenLinesC[][] contain up to 'maxcombine' composing characters |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
32 * (drawn on top of the first character). There is 0 after the last one used. |
| 7 | 33 * ScreenLines2[] is only used for euc-jp to store the second byte if the |
| 34 * first byte is 0x8e (single-width character). | |
| 35 * | |
| 36 * The screen_*() functions write to the screen and handle updating | |
| 37 * ScreenLines[]. | |
| 38 * | |
| 39 * update_screen() is the function that updates all windows and status lines. | |
| 40 * It is called form the main loop when must_redraw is non-zero. It may be | |
| 1213 | 41 * called from other places when an immediate screen update is needed. |
| 7 | 42 * |
| 43 * The part of the buffer that is displayed in a window is set with: | |
| 44 * - w_topline (first buffer line in window) | |
| 5946 | 45 * - w_topfill (filler lines above the first line) |
| 7 | 46 * - w_leftcol (leftmost window cell in window), |
| 47 * - w_skipcol (skipped window cells of first line) | |
| 48 * | |
| 49 * Commands that only move the cursor around in a window, do not need to take | |
| 50 * action to update the display. The main loop will check if w_topline is | |
| 51 * valid and update it (scroll the window) when needed. | |
| 52 * | |
| 53 * Commands that scroll a window change w_topline and must call | |
| 54 * check_cursor() to move the cursor into the visible part of the window, and | |
| 55 * call redraw_later(VALID) to have the window displayed by update_screen() | |
| 56 * later. | |
| 57 * | |
| 58 * Commands that change text in the buffer must call changed_bytes() or | |
| 59 * changed_lines() to mark the area that changed and will require updating | |
| 60 * later. The main loop will call update_screen(), which will update each | |
| 61 * window that shows the changed buffer. This assumes text above the change | |
| 62 * can remain displayed as it is. Text after the change may need updating for | |
| 63 * scrolling, folding and syntax highlighting. | |
| 64 * | |
| 65 * Commands that change how a window is displayed (e.g., setting 'list') or | |
| 66 * invalidate the contents of a window in another way (e.g., change fold | |
| 67 * settings), must call redraw_later(NOT_VALID) to have the whole window | |
| 68 * redisplayed by update_screen() later. | |
| 69 * | |
| 70 * Commands that change how a buffer is displayed (e.g., setting 'tabstop') | |
| 71 * must call redraw_curbuf_later(NOT_VALID) to have all the windows for the | |
| 72 * buffer redisplayed by update_screen() later. | |
| 73 * | |
| 743 | 74 * Commands that change highlighting and possibly cause a scroll too must call |
| 75 * redraw_later(SOME_VALID) to update the whole window but still use scrolling | |
| 76 * to avoid redrawing everything. But the length of displayed lines must not | |
| 77 * change, use NOT_VALID then. | |
| 78 * | |
| 7 | 79 * Commands that move the window position must call redraw_later(NOT_VALID). |
| 80 * TODO: should minimize redrawing by scrolling when possible. | |
| 81 * | |
| 82 * Commands that change everything (e.g., resizing the screen) must call | |
| 83 * redraw_all_later(NOT_VALID) or redraw_all_later(CLEAR). | |
| 84 * | |
| 85 * Things that are handled indirectly: | |
| 86 * - When messages scroll the screen up, msg_scrolled will be set and | |
| 87 * update_screen() called to redraw. | |
| 88 */ | |
| 89 | |
| 90 #include "vim.h" | |
| 91 | |
| 3586 | 92 #define MB_FILLER_CHAR '<' /* character used when a double-width character |
| 93 * doesn't fit. */ | |
| 94 | |
| 7 | 95 /* |
| 96 * The attributes that are actually active for writing to the screen. | |
| 97 */ | |
| 98 static int screen_attr = 0; | |
| 99 | |
| 100 /* | |
| 101 * Positioning the cursor is reduced by remembering the last position. | |
| 102 * Mostly used by windgoto() and screen_char(). | |
| 103 */ | |
| 104 static int screen_cur_row, screen_cur_col; /* last known cursor position */ | |
| 105 | |
| 106 #ifdef FEAT_SEARCH_EXTRA | |
| 107 static match_T search_hl; /* used for 'hlsearch' highlight matching */ | |
| 108 #endif | |
| 109 | |
| 110 #ifdef FEAT_FOLDING | |
| 111 static foldinfo_T win_foldinfo; /* info for 'foldcolumn' */ | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
112 static int compute_foldcolumn(win_T *wp, int col); |
| 7 | 113 #endif |
| 114 | |
| 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 | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
268 void |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
269 redraw_buf_and_status_later(buf_T *buf, int type) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
270 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
271 win_T *wp; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
272 |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
273 FOR_ALL_WINDOWS(wp) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
274 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
275 if (wp->w_buffer == buf) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
276 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
277 redraw_win_later(wp, type); |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
278 wp->w_redr_status = TRUE; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
279 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
280 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
281 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
282 |
| 7 | 283 /* |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
284 * 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
|
285 * 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
|
286 * Return a code indicating what happened. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
287 */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
288 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
289 redraw_asap(int type) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
290 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
291 int rows; |
| 6959 | 292 int cols = screen_Columns; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
293 int r; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
294 int ret = 0; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
295 schar_T *screenline; /* copy from ScreenLines[] */ |
|
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
296 sattr_T *screenattr; /* copy from ScreenAttrs[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
297 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
298 int i; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
299 u8char_T *screenlineUC = NULL; /* copy from ScreenLinesUC[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
300 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
|
301 schar_T *screenline2 = NULL; /* copy from ScreenLines2[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
302 #endif |
|
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 redraw_later(type); |
| 6959 | 305 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
|
306 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
307 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
308 /* Allocate space to save the text displayed in the command line area. */ |
| 6959 | 309 rows = screen_Rows - cmdline_row; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
310 screenline = (schar_T *)lalloc( |
| 6959 | 311 (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
|
312 screenattr = (sattr_T *)lalloc( |
| 6959 | 313 (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
|
314 if (screenline == NULL || screenattr == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
315 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
316 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
317 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
318 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
319 screenlineUC = (u8char_T *)lalloc( |
| 6959 | 320 (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
|
321 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
322 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
323 for (i = 0; i < p_mco; ++i) |
|
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 screenlineC[i] = (u8char_T *)lalloc( |
| 6959 | 326 (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
|
327 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
328 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
329 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
330 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
331 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
332 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
333 screenline2 = (schar_T *)lalloc( |
| 6959 | 334 (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
|
335 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
336 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
337 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
338 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
339 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
340 if (ret != 2) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
341 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
342 /* 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
|
343 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
344 { |
| 6959 | 345 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
346 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 347 (size_t)cols * sizeof(schar_T)); |
| 348 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
349 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 350 (size_t)cols * sizeof(sattr_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
351 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
352 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
353 { |
| 6959 | 354 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
355 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 356 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
357 for (i = 0; i < p_mco; ++i) |
| 6959 | 358 mch_memmove(screenlineC[i] + r * cols, |
| 359 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 360 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
361 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
362 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 363 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
364 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 365 (size_t)cols * sizeof(schar_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
366 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
367 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
368 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
369 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
370 ret = 3; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
371 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
372 if (must_redraw == 0) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
373 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
374 int off = (int)(current_ScreenLine - ScreenLines); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
375 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
376 /* 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
|
377 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
378 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
379 mch_memmove(current_ScreenLine, |
| 6959 | 380 screenline + r * cols, |
| 381 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
382 mch_memmove(ScreenAttrs + off, |
| 6959 | 383 screenattr + r * cols, |
| 384 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
385 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
386 if (enc_utf8) |
|
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 mch_memmove(ScreenLinesUC + off, |
| 6959 | 389 screenlineUC + r * cols, |
| 390 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
391 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
392 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 393 screenlineC[i] + r * cols, |
| 394 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
395 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
396 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
397 mch_memmove(ScreenLines2 + off, |
| 6959 | 398 screenline2 + r * cols, |
| 399 (size_t)cols * sizeof(schar_T)); | |
| 400 #endif | |
| 401 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
|
402 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
403 ret = 4; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
404 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
405 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
406 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
407 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
408 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
409 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
410 if (enc_utf8) |
|
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 vim_free(screenlineUC); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
413 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
414 vim_free(screenlineC[i]); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
415 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
416 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
417 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
418 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
419 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
420 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
421 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
422 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
423 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
424 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
425 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
426 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
427 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
428 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
429 * 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
|
430 * 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
|
431 * 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
|
432 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
433 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
434 redraw_after_callback(void) |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
435 { |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
436 if (State == HITRETURN || State == ASKMORE) |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
437 ; /* do nothing */ |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
438 else if (State & CMDLINE) |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
439 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
440 /* Redrawing only works when the screen didn't scroll. */ |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
441 if (msg_scrolled == 0) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
442 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
443 update_screen(0); |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
444 compute_cmdrow(); |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
445 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
446 else |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
447 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
448 /* Redraw in the same position, so that the user can continue |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
449 * editing the command. */ |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
450 compute_cmdrow(); |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
451 if (cmdline_row > msg_scrolled) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
452 cmdline_row -= msg_scrolled; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
453 else |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
454 cmdline_row = 0; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
455 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
456 redrawcmdline_ex(FALSE); |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
457 } |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
458 else if (State & (NORMAL | INSERT)) |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
459 { |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
460 /* keep the command line if possible */ |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
461 update_screen(VALID_NO_UPDATE); |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
462 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
463 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
464 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
465 out_flush(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
466 #ifdef FEAT_GUI |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
467 if (gui.in_use) |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
468 { |
|
9428
0c7f47088e55
commit https://github.com/vim/vim/commit/9d5d3c9c4468ad76f16b50eabd3d9e7eab2ed44d
Christian Brabandt <cb@256bit.org>
parents:
9320
diff
changeset
|
469 /* 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
|
470 * flicker. */ |
|
0c7f47088e55
commit https://github.com/vim/vim/commit/9d5d3c9c4468ad76f16b50eabd3d9e7eab2ed44d
Christian Brabandt <cb@256bit.org>
parents:
9320
diff
changeset
|
471 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
|
472 gui_update_cursor(FALSE, FALSE); |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
473 gui_mch_flush(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
474 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
475 #endif |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
476 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
477 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
478 /* |
| 7 | 479 * Changed something in the current window, at buffer line "lnum", that |
| 480 * requires that line and possibly other lines to be redrawn. | |
| 481 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 482 * Used to remove the "$" from a change command. | |
| 483 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 484 * may become invalid and the whole window will have to be redrawn. | |
| 485 */ | |
| 486 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
487 redrawWinline( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
488 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
489 int invalid UNUSED) /* window line height is invalid now */ |
| 7 | 490 { |
| 491 #ifdef FEAT_FOLDING | |
| 492 int i; | |
| 493 #endif | |
| 494 | |
| 495 if (curwin->w_redraw_top == 0 || curwin->w_redraw_top > lnum) | |
| 496 curwin->w_redraw_top = lnum; | |
| 497 if (curwin->w_redraw_bot == 0 || curwin->w_redraw_bot < lnum) | |
| 498 curwin->w_redraw_bot = lnum; | |
| 499 redraw_later(VALID); | |
| 500 | |
| 501 #ifdef FEAT_FOLDING | |
| 502 if (invalid) | |
| 503 { | |
| 504 /* A w_lines[] entry for this lnum has become invalid. */ | |
| 505 i = find_wl_entry(curwin, lnum); | |
| 506 if (i >= 0) | |
| 507 curwin->w_lines[i].wl_valid = FALSE; | |
| 508 } | |
| 509 #endif | |
| 510 } | |
| 511 | |
| 512 /* | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
513 * Update all windows that are editing the current buffer. |
| 7 | 514 */ |
| 515 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
516 update_curbuf(int type) |
| 7 | 517 { |
| 518 redraw_curbuf_later(type); | |
| 519 update_screen(type); | |
| 520 } | |
| 521 | |
| 522 /* | |
| 523 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 524 * of stuff from Filemem to ScreenLines[], and update curwin->w_botline. | |
| 525 */ | |
| 526 void | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
527 update_screen(int type_arg) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
528 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
529 int type = type_arg; |
| 7 | 530 win_T *wp; |
| 531 static int did_intro = FALSE; | |
| 532 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 533 int did_one; | |
| 534 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
535 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
536 int did_undraw = FALSE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
537 int gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
538 int gui_cursor_row; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
539 #endif |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
540 int no_update = FALSE; |
| 7 | 541 |
| 2008 | 542 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 543 if (!screen_valid(TRUE)) |
| 544 return; | |
| 545 | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
546 if (type == VALID_NO_UPDATE) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
547 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
548 no_update = TRUE; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
549 type = 0; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
550 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
551 |
| 7 | 552 if (must_redraw) |
| 553 { | |
| 554 if (type < must_redraw) /* use maximal type */ | |
| 555 type = must_redraw; | |
| 1331 | 556 |
| 557 /* must_redraw is reset here, so that when we run into some weird | |
| 558 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 559 * scrolling), or update_topline() in win_update() will cause a | |
| 560 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 561 must_redraw = 0; |
| 562 } | |
| 563 | |
| 564 /* Need to update w_lines[]. */ | |
| 565 if (curwin->w_lines_valid == 0 && type < NOT_VALID) | |
| 566 type = NOT_VALID; | |
| 567 | |
| 2008 | 568 /* Postpone the redrawing when it's not needed and when being called |
| 569 * recursively. */ | |
| 570 if (!redrawing() || updating_screen) | |
| 7 | 571 { |
| 572 redraw_later(type); /* remember type for next time */ | |
| 573 must_redraw = type; | |
| 574 if (type > INVERTED_ALL) | |
| 575 curwin->w_lines_valid = 0; /* don't use w_lines[].wl_size now */ | |
| 576 return; | |
| 577 } | |
| 578 | |
| 579 updating_screen = TRUE; | |
| 580 #ifdef FEAT_SYN_HL | |
| 581 ++display_tick; /* let syntax code know we're in a next round of | |
| 582 * display updating */ | |
| 583 #endif | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
584 if (no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
585 ++no_win_do_lines_ins; |
| 7 | 586 |
| 587 /* | |
| 588 * if the screen was scrolled up when displaying a message, scroll it down | |
| 589 */ | |
| 590 if (msg_scrolled) | |
| 591 { | |
| 592 clear_cmdline = TRUE; | |
| 593 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 594 type = CLEAR; | |
| 595 else if (type != CLEAR) | |
| 596 { | |
| 597 check_for_delay(FALSE); | |
| 598 if (screen_ins_lines(0, 0, msg_scrolled, (int)Rows, NULL) == FAIL) | |
| 599 type = CLEAR; | |
| 600 FOR_ALL_WINDOWS(wp) | |
| 601 { | |
| 602 if (W_WINROW(wp) < msg_scrolled) | |
| 603 { | |
| 604 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 605 && wp->w_redr_type < REDRAW_TOP | |
| 606 && wp->w_lines_valid > 0 | |
| 607 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 608 { | |
| 609 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 610 wp->w_redr_type = REDRAW_TOP; | |
| 611 } | |
| 612 else | |
| 613 { | |
| 614 wp->w_redr_type = NOT_VALID; | |
| 615 #ifdef FEAT_WINDOWS | |
| 616 if (W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp) | |
| 617 <= msg_scrolled) | |
| 618 wp->w_redr_status = TRUE; | |
| 619 #endif | |
| 620 } | |
| 621 } | |
| 622 } | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
623 if (!no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
624 redraw_cmdline = TRUE; |
| 667 | 625 #ifdef FEAT_WINDOWS |
| 673 | 626 redraw_tabline = TRUE; |
| 667 | 627 #endif |
| 7 | 628 } |
| 629 msg_scrolled = 0; | |
| 630 need_wait_return = FALSE; | |
| 631 } | |
| 632 | |
| 633 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 634 compute_cmdrow(); | |
| 635 | |
| 636 /* Check for changed highlighting */ | |
| 637 if (need_highlight_changed) | |
| 638 highlight_changed(); | |
| 639 | |
| 640 if (type == CLEAR) /* first clear screen */ | |
| 641 { | |
| 642 screenclear(); /* will reset clear_cmdline */ | |
| 643 type = NOT_VALID; | |
| 644 } | |
| 645 | |
| 646 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 647 check_for_delay(FALSE); | |
| 648 | |
| 13 | 649 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
650 /* 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
|
651 * changes. */ |
| 13 | 652 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
653 && 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
|
654 ? number_width(curwin) : 0)) |
| 13 | 655 curwin->w_redr_type = NOT_VALID; |
| 656 #endif | |
| 657 | |
| 7 | 658 /* |
| 659 * Only start redrawing if there is really something to do. | |
| 660 */ | |
| 661 if (type == INVERTED) | |
| 662 update_curswant(); | |
| 663 if (curwin->w_redr_type < type | |
| 664 && !((type == VALID | |
| 665 && curwin->w_lines[0].wl_valid | |
| 666 #ifdef FEAT_DIFF | |
| 667 && curwin->w_topfill == curwin->w_old_topfill | |
| 668 && curwin->w_botfill == curwin->w_old_botfill | |
| 669 #endif | |
| 670 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 671 || (type == INVERTED | |
| 1043 | 672 && VIsual_active |
| 7 | 673 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 674 && curwin->w_old_visual_mode == VIsual_mode | |
| 675 && (curwin->w_valid & VALID_VIRTCOL) | |
| 676 && curwin->w_old_curswant == curwin->w_curswant) | |
| 677 )) | |
| 678 curwin->w_redr_type = type; | |
| 679 | |
| 849 | 680 #ifdef FEAT_WINDOWS |
| 681 /* Redraw the tab pages line if needed. */ | |
| 682 if (redraw_tabline || type >= NOT_VALID) | |
| 683 draw_tabline(); | |
| 684 #endif | |
| 685 | |
| 7 | 686 #ifdef FEAT_SYN_HL |
| 687 /* | |
| 688 * Correct stored syntax highlighting info for changes in each displayed | |
| 689 * buffer. Each buffer must only be done once. | |
| 690 */ | |
| 691 FOR_ALL_WINDOWS(wp) | |
| 692 { | |
| 693 if (wp->w_buffer->b_mod_set) | |
| 694 { | |
| 695 # ifdef FEAT_WINDOWS | |
| 696 win_T *wwp; | |
| 697 | |
| 698 /* Check if we already did this buffer. */ | |
| 699 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 700 if (wwp->w_buffer == wp->w_buffer) | |
| 701 break; | |
| 702 # endif | |
| 703 if ( | |
| 704 # ifdef FEAT_WINDOWS | |
| 705 wwp == wp && | |
| 706 # endif | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
707 syntax_present(wp)) |
| 7 | 708 syn_stack_apply_changes(wp->w_buffer); |
| 709 } | |
| 710 } | |
| 711 #endif | |
| 712 | |
| 713 /* | |
| 714 * Go from top to bottom through the windows, redrawing the ones that need | |
| 715 * it. | |
| 716 */ | |
| 717 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 718 did_one = FALSE; | |
| 719 #endif | |
| 720 #ifdef FEAT_SEARCH_EXTRA | |
| 721 search_hl.rm.regprog = NULL; | |
| 722 #endif | |
| 723 FOR_ALL_WINDOWS(wp) | |
| 724 { | |
| 725 if (wp->w_redr_type != 0) | |
| 726 { | |
| 727 cursor_off(); | |
| 728 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 729 if (!did_one) | |
| 730 { | |
| 731 did_one = TRUE; | |
| 732 # ifdef FEAT_SEARCH_EXTRA | |
| 733 start_search_hl(); | |
| 734 # endif | |
| 735 # ifdef FEAT_CLIPBOARD | |
| 736 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 737 if (clip_star.available && clip_isautosel_star()) |
| 738 clip_update_selection(&clip_star); | |
| 739 if (clip_plus.available && clip_isautosel_plus()) | |
| 740 clip_update_selection(&clip_plus); | |
| 7 | 741 # endif |
| 742 #ifdef FEAT_GUI | |
| 743 /* Remove the cursor before starting to do anything, because | |
| 744 * scrolling may make it difficult to redraw the text under | |
| 745 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
746 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
|
747 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
748 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
749 gui_cursor_row = gui.cursor_row; |
| 7 | 750 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
751 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
752 } |
| 7 | 753 #endif |
| 754 } | |
| 755 #endif | |
| 756 win_update(wp); | |
| 757 } | |
| 758 | |
| 759 #ifdef FEAT_WINDOWS | |
| 760 /* redraw status line after the window to minimize cursor movement */ | |
| 761 if (wp->w_redr_status) | |
| 762 { | |
| 763 cursor_off(); | |
| 764 win_redr_status(wp); | |
| 765 } | |
| 766 #endif | |
| 767 } | |
| 768 #if defined(FEAT_SEARCH_EXTRA) | |
| 769 end_search_hl(); | |
| 770 #endif | |
| 4107 | 771 #ifdef FEAT_INS_EXPAND |
| 772 /* May need to redraw the popup menu. */ | |
| 773 if (pum_visible()) | |
| 774 pum_redraw(); | |
| 775 #endif | |
| 7 | 776 |
| 777 #ifdef FEAT_WINDOWS | |
| 778 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 779 * 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
|
780 FOR_ALL_WINDOWS(wp) |
| 7 | 781 wp->w_buffer->b_mod_set = FALSE; |
| 782 #else | |
| 783 curbuf->b_mod_set = FALSE; | |
| 784 #endif | |
| 785 | |
| 786 updating_screen = FALSE; | |
| 787 #ifdef FEAT_GUI | |
| 788 gui_may_resize_shell(); | |
| 789 #endif | |
| 790 | |
| 791 /* Clear or redraw the command line. Done last, because scrolling may | |
| 792 * mess up the command line. */ | |
| 793 if (clear_cmdline || redraw_cmdline) | |
| 794 showmode(); | |
| 795 | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
796 if (no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
797 --no_win_do_lines_ins; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
798 |
| 7 | 799 /* 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
|
800 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
801 maybe_intro_message(); |
| 7 | 802 did_intro = TRUE; |
| 803 | |
| 804 #ifdef FEAT_GUI | |
| 805 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 806 * done. */ | |
| 807 if (gui.in_use) | |
| 808 { | |
| 809 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
|
810 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
|
811 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
812 /* 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
|
813 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
814 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
815 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
816 # ifdef FEAT_MBYTE |
|
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
817 gui.col = mb_fix_col(gui.col, gui.row); |
|
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
818 # endif |
| 7 | 819 gui_update_cursor(FALSE, FALSE); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
820 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
821 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
822 } |
| 7 | 823 gui_update_scrollbars(FALSE); |
| 824 } | |
| 825 #endif | |
| 826 } | |
| 827 | |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
828 #if defined(FEAT_SIGNS) || defined(FEAT_GUI) || defined(FEAT_CONCEAL) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
829 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
830 * Prepare for updating one or more windows. |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
831 * Caller must check for "updating_screen" already set to avoid recursiveness. |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
832 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
833 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
834 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
835 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
836 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
837 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
838 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
839 /* Remove the cursor before starting to do anything, because scrolling may |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
840 * make it difficult to redraw the text under it. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
841 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
842 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
843 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
844 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
845 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
846 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
847 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
848 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
849 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
850 * Finish updating one or more windows. |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
851 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
852 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
853 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
854 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
855 if (redraw_cmdline) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
856 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
857 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
858 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
859 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
860 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
861 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
862 updating_screen = FALSE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
863 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
864 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
865 gui_may_resize_shell(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
866 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
867 /* Redraw the cursor and update the scrollbars when all screen updating is |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
868 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
869 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
870 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
871 out_flush(); /* required before updating the cursor */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
872 gui_update_cursor(FALSE, FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
873 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
874 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
876 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
877 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
878 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
879 #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
|
880 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
881 * 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
|
882 * 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
|
883 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
884 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
885 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
|
886 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
887 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
|
888 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
889 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
|
890 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
|
891 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
|
892 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
|
893 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
|
894 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
|
895 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
|
896 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
897 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
898 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
|
899 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
900 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
|
901 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
|
902 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
903 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
904 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
905 * 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
|
906 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
907 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
908 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
|
909 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
910 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
|
911 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
912 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
|
913 /* 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
|
914 * 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
|
915 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
|
916 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
917 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
918 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
919 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
920 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
|
921 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
922 int row; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
923 int j; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
924 |
|
9100
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
925 /* Don't do anything if the screen structures are (not yet) valid. */ |
|
10769
dd93e5439ffd
patch 8.0.0274: possible recursive screen updating causes trouble
Christian Brabandt <cb@256bit.org>
parents:
10690
diff
changeset
|
926 if (!screen_valid(TRUE) || updating_screen) |
|
9100
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
927 return; |
|
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
928 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
929 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
|
930 && foldedCount(wp, lnum, &win_foldinfo) == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
931 { |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
932 update_prepare(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
933 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
934 row = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
935 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
|
936 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
937 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
|
938 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
939 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
|
940 # ifdef FEAT_SEARCH_EXTRA |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
941 init_search_hl(wp); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
942 start_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
943 prepare_search_hl(wp, lnum); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
944 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
945 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
|
946 # if defined(FEAT_SEARCH_EXTRA) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
947 end_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
948 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
949 break; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
950 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
951 row += wp->w_lines[j].wl_size; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
952 } |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
953 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
954 update_finish(); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
955 } |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
956 need_cursor_line_redraw = FALSE; |
| 7 | 957 } |
| 958 #endif | |
| 959 | |
| 960 #if defined(FEAT_SIGNS) || defined(PROTO) | |
| 961 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
962 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 963 { |
| 964 win_T *wp; | |
| 965 int doit = FALSE; | |
| 966 | |
| 967 # ifdef FEAT_FOLDING | |
| 968 win_foldinfo.fi_level = 0; | |
| 969 # endif | |
| 970 | |
| 971 /* update/delete a specific mark */ | |
| 972 FOR_ALL_WINDOWS(wp) | |
| 973 { | |
| 974 if (buf != NULL && lnum > 0) | |
| 975 { | |
| 976 if (wp->w_buffer == buf && lnum >= wp->w_topline | |
| 977 && lnum < wp->w_botline) | |
| 978 { | |
| 979 if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) | |
| 980 wp->w_redraw_top = lnum; | |
| 981 if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) | |
| 982 wp->w_redraw_bot = lnum; | |
| 983 redraw_win_later(wp, VALID); | |
| 984 } | |
| 985 } | |
| 986 else | |
| 987 redraw_win_later(wp, VALID); | |
| 988 if (wp->w_redr_type != 0) | |
| 989 doit = TRUE; | |
| 990 } | |
| 991 | |
| 3250 | 992 /* Return when there is nothing to do, screen updating is already |
| 993 * happening (recursive call) or still starting up. */ | |
| 994 if (!doit || updating_screen | |
| 995 #ifdef FEAT_GUI | |
| 996 || gui.starting | |
| 997 #endif | |
| 998 || starting) | |
| 7 | 999 return; |
| 1000 | |
| 1001 /* update all windows that need updating */ | |
| 1002 update_prepare(); | |
| 1003 | |
| 1004 # ifdef FEAT_WINDOWS | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
1005 FOR_ALL_WINDOWS(wp) |
| 7 | 1006 { |
| 1007 if (wp->w_redr_type != 0) | |
| 1008 win_update(wp); | |
| 1009 if (wp->w_redr_status) | |
| 1010 win_redr_status(wp); | |
| 1011 } | |
| 1012 # else | |
| 1013 if (curwin->w_redr_type != 0) | |
| 1014 win_update(curwin); | |
| 1015 # endif | |
| 1016 | |
| 1017 update_finish(); | |
| 1018 } | |
| 1019 #endif | |
| 1020 | |
| 1021 | |
| 1022 #if defined(FEAT_GUI) || defined(PROTO) | |
| 1023 /* | |
| 1024 * Update a single window, its status line and maybe the command line msg. | |
| 1025 * Used for the GUI scrollbar. | |
| 1026 */ | |
| 1027 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1028 updateWindow(win_T *wp) |
| 7 | 1029 { |
| 2008 | 1030 /* return if already busy updating */ |
| 1031 if (updating_screen) | |
| 1032 return; | |
| 1033 | |
| 7 | 1034 update_prepare(); |
| 1035 | |
| 1036 #ifdef FEAT_CLIPBOARD | |
| 1037 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1038 if (clip_star.available && clip_isautosel_star()) |
| 1039 clip_update_selection(&clip_star); | |
| 1040 if (clip_plus.available && clip_isautosel_plus()) | |
| 1041 clip_update_selection(&clip_plus); | |
| 7 | 1042 #endif |
| 670 | 1043 |
| 7 | 1044 win_update(wp); |
| 670 | 1045 |
| 7 | 1046 #ifdef FEAT_WINDOWS |
| 670 | 1047 /* When the screen was cleared redraw the tab pages line. */ |
| 673 | 1048 if (redraw_tabline) |
| 677 | 1049 draw_tabline(); |
| 670 | 1050 |
| 7 | 1051 if (wp->w_redr_status |
| 1052 # ifdef FEAT_CMDL_INFO | |
| 1053 || p_ru | |
| 1054 # endif | |
| 1055 # ifdef FEAT_STL_OPT | |
| 40 | 1056 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1057 # endif |
| 1058 ) | |
| 1059 win_redr_status(wp); | |
| 1060 #endif | |
| 1061 | |
| 1062 update_finish(); | |
| 1063 } | |
| 1064 #endif | |
| 1065 | |
| 1066 /* | |
| 1067 * Update a single window. | |
| 1068 * | |
| 1069 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1070 * screen or scrolling lines). | |
| 1071 * | |
| 1072 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1073 * implies the one below it. | |
| 1074 * NOT_VALID redraw the whole window | |
| 743 | 1075 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1076 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1077 * INVERTED redraw the changed part of the Visual area | |
| 1078 * INVERTED_ALL redraw the whole Visual area | |
| 1079 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1080 * 2. update lines at the top when scrolled down | |
| 1081 * 3. redraw changed text: | |
| 301 | 1082 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1083 * b_mod_top and b_mod_bot. |
| 1084 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1085 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1086 * - continue redrawing when syntax status is invalid. | |
| 1087 * 4. if scrolled up, update lines at the bottom. | |
| 1088 * This results in three areas that may need updating: | |
| 1089 * top: from first row to top_end (when scrolled down) | |
| 1090 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1091 * bot: from bot_start to last row (when scrolled up) | |
| 1092 */ | |
| 1093 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1094 win_update(win_T *wp) |
| 7 | 1095 { |
| 1096 buf_T *buf = wp->w_buffer; | |
| 1097 int type; | |
| 1098 int top_end = 0; /* Below last row of the top area that needs | |
| 1099 updating. 0 when no top area updating. */ | |
| 1100 int mid_start = 999;/* first row of the mid area that needs | |
| 1101 updating. 999 when no mid area updating. */ | |
| 1102 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1103 updating. 0 when no mid area updating. */ | |
| 1104 int bot_start = 999;/* first row of the bot area that needs | |
| 1105 updating. 999 when no bot area updating */ | |
| 1106 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1107 w_topline got smaller a bit */ | |
| 1108 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1109 matchitem_T *cur; /* points to the match list */ |
| 7 | 1110 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1111 #endif | |
| 1112 | |
| 1113 int row; /* current window row to display */ | |
| 1114 linenr_T lnum; /* current buffer lnum to display */ | |
| 1115 int idx; /* current index in w_lines[] */ | |
| 1116 int srow; /* starting row of the current line */ | |
| 1117 | |
| 1118 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1119 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1120 int i; | |
| 1121 long j; | |
| 1122 static int recursive = FALSE; /* being called recursively */ | |
| 1123 int old_botline = wp->w_botline; | |
| 1124 #ifdef FEAT_FOLDING | |
| 1125 long fold_count; | |
| 1126 #endif | |
| 1127 #ifdef FEAT_SYN_HL | |
| 1128 /* remember what happened to the previous line, to know if | |
| 1129 * check_visual_highlight() can be used */ | |
| 1130 #define DID_NONE 1 /* didn't update a line */ | |
| 1131 #define DID_LINE 2 /* updated a normal line */ | |
| 1132 #define DID_FOLD 3 /* updated a folded line */ | |
| 1133 int did_update = DID_NONE; | |
| 1134 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1135 #endif | |
| 1136 linenr_T mod_top = 0; | |
| 1137 linenr_T mod_bot = 0; | |
| 1138 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1139 int save_got_int; | |
| 1140 #endif | |
| 1141 | |
| 1142 type = wp->w_redr_type; | |
| 1143 | |
| 1144 if (type == NOT_VALID) | |
| 1145 { | |
| 1146 #ifdef FEAT_WINDOWS | |
| 1147 wp->w_redr_status = TRUE; | |
| 1148 #endif | |
| 1149 wp->w_lines_valid = 0; | |
| 1150 } | |
| 1151 | |
| 1152 /* Window is zero-height: nothing to draw. */ | |
| 1153 if (wp->w_height == 0) | |
| 1154 { | |
| 1155 wp->w_redr_type = 0; | |
| 1156 return; | |
| 1157 } | |
| 1158 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
1159 #ifdef FEAT_WINDOWS |
| 7 | 1160 /* Window is zero-width: Only need to draw the separator. */ |
| 1161 if (wp->w_width == 0) | |
| 1162 { | |
| 1163 /* draw the vertical separator right of this window */ | |
| 1164 draw_vsep_win(wp, 0); | |
| 1165 wp->w_redr_type = 0; | |
| 1166 return; | |
| 1167 } | |
| 1168 #endif | |
| 1169 | |
| 1170 #ifdef FEAT_SEARCH_EXTRA | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1171 init_search_hl(wp); |
| 7 | 1172 #endif |
| 1173 | |
| 13 | 1174 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1175 /* 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
|
1176 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1177 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1178 if (wp->w_nrwidth != i) |
| 13 | 1179 { |
| 1180 type = NOT_VALID; | |
| 677 | 1181 wp->w_nrwidth = i; |
| 13 | 1182 } |
| 1183 else | |
| 1184 #endif | |
| 1185 | |
| 7 | 1186 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1187 { | |
| 1188 /* | |
| 1189 * When there are both inserted/deleted lines and specific lines to be | |
| 1190 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1191 * everything (only happens when redrawing is off for while). | |
| 1192 */ | |
| 1193 type = NOT_VALID; | |
| 1194 } | |
| 1195 else | |
| 1196 { | |
| 1197 /* | |
| 1198 * Set mod_top to the first line that needs displaying because of | |
| 1199 * changes. Set mod_bot to the first line after the changes. | |
| 1200 */ | |
| 1201 mod_top = wp->w_redraw_top; | |
| 1202 if (wp->w_redraw_bot != 0) | |
| 1203 mod_bot = wp->w_redraw_bot + 1; | |
| 1204 else | |
| 1205 mod_bot = 0; | |
| 1206 wp->w_redraw_top = 0; /* reset for next time */ | |
| 1207 wp->w_redraw_bot = 0; | |
| 1208 if (buf->b_mod_set) | |
| 1209 { | |
| 1210 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1211 { | |
| 1212 mod_top = buf->b_mod_top; | |
| 1213 #ifdef FEAT_SYN_HL | |
| 1214 /* Need to redraw lines above the change that may be included | |
| 1215 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1216 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1217 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1218 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1219 if (mod_top < 1) |
| 1220 mod_top = 1; | |
| 1221 } | |
| 1222 #endif | |
| 1223 } | |
| 1224 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1225 mod_bot = buf->b_mod_bot; | |
| 1226 | |
| 1227 #ifdef FEAT_SEARCH_EXTRA | |
| 1228 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1229 * change in one line may make the Search highlighting in a | |
| 1230 * previous line invalid. Simple solution: redraw all visible | |
| 1231 * lines above the change. | |
| 1326 | 1232 * Same for a match pattern. |
| 7 | 1233 */ |
| 699 | 1234 if (search_hl.rm.regprog != NULL |
| 1235 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1236 top_to_mod = TRUE; |
| 699 | 1237 else |
| 1326 | 1238 { |
| 1239 cur = wp->w_match_head; | |
| 1240 while (cur != NULL) | |
| 1241 { | |
| 1242 if (cur->match.regprog != NULL | |
| 1243 && re_multiline(cur->match.regprog)) | |
| 699 | 1244 { |
| 1245 top_to_mod = TRUE; | |
| 1246 break; | |
| 1247 } | |
| 1326 | 1248 cur = cur->next; |
| 1249 } | |
| 1250 } | |
| 7 | 1251 #endif |
| 1252 } | |
| 1253 #ifdef FEAT_FOLDING | |
| 1254 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1255 { | |
| 1256 linenr_T lnumt, lnumb; | |
| 1257 | |
| 1258 /* | |
| 1259 * A change in a line can cause lines above it to become folded or | |
| 1260 * unfolded. Find the top most buffer line that may be affected. | |
| 1261 * If the line was previously folded and displayed, get the first | |
| 1262 * line of that fold. If the line is folded now, get the first | |
| 1263 * folded line. Use the minimum of these two. | |
| 1264 */ | |
| 1265 | |
| 1266 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1267 * the line below it. If there is no valid entry, use w_topline. | |
| 1268 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1269 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1270 lnumt = wp->w_topline; | |
| 1271 lnumb = MAXLNUM; | |
| 1272 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1273 if (wp->w_lines[i].wl_valid) | |
| 1274 { | |
| 1275 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1276 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1277 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1278 { | |
| 1279 lnumb = wp->w_lines[i].wl_lnum; | |
| 1280 /* When there is a fold column it might need updating | |
| 1281 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1282 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1283 ++lnumb; |
| 1284 } | |
| 1285 } | |
| 1286 | |
| 1287 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1288 if (mod_top > lnumt) | |
| 1289 mod_top = lnumt; | |
| 1290 | |
| 1291 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1292 --mod_bot; | |
| 1293 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1294 ++mod_bot; | |
| 1295 if (mod_bot < lnumb) | |
| 1296 mod_bot = lnumb; | |
| 1297 } | |
| 1298 #endif | |
| 1299 | |
| 1300 /* When a change starts above w_topline and the end is below | |
| 1301 * w_topline, start redrawing at w_topline. | |
| 36 | 1302 * If the end of the change is above w_topline: do like no change was |
| 1303 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1304 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1305 { | |
| 1306 if (mod_bot > wp->w_topline) | |
| 1307 mod_top = wp->w_topline; | |
| 1308 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1309 else if (syntax_present(wp)) |
| 7 | 1310 top_end = 1; |
| 1311 #endif | |
| 1312 } | |
| 36 | 1313 |
| 1314 /* When line numbers are displayed need to redraw all lines below | |
| 1315 * inserted/deleted lines. */ | |
| 1316 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1317 mod_bot = MAXLNUM; | |
| 7 | 1318 } |
| 1319 | |
| 1320 /* | |
| 1321 * When only displaying the lines at the top, set top_end. Used when | |
| 1322 * window has scrolled down for msg_scrolled. | |
| 1323 */ | |
| 1324 if (type == REDRAW_TOP) | |
| 1325 { | |
| 1326 j = 0; | |
| 1327 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1328 { | |
| 1329 j += wp->w_lines[i].wl_size; | |
| 1330 if (j >= wp->w_upd_rows) | |
| 1331 { | |
| 1332 top_end = j; | |
| 1333 break; | |
| 1334 } | |
| 1335 } | |
| 1336 if (top_end == 0) | |
| 1337 /* not found (cannot happen?): redraw everything */ | |
| 1338 type = NOT_VALID; | |
| 1339 else | |
| 1340 /* top area defined, the rest is VALID */ | |
| 1341 type = VALID; | |
| 1342 } | |
| 1343 | |
| 1378 | 1344 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1345 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1346 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1347 * called. */ | |
| 1348 if (screen_cleared) | |
| 1349 screen_cleared = MAYBE; | |
| 1350 | |
| 7 | 1351 /* |
| 1352 * If there are no changes on the screen that require a complete redraw, | |
| 1353 * handle three cases: | |
| 1354 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1355 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1356 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1357 * w_lines[] that needs updating. | |
| 1358 */ | |
| 743 | 1359 if ((type == VALID || type == SOME_VALID |
| 1360 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1361 #ifdef FEAT_DIFF |
| 1362 && !wp->w_botfill && !wp->w_old_botfill | |
| 1363 #endif | |
| 1364 ) | |
| 1365 { | |
| 1366 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1367 { | |
| 1368 /* | |
| 1369 * w_topline is the first changed line, the scrolling will be done | |
| 1370 * further down. | |
| 1371 */ | |
| 1372 } | |
| 1373 else if (wp->w_lines[0].wl_valid | |
| 1374 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1375 #ifdef FEAT_DIFF | |
| 1376 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1377 && wp->w_topfill > wp->w_old_topfill) | |
| 1378 #endif | |
| 1379 )) | |
| 1380 { | |
| 1381 /* | |
| 1382 * New topline is above old topline: May scroll down. | |
| 1383 */ | |
| 1384 #ifdef FEAT_FOLDING | |
| 1385 if (hasAnyFolding(wp)) | |
| 1386 { | |
| 1387 linenr_T ln; | |
| 1388 | |
| 1389 /* count the number of lines we are off, counting a sequence | |
| 1390 * of folded lines as one */ | |
| 1391 j = 0; | |
| 1392 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1393 { | |
| 1394 ++j; | |
| 1395 if (j >= wp->w_height - 2) | |
| 1396 break; | |
| 1397 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1398 } | |
| 1399 } | |
| 1400 else | |
| 1401 #endif | |
| 1402 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1403 if (j < wp->w_height - 2) /* not too far off */ | |
| 1404 { | |
| 1405 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1406 #ifdef FEAT_DIFF | |
| 1407 /* insert extra lines for previously invisible filler lines */ | |
| 1408 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1409 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1410 - wp->w_old_topfill; | |
| 1411 #endif | |
| 1412 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1413 { | |
| 1414 /* | |
| 1415 * Try to insert the correct number of lines. | |
| 1416 * If not the last window, delete the lines at the bottom. | |
| 1417 * win_ins_lines may fail when the terminal can't do it. | |
| 1418 */ | |
| 1419 if (i > 0) | |
| 1420 check_for_delay(FALSE); | |
| 1421 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1422 { | |
| 1423 if (wp->w_lines_valid != 0) | |
| 1424 { | |
| 1425 /* Need to update rows that are new, stop at the | |
| 1426 * first one that scrolled down. */ | |
| 1427 top_end = i; | |
| 1428 scrolled_down = TRUE; | |
| 1429 | |
| 1430 /* Move the entries that were scrolled, disable | |
| 1431 * the entries for the lines to be redrawn. */ | |
| 1432 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1433 wp->w_lines_valid = wp->w_height; | |
| 1434 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1435 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1436 while (idx >= 0) | |
| 1437 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1438 } | |
| 1439 } | |
| 1440 else | |
| 1441 mid_start = 0; /* redraw all lines */ | |
| 1442 } | |
| 1443 else | |
| 1444 mid_start = 0; /* redraw all lines */ | |
| 1445 } | |
| 1446 else | |
| 1447 mid_start = 0; /* redraw all lines */ | |
| 1448 } | |
| 1449 else | |
| 1450 { | |
| 1451 /* | |
| 1452 * New topline is at or below old topline: May scroll up. | |
| 1453 * When topline didn't change, find first entry in w_lines[] that | |
| 1454 * needs updating. | |
| 1455 */ | |
| 1456 | |
| 1457 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1458 j = -1; | |
| 1459 row = 0; | |
| 1460 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1461 { | |
| 1462 if (wp->w_lines[i].wl_valid | |
| 1463 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1464 { | |
| 1465 j = i; | |
| 1466 break; | |
| 1467 } | |
| 1468 row += wp->w_lines[i].wl_size; | |
| 1469 } | |
| 1470 if (j == -1) | |
| 1471 { | |
| 1472 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1473 * lines */ | |
| 1474 mid_start = 0; | |
| 1475 } | |
| 1476 else | |
| 1477 { | |
| 1478 /* | |
| 1479 * Try to delete the correct number of lines. | |
| 1480 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1481 */ | |
| 1482 #ifdef FEAT_DIFF | |
| 1483 /* If the topline didn't change, delete old filler lines, | |
| 1484 * otherwise delete filler lines of the new topline... */ | |
| 1485 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1486 row += wp->w_old_topfill; | |
| 1487 else | |
| 1488 row += diff_check_fill(wp, wp->w_topline); | |
| 1489 /* ... but don't delete new filler lines. */ | |
| 1490 row -= wp->w_topfill; | |
| 1491 #endif | |
| 1492 if (row > 0) | |
| 1493 { | |
| 1494 check_for_delay(FALSE); | |
| 1495 if (win_del_lines(wp, 0, row, FALSE, wp == firstwin) == OK) | |
| 1496 bot_start = wp->w_height - row; | |
| 1497 else | |
| 1498 mid_start = 0; /* redraw all lines */ | |
| 1499 } | |
| 1500 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1501 { | |
| 1502 /* | |
| 1503 * Skip the lines (below the deleted lines) that are still | |
| 1504 * valid and don't need redrawing. Copy their info | |
| 1505 * upwards, to compensate for the deleted lines. Set | |
| 1506 * bot_start to the first row that needs redrawing. | |
| 1507 */ | |
| 1508 bot_start = 0; | |
| 1509 idx = 0; | |
| 1510 for (;;) | |
| 1511 { | |
| 1512 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1513 /* stop at line that didn't fit, unless it is still | |
| 1514 * valid (no lines deleted) */ | |
| 1515 if (row > 0 && bot_start + row | |
| 1516 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1517 { | |
| 1518 wp->w_lines_valid = idx + 1; | |
| 1519 break; | |
| 1520 } | |
| 1521 bot_start += wp->w_lines[idx++].wl_size; | |
| 1522 | |
| 1523 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1524 if (++j >= wp->w_lines_valid) | |
| 1525 { | |
| 1526 wp->w_lines_valid = idx; | |
| 1527 break; | |
| 1528 } | |
| 1529 } | |
| 1530 #ifdef FEAT_DIFF | |
| 1531 /* Correct the first entry for filler lines at the top | |
| 1532 * when it won't get updated below. */ | |
| 1533 if (wp->w_p_diff && bot_start > 0) | |
| 1534 wp->w_lines[0].wl_size = | |
| 1535 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1536 + wp->w_topfill; | |
| 1537 #endif | |
| 1538 } | |
| 1539 } | |
| 1540 } | |
| 1541 | |
| 1542 /* When starting redraw in the first line, redraw all lines. When | |
| 1543 * there is only one window it's probably faster to clear the screen | |
| 1544 * first. */ | |
| 1545 if (mid_start == 0) | |
| 1546 { | |
| 1547 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1548 if (ONE_WINDOW) |
| 981 | 1549 { |
| 1331 | 1550 /* Clear the screen when it was not done by win_del_lines() or |
| 1551 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1552 * then. */ | |
| 1553 if (screen_cleared != TRUE) | |
| 1554 screenclear(); | |
| 981 | 1555 #ifdef FEAT_WINDOWS |
| 1556 /* The screen was cleared, redraw the tab pages line. */ | |
| 1557 if (redraw_tabline) | |
| 1558 draw_tabline(); | |
| 1559 #endif | |
| 1560 } | |
| 7 | 1561 } |
| 1331 | 1562 |
| 1563 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1564 * cleared (only happens for the first window) or when screenclear() | |
| 1565 * was called directly above, "must_redraw" will have been set to | |
| 1566 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1567 if (screen_cleared == TRUE) | |
| 1568 must_redraw = 0; | |
| 7 | 1569 } |
| 1570 else | |
| 1571 { | |
| 1572 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1573 mid_start = 0; | |
| 1574 mid_end = wp->w_height; | |
| 1575 } | |
| 1576 | |
| 743 | 1577 if (type == SOME_VALID) |
| 1578 { | |
| 1579 /* SOME_VALID: redraw all lines. */ | |
| 1580 mid_start = 0; | |
| 1581 mid_end = wp->w_height; | |
| 1582 type = NOT_VALID; | |
| 1583 } | |
| 1584 | |
| 7 | 1585 /* check if we are updating or removing the inverted part */ |
| 1586 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1587 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1588 { | |
| 1589 linenr_T from, to; | |
| 1590 | |
| 1591 if (VIsual_active) | |
| 1592 { | |
| 1593 if (VIsual_active | |
| 1594 && (VIsual_mode != wp->w_old_visual_mode | |
| 1595 || type == INVERTED_ALL)) | |
| 1596 { | |
| 1597 /* | |
| 1598 * If the type of Visual selection changed, redraw the whole | |
| 1599 * selection. Also when the ownership of the X selection is | |
| 1600 * gained or lost. | |
| 1601 */ | |
| 1602 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1603 { | |
| 1604 from = curwin->w_cursor.lnum; | |
| 1605 to = VIsual.lnum; | |
| 1606 } | |
| 1607 else | |
| 1608 { | |
| 1609 from = VIsual.lnum; | |
| 1610 to = curwin->w_cursor.lnum; | |
| 1611 } | |
| 1612 /* redraw more when the cursor moved as well */ | |
| 1613 if (wp->w_old_cursor_lnum < from) | |
| 1614 from = wp->w_old_cursor_lnum; | |
| 1615 if (wp->w_old_cursor_lnum > to) | |
| 1616 to = wp->w_old_cursor_lnum; | |
| 1617 if (wp->w_old_visual_lnum < from) | |
| 1618 from = wp->w_old_visual_lnum; | |
| 1619 if (wp->w_old_visual_lnum > to) | |
| 1620 to = wp->w_old_visual_lnum; | |
| 1621 } | |
| 1622 else | |
| 1623 { | |
| 1624 /* | |
| 1625 * Find the line numbers that need to be updated: The lines | |
| 1626 * between the old cursor position and the current cursor | |
| 1627 * position. Also check if the Visual position changed. | |
| 1628 */ | |
| 1629 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1630 { | |
| 1631 from = curwin->w_cursor.lnum; | |
| 1632 to = wp->w_old_cursor_lnum; | |
| 1633 } | |
| 1634 else | |
| 1635 { | |
| 1636 from = wp->w_old_cursor_lnum; | |
| 1637 to = curwin->w_cursor.lnum; | |
| 1638 if (from == 0) /* Visual mode just started */ | |
| 1639 from = to; | |
| 1640 } | |
| 1641 | |
| 422 | 1642 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1643 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1644 { |
| 1645 if (wp->w_old_visual_lnum < from | |
| 1646 && wp->w_old_visual_lnum != 0) | |
| 1647 from = wp->w_old_visual_lnum; | |
| 1648 if (wp->w_old_visual_lnum > to) | |
| 1649 to = wp->w_old_visual_lnum; | |
| 1650 if (VIsual.lnum < from) | |
| 1651 from = VIsual.lnum; | |
| 1652 if (VIsual.lnum > to) | |
| 1653 to = VIsual.lnum; | |
| 1654 } | |
| 1655 } | |
| 1656 | |
| 1657 /* | |
| 1658 * If in block mode and changed column or curwin->w_curswant: | |
| 1659 * update all lines. | |
| 1660 * First compute the actual start and end column. | |
| 1661 */ | |
| 1662 if (VIsual_mode == Ctrl_V) | |
| 1663 { | |
| 6266 | 1664 colnr_T fromc, toc; |
| 1665 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) | |
| 1666 int save_ve_flags = ve_flags; | |
| 1667 | |
| 1668 if (curwin->w_p_lbr) | |
| 1669 ve_flags = VE_ALL; | |
| 1670 #endif | |
| 7 | 1671 getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); |
| 6266 | 1672 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) |
| 1673 ve_flags = save_ve_flags; | |
| 1674 #endif | |
| 7 | 1675 ++toc; |
| 1676 if (curwin->w_curswant == MAXCOL) | |
| 1677 toc = MAXCOL; | |
| 1678 | |
| 1679 if (fromc != wp->w_old_cursor_fcol | |
| 1680 || toc != wp->w_old_cursor_lcol) | |
| 1681 { | |
| 1682 if (from > VIsual.lnum) | |
| 1683 from = VIsual.lnum; | |
| 1684 if (to < VIsual.lnum) | |
| 1685 to = VIsual.lnum; | |
| 1686 } | |
| 1687 wp->w_old_cursor_fcol = fromc; | |
| 1688 wp->w_old_cursor_lcol = toc; | |
| 1689 } | |
| 1690 } | |
| 1691 else | |
| 1692 { | |
| 1693 /* Use the line numbers of the old Visual area. */ | |
| 1694 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1695 { | |
| 1696 from = wp->w_old_cursor_lnum; | |
| 1697 to = wp->w_old_visual_lnum; | |
| 1698 } | |
| 1699 else | |
| 1700 { | |
| 1701 from = wp->w_old_visual_lnum; | |
| 1702 to = wp->w_old_cursor_lnum; | |
| 1703 } | |
| 1704 } | |
| 1705 | |
| 1706 /* | |
| 1707 * There is no need to update lines above the top of the window. | |
| 1708 */ | |
| 1709 if (from < wp->w_topline) | |
| 1710 from = wp->w_topline; | |
| 1711 | |
| 1712 /* | |
| 1713 * If we know the value of w_botline, use it to restrict the update to | |
| 1714 * the lines that are visible in the window. | |
| 1715 */ | |
| 1716 if (wp->w_valid & VALID_BOTLINE) | |
| 1717 { | |
| 1718 if (from >= wp->w_botline) | |
| 1719 from = wp->w_botline - 1; | |
| 1720 if (to >= wp->w_botline) | |
| 1721 to = wp->w_botline - 1; | |
| 1722 } | |
| 1723 | |
| 1724 /* | |
| 1725 * Find the minimal part to be updated. | |
| 1726 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1727 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1728 * top_end; need to redraw from top_end to the "to" line. | |
| 1729 * A middle mouse click with a Visual selection may change the text | |
| 1730 * above the Visual area and reset wl_valid, do count these for | |
| 1731 * mid_end (in srow). | |
| 1732 */ | |
| 1733 if (mid_start > 0) | |
| 1734 { | |
| 1735 lnum = wp->w_topline; | |
| 1736 idx = 0; | |
| 1737 srow = 0; | |
| 1738 if (scrolled_down) | |
| 1739 mid_start = top_end; | |
| 1740 else | |
| 1741 mid_start = 0; | |
| 1742 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1743 { | |
| 1744 if (wp->w_lines[idx].wl_valid) | |
| 1745 mid_start += wp->w_lines[idx].wl_size; | |
| 1746 else if (!scrolled_down) | |
| 1747 srow += wp->w_lines[idx].wl_size; | |
| 1748 ++idx; | |
| 1749 # ifdef FEAT_FOLDING | |
| 1750 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1751 lnum = wp->w_lines[idx].wl_lnum; | |
| 1752 else | |
| 1753 # endif | |
| 1754 ++lnum; | |
| 1755 } | |
| 1756 srow += mid_start; | |
| 1757 mid_end = wp->w_height; | |
| 1758 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1759 { | |
| 1760 if (wp->w_lines[idx].wl_valid | |
| 1761 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1762 { | |
| 1763 /* Only update until first row of this line */ | |
| 1764 mid_end = srow; | |
| 1765 break; | |
| 1766 } | |
| 1767 srow += wp->w_lines[idx].wl_size; | |
| 1768 } | |
| 1769 } | |
| 1770 } | |
| 1771 | |
| 1772 if (VIsual_active && buf == curwin->w_buffer) | |
| 1773 { | |
| 1774 wp->w_old_visual_mode = VIsual_mode; | |
| 1775 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1776 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1777 wp->w_old_visual_col = VIsual.col; |
| 7 | 1778 wp->w_old_curswant = curwin->w_curswant; |
| 1779 } | |
| 1780 else | |
| 1781 { | |
| 1782 wp->w_old_visual_mode = 0; | |
| 1783 wp->w_old_cursor_lnum = 0; | |
| 1784 wp->w_old_visual_lnum = 0; | |
| 422 | 1785 wp->w_old_visual_col = 0; |
| 7 | 1786 } |
| 1787 | |
| 1788 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1789 /* reset got_int, otherwise regexp won't work */ | |
| 1790 save_got_int = got_int; | |
| 1791 got_int = 0; | |
| 1792 #endif | |
| 1793 #ifdef FEAT_FOLDING | |
| 1794 win_foldinfo.fi_level = 0; | |
| 1795 #endif | |
| 1796 | |
| 1797 /* | |
| 1798 * Update all the window rows. | |
| 1799 */ | |
| 1800 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1801 row = 0; | |
| 1802 srow = 0; | |
| 1803 lnum = wp->w_topline; /* first line shown in window */ | |
| 1804 for (;;) | |
| 1805 { | |
| 1806 /* stop updating when reached the end of the window (check for _past_ | |
| 1807 * the end of the window is at the end of the loop) */ | |
| 1808 if (row == wp->w_height) | |
| 1809 { | |
| 1810 didline = TRUE; | |
| 1811 break; | |
| 1812 } | |
| 1813 | |
| 1814 /* stop updating when hit the end of the file */ | |
| 1815 if (lnum > buf->b_ml.ml_line_count) | |
| 1816 { | |
| 1817 eof = TRUE; | |
| 1818 break; | |
| 1819 } | |
| 1820 | |
| 1821 /* Remember the starting row of the line that is going to be dealt | |
| 1822 * with. It is used further down when the line doesn't fit. */ | |
| 1823 srow = row; | |
| 1824 | |
| 1825 /* | |
| 1826 * Update a line when it is in an area that needs updating, when it | |
| 1827 * has changes or w_lines[idx] is invalid. | |
| 1828 * bot_start may be halfway a wrapped line after using | |
| 1829 * win_del_lines(), check if the current line includes it. | |
| 1830 * When syntax folding is being used, the saved syntax states will | |
| 1831 * already have been updated, we can't see where the syntax state is | |
| 1832 * the same again, just update until the end of the window. | |
| 1833 */ | |
| 1834 if (row < top_end | |
| 1835 || (row >= mid_start && row < mid_end) | |
| 1836 #ifdef FEAT_SEARCH_EXTRA | |
| 1837 || top_to_mod | |
| 1838 #endif | |
| 1839 || idx >= wp->w_lines_valid | |
| 1840 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1841 || (mod_top != 0 | |
| 1842 && (lnum == mod_top | |
| 1843 || (lnum >= mod_top | |
| 1844 && (lnum < mod_bot | |
| 1845 #ifdef FEAT_SYN_HL | |
| 1846 || did_update == DID_FOLD | |
| 1847 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1848 && syntax_present(wp) |
| 7 | 1849 && ( |
| 1850 # ifdef FEAT_FOLDING | |
| 1851 (foldmethodIsSyntax(wp) | |
| 1852 && hasAnyFolding(wp)) || | |
| 1853 # endif | |
| 1854 syntax_check_changed(lnum))) | |
| 1855 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1856 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1857 /* match in fixed position might need redraw |
| 1858 * if lines were inserted or deleted */ | |
| 1859 || (wp->w_match_head != NULL | |
| 1860 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1861 #endif |
| 7 | 1862 ))))) |
| 1863 { | |
| 1864 #ifdef FEAT_SEARCH_EXTRA | |
| 1865 if (lnum == mod_top) | |
| 1866 top_to_mod = FALSE; | |
| 1867 #endif | |
| 1868 | |
| 1869 /* | |
| 1870 * When at start of changed lines: May scroll following lines | |
| 1871 * up or down to minimize redrawing. | |
| 1872 * Don't do this when the change continues until the end. | |
| 3318 | 1873 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1874 */ |
| 1875 if (lnum == mod_top | |
| 1876 && mod_bot != MAXLNUM | |
| 3318 | 1877 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1878 { |
| 1879 int old_rows = 0; | |
| 1880 int new_rows = 0; | |
| 1881 int xtra_rows; | |
| 1882 linenr_T l; | |
| 1883 | |
| 1884 /* Count the old number of window rows, using w_lines[], which | |
| 1885 * should still contain the sizes for the lines as they are | |
| 1886 * currently displayed. */ | |
| 1887 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1888 { | |
| 1889 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1890 * lines are part of the changed area. */ | |
| 1891 if (wp->w_lines[i].wl_valid | |
| 1892 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1893 break; | |
| 1894 old_rows += wp->w_lines[i].wl_size; | |
| 1895 #ifdef FEAT_FOLDING | |
| 1896 if (wp->w_lines[i].wl_valid | |
| 1897 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1898 { | |
| 1899 /* Must have found the last valid entry above mod_bot. | |
| 1900 * Add following invalid entries. */ | |
| 1901 ++i; | |
| 1902 while (i < wp->w_lines_valid | |
| 1903 && !wp->w_lines[i].wl_valid) | |
| 1904 old_rows += wp->w_lines[i++].wl_size; | |
| 1905 break; | |
| 1906 } | |
| 1907 #endif | |
| 1908 } | |
| 1909 | |
| 1910 if (i >= wp->w_lines_valid) | |
| 1911 { | |
| 1912 /* We can't find a valid line below the changed lines, | |
| 1913 * need to redraw until the end of the window. | |
| 1914 * Inserting/deleting lines has no use. */ | |
| 1915 bot_start = 0; | |
| 1916 } | |
| 1917 else | |
| 1918 { | |
| 1919 /* Able to count old number of rows: Count new window | |
| 1920 * rows, and may insert/delete lines */ | |
| 1921 j = idx; | |
| 1922 for (l = lnum; l < mod_bot; ++l) | |
| 1923 { | |
| 1924 #ifdef FEAT_FOLDING | |
| 1925 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1926 ++new_rows; | |
| 1927 else | |
| 1928 #endif | |
| 1929 #ifdef FEAT_DIFF | |
| 1930 if (l == wp->w_topline) | |
| 1931 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1932 + wp->w_topfill; | |
| 1933 else | |
| 1934 #endif | |
| 1935 new_rows += plines_win(wp, l, TRUE); | |
| 1936 ++j; | |
| 1937 if (new_rows > wp->w_height - row - 2) | |
| 1938 { | |
| 1939 /* it's getting too much, must redraw the rest */ | |
| 1940 new_rows = 9999; | |
| 1941 break; | |
| 1942 } | |
| 1943 } | |
| 1944 xtra_rows = new_rows - old_rows; | |
| 1945 if (xtra_rows < 0) | |
| 1946 { | |
| 1947 /* May scroll text up. If there is not enough | |
| 1948 * remaining text or scrolling fails, must redraw the | |
| 1949 * rest. If scrolling works, must redraw the text | |
| 1950 * below the scrolled text. */ | |
| 1951 if (row - xtra_rows >= wp->w_height - 2) | |
| 1952 mod_bot = MAXLNUM; | |
| 1953 else | |
| 1954 { | |
| 1955 check_for_delay(FALSE); | |
| 1956 if (win_del_lines(wp, row, | |
| 1957 -xtra_rows, FALSE, FALSE) == FAIL) | |
| 1958 mod_bot = MAXLNUM; | |
| 1959 else | |
| 1960 bot_start = wp->w_height + xtra_rows; | |
| 1961 } | |
| 1962 } | |
| 1963 else if (xtra_rows > 0) | |
| 1964 { | |
| 1965 /* May scroll text down. If there is not enough | |
| 1966 * remaining text of scrolling fails, must redraw the | |
| 1967 * rest. */ | |
| 1968 if (row + xtra_rows >= wp->w_height - 2) | |
| 1969 mod_bot = MAXLNUM; | |
| 1970 else | |
| 1971 { | |
| 1972 check_for_delay(FALSE); | |
| 1973 if (win_ins_lines(wp, row + old_rows, | |
| 1974 xtra_rows, FALSE, FALSE) == FAIL) | |
| 1975 mod_bot = MAXLNUM; | |
| 1976 else if (top_end > row + old_rows) | |
| 1977 /* Scrolled the part at the top that requires | |
| 1978 * updating down. */ | |
| 1979 top_end += xtra_rows; | |
| 1980 } | |
| 1981 } | |
| 1982 | |
| 1983 /* When not updating the rest, may need to move w_lines[] | |
| 1984 * entries. */ | |
| 1985 if (mod_bot != MAXLNUM && i != j) | |
| 1986 { | |
| 1987 if (j < i) | |
| 1988 { | |
| 1989 int x = row + new_rows; | |
| 1990 | |
| 1991 /* move entries in w_lines[] upwards */ | |
| 1992 for (;;) | |
| 1993 { | |
| 1994 /* stop at last valid entry in w_lines[] */ | |
| 1995 if (i >= wp->w_lines_valid) | |
| 1996 { | |
| 1997 wp->w_lines_valid = j; | |
| 1998 break; | |
| 1999 } | |
| 2000 wp->w_lines[j] = wp->w_lines[i]; | |
| 2001 /* stop at a line that won't fit */ | |
| 2002 if (x + (int)wp->w_lines[j].wl_size | |
| 2003 > wp->w_height) | |
| 2004 { | |
| 2005 wp->w_lines_valid = j + 1; | |
| 2006 break; | |
| 2007 } | |
| 2008 x += wp->w_lines[j++].wl_size; | |
| 2009 ++i; | |
| 2010 } | |
| 2011 if (bot_start > x) | |
| 2012 bot_start = x; | |
| 2013 } | |
| 2014 else /* j > i */ | |
| 2015 { | |
| 2016 /* move entries in w_lines[] downwards */ | |
| 2017 j -= i; | |
| 2018 wp->w_lines_valid += j; | |
| 2019 if (wp->w_lines_valid > wp->w_height) | |
| 2020 wp->w_lines_valid = wp->w_height; | |
| 2021 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2022 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2023 | |
| 2024 /* The w_lines[] entries for inserted lines are | |
| 2025 * now invalid, but wl_size may be used above. | |
| 2026 * Reset to zero. */ | |
| 2027 while (i >= idx) | |
| 2028 { | |
| 2029 wp->w_lines[i].wl_size = 0; | |
| 2030 wp->w_lines[i--].wl_valid = FALSE; | |
| 2031 } | |
| 2032 } | |
| 2033 } | |
| 2034 } | |
| 2035 } | |
| 2036 | |
| 2037 #ifdef FEAT_FOLDING | |
| 2038 /* | |
| 2039 * When lines are folded, display one line for all of them. | |
| 2040 * Otherwise, display normally (can be several display lines when | |
| 2041 * 'wrap' is on). | |
| 2042 */ | |
| 2043 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2044 if (fold_count != 0) | |
| 2045 { | |
| 2046 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2047 ++row; | |
| 2048 --fold_count; | |
| 2049 wp->w_lines[idx].wl_folded = TRUE; | |
| 2050 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2051 # ifdef FEAT_SYN_HL | |
| 2052 did_update = DID_FOLD; | |
| 2053 # endif | |
| 2054 } | |
| 2055 else | |
| 2056 #endif | |
| 2057 if (idx < wp->w_lines_valid | |
| 2058 && wp->w_lines[idx].wl_valid | |
| 2059 && wp->w_lines[idx].wl_lnum == lnum | |
| 2060 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2061 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
| 7 | 2062 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2063 #ifdef FEAT_DIFF | |
| 2064 && diff_check_fill(wp, lnum) == 0 | |
| 2065 #endif | |
| 2066 ) | |
| 2067 { | |
| 2068 /* This line is not going to fit. Don't draw anything here, | |
| 2069 * will draw "@ " lines below. */ | |
| 2070 row = wp->w_height + 1; | |
| 2071 } | |
| 2072 else | |
| 2073 { | |
| 2074 #ifdef FEAT_SEARCH_EXTRA | |
| 2075 prepare_search_hl(wp, lnum); | |
| 2076 #endif | |
| 2077 #ifdef FEAT_SYN_HL | |
| 2078 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2079 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
|
2080 && syntax_present(wp)) |
| 7 | 2081 syntax_end_parsing(syntax_last_parsed + 1); |
| 2082 #endif | |
| 2083 | |
| 2084 /* | |
| 2085 * Display one line. | |
| 2086 */ | |
| 625 | 2087 row = win_line(wp, lnum, srow, wp->w_height, mod_top == 0); |
| 7 | 2088 |
| 2089 #ifdef FEAT_FOLDING | |
| 2090 wp->w_lines[idx].wl_folded = FALSE; | |
| 2091 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2092 #endif | |
| 2093 #ifdef FEAT_SYN_HL | |
| 2094 did_update = DID_LINE; | |
| 2095 syntax_last_parsed = lnum; | |
| 2096 #endif | |
| 2097 } | |
| 2098 | |
| 2099 wp->w_lines[idx].wl_lnum = lnum; | |
| 2100 wp->w_lines[idx].wl_valid = TRUE; | |
| 2101 if (row > wp->w_height) /* past end of screen */ | |
| 2102 { | |
| 2103 /* we may need the size of that too long line later on */ | |
| 3318 | 2104 if (dollar_vcol == -1) |
| 7 | 2105 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2106 ++idx; | |
| 2107 break; | |
| 2108 } | |
| 3318 | 2109 if (dollar_vcol == -1) |
| 7 | 2110 wp->w_lines[idx].wl_size = row - srow; |
| 2111 ++idx; | |
| 2112 #ifdef FEAT_FOLDING | |
| 2113 lnum += fold_count + 1; | |
| 2114 #else | |
| 2115 ++lnum; | |
| 2116 #endif | |
| 2117 } | |
| 2118 else | |
| 2119 { | |
| 2120 /* This line does not need updating, advance to the next one */ | |
| 2121 row += wp->w_lines[idx++].wl_size; | |
| 2122 if (row > wp->w_height) /* past end of screen */ | |
| 2123 break; | |
| 2124 #ifdef FEAT_FOLDING | |
| 2125 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2126 #else | |
| 2127 ++lnum; | |
| 2128 #endif | |
| 2129 #ifdef FEAT_SYN_HL | |
| 2130 did_update = DID_NONE; | |
| 2131 #endif | |
| 2132 } | |
| 2133 | |
| 2134 if (lnum > buf->b_ml.ml_line_count) | |
| 2135 { | |
| 2136 eof = TRUE; | |
| 2137 break; | |
| 2138 } | |
| 2139 } | |
| 2140 /* | |
| 2141 * End of loop over all window lines. | |
| 2142 */ | |
| 2143 | |
| 2144 | |
| 2145 if (idx > wp->w_lines_valid) | |
| 2146 wp->w_lines_valid = idx; | |
| 2147 | |
| 2148 #ifdef FEAT_SYN_HL | |
| 2149 /* | |
| 2150 * Let the syntax stuff know we stop parsing here. | |
| 2151 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2152 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2153 syntax_end_parsing(syntax_last_parsed + 1); |
| 2154 #endif | |
| 2155 | |
| 2156 /* | |
| 2157 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2158 * line we were working on, then the line didn't fit. | |
| 2159 */ | |
| 2160 wp->w_empty_rows = 0; | |
| 2161 #ifdef FEAT_DIFF | |
| 2162 wp->w_filler_rows = 0; | |
| 2163 #endif | |
| 2164 if (!eof && !didline) | |
| 2165 { | |
| 2166 if (lnum == wp->w_topline) | |
| 2167 { | |
| 2168 /* | |
| 2169 * Single line that does not fit! | |
| 2170 * Don't overwrite it, it can be edited. | |
| 2171 */ | |
| 2172 wp->w_botline = lnum + 1; | |
| 2173 } | |
| 2174 #ifdef FEAT_DIFF | |
| 2175 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2176 { | |
| 2177 /* Window ends in filler lines. */ | |
| 2178 wp->w_botline = lnum; | |
| 2179 wp->w_filler_rows = wp->w_height - srow; | |
| 2180 } | |
| 2181 #endif | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2182 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
|
2183 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2184 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
|
2185 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2186 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2187 * 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
|
2188 */ |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2189 screen_puts_len((char_u *)"@@", 2, scr_row, W_WINCOL(wp), |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2190 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2191 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
|
2192 (int)W_WINCOL(wp) + 2, (int)W_ENDCOL(wp), |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2193 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2194 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2195 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2196 } |
| 7 | 2197 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2198 { | |
| 2199 /* | |
| 2200 * Last line isn't finished: Display "@@@" at the end. | |
| 2201 */ | |
| 2202 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2203 W_WINROW(wp) + wp->w_height, | |
| 2204 (int)W_ENDCOL(wp) - 3, (int)W_ENDCOL(wp), | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2205 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2206 set_empty_rows(wp, srow); |
| 2207 wp->w_botline = lnum; | |
| 2208 } | |
| 2209 else | |
| 2210 { | |
| 2211 win_draw_end(wp, '@', ' ', srow, wp->w_height, HLF_AT); | |
| 2212 wp->w_botline = lnum; | |
| 2213 } | |
| 2214 } | |
| 2215 else | |
| 2216 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
2217 #ifdef FEAT_WINDOWS |
| 7 | 2218 draw_vsep_win(wp, row); |
| 2219 #endif | |
| 2220 if (eof) /* we hit the end of the file */ | |
| 2221 { | |
| 2222 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2223 #ifdef FEAT_DIFF | |
| 2224 j = diff_check_fill(wp, wp->w_botline); | |
| 2225 if (j > 0 && !wp->w_botfill) | |
| 2226 { | |
| 2227 /* | |
| 2228 * Display filler lines at the end of the file | |
| 2229 */ | |
| 2230 if (char2cells(fill_diff) > 1) | |
| 2231 i = '-'; | |
| 2232 else | |
| 2233 i = fill_diff; | |
| 2234 if (row + j > wp->w_height) | |
| 2235 j = wp->w_height - row; | |
| 2236 win_draw_end(wp, i, i, row, row + (int)j, HLF_DED); | |
| 2237 row += j; | |
| 2238 } | |
| 2239 #endif | |
| 2240 } | |
| 3318 | 2241 else if (dollar_vcol == -1) |
| 7 | 2242 wp->w_botline = lnum; |
| 2243 | |
| 2244 /* make sure the rest of the screen is blank */ | |
| 2245 /* 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
|
2246 win_draw_end(wp, '~', ' ', row, wp->w_height, HLF_EOB); |
| 7 | 2247 } |
| 2248 | |
| 2249 /* Reset the type of redrawing required, the window has been updated. */ | |
| 2250 wp->w_redr_type = 0; | |
| 2251 #ifdef FEAT_DIFF | |
| 2252 wp->w_old_topfill = wp->w_topfill; | |
| 2253 wp->w_old_botfill = wp->w_botfill; | |
| 2254 #endif | |
| 2255 | |
| 3318 | 2256 if (dollar_vcol == -1) |
| 7 | 2257 { |
| 2258 /* | |
| 2259 * There is a trick with w_botline. If we invalidate it on each | |
| 2260 * change that might modify it, this will cause a lot of expensive | |
| 2261 * calls to plines() in update_topline() each time. Therefore the | |
| 2262 * value of w_botline is often approximated, and this value is used to | |
| 2263 * compute the value of w_topline. If the value of w_botline was | |
| 2264 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2265 * the visible part of the text). If it's not, we need to redraw | |
| 2266 * again. Mostly this just means scrolling up a few lines, so it | |
| 2267 * doesn't look too bad. Only do this for the current window (where | |
| 2268 * changes are relevant). | |
| 2269 */ | |
| 2270 wp->w_valid |= VALID_BOTLINE; | |
| 2271 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2272 { | |
| 2273 recursive = TRUE; | |
| 2274 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2275 update_topline(); /* may invalidate w_botline again */ | |
| 2276 if (must_redraw != 0) | |
| 2277 { | |
| 2278 /* Don't update for changes in buffer again. */ | |
| 2279 i = curbuf->b_mod_set; | |
| 2280 curbuf->b_mod_set = FALSE; | |
| 2281 win_update(curwin); | |
| 2282 must_redraw = 0; | |
| 2283 curbuf->b_mod_set = i; | |
| 2284 } | |
| 2285 recursive = FALSE; | |
| 2286 } | |
| 2287 } | |
| 2288 | |
| 2289 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2290 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2291 if (!got_int) | |
| 2292 got_int = save_got_int; | |
| 2293 #endif | |
| 2294 } | |
| 2295 | |
| 2296 /* | |
| 2297 * Clear the rest of the window and mark the unused lines with "c1". use "c2" | |
| 2298 * as the filler character. | |
| 2299 */ | |
| 2300 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2301 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2302 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2303 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2304 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2305 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2306 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2307 hlf_T hl) |
| 7 | 2308 { |
| 2309 #if defined(FEAT_FOLDING) || defined(FEAT_SIGNS) || defined(FEAT_CMDWIN) | |
| 2310 int n = 0; | |
| 2311 # define FDC_OFF n | |
| 2312 #else | |
| 2313 # define FDC_OFF 0 | |
| 2314 #endif | |
| 6553 | 2315 #ifdef FEAT_FOLDING |
| 2316 int fdc = compute_foldcolumn(wp, 0); | |
| 2317 #endif | |
| 7 | 2318 |
| 2319 #ifdef FEAT_RIGHTLEFT | |
| 2320 if (wp->w_p_rl) | |
| 2321 { | |
| 2322 /* No check for cmdline window: should never be right-left. */ | |
| 2323 # ifdef FEAT_FOLDING | |
| 6553 | 2324 n = fdc; |
| 7 | 2325 |
| 2326 if (n > 0) | |
| 2327 { | |
| 2328 /* draw the fold column at the right */ | |
| 119 | 2329 if (n > W_WIDTH(wp)) |
| 2330 n = W_WIDTH(wp); | |
| 7 | 2331 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2332 W_ENDCOL(wp) - n, (int)W_ENDCOL(wp), | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2333 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2334 } |
| 2335 # endif | |
| 2336 # ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2337 if (signcolumn_on(wp)) |
| 7 | 2338 { |
| 2339 int nn = n + 2; | |
| 2340 | |
| 2341 /* draw the sign column left of the fold column */ | |
| 119 | 2342 if (nn > W_WIDTH(wp)) |
| 2343 nn = W_WIDTH(wp); | |
| 7 | 2344 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2345 W_ENDCOL(wp) - nn, (int)W_ENDCOL(wp) - n, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2346 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2347 n = nn; |
| 2348 } | |
| 2349 # endif | |
| 2350 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2351 W_WINCOL(wp), W_ENDCOL(wp) - 1 - FDC_OFF, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2352 c2, c2, HL_ATTR(hl)); |
| 7 | 2353 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2354 W_ENDCOL(wp) - 1 - FDC_OFF, W_ENDCOL(wp) - FDC_OFF, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2355 c1, c2, HL_ATTR(hl)); |
| 7 | 2356 } |
| 2357 else | |
| 2358 #endif | |
| 2359 { | |
| 2360 #ifdef FEAT_CMDWIN | |
| 2361 if (cmdwin_type != 0 && wp == curwin) | |
| 2362 { | |
| 2363 /* draw the cmdline character in the leftmost column */ | |
| 2364 n = 1; | |
| 2365 if (n > wp->w_width) | |
| 2366 n = wp->w_width; | |
| 2367 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2368 W_WINCOL(wp), (int)W_WINCOL(wp) + n, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2369 cmdwin_type, ' ', HL_ATTR(HLF_AT)); |
| 7 | 2370 } |
| 2371 #endif | |
| 2372 #ifdef FEAT_FOLDING | |
| 6553 | 2373 if (fdc > 0) |
| 2374 { | |
| 2375 int nn = n + fdc; | |
| 7 | 2376 |
| 2377 /* draw the fold column at the left */ | |
| 2378 if (nn > W_WIDTH(wp)) | |
| 2379 nn = W_WIDTH(wp); | |
| 2380 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2381 W_WINCOL(wp) + n, (int)W_WINCOL(wp) + nn, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2382 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2383 n = nn; |
| 2384 } | |
| 2385 #endif | |
| 2386 #ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2387 if (signcolumn_on(wp)) |
| 7 | 2388 { |
| 2389 int nn = n + 2; | |
| 2390 | |
| 2391 /* draw the sign column after the fold column */ | |
| 2392 if (nn > W_WIDTH(wp)) | |
| 2393 nn = W_WIDTH(wp); | |
| 2394 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2395 W_WINCOL(wp) + n, (int)W_WINCOL(wp) + nn, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2396 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2397 n = nn; |
| 2398 } | |
| 2399 #endif | |
| 2400 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2401 W_WINCOL(wp) + FDC_OFF, (int)W_ENDCOL(wp), | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2402 c1, c2, HL_ATTR(hl)); |
| 7 | 2403 } |
| 2404 set_empty_rows(wp, row); | |
| 2405 } | |
| 2406 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2407 #ifdef FEAT_SYN_HL |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
2408 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
|
2409 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2410 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2411 * 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
|
2412 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2413 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2414 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
|
2415 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2416 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2417 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2418 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2419 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2420 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2421 |
| 7 | 2422 #ifdef FEAT_FOLDING |
| 2423 /* | |
| 6553 | 2424 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2425 * space is available for window "wp", minus "col". | |
| 2426 */ | |
| 2427 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2428 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2429 { |
| 2430 int fdc = wp->w_p_fdc; | |
| 2431 int wmw = wp == curwin && p_wmw == 0 ? 1 : p_wmw; | |
| 2432 int wwidth = W_WIDTH(wp); | |
| 2433 | |
| 2434 if (fdc > wwidth - (col + wmw)) | |
| 2435 fdc = wwidth - (col + wmw); | |
| 2436 return fdc; | |
| 2437 } | |
| 2438 | |
| 2439 /* | |
| 7 | 2440 * Display one folded line. |
| 2441 */ | |
| 2442 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2443 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2444 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2445 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2446 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2447 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2448 int row) |
| 7 | 2449 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2450 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2451 pos_T *top, *bot; |
| 2452 linenr_T lnume = lnum + fold_count - 1; | |
| 2453 int len; | |
| 29 | 2454 char_u *text; |
| 7 | 2455 int fdc; |
| 2456 int col; | |
| 2457 int txtcol; | |
| 2458 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2459 int ri; |
| 7 | 2460 |
| 2461 /* Build the fold line: | |
| 2462 * 1. Add the cmdwin_type for the command-line window | |
| 2463 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2464 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2465 * 4. Compose the text |
| 2466 * 5. Add the text | |
| 2467 * 6. set highlighting for the Visual area an other text | |
| 2468 */ | |
| 2469 col = 0; | |
| 2470 | |
| 2471 /* | |
| 2472 * 1. Add the cmdwin_type for the command-line window | |
| 2473 * Ignores 'rightleft', this window is never right-left. | |
| 2474 */ | |
| 2475 #ifdef FEAT_CMDWIN | |
| 2476 if (cmdwin_type != 0 && wp == curwin) | |
| 2477 { | |
| 2478 ScreenLines[off] = cmdwin_type; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2479 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2480 #ifdef FEAT_MBYTE |
| 2481 if (enc_utf8) | |
| 2482 ScreenLinesUC[off] = 0; | |
| 2483 #endif | |
| 2484 ++col; | |
| 2485 } | |
| 2486 #endif | |
| 2487 | |
| 2488 /* | |
| 2489 * 2. Add the 'foldcolumn' | |
| 6553 | 2490 * Reduce the width when there is not enough space. |
| 7 | 2491 */ |
| 6553 | 2492 fdc = compute_foldcolumn(wp, col); |
| 7 | 2493 if (fdc > 0) |
| 2494 { | |
| 2495 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2496 #ifdef FEAT_RIGHTLEFT | |
| 2497 if (wp->w_p_rl) | |
| 2498 { | |
| 2499 int i; | |
| 2500 | |
| 2501 copy_text_attr(off + W_WIDTH(wp) - fdc - col, buf, fdc, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2502 HL_ATTR(HLF_FC)); |
| 7 | 2503 /* reverse the fold column */ |
| 2504 for (i = 0; i < fdc; ++i) | |
| 2505 ScreenLines[off + W_WIDTH(wp) - i - 1 - col] = buf[i]; | |
| 2506 } | |
| 2507 else | |
| 2508 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2509 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2510 col += fdc; |
| 2511 } | |
| 2512 | |
| 2513 #ifdef FEAT_RIGHTLEFT | |
| 216 | 2514 # define RL_MEMSET(p, v, l) if (wp->w_p_rl) \ |
| 2515 for (ri = 0; ri < l; ++ri) \ | |
| 2516 ScreenAttrs[off + (W_WIDTH(wp) - (p) - (l)) + ri] = v; \ | |
| 2517 else \ | |
| 2518 for (ri = 0; ri < l; ++ri) \ | |
| 2519 ScreenAttrs[off + (p) + ri] = v | |
| 7 | 2520 #else |
| 216 | 2521 # define RL_MEMSET(p, v, l) for (ri = 0; ri < l; ++ri) \ |
| 2522 ScreenAttrs[off + (p) + ri] = v | |
| 7 | 2523 #endif |
| 2524 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2525 /* 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
|
2526 * text */ |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2527 RL_MEMSET(col, HL_ATTR(HLF_FL), W_WIDTH(wp) - col); |
| 7 | 2528 |
| 2529 #ifdef FEAT_SIGNS | |
| 2530 /* 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
|
2531 if (signcolumn_on(wp)) |
| 7 | 2532 { |
| 2533 len = W_WIDTH(wp) - col; | |
| 2534 if (len > 0) | |
| 2535 { | |
| 2536 if (len > 2) | |
| 2537 len = 2; | |
| 2538 # ifdef FEAT_RIGHTLEFT | |
| 2539 if (wp->w_p_rl) | |
| 2540 /* the line number isn't reversed */ | |
| 2541 copy_text_attr(off + W_WIDTH(wp) - len - col, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2542 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2543 else |
| 2544 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2545 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2546 col += len; |
| 2547 } | |
| 2548 } | |
| 2549 #endif | |
| 2550 | |
| 2551 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2552 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2553 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2554 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2555 { |
| 2556 len = W_WIDTH(wp) - col; | |
| 2557 if (len > 0) | |
| 2558 { | |
| 13 | 2559 int w = number_width(wp); |
| 5905 | 2560 long num; |
| 2561 char *fmt = "%*ld "; | |
| 13 | 2562 |
| 2563 if (len > w + 1) | |
| 2564 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2565 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2566 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
|
2567 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2568 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2569 else |
| 4065 | 2570 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2571 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2572 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
|
2573 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
|
2574 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2575 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2576 * line number */ |
| 4065 | 2577 num = lnum; |
| 2578 fmt = "%-*ld "; | |
| 2579 } | |
| 2580 } | |
| 2581 | |
| 2582 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2583 #ifdef FEAT_RIGHTLEFT |
| 2584 if (wp->w_p_rl) | |
| 2585 /* the line number isn't reversed */ | |
| 2586 copy_text_attr(off + W_WIDTH(wp) - len - col, buf, len, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2587 HL_ATTR(HLF_FL)); |
| 7 | 2588 else |
| 2589 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2590 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2591 col += len; |
| 2592 } | |
| 2593 } | |
| 2594 | |
| 2595 /* | |
| 2596 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2597 */ | |
| 29 | 2598 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2599 |
| 2600 txtcol = col; /* remember where text starts */ | |
| 2601 | |
| 2602 /* | |
| 2603 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2604 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2605 * in columns number-col - window-width. | |
| 2606 */ | |
| 2607 #ifdef FEAT_MBYTE | |
| 2608 if (has_mbyte) | |
| 2609 { | |
| 2610 int cells; | |
| 714 | 2611 int u8c, u8cc[MAX_MCO]; |
| 2612 int i; | |
| 7 | 2613 int idx; |
| 2614 int c_len; | |
| 33 | 2615 char_u *p; |
| 7 | 2616 # ifdef FEAT_ARABIC |
| 2617 int prev_c = 0; /* previous Arabic character */ | |
| 2618 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 2619 # endif | |
| 2620 | |
| 2621 # ifdef FEAT_RIGHTLEFT | |
| 2622 if (wp->w_p_rl) | |
| 2623 idx = off; | |
| 2624 else | |
| 2625 # endif | |
| 2626 idx = off + col; | |
| 2627 | |
| 2628 /* Store multibyte characters in ScreenLines[] et al. correctly. */ | |
| 2629 for (p = text; *p != NUL; ) | |
| 2630 { | |
| 2631 cells = (*mb_ptr2cells)(p); | |
| 474 | 2632 c_len = (*mb_ptr2len)(p); |
| 7 | 2633 if (col + cells > W_WIDTH(wp) |
| 2634 # ifdef FEAT_RIGHTLEFT | |
| 2635 - (wp->w_p_rl ? col : 0) | |
| 2636 # endif | |
| 2637 ) | |
| 2638 break; | |
| 2639 ScreenLines[idx] = *p; | |
| 2640 if (enc_utf8) | |
| 2641 { | |
| 714 | 2642 u8c = utfc_ptr2char(p, u8cc); |
| 2643 if (*p < 0x80 && u8cc[0] == 0) | |
| 7 | 2644 { |
| 2645 ScreenLinesUC[idx] = 0; | |
| 2646 #ifdef FEAT_ARABIC | |
| 2647 prev_c = u8c; | |
| 2648 #endif | |
| 2649 } | |
| 2650 else | |
| 2651 { | |
| 2652 #ifdef FEAT_ARABIC | |
| 2653 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 2654 { | |
| 2655 /* Do Arabic shaping. */ | |
| 714 | 2656 int pc, pc1, nc; |
| 2657 int pcc[MAX_MCO]; | |
| 7 | 2658 int firstbyte = *p; |
| 2659 | |
| 2660 /* The idea of what is the previous and next | |
| 2661 * character depends on 'rightleft'. */ | |
| 2662 if (wp->w_p_rl) | |
| 2663 { | |
| 2664 pc = prev_c; | |
| 2665 pc1 = prev_c1; | |
| 2666 nc = utf_ptr2char(p + c_len); | |
| 714 | 2667 prev_c1 = u8cc[0]; |
| 7 | 2668 } |
| 2669 else | |
| 2670 { | |
| 714 | 2671 pc = utfc_ptr2char(p + c_len, pcc); |
| 7 | 2672 nc = prev_c; |
| 714 | 2673 pc1 = pcc[0]; |
| 7 | 2674 } |
| 2675 prev_c = u8c; | |
| 2676 | |
| 714 | 2677 u8c = arabic_shape(u8c, &firstbyte, &u8cc[0], |
| 7 | 2678 pc, pc1, nc); |
| 2679 ScreenLines[idx] = firstbyte; | |
| 2680 } | |
| 2681 else | |
| 2682 prev_c = u8c; | |
| 2683 #endif | |
| 2684 /* Non-BMP character: display as ? or fullwidth ?. */ | |
| 1401 | 2685 #ifdef UNICODE16 |
| 7 | 2686 if (u8c >= 0x10000) |
| 2687 ScreenLinesUC[idx] = (cells == 2) ? 0xff1f : (int)'?'; | |
| 2688 else | |
| 1401 | 2689 #endif |
| 7 | 2690 ScreenLinesUC[idx] = u8c; |
| 714 | 2691 for (i = 0; i < Screen_mco; ++i) |
| 2692 { | |
| 2693 ScreenLinesC[i][idx] = u8cc[i]; | |
| 2694 if (u8cc[i] == 0) | |
| 2695 break; | |
| 2696 } | |
| 7 | 2697 } |
| 2698 if (cells > 1) | |
| 2699 ScreenLines[idx + 1] = 0; | |
| 2700 } | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2701 else if (enc_dbcs == DBCS_JPNU && *p == 0x8e) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2702 /* double-byte single width character */ |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2703 ScreenLines2[idx] = p[1]; |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2704 else if (cells > 1) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2705 /* double-width character */ |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2706 ScreenLines[idx + 1] = p[1]; |
| 7 | 2707 col += cells; |
| 2708 idx += cells; | |
| 2709 p += c_len; | |
| 2710 } | |
| 2711 } | |
| 2712 else | |
| 2713 #endif | |
| 2714 { | |
| 2715 len = (int)STRLEN(text); | |
| 2716 if (len > W_WIDTH(wp) - col) | |
| 2717 len = W_WIDTH(wp) - col; | |
| 2718 if (len > 0) | |
| 2719 { | |
| 2720 #ifdef FEAT_RIGHTLEFT | |
| 2721 if (wp->w_p_rl) | |
| 2722 STRNCPY(current_ScreenLine, text, len); | |
| 2723 else | |
| 2724 #endif | |
| 2725 STRNCPY(current_ScreenLine + col, text, len); | |
| 2726 col += len; | |
| 2727 } | |
| 2728 } | |
| 2729 | |
| 2730 /* Fill the rest of the line with the fold filler */ | |
| 2731 #ifdef FEAT_RIGHTLEFT | |
| 2732 if (wp->w_p_rl) | |
| 2733 col -= txtcol; | |
| 2734 #endif | |
| 2735 while (col < W_WIDTH(wp) | |
| 2736 #ifdef FEAT_RIGHTLEFT | |
| 2737 - (wp->w_p_rl ? txtcol : 0) | |
| 2738 #endif | |
| 2739 ) | |
| 2740 { | |
| 2741 #ifdef FEAT_MBYTE | |
| 2742 if (enc_utf8) | |
| 2743 { | |
| 2744 if (fill_fold >= 0x80) | |
| 2745 { | |
| 2746 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2747 ScreenLinesC[0][off + col] = 0; |
|
11265
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2748 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2749 } |
| 2750 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2751 { |
| 7 | 2752 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2753 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2754 } |
|
11265
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2755 col++; |
|
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2756 } |
|
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2757 else |
|
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2758 #endif |
|
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2759 ScreenLines[off + col++] = fill_fold; |
| 7 | 2760 } |
| 2761 | |
| 2762 if (text != buf) | |
| 2763 vim_free(text); | |
| 2764 | |
| 2765 /* | |
| 2766 * 6. set highlighting for the Visual area an other text. | |
| 2767 * If all folded lines are in the Visual area, highlight the line. | |
| 2768 */ | |
| 2769 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2770 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2771 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2772 { |
| 2773 /* Visual is after curwin->w_cursor */ | |
| 2774 top = &curwin->w_cursor; | |
| 2775 bot = &VIsual; | |
| 2776 } | |
| 2777 else | |
| 2778 { | |
| 2779 /* Visual is before curwin->w_cursor */ | |
| 2780 top = &VIsual; | |
| 2781 bot = &curwin->w_cursor; | |
| 2782 } | |
| 2783 if (lnum >= top->lnum | |
| 2784 && lnume <= bot->lnum | |
| 2785 && (VIsual_mode != 'v' | |
| 2786 || ((lnum > top->lnum | |
| 2787 || (lnum == top->lnum | |
| 2788 && top->col == 0)) | |
| 2789 && (lnume < bot->lnum | |
| 2790 || (lnume == bot->lnum | |
| 2791 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2792 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2793 { |
| 2794 if (VIsual_mode == Ctrl_V) | |
| 2795 { | |
| 2796 /* Visual block mode: highlight the chars part of the block */ | |
| 2797 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)W_WIDTH(wp)) | |
| 2798 { | |
| 3040 | 2799 if (wp->w_old_cursor_lcol != MAXCOL |
| 2800 && wp->w_old_cursor_lcol + txtcol | |
| 2801 < (colnr_T)W_WIDTH(wp)) | |
| 7 | 2802 len = wp->w_old_cursor_lcol; |
| 2803 else | |
| 2804 len = W_WIDTH(wp) - txtcol; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2805 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2806 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2807 } |
| 2808 } | |
| 2809 else | |
| 216 | 2810 { |
| 7 | 2811 /* Set all attributes of the text */ |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2812 RL_MEMSET(txtcol, HL_ATTR(HLF_V), W_WIDTH(wp) - txtcol); |
| 216 | 2813 } |
| 7 | 2814 } |
| 2815 } | |
| 2816 | |
| 743 | 2817 #ifdef FEAT_SYN_HL |
| 6685 | 2818 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2819 if (wp->w_p_cc_cols) | |
| 2820 { | |
| 2821 int i = 0; | |
| 2822 int j = wp->w_p_cc_cols[i]; | |
| 2823 int old_txtcol = txtcol; | |
| 2824 | |
| 2825 while (j > -1) | |
| 2826 { | |
| 2827 txtcol += j; | |
| 2828 if (wp->w_p_wrap) | |
| 2829 txtcol -= wp->w_skipcol; | |
| 2830 else | |
| 2831 txtcol -= wp->w_leftcol; | |
| 2832 if (txtcol >= 0 && txtcol < W_WIDTH(wp)) | |
| 2833 ScreenAttrs[off + txtcol] = hl_combine_attr( | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2834 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2835 txtcol = old_txtcol; |
| 2836 j = wp->w_p_cc_cols[++i]; | |
| 2837 } | |
| 2838 } | |
| 2839 | |
| 743 | 2840 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2841 if (wp->w_p_cuc) |
| 2842 { | |
| 2843 txtcol += wp->w_virtcol; | |
| 2844 if (wp->w_p_wrap) | |
| 2845 txtcol -= wp->w_skipcol; | |
| 2846 else | |
| 2847 txtcol -= wp->w_leftcol; | |
| 2848 if (txtcol >= 0 && txtcol < W_WIDTH(wp)) | |
| 2849 ScreenAttrs[off + txtcol] = hl_combine_attr( | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2850 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2851 } |
| 743 | 2852 #endif |
| 7 | 2853 |
| 2854 SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp), | |
| 2855 (int)W_WIDTH(wp), FALSE); | |
| 2856 | |
| 2857 /* | |
| 2858 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2859 * updated (saves a call to plines() later). | |
| 2860 */ | |
| 2861 if (wp == curwin | |
| 2862 && lnum <= curwin->w_cursor.lnum | |
| 2863 && lnume >= curwin->w_cursor.lnum) | |
| 2864 { | |
| 2865 curwin->w_cline_row = row; | |
| 2866 curwin->w_cline_height = 1; | |
| 2867 curwin->w_cline_folded = TRUE; | |
| 2868 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2869 } | |
| 2870 } | |
| 2871 | |
| 2872 /* | |
| 2873 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2874 */ | |
| 2875 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2876 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2877 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2878 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2879 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2880 int attr) |
| 7 | 2881 { |
| 216 | 2882 int i; |
| 2883 | |
| 7 | 2884 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2885 # ifdef FEAT_MBYTE | |
| 2886 if (enc_utf8) | |
| 2887 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 2888 # endif | |
| 216 | 2889 for (i = 0; i < len; ++i) |
| 2890 ScreenAttrs[off + i] = attr; | |
| 7 | 2891 } |
| 2892 | |
| 2893 /* | |
| 2894 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2895 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2896 */ |
| 2897 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2898 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2899 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2900 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2901 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2902 linenr_T lnum) /* current line number */ |
| 7 | 2903 { |
| 2904 int i = 0; | |
| 2905 int level; | |
| 2906 int first_level; | |
| 519 | 2907 int empty; |
| 6553 | 2908 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2909 |
| 2910 /* Init to all spaces. */ | |
| 6929 | 2911 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2912 |
| 2913 level = win_foldinfo.fi_level; | |
| 2914 if (level > 0) | |
| 2915 { | |
| 519 | 2916 /* If there is only one column put more info in it. */ |
| 6553 | 2917 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2918 |
| 7 | 2919 /* If the column is too narrow, we start at the lowest level that |
| 2920 * fits and use numbers to indicated the depth. */ | |
| 6553 | 2921 first_level = level - fdc - closed + 1 + empty; |
| 7 | 2922 if (first_level < 1) |
| 2923 first_level = 1; | |
| 2924 | |
| 6553 | 2925 for (i = 0; i + empty < fdc; ++i) |
| 7 | 2926 { |
| 2927 if (win_foldinfo.fi_lnum == lnum | |
| 2928 && first_level + i >= win_foldinfo.fi_low_level) | |
| 2929 p[i] = '-'; | |
| 2930 else if (first_level == 1) | |
| 2931 p[i] = '|'; | |
| 2932 else if (first_level + i <= 9) | |
| 2933 p[i] = '0' + first_level + i; | |
| 2934 else | |
| 2935 p[i] = '>'; | |
| 2936 if (first_level + i == level) | |
| 2937 break; | |
| 2938 } | |
| 2939 } | |
| 2940 if (closed) | |
| 6553 | 2941 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 2942 } |
| 2943 #endif /* FEAT_FOLDING */ | |
| 2944 | |
| 2945 /* | |
| 2946 * Display line "lnum" of window 'wp' on the screen. | |
| 2947 * Start at row "startrow", stop when "endrow" is reached. | |
| 2948 * wp->w_virtcol needs to be valid. | |
| 2949 * | |
| 2950 * Return the number of last row the line occupies. | |
| 2951 */ | |
| 2952 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2953 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2954 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2955 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2956 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2957 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2958 int nochange UNUSED) /* not updating for changed text */ |
| 7 | 2959 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
2960 int col = 0; /* visual column on screen */ |
| 7 | 2961 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 2962 int c = 0; /* init for GCC */ | |
| 2963 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 2964 #ifdef FEAT_LINEBREAK |
| 2965 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 2966 #endif | |
| 7 | 2967 long vcol_prev = -1; /* "vcol" of previous character */ |
| 2968 char_u *line; /* current line */ | |
| 2969 char_u *ptr; /* current position in "line" */ | |
| 2970 int row; /* row in the window, excl w_winrow */ | |
| 2971 int screen_row; /* row on the screen, incl w_winrow */ | |
| 2972 | |
| 2973 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 2974 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 2975 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 2976 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 2977 int c_extra = NUL; /* extra chars, all the same */ |
| 2978 int extra_attr = 0; /* attributes when n_extra != 0 */ | |
| 2979 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 2980 displaying lcs_eol at end-of-line */ | |
| 2981 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 2982 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 2983 | |
| 2984 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 2985 int saved_n_extra = 0; | |
| 2986 char_u *saved_p_extra = NULL; | |
| 2987 int saved_c_extra = 0; | |
| 2988 int saved_char_attr = 0; | |
| 2989 | |
| 2990 int n_attr = 0; /* chars with special attr */ | |
| 2991 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 2992 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 2993 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 2994 | |
| 2995 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 2996 | |
| 2997 int fromcol, tocol; /* start/end of inverting */ | |
| 2998 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 2999 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3000 pos_T *top, *bot; | |
| 1813 | 3001 int lnum_in_visual_area = FALSE; |
| 7 | 3002 pos_T pos; |
| 3003 long v; | |
| 3004 | |
| 3005 int char_attr = 0; /* attributes for next character */ | |
| 674 | 3006 int attr_pri = FALSE; /* char_attr has priority */ |
| 7 | 3007 int area_highlighting = FALSE; /* Visual or incsearch highlighting |
| 3008 in this line */ | |
| 3009 int attr = 0; /* attributes for area highlighting */ | |
| 3010 int area_attr = 0; /* attributes desired by highlighting */ | |
| 3011 int search_attr = 0; /* attributes desired by 'hlsearch' */ | |
| 3012 #ifdef FEAT_SYN_HL | |
| 743 | 3013 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3014 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3015 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3016 int save_did_emsg; | |
| 1437 | 3017 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
|
3018 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3019 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3020 #endif |
| 3021 #ifdef FEAT_SPELL | |
| 221 | 3022 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3023 # define SPWORDLEN 150 |
| 3024 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3025 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3026 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3027 starts */ |
| 221 | 3028 int spell_attr = 0; /* attributes desired by spelling */ |
| 3029 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3030 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3031 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3032 * there are no spell errors */ |
| 386 | 3033 static int cap_col = -1; /* column to check for Cap word */ |
| 3034 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3035 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3036 #endif |
| 3037 int extra_check; /* has syntax or linebreak */ | |
| 3038 #ifdef FEAT_MBYTE | |
| 3039 int multi_attr = 0; /* attributes desired by multibyte */ | |
| 3040 int mb_l = 1; /* multi-byte byte length */ | |
| 3041 int mb_c = 0; /* decoded multi-byte character */ | |
| 3042 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3043 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3044 #endif |
| 3045 #ifdef FEAT_DIFF | |
| 3046 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3047 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3048 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3049 int change_start = MAXCOL; /* first col of changed area */ |
| 3050 int change_end = -1; /* last col of changed area */ | |
| 3051 #endif | |
| 3052 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3053 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3054 int need_showbreak = FALSE; /* overlong line, skipping first x |
|
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3055 chars */ |
| 7 | 3056 #endif |
| 910 | 3057 #if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \ |
| 3058 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) | |
| 7 | 3059 # define LINE_ATTR |
| 1536 | 3060 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3061 #endif |
| 3062 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3063 matchitem_T *cur; /* points to the match list */ |
| 3064 match_T *shl; /* points to search_hl or a match */ | |
| 3065 int shl_flag; /* flag to indicate whether search_hl | |
| 3066 has been processed or not */ | |
| 5979 | 3067 int pos_inprogress; /* marks that position match search is |
| 3068 in progress */ | |
| 1326 | 3069 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3070 equals startcol of search_hl or one | |
| 3071 of the matches */ | |
| 7 | 3072 #endif |
| 3073 #ifdef FEAT_ARABIC | |
| 3074 int prev_c = 0; /* previous Arabic character */ | |
| 3075 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3076 #endif | |
| 910 | 3077 #if defined(LINE_ATTR) |
| 867 | 3078 int did_line_attr = 0; |
| 3079 #endif | |
| 7 | 3080 |
| 3081 /* draw_state: items that are drawn in sequence: */ | |
| 3082 #define WL_START 0 /* nothing done yet */ | |
| 3083 #ifdef FEAT_CMDWIN | |
| 3084 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3085 #else | |
| 3086 # define WL_CMDLINE WL_START | |
| 3087 #endif | |
| 3088 #ifdef FEAT_FOLDING | |
| 3089 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3090 #else | |
| 3091 # define WL_FOLD WL_CMDLINE | |
| 3092 #endif | |
| 3093 #ifdef FEAT_SIGNS | |
| 3094 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3095 #else | |
| 3096 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3097 #endif | |
| 3098 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3099 #ifdef FEAT_LINEBREAK |
| 3100 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3101 #else | |
| 3102 # define WL_BRI WL_NR | |
| 3103 #endif | |
| 7 | 3104 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3105 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3106 #else |
| 5995 | 3107 # define WL_SBR WL_BRI |
| 7 | 3108 #endif |
| 3109 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3110 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3111 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3112 int feedback_col = 0; |
| 3113 int feedback_old_attr = -1; | |
| 3114 #endif | |
| 3115 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3116 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3117 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
|
3118 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
|
3119 int prev_syntax_id = 0; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3120 int conceal_attr = HL_ATTR(HLF_CONCEAL); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3121 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3122 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
|
3123 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3124 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
|
3125 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3126 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
|
3127 int has_match_conc = 0; /* match wants to conceal */ |
| 6520 | 3128 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3129 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3130 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3131 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3132 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3133 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3134 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3135 col -= boguscols; \ |
| 6520 | 3136 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3137 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3138 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3139 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3140 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3141 #endif |
| 7 | 3142 |
| 3143 if (startrow > endrow) /* past the end already! */ | |
| 3144 return startrow; | |
| 3145 | |
| 3146 row = startrow; | |
| 3147 screen_row = row + W_WINROW(wp); | |
| 3148 | |
| 3149 /* | |
| 3150 * To speed up the loop below, set extra_check when there is linebreak, | |
| 3151 * trailing white space and/or syntax processing to be done. | |
| 3152 */ | |
| 3153 #ifdef FEAT_LINEBREAK | |
| 3154 extra_check = wp->w_p_lbr; | |
| 3155 #else | |
| 3156 extra_check = 0; | |
| 3157 #endif | |
| 3158 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3159 if (syntax_present(wp) && !wp->w_s->b_syn_error) |
| 7 | 3160 { |
| 3161 /* Prepare for syntax highlighting in this line. When there is an | |
| 3162 * error, stop syntax highlighting. */ | |
| 3163 save_did_emsg = did_emsg; | |
| 3164 did_emsg = FALSE; | |
| 3165 syntax_start(wp, lnum); | |
| 3166 if (did_emsg) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3167 wp->w_s->b_syn_error = TRUE; |
| 7 | 3168 else |
| 3169 { | |
| 3170 did_emsg = save_did_emsg; | |
| 3171 has_syntax = TRUE; | |
| 3172 extra_check = TRUE; | |
| 3173 } | |
| 3174 } | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3175 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3176 /* Check for columns to display for 'colorcolumn'. */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3177 color_cols = wp->w_p_cc_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3178 if (color_cols != NULL) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3179 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3180 #endif |
| 3181 | |
| 3182 #ifdef FEAT_SPELL | |
| 258 | 3183 if (wp->w_p_spell |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3184 && *wp->w_s->b_p_spl != NUL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3185 && 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
|
3186 && *(char **)(wp->w_s->b_langp.ga_data) != NULL) |
| 221 | 3187 { |
| 3188 /* Prepare for spell checking. */ | |
| 3189 has_spell = TRUE; | |
| 3190 extra_check = TRUE; | |
| 348 | 3191 |
| 3192 /* Get the start of the next line, so that words that wrap to the next | |
| 3193 * line are found too: "et<line-break>al.". | |
| 3194 * Trick: skip a few chars for C/shell/Vim comments */ | |
| 3195 nextline[SPWORDLEN] = NUL; | |
| 3196 if (lnum < wp->w_buffer->b_ml.ml_line_count) | |
| 3197 { | |
| 3198 line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE); | |
| 3199 spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN); | |
| 3200 } | |
| 3201 | |
| 3202 /* When a word wrapped from the previous line the start of the current | |
| 3203 * line is valid. */ | |
| 3204 if (lnum == checked_lnum) | |
| 3205 cur_checked_col = checked_col; | |
| 3206 checked_lnum = 0; | |
| 386 | 3207 |
| 3208 /* When there was a sentence end in the previous line may require a | |
| 3209 * word starting with capital in this line. In line 1 always check | |
| 3210 * the first word. */ | |
| 3211 if (lnum != capcol_lnum) | |
| 3212 cap_col = -1; | |
| 3213 if (lnum == 1) | |
| 3214 cap_col = 0; | |
| 3215 capcol_lnum = 0; | |
| 221 | 3216 } |
| 7 | 3217 #endif |
| 3218 | |
| 3219 /* | |
| 3220 * handle visual active in this window | |
| 3221 */ | |
| 3222 fromcol = -10; | |
| 3223 tocol = MAXCOL; | |
| 3224 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 3225 { | |
| 3226 /* Visual is after curwin->w_cursor */ | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
3227 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 3228 { |
| 3229 top = &curwin->w_cursor; | |
| 3230 bot = &VIsual; | |
| 3231 } | |
| 3232 else /* Visual is before curwin->w_cursor */ | |
| 3233 { | |
| 3234 top = &VIsual; | |
| 3235 bot = &curwin->w_cursor; | |
| 3236 } | |
| 1813 | 3237 lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum); |
| 7 | 3238 if (VIsual_mode == Ctrl_V) /* block mode */ |
| 3239 { | |
| 1813 | 3240 if (lnum_in_visual_area) |
| 7 | 3241 { |
| 3242 fromcol = wp->w_old_cursor_fcol; | |
| 3243 tocol = wp->w_old_cursor_lcol; | |
| 3244 } | |
| 3245 } | |
| 3246 else /* non-block mode */ | |
| 3247 { | |
| 3248 if (lnum > top->lnum && lnum <= bot->lnum) | |
| 3249 fromcol = 0; | |
| 3250 else if (lnum == top->lnum) | |
| 3251 { | |
| 3252 if (VIsual_mode == 'V') /* linewise */ | |
| 3253 fromcol = 0; | |
| 3254 else | |
| 3255 { | |
| 3256 getvvcol(wp, top, (colnr_T *)&fromcol, NULL, NULL); | |
| 3257 if (gchar_pos(top) == NUL) | |
| 3258 tocol = fromcol + 1; | |
| 3259 } | |
| 3260 } | |
| 3261 if (VIsual_mode != 'V' && lnum == bot->lnum) | |
| 3262 { | |
| 3263 if (*p_sel == 'e' && bot->col == 0 | |
| 3264 #ifdef FEAT_VIRTUALEDIT | |
| 3265 && bot->coladd == 0 | |
| 3266 #endif | |
| 3267 ) | |
| 3268 { | |
| 3269 fromcol = -10; | |
| 3270 tocol = MAXCOL; | |
| 3271 } | |
| 36 | 3272 else if (bot->col == MAXCOL) |
| 3273 tocol = MAXCOL; | |
| 7 | 3274 else |
| 3275 { | |
| 3276 pos = *bot; | |
| 3277 if (*p_sel == 'e') | |
| 3278 getvvcol(wp, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3279 else | |
| 3280 { | |
| 3281 getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol); | |
| 3282 ++tocol; | |
| 3283 } | |
| 3284 } | |
| 3285 } | |
| 3286 } | |
| 3287 | |
| 3288 /* Check if the character under the cursor should not be inverted */ | |
| 3289 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
|
3290 #ifdef FEAT_GUI |
| 7 | 3291 && !gui.in_use |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
3292 #endif |
| 7 | 3293 ) |
| 3294 noinvcur = TRUE; | |
| 3295 | |
| 3296 /* if inverting in this line set area_highlighting */ | |
| 3297 if (fromcol >= 0) | |
| 3298 { | |
| 3299 area_highlighting = TRUE; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3300 attr = HL_ATTR(HLF_V); |
| 7 | 3301 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
| 3674 | 3302 if ((clip_star.available && !clip_star.owned |
| 3303 && clip_isautosel_star()) | |
| 3304 || (clip_plus.available && !clip_plus.owned | |
| 3305 && clip_isautosel_plus())) | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3306 attr = HL_ATTR(HLF_VNC); |
| 7 | 3307 #endif |
| 3308 } | |
| 3309 } | |
| 3310 | |
| 3311 /* | |
| 674 | 3312 * handle 'incsearch' and ":s///c" highlighting |
| 7 | 3313 */ |
| 5735 | 3314 else if (highlight_match |
| 7 | 3315 && wp == curwin |
| 3316 && lnum >= curwin->w_cursor.lnum | |
| 3317 && lnum <= curwin->w_cursor.lnum + search_match_lines) | |
| 3318 { | |
| 3319 if (lnum == curwin->w_cursor.lnum) | |
| 3320 getvcol(curwin, &(curwin->w_cursor), | |
| 3321 (colnr_T *)&fromcol, NULL, NULL); | |
| 3322 else | |
| 3323 fromcol = 0; | |
| 3324 if (lnum == curwin->w_cursor.lnum + search_match_lines) | |
| 3325 { | |
| 3326 pos.lnum = lnum; | |
| 3327 pos.col = search_match_endcol; | |
| 3328 getvcol(curwin, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3329 } | |
| 3330 else | |
| 3331 tocol = MAXCOL; | |
| 1850 | 3332 /* do at least one character; happens when past end of line */ |
| 3333 if (fromcol == tocol) | |
| 3334 tocol = fromcol + 1; | |
| 7 | 3335 area_highlighting = TRUE; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3336 attr = HL_ATTR(HLF_I); |
| 7 | 3337 } |
| 3338 | |
| 3339 #ifdef FEAT_DIFF | |
| 3340 filler_lines = diff_check(wp, lnum); | |
| 3341 if (filler_lines < 0) | |
| 3342 { | |
| 3343 if (filler_lines == -1) | |
| 3344 { | |
| 3345 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3346 diff_hlf = HLF_ADD; /* added line */ | |
| 3347 else if (change_start == 0) | |
| 3348 diff_hlf = HLF_TXD; /* changed text */ | |
| 3349 else | |
| 3350 diff_hlf = HLF_CHD; /* changed line */ | |
| 3351 } | |
| 3352 else | |
| 3353 diff_hlf = HLF_ADD; /* added line */ | |
| 3354 filler_lines = 0; | |
| 3355 area_highlighting = TRUE; | |
| 3356 } | |
| 3357 if (lnum == wp->w_topline) | |
| 3358 filler_lines = wp->w_topfill; | |
| 3359 filler_todo = filler_lines; | |
| 3360 #endif | |
| 3361 | |
| 3362 #ifdef LINE_ATTR | |
| 3363 # ifdef FEAT_SIGNS | |
| 3364 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3365 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3366 if (v != 0) | |
| 3367 line_attr = sign_get_attr((int)v, TRUE); | |
| 3368 # endif | |
| 3369 # if defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS) | |
| 3370 /* Highlight the current line in the quickfix window. */ | |
| 644 | 3371 if (bt_quickfix(wp->w_buffer) && qf_current_entry(wp) == lnum) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3372 line_attr = HL_ATTR(HLF_L); |
| 7 | 3373 # endif |
| 3374 if (line_attr != 0) | |
| 3375 area_highlighting = TRUE; | |
| 3376 #endif | |
| 3377 | |
| 3378 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3379 ptr = line; | |
| 3380 | |
| 743 | 3381 #ifdef FEAT_SPELL |
| 348 | 3382 if (has_spell) |
| 3383 { | |
| 386 | 3384 /* For checking first word with a capital skip white space. */ |
| 3385 if (cap_col == 0) | |
| 835 | 3386 cap_col = (int)(skipwhite(line) - line); |
| 386 | 3387 |
| 348 | 3388 /* To be able to spell-check over line boundaries copy the end of the |
| 3389 * current line into nextline[]. Above the start of the next line was | |
| 3390 * copied to nextline[SPWORDLEN]. */ | |
| 3391 if (nextline[SPWORDLEN] == NUL) | |
| 3392 { | |
| 3393 /* No next line or it is empty. */ | |
| 3394 nextlinecol = MAXCOL; | |
| 3395 nextline_idx = 0; | |
| 3396 } | |
| 3397 else | |
| 3398 { | |
| 835 | 3399 v = (long)STRLEN(line); |
| 348 | 3400 if (v < SPWORDLEN) |
| 3401 { | |
| 3402 /* Short line, use it completely and append the start of the | |
| 3403 * next line. */ | |
| 3404 nextlinecol = 0; | |
| 3405 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3406 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3407 nextline_idx = v + 1; |
| 3408 } | |
| 3409 else | |
| 3410 { | |
| 3411 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3412 nextlinecol = v - SPWORDLEN; | |
| 3413 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3414 nextline_idx = SPWORDLEN + 1; | |
| 3415 } | |
| 3416 } | |
| 3417 } | |
| 3418 #endif | |
| 3419 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3420 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3421 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3422 if (lcs_space || lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3423 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3424 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3425 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3426 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3427 trailcol = (colnr_T)STRLEN(ptr); |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
3428 while (trailcol > (colnr_T)0 && VIM_ISWHITE(ptr[trailcol - 1])) |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3429 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3430 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3431 } |
| 7 | 3432 } |
| 3433 | |
| 3434 /* | |
| 3435 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3436 * first character to be displayed. | |
| 3437 */ | |
| 3438 if (wp->w_p_wrap) | |
| 3439 v = wp->w_skipcol; | |
| 3440 else | |
| 3441 v = wp->w_leftcol; | |
| 3442 if (v > 0) | |
| 3443 { | |
| 3444 #ifdef FEAT_MBYTE | |
| 3445 char_u *prev_ptr = ptr; | |
| 3446 #endif | |
| 3447 while (vcol < v && *ptr != NUL) | |
| 3448 { | |
| 5995 | 3449 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3450 vcol += c; |
| 3451 #ifdef FEAT_MBYTE | |
| 3452 prev_ptr = ptr; | |
| 39 | 3453 #endif |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3454 MB_PTR_ADV(ptr); |
| 7 | 3455 } |
| 3456 | |
| 1984 | 3457 /* When: |
| 3458 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3459 * - 'colorcolumn' is set, or |
| 1984 | 3460 * - 'virtualedit' is set, or |
| 3461 * - the visual mode is active, | |
| 3462 * the end of the line may be before the start of the displayed part. | |
| 3463 */ | |
| 3464 if (vcol < v && ( | |
| 5735 | 3465 #ifdef FEAT_SYN_HL |
| 3466 wp->w_p_cuc || draw_color_col || | |
| 3467 #endif | |
| 3468 #ifdef FEAT_VIRTUALEDIT | |
| 3469 virtual_active() || | |
| 3470 #endif | |
| 3471 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 1984 | 3472 { |
| 7 | 3473 vcol = v; |
| 1984 | 3474 } |
| 7 | 3475 |
| 3476 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3477 * that character but skip the first few screen characters. */ | |
| 3478 if (vcol > v) | |
| 3479 { | |
| 3480 vcol -= c; | |
| 3481 #ifdef FEAT_MBYTE | |
| 3482 ptr = prev_ptr; | |
| 3483 #else | |
| 3484 --ptr; | |
| 3485 #endif | |
|
11010
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3486 /* If the character fits on the screen, don't need to skip it. |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3487 * Except for a TAB. */ |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3488 if (( |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3489 #ifdef FEAT_MBYTE |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3490 (*mb_ptr2cells)(ptr) >= c || |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3491 #endif |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3492 *ptr == TAB) && col == 0) |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3493 n_skip = v - vcol; |
| 7 | 3494 } |
| 3495 | |
| 3496 /* | |
| 3497 * Adjust for when the inverted text is before the screen, | |
| 3498 * and when the start of the inverted text is before the screen. | |
| 3499 */ | |
| 3500 if (tocol <= vcol) | |
| 3501 fromcol = 0; | |
| 3502 else if (fromcol >= 0 && fromcol < vcol) | |
| 3503 fromcol = vcol; | |
| 3504 | |
| 3505 #ifdef FEAT_LINEBREAK | |
| 3506 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3507 if (wp->w_p_wrap) | |
| 3508 need_showbreak = TRUE; | |
| 3509 #endif | |
| 743 | 3510 #ifdef FEAT_SPELL |
| 499 | 3511 /* When spell checking a word we need to figure out the start of the |
| 3512 * word and if it's badly spelled or not. */ | |
| 3513 if (has_spell) | |
| 3514 { | |
| 3515 int len; | |
| 1536 | 3516 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3517 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3518 |
| 3519 pos = wp->w_cursor; | |
| 3520 wp->w_cursor.lnum = lnum; | |
| 1536 | 3521 wp->w_cursor.col = linecol; |
| 534 | 3522 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3523 |
| 3524 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3525 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3526 ptr = line + linecol; | |
| 3527 | |
| 530 | 3528 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3529 { |
| 3530 /* no bad word found at line start, don't check until end of a | |
| 3531 * word */ | |
| 534 | 3532 spell_hlf = HLF_COUNT; |
| 3572 | 3533 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3534 } |
| 3535 else | |
| 534 | 3536 { |
| 499 | 3537 /* bad word found, use attributes until end of word */ |
| 3538 word_end = wp->w_cursor.col + len + 1; | |
| 3539 | |
| 534 | 3540 /* Turn index into actual attributes. */ |
| 3541 if (spell_hlf != HLF_COUNT) | |
| 3542 spell_attr = highlight_attr[spell_hlf]; | |
| 3543 } | |
| 499 | 3544 wp->w_cursor = pos; |
| 501 | 3545 |
| 743 | 3546 # ifdef FEAT_SYN_HL |
| 501 | 3547 /* Need to restart syntax highlighting for this line. */ |
| 3548 if (has_syntax) | |
| 3549 syntax_start(wp, lnum); | |
| 743 | 3550 # endif |
| 499 | 3551 } |
| 3552 #endif | |
| 7 | 3553 } |
| 3554 | |
| 3555 /* | |
| 3556 * Correct highlighting for cursor that can't be disabled. | |
| 3557 * Avoids having to check this for each character. | |
| 3558 */ | |
| 3559 if (fromcol >= 0) | |
| 3560 { | |
| 3561 if (noinvcur) | |
| 3562 { | |
| 3563 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3564 { | |
| 3565 /* highlighting starts at cursor, let it start just after the | |
| 3566 * cursor */ | |
| 3567 fromcol_prev = fromcol; | |
| 3568 fromcol = -1; | |
| 3569 } | |
| 3570 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3571 /* restart highlighting after the cursor */ | |
| 3572 fromcol_prev = wp->w_virtcol; | |
| 3573 } | |
| 3574 if (fromcol >= tocol) | |
| 3575 fromcol = -1; | |
| 3576 } | |
| 3577 | |
| 3578 #ifdef FEAT_SEARCH_EXTRA | |
| 3579 /* | |
| 1326 | 3580 * Handle highlighting the last used search pattern and matches. |
| 3581 * Do this for both search_hl and the match list. | |
| 7 | 3582 */ |
| 1326 | 3583 cur = wp->w_match_head; |
| 3584 shl_flag = FALSE; | |
| 3585 while (cur != NULL || shl_flag == FALSE) | |
| 3586 { | |
| 3587 if (shl_flag == FALSE) | |
| 3588 { | |
| 3589 shl = &search_hl; | |
| 3590 shl_flag = TRUE; | |
| 3591 } | |
| 3592 else | |
| 3593 shl = &cur->hl; | |
| 36 | 3594 shl->startcol = MAXCOL; |
| 3595 shl->endcol = MAXCOL; | |
| 7 | 3596 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3597 shl->is_addpos = FALSE; |
| 5979 | 3598 v = (long)(ptr - line); |
| 3599 if (cur != NULL) | |
| 3600 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3601 next_search_hl(wp, shl, lnum, (colnr_T)v, |
|
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3602 shl == &search_hl ? NULL : cur); |
| 5979 | 3603 |
| 3604 /* Need to get the line again, a multi-line regexp may have made it | |
| 3605 * invalid. */ | |
| 3606 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3607 ptr = line + v; | |
| 3608 | |
| 3609 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3610 { | |
| 3611 if (shl->lnum == lnum) | |
| 3612 shl->startcol = shl->rm.startpos[0].col; | |
| 3613 else | |
| 3614 shl->startcol = 0; | |
| 3615 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3616 - shl->rm.startpos[0].lnum) | |
| 3617 shl->endcol = shl->rm.endpos[0].col; | |
| 3618 else | |
| 3619 shl->endcol = MAXCOL; | |
| 3620 /* Highlight one character for an empty match. */ | |
| 3621 if (shl->startcol == shl->endcol) | |
| 3622 { | |
| 3623 #ifdef FEAT_MBYTE | |
| 3624 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3625 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3626 else |
| 5979 | 3627 #endif |
| 3628 ++shl->endcol; | |
| 3629 } | |
| 3630 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3631 { | |
| 3632 shl->attr_cur = shl->attr; | |
| 3633 search_attr = shl->attr; | |
| 3634 } | |
| 3635 area_highlighting = TRUE; | |
| 7 | 3636 } |
| 1326 | 3637 if (shl != &search_hl && cur != NULL) |
| 3638 cur = cur->next; | |
| 7 | 3639 } |
| 3640 #endif | |
| 3641 | |
| 743 | 3642 #ifdef FEAT_SYN_HL |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3643 /* 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
|
3644 * 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
|
3645 * then. */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3646 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
| 5979 | 3647 && !(wp == curwin && VIsual_active)) |
| 743 | 3648 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3649 line_attr = HL_ATTR(HLF_CUL); |
| 743 | 3650 area_highlighting = TRUE; |
| 3651 } | |
| 3652 #endif | |
| 3653 | |
| 504 | 3654 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3655 col = 0; |
| 3656 #ifdef FEAT_RIGHTLEFT | |
| 3657 if (wp->w_p_rl) | |
| 3658 { | |
| 3659 /* Rightleft window: process the text in the normal direction, but put | |
| 3660 * it in current_ScreenLine[] from right to left. Start at the | |
| 3661 * rightmost column of the window. */ | |
| 3662 col = W_WIDTH(wp) - 1; | |
| 3663 off += col; | |
| 3664 } | |
| 3665 #endif | |
| 3666 | |
| 3667 /* | |
| 3668 * Repeat for the whole displayed line. | |
| 3669 */ | |
| 3670 for (;;) | |
| 3671 { | |
| 6947 | 3672 #ifdef FEAT_CONCEAL |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3673 has_match_conc = 0; |
| 6947 | 3674 #endif |
| 7 | 3675 /* Skip this quickly when working on the text. */ |
| 3676 if (draw_state != WL_LINE) | |
| 3677 { | |
| 3678 #ifdef FEAT_CMDWIN | |
| 3679 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3680 { | |
| 3681 draw_state = WL_CMDLINE; | |
| 3682 if (cmdwin_type != 0 && wp == curwin) | |
| 3683 { | |
| 3684 /* Draw the cmdline character. */ | |
| 3685 n_extra = 1; | |
| 1340 | 3686 c_extra = cmdwin_type; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3687 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3688 } |
| 3689 } | |
| 3690 #endif | |
| 3691 | |
| 3692 #ifdef FEAT_FOLDING | |
| 3693 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3694 { | |
| 6553 | 3695 int fdc = compute_foldcolumn(wp, 0); |
| 3696 | |
| 7 | 3697 draw_state = WL_FOLD; |
| 6553 | 3698 if (fdc > 0) |
| 7 | 3699 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3700 /* Draw the 'foldcolumn'. Allocate a buffer, "extra" may |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
3701 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3702 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3703 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3704 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3705 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3706 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3707 fill_foldcolumn(p_extra_free, wp, FALSE, lnum); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3708 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3709 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3710 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3711 c_extra = NUL; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3712 char_attr = HL_ATTR(HLF_FC); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3713 } |
| 7 | 3714 } |
| 3715 } | |
| 3716 #endif | |
| 3717 | |
| 3718 #ifdef FEAT_SIGNS | |
| 3719 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3720 { | |
| 3721 draw_state = WL_SIGN; | |
| 3722 /* Show the sign column when there are any signs in this | |
| 3723 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3724 if (signcolumn_on(wp)) |
| 7 | 3725 { |
| 2661 | 3726 int text_sign; |
| 7 | 3727 # ifdef FEAT_SIGN_ICONS |
| 2661 | 3728 int icon_sign; |
| 7 | 3729 # endif |
| 3730 | |
| 3731 /* Draw two cells with the sign value or blank. */ | |
| 3732 c_extra = ' '; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3733 char_attr = HL_ATTR(HLF_SC); |
| 7 | 3734 n_extra = 2; |
| 3735 | |
| 5921 | 3736 if (row == startrow |
| 3737 #ifdef FEAT_DIFF | |
| 3738 + filler_lines && filler_todo <= 0 | |
| 3739 #endif | |
| 3740 ) | |
| 7 | 3741 { |
| 3742 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3743 SIGN_TEXT); | |
| 3744 # ifdef FEAT_SIGN_ICONS | |
| 3745 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3746 SIGN_ICON); | |
| 3747 if (gui.in_use && icon_sign != 0) | |
| 3748 { | |
| 3749 /* Use the image in this position. */ | |
| 3750 c_extra = SIGN_BYTE; | |
| 3751 # ifdef FEAT_NETBEANS_INTG | |
| 3752 if (buf_signcount(wp->w_buffer, lnum) > 1) | |
| 3753 c_extra = MULTISIGN_BYTE; | |
| 3754 # endif | |
| 3755 char_attr = icon_sign; | |
| 3756 } | |
| 3757 else | |
| 3758 # endif | |
| 3759 if (text_sign != 0) | |
| 3760 { | |
| 3761 p_extra = sign_get_text(text_sign); | |
| 3762 if (p_extra != NULL) | |
| 3763 { | |
| 3764 c_extra = NUL; | |
| 835 | 3765 n_extra = (int)STRLEN(p_extra); |
| 7 | 3766 } |
| 3767 char_attr = sign_get_attr(text_sign, FALSE); | |
| 3768 } | |
| 3769 } | |
| 3770 } | |
| 3771 } | |
| 3772 #endif | |
| 3773 | |
| 3774 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3775 { | |
| 3776 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3777 /* 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
|
3778 * 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
|
3779 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3780 && (row == startrow |
| 3781 #ifdef FEAT_DIFF | |
| 3782 + filler_lines | |
| 3783 #endif | |
| 3784 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3785 { | |
| 3786 /* Draw the line number (empty space after wrapping). */ | |
| 3787 if (row == startrow | |
| 3788 #ifdef FEAT_DIFF | |
| 3789 + filler_lines | |
| 3790 #endif | |
| 3791 ) | |
| 3792 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3793 long num; |
| 4065 | 3794 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3795 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3796 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
|
3797 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3798 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3799 else |
| 4065 | 3800 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3801 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3802 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
|
3803 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3804 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3805 /* 'number' + 'relativenumber' */ |
| 4065 | 3806 num = lnum; |
| 3807 fmt = "%-*ld "; | |
| 3808 } | |
| 3809 } | |
| 3810 | |
| 3811 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3812 number_width(wp), num); |
| 7 | 3813 if (wp->w_skipcol > 0) |
| 3814 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3815 *p_extra = '-'; | |
| 3816 #ifdef FEAT_RIGHTLEFT | |
| 3817 if (wp->w_p_rl) /* reverse line numbers */ | |
| 3818 rl_mirror(extra); | |
| 3819 #endif | |
| 3820 p_extra = extra; | |
| 3821 c_extra = NUL; | |
| 3822 } | |
| 3823 else | |
| 3824 c_extra = ' '; | |
| 13 | 3825 n_extra = number_width(wp) + 1; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3826 char_attr = HL_ATTR(HLF_N); |
| 743 | 3827 #ifdef FEAT_SYN_HL |
| 3828 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 3829 * the current line differently. |
| 3830 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 3831 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3832 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 3833 && lnum == wp->w_cursor.lnum) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3834 char_attr = HL_ATTR(HLF_CLN); |
| 743 | 3835 #endif |
| 7 | 3836 } |
| 3837 } | |
| 3838 | |
| 5995 | 3839 #ifdef FEAT_LINEBREAK |
| 3840 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 3841 && n_extra == 0 && *p_sbr != NUL) | |
| 3842 /* draw indent after showbreak value */ | |
| 3843 draw_state = WL_BRI; | |
| 3844 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 3845 /* After the showbreak, draw the breakindent */ | |
| 3846 draw_state = WL_BRI - 1; | |
| 3847 | |
| 3848 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 3849 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 3850 { | |
| 3851 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3852 /* if need_showbreak is set, breakindent also applies */ |
|
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3853 if (wp->w_p_bri && n_extra == 0 |
|
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3854 && (row != startrow || need_showbreak) |
| 5995 | 3855 # ifdef FEAT_DIFF |
| 3856 && filler_lines == 0 | |
| 6834 | 3857 # endif |
| 5995 | 3858 ) |
| 3859 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3860 char_attr = 0; |
| 6834 | 3861 # ifdef FEAT_DIFF |
| 5995 | 3862 if (diff_hlf != (hlf_T)0) |
| 6106 | 3863 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3864 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 3865 # ifdef FEAT_SYN_HL |
| 6106 | 3866 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 3867 char_attr = hl_combine_attr(char_attr, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3868 HL_ATTR(HLF_CUL)); |
| 6834 | 3869 # endif |
| 6106 | 3870 } |
| 6834 | 3871 # endif |
| 6028 | 3872 p_extra = NULL; |
| 5995 | 3873 c_extra = ' '; |
| 3874 n_extra = get_breakindent_win(wp, | |
| 3875 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 3876 /* Correct end of highlighted area for 'breakindent', | |
| 3877 * required when 'linebreak' is also set. */ | |
| 3878 if (tocol == vcol) | |
| 3879 tocol += n_extra; | |
| 3880 } | |
| 3881 } | |
| 3882 #endif | |
| 3883 | |
| 7 | 3884 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 3885 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 3886 { | |
| 3887 draw_state = WL_SBR; | |
| 3888 # ifdef FEAT_DIFF | |
| 3889 if (filler_todo > 0) | |
| 3890 { | |
| 3891 /* Draw "deleted" diff line(s). */ | |
| 3892 if (char2cells(fill_diff) > 1) | |
| 3893 c_extra = '-'; | |
| 3894 else | |
| 3895 c_extra = fill_diff; | |
| 3896 # ifdef FEAT_RIGHTLEFT | |
| 3897 if (wp->w_p_rl) | |
| 3898 n_extra = col + 1; | |
| 3899 else | |
| 3900 # endif | |
| 3901 n_extra = W_WIDTH(wp) - col; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3902 char_attr = HL_ATTR(HLF_DED); |
| 7 | 3903 } |
| 3904 # endif | |
| 3905 # ifdef FEAT_LINEBREAK | |
| 3906 if (*p_sbr != NUL && need_showbreak) | |
| 3907 { | |
| 3908 /* Draw 'showbreak' at the start of each broken line. */ | |
| 3909 p_extra = p_sbr; | |
| 3910 c_extra = NUL; | |
| 3911 n_extra = (int)STRLEN(p_sbr); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3912 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3913 need_showbreak = FALSE; |
| 6503 | 3914 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 3915 /* Correct end of highlighted area for 'showbreak', |
| 3916 * required when 'linebreak' is also set. */ | |
| 3917 if (tocol == vcol) | |
| 3918 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3919 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3920 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3921 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 3922 char_attr = hl_combine_attr(char_attr, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3923 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3924 #endif |
| 7 | 3925 } |
| 3926 # endif | |
| 3927 } | |
| 3928 #endif | |
| 3929 | |
| 3930 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 3931 { | |
| 3932 draw_state = WL_LINE; | |
| 3933 if (saved_n_extra) | |
| 3934 { | |
| 3935 /* Continue item from end of wrapped line. */ | |
| 3936 n_extra = saved_n_extra; | |
| 3937 c_extra = saved_c_extra; | |
| 3938 p_extra = saved_p_extra; | |
| 3939 char_attr = saved_char_attr; | |
| 3940 } | |
| 3941 else | |
| 3942 char_attr = 0; | |
| 3943 } | |
| 3944 } | |
| 3945 | |
| 3946 /* When still displaying '$' of change command, stop at cursor */ | |
| 3318 | 3947 if (dollar_vcol >= 0 && wp == curwin |
| 819 | 3948 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 3949 #ifdef FEAT_DIFF |
| 3950 && filler_todo <= 0 | |
| 3951 #endif | |
| 3952 ) | |
| 3953 { | |
| 3954 SCREEN_LINE(screen_row, W_WINCOL(wp), col, -(int)W_WIDTH(wp), | |
| 3955 wp->w_p_rl); | |
| 819 | 3956 /* Pretend we have finished updating the window. Except when |
| 3957 * 'cursorcolumn' is set. */ | |
| 3958 #ifdef FEAT_SYN_HL | |
| 3959 if (wp->w_p_cuc) | |
| 3960 row = wp->w_cline_row + wp->w_cline_height; | |
| 3961 else | |
| 3962 #endif | |
| 3963 row = wp->w_height; | |
| 7 | 3964 break; |
| 3965 } | |
| 3966 | |
| 3967 if (draw_state == WL_LINE && area_highlighting) | |
| 3968 { | |
| 3969 /* handle Visual or match highlighting in this line */ | |
| 3970 if (vcol == fromcol | |
| 3971 #ifdef FEAT_MBYTE | |
| 3972 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 3973 && (*mb_ptr2cells)(ptr) > 1) | |
| 3974 #endif | |
| 3975 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 3976 && vcol_prev < vcol /* not at margin */ |
| 7 | 3977 && vcol < tocol)) |
| 3978 area_attr = attr; /* start highlighting */ | |
| 3979 else if (area_attr != 0 | |
| 3980 && (vcol == tocol | |
| 3981 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 3982 area_attr = 0; /* stop highlighting */ | |
| 3983 | |
| 3984 #ifdef FEAT_SEARCH_EXTRA | |
| 3985 if (!n_extra) | |
| 3986 { | |
| 3987 /* | |
| 3988 * Check for start/end of search pattern match. | |
| 3989 * After end, check for start/end of next match. | |
| 3990 * When another match, have to check for start again. | |
| 3991 * Watch out for matching an empty string! | |
| 1326 | 3992 * Do this for 'search_hl' and the match list (ordered by |
| 3993 * priority). | |
| 7 | 3994 */ |
| 36 | 3995 v = (long)(ptr - line); |
| 1326 | 3996 cur = wp->w_match_head; |
| 3997 shl_flag = FALSE; | |
| 3998 while (cur != NULL || shl_flag == FALSE) | |
| 3999 { | |
| 4000 if (shl_flag == FALSE | |
| 4001 && ((cur != NULL | |
| 4002 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4003 || cur == NULL)) | |
| 4004 { | |
| 4005 shl = &search_hl; | |
| 4006 shl_flag = TRUE; | |
| 4007 } | |
| 4008 else | |
| 4009 shl = &cur->hl; | |
| 5979 | 4010 if (cur != NULL) |
| 4011 cur->pos.cur = 0; | |
| 4012 pos_inprogress = TRUE; | |
| 4013 while (shl->rm.regprog != NULL | |
| 4014 || (cur != NULL && pos_inprogress)) | |
| 7 | 4015 { |
| 36 | 4016 if (shl->startcol != MAXCOL |
| 4017 && v >= (long)shl->startcol | |
| 4018 && v < (long)shl->endcol) | |
| 7 | 4019 { |
| 6430 | 4020 #ifdef FEAT_MBYTE |
| 4021 int tmp_col = v + MB_PTR2LEN(ptr); | |
| 4022 | |
| 4023 if (shl->endcol < tmp_col) | |
| 4024 shl->endcol = tmp_col; | |
| 4025 #endif | |
| 7 | 4026 shl->attr_cur = shl->attr; |
| 6947 | 4027 #ifdef FEAT_CONCEAL |
| 4028 if (cur != NULL && syn_name2id((char_u *)"Conceal") | |
| 4029 == cur->hlg_id) | |
| 4030 { | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4031 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4032 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4033 match_conc = cur->conceal_char; |
| 4034 } | |
| 4035 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4036 has_match_conc = match_conc = 0; |
| 6947 | 4037 #endif |
| 7 | 4038 } |
| 6430 | 4039 else if (v == (long)shl->endcol) |
| 7 | 4040 { |
| 4041 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4042 next_search_hl(wp, shl, lnum, (colnr_T)v, |
|
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4043 shl == &search_hl ? NULL : cur); |
| 5979 | 4044 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4045 ? FALSE : TRUE; |
| 7 | 4046 |
| 4047 /* Need to get the line again, a multi-line regexp | |
| 4048 * may have made it invalid. */ | |
| 4049 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4050 ptr = line + v; | |
| 4051 | |
| 4052 if (shl->lnum == lnum) | |
| 4053 { | |
| 36 | 4054 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4055 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4056 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4057 else |
| 36 | 4058 shl->endcol = MAXCOL; |
| 4059 | |
| 4060 if (shl->startcol == shl->endcol) | |
| 7 | 4061 { |
| 4062 /* highlight empty match, try again after | |
| 4063 * it */ | |
| 4064 #ifdef FEAT_MBYTE | |
| 4065 if (has_mbyte) | |
| 474 | 4066 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4067 + shl->endcol); |
| 7 | 4068 else |
| 4069 #endif | |
| 36 | 4070 ++shl->endcol; |
| 7 | 4071 } |
| 4072 | |
| 4073 /* Loop to check if the match starts at the | |
| 4074 * current position */ | |
| 4075 continue; | |
| 4076 } | |
| 4077 } | |
| 4078 break; | |
| 4079 } | |
| 1326 | 4080 if (shl != &search_hl && cur != NULL) |
| 4081 cur = cur->next; | |
| 4082 } | |
| 4083 | |
| 4084 /* Use attributes from match with highest priority among | |
| 4085 * 'search_hl' and the match list. */ | |
| 4086 search_attr = search_hl.attr_cur; | |
| 4087 cur = wp->w_match_head; | |
| 4088 shl_flag = FALSE; | |
| 4089 while (cur != NULL || shl_flag == FALSE) | |
| 4090 { | |
| 4091 if (shl_flag == FALSE | |
| 4092 && ((cur != NULL | |
| 4093 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4094 || cur == NULL)) | |
| 699 | 4095 { |
| 1326 | 4096 shl = &search_hl; |
| 4097 shl_flag = TRUE; | |
| 699 | 4098 } |
| 1326 | 4099 else |
| 4100 shl = &cur->hl; | |
| 4101 if (shl->attr_cur != 0) | |
| 4102 search_attr = shl->attr_cur; | |
| 4103 if (shl != &search_hl && cur != NULL) | |
| 4104 cur = cur->next; | |
| 4105 } | |
| 7 | 4106 } |
| 4107 #endif | |
| 4108 | |
| 4109 #ifdef FEAT_DIFF | |
| 674 | 4110 if (diff_hlf != (hlf_T)0) |
| 7 | 4111 { |
| 1295 | 4112 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4113 && n_extra == 0) | |
| 7 | 4114 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4115 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4116 && n_extra == 0) | |
| 7 | 4117 diff_hlf = HLF_CHD; /* changed line */ |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4118 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4119 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4120 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4121 } |
| 4122 #endif | |
| 4123 | |
| 4124 /* Decide which of the highlight attributes to use. */ | |
| 4125 attr_pri = TRUE; | |
| 6717 | 4126 #ifdef LINE_ATTR |
| 674 | 4127 if (area_attr != 0) |
| 6717 | 4128 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4129 else if (search_attr != 0) |
| 6717 | 4130 char_attr = hl_combine_attr(line_attr, search_attr); |
| 674 | 4131 /* Use line_attr when not in the Visual or 'incsearch' area |
| 4132 * (area_attr may be 0 when "noinvcur" is set). */ | |
| 4133 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) | |
| 1842 | 4134 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4135 || vcol >= tocol)) | |
| 674 | 4136 char_attr = line_attr; |
| 6717 | 4137 #else |
| 4138 if (area_attr != 0) | |
| 4139 char_attr = area_attr; | |
| 4140 else if (search_attr != 0) | |
| 4141 char_attr = search_attr; | |
| 674 | 4142 #endif |
| 4143 else | |
| 4144 { | |
| 4145 attr_pri = FALSE; | |
| 4146 #ifdef FEAT_SYN_HL | |
| 4147 if (has_syntax) | |
| 4148 char_attr = syntax_attr; | |
| 4149 else | |
| 4150 #endif | |
| 4151 char_attr = 0; | |
| 4152 } | |
| 7 | 4153 } |
| 4154 | |
| 4155 /* | |
| 4156 * Get the next character to put on the screen. | |
| 4157 */ | |
| 4158 /* | |
| 1340 | 4159 * The "p_extra" points to the extra stuff that is inserted to |
| 4160 * represent special characters (non-printable stuff) and other | |
| 4161 * things. When all characters are the same, c_extra is used. | |
| 4162 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past | |
| 4163 * "p_extra[n_extra]". | |
| 7 | 4164 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4165 */ | |
| 4166 if (n_extra > 0) | |
| 4167 { | |
| 4168 if (c_extra != NUL) | |
| 4169 { | |
| 4170 c = c_extra; | |
| 4171 #ifdef FEAT_MBYTE | |
| 4172 mb_c = c; /* doesn't handle non-utf-8 multi-byte! */ | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4173 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4174 { |
| 4175 mb_utf8 = TRUE; | |
| 714 | 4176 u8cc[0] = 0; |
| 819 | 4177 c = 0xc0; |
| 7 | 4178 } |
| 4179 else | |
| 4180 mb_utf8 = FALSE; | |
| 4181 #endif | |
| 4182 } | |
| 4183 else | |
| 4184 { | |
| 4185 c = *p_extra; | |
| 4186 #ifdef FEAT_MBYTE | |
| 4187 if (has_mbyte) | |
| 4188 { | |
| 4189 mb_c = c; | |
| 4190 if (enc_utf8) | |
| 4191 { | |
| 4192 /* If the UTF-8 character is more than one byte: | |
| 4193 * Decode it into "mb_c". */ | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4194 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4195 mb_utf8 = FALSE; |
| 4196 if (mb_l > n_extra) | |
| 4197 mb_l = 1; | |
| 4198 else if (mb_l > 1) | |
| 4199 { | |
| 714 | 4200 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4201 mb_utf8 = TRUE; |
| 819 | 4202 c = 0xc0; |
| 7 | 4203 } |
| 4204 } | |
| 4205 else | |
| 4206 { | |
| 4207 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4208 mb_l = MB_BYTE2LEN(c); | |
| 4209 if (mb_l >= n_extra) | |
| 4210 mb_l = 1; | |
| 4211 else if (mb_l > 1) | |
| 4212 mb_c = (c << 8) + p_extra[1]; | |
| 4213 } | |
| 504 | 4214 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4215 mb_l = 1; | |
| 4216 | |
| 7 | 4217 /* If a double-width char doesn't fit display a '>' in the |
| 4218 * last column. */ | |
| 504 | 4219 if (( |
| 7 | 4220 # ifdef FEAT_RIGHTLEFT |
| 4221 wp->w_p_rl ? (col <= 0) : | |
| 4222 # endif | |
| 504 | 4223 (col >= W_WIDTH(wp) - 1)) |
| 7 | 4224 && (*mb_char2cells)(mb_c) == 2) |
| 4225 { | |
| 4226 c = '>'; | |
| 4227 mb_c = c; | |
| 4228 mb_l = 1; | |
| 4229 mb_utf8 = FALSE; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4230 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4231 /* put the pointer back to output the double-width |
| 4232 * character at the start of the next line. */ | |
| 4233 ++n_extra; | |
| 4234 --p_extra; | |
| 4235 } | |
| 4236 else | |
| 4237 { | |
| 4238 n_extra -= mb_l - 1; | |
| 4239 p_extra += mb_l - 1; | |
| 4240 } | |
| 4241 } | |
| 4242 #endif | |
| 4243 ++p_extra; | |
| 4244 } | |
| 4245 --n_extra; | |
| 4246 } | |
| 4247 else | |
| 4248 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4249 #ifdef FEAT_LINEBREAK |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4250 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4251 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4252 |
| 6026 | 4253 if (p_extra_free != NULL) |
| 4254 { | |
| 4255 vim_free(p_extra_free); | |
| 4256 p_extra_free = NULL; | |
| 4257 } | |
| 7 | 4258 /* |
| 4259 * Get a character from the line itself. | |
| 4260 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4261 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4262 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4263 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4264 #endif |
| 7 | 4265 #ifdef FEAT_MBYTE |
| 4266 if (has_mbyte) | |
| 4267 { | |
| 4268 mb_c = c; | |
| 4269 if (enc_utf8) | |
| 4270 { | |
| 4271 /* If the UTF-8 character is more than one byte: Decode it | |
| 4272 * into "mb_c". */ | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4273 mb_l = utfc_ptr2len(ptr); |
| 7 | 4274 mb_utf8 = FALSE; |
| 4275 if (mb_l > 1) | |
| 4276 { | |
| 714 | 4277 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4278 /* Overlong encoded ASCII or ASCII with composing char |
| 4279 * is displayed normally, except a NUL. */ | |
| 4280 if (mb_c < 0x80) | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4281 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4282 c = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4283 # ifdef FEAT_LINEBREAK |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4284 c0 = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4285 # endif |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4286 } |
| 7 | 4287 mb_utf8 = TRUE; |
| 507 | 4288 |
| 4289 /* At start of the line we can have a composing char. | |
| 4290 * Draw it as a space with a composing char. */ | |
| 4291 if (utf_iscomposing(mb_c)) | |
| 4292 { | |
| 1326 | 4293 int i; |
| 4294 | |
| 714 | 4295 for (i = Screen_mco - 1; i > 0; --i) |
| 4296 u8cc[i] = u8cc[i - 1]; | |
| 4297 u8cc[0] = mb_c; | |
| 507 | 4298 mb_c = ' '; |
| 4299 } | |
| 7 | 4300 } |
| 4301 | |
| 4302 if ((mb_l == 1 && c >= 0x80) | |
| 4303 || (mb_l >= 1 && mb_c == 0) | |
| 4304 || (mb_l > 1 && (!vim_isprintc(mb_c) | |
| 1401 | 4305 # ifdef UNICODE16 |
| 4306 || mb_c >= 0x10000 | |
| 4307 # endif | |
| 4308 ))) | |
| 7 | 4309 { |
| 4310 /* | |
| 4311 * Illegal UTF-8 byte: display as <xx>. | |
| 4312 * Non-BMP character : display as ? or fullwidth ?. | |
| 4313 */ | |
| 1401 | 4314 # ifdef UNICODE16 |
| 7 | 4315 if (mb_c < 0x10000) |
| 1401 | 4316 # endif |
| 7 | 4317 { |
| 4318 transchar_hex(extra, mb_c); | |
| 714 | 4319 # ifdef FEAT_RIGHTLEFT |
| 7 | 4320 if (wp->w_p_rl) /* reverse */ |
| 4321 rl_mirror(extra); | |
| 714 | 4322 # endif |
| 7 | 4323 } |
| 1401 | 4324 # ifdef UNICODE16 |
| 7 | 4325 else if (utf_char2cells(mb_c) != 2) |
| 4326 STRCPY(extra, "?"); | |
| 4327 else | |
| 4328 /* 0xff1f in UTF-8: full-width '?' */ | |
| 4329 STRCPY(extra, "\357\274\237"); | |
| 1401 | 4330 # endif |
| 7 | 4331 |
| 4332 p_extra = extra; | |
| 4333 c = *p_extra; | |
| 4334 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4335 mb_utf8 = (c >= 0x80); | |
| 4336 n_extra = (int)STRLEN(p_extra); | |
| 4337 c_extra = NUL; | |
| 4338 if (area_attr == 0 && search_attr == 0) | |
| 4339 { | |
| 4340 n_attr = n_extra + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4341 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4342 saved_attr2 = char_attr; /* save current attr */ |
| 4343 } | |
| 4344 } | |
| 4345 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4346 mb_l = 1; | |
| 4347 #ifdef FEAT_ARABIC | |
| 4348 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4349 { | |
| 4350 /* Do Arabic shaping. */ | |
| 714 | 4351 int pc, pc1, nc; |
| 4352 int pcc[MAX_MCO]; | |
| 7 | 4353 |
| 4354 /* The idea of what is the previous and next | |
| 4355 * character depends on 'rightleft'. */ | |
| 4356 if (wp->w_p_rl) | |
| 4357 { | |
| 4358 pc = prev_c; | |
| 4359 pc1 = prev_c1; | |
| 4360 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4361 prev_c1 = u8cc[0]; |
| 7 | 4362 } |
| 4363 else | |
| 4364 { | |
| 714 | 4365 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4366 nc = prev_c; |
| 714 | 4367 pc1 = pcc[0]; |
| 7 | 4368 } |
| 4369 prev_c = mb_c; | |
| 4370 | |
| 714 | 4371 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4372 } |
| 4373 else | |
| 4374 prev_c = mb_c; | |
| 4375 #endif | |
| 4376 } | |
| 4377 else /* enc_dbcs */ | |
| 4378 { | |
| 4379 mb_l = MB_BYTE2LEN(c); | |
| 4380 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4381 mb_l = 1; | |
| 4382 else if (mb_l > 1) | |
| 4383 { | |
| 4384 /* We assume a second byte below 32 is illegal. | |
| 4385 * Hopefully this is OK for all double-byte encodings! | |
| 4386 */ | |
| 4387 if (ptr[1] >= 32) | |
| 4388 mb_c = (c << 8) + ptr[1]; | |
| 4389 else | |
| 4390 { | |
| 4391 if (ptr[1] == NUL) | |
| 4392 { | |
| 4393 /* head byte at end of line */ | |
| 4394 mb_l = 1; | |
| 4395 transchar_nonprint(extra, c); | |
| 4396 } | |
| 4397 else | |
| 4398 { | |
| 4399 /* illegal tail byte */ | |
| 4400 mb_l = 2; | |
| 4401 STRCPY(extra, "XX"); | |
| 4402 } | |
| 4403 p_extra = extra; | |
| 4404 n_extra = (int)STRLEN(extra) - 1; | |
| 4405 c_extra = NUL; | |
| 4406 c = *p_extra++; | |
| 4407 if (area_attr == 0 && search_attr == 0) | |
| 4408 { | |
| 4409 n_attr = n_extra + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4410 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4411 saved_attr2 = char_attr; /* save current attr */ |
| 4412 } | |
| 4413 mb_c = c; | |
| 4414 } | |
| 4415 } | |
| 4416 } | |
| 4417 /* If a double-width char doesn't fit display a '>' in the | |
| 4418 * last column; the character is displayed at the start of the | |
| 4419 * next line. */ | |
| 4420 if (( | |
| 4421 # ifdef FEAT_RIGHTLEFT | |
| 4422 wp->w_p_rl ? (col <= 0) : | |
| 4423 # endif | |
| 4424 (col >= W_WIDTH(wp) - 1)) | |
| 4425 && (*mb_char2cells)(mb_c) == 2) | |
| 4426 { | |
| 4427 c = '>'; | |
| 4428 mb_c = c; | |
| 4429 mb_utf8 = FALSE; | |
| 4430 mb_l = 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4431 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4432 /* Put pointer back so that the character will be |
| 4433 * displayed at the start of the next line. */ | |
| 4434 --ptr; | |
| 4435 } | |
| 4436 else if (*ptr != NUL) | |
| 4437 ptr += mb_l - 1; | |
| 4438 | |
| 4439 /* 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
|
4440 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4441 * 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
|
4442 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4443 { |
| 4444 n_extra = 1; | |
| 3586 | 4445 c_extra = MB_FILLER_CHAR; |
| 7 | 4446 c = ' '; |
| 4447 if (area_attr == 0 && search_attr == 0) | |
| 4448 { | |
| 4449 n_attr = n_extra + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4450 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4451 saved_attr2 = char_attr; /* save current attr */ |
| 4452 } | |
| 4453 mb_c = c; | |
| 4454 mb_utf8 = FALSE; | |
| 4455 mb_l = 1; | |
| 4456 } | |
| 4457 | |
| 4458 } | |
| 4459 #endif | |
| 4460 ++ptr; | |
| 4461 | |
| 4462 if (extra_check) | |
| 4463 { | |
| 743 | 4464 #ifdef FEAT_SPELL |
| 221 | 4465 int can_spell = TRUE; |
| 743 | 4466 #endif |
| 4467 | |
| 4468 #ifdef FEAT_SYN_HL | |
| 7 | 4469 /* Get syntax attribute, unless still at the start of the line |
| 4470 * (double-wide char that doesn't fit). */ | |
| 221 | 4471 v = (long)(ptr - line); |
| 4472 if (has_syntax && v > 0) | |
| 7 | 4473 { |
| 4474 /* Get the syntax attribute for the character. If there | |
| 4475 * is an error, disable syntax highlighting. */ | |
| 4476 save_did_emsg = did_emsg; | |
| 4477 did_emsg = FALSE; | |
| 4478 | |
| 221 | 4479 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4480 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4481 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4482 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4483 NULL, FALSE); |
| 7 | 4484 |
| 4485 if (did_emsg) | |
| 482 | 4486 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4487 wp->w_s->b_syn_error = TRUE; |
| 482 | 4488 has_syntax = FALSE; |
| 4489 } | |
| 7 | 4490 else |
| 4491 did_emsg = save_did_emsg; | |
| 4492 | |
| 4493 /* Need to get the line again, a multi-line regexp may | |
| 4494 * have made it invalid. */ | |
| 4495 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4496 ptr = line + v; | |
| 4497 | |
| 674 | 4498 if (!attr_pri) |
| 7 | 4499 char_attr = syntax_attr; |
| 301 | 4500 else |
| 303 | 4501 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
|
4502 # 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
|
4503 /* 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
|
4504 * 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
|
4505 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
|
4506 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
|
4507 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
|
4508 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
|
4509 # endif |
| 7 | 4510 } |
| 743 | 4511 #endif |
| 4512 | |
| 4513 #ifdef FEAT_SPELL | |
| 301 | 4514 /* Check spelling (unless at the end of the line). |
| 319 | 4515 * Only do this when there is no syntax highlighting, the |
| 4516 * @Spell cluster is not used or the current syntax item | |
| 4517 * contains the @Spell cluster. */ | |
| 348 | 4518 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4519 { |
| 230 | 4520 spell_attr = 0; |
| 743 | 4521 # ifdef FEAT_SYN_HL |
| 674 | 4522 if (!attr_pri) |
| 230 | 4523 char_attr = syntax_attr; |
| 743 | 4524 # endif |
| 4525 if (c != 0 && ( | |
| 4526 # ifdef FEAT_SYN_HL | |
| 4527 !has_syntax || | |
| 4528 # endif | |
| 4529 can_spell)) | |
| 221 | 4530 { |
| 348 | 4531 char_u *prev_ptr, *p; |
| 4532 int len; | |
| 534 | 4533 hlf_T spell_hlf = HLF_COUNT; |
| 221 | 4534 # ifdef FEAT_MBYTE |
| 336 | 4535 if (has_mbyte) |
| 4536 { | |
| 4537 prev_ptr = ptr - mb_l; | |
| 4538 v -= mb_l - 1; | |
| 4539 } | |
| 4540 else | |
| 221 | 4541 # endif |
| 336 | 4542 prev_ptr = ptr - 1; |
| 348 | 4543 |
| 4544 /* Use nextline[] if possible, it has the start of the | |
| 4545 * next line concatenated. */ | |
| 4546 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4547 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4548 else | |
| 4549 p = prev_ptr; | |
| 835 | 4550 cap_col -= (int)(prev_ptr - line); |
| 625 | 4551 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4552 nochange); | |
| 348 | 4553 word_end = v + len; |
| 301 | 4554 |
| 4555 /* In Insert mode only highlight a word that | |
| 4556 * doesn't touch the cursor. */ | |
| 534 | 4557 if (spell_hlf != HLF_COUNT |
| 301 | 4558 && (State & INSERT) != 0 |
| 4559 && wp->w_cursor.lnum == lnum | |
| 4560 && wp->w_cursor.col >= | |
| 4561 (colnr_T)(prev_ptr - line) | |
| 4562 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4563 { |
| 534 | 4564 spell_hlf = HLF_COUNT; |
| 301 | 4565 spell_redraw_lnum = lnum; |
| 221 | 4566 } |
| 348 | 4567 |
| 534 | 4568 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4569 && (p - nextline) + len > nextline_idx) |
| 4570 { | |
| 4571 /* Remember that the good word continues at the | |
| 4572 * start of the next line. */ | |
| 4573 checked_lnum = lnum + 1; | |
| 835 | 4574 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4575 } |
| 386 | 4576 |
| 534 | 4577 /* Turn index into actual attributes. */ |
| 4578 if (spell_hlf != HLF_COUNT) | |
| 4579 spell_attr = highlight_attr[spell_hlf]; | |
| 4580 | |
| 386 | 4581 if (cap_col > 0) |
| 4582 { | |
| 4583 if (p != prev_ptr | |
| 4584 && (p - nextline) + cap_col >= nextline_idx) | |
| 4585 { | |
| 4586 /* Remember that the word in the next line | |
| 4587 * must start with a capital. */ | |
| 4588 capcol_lnum = lnum + 1; | |
| 835 | 4589 cap_col = (int)((p - nextline) + cap_col |
| 4590 - nextline_idx); | |
| 386 | 4591 } |
| 4592 else | |
| 4593 /* Compute the actual column. */ | |
| 835 | 4594 cap_col += (int)(prev_ptr - line); |
| 386 | 4595 } |
| 221 | 4596 } |
| 4597 } | |
| 4598 if (spell_attr != 0) | |
| 348 | 4599 { |
| 674 | 4600 if (!attr_pri) |
| 348 | 4601 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4602 else | |
| 4603 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4604 } | |
| 7 | 4605 #endif |
| 4606 #ifdef FEAT_LINEBREAK | |
| 4607 /* | |
| 221 | 4608 * Found last space before word: check for line break. |
| 7 | 4609 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4610 if (wp->w_p_lbr && c0 == c |
|
11133
d8e830e32be9
patch 8.0.0454: compiler warnings for "always true" comparison
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4611 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4612 { |
| 6681 | 4613 # ifdef FEAT_MBYTE |
| 6693 | 4614 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
| 6681 | 4615 # endif |
| 5995 | 4616 char_u *p = ptr - ( |
| 7 | 4617 # ifdef FEAT_MBYTE |
| 6693 | 4618 mb_off + |
| 7 | 4619 # endif |
| 5995 | 4620 1); |
| 6681 | 4621 |
| 5995 | 4622 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4623 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4624 NULL) - 1; |
| 6371 | 4625 if (c == TAB && n_extra + col > W_WIDTH(wp)) |
| 4626 n_extra = (int)wp->w_buffer->b_p_ts | |
| 4627 - vcol % (int)wp->w_buffer->b_p_ts - 1; | |
| 4628 | |
| 6681 | 4629 # ifdef FEAT_MBYTE |
| 6693 | 4630 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; |
| 6681 | 4631 # else |
| 7 | 4632 c_extra = ' '; |
| 6681 | 4633 # endif |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4634 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4635 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4636 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4637 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4638 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4639 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4640 #endif |
| 6026 | 4641 if (!wp->w_p_list) |
| 4642 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4643 } |
| 7 | 4644 } |
| 4645 #endif | |
| 4646 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4647 /* '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
|
4648 */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4649 if (wp->w_p_list |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4650 && (((c == 160 |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4651 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4652 || (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
|
4653 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4654 ) && lcs_nbsp) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4655 || (c == ' ' && lcs_space && ptr - line <= trailcol))) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4656 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4657 c = (c == ' ') ? lcs_space : lcs_nbsp; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4658 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
|
4659 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4660 n_attr = 1; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4661 extra_attr = HL_ATTR(HLF_8); |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4662 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
|
4663 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4664 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4665 mb_c = c; |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4666 if (enc_utf8 && utf_char2len(c) > 1) |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4667 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4668 mb_utf8 = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4669 u8cc[0] = 0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4670 c = 0xc0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4671 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4672 else |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4673 mb_utf8 = FALSE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4674 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4675 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4676 |
| 7 | 4677 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4678 { | |
| 4679 c = lcs_trail; | |
| 674 | 4680 if (!attr_pri) |
| 7 | 4681 { |
| 4682 n_attr = 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4683 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4684 saved_attr2 = char_attr; /* save current attr */ |
| 4685 } | |
| 4686 #ifdef FEAT_MBYTE | |
| 4687 mb_c = c; | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4688 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4689 { |
| 4690 mb_utf8 = TRUE; | |
| 714 | 4691 u8cc[0] = 0; |
| 819 | 4692 c = 0xc0; |
| 7 | 4693 } |
| 4694 else | |
| 4695 mb_utf8 = FALSE; | |
| 4696 #endif | |
| 4697 } | |
| 4698 } | |
| 4699 | |
| 4700 /* | |
| 4701 * Handling of non-printable characters. | |
| 4702 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4703 if (!vim_isprintc(c)) |
| 7 | 4704 { |
| 4705 /* | |
| 4706 * when getting a character from the file, we may have to | |
| 4707 * turn it into something else on the way to putting it | |
| 4708 * into "ScreenLines". | |
| 4709 */ | |
| 4710 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4711 { | |
| 6026 | 4712 int tab_len = 0; |
| 6503 | 4713 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 4714 #ifdef FEAT_LINEBREAK | |
| 4715 /* only adjust the tab_len, when at the first column | |
| 4716 * after the showbreak value was drawn */ | |
| 4717 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 4718 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 4719 #endif | |
| 7 | 4720 /* tab amount depends on current column */ |
| 6026 | 4721 tab_len = (int)wp->w_buffer->b_p_ts |
| 6503 | 4722 - vcol_adjusted % (int)wp->w_buffer->b_p_ts - 1; |
| 4723 | |
| 6026 | 4724 #ifdef FEAT_LINEBREAK |
| 6100 | 4725 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 4726 #endif |
| 4727 /* tab amount depends on current column */ | |
| 4728 n_extra = tab_len; | |
| 4729 #ifdef FEAT_LINEBREAK | |
| 4730 else | |
| 4731 { | |
| 4732 char_u *p; | |
| 4733 int len = n_extra; | |
| 4734 int i; | |
| 4735 int saved_nextra = n_extra; | |
| 4736 | |
| 6172 | 4737 #ifdef FEAT_CONCEAL |
| 6627 | 4738 if (vcol_off > 0) |
| 6172 | 4739 /* there are characters to conceal */ |
| 4740 tab_len += vcol_off; | |
| 6520 | 4741 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 4742 */ | |
| 4743 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 4744 && n_extra > tab_len) | |
| 4745 tab_len += n_extra - tab_len; | |
| 4746 #endif | |
| 4747 | |
| 6026 | 4748 /* if n_extra > 0, it gives the number of chars, to |
| 4749 * use for a tab, else we need to calculate the width | |
| 4750 * for a tab */ | |
| 4751 #ifdef FEAT_MBYTE | |
| 4752 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 4753 if (n_extra > 0) | |
| 4754 len += n_extra - tab_len; | |
| 4755 #endif | |
| 4756 c = lcs_tab1; | |
| 4757 p = alloc((unsigned)(len + 1)); | |
| 4758 vim_memset(p, ' ', len); | |
| 4759 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4760 vim_free(p_extra_free); |
| 6026 | 4761 p_extra_free = p; |
| 4762 for (i = 0; i < tab_len; i++) | |
| 4763 { | |
| 4764 #ifdef FEAT_MBYTE | |
| 4765 mb_char2bytes(lcs_tab2, p); | |
| 4766 p += mb_char2len(lcs_tab2); | |
| 4767 n_extra += mb_char2len(lcs_tab2) | |
| 4768 - (saved_nextra > 0 ? 1 : 0); | |
| 4769 #else | |
| 4770 p[i] = lcs_tab2; | |
| 4771 #endif | |
| 4772 } | |
| 4773 p_extra = p_extra_free; | |
| 6172 | 4774 #ifdef FEAT_CONCEAL |
| 4775 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 4776 * macro below, so need to adjust for that here */ | |
| 6627 | 4777 if (vcol_off > 0) |
| 6172 | 4778 n_extra -= vcol_off; |
| 4779 #endif | |
| 6026 | 4780 } |
| 4781 #endif | |
| 3984 | 4782 #ifdef FEAT_CONCEAL |
| 6627 | 4783 { |
| 4784 int vc_saved = vcol_off; | |
| 4785 | |
| 4786 /* Tab alignment should be identical regardless of | |
| 4787 * 'conceallevel' value. So tab compensates of all | |
| 4788 * previous concealed characters, and thus resets | |
| 4789 * vcol_off and boguscols accumulated so far in the | |
| 4790 * line. Note that the tab can be longer than | |
| 4791 * 'tabstop' when there are concealed characters. */ | |
| 4792 FIX_FOR_BOGUSCOLS; | |
| 4793 | |
| 4794 /* Make sure, the highlighting for the tab char will be | |
| 4795 * correctly set further below (effectively reverts the | |
| 4796 * FIX_FOR_BOGSUCOLS macro */ | |
| 4797 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 4798 && lcs_tab1) |
| 6627 | 4799 tab_len += vc_saved; |
| 4800 } | |
| 3984 | 4801 #endif |
| 7 | 4802 #ifdef FEAT_MBYTE |
| 4803 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4804 #endif | |
| 4805 if (wp->w_p_list) | |
| 4806 { | |
| 4807 c = lcs_tab1; | |
| 6026 | 4808 #ifdef FEAT_LINEBREAK |
| 4809 if (wp->w_p_lbr) | |
| 4810 c_extra = NUL; /* using p_extra from above */ | |
| 4811 else | |
| 4812 #endif | |
| 4813 c_extra = lcs_tab2; | |
| 4814 n_attr = tab_len + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4815 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4816 saved_attr2 = char_attr; /* save current attr */ |
| 4817 #ifdef FEAT_MBYTE | |
| 4818 mb_c = c; | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4819 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4820 { |
| 4821 mb_utf8 = TRUE; | |
| 714 | 4822 u8cc[0] = 0; |
| 819 | 4823 c = 0xc0; |
| 7 | 4824 } |
| 4825 #endif | |
| 4826 } | |
| 4827 else | |
| 4828 { | |
| 4829 c_extra = ' '; | |
| 4830 c = ' '; | |
| 4831 } | |
| 4832 } | |
| 36 | 4833 else if (c == NUL |
| 6799 | 4834 && (wp->w_p_list |
| 36 | 4835 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 4836 && tocol > vcol | |
| 4837 && VIsual_mode != Ctrl_V | |
| 4838 && ( | |
| 4839 # ifdef FEAT_RIGHTLEFT | |
| 4840 wp->w_p_rl ? (col >= 0) : | |
| 4841 # endif | |
| 4842 (col < W_WIDTH(wp))) | |
| 4843 && !(noinvcur | |
| 1850 | 4844 && lnum == wp->w_cursor.lnum |
| 36 | 4845 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 4846 && lcs_eol_one > 0) |
| 7 | 4847 { |
| 36 | 4848 /* Display a '$' after the line or highlight an extra |
| 4849 * character if the line break is included. */ | |
| 7 | 4850 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 4851 /* For a diff line the highlighting continues after the | |
| 4852 * "$". */ | |
| 4853 if ( | |
| 4854 # ifdef FEAT_DIFF | |
| 534 | 4855 diff_hlf == (hlf_T)0 |
| 7 | 4856 # ifdef LINE_ATTR |
| 4857 && | |
| 4858 # endif | |
| 4859 # endif | |
| 4860 # ifdef LINE_ATTR | |
| 4861 line_attr == 0 | |
| 4862 # endif | |
| 4863 ) | |
| 4864 #endif | |
| 4865 { | |
| 4866 #ifdef FEAT_VIRTUALEDIT | |
| 4867 /* In virtualedit, visual selections may extend | |
| 4868 * beyond end of line. */ | |
| 4869 if (area_highlighting && virtual_active() | |
| 4870 && tocol != MAXCOL && vcol < tocol) | |
| 4871 n_extra = 0; | |
| 4872 else | |
| 4873 #endif | |
| 4874 { | |
| 4875 p_extra = at_end_str; | |
| 4876 n_extra = 1; | |
| 4877 c_extra = NUL; | |
| 4878 } | |
| 4879 } | |
| 6799 | 4880 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 4881 c = lcs_eol; |
| 4882 else | |
| 4883 c = ' '; | |
| 7 | 4884 lcs_eol_one = -1; |
| 4885 --ptr; /* put it back at the NUL */ | |
| 674 | 4886 if (!attr_pri) |
| 7 | 4887 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4888 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4889 n_attr = 1; |
| 4890 } | |
| 4891 #ifdef FEAT_MBYTE | |
| 4892 mb_c = c; | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4893 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4894 { |
| 4895 mb_utf8 = TRUE; | |
| 714 | 4896 u8cc[0] = 0; |
| 819 | 4897 c = 0xc0; |
| 7 | 4898 } |
| 4899 else | |
| 4900 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4901 #endif | |
| 4902 } | |
| 4903 else if (c != NUL) | |
| 4904 { | |
| 4905 p_extra = transchar(c); | |
| 6064 | 4906 if (n_extra == 0) |
| 4907 n_extra = byte2cells(c) - 1; | |
| 7 | 4908 #ifdef FEAT_RIGHTLEFT |
| 4909 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 4910 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 4911 #endif | |
| 4912 c_extra = NUL; | |
| 6026 | 4913 #ifdef FEAT_LINEBREAK |
| 4914 if (wp->w_p_lbr) | |
| 4915 { | |
| 4916 char_u *p; | |
| 4917 | |
| 4918 c = *p_extra; | |
| 4919 p = alloc((unsigned)n_extra + 1); | |
| 4920 vim_memset(p, ' ', n_extra); | |
| 4921 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 4922 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4923 vim_free(p_extra_free); |
| 6026 | 4924 p_extra_free = p_extra = p; |
| 4925 } | |
| 4926 else | |
| 4927 #endif | |
| 4928 { | |
| 4929 n_extra = byte2cells(c) - 1; | |
| 4930 c = *p_extra++; | |
| 4931 } | |
| 674 | 4932 if (!attr_pri) |
| 7 | 4933 { |
| 4934 n_attr = n_extra + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4935 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4936 saved_attr2 = char_attr; /* save current attr */ |
| 4937 } | |
| 4938 #ifdef FEAT_MBYTE | |
| 4939 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4940 #endif | |
| 4941 } | |
| 4942 #ifdef FEAT_VIRTUALEDIT | |
| 4943 else if (VIsual_active | |
| 4944 && (VIsual_mode == Ctrl_V | |
| 4945 || VIsual_mode == 'v') | |
| 4946 && virtual_active() | |
| 4947 && tocol != MAXCOL | |
| 4948 && vcol < tocol | |
| 4949 && ( | |
| 4950 # ifdef FEAT_RIGHTLEFT | |
| 4951 wp->w_p_rl ? (col >= 0) : | |
| 4952 # endif | |
| 4953 (col < W_WIDTH(wp)))) | |
| 4954 { | |
| 4955 c = ' '; | |
| 4956 --ptr; /* put it back at the NUL */ | |
| 4957 } | |
| 4958 #endif | |
| 910 | 4959 #if defined(LINE_ATTR) |
| 7 | 4960 else if (( |
| 4961 # ifdef FEAT_DIFF | |
| 910 | 4962 diff_hlf != (hlf_T)0 || |
| 7 | 4963 # endif |
| 4964 line_attr != 0 | |
| 4965 ) && ( | |
| 4966 # ifdef FEAT_RIGHTLEFT | |
| 4967 wp->w_p_rl ? (col >= 0) : | |
| 4968 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4969 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4970 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4971 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4972 # endif |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4973 < W_WIDTH(wp)))) |
| 7 | 4974 { |
| 4975 /* Highlight until the right side of the window */ | |
| 4976 c = ' '; | |
| 4977 --ptr; /* put it back at the NUL */ | |
| 867 | 4978 |
| 4979 /* Remember we do the char for line highlighting. */ | |
| 4980 ++did_line_attr; | |
| 4981 | |
| 4982 /* don't do search HL for the rest of the line */ | |
| 4983 if (line_attr != 0 && char_attr == search_attr && col > 0) | |
| 4984 char_attr = line_attr; | |
| 7 | 4985 # ifdef FEAT_DIFF |
| 4986 if (diff_hlf == HLF_TXD) | |
| 4987 { | |
| 4988 diff_hlf = HLF_CHD; | |
| 4989 if (attr == 0 || char_attr != attr) | |
| 6106 | 4990 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4991 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 4992 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4993 char_attr = hl_combine_attr(char_attr, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4994 HL_ATTR(HLF_CUL)); |
| 6106 | 4995 } |
| 7 | 4996 } |
| 4997 # endif | |
| 4998 } | |
| 4999 #endif | |
| 5000 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5001 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5002 #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
|
5003 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
|
5004 && (wp != curwin || lnum != wp->w_cursor.lnum || |
| 6947 | 5005 conceal_cursor_line(wp) ) |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5006 && ( (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
|
5007 && !(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
|
5008 && 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
|
5009 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5010 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5011 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5012 && (syn_get_sub_char() != NUL || match_conc |
| 5013 || 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
|
5014 && 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
|
5015 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5016 /* 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
|
5017 * character. */ |
| 6947 | 5018 if (match_conc) |
| 5019 c = match_conc; | |
| 5020 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
|
5021 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5022 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5023 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5024 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5025 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5026 |
|
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
|
5027 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5028 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5029 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5030 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5031 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5032 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
|
5033 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5034 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5035 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5036 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5037 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5038 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5039 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5040 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5041 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5042 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5043 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5044 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5045 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5046 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5047 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5048 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5049 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5050 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5051 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5052 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5053 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5054 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5055 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5056 mb_c = c; |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
5057 if (enc_utf8 && utf_char2len(c) > 1) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5058 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5059 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5060 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5061 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5062 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5063 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5064 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
|
5065 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5066 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5067 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5068 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5069 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
|
5070 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5071 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5072 #endif /* FEAT_CONCEAL */ |
| 7 | 5073 } |
| 5074 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5075 #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
|
5076 /* 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
|
5077 * 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
|
5078 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
|
5079 && 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
|
5080 && 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
|
5081 && (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
|
5082 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5083 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5084 if (wp->w_p_rl) |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5085 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
|
5086 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5087 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5088 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
|
5089 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
|
5090 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
|
5091 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5092 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5093 |
| 7 | 5094 /* Don't override visual selection highlighting. */ |
| 5095 if (n_attr > 0 | |
| 5096 && draw_state == WL_LINE | |
| 674 | 5097 && !attr_pri) |
| 7 | 5098 char_attr = extra_attr; |
| 5099 | |
| 42 | 5100 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5101 /* XIM don't send preedit_start and preedit_end, but they send |
| 5102 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5103 * im_is_preediting() here. */ | |
| 5104 if (xic != NULL | |
| 1850 | 5105 && lnum == wp->w_cursor.lnum |
| 7 | 5106 && (State & INSERT) |
| 5107 && !p_imdisable | |
| 5108 && im_is_preediting() | |
| 5109 && draw_state == WL_LINE) | |
| 5110 { | |
| 5111 colnr_T tcol; | |
| 5112 | |
| 5113 if (preedit_end_col == MAXCOL) | |
| 1850 | 5114 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5115 else |
| 5116 tcol = preedit_end_col; | |
| 5117 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5118 { | |
| 5119 if (feedback_old_attr < 0) | |
| 5120 { | |
| 5121 feedback_col = 0; | |
| 5122 feedback_old_attr = char_attr; | |
| 5123 } | |
| 5124 char_attr = im_get_feedback_attr(feedback_col); | |
| 5125 if (char_attr < 0) | |
| 5126 char_attr = feedback_old_attr; | |
| 5127 feedback_col++; | |
| 5128 } | |
| 5129 else if (feedback_old_attr >= 0) | |
| 5130 { | |
| 5131 char_attr = feedback_old_attr; | |
| 5132 feedback_old_attr = -1; | |
| 5133 feedback_col = 0; | |
| 5134 } | |
| 5135 } | |
| 5136 #endif | |
| 5137 /* | |
| 5138 * Handle the case where we are in column 0 but not on the first | |
| 5139 * character of the line and the user wants us to show us a | |
| 5140 * special character (via 'listchars' option "precedes:<char>". | |
| 5141 */ | |
| 5142 if (lcs_prec_todo != NUL | |
| 6276 | 5143 && wp->w_p_list |
| 7 | 5144 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5145 #ifdef FEAT_DIFF | |
| 5146 && filler_todo <= 0 | |
| 5147 #endif | |
| 5148 && draw_state > WL_NR | |
| 5149 && c != NUL) | |
| 5150 { | |
| 5151 c = lcs_prec; | |
| 5152 lcs_prec_todo = NUL; | |
| 5153 #ifdef FEAT_MBYTE | |
| 3586 | 5154 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5155 { | |
| 5156 /* Double-width character being overwritten by the "precedes" | |
| 5157 * character, need to fill up half the character. */ | |
| 5158 c_extra = MB_FILLER_CHAR; | |
| 5159 n_extra = 1; | |
| 5160 n_attr = 2; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5161 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5162 } |
| 7 | 5163 mb_c = c; |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
5164 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5165 { |
| 5166 mb_utf8 = TRUE; | |
| 714 | 5167 u8cc[0] = 0; |
| 819 | 5168 c = 0xc0; |
| 7 | 5169 } |
| 5170 else | |
| 5171 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5172 #endif | |
| 674 | 5173 if (!attr_pri) |
| 7 | 5174 { |
| 5175 saved_attr3 = char_attr; /* save current attr */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5176 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5177 n_attr3 = 1; |
| 5178 } | |
| 5179 } | |
| 5180 | |
| 5181 /* | |
| 867 | 5182 * At end of the text line or just after the last character. |
| 7 | 5183 */ |
| 867 | 5184 if (c == NUL |
| 910 | 5185 #if defined(LINE_ATTR) |
| 867 | 5186 || did_line_attr == 1 |
| 5187 #endif | |
| 5188 ) | |
| 5189 { | |
| 5190 #ifdef FEAT_SEARCH_EXTRA | |
| 5191 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5192 |
| 5193 /* we're not really at that column when skipping some text */ | |
| 1439 | 5194 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5195 ++prevcol; |
| 867 | 5196 #endif |
| 5197 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5198 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5199 * highlight match at end of line. If it's beyond the last |
| 5200 * char on the screen, just overwrite that one (tricky!) Not | |
| 5201 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5202 #ifdef FEAT_SEARCH_EXTRA |
| 5203 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5204 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5205 prevcol_hl_flag = TRUE; |
| 5206 else | |
| 5207 { | |
| 5208 cur = wp->w_match_head; | |
| 5209 while (cur != NULL) | |
| 5210 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5211 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5212 { |
| 5213 prevcol_hl_flag = TRUE; | |
| 5214 break; | |
| 5215 } | |
| 5216 cur = cur->next; | |
| 5217 } | |
| 5218 } | |
| 5219 #endif | |
| 7 | 5220 if (lcs_eol == lcs_eol_one |
| 1850 | 5221 && ((area_attr != 0 && vcol == fromcol |
| 5222 && (VIsual_mode != Ctrl_V | |
| 5223 || lnum == VIsual.lnum | |
| 5224 || lnum == curwin->w_cursor.lnum) | |
| 5225 && c == NUL) | |
| 7 | 5226 #ifdef FEAT_SEARCH_EXTRA |
| 5227 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5228 || (prevcol_hl_flag == TRUE |
| 910 | 5229 # if defined(LINE_ATTR) |
| 867 | 5230 && did_line_attr <= 1 |
| 5231 # endif | |
| 5232 ) | |
| 7 | 5233 #endif |
| 5234 )) | |
| 5235 { | |
| 5236 int n = 0; | |
| 5237 | |
| 5238 #ifdef FEAT_RIGHTLEFT | |
| 5239 if (wp->w_p_rl) | |
| 5240 { | |
| 5241 if (col < 0) | |
| 5242 n = 1; | |
| 5243 } | |
| 5244 else | |
| 5245 #endif | |
| 5246 { | |
| 5247 if (col >= W_WIDTH(wp)) | |
| 5248 n = -1; | |
| 5249 } | |
| 5250 if (n != 0) | |
| 5251 { | |
| 5252 /* At the window boundary, highlight the last character | |
| 5253 * instead (better than nothing). */ | |
| 5254 off += n; | |
| 5255 col += n; | |
| 5256 } | |
| 5257 else | |
| 5258 { | |
| 5259 /* Add a blank character to highlight. */ | |
| 5260 ScreenLines[off] = ' '; | |
| 5261 #ifdef FEAT_MBYTE | |
| 5262 if (enc_utf8) | |
| 5263 ScreenLinesUC[off] = 0; | |
| 5264 #endif | |
| 5265 } | |
| 5266 #ifdef FEAT_SEARCH_EXTRA | |
| 5267 if (area_attr == 0) | |
| 5268 { | |
| 1326 | 5269 /* Use attributes from match with highest priority among |
| 5270 * 'search_hl' and the match list. */ | |
| 5271 char_attr = search_hl.attr; | |
| 5272 cur = wp->w_match_head; | |
| 5273 shl_flag = FALSE; | |
| 5274 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5275 { |
| 1326 | 5276 if (shl_flag == FALSE |
| 5277 && ((cur != NULL | |
| 5278 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5279 || cur == NULL)) | |
| 699 | 5280 { |
| 1326 | 5281 shl = &search_hl; |
| 5282 shl_flag = TRUE; | |
| 699 | 5283 } |
| 1326 | 5284 else |
| 5285 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5286 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
|
5287 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5288 char_attr = shl->attr; |
| 5289 if (shl != &search_hl && cur != NULL) | |
| 5290 cur = cur->next; | |
| 699 | 5291 } |
| 7 | 5292 } |
| 5293 #endif | |
| 5294 ScreenAttrs[off] = char_attr; | |
| 5295 #ifdef FEAT_RIGHTLEFT | |
| 5296 if (wp->w_p_rl) | |
| 1437 | 5297 { |
| 7 | 5298 --col; |
| 1437 | 5299 --off; |
| 5300 } | |
| 7 | 5301 else |
| 5302 #endif | |
| 1437 | 5303 { |
| 7 | 5304 ++col; |
| 1437 | 5305 ++off; |
| 5306 } | |
| 743 | 5307 ++vcol; |
| 1437 | 5308 #ifdef FEAT_SYN_HL |
| 5309 eol_hl_off = 1; | |
| 5310 #endif | |
| 743 | 5311 } |
| 867 | 5312 } |
| 5313 | |
| 5314 /* | |
| 5315 * At end of the text line. | |
| 5316 */ | |
| 5317 if (c == NUL) | |
| 5318 { | |
| 743 | 5319 #ifdef FEAT_SYN_HL |
| 1850 | 5320 if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol |
| 5321 && lnum == wp->w_cursor.lnum) | |
| 1437 | 5322 { |
| 5323 /* highlight last char after line */ | |
| 5324 --col; | |
| 5325 --off; | |
| 5326 --vcol; | |
| 5327 } | |
| 5328 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5329 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5330 if (wp->w_p_wrap) |
| 5331 v = wp->w_skipcol; | |
| 5332 else | |
| 5333 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5334 |
| 820 | 5335 /* check if line ends before left margin */ |
| 5336 if (vcol < v + col - win_col_off(wp)) | |
| 5337 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
|
5338 #ifdef FEAT_CONCEAL |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5339 /* 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
|
5340 * edge for 'cursorcolumn'. */ |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5341 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5342 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5343 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5344 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5345 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5346 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
|
5347 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5348 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5349 && (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
|
5350 && (int)wp->w_virtcol < |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5351 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
|
5352 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5353 || draw_color_col) |
| 743 | 5354 # ifdef FEAT_RIGHTLEFT |
| 5355 && !wp->w_p_rl | |
| 5356 # endif | |
| 5357 ) | |
| 5358 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5359 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5360 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5361 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5362 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5363 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5364 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5365 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5366 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
|
5367 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5368 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5369 |
| 743 | 5370 while (col < W_WIDTH(wp)) |
| 5371 { | |
| 5372 ScreenLines[off] = ' '; | |
| 5373 #ifdef FEAT_MBYTE | |
| 5374 if (enc_utf8) | |
| 5375 ScreenLinesUC[off] = 0; | |
| 5376 #endif | |
| 5377 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5378 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5379 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
|
5380 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5381 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5382 if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5383 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
|
5384 else if (draw_color_col && VCOL_HLC == *color_cols) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5385 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5386 else |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5387 ScreenAttrs[off++] = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5388 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5389 if (VCOL_HLC >= rightmost_vcol) |
| 743 | 5390 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5391 |
| 743 | 5392 ++vcol; |
| 5393 } | |
| 5394 } | |
| 5395 #endif | |
| 7 | 5396 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5397 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
|
5398 (int)W_WIDTH(wp), wp->w_p_rl); |
| 7 | 5399 row++; |
| 5400 | |
| 5401 /* | |
| 5402 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5403 * updated (saves a call to plines() later). | |
| 5404 */ | |
| 5405 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5406 { | |
| 5407 curwin->w_cline_row = startrow; | |
| 5408 curwin->w_cline_height = row - startrow; | |
| 5409 #ifdef FEAT_FOLDING | |
| 5410 curwin->w_cline_folded = FALSE; | |
| 5411 #endif | |
| 5412 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5413 } | |
| 5414 | |
| 5415 break; | |
| 5416 } | |
| 5417 | |
| 5418 /* line continues beyond line end */ | |
| 5419 if (lcs_ext | |
| 5420 && !wp->w_p_wrap | |
| 5421 #ifdef FEAT_DIFF | |
| 5422 && filler_todo <= 0 | |
| 5423 #endif | |
| 5424 && ( | |
| 5425 #ifdef FEAT_RIGHTLEFT | |
| 5426 wp->w_p_rl ? col == 0 : | |
| 5427 #endif | |
| 5428 col == W_WIDTH(wp) - 1) | |
| 5429 && (*ptr != NUL | |
| 1555 | 5430 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5431 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5432 { | |
| 5433 c = lcs_ext; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5434 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5435 #ifdef FEAT_MBYTE |
| 5436 mb_c = c; | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
5437 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5438 { |
| 5439 mb_utf8 = TRUE; | |
| 714 | 5440 u8cc[0] = 0; |
| 819 | 5441 c = 0xc0; |
| 7 | 5442 } |
| 5443 else | |
| 5444 mb_utf8 = FALSE; | |
| 5445 #endif | |
| 5446 } | |
| 5447 | |
| 743 | 5448 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5449 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5450 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5451 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
|
5452 |
| 743 | 5453 /* 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
|
5454 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5455 * 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
|
5456 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5457 vcol_save_attr = -1; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5458 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
|
5459 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5460 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
|
5461 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5462 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5463 vcol_save_attr = char_attr; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5464 char_attr = hl_combine_attr(char_attr, HL_ATTR(HLF_CUC)); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5465 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5466 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
|
5467 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5468 vcol_save_attr = char_attr; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5469 char_attr = hl_combine_attr(char_attr, HL_ATTR(HLF_MC)); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5470 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5471 } |
| 743 | 5472 #endif |
| 5473 | |
| 7 | 5474 /* |
| 5475 * Store character to be displayed. | |
| 5476 * Skip characters that are left of the screen for 'nowrap'. | |
| 5477 */ | |
| 5478 vcol_prev = vcol; | |
| 5479 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5480 { | |
| 5481 /* | |
| 5482 * Store the character. | |
| 5483 */ | |
| 5484 #if defined(FEAT_RIGHTLEFT) && defined(FEAT_MBYTE) | |
| 5485 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) | |
| 5486 { | |
| 5487 /* A double-wide character is: put first halve in left cell. */ | |
| 5488 --off; | |
| 5489 --col; | |
| 5490 } | |
| 5491 #endif | |
| 5492 ScreenLines[off] = c; | |
| 5493 #ifdef FEAT_MBYTE | |
| 5494 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5495 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5496 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5497 ScreenLines[off] = 0x8e; |
| 7 | 5498 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5499 } |
| 7 | 5500 else if (enc_utf8) |
| 5501 { | |
| 5502 if (mb_utf8) | |
| 5503 { | |
| 1326 | 5504 int i; |
| 5505 | |
| 7 | 5506 ScreenLinesUC[off] = mb_c; |
| 819 | 5507 if ((c & 0xff) == 0) |
| 5508 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5509 for (i = 0; i < Screen_mco; ++i) |
| 5510 { | |
| 5511 ScreenLinesC[i][off] = u8cc[i]; | |
| 5512 if (u8cc[i] == 0) | |
| 5513 break; | |
| 5514 } | |
| 7 | 5515 } |
| 5516 else | |
| 5517 ScreenLinesUC[off] = 0; | |
| 5518 } | |
| 5519 if (multi_attr) | |
| 5520 { | |
| 5521 ScreenAttrs[off] = multi_attr; | |
| 5522 multi_attr = 0; | |
| 5523 } | |
| 5524 else | |
| 5525 #endif | |
| 5526 ScreenAttrs[off] = char_attr; | |
| 5527 | |
| 5528 #ifdef FEAT_MBYTE | |
| 5529 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5530 { | |
| 5531 /* Need to fill two screen columns. */ | |
| 5532 ++off; | |
| 5533 ++col; | |
| 5534 if (enc_utf8) | |
| 5535 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5536 ScreenLines[off] = 0; | |
| 5537 else | |
| 5538 /* DBCS: Put second byte in the second screen char. */ | |
| 5539 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5540 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5541 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5542 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5543 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5544 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5545 ++vcol; |
| 7 | 5546 /* When "tocol" is halfway a character, set it to the end of |
| 5547 * the character, otherwise highlighting won't stop. */ | |
| 5548 if (tocol == vcol) | |
| 5549 ++tocol; | |
| 5550 #ifdef FEAT_RIGHTLEFT | |
| 5551 if (wp->w_p_rl) | |
| 5552 { | |
| 5553 /* now it's time to backup one cell */ | |
| 5554 --off; | |
| 5555 --col; | |
| 5556 } | |
| 5557 #endif | |
| 5558 } | |
| 5559 #endif | |
| 5560 #ifdef FEAT_RIGHTLEFT | |
| 5561 if (wp->w_p_rl) | |
| 5562 { | |
| 5563 --off; | |
| 5564 --col; | |
| 5565 } | |
| 5566 else | |
| 5567 #endif | |
| 5568 { | |
| 5569 ++off; | |
| 5570 ++col; | |
| 5571 } | |
| 5572 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5573 #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
|
5574 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
|
5575 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5576 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5577 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5578 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5579 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5580 if (wp->w_p_wrap) |
|
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 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5584 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5585 * 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
|
5586 * 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
|
5587 * 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
|
5588 * 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
|
5589 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5590 * 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
|
5591 * 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
|
5592 * 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
|
5593 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5594 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5595 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5596 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5597 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5598 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5599 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5600 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5601 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5602 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5603 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5604 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5605 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5606 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5607 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5608 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5609 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5610 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5611 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5612 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5613 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5614 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5615 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5616 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
|
5617 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5618 /* Need to fill two screen columns. */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5619 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5620 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5621 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5622 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5623 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5624 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5625 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5626 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5627 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5628 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5629 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5630 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5631 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5632 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5633 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5634 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5635 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5636 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5637 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5638 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5639 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5640 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5641 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5642 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5643 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5644 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5645 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5646 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5647 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5648 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5649 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5650 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5651 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5652 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5653 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5654 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5655 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5656 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5657 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5658 #endif /* FEAT_CONCEAL */ |
| 7 | 5659 else |
| 5660 --n_skip; | |
| 5661 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5662 /* 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
|
5663 * column. */ |
| 1849 | 5664 if (draw_state > WL_NR |
| 7 | 5665 #ifdef FEAT_DIFF |
| 5666 && filler_todo <= 0 | |
| 5667 #endif | |
| 5668 ) | |
| 5669 ++vcol; | |
| 5670 | |
| 743 | 5671 #ifdef FEAT_SYN_HL |
| 5672 if (vcol_save_attr >= 0) | |
| 5673 char_attr = vcol_save_attr; | |
| 5674 #endif | |
| 5675 | |
| 7 | 5676 /* restore attributes after "predeces" in 'listchars' */ |
| 5677 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5678 char_attr = saved_attr3; | |
| 5679 | |
| 5680 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5681 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5682 char_attr = saved_attr2; | |
| 5683 | |
| 5684 /* | |
| 5685 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5686 * so far. If there is no more to display it is caught above. |
| 7 | 5687 */ |
| 5688 if (( | |
| 5689 #ifdef FEAT_RIGHTLEFT | |
| 5690 wp->w_p_rl ? (col < 0) : | |
| 5691 #endif | |
| 5692 (col >= W_WIDTH(wp))) | |
| 5693 && (*ptr != NUL | |
| 5694 #ifdef FEAT_DIFF | |
| 5695 || filler_todo > 0 | |
| 5696 #endif | |
| 2724 | 5697 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5698 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5699 ) | |
| 5700 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5701 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5702 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
|
5703 (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
|
5704 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5705 #else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5706 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
|
5707 (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
|
5708 #endif |
| 7 | 5709 ++row; |
| 5710 ++screen_row; | |
| 5711 | |
| 5712 /* When not wrapping and finished diff lines, or when displayed | |
| 5713 * '$' and highlighting until last column, break here. */ | |
| 5714 if ((!wp->w_p_wrap | |
| 5715 #ifdef FEAT_DIFF | |
| 5716 && filler_todo <= 0 | |
| 5717 #endif | |
| 5718 ) || lcs_eol_one == -1) | |
| 5719 break; | |
| 5720 | |
| 5721 /* When the window is too narrow draw all "@" lines. */ | |
| 5722 if (draw_state != WL_LINE | |
| 5723 #ifdef FEAT_DIFF | |
| 5724 && filler_todo <= 0 | |
| 5725 #endif | |
| 5726 ) | |
| 5727 { | |
| 5728 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
|
5729 #ifdef FEAT_WINDOWS |
| 7 | 5730 draw_vsep_win(wp, row); |
| 5731 #endif | |
| 5732 row = endrow; | |
| 5733 } | |
| 5734 | |
| 5735 /* When line got too long for screen break here. */ | |
| 5736 if (row == endrow) | |
| 5737 { | |
| 5738 ++row; | |
| 5739 break; | |
| 5740 } | |
| 5741 | |
| 5742 if (screen_cur_row == screen_row - 1 | |
| 5743 #ifdef FEAT_DIFF | |
| 5744 && filler_todo <= 0 | |
| 5745 #endif | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5746 #ifdef FEAT_WINDOWS |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5747 && W_WIDTH(wp) == Columns |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5748 #endif |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5749 ) |
| 7 | 5750 { |
| 5751 /* Remember that the line wraps, used for modeless copy. */ | |
| 5752 LineWraps[screen_row - 1] = TRUE; | |
| 5753 | |
| 5754 /* | |
| 5755 * Special trick to make copy/paste of wrapped lines work with | |
| 5756 * xterm/screen: write an extra character beyond the end of | |
| 5757 * the line. This will work with all terminal types | |
| 5758 * (regardless of the xn,am settings). | |
| 5759 * Only do this on a fast tty. | |
| 5760 * Only do this if the cursor is on the current line | |
| 5761 * (something has been written in it). | |
| 5762 * Don't do this for the GUI. | |
| 5763 * Don't do this for double-width characters. | |
| 5764 * Don't do this for a window not at the right screen border. | |
| 5765 */ | |
| 5766 if (p_tf | |
| 5767 #ifdef FEAT_GUI | |
| 5768 && !gui.in_use | |
| 5769 #endif | |
| 5770 #ifdef FEAT_MBYTE | |
| 5771 && !(has_mbyte | |
| 1378 | 5772 && ((*mb_off2cells)(LineOffset[screen_row], |
| 5773 LineOffset[screen_row] + screen_Columns) | |
| 5774 == 2 | |
| 7 | 5775 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 5776 + (int)Columns - 2, |
| 5777 LineOffset[screen_row] + screen_Columns) | |
| 5778 == 2)) | |
| 7 | 5779 #endif |
| 5780 ) | |
| 5781 { | |
| 5782 /* First make sure we are at the end of the screen line, | |
| 5783 * then output the same character again to let the | |
| 5784 * terminal know about the wrap. If the terminal doesn't | |
| 5785 * auto-wrap, we overwrite the character. */ | |
| 5786 if (screen_cur_col != W_WIDTH(wp)) | |
| 5787 screen_char(LineOffset[screen_row - 1] | |
| 5788 + (unsigned)Columns - 1, | |
| 5789 screen_row - 1, (int)(Columns - 1)); | |
| 5790 | |
| 5791 #ifdef FEAT_MBYTE | |
| 5792 /* When there is a multi-byte character, just output a | |
| 5793 * space to keep it simple. */ | |
| 148 | 5794 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 5795 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 5796 out_char(' '); |
| 5797 else | |
| 5798 #endif | |
| 5799 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 5800 + (Columns - 1)]); | |
| 5801 /* force a redraw of the first char on the next line */ | |
| 5802 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 5803 screen_start(); /* don't know where cursor is now */ | |
| 5804 } | |
| 5805 } | |
| 5806 | |
| 5807 col = 0; | |
| 5808 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5809 #ifdef FEAT_RIGHTLEFT | |
| 5810 if (wp->w_p_rl) | |
| 5811 { | |
| 5812 col = W_WIDTH(wp) - 1; /* col is not used if breaking! */ | |
| 5813 off += col; | |
| 5814 } | |
| 5815 #endif | |
| 5816 | |
| 5817 /* reset the drawing state for the start of a wrapped line */ | |
| 5818 draw_state = WL_START; | |
| 5819 saved_n_extra = n_extra; | |
| 5820 saved_p_extra = p_extra; | |
| 5821 saved_c_extra = c_extra; | |
| 5822 saved_char_attr = char_attr; | |
| 5823 n_extra = 0; | |
| 5824 lcs_prec_todo = lcs_prec; | |
| 5825 #ifdef FEAT_LINEBREAK | |
| 5826 # ifdef FEAT_DIFF | |
| 5827 if (filler_todo <= 0) | |
| 5828 # endif | |
| 5829 need_showbreak = TRUE; | |
| 5830 #endif | |
| 5831 #ifdef FEAT_DIFF | |
| 5832 --filler_todo; | |
| 5833 /* When the filler lines are actually below the last line of the | |
| 5834 * file, don't draw the line itself, break here. */ | |
| 5835 if (filler_todo == 0 && wp->w_botfill) | |
| 5836 break; | |
| 5837 #endif | |
| 5838 } | |
| 5839 | |
| 5840 } /* for every character in the line */ | |
| 5841 | |
| 743 | 5842 #ifdef FEAT_SPELL |
| 386 | 5843 /* After an empty line check first word for capital. */ |
| 5844 if (*skipwhite(line) == NUL) | |
| 5845 { | |
| 5846 capcol_lnum = lnum + 1; | |
| 5847 cap_col = 0; | |
| 5848 } | |
| 5849 #endif | |
| 5850 | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5851 vim_free(p_extra_free); |
| 7 | 5852 return row; |
| 5853 } | |
| 5854 | |
| 714 | 5855 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
5856 static int comp_char_differs(int, int); |
| 714 | 5857 |
| 5858 /* | |
| 5859 * 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
|
5860 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 5861 */ |
| 5862 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5863 comp_char_differs(int off_from, int off_to) |
| 714 | 5864 { |
| 5865 int i; | |
| 5866 | |
| 5867 for (i = 0; i < Screen_mco; ++i) | |
| 5868 { | |
| 5869 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 5870 return TRUE; | |
| 5871 if (ScreenLinesC[i][off_from] == 0) | |
| 5872 break; | |
| 5873 } | |
| 5874 return FALSE; | |
| 5875 } | |
| 5876 #endif | |
| 5877 | |
| 7 | 5878 /* |
| 5879 * Check whether the given character needs redrawing: | |
| 5880 * - the (first byte of the) character is different | |
| 5881 * - the attributes are different | |
| 5882 * - the character is multi-byte and the next byte is different | |
| 1616 | 5883 * - the character is two cells wide and the second cell differs. |
| 7 | 5884 */ |
| 5885 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5886 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 5887 { |
| 5888 if (cols > 0 | |
| 5889 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 5890 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 5891 | |
| 5892 #ifdef FEAT_MBYTE | |
| 5893 || (enc_dbcs != 0 | |
| 5894 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 5895 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 5896 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 5897 : (cols > 1 && ScreenLines[off_from + 1] | |
| 5898 != ScreenLines[off_to + 1]))) | |
| 5899 || (enc_utf8 | |
| 5900 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 5901 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 5902 && comp_char_differs(off_from, off_to)) |
| 3759 | 5903 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 5904 && ScreenLines[off_from + 1] | |
| 5905 != ScreenLines[off_to + 1]))) | |
| 7 | 5906 #endif |
| 5907 )) | |
| 5908 return TRUE; | |
| 5909 return FALSE; | |
| 5910 } | |
| 5911 | |
| 5912 /* | |
| 5913 * Move one "cooked" screen line to the screen, but only the characters that | |
| 5914 * have actually changed. Handle insert/delete character. | |
| 5915 * "coloff" gives the first column on the screen for this line. | |
| 5916 * "endcol" gives the columns where valid characters are. | |
| 5917 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 5918 * needs to be cleared, negative otherwise. | |
| 5919 * "rlflag" is TRUE in a rightleft window: | |
| 5920 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" | |
| 5921 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 5922 */ | |
| 5923 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5924 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5925 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5926 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5927 int endcol, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5928 int clear_width |
| 7 | 5929 #ifdef FEAT_RIGHTLEFT |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5930 , int rlflag |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5931 #endif |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5932 ) |
| 7 | 5933 { |
| 5934 unsigned off_from; | |
| 5935 unsigned off_to; | |
| 1378 | 5936 #ifdef FEAT_MBYTE |
| 5937 unsigned max_off_from; | |
| 5938 unsigned max_off_to; | |
| 5939 #endif | |
| 7 | 5940 int col = 0; |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
5941 #if defined(FEAT_GUI) || defined(UNIX) || defined(FEAT_WINDOWS) |
| 7 | 5942 int hl; |
| 5943 #endif | |
| 5944 int force = FALSE; /* force update rest of the line */ | |
| 5945 int redraw_this /* bool: does character need redraw? */ | |
| 5946 #ifdef FEAT_GUI | |
| 5947 = TRUE /* For GUI when while-loop empty */ | |
| 5948 #endif | |
| 5949 ; | |
| 5950 int redraw_next; /* redraw_this for next character */ | |
| 5951 #ifdef FEAT_MBYTE | |
| 5952 int clear_next = FALSE; | |
| 5953 int char_cells; /* 1: normal char */ | |
| 5954 /* 2: occupies two display cells */ | |
| 5955 # define CHAR_CELLS char_cells | |
| 5956 #else | |
| 5957 # define CHAR_CELLS 1 | |
| 5958 #endif | |
| 5959 | |
| 3413 | 5960 /* Check for illegal row and col, just in case. */ |
| 5961 if (row >= Rows) | |
| 5962 row = Rows - 1; | |
| 5963 if (endcol > Columns) | |
| 5964 endcol = Columns; | |
| 5965 | |
| 7 | 5966 # ifdef FEAT_CLIPBOARD |
| 5967 clip_may_clear_selection(row, row); | |
| 5968 # endif | |
| 5969 | |
| 5970 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5971 off_to = LineOffset[row] + coloff; | |
| 1378 | 5972 #ifdef FEAT_MBYTE |
| 5973 max_off_from = off_from + screen_Columns; | |
| 5974 max_off_to = LineOffset[row] + screen_Columns; | |
| 5975 #endif | |
| 7 | 5976 |
| 5977 #ifdef FEAT_RIGHTLEFT | |
| 5978 if (rlflag) | |
| 5979 { | |
| 5980 /* Clear rest first, because it's left of the text. */ | |
| 5981 if (clear_width > 0) | |
| 5982 { | |
| 5983 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 5984 && ScreenAttrs[off_to] == 0 | |
| 5985 # ifdef FEAT_MBYTE | |
| 5986 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 5987 # endif | |
| 5988 ) | |
| 5989 { | |
| 5990 ++off_to; | |
| 5991 ++col; | |
| 5992 } | |
| 5993 if (col <= endcol) | |
| 5994 screen_fill(row, row + 1, col + coloff, | |
| 5995 endcol + coloff + 1, ' ', ' ', 0); | |
| 5996 } | |
| 5997 col = endcol + 1; | |
| 5998 off_to = LineOffset[row] + col + coloff; | |
| 5999 off_from += col; | |
| 6000 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6001 } | |
| 6002 #endif /* FEAT_RIGHTLEFT */ | |
| 6003 | |
| 6004 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6005 | |
| 6006 while (col < endcol) | |
| 6007 { | |
| 6008 #ifdef FEAT_MBYTE | |
| 6009 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6010 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6011 else |
| 6012 char_cells = 1; | |
| 6013 #endif | |
| 6014 | |
| 6015 redraw_this = redraw_next; | |
| 6016 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6017 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6018 | |
| 6019 #ifdef FEAT_GUI | |
| 6020 /* If the next character was bold, then redraw the current character to | |
| 6021 * remove any pixels that might have spilt over into us. This only | |
| 6022 * happens in the GUI. | |
| 6023 */ | |
| 6024 if (redraw_next && gui.in_use) | |
| 6025 { | |
| 6026 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6027 if (hl > HL_ALL) |
| 6028 hl = syn_attr2attr(hl); | |
| 6029 if (hl & HL_BOLD) | |
| 7 | 6030 redraw_this = TRUE; |
| 6031 } | |
| 6032 #endif | |
| 6033 | |
| 6034 if (redraw_this) | |
| 6035 { | |
| 6036 /* | |
| 6037 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6038 * Attributes for characters are stored at the position where the | |
| 6039 * cursor is when writing the highlighting code. The | |
| 6040 * start-highlighting code must be written with the cursor on the | |
| 6041 * first highlighted character. The stop-highlighting code must | |
| 6042 * be written with the cursor just after the last highlighted | |
| 6043 * character. | |
| 6044 * Overwriting a character doesn't remove it's highlighting. Need | |
| 6045 * to clear the rest of the line, and force redrawing it | |
| 6046 * completely. | |
| 6047 */ | |
| 6048 if ( p_wiv | |
| 6049 && !force | |
| 6050 #ifdef FEAT_GUI | |
| 6051 && !gui.in_use | |
| 6052 #endif | |
| 6053 && ScreenAttrs[off_to] != 0 | |
| 6054 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6055 { | |
| 6056 /* | |
| 6057 * Need to remove highlighting attributes here. | |
| 6058 */ | |
| 6059 windgoto(row, col + coloff); | |
| 6060 out_str(T_CE); /* clear rest of this screen line */ | |
| 6061 screen_start(); /* don't know where cursor is now */ | |
| 6062 force = TRUE; /* force redraw of rest of the line */ | |
| 6063 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6064 | |
| 6065 /* | |
| 6066 * If the previous character was highlighted, need to stop | |
| 6067 * highlighting at this character. | |
| 6068 */ | |
| 6069 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6070 { | |
| 6071 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6072 term_windgoto(row, col + coloff); | |
| 6073 screen_stop_highlight(); | |
| 6074 } | |
| 6075 else | |
| 6076 screen_attr = 0; /* highlighting has stopped */ | |
| 6077 } | |
| 6078 #ifdef FEAT_MBYTE | |
| 6079 if (enc_dbcs != 0) | |
| 6080 { | |
| 6081 /* Check if overwriting a double-byte with a single-byte or | |
| 6082 * the other way around requires another character to be | |
| 6083 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6084 * ScreenLinesUC[] is sufficient. */ | |
| 6085 if (char_cells == 1 | |
| 6086 && col + 1 < endcol | |
| 1378 | 6087 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6088 { |
| 6089 /* Writing a single-cell character over a double-cell | |
| 6090 * character: need to redraw the next cell. */ | |
| 6091 ScreenLines[off_to + 1] = 0; | |
| 6092 redraw_next = TRUE; | |
| 6093 } | |
| 6094 else if (char_cells == 2 | |
| 6095 && col + 2 < endcol | |
| 1378 | 6096 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6097 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6098 { |
| 6099 /* Writing the second half of a double-cell character over | |
| 6100 * a double-cell character: need to redraw the second | |
| 6101 * cell. */ | |
| 6102 ScreenLines[off_to + 2] = 0; | |
| 6103 redraw_next = TRUE; | |
| 6104 } | |
| 6105 | |
| 6106 if (enc_dbcs == DBCS_JPNU) | |
| 6107 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6108 } | |
| 6109 /* When writing a single-width character over a double-width | |
| 6110 * character and at the end of the redrawn text, need to clear out | |
| 6111 * the right halve of the old character. | |
| 6112 * Also required when writing the right halve of a double-width | |
| 6113 * char over the left halve of an existing one. */ | |
| 6114 if (has_mbyte && col + char_cells == endcol | |
| 6115 && ((char_cells == 1 | |
| 1378 | 6116 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6117 || (char_cells == 2 |
| 1378 | 6118 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6119 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6120 clear_next = TRUE; |
| 6121 #endif | |
| 6122 | |
| 6123 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6124 #ifdef FEAT_MBYTE | |
| 6125 if (enc_utf8) | |
| 6126 { | |
| 6127 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6128 if (ScreenLinesUC[off_from] != 0) | |
| 6129 { | |
| 714 | 6130 int i; |
| 6131 | |
| 6132 for (i = 0; i < Screen_mco; ++i) | |
| 6133 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6134 } |
| 6135 } | |
| 6136 if (char_cells == 2) | |
| 6137 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6138 #endif | |
| 6139 | |
| 6140 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6141 /* The bold trick makes a single column of pixels appear in the |
| 6142 * next character. When a bold character is removed, the next | |
| 7 | 6143 * character should be redrawn too. This happens for our own GUI |
| 6144 * and for some xterms. */ | |
| 6145 if ( | |
| 6146 # ifdef FEAT_GUI | |
| 6147 gui.in_use | |
| 6148 # endif | |
| 6149 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6150 || | |
| 6151 # endif | |
| 6152 # ifdef UNIX | |
| 6153 term_is_xterm | |
| 6154 # endif | |
| 6155 ) | |
| 6156 { | |
| 6157 hl = ScreenAttrs[off_to]; | |
| 743 | 6158 if (hl > HL_ALL) |
| 6159 hl = syn_attr2attr(hl); | |
| 6160 if (hl & HL_BOLD) | |
| 7 | 6161 redraw_next = TRUE; |
| 6162 } | |
| 6163 #endif | |
| 6164 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
| 6165 #ifdef FEAT_MBYTE | |
| 819 | 6166 /* For simplicity set the attributes of second half of a |
| 6167 * double-wide character equal to the first half. */ | |
| 6168 if (char_cells == 2) | |
| 6169 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6170 | |
| 7 | 6171 if (enc_dbcs != 0 && char_cells == 2) |
| 6172 screen_char_2(off_to, row, col + coloff); | |
| 6173 else | |
| 6174 #endif | |
| 6175 screen_char(off_to, row, col + coloff); | |
| 6176 } | |
| 6177 else if ( p_wiv | |
| 6178 #ifdef FEAT_GUI | |
| 6179 && !gui.in_use | |
| 6180 #endif | |
| 6181 && col + coloff > 0) | |
| 6182 { | |
| 6183 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6184 { | |
| 6185 /* | |
| 6186 * Don't output stop-highlight when moving the cursor, it will | |
| 6187 * stop the highlighting when it should continue. | |
| 6188 */ | |
| 6189 screen_attr = 0; | |
| 6190 } | |
| 6191 else if (screen_attr != 0) | |
| 6192 screen_stop_highlight(); | |
| 6193 } | |
| 6194 | |
| 6195 off_to += CHAR_CELLS; | |
| 6196 off_from += CHAR_CELLS; | |
| 6197 col += CHAR_CELLS; | |
| 6198 } | |
| 6199 | |
| 6200 #ifdef FEAT_MBYTE | |
| 6201 if (clear_next) | |
| 6202 { | |
| 6203 /* Clear the second half of a double-wide character of which the left | |
| 6204 * half was overwritten with a single-wide character. */ | |
| 6205 ScreenLines[off_to] = ' '; | |
| 6206 if (enc_utf8) | |
| 6207 ScreenLinesUC[off_to] = 0; | |
| 6208 screen_char(off_to, row, col + coloff); | |
| 6209 } | |
| 6210 #endif | |
| 6211 | |
| 6212 if (clear_width > 0 | |
| 6213 #ifdef FEAT_RIGHTLEFT | |
| 6214 && !rlflag | |
| 6215 #endif | |
| 6216 ) | |
| 6217 { | |
| 6218 #ifdef FEAT_GUI | |
| 6219 int startCol = col; | |
| 6220 #endif | |
| 6221 | |
| 6222 /* blank out the rest of the line */ | |
| 6223 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6224 && ScreenAttrs[off_to] == 0 | |
| 6225 #ifdef FEAT_MBYTE | |
| 6226 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6227 #endif | |
| 6228 ) | |
| 6229 { | |
| 6230 ++off_to; | |
| 6231 ++col; | |
| 6232 } | |
| 6233 if (col < clear_width) | |
| 6234 { | |
| 6235 #ifdef FEAT_GUI | |
| 6236 /* | |
| 6237 * In the GUI, clearing the rest of the line may leave pixels | |
| 6238 * behind if the first character cleared was bold. Some bold | |
| 6239 * fonts spill over the left. In this case we redraw the previous | |
| 6240 * character too. If we didn't skip any blanks above, then we | |
| 6241 * only redraw if the character wasn't already redrawn anyway. | |
| 6242 */ | |
| 996 | 6243 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6244 { |
| 6245 hl = ScreenAttrs[off_to]; | |
| 6246 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6247 { |
| 6248 int prev_cells = 1; | |
| 6249 # ifdef FEAT_MBYTE | |
| 6250 if (enc_utf8) | |
| 6251 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6252 * that its width is 2. */ | |
| 6253 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6254 else if (enc_dbcs != 0) | |
| 6255 { | |
| 6256 /* find previous character by counting from first | |
| 6257 * column and get its width. */ | |
| 6258 unsigned off = LineOffset[row]; | |
| 1378 | 6259 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6260 |
| 6261 while (off < off_to) | |
| 6262 { | |
| 1378 | 6263 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6264 off += prev_cells; |
| 6265 } | |
| 6266 } | |
| 6267 | |
| 6268 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6269 screen_char_2(off_to - prev_cells, row, | |
| 6270 col + coloff - prev_cells); | |
| 6271 else | |
| 6272 # endif | |
| 6273 screen_char(off_to - prev_cells, row, | |
| 6274 col + coloff - prev_cells); | |
| 6275 } | |
| 7 | 6276 } |
| 6277 #endif | |
| 6278 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6279 ' ', ' ', 0); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6280 #ifdef FEAT_WINDOWS |
| 7 | 6281 off_to += clear_width - col; |
| 6282 col = clear_width; | |
| 6283 #endif | |
| 6284 } | |
| 6285 } | |
| 6286 | |
| 6287 if (clear_width > 0) | |
| 6288 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6289 #ifdef FEAT_WINDOWS |
| 7 | 6290 /* For a window that's left of another, draw the separator char. */ |
| 6291 if (col + coloff < Columns) | |
| 6292 { | |
| 6293 int c; | |
| 6294 | |
| 6295 c = fillchar_vsep(&hl); | |
| 6477 | 6296 if (ScreenLines[off_to] != (schar_T)c |
| 7 | 6297 # ifdef FEAT_MBYTE |
| 714 | 6298 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6299 != (c >= 0x80 ? c : 0)) | |
| 7 | 6300 # endif |
| 6301 || ScreenAttrs[off_to] != hl) | |
| 6302 { | |
| 6303 ScreenLines[off_to] = c; | |
| 6304 ScreenAttrs[off_to] = hl; | |
| 6305 # ifdef FEAT_MBYTE | |
| 6306 if (enc_utf8) | |
| 6307 { | |
| 6308 if (c >= 0x80) | |
| 6309 { | |
| 6310 ScreenLinesUC[off_to] = c; | |
| 714 | 6311 ScreenLinesC[0][off_to] = 0; |
| 7 | 6312 } |
| 6313 else | |
| 6314 ScreenLinesUC[off_to] = 0; | |
| 6315 } | |
| 6316 # endif | |
| 6317 screen_char(off_to, row, col + coloff); | |
| 6318 } | |
| 6319 } | |
| 6320 else | |
| 6321 #endif | |
| 6322 LineWraps[row] = FALSE; | |
| 6323 } | |
| 6324 } | |
| 6325 | |
| 474 | 6326 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6327 /* |
| 474 | 6328 * Mirror text "str" for right-left displaying. |
| 6329 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6330 */ |
| 474 | 6331 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6332 rl_mirror(char_u *str) |
| 7 | 6333 { |
| 6334 char_u *p1, *p2; | |
| 6335 int t; | |
| 6336 | |
| 6337 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6338 { | |
| 6339 t = *p1; | |
| 6340 *p1 = *p2; | |
| 6341 *p2 = t; | |
| 6342 } | |
| 6343 } | |
| 6344 #endif | |
| 6345 | |
| 6346 #if defined(FEAT_WINDOWS) || defined(PROTO) | |
| 6347 /* | |
| 6348 * mark all status lines for redraw; used after first :cd | |
| 6349 */ | |
| 6350 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6351 status_redraw_all(void) |
| 7 | 6352 { |
| 6353 win_T *wp; | |
| 6354 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6355 FOR_ALL_WINDOWS(wp) |
| 7 | 6356 if (wp->w_status_height) |
| 6357 { | |
| 6358 wp->w_redr_status = TRUE; | |
| 6359 redraw_later(VALID); | |
| 6360 } | |
| 6361 } | |
| 6362 | |
| 6363 /* | |
| 6364 * mark all status lines of the current buffer for redraw | |
| 6365 */ | |
| 6366 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6367 status_redraw_curbuf(void) |
| 7 | 6368 { |
| 6369 win_T *wp; | |
| 6370 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6371 FOR_ALL_WINDOWS(wp) |
| 7 | 6372 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6373 { | |
| 6374 wp->w_redr_status = TRUE; | |
| 6375 redraw_later(VALID); | |
| 6376 } | |
| 6377 } | |
| 6378 | |
| 6379 /* | |
| 6380 * Redraw all status lines that need to be redrawn. | |
| 6381 */ | |
| 6382 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6383 redraw_statuslines(void) |
| 7 | 6384 { |
| 6385 win_T *wp; | |
| 6386 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6387 FOR_ALL_WINDOWS(wp) |
| 7 | 6388 if (wp->w_redr_status) |
| 6389 win_redr_status(wp); | |
| 673 | 6390 if (redraw_tabline) |
| 677 | 6391 draw_tabline(); |
| 7 | 6392 } |
| 6393 #endif | |
| 6394 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6395 #if (defined(FEAT_WILDMENU) && defined(FEAT_WINDOWS)) || defined(PROTO) |
| 7 | 6396 /* |
| 6397 * Redraw all status lines at the bottom of frame "frp". | |
| 6398 */ | |
| 6399 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6400 win_redraw_last_status(frame_T *frp) |
| 7 | 6401 { |
| 6402 if (frp->fr_layout == FR_LEAF) | |
| 6403 frp->fr_win->w_redr_status = TRUE; | |
| 6404 else if (frp->fr_layout == FR_ROW) | |
| 6405 { | |
| 6406 for (frp = frp->fr_child; frp != NULL; frp = frp->fr_next) | |
| 6407 win_redraw_last_status(frp); | |
| 6408 } | |
| 6409 else /* frp->fr_layout == FR_COL */ | |
| 6410 { | |
| 6411 frp = frp->fr_child; | |
| 6412 while (frp->fr_next != NULL) | |
| 6413 frp = frp->fr_next; | |
| 6414 win_redraw_last_status(frp); | |
| 6415 } | |
| 6416 } | |
| 6417 #endif | |
| 6418 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6419 #ifdef FEAT_WINDOWS |
| 7 | 6420 /* |
| 6421 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6422 */ | |
| 6423 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6424 draw_vsep_win(win_T *wp, int row) |
| 7 | 6425 { |
| 6426 int hl; | |
| 6427 int c; | |
| 6428 | |
| 6429 if (wp->w_vsep_width) | |
| 6430 { | |
| 6431 /* draw the vertical separator right of this window */ | |
| 6432 c = fillchar_vsep(&hl); | |
| 6433 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6434 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6435 c, ' ', hl); | |
| 6436 } | |
| 6437 } | |
| 6438 #endif | |
| 6439 | |
| 6440 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6441 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
|
6442 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6443 |
| 6444 /* | |
| 1378 | 6445 * Get the length of an item as it will be shown in the status line. |
| 7 | 6446 */ |
| 6447 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6448 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6449 { |
| 6450 int len = 0; | |
| 6451 | |
| 6452 #ifdef FEAT_MENU | |
| 6453 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6454 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6455 | |
| 6456 /* Check for menu separators - replace with '|'. */ | |
| 6457 if (emenu && menu_is_separator(s)) | |
| 6458 return 1; | |
| 6459 #endif | |
| 6460 | |
| 6461 while (*s != NUL) | |
| 6462 { | |
| 1685 | 6463 s += skip_status_match_char(xp, s); |
| 42 | 6464 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6465 MB_PTR_ADV(s); |
| 7 | 6466 } |
| 6467 | |
| 6468 return len; | |
| 6469 } | |
| 6470 | |
| 6471 /* | |
| 1685 | 6472 * Return the number of characters that should be skipped in a status match. |
| 277 | 6473 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6474 */ | |
| 6475 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6476 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6477 { |
| 1685 | 6478 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6479 #ifdef FEAT_MENU |
| 6480 || ((xp->xp_context == EXPAND_MENUS | |
| 6481 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6482 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6483 #endif | |
| 1685 | 6484 ) |
| 6485 { | |
| 6486 #ifndef BACKSLASH_IN_FILENAME | |
| 6487 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6488 return 2; | |
| 6489 #endif | |
| 6490 return 1; | |
| 6491 } | |
| 6492 return 0; | |
| 277 | 6493 } |
| 6494 | |
| 6495 /* | |
| 7 | 6496 * Show wildchar matches in the status line. |
| 6497 * Show at least the "match" item. | |
| 6498 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6499 * | |
| 6500 * If inversion is possible we use it. Else '=' characters are used. | |
| 6501 */ | |
| 6502 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6503 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6504 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6505 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6506 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6507 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6508 int showtail) |
| 7 | 6509 { |
| 6510 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6511 int row; | |
| 6512 char_u *buf; | |
| 6513 int len; | |
| 1378 | 6514 int clen; /* length in screen cells */ |
| 7 | 6515 int fillchar; |
| 6516 int attr; | |
| 6517 int i; | |
| 6518 int highlight = TRUE; | |
| 6519 char_u *selstart = NULL; | |
| 6520 int selstart_col = 0; | |
| 6521 char_u *selend = NULL; | |
| 6522 static int first_match = 0; | |
| 6523 int add_left = FALSE; | |
| 6524 char_u *s; | |
| 6525 #ifdef FEAT_MENU | |
| 6526 int emenu; | |
| 6527 #endif | |
| 6528 #if defined(FEAT_MBYTE) || defined(FEAT_MENU) | |
| 6529 int l; | |
| 6530 #endif | |
| 6531 | |
| 6532 if (matches == NULL) /* interrupted completion? */ | |
| 6533 return; | |
| 6534 | |
| 39 | 6535 #ifdef FEAT_MBYTE |
| 6536 if (has_mbyte) | |
| 6537 buf = alloc((unsigned)Columns * MB_MAXBYTES + 1); | |
| 6538 else | |
| 6539 #endif | |
| 6540 buf = alloc((unsigned)Columns + 1); | |
| 7 | 6541 if (buf == NULL) |
| 6542 return; | |
| 6543 | |
| 6544 if (match == -1) /* don't show match but original text */ | |
| 6545 { | |
| 6546 match = 0; | |
| 6547 highlight = FALSE; | |
| 6548 } | |
| 6549 /* count 1 for the ending ">" */ | |
| 6550 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6551 if (match == 0) | |
| 6552 first_match = 0; | |
| 6553 else if (match < first_match) | |
| 6554 { | |
| 6555 /* jumping left, as far as we can go */ | |
| 6556 first_match = match; | |
| 6557 add_left = TRUE; | |
| 6558 } | |
| 6559 else | |
| 6560 { | |
| 6561 /* check if match fits on the screen */ | |
| 6562 for (i = first_match; i < match; ++i) | |
| 6563 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6564 if (first_match > 0) | |
| 6565 clen += 2; | |
| 6566 /* jumping right, put match at the left */ | |
| 6567 if ((long)clen > Columns) | |
| 6568 { | |
| 6569 first_match = match; | |
| 6570 /* if showing the last match, we can add some on the left */ | |
| 6571 clen = 2; | |
| 6572 for (i = match; i < num_matches; ++i) | |
| 6573 { | |
| 6574 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6575 if ((long)clen >= Columns) | |
| 6576 break; | |
| 6577 } | |
| 6578 if (i == num_matches) | |
| 6579 add_left = TRUE; | |
| 6580 } | |
| 6581 } | |
| 6582 if (add_left) | |
| 6583 while (first_match > 0) | |
| 6584 { | |
| 6585 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6586 if ((long)clen >= Columns) | |
| 6587 break; | |
| 6588 --first_match; | |
| 6589 } | |
| 6590 | |
| 6591 fillchar = fillchar_status(&attr, TRUE); | |
| 6592 | |
| 6593 if (first_match == 0) | |
| 6594 { | |
| 6595 *buf = NUL; | |
| 6596 len = 0; | |
| 6597 } | |
| 6598 else | |
| 6599 { | |
| 6600 STRCPY(buf, "< "); | |
| 6601 len = 2; | |
| 6602 } | |
| 6603 clen = len; | |
| 6604 | |
| 6605 i = first_match; | |
| 6606 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6607 { | |
| 6608 if (i == match) | |
| 6609 { | |
| 6610 selstart = buf + len; | |
| 6611 selstart_col = clen; | |
| 6612 } | |
| 6613 | |
| 6614 s = L_MATCH(i); | |
| 6615 /* Check for menu separators - replace with '|' */ | |
| 6616 #ifdef FEAT_MENU | |
| 6617 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6618 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6619 if (emenu && menu_is_separator(s)) | |
| 6620 { | |
| 6621 STRCPY(buf + len, transchar('|')); | |
| 6622 l = (int)STRLEN(buf + len); | |
| 6623 len += l; | |
| 6624 clen += l; | |
| 6625 } | |
| 6626 else | |
| 6627 #endif | |
| 6628 for ( ; *s != NUL; ++s) | |
| 6629 { | |
| 1685 | 6630 s += skip_status_match_char(xp, s); |
| 7 | 6631 clen += ptr2cells(s); |
| 6632 #ifdef FEAT_MBYTE | |
| 474 | 6633 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6634 { |
| 6635 STRNCPY(buf + len, s, l); | |
| 6636 s += l - 1; | |
| 6637 len += l; | |
| 6638 } | |
| 6639 else | |
| 6640 #endif | |
| 6641 { | |
| 6642 STRCPY(buf + len, transchar_byte(*s)); | |
| 6643 len += (int)STRLEN(buf + len); | |
| 6644 } | |
| 6645 } | |
| 6646 if (i == match) | |
| 6647 selend = buf + len; | |
| 6648 | |
| 6649 *(buf + len++) = ' '; | |
| 6650 *(buf + len++) = ' '; | |
| 6651 clen += 2; | |
| 6652 if (++i == num_matches) | |
| 6653 break; | |
| 6654 } | |
| 6655 | |
| 6656 if (i != num_matches) | |
| 6657 { | |
| 6658 *(buf + len++) = '>'; | |
| 6659 ++clen; | |
| 6660 } | |
| 6661 | |
| 6662 buf[len] = NUL; | |
| 6663 | |
| 6664 row = cmdline_row - 1; | |
| 6665 if (row >= 0) | |
| 6666 { | |
| 6667 if (wild_menu_showing == 0) | |
| 6668 { | |
| 6669 if (msg_scrolled > 0) | |
| 6670 { | |
| 6671 /* Put the wildmenu just above the command line. If there is | |
| 6672 * no room, scroll the screen one line up. */ | |
| 6673 if (cmdline_row == Rows - 1) | |
| 6674 { | |
| 6675 screen_del_lines(0, 0, 1, (int)Rows, TRUE, NULL); | |
| 6676 ++msg_scrolled; | |
| 6677 } | |
| 6678 else | |
| 6679 { | |
| 6680 ++cmdline_row; | |
| 6681 ++row; | |
| 6682 } | |
| 6683 wild_menu_showing = WM_SCROLLED; | |
| 6684 } | |
| 6685 else | |
| 6686 { | |
| 6687 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6688 * Set 'winminheight' to zero to avoid that the window is | |
| 6689 * resized. */ | |
| 6690 if (lastwin->w_status_height == 0) | |
| 6691 { | |
| 6692 save_p_ls = p_ls; | |
| 6693 save_p_wmh = p_wmh; | |
| 6694 p_ls = 2; | |
| 6695 p_wmh = 0; | |
| 6696 last_status(FALSE); | |
| 6697 } | |
| 6698 wild_menu_showing = WM_SHOWN; | |
| 6699 } | |
| 6700 } | |
| 6701 | |
| 6702 screen_puts(buf, row, 0, attr); | |
| 6703 if (selstart != NULL && highlight) | |
| 6704 { | |
| 6705 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
6706 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 6707 } |
| 6708 | |
| 6709 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6710 } | |
| 6711 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6712 #ifdef FEAT_WINDOWS |
| 7 | 6713 win_redraw_last_status(topframe); |
| 6714 #else | |
| 6715 lastwin->w_redr_status = TRUE; | |
| 6716 #endif | |
| 6717 vim_free(buf); | |
| 6718 } | |
| 6719 #endif | |
| 6720 | |
| 6721 #if defined(FEAT_WINDOWS) || defined(PROTO) | |
| 6722 /* | |
| 6723 * Redraw the status line of window wp. | |
| 6724 * | |
| 6725 * If inversion is possible we use it. Else '=' characters are used. | |
| 6726 */ | |
| 6727 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6728 win_redr_status(win_T *wp) |
| 7 | 6729 { |
| 6730 int row; | |
| 6731 char_u *p; | |
| 6732 int len; | |
| 6733 int fillchar; | |
| 6734 int attr; | |
| 6735 int this_ru_col; | |
| 1910 | 6736 static int busy = FALSE; |
| 6737 | |
| 6738 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6739 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6740 if (busy) | |
| 6741 return; | |
| 6742 busy = TRUE; | |
| 7 | 6743 |
| 6744 wp->w_redr_status = FALSE; | |
| 6745 if (wp->w_status_height == 0) | |
| 6746 { | |
| 6747 /* no status line, can only be last window */ | |
| 6748 redraw_cmdline = TRUE; | |
| 6749 } | |
| 540 | 6750 else if (!redrawing() |
| 6751 #ifdef FEAT_INS_EXPAND | |
| 6752 /* don't update status line when popup menu is visible and may be | |
| 6753 * drawn over it */ | |
| 6754 || pum_visible() | |
| 6755 #endif | |
| 6756 ) | |
| 7 | 6757 { |
| 6758 /* Don't redraw right now, do it later. */ | |
| 6759 wp->w_redr_status = TRUE; | |
| 6760 } | |
| 6761 #ifdef FEAT_STL_OPT | |
| 40 | 6762 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 6763 { |
| 6764 /* redraw custom status line */ | |
| 1983 | 6765 redraw_custom_statusline(wp); |
| 7 | 6766 } |
| 6767 #endif | |
| 6768 else | |
| 6769 { | |
| 6770 fillchar = fillchar_status(&attr, wp == curwin); | |
| 6771 | |
| 685 | 6772 get_trans_bufname(wp->w_buffer); |
| 7 | 6773 p = NameBuff; |
| 6774 len = (int)STRLEN(p); | |
| 6775 | |
| 6776 if (wp->w_buffer->b_help | |
| 6777 #ifdef FEAT_QUICKFIX | |
| 6778 || wp->w_p_pvw | |
| 6779 #endif | |
| 6780 || bufIsChanged(wp->w_buffer) | |
| 6781 || wp->w_buffer->b_p_ro) | |
| 6782 *(p + len++) = ' '; | |
| 6783 if (wp->w_buffer->b_help) | |
| 6784 { | |
| 809 | 6785 STRCPY(p + len, _("[Help]")); |
| 7 | 6786 len += (int)STRLEN(p + len); |
| 6787 } | |
| 6788 #ifdef FEAT_QUICKFIX | |
| 6789 if (wp->w_p_pvw) | |
| 6790 { | |
| 6791 STRCPY(p + len, _("[Preview]")); | |
| 6792 len += (int)STRLEN(p + len); | |
| 6793 } | |
| 6794 #endif | |
| 6795 if (bufIsChanged(wp->w_buffer)) | |
| 6796 { | |
| 6797 STRCPY(p + len, "[+]"); | |
| 6798 len += 3; | |
| 6799 } | |
| 6800 if (wp->w_buffer->b_p_ro) | |
| 6801 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
6802 STRCPY(p + len, _("[RO]")); |
|
10928
5b3e671ef6a2
patch 8.0.0353: if [RO] is translated it may be truncated
Christian Brabandt <cb@256bit.org>
parents:
10801
diff
changeset
|
6803 len += (int)STRLEN(p + len); |
| 7 | 6804 } |
| 6805 | |
| 6806 this_ru_col = ru_col - (Columns - W_WIDTH(wp)); | |
| 6807 if (this_ru_col < (W_WIDTH(wp) + 1) / 2) | |
| 6808 this_ru_col = (W_WIDTH(wp) + 1) / 2; | |
| 6809 if (this_ru_col <= 1) | |
| 6810 { | |
| 6811 p = (char_u *)"<"; /* No room for file name! */ | |
| 6812 len = 1; | |
| 6813 } | |
| 6814 else | |
| 6815 #ifdef FEAT_MBYTE | |
| 6816 if (has_mbyte) | |
| 6817 { | |
| 6818 int clen = 0, i; | |
| 6819 | |
| 6820 /* Count total number of display cells. */ | |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6821 clen = mb_string2cells(p, -1); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6822 |
| 7 | 6823 /* Find first character that will fit. |
| 6824 * Going from start to end is much faster for DBCS. */ | |
| 6825 for (i = 0; p[i] != NUL && clen >= this_ru_col - 1; | |
| 474 | 6826 i += (*mb_ptr2len)(p + i)) |
| 7 | 6827 clen -= (*mb_ptr2cells)(p + i); |
| 6828 len = clen; | |
| 6829 if (i > 0) | |
| 6830 { | |
| 6831 p = p + i - 1; | |
| 6832 *p = '<'; | |
| 6833 ++len; | |
| 6834 } | |
| 6835 | |
| 6836 } | |
| 6837 else | |
| 6838 #endif | |
| 6839 if (len > this_ru_col - 1) | |
| 6840 { | |
| 6841 p += len - (this_ru_col - 1); | |
| 6842 *p = '<'; | |
| 6843 len = this_ru_col - 1; | |
| 6844 } | |
| 6845 | |
| 6846 row = W_WINROW(wp) + wp->w_height; | |
| 6847 screen_puts(p, row, W_WINCOL(wp), attr); | |
| 6848 screen_fill(row, row + 1, len + W_WINCOL(wp), | |
| 6849 this_ru_col + W_WINCOL(wp), fillchar, fillchar, attr); | |
| 6850 | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6851 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 6852 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 6853 screen_puts(NameBuff, row, (int)(this_ru_col - STRLEN(NameBuff) | |
| 6854 - 1 + W_WINCOL(wp)), attr); | |
| 6855 | |
| 6856 #ifdef FEAT_CMDL_INFO | |
| 6857 win_redr_ruler(wp, TRUE); | |
| 6858 #endif | |
| 6859 } | |
| 6860 | |
| 6861 /* | |
| 6862 * May need to draw the character below the vertical separator. | |
| 6863 */ | |
| 6864 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 6865 { | |
| 6866 if (stl_connected(wp)) | |
| 6867 fillchar = fillchar_status(&attr, wp == curwin); | |
| 6868 else | |
| 6869 fillchar = fillchar_vsep(&attr); | |
| 6870 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 6871 attr); | |
| 6872 } | |
| 1910 | 6873 busy = FALSE; |
| 7 | 6874 } |
| 6875 | |
| 680 | 6876 #ifdef FEAT_STL_OPT |
| 6877 /* | |
| 6878 * Redraw the status line according to 'statusline' and take care of any | |
| 6879 * errors encountered. | |
| 6880 */ | |
| 6881 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6882 redraw_custom_statusline(win_T *wp) |
| 680 | 6883 { |
| 1983 | 6884 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6885 int saved_did_emsg = did_emsg; |
| 1983 | 6886 |
| 6887 /* When called recursively return. This can happen when the statusline | |
| 6888 * contains an expression that triggers a redraw. */ | |
| 6889 if (entered) | |
| 6890 return; | |
| 6891 entered = TRUE; | |
| 680 | 6892 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6893 did_emsg = FALSE; |
| 680 | 6894 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6895 if (did_emsg) |
| 1983 | 6896 { |
| 6897 /* When there is an error disable the statusline, otherwise the | |
| 6898 * display is messed up with errors and a redraw triggers the problem | |
| 6899 * again and again. */ | |
| 680 | 6900 set_string_option_direct((char_u *)"statusline", -1, |
| 6901 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 6902 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 6903 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6904 did_emsg |= saved_did_emsg; |
| 1983 | 6905 entered = FALSE; |
| 680 | 6906 } |
| 6907 #endif | |
| 6908 | |
| 7 | 6909 /* |
| 6910 * Return TRUE if the status line of window "wp" is connected to the status | |
| 6911 * line of the window right of it. If not, then it's a vertical separator. | |
| 6912 * Only call if (wp->w_vsep_width != 0). | |
| 6913 */ | |
| 6914 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6915 stl_connected(win_T *wp) |
| 7 | 6916 { |
| 6917 frame_T *fr; | |
| 6918 | |
| 6919 fr = wp->w_frame; | |
| 6920 while (fr->fr_parent != NULL) | |
| 6921 { | |
| 6922 if (fr->fr_parent->fr_layout == FR_COL) | |
| 6923 { | |
| 6924 if (fr->fr_next != NULL) | |
| 6925 break; | |
| 6926 } | |
| 6927 else | |
| 6928 { | |
| 6929 if (fr->fr_next != NULL) | |
| 6930 return TRUE; | |
| 6931 } | |
| 6932 fr = fr->fr_parent; | |
| 6933 } | |
| 6934 return FALSE; | |
| 6935 } | |
| 6936 | |
| 6937 #endif /* FEAT_WINDOWS */ | |
| 6938 | |
| 6939 #if defined(FEAT_WINDOWS) || defined(FEAT_STL_OPT) || defined(PROTO) | |
| 6940 /* | |
| 6941 * Get the value to show for the language mappings, active 'keymap'. | |
| 6942 */ | |
| 6943 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6944 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6945 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6946 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
|
6947 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
|
6948 int len) /* length of buffer */ |
| 7 | 6949 { |
| 6950 char_u *p; | |
| 6951 | |
| 6952 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 6953 return FALSE; | |
| 6954 | |
| 6955 { | |
| 6956 #ifdef FEAT_EVAL | |
| 6957 buf_T *old_curbuf = curbuf; | |
| 6958 win_T *old_curwin = curwin; | |
| 6959 char_u *s; | |
| 6960 | |
| 6961 curbuf = wp->w_buffer; | |
| 6962 curwin = wp; | |
| 6963 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 6964 ++emsg_skip; | |
| 714 | 6965 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 6966 --emsg_skip; |
| 6967 curbuf = old_curbuf; | |
| 6968 curwin = old_curwin; | |
| 6969 if (p == NULL || *p == NUL) | |
| 6970 #endif | |
| 6971 { | |
| 6972 #ifdef FEAT_KEYMAP | |
| 6973 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 6974 p = wp->w_buffer->b_p_keymap; | |
| 6975 else | |
| 6976 #endif | |
| 6977 p = (char_u *)"lang"; | |
| 6978 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6979 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 6980 buf[0] = NUL; |
| 6981 #ifdef FEAT_EVAL | |
| 6982 vim_free(s); | |
| 6983 #endif | |
| 6984 } | |
| 6985 return buf[0] != NUL; | |
| 6986 } | |
| 6987 #endif | |
| 6988 | |
| 6989 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 6990 /* | |
| 677 | 6991 * Redraw the status line or ruler of window "wp". |
| 6992 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 6993 */ |
| 6994 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6995 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6996 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6997 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 6998 { |
| 5539 | 6999 static int entered = FALSE; |
| 7 | 7000 int attr; |
| 7001 int curattr; | |
| 7002 int row; | |
| 7003 int col = 0; | |
| 7004 int maxwidth; | |
| 7005 int width; | |
| 7006 int n; | |
| 7007 int len; | |
| 7008 int fillchar; | |
| 7009 char_u buf[MAXPATHL]; | |
| 1983 | 7010 char_u *stl; |
| 7 | 7011 char_u *p; |
| 681 | 7012 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7013 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7014 int use_sandbox = FALSE; |
| 2693 | 7015 win_T *ewp; |
| 7016 int p_crb_save; | |
| 7 | 7017 |
| 5539 | 7018 /* There is a tiny chance that this gets called recursively: When |
| 7019 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7020 * Avoid trouble by not allowing recursion. */ | |
| 7021 if (entered) | |
| 7022 return; | |
| 7023 entered = TRUE; | |
| 7024 | |
| 7 | 7025 /* setup environment for the task at hand */ |
| 677 | 7026 if (wp == NULL) |
| 7027 { | |
| 7028 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7029 stl = p_tal; |
| 677 | 7030 row = 0; |
| 707 | 7031 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7032 attr = HL_ATTR(HLF_TPF); |
| 677 | 7033 maxwidth = Columns; |
| 7034 # ifdef FEAT_EVAL | |
| 681 | 7035 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7036 # endif |
| 7037 } | |
| 40 | 7038 else |
| 677 | 7039 { |
| 7040 row = W_WINROW(wp) + wp->w_height; | |
| 7041 fillchar = fillchar_status(&attr, wp == curwin); | |
| 7042 maxwidth = W_WIDTH(wp); | |
| 7043 | |
| 7044 if (draw_ruler) | |
| 7045 { | |
| 1983 | 7046 stl = p_ruf; |
| 677 | 7047 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7048 if (*stl == '%') |
| 7049 { | |
| 7050 if (*++stl == '-') | |
| 7051 stl++; | |
| 7052 if (atoi((char *)stl)) | |
| 7053 while (VIM_ISDIGIT(*stl)) | |
| 7054 stl++; | |
| 7055 if (*stl++ != '(') | |
| 7056 stl = p_ruf; | |
| 677 | 7057 } |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
7058 #ifdef FEAT_WINDOWS |
| 677 | 7059 col = ru_col - (Columns - W_WIDTH(wp)); |
| 7060 if (col < (W_WIDTH(wp) + 1) / 2) | |
| 7061 col = (W_WIDTH(wp) + 1) / 2; | |
| 7 | 7062 #else |
| 677 | 7063 col = ru_col; |
| 7064 if (col > (Columns + 1) / 2) | |
| 7065 col = (Columns + 1) / 2; | |
| 7066 #endif | |
| 7067 maxwidth = W_WIDTH(wp) - col; | |
| 7 | 7068 #ifdef FEAT_WINDOWS |
| 677 | 7069 if (!wp->w_status_height) |
| 7070 #endif | |
| 7071 { | |
| 7072 row = Rows - 1; | |
| 7073 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7074 fillchar = ' '; | |
| 7075 attr = 0; | |
| 7076 } | |
| 7077 | |
| 7078 # ifdef FEAT_EVAL | |
| 681 | 7079 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7080 # endif |
| 7081 } | |
| 7082 else | |
| 7083 { | |
| 7084 if (*wp->w_p_stl != NUL) | |
| 1983 | 7085 stl = wp->w_p_stl; |
| 677 | 7086 else |
| 1983 | 7087 stl = p_stl; |
| 677 | 7088 # ifdef FEAT_EVAL |
| 681 | 7089 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7090 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7091 # endif |
| 7092 } | |
| 7093 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
7094 #ifdef FEAT_WINDOWS |
| 677 | 7095 col += W_WINCOL(wp); |
| 7096 #endif | |
| 7097 } | |
| 7098 | |
| 7 | 7099 if (maxwidth <= 0) |
| 5539 | 7100 goto theend; |
| 677 | 7101 |
| 2693 | 7102 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7103 * the cursor away and back. */ | |
| 7104 ewp = wp == NULL ? curwin : wp; | |
| 7105 p_crb_save = ewp->w_p_crb; | |
| 7106 ewp->w_p_crb = FALSE; | |
| 7107 | |
| 1983 | 7108 /* Make a copy, because the statusline may include a function call that |
| 7109 * might change the option value and free the memory. */ | |
| 7110 stl = vim_strsave(stl); | |
| 2693 | 7111 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7112 stl, use_sandbox, |
| 681 | 7113 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7114 vim_free(stl); |
| 2693 | 7115 ewp->w_p_crb = p_crb_save; |
| 2661 | 7116 |
| 7117 /* Make all characters printable. */ | |
| 7118 p = transstr(buf); | |
| 7119 if (p != NULL) | |
| 7120 { | |
| 7121 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7122 vim_free(p); | |
| 7123 } | |
| 7124 | |
| 7125 /* fill up with "fillchar" */ | |
| 835 | 7126 len = (int)STRLEN(buf); |
| 1883 | 7127 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7128 { |
| 7129 #ifdef FEAT_MBYTE | |
| 7130 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7131 #else | |
| 7132 buf[len++] = fillchar; | |
| 7133 #endif | |
| 7134 ++width; | |
| 7135 } | |
| 7136 buf[len] = NUL; | |
| 7137 | |
| 681 | 7138 /* |
| 7139 * Draw each snippet with the specified highlighting. | |
| 7140 */ | |
| 7 | 7141 curattr = attr; |
| 7142 p = buf; | |
| 681 | 7143 for (n = 0; hltab[n].start != NULL; n++) |
| 7144 { | |
| 7145 len = (int)(hltab[n].start - p); | |
| 7 | 7146 screen_puts_len(p, len, row, col, curattr); |
| 7147 col += vim_strnsize(p, len); | |
| 681 | 7148 p = hltab[n].start; |
| 7149 | |
| 7150 if (hltab[n].userhl == 0) | |
| 7 | 7151 curattr = attr; |
| 681 | 7152 else if (hltab[n].userhl < 0) |
| 7153 curattr = syn_id2attr(-hltab[n].userhl); | |
| 7 | 7154 #ifdef FEAT_WINDOWS |
| 680 | 7155 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7156 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7157 #endif |
| 7158 else | |
| 681 | 7159 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7160 } |
| 7161 screen_puts(p, row, col, curattr); | |
| 681 | 7162 |
| 7163 if (wp == NULL) | |
| 7164 { | |
| 7165 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7166 col = 0; | |
| 7167 len = 0; | |
| 7168 p = buf; | |
| 7169 fillchar = 0; | |
| 7170 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7171 { | |
| 7172 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7173 while (col < len) | |
| 7174 TabPageIdxs[col++] = fillchar; | |
| 7175 p = tabtab[n].start; | |
| 7176 fillchar = tabtab[n].userhl; | |
| 7177 } | |
| 7178 while (col < Columns) | |
| 7179 TabPageIdxs[col++] = fillchar; | |
| 7180 } | |
| 5539 | 7181 |
| 7182 theend: | |
| 7183 entered = FALSE; | |
| 7 | 7184 } |
| 7185 | |
| 7186 #endif /* FEAT_STL_OPT */ | |
| 7187 | |
| 7188 /* | |
| 7189 * Output a single character directly to the screen and update ScreenLines. | |
| 7190 */ | |
| 7191 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7192 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7193 { |
| 3549 | 7194 char_u buf[MB_MAXBYTES + 1]; |
| 7195 | |
| 7 | 7196 #ifdef FEAT_MBYTE |
| 3549 | 7197 if (has_mbyte) |
| 7198 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7199 else | |
| 7200 #endif | |
| 7201 { | |
| 7202 buf[0] = c; | |
| 7203 buf[1] = NUL; | |
| 7204 } | |
| 7 | 7205 screen_puts(buf, row, col, attr); |
| 7206 } | |
| 7207 | |
| 7208 /* | |
| 7209 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7210 * Also return its attribute in *attrp; | |
| 7211 */ | |
| 7212 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7213 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7214 { |
| 7215 unsigned off; | |
| 7216 | |
| 7217 /* safety check */ | |
| 7218 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7219 { | |
| 7220 off = LineOffset[row] + col; | |
| 7221 *attrp = ScreenAttrs[off]; | |
| 7222 bytes[0] = ScreenLines[off]; | |
| 7223 bytes[1] = NUL; | |
| 7224 | |
| 7225 #ifdef FEAT_MBYTE | |
| 7226 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7227 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7228 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7229 { | |
| 7230 bytes[0] = ScreenLines[off]; | |
| 7231 bytes[1] = ScreenLines2[off]; | |
| 7232 bytes[2] = NUL; | |
| 7233 } | |
| 7234 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7235 { | |
| 7236 bytes[1] = ScreenLines[off + 1]; | |
| 7237 bytes[2] = NUL; | |
| 7238 } | |
| 7239 #endif | |
| 7240 } | |
| 7241 } | |
| 7242 | |
| 714 | 7243 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
7244 static int screen_comp_differs(int, int*); |
| 714 | 7245 |
| 7246 /* | |
| 7247 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7248 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7249 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7250 */ |
| 7251 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7252 screen_comp_differs(int off, int *u8cc) |
| 714 | 7253 { |
| 7254 int i; | |
| 7255 | |
| 7256 for (i = 0; i < Screen_mco; ++i) | |
| 7257 { | |
| 7258 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7259 return TRUE; | |
| 7260 if (u8cc[i] == 0) | |
| 7261 break; | |
| 7262 } | |
| 7263 return FALSE; | |
| 7264 } | |
| 7265 #endif | |
| 7266 | |
| 7 | 7267 /* |
| 7268 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7269 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7270 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7271 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7272 */ | |
| 7273 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7274 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7275 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7276 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7277 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7278 int attr) |
| 7 | 7279 { |
| 7280 screen_puts_len(text, -1, row, col, attr); | |
| 7281 } | |
| 7282 | |
| 7283 /* | |
| 7284 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7285 * a NUL. | |
| 7286 */ | |
| 7287 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7288 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7289 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7290 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7291 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7292 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7293 int attr) |
| 7 | 7294 { |
| 7295 unsigned off; | |
| 7296 char_u *ptr = text; | |
| 5923 | 7297 int len = textlen; |
| 7 | 7298 int c; |
| 7299 #ifdef FEAT_MBYTE | |
| 1378 | 7300 unsigned max_off; |
| 7 | 7301 int mbyte_blen = 1; |
| 7302 int mbyte_cells = 1; | |
| 7303 int u8c = 0; | |
| 714 | 7304 int u8cc[MAX_MCO]; |
| 7 | 7305 int clear_next_cell = FALSE; |
| 7306 # ifdef FEAT_ARABIC | |
| 7307 int prev_c = 0; /* previous Arabic character */ | |
| 714 | 7308 int pc, nc, nc1; |
| 7309 int pcc[MAX_MCO]; | |
| 7 | 7310 # endif |
| 7311 #endif | |
| 1843 | 7312 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7313 int force_redraw_this; | |
| 7314 int force_redraw_next = FALSE; | |
| 7315 #endif | |
| 7316 int need_redraw; | |
| 7 | 7317 |
| 7318 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7319 return; | |
| 1843 | 7320 off = LineOffset[row] + col; |
| 7 | 7321 |
| 1668 | 7322 #ifdef FEAT_MBYTE |
| 7323 /* When drawing over the right halve of a double-wide char clear out the | |
| 7324 * left halve. Only needed in a terminal. */ | |
| 1685 | 7325 if (has_mbyte && col > 0 && col < screen_Columns |
| 1668 | 7326 # ifdef FEAT_GUI |
| 7327 && !gui.in_use | |
| 7328 # endif | |
| 7329 && mb_fix_col(col, row) != col) | |
| 1843 | 7330 { |
| 7331 ScreenLines[off - 1] = ' '; | |
| 7332 ScreenAttrs[off - 1] = 0; | |
| 7333 if (enc_utf8) | |
| 7334 { | |
| 7335 ScreenLinesUC[off - 1] = 0; | |
| 7336 ScreenLinesC[0][off - 1] = 0; | |
| 7337 } | |
| 7338 /* redraw the previous cell, make it empty */ | |
| 7339 screen_char(off - 1, row, col - 1); | |
| 7340 /* force the cell at "col" to be redrawn */ | |
| 7341 force_redraw_next = TRUE; | |
| 7342 } | |
| 7343 #endif | |
| 7344 | |
| 1378 | 7345 #ifdef FEAT_MBYTE |
| 7346 max_off = LineOffset[row] + screen_Columns; | |
| 7347 #endif | |
| 1340 | 7348 while (col < screen_Columns |
| 7349 && (len < 0 || (int)(ptr - text) < len) | |
| 7350 && *ptr != NUL) | |
| 7 | 7351 { |
| 7352 c = *ptr; | |
| 7353 #ifdef FEAT_MBYTE | |
| 7354 /* check if this is the first byte of a multibyte */ | |
| 7355 if (has_mbyte) | |
| 7356 { | |
| 7357 if (enc_utf8 && len > 0) | |
| 474 | 7358 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7359 else |
| 474 | 7360 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7361 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7362 mbyte_cells = 1; | |
| 7363 else if (enc_dbcs != 0) | |
| 7364 mbyte_cells = mbyte_blen; | |
| 7365 else /* enc_utf8 */ | |
| 7366 { | |
| 7367 if (len >= 0) | |
| 714 | 7368 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7369 (int)((text + len) - ptr)); |
| 7370 else | |
| 714 | 7371 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7372 mbyte_cells = utf_char2cells(u8c); |
| 1401 | 7373 # ifdef UNICODE16 |
| 7 | 7374 /* Non-BMP character: display as ? or fullwidth ?. */ |
| 7375 if (u8c >= 0x10000) | |
| 7376 { | |
| 7377 u8c = (mbyte_cells == 2) ? 0xff1f : (int)'?'; | |
| 7378 if (attr == 0) | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7379 attr = HL_ATTR(HLF_8); |
| 7 | 7380 } |
| 1401 | 7381 # endif |
| 7 | 7382 # ifdef FEAT_ARABIC |
| 7383 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 7384 { | |
| 7385 /* Do Arabic shaping. */ | |
| 7386 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7387 { | |
| 7388 /* Past end of string to be displayed. */ | |
| 7389 nc = NUL; | |
| 7390 nc1 = NUL; | |
| 7391 } | |
| 7392 else | |
| 714 | 7393 { |
| 1994 | 7394 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7395 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7396 nc1 = pcc[0]; |
| 7397 } | |
| 7 | 7398 pc = prev_c; |
| 7399 prev_c = u8c; | |
| 714 | 7400 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7401 } |
| 7402 else | |
| 7403 prev_c = u8c; | |
| 7404 # endif | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7405 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7406 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7407 /* 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
|
7408 * 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
|
7409 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7410 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7411 } |
| 7 | 7412 } |
| 7413 } | |
| 7414 #endif | |
| 7415 | |
| 1843 | 7416 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7417 force_redraw_this = force_redraw_next; | |
| 7418 force_redraw_next = FALSE; | |
| 7419 #endif | |
| 7420 | |
| 7421 need_redraw = ScreenLines[off] != c | |
| 7 | 7422 #ifdef FEAT_MBYTE |
| 7423 || (mbyte_cells == 2 | |
| 7424 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7425 || (enc_dbcs == DBCS_JPNU | |
| 7426 && c == 0x8e | |
| 7427 && ScreenLines2[off] != ptr[1]) | |
| 7428 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7429 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7430 (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
|
7431 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7432 && screen_comp_differs(off, u8cc)))) |
| 7 | 7433 #endif |
| 7434 || ScreenAttrs[off] != attr | |
| 1843 | 7435 || exmode_active; |
| 7436 | |
| 7437 if (need_redraw | |
| 7438 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7439 || force_redraw_this | |
| 7440 #endif | |
| 7 | 7441 ) |
| 7442 { | |
| 7443 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7444 /* The bold trick makes a single row of pixels appear in the next | |
| 7445 * character. When a bold character is removed, the next | |
| 7446 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7447 * and for some xterms. */ |
| 7448 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7449 # ifdef FEAT_GUI |
| 7450 gui.in_use | |
| 7451 # endif | |
| 7452 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7453 || | |
| 7454 # endif | |
| 7455 # ifdef UNIX | |
| 7456 term_is_xterm | |
| 7457 # endif | |
| 1843 | 7458 )) |
| 7459 { | |
| 7460 int n = ScreenAttrs[off]; | |
| 7461 | |
| 7462 if (n > HL_ALL) | |
| 7463 n = syn_attr2attr(n); | |
| 7464 if (n & HL_BOLD) | |
| 7465 force_redraw_next = TRUE; | |
| 7 | 7466 } |
| 7467 #endif | |
| 7468 #ifdef FEAT_MBYTE | |
| 7469 /* When at the end of the text and overwriting a two-cell | |
| 7470 * character with a one-cell character, need to clear the next | |
| 7471 * cell. Also when overwriting the left halve of a two-cell char | |
| 7472 * with the right halve of a two-cell char. Do this only once | |
| 7473 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7474 if (clear_next_cell) | |
| 7475 clear_next_cell = FALSE; | |
| 7476 else if (has_mbyte | |
| 7477 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7478 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7479 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7480 || (mbyte_cells == 2 |
| 1378 | 7481 && (*mb_off2cells)(off, max_off) == 1 |
| 7482 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7483 clear_next_cell = TRUE; |
| 7484 | |
| 7485 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7486 * it confuses mb_off2cells(). */ | |
| 7487 if (enc_dbcs | |
| 1378 | 7488 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7489 || (mbyte_cells == 2 |
| 1378 | 7490 && (*mb_off2cells)(off, max_off) == 1 |
| 7491 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7492 ScreenLines[off + mbyte_blen] = 0; |
| 7493 #endif | |
| 7494 ScreenLines[off] = c; | |
| 7495 ScreenAttrs[off] = attr; | |
| 7496 #ifdef FEAT_MBYTE | |
| 7497 if (enc_utf8) | |
| 7498 { | |
| 714 | 7499 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7500 ScreenLinesUC[off] = 0; |
| 7501 else | |
| 7502 { | |
| 714 | 7503 int i; |
| 7504 | |
| 7 | 7505 ScreenLinesUC[off] = u8c; |
| 714 | 7506 for (i = 0; i < Screen_mco; ++i) |
| 7507 { | |
| 7508 ScreenLinesC[i][off] = u8cc[i]; | |
| 7509 if (u8cc[i] == 0) | |
| 7510 break; | |
| 7511 } | |
| 7 | 7512 } |
| 7513 if (mbyte_cells == 2) | |
| 7514 { | |
| 7515 ScreenLines[off + 1] = 0; | |
| 7516 ScreenAttrs[off + 1] = attr; | |
| 7517 } | |
| 7518 screen_char(off, row, col); | |
| 7519 } | |
| 7520 else if (mbyte_cells == 2) | |
| 7521 { | |
| 7522 ScreenLines[off + 1] = ptr[1]; | |
| 7523 ScreenAttrs[off + 1] = attr; | |
| 7524 screen_char_2(off, row, col); | |
| 7525 } | |
| 7526 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7527 { | |
| 7528 ScreenLines2[off] = ptr[1]; | |
| 7529 screen_char(off, row, col); | |
| 7530 } | |
| 7531 else | |
| 7532 #endif | |
| 7533 screen_char(off, row, col); | |
| 7534 } | |
| 7535 #ifdef FEAT_MBYTE | |
| 7536 if (has_mbyte) | |
| 7537 { | |
| 7538 off += mbyte_cells; | |
| 7539 col += mbyte_cells; | |
| 7540 ptr += mbyte_blen; | |
| 7541 if (clear_next_cell) | |
| 5923 | 7542 { |
| 7543 /* This only happens at the end, display one space next. */ | |
| 7 | 7544 ptr = (char_u *)" "; |
| 5923 | 7545 len = -1; |
| 7546 } | |
| 7 | 7547 } |
| 7548 else | |
| 7549 #endif | |
| 7550 { | |
| 7551 ++off; | |
| 7552 ++col; | |
| 7553 ++ptr; | |
| 7554 } | |
| 7555 } | |
| 1843 | 7556 |
| 7557 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7558 /* If we detected the next character needs to be redrawn, but the text | |
| 7559 * doesn't extend up to there, update the character here. */ | |
| 7560 if (force_redraw_next && col < screen_Columns) | |
| 7561 { | |
| 7562 # ifdef FEAT_MBYTE | |
| 7563 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7564 screen_char_2(off, row, col); | |
| 7565 else | |
| 7566 # endif | |
| 7567 screen_char(off, row, col); | |
| 7568 } | |
| 7569 #endif | |
| 7 | 7570 } |
| 7571 | |
| 7572 #ifdef FEAT_SEARCH_EXTRA | |
| 7573 /* | |
| 1326 | 7574 * Prepare for 'hlsearch' highlighting. |
| 7 | 7575 */ |
| 7576 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7577 start_search_hl(void) |
| 7 | 7578 { |
| 7579 if (p_hls && !no_hlsearch) | |
| 7580 { | |
| 7581 last_pat_prog(&search_hl.rm); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7582 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7583 # ifdef FEAT_RELTIME |
| 7584 /* Set the time limit to 'redrawtime'. */ | |
| 7585 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7586 # endif | |
| 7 | 7587 } |
| 7588 } | |
| 7589 | |
| 7590 /* | |
| 1326 | 7591 * Clean up for 'hlsearch' highlighting. |
| 7 | 7592 */ |
| 7593 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7594 end_search_hl(void) |
| 7 | 7595 { |
| 7596 if (search_hl.rm.regprog != NULL) | |
| 7597 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7598 vim_regfree(search_hl.rm.regprog); |
| 7 | 7599 search_hl.rm.regprog = NULL; |
| 7600 } | |
| 7601 } | |
| 7602 | |
| 7603 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7604 * 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
|
7605 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7606 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7607 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
|
7608 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7609 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7610 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7611 /* 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
|
7612 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7613 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7614 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7615 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7616 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7617 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7618 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7619 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7620 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
|
7621 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
|
7622 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7623 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7624 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7625 /* 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
|
7626 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
|
7627 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7628 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7629 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7630 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
|
7631 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7632 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7633 /* 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
|
7634 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7635 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7636 /* |
| 7 | 7637 * Advance to the match in window "wp" line "lnum" or past it. |
| 7638 */ | |
| 7639 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7640 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7641 { |
| 1326 | 7642 matchitem_T *cur; /* points to the match list */ |
| 7643 match_T *shl; /* points to search_hl or a match */ | |
| 7644 int shl_flag; /* flag to indicate whether search_hl | |
| 7645 has been processed or not */ | |
| 5979 | 7646 int pos_inprogress; /* marks that position match search is |
| 7647 in progress */ | |
| 7 | 7648 int n; |
| 7649 | |
| 7650 /* | |
| 7651 * When using a multi-line pattern, start searching at the top | |
| 7652 * of the window or just after a closed fold. | |
| 1326 | 7653 * Do this both for search_hl and the match list. |
| 7 | 7654 */ |
| 1326 | 7655 cur = wp->w_match_head; |
| 7656 shl_flag = FALSE; | |
| 7657 while (cur != NULL || shl_flag == FALSE) | |
| 7658 { | |
| 7659 if (shl_flag == FALSE) | |
| 7660 { | |
| 7661 shl = &search_hl; | |
| 7662 shl_flag = TRUE; | |
| 7663 } | |
| 7664 else | |
| 7665 shl = &cur->hl; | |
| 7 | 7666 if (shl->rm.regprog != NULL |
| 7667 && shl->lnum == 0 | |
| 7668 && re_multiline(shl->rm.regprog)) | |
| 7669 { | |
| 7670 if (shl->first_lnum == 0) | |
| 7671 { | |
| 7672 # ifdef FEAT_FOLDING | |
| 7673 for (shl->first_lnum = lnum; | |
| 7674 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7675 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7676 NULL, NULL, TRUE, NULL)) | |
| 7677 break; | |
| 7678 # else | |
| 7679 shl->first_lnum = wp->w_topline; | |
| 7680 # endif | |
| 7681 } | |
| 5979 | 7682 if (cur != NULL) |
| 7683 cur->pos.cur = 0; | |
| 7684 pos_inprogress = TRUE; | |
| 7 | 7685 n = 0; |
| 5979 | 7686 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7687 || (cur != NULL && pos_inprogress))) | |
| 7688 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7689 next_search_hl(wp, shl, shl->first_lnum, (colnr_T)n, |
|
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7690 shl == &search_hl ? NULL : cur); |
| 5979 | 7691 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 7692 ? FALSE : TRUE; | |
| 7 | 7693 if (shl->lnum != 0) |
| 7694 { | |
| 7695 shl->first_lnum = shl->lnum | |
| 7696 + shl->rm.endpos[0].lnum | |
| 7697 - shl->rm.startpos[0].lnum; | |
| 7698 n = shl->rm.endpos[0].col; | |
| 7699 } | |
| 7700 else | |
| 7701 { | |
| 7702 ++shl->first_lnum; | |
| 7703 n = 0; | |
| 7704 } | |
| 7705 } | |
| 7706 } | |
| 1326 | 7707 if (shl != &search_hl && cur != NULL) |
| 7708 cur = cur->next; | |
| 7 | 7709 } |
| 7710 } | |
| 7711 | |
| 7712 /* | |
| 1326 | 7713 * Search for a next 'hlsearch' or match. |
| 7 | 7714 * Uses shl->buf. |
| 7715 * Sets shl->lnum and shl->rm contents. | |
| 7716 * Note: Assumes a previous match is always before "lnum", unless | |
| 7717 * shl->lnum is zero. | |
| 7718 * Careful: Any pointers for buffer lines will become invalid. | |
| 7719 */ | |
| 7720 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7721 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7722 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7723 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
|
7724 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7725 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
|
7726 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 7727 { |
| 7728 linenr_T l; | |
| 7729 colnr_T matchcol; | |
| 7730 long nmatched; | |
| 7731 | |
| 7732 if (shl->lnum != 0) | |
| 7733 { | |
| 7734 /* Check for three situations: | |
| 7735 * 1. If the "lnum" is below a previous match, start a new search. | |
| 7736 * 2. If the previous match includes "mincol", use it. | |
| 7737 * 3. Continue after the previous match. | |
| 7738 */ | |
| 7739 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 7740 if (lnum > l) | |
| 7741 shl->lnum = 0; | |
| 7742 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 7743 return; | |
| 7744 } | |
| 7745 | |
| 7746 /* | |
| 7747 * Repeat searching for a match until one is found that includes "mincol" | |
| 7748 * or none is found in this line. | |
| 7749 */ | |
| 7750 called_emsg = FALSE; | |
| 7751 for (;;) | |
| 7752 { | |
| 1521 | 7753 #ifdef FEAT_RELTIME |
| 7754 /* Stop searching after passing the time limit. */ | |
| 7755 if (profile_passed_limit(&(shl->tm))) | |
| 7756 { | |
| 7757 shl->lnum = 0; /* no match found in time */ | |
| 7758 break; | |
| 7759 } | |
| 7760 #endif | |
| 7 | 7761 /* Three situations: |
| 7762 * 1. No useful previous match: search from start of line. | |
| 7763 * 2. Not Vi compatible or empty match: continue at next character. | |
| 7764 * Break the loop if this is beyond the end of the line. | |
| 7765 * 3. Vi compatible searching: continue at end of previous match. | |
| 7766 */ | |
| 7767 if (shl->lnum == 0) | |
| 7768 matchcol = 0; | |
| 7769 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 7770 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 7771 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 7772 { | |
| 688 | 7773 char_u *ml; |
| 685 | 7774 |
| 7775 matchcol = shl->rm.startpos[0].col; | |
| 688 | 7776 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 7777 if (*ml == NUL) |
| 7778 { | |
| 7779 ++matchcol; | |
| 7 | 7780 shl->lnum = 0; |
| 7781 break; | |
| 7782 } | |
| 685 | 7783 #ifdef FEAT_MBYTE |
| 7784 if (has_mbyte) | |
| 7785 matchcol += mb_ptr2len(ml); | |
| 7786 else | |
| 7787 #endif | |
| 7788 ++matchcol; | |
| 7 | 7789 } |
| 7790 else | |
| 7791 matchcol = shl->rm.endpos[0].col; | |
| 7792 | |
| 7793 shl->lnum = lnum; | |
| 5979 | 7794 if (shl->rm.regprog != NULL) |
| 7795 { | |
| 6394 | 7796 /* Remember whether shl->rm is using a copy of the regprog in |
| 7797 * cur->match. */ | |
| 7798 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 7799 && shl == &cur->hl | |
| 7800 && cur->match.regprog == cur->hl.rm.regprog); | |
| 7801 | |
| 5979 | 7802 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 7803 matchcol, | |
| 1521 | 7804 #ifdef FEAT_RELTIME |
| 5979 | 7805 &(shl->tm) |
| 1521 | 7806 #else |
| 5979 | 7807 NULL |
| 7808 #endif | |
| 7809 ); | |
| 6394 | 7810 /* Copy the regprog, in case it got freed and recompiled. */ |
| 7811 if (regprog_is_copy) | |
| 7812 cur->match.regprog = cur->hl.rm.regprog; | |
| 7813 | |
| 5979 | 7814 if (called_emsg || got_int) |
| 7815 { | |
| 7816 /* Error while handling regexp: stop using this regexp. */ | |
| 7817 if (shl == &search_hl) | |
| 7818 { | |
| 7819 /* don't free regprog in the match list, it's a copy */ | |
| 7820 vim_regfree(shl->rm.regprog); | |
| 7821 SET_NO_HLSEARCH(TRUE); | |
| 7822 } | |
| 7823 shl->rm.regprog = NULL; | |
| 7824 shl->lnum = 0; | |
| 7825 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 7826 message */ | |
| 7827 break; | |
| 7828 } | |
| 7829 } | |
| 7830 else if (cur != NULL) | |
| 7831 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 7832 else |
| 7833 nmatched = 0; | |
| 7 | 7834 if (nmatched == 0) |
| 7835 { | |
| 7836 shl->lnum = 0; /* no match found */ | |
| 7837 break; | |
| 7838 } | |
| 7839 if (shl->rm.startpos[0].lnum > 0 | |
| 7840 || shl->rm.startpos[0].col >= mincol | |
| 7841 || nmatched > 1 | |
| 7842 || shl->rm.endpos[0].col > mincol) | |
| 7843 { | |
| 7844 shl->lnum += shl->rm.startpos[0].lnum; | |
| 7845 break; /* useful match found */ | |
| 7846 } | |
| 7847 } | |
| 7848 } | |
| 7849 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7850 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7851 * If there is a match fill "shl" and return one. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7852 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7853 */ |
| 5979 | 7854 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7855 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7856 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
|
7857 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7858 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7859 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 7860 { |
| 7861 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7862 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7863 |
| 5979 | 7864 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 7865 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7866 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7867 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7868 if (pos->lnum == 0) |
| 5979 | 7869 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7870 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 7871 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7872 if (pos->lnum == lnum) |
| 5979 | 7873 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7874 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7875 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7876 /* if this match comes before the one at "found" then swap |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7877 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7878 if (pos->col < posmatch->pos[found].col) |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7879 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7880 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7881 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7882 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7883 posmatch->pos[found] = tmp; |
| 5979 | 7884 } |
| 7885 } | |
| 7886 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7887 found = i; |
| 5979 | 7888 } |
| 7889 } | |
| 7890 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7891 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7892 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7893 colnr_T start = posmatch->pos[found].col == 0 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7894 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7895 colnr_T end = posmatch->pos[found].col == 0 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7896 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7897 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7898 shl->lnum = lnum; |
| 5979 | 7899 shl->rm.startpos[0].lnum = 0; |
| 7900 shl->rm.startpos[0].col = start; | |
| 7901 shl->rm.endpos[0].lnum = 0; | |
| 7902 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
|
7903 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7904 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7905 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7906 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7907 return 0; |
| 5979 | 7908 } |
| 5985 | 7909 #endif |
| 5979 | 7910 |
| 7 | 7911 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7912 screen_start_highlight(int attr) |
| 7 | 7913 { |
| 7914 attrentry_T *aep = NULL; | |
| 7915 | |
| 7916 screen_attr = attr; | |
| 7917 if (full_screen | |
| 7918 #ifdef WIN3264 | |
| 7919 && termcap_active | |
| 7920 #endif | |
| 7921 ) | |
| 7922 { | |
| 7923 #ifdef FEAT_GUI | |
| 7924 if (gui.in_use) | |
| 7925 { | |
| 7926 char buf[20]; | |
| 7927 | |
| 681 | 7928 /* The GUI handles this internally. */ |
| 7929 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 7930 OUT_STR(buf); |
| 7931 } | |
| 7932 else | |
| 7933 #endif | |
| 7934 { | |
| 7935 if (attr > HL_ALL) /* special HL attr. */ | |
| 7936 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7937 if (IS_CTERM) |
| 7 | 7938 aep = syn_cterm_attr2entry(attr); |
| 7939 else | |
| 7940 aep = syn_term_attr2entry(attr); | |
| 7941 if (aep == NULL) /* did ":syntax clear" */ | |
| 7942 attr = 0; | |
| 7943 else | |
| 7944 attr = aep->ae_attr; | |
| 7945 } | |
| 7946 if ((attr & HL_BOLD) && T_MD != NULL) /* bold */ | |
| 7947 out_str(T_MD); | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7948 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
|
7949 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7950 (p_tgc ? |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7951 (aep->ae_u.cterm.fg_rgb != INVALCOLOR): |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7952 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7953 (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
|
7954 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7955 ) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7956 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7957 ) |
| 681 | 7958 /* If the Normal FG color has BOLD attribute and the new HL |
| 7959 * has a FG color defined, clear BOLD. */ | |
| 7960 out_str(T_ME); | |
| 7 | 7961 if ((attr & HL_STANDOUT) && T_SO != NULL) /* standout */ |
| 7962 out_str(T_SO); | |
| 205 | 7963 if ((attr & (HL_UNDERLINE | HL_UNDERCURL)) && T_US != NULL) |
| 7964 /* underline or undercurl */ | |
| 7 | 7965 out_str(T_US); |
| 7966 if ((attr & HL_ITALIC) && T_CZH != NULL) /* italic */ | |
| 7967 out_str(T_CZH); | |
| 7968 if ((attr & HL_INVERSE) && T_MR != NULL) /* inverse (reverse) */ | |
| 7969 out_str(T_MR); | |
| 7970 | |
| 7971 /* | |
| 7972 * Output the color or start string after bold etc., in case the | |
| 7973 * bold etc. override the color setting. | |
| 7974 */ | |
| 7975 if (aep != NULL) | |
| 7976 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7977 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7978 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7979 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7980 if (aep->ae_u.cterm.fg_rgb != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7981 term_fg_rgb_color(aep->ae_u.cterm.fg_rgb); |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7982 if (aep->ae_u.cterm.bg_rgb != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7983 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 7984 } |
| 7985 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7986 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7987 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7988 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7989 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7990 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
|
7991 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
|
7992 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
|
7993 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
|
7994 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7995 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7996 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7997 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
|
7998 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
|
7999 } |
| 7 | 8000 } |
| 8001 } | |
| 8002 } | |
| 8003 } | |
| 8004 } | |
| 8005 | |
| 8006 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8007 screen_stop_highlight(void) |
| 7 | 8008 { |
| 8009 int do_ME = FALSE; /* output T_ME code */ | |
| 8010 | |
| 8011 if (screen_attr != 0 | |
| 8012 #ifdef WIN3264 | |
| 8013 && termcap_active | |
| 8014 #endif | |
| 8015 ) | |
| 8016 { | |
| 8017 #ifdef FEAT_GUI | |
| 8018 if (gui.in_use) | |
| 8019 { | |
| 8020 char buf[20]; | |
| 8021 | |
| 8022 /* use internal GUI code */ | |
| 8023 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8024 OUT_STR(buf); | |
| 8025 } | |
| 8026 else | |
| 8027 #endif | |
| 8028 { | |
| 8029 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8030 { | |
| 8031 attrentry_T *aep; | |
| 8032 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8033 if (IS_CTERM) |
| 7 | 8034 { |
| 8035 /* | |
| 8036 * Assume that t_me restores the original colors! | |
| 8037 */ | |
| 8038 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
|
8039 if (aep != NULL && |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8040 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8041 (p_tgc ? |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8042 (aep->ae_u.cterm.fg_rgb != INVALCOLOR |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8043 || aep->ae_u.cterm.bg_rgb != INVALCOLOR): |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8044 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8045 (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
|
8046 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8047 ) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8048 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8049 ) |
| 7 | 8050 do_ME = TRUE; |
| 8051 } | |
| 8052 else | |
| 8053 { | |
| 8054 aep = syn_term_attr2entry(screen_attr); | |
| 8055 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8056 { | |
| 8057 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8058 do_ME = TRUE; | |
| 8059 else | |
| 8060 out_str(aep->ae_u.term.stop); | |
| 8061 } | |
| 8062 } | |
| 8063 if (aep == NULL) /* did ":syntax clear" */ | |
| 8064 screen_attr = 0; | |
| 8065 else | |
| 8066 screen_attr = aep->ae_attr; | |
| 8067 } | |
| 8068 | |
| 8069 /* | |
| 8070 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8071 * same sequence several times. | |
| 8072 */ | |
| 8073 if (screen_attr & HL_STANDOUT) | |
| 8074 { | |
| 8075 if (STRCMP(T_SE, T_ME) == 0) | |
| 8076 do_ME = TRUE; | |
| 8077 else | |
| 8078 out_str(T_SE); | |
| 8079 } | |
| 205 | 8080 if (screen_attr & (HL_UNDERLINE | HL_UNDERCURL)) |
| 7 | 8081 { |
| 8082 if (STRCMP(T_UE, T_ME) == 0) | |
| 8083 do_ME = TRUE; | |
| 8084 else | |
| 8085 out_str(T_UE); | |
| 8086 } | |
| 8087 if (screen_attr & HL_ITALIC) | |
| 8088 { | |
| 8089 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8090 do_ME = TRUE; | |
| 8091 else | |
| 8092 out_str(T_CZR); | |
| 8093 } | |
| 8094 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) | |
| 8095 out_str(T_ME); | |
| 8096 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8097 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8098 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8099 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8100 if (cterm_normal_fg_gui_color != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8101 term_fg_rgb_color(cterm_normal_fg_gui_color); |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8102 if (cterm_normal_bg_gui_color != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8103 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
|
8104 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8105 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8106 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8107 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8108 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8109 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8110 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8111 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8112 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
|
8113 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8114 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
|
8115 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8116 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8117 } |
| 7 | 8118 } |
| 8119 } | |
| 8120 } | |
| 8121 screen_attr = 0; | |
| 8122 } | |
| 8123 | |
| 8124 /* | |
| 8125 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8126 * The machine specific code may override this again. | |
| 8127 */ | |
| 8128 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8129 reset_cterm_colors(void) |
| 7 | 8130 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8131 if (IS_CTERM) |
| 7 | 8132 { |
| 8133 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8134 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8135 if (p_tgc ? (cterm_normal_fg_gui_color != INVALCOLOR |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8136 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8137 : (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
|
8138 #else |
| 7 | 8139 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
|
8140 #endif |
| 7 | 8141 { |
| 8142 out_str(T_OP); | |
| 8143 screen_attr = -1; | |
| 8144 } | |
| 8145 if (cterm_normal_fg_bold) | |
| 8146 { | |
| 8147 out_str(T_ME); | |
| 8148 screen_attr = -1; | |
| 8149 } | |
| 8150 } | |
| 8151 } | |
| 8152 | |
| 8153 /* | |
| 8154 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8155 * using the attributes from ScreenAttrs["off"]. | |
| 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(unsigned off, int row, int col) |
| 7 | 8159 { |
| 8160 int attr; | |
| 8161 | |
| 8162 /* Check for illegal values, just in case (could happen just after | |
| 8163 * resizing). */ | |
| 8164 if (row >= screen_Rows || col >= screen_Columns) | |
| 8165 return; | |
| 8166 | |
| 6602 | 8167 /* Outputting a character in the last cell on the screen may scroll the |
| 8168 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8169 * mark the character invalid (update it when scrolled up). */ | |
| 8170 if (*T_XN == NUL | |
| 8171 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8172 #ifdef FEAT_RIGHTLEFT |
| 8173 /* account for first command-line character in rightleft mode */ | |
| 8174 && !cmdmsg_rl | |
| 8175 #endif | |
| 8176 ) | |
| 8177 { | |
| 8178 ScreenAttrs[off] = (sattr_T)-1; | |
| 8179 return; | |
| 8180 } | |
| 8181 | |
| 8182 /* | |
| 8183 * Stop highlighting first, so it's easier to move the cursor. | |
| 8184 */ | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8185 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) |
| 7 | 8186 if (screen_char_attr != 0) |
| 8187 attr = screen_char_attr; | |
| 8188 else | |
| 8189 #endif | |
| 8190 attr = ScreenAttrs[off]; | |
| 8191 if (screen_attr != attr) | |
| 8192 screen_stop_highlight(); | |
| 8193 | |
| 8194 windgoto(row, col); | |
| 8195 | |
| 8196 if (screen_attr != attr) | |
| 8197 screen_start_highlight(attr); | |
| 8198 | |
| 8199 #ifdef FEAT_MBYTE | |
| 8200 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8201 { | |
| 8202 char_u buf[MB_MAXBYTES + 1]; | |
| 8203 | |
| 8204 /* Convert UTF-8 character to bytes and write it. */ | |
| 8205 | |
| 8206 buf[utfc_char2bytes(off, buf)] = NUL; | |
| 8207 | |
| 8208 out_str(buf); | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8209 if (utf_ambiguous_width(ScreenLinesUC[off])) |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8210 screen_cur_col = 9999; |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8211 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8212 ++screen_cur_col; |
| 8213 } | |
| 8214 else | |
| 8215 #endif | |
| 8216 { | |
| 8217 #ifdef FEAT_MBYTE | |
| 8218 out_flush_check(); | |
| 8219 #endif | |
| 8220 out_char(ScreenLines[off]); | |
| 8221 #ifdef FEAT_MBYTE | |
| 8222 /* double-byte character in single-width cell */ | |
| 8223 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8224 out_char(ScreenLines2[off]); | |
| 8225 #endif | |
| 8226 } | |
| 8227 | |
| 8228 screen_cur_col++; | |
| 8229 } | |
| 8230 | |
| 8231 #ifdef FEAT_MBYTE | |
| 8232 | |
| 8233 /* | |
| 8234 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8235 * on the screen at position 'row' and 'col'. | |
| 8236 * The attributes of the first byte is used for all. This is required to | |
| 8237 * output the two bytes of a double-byte character with nothing in between. | |
| 8238 */ | |
| 8239 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8240 screen_char_2(unsigned off, int row, int col) |
| 7 | 8241 { |
| 8242 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8243 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8244 return; | |
| 8245 | |
| 8246 /* Outputting the last character on the screen may scrollup the screen. | |
| 8247 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8248 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8249 { | |
| 8250 ScreenAttrs[off] = (sattr_T)-1; | |
| 8251 return; | |
| 8252 } | |
| 8253 | |
| 8254 /* Output the first byte normally (positions the cursor), then write the | |
| 8255 * second byte directly. */ | |
| 8256 screen_char(off, row, col); | |
| 8257 out_char(ScreenLines[off + 1]); | |
| 8258 ++screen_cur_col; | |
| 8259 } | |
| 8260 #endif | |
| 8261 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8262 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) || defined(PROTO) |
| 7 | 8263 /* |
| 8264 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8265 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8266 */ | |
| 8267 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8268 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8269 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8270 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8271 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8272 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8273 int invert) |
| 7 | 8274 { |
| 8275 int r, c; | |
| 8276 int off; | |
| 1378 | 8277 #ifdef FEAT_MBYTE |
| 8278 int max_off; | |
| 8279 #endif | |
| 7 | 8280 |
| 534 | 8281 /* Can't use ScreenLines unless initialized */ |
| 8282 if (ScreenLines == NULL) | |
| 8283 return; | |
| 8284 | |
| 7 | 8285 if (invert) |
| 8286 screen_char_attr = HL_INVERSE; | |
| 8287 for (r = row; r < row + height; ++r) | |
| 8288 { | |
| 8289 off = LineOffset[r]; | |
| 1378 | 8290 #ifdef FEAT_MBYTE |
| 8291 max_off = off + screen_Columns; | |
| 8292 #endif | |
| 7 | 8293 for (c = col; c < col + width; ++c) |
| 8294 { | |
| 8295 #ifdef FEAT_MBYTE | |
| 1378 | 8296 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8297 { |
| 8298 screen_char_2(off + c, r, c); | |
| 8299 ++c; | |
| 8300 } | |
| 8301 else | |
| 8302 #endif | |
| 8303 { | |
| 8304 screen_char(off + c, r, c); | |
| 8305 #ifdef FEAT_MBYTE | |
| 1378 | 8306 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8307 ++c; |
| 8308 #endif | |
| 8309 } | |
| 8310 } | |
| 8311 } | |
| 8312 screen_char_attr = 0; | |
| 8313 } | |
| 8314 #endif | |
| 8315 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8316 #ifdef FEAT_WINDOWS |
| 7 | 8317 /* |
| 8318 * Redraw the characters for a vertically split window. | |
| 8319 */ | |
| 8320 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8321 redraw_block(int row, int end, win_T *wp) |
| 7 | 8322 { |
| 8323 int col; | |
| 8324 int width; | |
| 8325 | |
| 8326 # ifdef FEAT_CLIPBOARD | |
| 8327 clip_may_clear_selection(row, end - 1); | |
| 8328 # endif | |
| 8329 | |
| 8330 if (wp == NULL) | |
| 8331 { | |
| 8332 col = 0; | |
| 8333 width = Columns; | |
| 8334 } | |
| 8335 else | |
| 8336 { | |
| 8337 col = wp->w_wincol; | |
| 8338 width = wp->w_width; | |
| 8339 } | |
| 8340 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8341 } | |
| 8342 #endif | |
| 8343 | |
| 8344 /* | |
| 8345 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8346 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8347 * Use attributes 'attr'. | |
| 8348 */ | |
| 8349 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8350 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8351 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8352 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8353 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8354 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8355 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8356 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8357 int attr) |
| 7 | 8358 { |
| 8359 int row; | |
| 8360 int col; | |
| 8361 int off; | |
| 8362 int end_off; | |
| 8363 int did_delete; | |
| 8364 int c; | |
| 8365 int norm_term; | |
| 8366 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8367 int force_next = FALSE; | |
| 8368 #endif | |
| 8369 | |
| 8370 if (end_row > screen_Rows) /* safety check */ | |
| 8371 end_row = screen_Rows; | |
| 8372 if (end_col > screen_Columns) /* safety check */ | |
| 8373 end_col = screen_Columns; | |
| 8374 if (ScreenLines == NULL | |
| 8375 || start_row >= end_row | |
| 8376 || start_col >= end_col) /* nothing to do */ | |
| 8377 return; | |
| 8378 | |
| 8379 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8380 norm_term = ( | |
| 8381 #ifdef FEAT_GUI | |
| 8382 !gui.in_use && | |
| 8383 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8384 !IS_CTERM); |
| 7 | 8385 for (row = start_row; row < end_row; ++row) |
| 8386 { | |
| 1668 | 8387 #ifdef FEAT_MBYTE |
| 8388 if (has_mbyte | |
| 8389 # ifdef FEAT_GUI | |
| 8390 && !gui.in_use | |
| 8391 # endif | |
| 8392 ) | |
| 8393 { | |
| 8394 /* When drawing over the right halve of a double-wide char clear | |
| 8395 * out the left halve. When drawing over the left halve of a | |
| 8396 * double wide-char clear out the right halve. Only needed in a | |
| 8397 * terminal. */ | |
| 1685 | 8398 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8399 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8400 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8401 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8402 } |
| 8403 #endif | |
| 7 | 8404 /* |
| 8405 * Try to use delete-line termcap code, when no attributes or in a | |
| 8406 * "normal" terminal, where a bold/italic space is just a | |
| 8407 * space. | |
| 8408 */ | |
| 8409 did_delete = FALSE; | |
| 8410 if (c2 == ' ' | |
| 8411 && end_col == Columns | |
| 8412 && can_clear(T_CE) | |
| 8413 && (attr == 0 | |
| 8414 || (norm_term | |
| 8415 && attr <= HL_ALL | |
| 8416 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8417 { | |
| 8418 /* | |
| 8419 * check if we really need to clear something | |
| 8420 */ | |
| 8421 col = start_col; | |
| 8422 if (c1 != ' ') /* don't clear first char */ | |
| 8423 ++col; | |
| 8424 | |
| 8425 off = LineOffset[row] + col; | |
| 8426 end_off = LineOffset[row] + end_col; | |
| 8427 | |
| 8428 /* skip blanks (used often, keep it fast!) */ | |
| 8429 #ifdef FEAT_MBYTE | |
| 8430 if (enc_utf8) | |
| 8431 while (off < end_off && ScreenLines[off] == ' ' | |
| 8432 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8433 ++off; | |
| 8434 else | |
| 8435 #endif | |
| 8436 while (off < end_off && ScreenLines[off] == ' ' | |
| 8437 && ScreenAttrs[off] == 0) | |
| 8438 ++off; | |
| 8439 if (off < end_off) /* something to be cleared */ | |
| 8440 { | |
| 8441 col = off - LineOffset[row]; | |
| 8442 screen_stop_highlight(); | |
| 8443 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8444 out_str(T_CE); | |
| 8445 screen_start(); /* don't know where cursor is now */ | |
| 8446 col = end_col - col; | |
| 8447 while (col--) /* clear chars in ScreenLines */ | |
| 8448 { | |
| 8449 ScreenLines[off] = ' '; | |
| 8450 #ifdef FEAT_MBYTE | |
| 8451 if (enc_utf8) | |
| 8452 ScreenLinesUC[off] = 0; | |
| 8453 #endif | |
| 8454 ScreenAttrs[off] = 0; | |
| 8455 ++off; | |
| 8456 } | |
| 8457 } | |
| 8458 did_delete = TRUE; /* the chars are cleared now */ | |
| 8459 } | |
| 8460 | |
| 8461 off = LineOffset[row] + start_col; | |
| 8462 c = c1; | |
| 8463 for (col = start_col; col < end_col; ++col) | |
| 8464 { | |
| 8465 if (ScreenLines[off] != c | |
| 8466 #ifdef FEAT_MBYTE | |
| 714 | 8467 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8468 != (c >= 0x80 ? c : 0)) | |
| 7 | 8469 #endif |
| 8470 || ScreenAttrs[off] != attr | |
| 8471 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8472 || force_next | |
| 8473 #endif | |
| 8474 ) | |
| 8475 { | |
| 8476 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8477 /* The bold trick may make a single row of pixels appear in | |
| 8478 * the next character. When a bold character is removed, the | |
| 8479 * next character should be redrawn too. This happens for our | |
| 8480 * own GUI and for some xterms. */ | |
| 8481 if ( | |
| 8482 # ifdef FEAT_GUI | |
| 8483 gui.in_use | |
| 8484 # endif | |
| 8485 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8486 || | |
| 8487 # endif | |
| 8488 # ifdef UNIX | |
| 8489 term_is_xterm | |
| 8490 # endif | |
| 8491 ) | |
| 8492 { | |
| 8493 if (ScreenLines[off] != ' ' | |
| 8494 && (ScreenAttrs[off] > HL_ALL | |
| 8495 || ScreenAttrs[off] & HL_BOLD)) | |
| 8496 force_next = TRUE; | |
| 8497 else | |
| 8498 force_next = FALSE; | |
| 8499 } | |
| 8500 #endif | |
| 8501 ScreenLines[off] = c; | |
| 8502 #ifdef FEAT_MBYTE | |
| 8503 if (enc_utf8) | |
| 8504 { | |
| 8505 if (c >= 0x80) | |
| 8506 { | |
| 8507 ScreenLinesUC[off] = c; | |
| 714 | 8508 ScreenLinesC[0][off] = 0; |
| 7 | 8509 } |
| 8510 else | |
| 8511 ScreenLinesUC[off] = 0; | |
| 8512 } | |
| 8513 #endif | |
| 8514 ScreenAttrs[off] = attr; | |
| 8515 if (!did_delete || c != ' ') | |
| 8516 screen_char(off, row, col); | |
| 8517 } | |
| 8518 ++off; | |
| 8519 if (col == start_col) | |
| 8520 { | |
| 8521 if (did_delete) | |
| 8522 break; | |
| 8523 c = c2; | |
| 8524 } | |
| 8525 } | |
| 8526 if (end_col == Columns) | |
| 8527 LineWraps[row] = FALSE; | |
| 8528 if (row == Rows - 1) /* overwritten the command line */ | |
| 8529 { | |
| 8530 redraw_cmdline = TRUE; | |
| 8531 if (c1 == ' ' && c2 == ' ') | |
| 8532 clear_cmdline = FALSE; /* command line has been cleared */ | |
| 644 | 8533 if (start_col == 0) |
| 8534 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8535 } |
| 8536 } | |
| 8537 } | |
| 8538 | |
| 8539 /* | |
| 8540 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8541 * screen or the command line. | |
| 8542 */ | |
| 8543 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8544 check_for_delay(int check_msg_scroll) |
| 7 | 8545 { |
| 8546 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8547 && !did_wait_return | |
| 8548 && emsg_silent == 0) | |
| 8549 { | |
| 8550 out_flush(); | |
| 8551 ui_delay(1000L, TRUE); | |
| 8552 emsg_on_display = FALSE; | |
| 8553 if (check_msg_scroll) | |
| 8554 msg_scroll = FALSE; | |
| 8555 } | |
| 8556 } | |
| 8557 | |
| 8558 /* | |
| 8559 * screen_valid - allocate screen buffers if size changed | |
| 3263 | 8560 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8561 * Returns TRUE if there is a valid screen to write to. |
| 8562 * Returns FALSE when starting up and screen not initialized yet. | |
| 8563 */ | |
| 8564 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8565 screen_valid(int doclear) |
| 7 | 8566 { |
| 3263 | 8567 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8568 return (ScreenLines != NULL); |
| 8569 } | |
| 8570 | |
| 8571 /* | |
| 8572 * Resize the shell to Rows and Columns. | |
| 8573 * Allocate ScreenLines[] and associated items. | |
| 8574 * | |
| 8575 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8576 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8577 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8578 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8579 * final size of the shell is needed. | |
| 8580 */ | |
| 8581 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8582 screenalloc(int doclear) |
| 7 | 8583 { |
| 8584 int new_row, old_row; | |
| 8585 #ifdef FEAT_GUI | |
| 8586 int old_Rows; | |
| 8587 #endif | |
| 8588 win_T *wp; | |
| 8589 int outofmem = FALSE; | |
| 8590 int len; | |
| 8591 schar_T *new_ScreenLines; | |
| 8592 #ifdef FEAT_MBYTE | |
| 8593 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8594 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8595 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8596 int i; |
| 7 | 8597 #endif |
| 8598 sattr_T *new_ScreenAttrs; | |
| 8599 unsigned *new_LineOffset; | |
| 8600 char_u *new_LineWraps; | |
| 671 | 8601 #ifdef FEAT_WINDOWS |
| 681 | 8602 short *new_TabPageIdxs; |
| 671 | 8603 tabpage_T *tp; |
| 8604 #endif | |
| 7 | 8605 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8606 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8607 #ifdef FEAT_AUTOCMD |
| 8608 int retry_count = 0; | |
| 8609 | |
| 8610 retry: | |
| 8611 #endif | |
| 7 | 8612 /* |
| 8613 * Allocation of the screen buffers is done only when the size changes and | |
| 8614 * when Rows and Columns have been set and we have started doing full | |
| 8615 * screen stuff. | |
| 8616 */ | |
| 8617 if ((ScreenLines != NULL | |
| 8618 && Rows == screen_Rows | |
| 8619 && Columns == screen_Columns | |
| 8620 #ifdef FEAT_MBYTE | |
| 8621 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8622 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
| 714 | 8623 && p_mco == Screen_mco |
| 7 | 8624 #endif |
| 8625 ) | |
| 8626 || Rows == 0 | |
| 8627 || Columns == 0 | |
| 8628 || (!full_screen && ScreenLines == NULL)) | |
| 8629 return; | |
| 8630 | |
| 8631 /* | |
| 8632 * It's possible that we produce an out-of-memory message below, which | |
| 8633 * will cause this function to be called again. To break the loop, just | |
| 8634 * return here. | |
| 8635 */ | |
| 8636 if (entered) | |
| 8637 return; | |
| 8638 entered = TRUE; | |
| 8639 | |
| 911 | 8640 /* |
| 8641 * Note that the window sizes are updated before reallocating the arrays, | |
| 8642 * thus we must not redraw here! | |
| 8643 */ | |
| 8644 ++RedrawingDisabled; | |
| 8645 | |
| 7 | 8646 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8647 | |
| 8648 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8649 | |
| 8650 /* | |
| 8651 * We're changing the size of the screen. | |
| 8652 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8653 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8654 * lines (unless the screen is going to be cleared). | |
| 8655 * - Free the old arrays. | |
| 8656 * | |
| 8657 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8658 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8659 * size is wrong. | |
| 8660 */ | |
| 671 | 8661 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8662 win_free_lsize(wp); |
| 1946 | 8663 #ifdef FEAT_AUTOCMD |
| 8664 if (aucmd_win != NULL) | |
| 8665 win_free_lsize(aucmd_win); | |
| 8666 #endif | |
| 7 | 8667 |
| 8668 new_ScreenLines = (schar_T *)lalloc((long_u)( | |
| 8669 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8670 #ifdef FEAT_MBYTE | |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
8671 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8672 if (enc_utf8) |
| 8673 { | |
| 8674 new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( | |
| 8675 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); | |
| 714 | 8676 for (i = 0; i < p_mco; ++i) |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
8677 new_ScreenLinesC[i] = (u8char_T *)lalloc_clear((long_u)( |
| 7 | 8678 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); |
| 8679 } | |
| 8680 if (enc_dbcs == DBCS_JPNU) | |
| 8681 new_ScreenLines2 = (schar_T *)lalloc((long_u)( | |
| 8682 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8683 #endif | |
| 8684 new_ScreenAttrs = (sattr_T *)lalloc((long_u)( | |
| 8685 (Rows + 1) * Columns * sizeof(sattr_T)), FALSE); | |
| 8686 new_LineOffset = (unsigned *)lalloc((long_u)( | |
| 8687 Rows * sizeof(unsigned)), FALSE); | |
| 8688 new_LineWraps = (char_u *)lalloc((long_u)(Rows * sizeof(char_u)), FALSE); | |
| 671 | 8689 #ifdef FEAT_WINDOWS |
| 681 | 8690 new_TabPageIdxs = (short *)lalloc((long_u)(Columns * sizeof(short)), FALSE); |
| 671 | 8691 #endif |
| 7 | 8692 |
| 677 | 8693 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8694 { |
| 8695 if (win_alloc_lines(wp) == FAIL) | |
| 8696 { | |
| 8697 outofmem = TRUE; | |
| 8698 #ifdef FEAT_WINDOWS | |
| 1819 | 8699 goto give_up; |
| 8700 #endif | |
| 8701 } | |
| 8702 } | |
| 1906 | 8703 #ifdef FEAT_AUTOCMD |
| 1946 | 8704 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8705 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8706 outofmem = TRUE; |
| 8707 #endif | |
| 1819 | 8708 #ifdef FEAT_WINDOWS |
| 8709 give_up: | |
| 8710 #endif | |
| 7 | 8711 |
| 714 | 8712 #ifdef FEAT_MBYTE |
| 8713 for (i = 0; i < p_mco; ++i) | |
| 8714 if (new_ScreenLinesC[i] == NULL) | |
| 8715 break; | |
| 8716 #endif | |
| 7 | 8717 if (new_ScreenLines == NULL |
| 8718 #ifdef FEAT_MBYTE | |
| 714 | 8719 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8720 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8721 #endif | |
| 8722 || new_ScreenAttrs == NULL | |
| 8723 || new_LineOffset == NULL | |
| 8724 || new_LineWraps == NULL | |
| 671 | 8725 #ifdef FEAT_WINDOWS |
| 8726 || new_TabPageIdxs == NULL | |
| 8727 #endif | |
| 7 | 8728 || outofmem) |
| 8729 { | |
| 944 | 8730 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8731 { |
| 8732 /* guess the size */ | |
| 8733 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8734 | |
| 8735 /* Remember we did this to avoid getting outofmem messages over | |
| 8736 * and over again. */ | |
| 944 | 8737 done_outofmem_msg = TRUE; |
| 534 | 8738 } |
| 7 | 8739 vim_free(new_ScreenLines); |
| 8740 new_ScreenLines = NULL; | |
| 8741 #ifdef FEAT_MBYTE | |
| 8742 vim_free(new_ScreenLinesUC); | |
| 8743 new_ScreenLinesUC = NULL; | |
| 714 | 8744 for (i = 0; i < p_mco; ++i) |
| 8745 { | |
| 8746 vim_free(new_ScreenLinesC[i]); | |
| 8747 new_ScreenLinesC[i] = NULL; | |
| 8748 } | |
| 7 | 8749 vim_free(new_ScreenLines2); |
| 8750 new_ScreenLines2 = NULL; | |
| 8751 #endif | |
| 8752 vim_free(new_ScreenAttrs); | |
| 8753 new_ScreenAttrs = NULL; | |
| 8754 vim_free(new_LineOffset); | |
| 8755 new_LineOffset = NULL; | |
| 8756 vim_free(new_LineWraps); | |
| 8757 new_LineWraps = NULL; | |
| 671 | 8758 #ifdef FEAT_WINDOWS |
| 8759 vim_free(new_TabPageIdxs); | |
| 8760 new_TabPageIdxs = NULL; | |
| 8761 #endif | |
| 7 | 8762 } |
| 8763 else | |
| 8764 { | |
| 944 | 8765 done_outofmem_msg = FALSE; |
| 534 | 8766 |
| 7 | 8767 for (new_row = 0; new_row < Rows; ++new_row) |
| 8768 { | |
| 8769 new_LineOffset[new_row] = new_row * Columns; | |
| 8770 new_LineWraps[new_row] = FALSE; | |
| 8771 | |
| 8772 /* | |
| 8773 * If the screen is not going to be cleared, copy as much as | |
| 8774 * possible from the old screen to the new one and clear the rest | |
| 8775 * (used when resizing the window at the "--more--" prompt or when | |
| 8776 * executing an external command, for the GUI). | |
| 8777 */ | |
| 3263 | 8778 if (!doclear) |
| 7 | 8779 { |
| 8780 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 8781 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 8782 #ifdef FEAT_MBYTE | |
| 8783 if (enc_utf8) | |
| 8784 { | |
| 8785 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 8786 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 8787 for (i = 0; i < p_mco; ++i) |
| 8788 (void)vim_memset(new_ScreenLinesC[i] | |
| 8789 + new_row * Columns, | |
| 7 | 8790 0, (size_t)Columns * sizeof(u8char_T)); |
| 8791 } | |
| 8792 if (enc_dbcs == DBCS_JPNU) | |
| 8793 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 8794 0, (size_t)Columns * sizeof(schar_T)); | |
| 8795 #endif | |
| 8796 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 8797 0, (size_t)Columns * sizeof(sattr_T)); | |
| 8798 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 8799 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 8800 { |
| 8801 if (screen_Columns < Columns) | |
| 8802 len = screen_Columns; | |
| 8803 else | |
| 8804 len = Columns; | |
| 26 | 8805 #ifdef FEAT_MBYTE |
| 571 | 8806 /* When switching to utf-8 don't copy characters, they |
| 714 | 8807 * may be invalid now. Also when p_mco changes. */ |
| 8808 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 8809 && p_mco == Screen_mco) | |
| 26 | 8810 #endif |
| 8811 mch_memmove(new_ScreenLines + new_LineOffset[new_row], | |
| 8812 ScreenLines + LineOffset[old_row], | |
| 8813 (size_t)len * sizeof(schar_T)); | |
| 7 | 8814 #ifdef FEAT_MBYTE |
| 714 | 8815 if (enc_utf8 && ScreenLinesUC != NULL |
| 8816 && p_mco == Screen_mco) | |
| 7 | 8817 { |
| 8818 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 8819 ScreenLinesUC + LineOffset[old_row], | |
| 8820 (size_t)len * sizeof(u8char_T)); | |
| 714 | 8821 for (i = 0; i < p_mco; ++i) |
| 8822 mch_memmove(new_ScreenLinesC[i] | |
| 8823 + new_LineOffset[new_row], | |
| 8824 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 8825 (size_t)len * sizeof(u8char_T)); |
| 8826 } | |
| 8827 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 8828 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 8829 ScreenLines2 + LineOffset[old_row], | |
| 8830 (size_t)len * sizeof(schar_T)); | |
| 8831 #endif | |
| 8832 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 8833 ScreenAttrs + LineOffset[old_row], | |
| 8834 (size_t)len * sizeof(sattr_T)); | |
| 8835 } | |
| 8836 } | |
| 8837 } | |
| 8838 /* Use the last line of the screen for the current line. */ | |
| 8839 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 8840 } | |
| 8841 | |
| 356 | 8842 free_screenlines(); |
| 8843 | |
| 7 | 8844 ScreenLines = new_ScreenLines; |
| 8845 #ifdef FEAT_MBYTE | |
| 8846 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 8847 for (i = 0; i < p_mco; ++i) |
| 8848 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 8849 Screen_mco = p_mco; | |
| 7 | 8850 ScreenLines2 = new_ScreenLines2; |
| 8851 #endif | |
| 8852 ScreenAttrs = new_ScreenAttrs; | |
| 8853 LineOffset = new_LineOffset; | |
| 8854 LineWraps = new_LineWraps; | |
| 671 | 8855 #ifdef FEAT_WINDOWS |
| 8856 TabPageIdxs = new_TabPageIdxs; | |
| 8857 #endif | |
| 7 | 8858 |
| 8859 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 8860 * size of ScreenLines[]. Set them before calling anything. */ | |
| 8861 #ifdef FEAT_GUI | |
| 8862 old_Rows = screen_Rows; | |
| 8863 #endif | |
| 8864 screen_Rows = Rows; | |
| 8865 screen_Columns = Columns; | |
| 8866 | |
| 8867 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 8868 if (doclear) |
| 7 | 8869 screenclear2(); |
| 8870 | |
| 8871 #ifdef FEAT_GUI | |
| 8872 else if (gui.in_use | |
| 8873 && !gui.starting | |
| 8874 && ScreenLines != NULL | |
| 8875 && old_Rows != Rows) | |
| 8876 { | |
| 8877 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 8878 /* | |
| 8879 * Adjust the position of the cursor, for when executing an external | |
| 8880 * command. | |
| 8881 */ | |
| 8882 if (msg_row >= Rows) /* Rows got smaller */ | |
| 8883 msg_row = Rows - 1; /* put cursor at last row */ | |
| 8884 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 8885 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 8886 if (msg_col >= Columns) /* Columns got smaller */ | |
| 8887 msg_col = Columns - 1; /* put cursor at last column */ | |
| 8888 } | |
| 8889 #endif | |
| 8890 | |
| 8891 entered = FALSE; | |
| 911 | 8892 --RedrawingDisabled; |
| 766 | 8893 |
| 8894 #ifdef FEAT_AUTOCMD | |
| 1824 | 8895 /* |
| 8896 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 8897 * in case applying autocommands always changes Rows or Columns. | |
| 8898 */ | |
| 8899 if (starting == 0 && ++retry_count <= 3) | |
| 8900 { | |
| 766 | 8901 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 8902 /* In rare cases, autocommands may have altered Rows or Columns, |
| 8903 * jump back to check if we need to allocate the screen again. */ | |
| 8904 goto retry; | |
| 8905 } | |
| 766 | 8906 #endif |
| 7 | 8907 } |
| 8908 | |
| 8909 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8910 free_screenlines(void) |
| 356 | 8911 { |
| 8912 #ifdef FEAT_MBYTE | |
| 714 | 8913 int i; |
| 8914 | |
| 356 | 8915 vim_free(ScreenLinesUC); |
| 714 | 8916 for (i = 0; i < Screen_mco; ++i) |
| 8917 vim_free(ScreenLinesC[i]); | |
| 356 | 8918 vim_free(ScreenLines2); |
| 8919 #endif | |
| 714 | 8920 vim_free(ScreenLines); |
| 356 | 8921 vim_free(ScreenAttrs); |
| 8922 vim_free(LineOffset); | |
| 8923 vim_free(LineWraps); | |
| 671 | 8924 #ifdef FEAT_WINDOWS |
| 8925 vim_free(TabPageIdxs); | |
| 8926 #endif | |
| 356 | 8927 } |
| 8928 | |
| 8929 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8930 screenclear(void) |
| 7 | 8931 { |
| 8932 check_for_delay(FALSE); | |
| 8933 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 8934 screenclear2(); /* clear the screen */ | |
| 8935 } | |
| 8936 | |
| 8937 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8938 screenclear2(void) |
| 7 | 8939 { |
| 8940 int i; | |
| 8941 | |
| 8942 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 8943 #ifdef FEAT_GUI | |
| 8944 || (gui.in_use && gui.starting) | |
| 8945 #endif | |
| 8946 ) | |
| 8947 return; | |
| 8948 | |
| 8949 #ifdef FEAT_GUI | |
| 8950 if (!gui.in_use) | |
| 8951 #endif | |
| 8952 screen_attr = -1; /* force setting the Normal colors */ | |
| 8953 screen_stop_highlight(); /* don't want highlighting here */ | |
| 8954 | |
| 8955 #ifdef FEAT_CLIPBOARD | |
| 8956 /* disable selection without redrawing it */ | |
| 8957 clip_scroll_selection(9999); | |
| 8958 #endif | |
| 8959 | |
| 8960 /* blank out ScreenLines */ | |
| 8961 for (i = 0; i < Rows; ++i) | |
| 8962 { | |
| 8963 lineclear(LineOffset[i], (int)Columns); | |
| 8964 LineWraps[i] = FALSE; | |
| 8965 } | |
| 8966 | |
| 8967 if (can_clear(T_CL)) | |
| 8968 { | |
| 8969 out_str(T_CL); /* clear the display */ | |
| 8970 clear_cmdline = FALSE; | |
| 644 | 8971 mode_displayed = FALSE; |
| 7 | 8972 } |
| 8973 else | |
| 8974 { | |
| 8975 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 8976 for (i = 0; i < Rows; ++i) | |
| 8977 lineinvalid(LineOffset[i], (int)Columns); | |
| 8978 clear_cmdline = TRUE; | |
| 8979 } | |
| 8980 | |
| 8981 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 8982 | |
| 8983 win_rest_invalid(firstwin); | |
| 8984 redraw_cmdline = TRUE; | |
| 670 | 8985 #ifdef FEAT_WINDOWS |
| 673 | 8986 redraw_tabline = TRUE; |
| 670 | 8987 #endif |
| 7 | 8988 if (must_redraw == CLEAR) /* no need to clear again */ |
| 8989 must_redraw = NOT_VALID; | |
| 8990 compute_cmdrow(); | |
| 8991 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 8992 msg_col = 0; | |
| 8993 screen_start(); /* don't know where cursor is now */ | |
| 8994 msg_scrolled = 0; /* can't scroll back */ | |
| 8995 msg_didany = FALSE; | |
| 8996 msg_didout = FALSE; | |
| 8997 } | |
| 8998 | |
| 8999 /* | |
| 9000 * Clear one line in ScreenLines. | |
| 9001 */ | |
| 9002 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9003 lineclear(unsigned off, int width) |
| 7 | 9004 { |
| 9005 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9006 #ifdef FEAT_MBYTE | |
| 9007 if (enc_utf8) | |
| 9008 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9009 (size_t)width * sizeof(u8char_T)); | |
| 9010 #endif | |
| 9011 (void)vim_memset(ScreenAttrs + off, 0, (size_t)width * sizeof(sattr_T)); | |
| 9012 } | |
| 9013 | |
| 9014 /* | |
| 9015 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9016 * invalid value. | |
| 9017 */ | |
| 9018 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9019 lineinvalid(unsigned off, int width) |
| 7 | 9020 { |
| 9021 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9022 } | |
| 9023 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9024 #ifdef FEAT_WINDOWS |
| 7 | 9025 /* |
| 9026 * Copy part of a Screenline for vertically split window "wp". | |
| 9027 */ | |
| 9028 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9029 linecopy(int to, int from, win_T *wp) |
| 7 | 9030 { |
| 9031 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9032 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9033 | |
| 9034 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9035 wp->w_width * sizeof(schar_T)); | |
| 9036 # ifdef FEAT_MBYTE | |
| 9037 if (enc_utf8) | |
| 9038 { | |
| 714 | 9039 int i; |
| 9040 | |
| 7 | 9041 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9042 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9043 for (i = 0; i < p_mco; ++i) |
| 9044 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9045 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9046 } |
| 9047 if (enc_dbcs == DBCS_JPNU) | |
| 9048 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9049 wp->w_width * sizeof(schar_T)); | |
| 9050 # endif | |
| 9051 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 9052 wp->w_width * sizeof(sattr_T)); | |
| 9053 } | |
| 9054 #endif | |
| 9055 | |
| 9056 /* | |
| 9057 * Return TRUE if clearing with term string "p" would work. | |
| 9058 * It can't work when the string is empty or it won't set the right background. | |
| 9059 */ | |
| 9060 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9061 can_clear(char_u *p) |
| 7 | 9062 { |
| 9063 return (*p != NUL && (t_colors <= 1 | |
| 9064 #ifdef FEAT_GUI | |
| 9065 || gui.in_use | |
| 9066 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9067 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9068 || (p_tgc && cterm_normal_bg_gui_color == INVALCOLOR) |
|
9320
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9069 || (!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
|
9070 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9071 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9072 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9073 || *T_UT != NUL)); |
| 7 | 9074 } |
| 9075 | |
| 9076 /* | |
| 9077 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9078 * something directly to the screen (shell commands) or a terminal control | |
| 9079 * code. | |
| 9080 */ | |
| 9081 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9082 screen_start(void) |
| 7 | 9083 { |
| 9084 screen_cur_row = screen_cur_col = 9999; | |
| 9085 } | |
| 9086 | |
| 9087 /* | |
| 9088 * Move the cursor to position "row","col" in the screen. | |
| 9089 * This tries to find the most efficient way to move, minimizing the number of | |
| 9090 * characters sent to the terminal. | |
| 9091 */ | |
| 9092 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9093 windgoto(int row, int col) |
| 7 | 9094 { |
| 205 | 9095 sattr_T *p; |
| 7 | 9096 int i; |
| 9097 int plan; | |
| 9098 int cost; | |
| 9099 int wouldbe_col; | |
| 9100 int noinvcurs; | |
| 9101 char_u *bs; | |
| 9102 int goto_cost; | |
| 9103 int attr; | |
| 9104 | |
| 1213 | 9105 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9106 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9107 | |
| 9108 #define PLAN_LE 1 | |
| 9109 #define PLAN_CR 2 | |
| 9110 #define PLAN_NL 3 | |
| 9111 #define PLAN_WRITE 4 | |
| 9112 /* Can't use ScreenLines unless initialized */ | |
| 9113 if (ScreenLines == NULL) | |
| 9114 return; | |
| 9115 | |
| 9116 if (col != screen_cur_col || row != screen_cur_row) | |
| 9117 { | |
| 9118 /* Check for valid position. */ | |
| 9119 if (row < 0) /* window without text lines? */ | |
| 9120 row = 0; | |
| 9121 if (row >= screen_Rows) | |
| 9122 row = screen_Rows - 1; | |
| 9123 if (col >= screen_Columns) | |
| 9124 col = screen_Columns - 1; | |
| 9125 | |
| 9126 /* check if no cursor movement is allowed in highlight mode */ | |
| 9127 if (screen_attr && *T_MS == NUL) | |
| 9128 noinvcurs = HIGHL_COST; | |
| 9129 else | |
| 9130 noinvcurs = 0; | |
| 9131 goto_cost = GOTO_COST + noinvcurs; | |
| 9132 | |
| 9133 /* | |
| 9134 * Plan how to do the positioning: | |
| 9135 * 1. Use CR to move it to column 0, same row. | |
| 9136 * 2. Use T_LE to move it a few columns to the left. | |
| 9137 * 3. Use NL to move a few lines down, column 0. | |
| 9138 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9139 * | |
| 9140 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9141 * position is unknown then (some terminals wrap, some don't ) | |
| 9142 * | |
| 1213 | 9143 * First check if the highlighting attributes allow us to write |
| 7 | 9144 * characters to move the cursor to the right. |
| 9145 */ | |
| 9146 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9147 { | |
| 9148 /* | |
| 9149 * If the cursor is in the same row, bigger col, we can use CR | |
| 9150 * or T_LE. | |
| 9151 */ | |
| 9152 bs = NULL; /* init for GCC */ | |
| 9153 attr = screen_attr; | |
| 9154 if (row == screen_cur_row && col < screen_cur_col) | |
| 9155 { | |
| 9156 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9157 if (*T_LE) | |
| 9158 bs = T_LE; /* "cursor left" */ | |
| 9159 else | |
| 9160 bs = T_BC; /* "backspace character (old) */ | |
| 9161 if (*bs) | |
| 9162 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9163 else | |
| 9164 cost = 999; | |
| 9165 if (col + 1 < cost) /* using CR is less characters */ | |
| 9166 { | |
| 9167 plan = PLAN_CR; | |
| 9168 wouldbe_col = 0; | |
| 9169 cost = 1; /* CR is just one character */ | |
| 9170 } | |
| 9171 else | |
| 9172 { | |
| 9173 plan = PLAN_LE; | |
| 9174 wouldbe_col = col; | |
| 9175 } | |
| 9176 if (noinvcurs) /* will stop highlighting */ | |
| 9177 { | |
| 9178 cost += noinvcurs; | |
| 9179 attr = 0; | |
| 9180 } | |
| 9181 } | |
| 9182 | |
| 9183 /* | |
| 9184 * If the cursor is above where we want to be, we can use CR LF. | |
| 9185 */ | |
| 9186 else if (row > screen_cur_row) | |
| 9187 { | |
| 9188 plan = PLAN_NL; | |
| 9189 wouldbe_col = 0; | |
| 9190 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9191 if (noinvcurs) /* will stop highlighting */ | |
| 9192 { | |
| 9193 cost += noinvcurs; | |
| 9194 attr = 0; | |
| 9195 } | |
| 9196 } | |
| 9197 | |
| 9198 /* | |
| 9199 * If the cursor is in the same row, smaller col, just use write. | |
| 9200 */ | |
| 9201 else | |
| 9202 { | |
| 9203 plan = PLAN_WRITE; | |
| 9204 wouldbe_col = screen_cur_col; | |
| 9205 cost = 0; | |
| 9206 } | |
| 9207 | |
| 9208 /* | |
| 9209 * Check if any characters that need to be written have the | |
| 9210 * correct attributes. Also avoid UTF-8 characters. | |
| 9211 */ | |
| 9212 i = col - wouldbe_col; | |
| 9213 if (i > 0) | |
| 9214 cost += i; | |
| 9215 if (cost < goto_cost && i > 0) | |
| 9216 { | |
| 9217 /* | |
| 9218 * Check if the attributes are correct without additionally | |
| 9219 * stopping highlighting. | |
| 9220 */ | |
| 9221 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9222 while (i && *p++ == attr) | |
| 9223 --i; | |
| 9224 if (i != 0) | |
| 9225 { | |
| 9226 /* | |
| 9227 * Try if it works when highlighting is stopped here. | |
| 9228 */ | |
| 9229 if (*--p == 0) | |
| 9230 { | |
| 9231 cost += noinvcurs; | |
| 9232 while (i && *p++ == 0) | |
| 9233 --i; | |
| 9234 } | |
| 9235 if (i != 0) | |
| 9236 cost = 999; /* different attributes, don't do it */ | |
| 9237 } | |
| 9238 #ifdef FEAT_MBYTE | |
| 9239 if (enc_utf8) | |
| 9240 { | |
| 9241 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9242 for (i = wouldbe_col; i < col; ++i) | |
| 9243 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9244 { | |
| 9245 cost = 999; | |
| 9246 break; | |
| 9247 } | |
| 9248 } | |
| 9249 #endif | |
| 9250 } | |
| 9251 | |
| 9252 /* | |
| 9253 * We can do it without term_windgoto()! | |
| 9254 */ | |
| 9255 if (cost < goto_cost) | |
| 9256 { | |
| 9257 if (plan == PLAN_LE) | |
| 9258 { | |
| 9259 if (noinvcurs) | |
| 9260 screen_stop_highlight(); | |
| 9261 while (screen_cur_col > col) | |
| 9262 { | |
| 9263 out_str(bs); | |
| 9264 --screen_cur_col; | |
| 9265 } | |
| 9266 } | |
| 9267 else if (plan == PLAN_CR) | |
| 9268 { | |
| 9269 if (noinvcurs) | |
| 9270 screen_stop_highlight(); | |
| 9271 out_char('\r'); | |
| 9272 screen_cur_col = 0; | |
| 9273 } | |
| 9274 else if (plan == PLAN_NL) | |
| 9275 { | |
| 9276 if (noinvcurs) | |
| 9277 screen_stop_highlight(); | |
| 9278 while (screen_cur_row < row) | |
| 9279 { | |
| 9280 out_char('\n'); | |
| 9281 ++screen_cur_row; | |
| 9282 } | |
| 9283 screen_cur_col = 0; | |
| 9284 } | |
| 9285 | |
| 9286 i = col - screen_cur_col; | |
| 9287 if (i > 0) | |
| 9288 { | |
| 9289 /* | |
| 9290 * Use cursor-right if it's one character only. Avoids | |
| 9291 * removing a line of pixels from the last bold char, when | |
| 9292 * using the bold trick in the GUI. | |
| 9293 */ | |
| 9294 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9295 { | |
| 9296 while (i-- > 0) | |
| 9297 out_char(*T_ND); | |
| 9298 } | |
| 9299 else | |
| 9300 { | |
| 9301 int off; | |
| 9302 | |
| 9303 off = LineOffset[row] + screen_cur_col; | |
| 9304 while (i-- > 0) | |
| 9305 { | |
| 9306 if (ScreenAttrs[off] != screen_attr) | |
| 9307 screen_stop_highlight(); | |
| 9308 #ifdef FEAT_MBYTE | |
| 9309 out_flush_check(); | |
| 9310 #endif | |
| 9311 out_char(ScreenLines[off]); | |
| 9312 #ifdef FEAT_MBYTE | |
| 9313 if (enc_dbcs == DBCS_JPNU | |
| 9314 && ScreenLines[off] == 0x8e) | |
| 9315 out_char(ScreenLines2[off]); | |
| 9316 #endif | |
| 9317 ++off; | |
| 9318 } | |
| 9319 } | |
| 9320 } | |
| 9321 } | |
| 9322 } | |
| 9323 else | |
| 9324 cost = 999; | |
| 9325 | |
| 9326 if (cost >= goto_cost) | |
| 9327 { | |
| 9328 if (noinvcurs) | |
| 9329 screen_stop_highlight(); | |
| 5995 | 9330 if (row == screen_cur_row && (col > screen_cur_col) |
| 9331 && *T_CRI != NUL) | |
| 7 | 9332 term_cursor_right(col - screen_cur_col); |
| 9333 else | |
| 9334 term_windgoto(row, col); | |
| 9335 } | |
| 9336 screen_cur_row = row; | |
| 9337 screen_cur_col = col; | |
| 9338 } | |
| 9339 } | |
| 9340 | |
| 9341 /* | |
| 9342 * Set cursor to its position in the current window. | |
| 9343 */ | |
| 9344 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9345 setcursor(void) |
| 7 | 9346 { |
| 9347 if (redrawing()) | |
| 9348 { | |
| 9349 validate_cursor(); | |
| 9350 windgoto(W_WINROW(curwin) + curwin->w_wrow, | |
| 9351 W_WINCOL(curwin) + ( | |
| 9352 #ifdef FEAT_RIGHTLEFT | |
| 1545 | 9353 /* With 'rightleft' set and the cursor on a double-wide |
| 9354 * character, position it on the leftmost column. */ | |
| 7 | 9355 curwin->w_p_rl ? ((int)W_WIDTH(curwin) - curwin->w_wcol - ( |
| 9356 # ifdef FEAT_MBYTE | |
| 1545 | 9357 (has_mbyte |
| 9358 && (*mb_ptr2cells)(ml_get_cursor()) == 2 | |
| 9359 && vim_isprintc(gchar_cursor())) ? 2 : | |
| 7 | 9360 # endif |
| 9361 1)) : | |
| 9362 #endif | |
| 9363 curwin->w_wcol)); | |
| 9364 } | |
| 9365 } | |
| 9366 | |
| 9367 | |
| 9368 /* | |
| 9369 * insert 'line_count' lines at 'row' in window 'wp' | |
| 9370 * if 'invalid' is TRUE the wp->w_lines[].wl_lnum is invalidated. | |
| 9371 * if 'mayclear' is TRUE the screen will be cleared if it is faster than | |
| 9372 * scrolling. | |
| 9373 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9374 */ | |
| 9375 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9376 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9377 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9378 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9379 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9380 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9381 int mayclear) |
| 7 | 9382 { |
| 9383 int did_delete; | |
| 9384 int nextrow; | |
| 9385 int lastrow; | |
| 9386 int retval; | |
| 9387 | |
| 9388 if (invalid) | |
| 9389 wp->w_lines_valid = 0; | |
| 9390 | |
| 9391 if (wp->w_height < 5) | |
| 9392 return FAIL; | |
| 9393 | |
| 9394 if (line_count > wp->w_height - row) | |
| 9395 line_count = wp->w_height - row; | |
| 9396 | |
| 9397 retval = win_do_lines(wp, row, line_count, mayclear, FALSE); | |
| 9398 if (retval != MAYBE) | |
| 9399 return retval; | |
| 9400 | |
| 9401 /* | |
| 9402 * If there is a next window or a status line, we first try to delete the | |
| 9403 * lines at the bottom to avoid messing what is after the window. | |
| 9404 * If this fails and there are following windows, don't do anything to avoid | |
| 9405 * messing up those windows, better just redraw. | |
| 9406 */ | |
| 9407 did_delete = FALSE; | |
| 9408 #ifdef FEAT_WINDOWS | |
| 9409 if (wp->w_next != NULL || wp->w_status_height) | |
| 9410 { | |
| 9411 if (screen_del_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
| 9412 line_count, (int)Rows, FALSE, NULL) == OK) | |
| 9413 did_delete = TRUE; | |
| 9414 else if (wp->w_next) | |
| 9415 return FAIL; | |
| 9416 } | |
| 9417 #endif | |
| 9418 /* | |
| 9419 * if no lines deleted, blank the lines that will end up below the window | |
| 9420 */ | |
| 9421 if (!did_delete) | |
| 9422 { | |
| 9423 #ifdef FEAT_WINDOWS | |
| 9424 wp->w_redr_status = TRUE; | |
| 9425 #endif | |
| 9426 redraw_cmdline = TRUE; | |
| 9427 nextrow = W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp); | |
| 9428 lastrow = nextrow + line_count; | |
| 9429 if (lastrow > Rows) | |
| 9430 lastrow = Rows; | |
| 9431 screen_fill(nextrow - line_count, lastrow - line_count, | |
| 9432 W_WINCOL(wp), (int)W_ENDCOL(wp), | |
| 9433 ' ', ' ', 0); | |
| 9434 } | |
| 9435 | |
| 9436 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, NULL) | |
| 9437 == FAIL) | |
| 9438 { | |
| 9439 /* deletion will have messed up other windows */ | |
| 9440 if (did_delete) | |
| 9441 { | |
| 9442 #ifdef FEAT_WINDOWS | |
| 9443 wp->w_redr_status = TRUE; | |
| 9444 #endif | |
| 9445 win_rest_invalid(W_NEXT(wp)); | |
| 9446 } | |
| 9447 return FAIL; | |
| 9448 } | |
| 9449 | |
| 9450 return OK; | |
| 9451 } | |
| 9452 | |
| 9453 /* | |
| 9454 * delete "line_count" window lines at "row" in window "wp" | |
| 9455 * If "invalid" is TRUE curwin->w_lines[] is invalidated. | |
| 9456 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9457 * scrolling | |
| 9458 * Return OK for success, FAIL if the lines are not deleted. | |
| 9459 */ | |
| 9460 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9461 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9462 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9463 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9464 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9465 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9466 int mayclear) |
| 7 | 9467 { |
| 9468 int retval; | |
| 9469 | |
| 9470 if (invalid) | |
| 9471 wp->w_lines_valid = 0; | |
| 9472 | |
| 9473 if (line_count > wp->w_height - row) | |
| 9474 line_count = wp->w_height - row; | |
| 9475 | |
| 9476 retval = win_do_lines(wp, row, line_count, mayclear, TRUE); | |
| 9477 if (retval != MAYBE) | |
| 9478 return retval; | |
| 9479 | |
| 9480 if (screen_del_lines(0, W_WINROW(wp) + row, line_count, | |
| 9481 (int)Rows, FALSE, NULL) == FAIL) | |
| 9482 return FAIL; | |
| 9483 | |
| 9484 #ifdef FEAT_WINDOWS | |
| 9485 /* | |
| 9486 * If there are windows or status lines below, try to put them at the | |
| 9487 * correct place. If we can't do that, they have to be redrawn. | |
| 9488 */ | |
| 9489 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9490 { | |
| 9491 if (screen_ins_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
| 9492 line_count, (int)Rows, NULL) == FAIL) | |
| 9493 { | |
| 9494 wp->w_redr_status = TRUE; | |
| 9495 win_rest_invalid(wp->w_next); | |
| 9496 } | |
| 9497 } | |
| 9498 /* | |
| 9499 * If this is the last window and there is no status line, redraw the | |
| 9500 * command line later. | |
| 9501 */ | |
| 9502 else | |
| 9503 #endif | |
| 9504 redraw_cmdline = TRUE; | |
| 9505 return OK; | |
| 9506 } | |
| 9507 | |
| 9508 /* | |
| 9509 * Common code for win_ins_lines() and win_del_lines(). | |
| 9510 * Returns OK or FAIL when the work has been done. | |
| 9511 * Returns MAYBE when not finished yet. | |
| 9512 */ | |
| 9513 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9514 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9515 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9516 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9517 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9518 int mayclear, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9519 int del) |
| 7 | 9520 { |
| 9521 int retval; | |
| 9522 | |
| 9523 if (!redrawing() || line_count <= 0) | |
| 9524 return FAIL; | |
| 9525 | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9526 /* When inserting lines would result in loss of command output, just redraw |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9527 * the lines. */ |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9528 if (no_win_do_lines_ins && !del) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9529 return FAIL; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9530 |
| 7 | 9531 /* only a few lines left: redraw is faster */ |
| 9532 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
|
9533 #ifdef FEAT_WINDOWS |
| 7 | 9534 && wp->w_width == Columns |
| 9535 #endif | |
| 9536 ) | |
| 9537 { | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9538 if (!no_win_do_lines_ins) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9539 screenclear(); /* will set wp->w_lines_valid to 0 */ |
| 7 | 9540 return FAIL; |
| 9541 } | |
| 9542 | |
| 9543 /* | |
| 9544 * Delete all remaining lines | |
| 9545 */ | |
| 9546 if (row + line_count >= wp->w_height) | |
| 9547 { | |
| 9548 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 9549 W_WINCOL(wp), (int)W_ENDCOL(wp), | |
| 9550 ' ', ' ', 0); | |
| 9551 return OK; | |
| 9552 } | |
| 9553 | |
| 9554 /* | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9555 * When scrolling, the message on the command line should be cleared, |
| 7 | 9556 * otherwise it will stay there forever. |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9557 * Don't do this when avoiding to insert lines. |
| 7 | 9558 */ |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9559 if (!no_win_do_lines_ins) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9560 clear_cmdline = TRUE; |
| 7 | 9561 |
| 9562 /* | |
| 9563 * If the terminal can set a scroll region, use that. | |
| 9564 * Always do this in a vertically split window. This will redraw from | |
| 9565 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9566 * win_line(). | |
| 9567 * 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
|
9568 * 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
|
9569 * scroll-up . |
| 7 | 9570 */ |
| 9571 if (scroll_region | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9572 #ifdef FEAT_WINDOWS |
| 7 | 9573 || W_WIDTH(wp) != Columns |
| 9574 #endif | |
| 9575 ) | |
| 9576 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9577 #ifdef FEAT_WINDOWS |
| 7 | 9578 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9579 #endif | |
| 9580 scroll_region_set(wp, row); | |
| 9581 if (del) | |
| 9582 retval = screen_del_lines(W_WINROW(wp) + row, 0, line_count, | |
| 9583 wp->w_height - row, FALSE, wp); | |
| 9584 else | |
| 9585 retval = screen_ins_lines(W_WINROW(wp) + row, 0, line_count, | |
| 9586 wp->w_height - row, wp); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9587 #ifdef FEAT_WINDOWS |
| 7 | 9588 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9589 #endif | |
| 9590 scroll_region_reset(); | |
| 9591 return retval; | |
| 9592 } | |
| 9593 | |
| 9594 #ifdef FEAT_WINDOWS | |
| 9595 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9596 return FAIL; | |
| 9597 #endif | |
| 9598 | |
| 9599 return MAYBE; | |
| 9600 } | |
| 9601 | |
| 9602 /* | |
| 9603 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9604 */ | |
| 9605 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9606 win_rest_invalid(win_T *wp) |
| 7 | 9607 { |
| 9608 #ifdef FEAT_WINDOWS | |
| 9609 while (wp != NULL) | |
| 9610 #else | |
| 9611 if (wp != NULL) | |
| 9612 #endif | |
| 9613 { | |
| 9614 redraw_win_later(wp, NOT_VALID); | |
| 9615 #ifdef FEAT_WINDOWS | |
| 9616 wp->w_redr_status = TRUE; | |
| 9617 wp = wp->w_next; | |
| 9618 #endif | |
| 9619 } | |
| 9620 redraw_cmdline = TRUE; | |
| 9621 } | |
| 9622 | |
| 9623 /* | |
| 9624 * The rest of the routines in this file perform screen manipulations. The | |
| 9625 * given operation is performed physically on the screen. The corresponding | |
| 9626 * change is also made to the internal screen image. In this way, the editor | |
| 9627 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9628 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9629 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9630 * screen changes, and in the meantime, everything still works. | |
| 9631 */ | |
| 9632 | |
| 9633 /* | |
| 9634 * types for inserting or deleting lines | |
| 9635 */ | |
| 9636 #define USE_T_CAL 1 | |
| 9637 #define USE_T_CDL 2 | |
| 9638 #define USE_T_AL 3 | |
| 9639 #define USE_T_CE 4 | |
| 9640 #define USE_T_DL 5 | |
| 9641 #define USE_T_SR 6 | |
| 9642 #define USE_NL 7 | |
| 9643 #define USE_T_CD 8 | |
| 9644 #define USE_REDRAW 9 | |
| 9645 | |
| 9646 /* | |
| 9647 * insert lines on the screen and update ScreenLines[] | |
| 9648 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9649 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9650 * 'row' and 'end' are relative to the start of the region. | |
| 9651 * | |
| 9652 * return FAIL for failure, OK for success. | |
| 9653 */ | |
| 446 | 9654 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9655 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9656 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9657 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9658 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9659 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9660 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9661 { |
| 9662 int i; | |
| 9663 int j; | |
| 9664 unsigned temp; | |
| 9665 int cursor_row; | |
| 9666 int type; | |
| 9667 int result_empty; | |
| 9668 int can_ce = can_clear(T_CE); | |
| 9669 | |
| 9670 /* | |
| 9671 * FAIL if | |
| 9672 * - there is no valid screen | |
| 9673 * - the screen has to be redrawn completely | |
| 9674 * - the line count is less than one | |
| 9675 * - the line count is more than 'ttyscroll' | |
| 9676 */ | |
| 9677 if (!screen_valid(TRUE) || line_count <= 0 || line_count > p_ttyscroll) | |
| 9678 return FAIL; | |
| 9679 | |
| 9680 /* | |
| 9681 * There are seven ways to insert lines: | |
| 9682 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9683 * characters from ScreenLines[]. | |
| 9684 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9685 * the insert is just empty lines | |
| 9686 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9687 * present or line_count > 1. It looks better if we do all the inserts | |
| 9688 * at once. | |
| 9689 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9690 * insert is just empty lines and T_CE is not present or line_count > | |
| 9691 * 1. | |
| 9692 * 4. Use T_AL (insert line) if it exists. | |
| 9693 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9694 * just empty lines. | |
| 9695 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9696 * just empty lines. | |
| 9697 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9698 * the 'da' flag is not set or we have clear line capability. | |
| 9699 * 8. redraw the characters from ScreenLines[]. | |
| 9700 * | |
| 9701 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9702 * the scrollbar for the window. It does have insert line, use that if it | |
| 9703 * exists. | |
| 9704 */ | |
| 9705 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
|
9706 #ifdef FEAT_WINDOWS |
| 7 | 9707 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) |
| 9708 type = USE_REDRAW; | |
| 9709 else | |
| 9710 #endif | |
| 9711 if (can_clear(T_CD) && result_empty) | |
| 9712 type = USE_T_CD; | |
| 9713 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9714 type = USE_T_CAL; | |
| 9715 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9716 type = USE_T_CDL; | |
| 9717 else if (*T_AL != NUL) | |
| 9718 type = USE_T_AL; | |
| 9719 else if (can_ce && result_empty) | |
| 9720 type = USE_T_CE; | |
| 9721 else if (*T_DL != NUL && result_empty) | |
| 9722 type = USE_T_DL; | |
| 9723 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9724 type = USE_T_SR; | |
| 9725 else | |
| 9726 return FAIL; | |
| 9727 | |
| 9728 /* | |
| 9729 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9730 * care of t_db if necessary. | |
| 9731 */ | |
| 9732 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9733 type == USE_T_CE || type == USE_T_DL) | |
| 9734 return screen_del_lines(off, row, line_count, end, FALSE, wp); | |
| 9735 | |
| 9736 /* | |
| 9737 * If text is retained below the screen, first clear or delete as many | |
| 9738 * lines at the bottom of the window as are about to be inserted so that | |
| 9739 * the deleted lines won't later surface during a screen_del_lines. | |
| 9740 */ | |
| 9741 if (*T_DB) | |
| 9742 screen_del_lines(off, end - line_count, line_count, end, FALSE, wp); | |
| 9743 | |
| 9744 #ifdef FEAT_CLIPBOARD | |
| 9745 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9746 * or not the full width of the screen. */ | |
| 9747 if (off + row > 0 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9748 # ifdef FEAT_WINDOWS |
| 7 | 9749 || (wp != NULL && wp->w_width != Columns) |
| 9750 # endif | |
| 9751 ) | |
| 3674 | 9752 clip_clear_selection(&clip_star); |
| 7 | 9753 else |
| 9754 clip_scroll_selection(-line_count); | |
| 9755 #endif | |
| 9756 | |
| 9757 #ifdef FEAT_GUI | |
| 9758 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9759 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9760 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 9761 #endif |
| 9762 | |
| 9763 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 9764 cursor_row = row; | |
| 9765 else | |
| 9766 cursor_row = row + off; | |
| 9767 | |
| 9768 /* | |
| 9769 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9770 * Clear the inserted lines in ScreenLines[]. | |
| 9771 */ | |
| 9772 row += off; | |
| 9773 end += off; | |
| 9774 for (i = 0; i < line_count; ++i) | |
| 9775 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9776 #ifdef FEAT_WINDOWS |
| 7 | 9777 if (wp != NULL && wp->w_width != Columns) |
| 9778 { | |
| 9779 /* need to copy part of a line */ | |
| 9780 j = end - 1 - i; | |
| 9781 while ((j -= line_count) >= row) | |
| 9782 linecopy(j + line_count, j, wp); | |
| 9783 j += line_count; | |
| 9784 if (can_clear((char_u *)" ")) | |
| 9785 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9786 else | |
| 9787 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9788 LineWraps[j] = FALSE; | |
| 9789 } | |
| 9790 else | |
| 9791 #endif | |
| 9792 { | |
| 9793 j = end - 1 - i; | |
| 9794 temp = LineOffset[j]; | |
| 9795 while ((j -= line_count) >= row) | |
| 9796 { | |
| 9797 LineOffset[j + line_count] = LineOffset[j]; | |
| 9798 LineWraps[j + line_count] = LineWraps[j]; | |
| 9799 } | |
| 9800 LineOffset[j + line_count] = temp; | |
| 9801 LineWraps[j + line_count] = FALSE; | |
| 9802 if (can_clear((char_u *)" ")) | |
| 9803 lineclear(temp, (int)Columns); | |
| 9804 else | |
| 9805 lineinvalid(temp, (int)Columns); | |
| 9806 } | |
| 9807 } | |
| 9808 | |
| 9809 screen_stop_highlight(); | |
| 9810 windgoto(cursor_row, 0); | |
| 9811 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9812 #ifdef FEAT_WINDOWS |
| 7 | 9813 /* redraw the characters */ |
| 9814 if (type == USE_REDRAW) | |
| 9815 redraw_block(row, end, wp); | |
| 9816 else | |
| 9817 #endif | |
| 9818 if (type == USE_T_CAL) | |
| 9819 { | |
| 9820 term_append_lines(line_count); | |
| 9821 screen_start(); /* don't know where cursor is now */ | |
| 9822 } | |
| 9823 else | |
| 9824 { | |
| 9825 for (i = 0; i < line_count; i++) | |
| 9826 { | |
| 9827 if (type == USE_T_AL) | |
| 9828 { | |
| 9829 if (i && cursor_row != 0) | |
| 9830 windgoto(cursor_row, 0); | |
| 9831 out_str(T_AL); | |
| 9832 } | |
| 9833 else /* type == USE_T_SR */ | |
| 9834 out_str(T_SR); | |
| 9835 screen_start(); /* don't know where cursor is now */ | |
| 9836 } | |
| 9837 } | |
| 9838 | |
| 9839 /* | |
| 9840 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 9841 * have been scrolled down into the region. | |
| 9842 */ | |
| 9843 if (type == USE_T_SR && *T_DA) | |
| 9844 { | |
| 9845 for (i = 0; i < line_count; ++i) | |
| 9846 { | |
| 9847 windgoto(off + i, 0); | |
| 9848 out_str(T_CE); | |
| 9849 screen_start(); /* don't know where cursor is now */ | |
| 9850 } | |
| 9851 } | |
| 9852 | |
| 9853 #ifdef FEAT_GUI | |
| 9854 gui_can_update_cursor(); | |
| 9855 if (gui.in_use) | |
| 9856 out_flush(); /* always flush after a scroll */ | |
| 9857 #endif | |
| 9858 return OK; | |
| 9859 } | |
| 9860 | |
| 9861 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9862 * 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
|
9863 * "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
|
9864 * 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
|
9865 * "row" and "end" are relative to the start of the region. |
| 7 | 9866 * |
| 9867 * Return OK for success, FAIL if the lines are not deleted. | |
| 9868 */ | |
| 9869 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9870 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9871 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9872 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9873 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9874 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9875 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
|
9876 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 9877 { |
| 9878 int j; | |
| 9879 int i; | |
| 9880 unsigned temp; | |
| 9881 int cursor_row; | |
| 9882 int cursor_end; | |
| 9883 int result_empty; /* result is empty until end of region */ | |
| 9884 int can_delete; /* deleting line codes can be used */ | |
| 9885 int type; | |
| 9886 | |
| 9887 /* | |
| 9888 * FAIL if | |
| 9889 * - there is no valid screen | |
| 9890 * - the screen has to be redrawn completely | |
| 9891 * - the line count is less than one | |
| 9892 * - the line count is more than 'ttyscroll' | |
| 9893 */ | |
| 9894 if (!screen_valid(TRUE) || line_count <= 0 || | |
| 9895 (!force && line_count > p_ttyscroll)) | |
| 9896 return FAIL; | |
| 9897 | |
| 9898 /* | |
| 9899 * Check if the rest of the current region will become empty. | |
| 9900 */ | |
| 9901 result_empty = row + line_count >= end; | |
| 9902 | |
| 9903 /* | |
| 9904 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 9905 * available. | |
| 9906 */ | |
| 9907 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 9908 | |
| 9909 /* | |
| 9910 * There are six ways to delete lines: | |
| 9911 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9912 * characters from ScreenLines[]. | |
| 9913 * 1. Use T_CD if it exists and the result is empty. | |
| 9914 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 9915 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 9916 * none of the other ways work. | |
| 9917 * 4. Use T_CE (erase line) if the result is empty. | |
| 9918 * 5. Use T_DL (delete line) if it exists. | |
| 9919 * 6. redraw the characters from ScreenLines[]. | |
| 9920 */ | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9921 #ifdef FEAT_WINDOWS |
| 7 | 9922 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) |
| 9923 type = USE_REDRAW; | |
| 9924 else | |
| 9925 #endif | |
| 9926 if (can_clear(T_CD) && result_empty) | |
| 9927 type = USE_T_CD; | |
| 9928 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 9929 /* | |
| 9930 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 9931 * its internal termcap... this works okay for tests which test *T_DB != | |
| 9932 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 9933 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 9934 * the trick... | |
| 9935 * Anyway, this hack will hopefully go away with the next OS release. | |
| 9936 * (Olaf Seibert) | |
| 9937 */ | |
| 9938 else if (row == 0 && T_DB == empty_option | |
| 9939 && (line_count == 1 || *T_CDL == NUL)) | |
| 9940 #else | |
| 9941 else if (row == 0 && ( | |
| 9942 #ifndef AMIGA | |
| 9943 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 9944 * up, so use delete-line command */ | |
| 9945 line_count == 1 || | |
| 9946 #endif | |
| 9947 *T_CDL == NUL)) | |
| 9948 #endif | |
| 9949 type = USE_NL; | |
| 9950 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 9951 type = USE_T_CDL; | |
| 9952 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
|
9953 #ifdef FEAT_WINDOWS |
| 7 | 9954 && (wp == NULL || wp->w_width == Columns) |
| 9955 #endif | |
| 9956 ) | |
| 9957 type = USE_T_CE; | |
| 9958 else if (*T_DL != NUL && can_delete) | |
| 9959 type = USE_T_DL; | |
| 9960 else if (*T_CDL != NUL && can_delete) | |
| 9961 type = USE_T_CDL; | |
| 9962 else | |
| 9963 return FAIL; | |
| 9964 | |
| 9965 #ifdef FEAT_CLIPBOARD | |
| 9966 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 9967 * not the full width of the screen. */ | |
| 9968 if (off + row > 0 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9969 # ifdef FEAT_WINDOWS |
| 7 | 9970 || (wp != NULL && wp->w_width != Columns) |
| 9971 # endif | |
| 9972 ) | |
| 3674 | 9973 clip_clear_selection(&clip_star); |
| 7 | 9974 else |
| 9975 clip_scroll_selection(line_count); | |
| 9976 #endif | |
| 9977 | |
| 9978 #ifdef FEAT_GUI | |
| 9979 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9980 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9981 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
|
9982 && gui.cursor_row < end + off); |
| 7 | 9983 #endif |
| 9984 | |
| 9985 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 9986 { | |
| 9987 cursor_row = row; | |
| 9988 cursor_end = end; | |
| 9989 } | |
| 9990 else | |
| 9991 { | |
| 9992 cursor_row = row + off; | |
| 9993 cursor_end = end + off; | |
| 9994 } | |
| 9995 | |
| 9996 /* | |
| 9997 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 9998 * Clear the inserted lines in ScreenLines[]. | |
| 9999 */ | |
| 10000 row += off; | |
| 10001 end += off; | |
| 10002 for (i = 0; i < line_count; ++i) | |
| 10003 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10004 #ifdef FEAT_WINDOWS |
| 7 | 10005 if (wp != NULL && wp->w_width != Columns) |
| 10006 { | |
| 10007 /* need to copy part of a line */ | |
| 10008 j = row + i; | |
| 10009 while ((j += line_count) <= end - 1) | |
| 10010 linecopy(j - line_count, j, wp); | |
| 10011 j -= line_count; | |
| 10012 if (can_clear((char_u *)" ")) | |
| 10013 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10014 else | |
| 10015 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10016 LineWraps[j] = FALSE; | |
| 10017 } | |
| 10018 else | |
| 10019 #endif | |
| 10020 { | |
| 10021 /* whole width, moving the line pointers is faster */ | |
| 10022 j = row + i; | |
| 10023 temp = LineOffset[j]; | |
| 10024 while ((j += line_count) <= end - 1) | |
| 10025 { | |
| 10026 LineOffset[j - line_count] = LineOffset[j]; | |
| 10027 LineWraps[j - line_count] = LineWraps[j]; | |
| 10028 } | |
| 10029 LineOffset[j - line_count] = temp; | |
| 10030 LineWraps[j - line_count] = FALSE; | |
| 10031 if (can_clear((char_u *)" ")) | |
| 10032 lineclear(temp, (int)Columns); | |
| 10033 else | |
| 10034 lineinvalid(temp, (int)Columns); | |
| 10035 } | |
| 10036 } | |
| 10037 | |
| 10038 screen_stop_highlight(); | |
| 10039 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10040 #ifdef FEAT_WINDOWS |
| 7 | 10041 /* redraw the characters */ |
| 10042 if (type == USE_REDRAW) | |
| 10043 redraw_block(row, end, wp); | |
| 10044 else | |
| 10045 #endif | |
| 10046 if (type == USE_T_CD) /* delete the lines */ | |
| 10047 { | |
| 10048 windgoto(cursor_row, 0); | |
| 10049 out_str(T_CD); | |
| 10050 screen_start(); /* don't know where cursor is now */ | |
| 10051 } | |
| 10052 else if (type == USE_T_CDL) | |
| 10053 { | |
| 10054 windgoto(cursor_row, 0); | |
| 10055 term_delete_lines(line_count); | |
| 10056 screen_start(); /* don't know where cursor is now */ | |
| 10057 } | |
| 10058 /* | |
| 10059 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10060 * the whole screen (scroll region) up by outputting newlines on the | |
| 10061 * last line. | |
| 10062 */ | |
| 10063 else if (type == USE_NL) | |
| 10064 { | |
| 10065 windgoto(cursor_end - 1, 0); | |
| 10066 for (i = line_count; --i >= 0; ) | |
| 10067 out_char('\n'); /* cursor will remain on same line */ | |
| 10068 } | |
| 10069 else | |
| 10070 { | |
| 10071 for (i = line_count; --i >= 0; ) | |
| 10072 { | |
| 10073 if (type == USE_T_DL) | |
| 10074 { | |
| 10075 windgoto(cursor_row, 0); | |
| 10076 out_str(T_DL); /* delete a line */ | |
| 10077 } | |
| 10078 else /* type == USE_T_CE */ | |
| 10079 { | |
| 10080 windgoto(cursor_row + i, 0); | |
| 10081 out_str(T_CE); /* erase a line */ | |
| 10082 } | |
| 10083 screen_start(); /* don't know where cursor is now */ | |
| 10084 } | |
| 10085 } | |
| 10086 | |
| 10087 /* | |
| 10088 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10089 * scrolled up at the bottom of the region. | |
| 10090 */ | |
| 10091 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10092 { | |
| 10093 for (i = line_count; i > 0; --i) | |
| 10094 { | |
| 10095 windgoto(cursor_end - i, 0); | |
| 10096 out_str(T_CE); /* erase a line */ | |
| 10097 screen_start(); /* don't know where cursor is now */ | |
| 10098 } | |
| 10099 } | |
| 10100 | |
| 10101 #ifdef FEAT_GUI | |
| 10102 gui_can_update_cursor(); | |
| 10103 if (gui.in_use) | |
| 10104 out_flush(); /* always flush after a scroll */ | |
| 10105 #endif | |
| 10106 | |
| 10107 return OK; | |
| 10108 } | |
| 10109 | |
| 10110 /* | |
| 10111 * show the current mode and ruler | |
| 10112 * | |
| 10113 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10114 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10115 * cleared only if a mode is shown. | |
| 10116 * Return the length of the message (0 if no message). | |
| 10117 */ | |
| 10118 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10119 showmode(void) |
| 7 | 10120 { |
| 10121 int need_clear; | |
| 10122 int length = 0; | |
| 10123 int do_mode; | |
| 10124 int attr; | |
| 10125 int nwr_save; | |
| 10126 #ifdef FEAT_INS_EXPAND | |
| 10127 int sub_attr; | |
| 10128 #endif | |
| 10129 | |
| 642 | 10130 do_mode = ((p_smd && msg_silent == 0) |
| 10131 && ((State & INSERT) | |
| 10132 || restart_edit | |
| 5735 | 10133 || VIsual_active)); |
| 7 | 10134 if (do_mode || Recording) |
| 10135 { | |
| 10136 /* | |
| 10137 * Don't show mode right now, when not redrawing or inside a mapping. | |
| 10138 * Call char_avail() only when we are going to show something, because | |
| 10139 * it takes a bit of time. | |
| 10140 */ | |
| 10141 if (!redrawing() || (char_avail() && !KeyTyped) || msg_silent != 0) | |
| 10142 { | |
| 10143 redraw_cmdline = TRUE; /* show mode later */ | |
| 10144 return 0; | |
| 10145 } | |
| 10146 | |
| 10147 nwr_save = need_wait_return; | |
| 10148 | |
| 10149 /* wait a bit before overwriting an important message */ | |
| 10150 check_for_delay(FALSE); | |
| 10151 | |
| 10152 /* if the cmdline is more than one line high, erase top lines */ | |
| 10153 need_clear = clear_cmdline; | |
| 10154 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10155 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10156 | |
| 10157 /* Position on the last line in the window, column 0 */ | |
| 10158 msg_pos_mode(); | |
| 10159 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10160 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10161 if (do_mode) |
| 10162 { | |
| 10163 MSG_PUTS_ATTR("--", attr); | |
| 10164 #if defined(FEAT_XIM) | |
| 2520 | 10165 if ( |
| 10166 # ifdef FEAT_GUI_GTK | |
| 10167 preedit_get_status() | |
| 1668 | 10168 # else |
| 10169 im_get_status() | |
| 2520 | 10170 # endif |
| 1668 | 10171 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10172 # ifdef FEAT_GUI_GTK /* most of the time, it's not XIM being used */ |
| 7 | 10173 MSG_PUTS_ATTR(" IM", attr); |
| 10174 # else | |
| 10175 MSG_PUTS_ATTR(" XIM", attr); | |
| 10176 # endif | |
| 10177 #endif | |
| 10178 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10179 if (gui.in_use) | |
| 10180 { | |
| 10181 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10182 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10183 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10184 if (enc_utf8) |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10185 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
|
10186 else |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10187 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
|
10188 } |
| 7 | 10189 } |
| 10190 #endif | |
| 10191 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10192 /* CTRL-X in Insert mode */ |
| 10193 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10194 { |
| 10195 /* These messages can get long, avoid a wrap in a narrow | |
| 10196 * window. Prefer showing edit_submode_extra. */ | |
| 10197 length = (Rows - msg_row) * Columns - 3; | |
| 10198 if (edit_submode_extra != NULL) | |
| 10199 length -= vim_strsize(edit_submode_extra); | |
| 10200 if (length > 0) | |
| 10201 { | |
| 10202 if (edit_submode_pre != NULL) | |
| 10203 length -= vim_strsize(edit_submode_pre); | |
| 10204 if (length - vim_strsize(edit_submode) > 0) | |
| 10205 { | |
| 10206 if (edit_submode_pre != NULL) | |
| 10207 msg_puts_attr(edit_submode_pre, attr); | |
| 10208 msg_puts_attr(edit_submode, attr); | |
| 10209 } | |
| 10210 if (edit_submode_extra != NULL) | |
| 10211 { | |
| 10212 MSG_PUTS_ATTR(" ", attr); /* add a space in between */ | |
| 10213 if ((int)edit_submode_highl < (int)HLF_COUNT) | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10214 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10215 else |
| 10216 sub_attr = attr; | |
| 10217 msg_puts_attr(edit_submode_extra, sub_attr); | |
| 10218 } | |
| 10219 } | |
| 10220 length = 0; | |
| 10221 } | |
| 10222 else | |
| 10223 #endif | |
| 10224 { | |
| 10225 #ifdef FEAT_VREPLACE | |
| 10226 if (State & VREPLACE_FLAG) | |
| 10227 MSG_PUTS_ATTR(_(" VREPLACE"), attr); | |
| 10228 else | |
| 10229 #endif | |
| 10230 if (State & REPLACE_FLAG) | |
| 10231 MSG_PUTS_ATTR(_(" REPLACE"), attr); | |
| 10232 else if (State & INSERT) | |
| 10233 { | |
| 10234 #ifdef FEAT_RIGHTLEFT | |
| 10235 if (p_ri) | |
| 10236 MSG_PUTS_ATTR(_(" REVERSE"), attr); | |
| 10237 #endif | |
| 10238 MSG_PUTS_ATTR(_(" INSERT"), attr); | |
| 10239 } | |
| 10240 else if (restart_edit == 'I') | |
| 10241 MSG_PUTS_ATTR(_(" (insert)"), attr); | |
| 10242 else if (restart_edit == 'R') | |
| 10243 MSG_PUTS_ATTR(_(" (replace)"), attr); | |
| 10244 else if (restart_edit == 'V') | |
| 10245 MSG_PUTS_ATTR(_(" (vreplace)"), attr); | |
| 10246 #ifdef FEAT_RIGHTLEFT | |
| 10247 if (p_hkmap) | |
| 10248 MSG_PUTS_ATTR(_(" Hebrew"), attr); | |
| 10249 # ifdef FEAT_FKMAP | |
| 10250 if (p_fkmap) | |
| 10251 MSG_PUTS_ATTR(farsi_text_5, attr); | |
| 10252 # endif | |
| 10253 #endif | |
| 10254 #ifdef FEAT_KEYMAP | |
| 10255 if (State & LANGMAP) | |
| 10256 { | |
| 10257 # ifdef FEAT_ARABIC | |
| 10258 if (curwin->w_p_arab) | |
| 10259 MSG_PUTS_ATTR(_(" Arabic"), attr); | |
| 10260 else | |
| 10261 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10262 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
|
10263 NameBuff, MAXPATHL)) |
|
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10264 MSG_PUTS_ATTR(NameBuff, attr); |
| 7 | 10265 } |
| 10266 #endif | |
| 10267 if ((State & INSERT) && p_paste) | |
| 10268 MSG_PUTS_ATTR(_(" (paste)"), attr); | |
| 10269 | |
| 10270 if (VIsual_active) | |
| 10271 { | |
| 10272 char *p; | |
| 10273 | |
| 10274 /* Don't concatenate separate words to avoid translation | |
| 10275 * problems. */ | |
| 10276 switch ((VIsual_select ? 4 : 0) | |
| 10277 + (VIsual_mode == Ctrl_V) * 2 | |
| 10278 + (VIsual_mode == 'V')) | |
| 10279 { | |
| 10280 case 0: p = N_(" VISUAL"); break; | |
| 10281 case 1: p = N_(" VISUAL LINE"); break; | |
| 10282 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10283 case 4: p = N_(" SELECT"); break; | |
| 10284 case 5: p = N_(" SELECT LINE"); break; | |
| 10285 default: p = N_(" SELECT BLOCK"); break; | |
| 10286 } | |
| 10287 MSG_PUTS_ATTR(_(p), attr); | |
| 10288 } | |
| 10289 MSG_PUTS_ATTR(" --", attr); | |
| 10290 } | |
| 644 | 10291 |
| 7 | 10292 need_clear = TRUE; |
| 10293 } | |
| 10294 if (Recording | |
| 10295 #ifdef FEAT_INS_EXPAND | |
| 10296 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10297 #endif | |
| 10298 ) | |
| 10299 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10300 recording_mode(attr); |
| 7 | 10301 need_clear = TRUE; |
| 10302 } | |
| 644 | 10303 |
| 10304 mode_displayed = TRUE; | |
| 7 | 10305 if (need_clear || clear_cmdline) |
| 10306 msg_clr_eos(); | |
| 10307 msg_didout = FALSE; /* overwrite this message */ | |
| 10308 length = msg_col; | |
| 10309 msg_col = 0; | |
| 10310 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10311 } | |
| 10312 else if (clear_cmdline && msg_silent == 0) | |
| 10313 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10314 msg_clr_cmdline(); | |
| 10315 | |
| 10316 #ifdef FEAT_CMDL_INFO | |
| 10317 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10318 if (VIsual_active) | |
| 10319 clear_showcmd(); | |
| 10320 | |
| 10321 /* If the last window has no status line, the ruler is after the mode | |
| 10322 * message and must be redrawn */ | |
| 10323 if (redrawing() | |
| 10324 # ifdef FEAT_WINDOWS | |
| 10325 && lastwin->w_status_height == 0 | |
| 10326 # endif | |
| 10327 ) | |
| 10328 win_redr_ruler(lastwin, TRUE); | |
| 10329 #endif | |
| 10330 redraw_cmdline = FALSE; | |
| 10331 clear_cmdline = FALSE; | |
| 10332 | |
| 10333 return length; | |
| 10334 } | |
| 10335 | |
| 10336 /* | |
| 10337 * Position for a mode message. | |
| 10338 */ | |
| 10339 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10340 msg_pos_mode(void) |
| 7 | 10341 { |
| 10342 msg_col = 0; | |
| 10343 msg_row = Rows - 1; | |
| 10344 } | |
| 10345 | |
| 10346 /* | |
| 10347 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10348 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10349 * Caller should check "mode_displayed". |
| 7 | 10350 */ |
| 10351 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10352 unshowmode(int force) |
| 7 | 10353 { |
| 10354 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10355 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10356 */ |
| 10357 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10358 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10359 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10360 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10361 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10362 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10363 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10364 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10365 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10366 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10367 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10368 { |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10369 msg_pos_mode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10370 if (Recording) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10371 recording_mode(HL_ATTR(HLF_CM)); |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10372 msg_clr_eos(); |
| 7 | 10373 } |
| 10374 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10375 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10376 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10377 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10378 MSG_PUTS_ATTR(_("recording"), attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10379 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10380 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10381 char_u s[4]; |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10382 sprintf((char *)s, " @%c", Recording); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10383 MSG_PUTS_ATTR(s, attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10384 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10385 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10386 |
| 667 | 10387 #if defined(FEAT_WINDOWS) |
| 10388 /* | |
| 10389 * Draw the tab pages line at the top of the Vim window. | |
| 10390 */ | |
| 10391 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10392 draw_tabline(void) |
| 667 | 10393 { |
| 10394 int tabcount = 0; | |
| 10395 tabpage_T *tp; | |
| 10396 int tabwidth; | |
| 10397 int col = 0; | |
| 673 | 10398 int scol = 0; |
| 667 | 10399 int attr; |
| 10400 win_T *wp; | |
| 671 | 10401 win_T *cwp; |
| 10402 int wincount; | |
| 10403 int modified; | |
| 667 | 10404 int c; |
| 10405 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10406 int attr_sel = HL_ATTR(HLF_TPS); |
|
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10407 int attr_nosel = HL_ATTR(HLF_TP); |
|
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10408 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10409 char_u *p; |
| 677 | 10410 int room; |
| 10411 int use_sep_chars = (t_colors < 8 | |
| 10412 #ifdef FEAT_GUI | |
| 10413 && !gui.in_use | |
| 10414 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10415 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10416 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10417 #endif |
| 677 | 10418 ); |
| 673 | 10419 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10420 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10421 return; |
| 673 | 10422 redraw_tabline = FALSE; |
| 667 | 10423 |
| 685 | 10424 #ifdef FEAT_GUI_TABLINE |
| 798 | 10425 /* Take care of a GUI tabline. */ |
| 685 | 10426 if (gui_use_tabline()) |
| 10427 { | |
| 10428 gui_update_tabline(); | |
| 10429 return; | |
| 10430 } | |
| 10431 #endif | |
| 10432 | |
| 10433 if (tabline_height() < 1) | |
| 667 | 10434 return; |
| 10435 | |
| 677 | 10436 #if defined(FEAT_STL_OPT) |
| 681 | 10437 |
| 10438 /* Init TabPageIdxs[] to zero: Clicking outside of tabs has no effect. */ | |
| 10439 for (scol = 0; scol < Columns; ++scol) | |
| 10440 TabPageIdxs[scol] = 0; | |
| 10441 | |
| 677 | 10442 /* Use the 'tabline' option if it's set. */ |
| 10443 if (*p_tal != NUL) | |
| 10444 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10445 int saved_did_emsg = did_emsg; |
| 680 | 10446 |
| 10447 /* Check for an error. If there is one we would loop in redrawing the | |
| 10448 * 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
|
10449 did_emsg = FALSE; |
| 677 | 10450 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10451 if (did_emsg) |
| 680 | 10452 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10453 (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
|
10454 did_emsg |= saved_did_emsg; |
| 680 | 10455 } |
| 10456 else | |
| 10457 #endif | |
| 10458 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10459 FOR_ALL_TABPAGES(tp) |
| 680 | 10460 ++tabcount; |
| 10461 | |
| 10462 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10463 if (tabwidth < 6) | |
| 10464 tabwidth = 6; | |
| 10465 | |
| 10466 attr = attr_nosel; | |
| 10467 tabcount = 0; | |
| 681 | 10468 scol = 0; |
| 699 | 10469 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10470 tp = tp->tp_next) | |
| 680 | 10471 { |
| 10472 scol = col; | |
| 10473 | |
| 10474 if (tp->tp_topframe == topframe) | |
| 10475 attr = attr_sel; | |
| 10476 if (use_sep_chars && col > 0) | |
| 10477 screen_putchar('|', 0, col++, attr); | |
| 10478 | |
| 10479 if (tp->tp_topframe != topframe) | |
| 10480 attr = attr_nosel; | |
| 10481 | |
| 10482 screen_putchar(' ', 0, col++, attr); | |
| 10483 | |
| 10484 if (tp == curtab) | |
| 10485 { | |
| 10486 cwp = curwin; | |
| 10487 wp = firstwin; | |
| 10488 } | |
| 10489 else | |
| 10490 { | |
| 10491 cwp = tp->tp_curwin; | |
| 10492 wp = tp->tp_firstwin; | |
| 10493 } | |
| 10494 | |
| 10495 modified = FALSE; | |
| 10496 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10497 if (bufIsChanged(wp->w_buffer)) | |
| 10498 modified = TRUE; | |
| 10499 if (modified || wincount > 1) | |
| 10500 { | |
| 10501 if (wincount > 1) | |
| 10502 { | |
| 10503 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10504 len = (int)STRLEN(NameBuff); |
| 699 | 10505 if (col + len >= Columns - 3) |
| 10506 break; | |
| 680 | 10507 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10508 #if defined(FEAT_SYN_HL) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10509 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10510 #else |
| 6106 | 10511 attr |
| 680 | 10512 #endif |
| 10513 ); | |
| 10514 col += len; | |
| 10515 } | |
| 10516 if (modified) | |
| 10517 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10518 screen_putchar(' ', 0, col++, attr); | |
| 10519 } | |
| 10520 | |
| 10521 room = scol - col + tabwidth - 1; | |
| 10522 if (room > 0) | |
| 10523 { | |
| 685 | 10524 /* Get buffer name in NameBuff[] */ |
| 10525 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10526 shorten_dir(NameBuff); |
| 680 | 10527 len = vim_strsize(NameBuff); |
| 10528 p = NameBuff; | |
| 677 | 10529 #ifdef FEAT_MBYTE |
| 680 | 10530 if (has_mbyte) |
| 10531 while (len > room) | |
| 10532 { | |
| 10533 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10534 MB_PTR_ADV(p); |
| 680 | 10535 } |
| 10536 else | |
| 10537 #endif | |
| 10538 if (len > room) | |
| 677 | 10539 { |
| 680 | 10540 p += len - room; |
| 10541 len = room; | |
| 677 | 10542 } |
| 699 | 10543 if (len > Columns - col - 1) |
| 10544 len = Columns - col - 1; | |
| 680 | 10545 |
| 835 | 10546 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10547 col += len; |
| 10548 } | |
| 10549 screen_putchar(' ', 0, col++, attr); | |
| 10550 | |
| 10551 /* Store the tab page number in TabPageIdxs[], so that | |
| 10552 * jump_to_mouse() knows where each one is. */ | |
| 10553 ++tabcount; | |
| 10554 while (scol < col) | |
| 10555 TabPageIdxs[scol++] = tabcount; | |
| 10556 } | |
| 10557 | |
| 10558 if (use_sep_chars) | |
| 10559 c = '_'; | |
| 10560 else | |
| 10561 c = ' '; | |
| 10562 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10563 |
| 10564 /* Put an "X" for closing the current tab if there are several. */ | |
| 10565 if (first_tabpage->tp_next != NULL) | |
| 10566 { | |
| 10567 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10568 TabPageIdxs[Columns - 1] = -999; | |
| 10569 } | |
| 10570 } | |
| 834 | 10571 |
| 10572 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10573 * set. */ | |
| 10574 redraw_tabline = FALSE; | |
| 667 | 10575 } |
| 685 | 10576 |
| 10577 /* | |
| 10578 * Get buffer name for "buf" into NameBuff[]. | |
| 10579 * Takes care of special buffer names and translates special characters. | |
| 10580 */ | |
| 10581 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10582 get_trans_bufname(buf_T *buf) |
| 685 | 10583 { |
| 10584 if (buf_spname(buf) != NULL) | |
| 3839 | 10585 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10586 else |
| 10587 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10588 trans_characters(NameBuff, MAXPATHL); | |
| 10589 } | |
| 667 | 10590 #endif |
| 10591 | |
| 7 | 10592 #if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) |
| 10593 /* | |
| 10594 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10595 */ | |
| 10596 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10597 fillchar_status(int *attr, int is_curwin) |
| 7 | 10598 { |
| 10599 int fill; | |
| 10600 if (is_curwin) | |
| 10601 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10602 *attr = HL_ATTR(HLF_S); |
| 7 | 10603 fill = fill_stl; |
| 10604 } | |
| 10605 else | |
| 10606 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10607 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10608 fill = fill_stlnc; |
| 10609 } | |
| 10610 /* Use fill when there is highlighting, and highlighting of current | |
| 10611 * window differs, or the fillchars differ, or this is not the | |
| 10612 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10613 if (*attr != 0 && ((HL_ATTR(HLF_S) != HL_ATTR(HLF_SNC) |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
10614 || !is_curwin || ONE_WINDOW) |
| 7 | 10615 || (fill_stl != fill_stlnc))) |
| 10616 return fill; | |
| 10617 if (is_curwin) | |
| 10618 return '^'; | |
| 10619 return '='; | |
| 10620 } | |
| 10621 #endif | |
| 10622 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10623 #ifdef FEAT_WINDOWS |
| 7 | 10624 /* |
| 10625 * Get the character to use in a separator between vertically split windows. | |
| 10626 * Get its attributes in "*attr". | |
| 10627 */ | |
| 10628 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10629 fillchar_vsep(int *attr) |
| 7 | 10630 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10631 *attr = HL_ATTR(HLF_C); |
| 7 | 10632 if (*attr == 0 && fill_vert == ' ') |
| 10633 return '|'; | |
| 10634 else | |
| 10635 return fill_vert; | |
| 10636 } | |
| 10637 #endif | |
| 10638 | |
| 10639 /* | |
| 10640 * Return TRUE if redrawing should currently be done. | |
| 10641 */ | |
| 10642 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10643 redrawing(void) |
| 7 | 10644 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10645 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10646 if (disable_redraw_for_testing) |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10647 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10648 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10649 #endif |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10650 return (!RedrawingDisabled |
| 7 | 10651 && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 10652 } | |
| 10653 | |
| 10654 /* | |
| 10655 * Return TRUE if printing messages should currently be done. | |
| 10656 */ | |
| 10657 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10658 messaging(void) |
| 7 | 10659 { |
| 10660 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10661 } | |
| 10662 | |
| 10663 /* | |
| 10664 * Show current status info in ruler and various other places | |
| 10665 * If always is FALSE, only show ruler if position has changed. | |
| 10666 */ | |
| 10667 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10668 showruler(int always) |
| 7 | 10669 { |
| 10670 if (!always && !redrawing()) | |
| 10671 return; | |
| 574 | 10672 #ifdef FEAT_INS_EXPAND |
| 10673 if (pum_visible()) | |
| 10674 { | |
| 639 | 10675 # ifdef FEAT_WINDOWS |
| 574 | 10676 /* Don't redraw right now, do it later. */ |
| 10677 curwin->w_redr_status = TRUE; | |
| 639 | 10678 # endif |
| 574 | 10679 return; |
| 10680 } | |
| 10681 #endif | |
| 7 | 10682 #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS) |
| 40 | 10683 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 680 | 10684 { |
| 1983 | 10685 redraw_custom_statusline(curwin); |
| 680 | 10686 } |
| 7 | 10687 else |
| 10688 #endif | |
| 10689 #ifdef FEAT_CMDL_INFO | |
| 10690 win_redr_ruler(curwin, always); | |
| 10691 #endif | |
| 10692 | |
| 10693 #ifdef FEAT_TITLE | |
| 10694 if (need_maketitle | |
| 10695 # ifdef FEAT_STL_OPT | |
| 10696 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10697 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10698 # endif | |
| 10699 ) | |
| 10700 maketitle(); | |
| 10701 #endif | |
| 1588 | 10702 #ifdef FEAT_WINDOWS |
| 10703 /* Redraw the tab pages line if needed. */ | |
| 10704 if (redraw_tabline) | |
| 10705 draw_tabline(); | |
| 10706 #endif | |
| 7 | 10707 } |
| 10708 | |
| 10709 #ifdef FEAT_CMDL_INFO | |
| 10710 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10711 win_redr_ruler(win_T *wp, int always) |
| 7 | 10712 { |
| 1869 | 10713 #define RULER_BUF_LEN 70 |
| 10714 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10715 int row; |
| 10716 int fillchar; | |
| 10717 int attr; | |
| 10718 int empty_line = FALSE; | |
| 10719 colnr_T virtcol; | |
| 10720 int i; | |
| 1869 | 10721 size_t len; |
| 7 | 10722 int o; |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10723 #ifdef FEAT_WINDOWS |
| 7 | 10724 int this_ru_col; |
| 10725 int off = 0; | |
| 10726 int width = Columns; | |
| 10727 # define WITH_OFF(x) x | |
| 10728 # define WITH_WIDTH(x) x | |
| 10729 #else | |
| 10730 # define WITH_OFF(x) 0 | |
| 10731 # define WITH_WIDTH(x) Columns | |
| 10732 # define this_ru_col ru_col | |
| 10733 #endif | |
| 10734 | |
| 10735 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10736 if (!p_ru) | |
| 10737 return; | |
| 10738 | |
| 10739 /* | |
| 10740 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10741 * after deleting lines, before cursor.lnum is corrected. | |
| 10742 */ | |
| 10743 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10744 return; | |
| 10745 | |
| 10746 #ifdef FEAT_INS_EXPAND | |
| 10747 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 10748 * the (long) mode message. */ | |
| 10749 # ifdef FEAT_WINDOWS | |
| 10750 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 10751 # endif | |
| 10752 if (edit_submode != NULL) | |
| 10753 return; | |
| 540 | 10754 /* Don't draw the ruler when the popup menu is visible, it may overlap. */ |
| 10755 if (pum_visible()) | |
| 10756 return; | |
| 7 | 10757 #endif |
| 10758 | |
| 10759 #ifdef FEAT_STL_OPT | |
| 10760 if (*p_ruf) | |
| 10761 { | |
| 680 | 10762 int save_called_emsg = called_emsg; |
| 10763 | |
| 10764 called_emsg = FALSE; | |
| 7 | 10765 win_redr_custom(wp, TRUE); |
| 680 | 10766 if (called_emsg) |
| 10767 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 10768 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 10769 called_emsg |= save_called_emsg; |
| 7 | 10770 return; |
| 10771 } | |
| 10772 #endif | |
| 10773 | |
| 10774 /* | |
| 10775 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 10776 */ | |
| 10777 if (!(State & INSERT) | |
| 10778 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 10779 empty_line = TRUE; | |
| 10780 | |
| 10781 /* | |
| 10782 * Only draw the ruler when something changed. | |
| 10783 */ | |
| 10784 validate_virtcol_win(wp); | |
| 10785 if ( redraw_cmdline | |
| 10786 || always | |
| 10787 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 10788 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 10789 || wp->w_virtcol != wp->w_ru_virtcol | |
| 10790 #ifdef FEAT_VIRTUALEDIT | |
| 10791 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 10792 #endif | |
| 10793 || wp->w_topline != wp->w_ru_topline | |
| 10794 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 10795 #ifdef FEAT_DIFF | |
| 10796 || wp->w_topfill != wp->w_ru_topfill | |
| 10797 #endif | |
| 10798 || empty_line != wp->w_ru_empty) | |
| 10799 { | |
| 10800 cursor_off(); | |
| 10801 #ifdef FEAT_WINDOWS | |
| 10802 if (wp->w_status_height) | |
| 10803 { | |
| 10804 row = W_WINROW(wp) + wp->w_height; | |
| 10805 fillchar = fillchar_status(&attr, wp == curwin); | |
| 10806 off = W_WINCOL(wp); | |
| 10807 width = W_WIDTH(wp); | |
| 10808 } | |
| 10809 else | |
| 10810 #endif | |
| 10811 { | |
| 10812 row = Rows - 1; | |
| 10813 fillchar = ' '; | |
| 10814 attr = 0; | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10815 #ifdef FEAT_WINDOWS |
| 7 | 10816 width = Columns; |
| 10817 off = 0; | |
| 10818 #endif | |
| 10819 } | |
| 10820 | |
| 10821 /* In list mode virtcol needs to be recomputed */ | |
| 10822 virtcol = wp->w_virtcol; | |
| 10823 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 10824 { | |
| 10825 wp->w_p_list = FALSE; | |
| 10826 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 10827 wp->w_p_list = TRUE; | |
| 10828 } | |
| 10829 | |
| 10830 /* | |
| 10831 * Some sprintfs return the length, some return a pointer. | |
| 10832 * To avoid portability problems we use strlen() here. | |
| 10833 */ | |
| 1869 | 10834 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 10835 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 10836 ? 0L | |
| 10837 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 10838 len = STRLEN(buffer); |
| 10839 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 10840 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 10841 (int)virtcol + 1); | |
| 10842 | |
| 10843 /* | |
| 10844 * Add a "50%" if there is room for it. | |
| 10845 * On the last line, don't print in the last column (scrolls the | |
| 10846 * screen up on some terminals). | |
| 10847 */ | |
| 10848 i = (int)STRLEN(buffer); | |
| 1869 | 10849 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 10850 o = i + vim_strsize(buffer + i + 1); |
| 10851 #ifdef FEAT_WINDOWS | |
| 10852 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 10853 #endif | |
| 10854 ++o; | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10855 #ifdef FEAT_WINDOWS |
| 7 | 10856 this_ru_col = ru_col - (Columns - width); |
| 10857 if (this_ru_col < 0) | |
| 10858 this_ru_col = 0; | |
| 10859 #endif | |
| 10860 /* Never use more than half the window/screen width, leave the other | |
| 10861 * half for the filename. */ | |
| 10862 if (this_ru_col < (WITH_WIDTH(width) + 1) / 2) | |
| 10863 this_ru_col = (WITH_WIDTH(width) + 1) / 2; | |
| 10864 if (this_ru_col + o < WITH_WIDTH(width)) | |
| 10865 { | |
| 6466 | 10866 /* need at least 3 chars left for get_rel_pos() + NUL */ |
| 10867 while (this_ru_col + o < WITH_WIDTH(width) && RULER_BUF_LEN > i + 4) | |
| 7 | 10868 { |
| 10869 #ifdef FEAT_MBYTE | |
| 10870 if (has_mbyte) | |
| 10871 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 10872 else | |
| 10873 #endif | |
| 10874 buffer[i++] = fillchar; | |
| 10875 ++o; | |
| 10876 } | |
| 1869 | 10877 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 10878 } |
| 10879 /* Truncate at window boundary. */ | |
| 10880 #ifdef FEAT_MBYTE | |
| 10881 if (has_mbyte) | |
| 10882 { | |
| 10883 o = 0; | |
| 474 | 10884 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 10885 { |
| 10886 o += (*mb_ptr2cells)(buffer + i); | |
| 10887 if (this_ru_col + o > WITH_WIDTH(width)) | |
| 10888 { | |
| 10889 buffer[i] = NUL; | |
| 10890 break; | |
| 10891 } | |
| 10892 } | |
| 10893 } | |
| 10894 else | |
| 10895 #endif | |
| 10896 if (this_ru_col + (int)STRLEN(buffer) > WITH_WIDTH(width)) | |
| 10897 buffer[WITH_WIDTH(width) - this_ru_col] = NUL; | |
| 10898 | |
| 10899 screen_puts(buffer, row, this_ru_col + WITH_OFF(off), attr); | |
| 10900 i = redraw_cmdline; | |
| 10901 screen_fill(row, row + 1, | |
| 10902 this_ru_col + WITH_OFF(off) + (int)STRLEN(buffer), | |
| 10903 (int)(WITH_OFF(off) + WITH_WIDTH(width)), | |
| 10904 fillchar, fillchar, attr); | |
| 10905 /* don't redraw the cmdline because of showing the ruler */ | |
| 10906 redraw_cmdline = i; | |
| 10907 wp->w_ru_cursor = wp->w_cursor; | |
| 10908 wp->w_ru_virtcol = wp->w_virtcol; | |
| 10909 wp->w_ru_empty = empty_line; | |
| 10910 wp->w_ru_topline = wp->w_topline; | |
| 10911 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 10912 #ifdef FEAT_DIFF | |
| 10913 wp->w_ru_topfill = wp->w_topfill; | |
| 10914 #endif | |
| 10915 } | |
| 10916 } | |
| 10917 #endif | |
| 13 | 10918 |
| 10919 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 10920 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
10921 * 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
|
10922 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 10923 * Otherwise it depends on 'numberwidth' and the line count. |
| 10924 */ | |
| 10925 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10926 number_width(win_T *wp) |
| 13 | 10927 { |
| 10928 int n; | |
| 10929 linenr_T lnum; | |
| 10930 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10931 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
|
10932 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10933 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10934 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10935 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10936 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
|
10937 |
| 6679 | 10938 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 10939 return wp->w_nrwidth_width; |
| 10940 wp->w_nrwidth_line_count = lnum; | |
| 10941 | |
| 10942 n = 0; | |
| 10943 do | |
| 10944 { | |
| 856 | 10945 lnum /= 10; |
| 10946 ++n; | |
| 13 | 10947 } while (lnum > 0); |
| 10948 | |
| 10949 /* 'numberwidth' gives the minimal width plus one */ | |
| 10950 if (n < wp->w_p_nuw - 1) | |
| 10951 n = wp->w_p_nuw - 1; | |
| 10952 | |
| 10953 wp->w_nrwidth_width = n; | |
| 6679 | 10954 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 10955 return n; |
| 10956 } | |
| 10957 #endif | |
| 3986 | 10958 |
| 10959 /* | |
| 10960 * Return the current cursor column. This is the actual position on the | |
| 10961 * screen. First column is 0. | |
| 10962 */ | |
| 10963 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10964 screen_screencol(void) |
| 3986 | 10965 { |
| 10966 return screen_cur_col; | |
| 10967 } | |
| 10968 | |
| 10969 /* | |
| 10970 * Return the current cursor row. This is the actual position on the screen. | |
| 10971 * First row is 0. | |
| 10972 */ | |
| 10973 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10974 screen_screenrow(void) |
| 3986 | 10975 { |
| 10976 return screen_cur_row; | |
| 10977 } |