Mercurial > vim
annotate src/screen.c @ 15502:bc17a9d37810 v8.1.0759
patch 8.1.0759: showing two characters for tab is limited
commit https://github.com/vim/vim/commit/83a52171ba00b2b9fd2d1d22a07e38fc9fc69c1e
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jan 16 22:41:54 2019 +0100
patch 8.1.0759: showing two characters for tab is limited
Problem: Showing two characters for tab is limited.
Solution: Allow for a third character for "tab:" in 'listchars'. (Nathaniel
Braun, Ken Takata, closes #3810)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 16 Jan 2019 22:45:07 +0100 |
| parents | 29f3d59bb6f0 |
| children | 6d949e552e99 |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9992
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 | |
| 10 /* | |
| 11 * screen.c: code for displaying on the screen | |
| 12 * | |
| 13 * Output to the screen (console, terminal emulator or GUI window) is minimized | |
| 14 * by remembering what is already on the screen, and only updating the parts | |
| 15 * that changed. | |
| 16 * | |
| 17 * ScreenLines[off] Contains a copy of the whole screen, as it is currently | |
| 18 * displayed (excluding text written by external commands). | |
| 19 * ScreenAttrs[off] Contains the associated attributes. | |
| 20 * LineOffset[row] Contains the offset into ScreenLines*[] and ScreenAttrs[] | |
| 21 * for each line. | |
| 22 * LineWraps[row] Flag for each line whether it wraps to the next line. | |
| 23 * | |
| 24 * For double-byte characters, two consecutive bytes in ScreenLines[] can form | |
| 25 * one character which occupies two display cells. | |
| 26 * For UTF-8 a multi-byte character is converted to Unicode and stored in | |
| 27 * ScreenLinesUC[]. ScreenLines[] contains the first byte only. For an ASCII | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
28 * character without composing chars ScreenLinesUC[] will be 0 and |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
29 * ScreenLinesC[][] is not used. When the character occupies two display |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
30 * cells the next byte in ScreenLines[] is 0. |
| 714 | 31 * ScreenLinesC[][] contain up to 'maxcombine' composing characters |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
32 * (drawn on top of the first character). There is 0 after the last one used. |
| 7 | 33 * ScreenLines2[] is only used for euc-jp to store the second byte if the |
| 34 * first byte is 0x8e (single-width character). | |
| 35 * | |
| 36 * The screen_*() functions write to the screen and handle updating | |
| 37 * ScreenLines[]. | |
| 38 * | |
| 39 * update_screen() is the function that updates all windows and status lines. | |
| 40 * It is called form the main loop when must_redraw is non-zero. It may be | |
| 1213 | 41 * called from other places when an immediate screen update is needed. |
| 7 | 42 * |
| 43 * The part of the buffer that is displayed in a window is set with: | |
| 44 * - w_topline (first buffer line in window) | |
| 5946 | 45 * - w_topfill (filler lines above the first line) |
| 7 | 46 * - w_leftcol (leftmost window cell in window), |
| 47 * - w_skipcol (skipped window cells of first line) | |
| 48 * | |
| 49 * Commands that only move the cursor around in a window, do not need to take | |
| 50 * action to update the display. The main loop will check if w_topline is | |
| 51 * valid and update it (scroll the window) when needed. | |
| 52 * | |
| 53 * Commands that scroll a window change w_topline and must call | |
| 54 * check_cursor() to move the cursor into the visible part of the window, and | |
| 55 * call redraw_later(VALID) to have the window displayed by update_screen() | |
| 56 * later. | |
| 57 * | |
| 58 * Commands that change text in the buffer must call changed_bytes() or | |
| 59 * changed_lines() to mark the area that changed and will require updating | |
| 60 * later. The main loop will call update_screen(), which will update each | |
| 61 * window that shows the changed buffer. This assumes text above the change | |
| 62 * can remain displayed as it is. Text after the change may need updating for | |
| 63 * scrolling, folding and syntax highlighting. | |
| 64 * | |
| 65 * Commands that change how a window is displayed (e.g., setting 'list') or | |
| 66 * invalidate the contents of a window in another way (e.g., change fold | |
| 67 * settings), must call redraw_later(NOT_VALID) to have the whole window | |
| 68 * redisplayed by update_screen() later. | |
| 69 * | |
| 70 * Commands that change how a buffer is displayed (e.g., setting 'tabstop') | |
| 71 * must call redraw_curbuf_later(NOT_VALID) to have all the windows for the | |
| 72 * buffer redisplayed by update_screen() later. | |
| 73 * | |
| 743 | 74 * Commands that change highlighting and possibly cause a scroll too must call |
| 75 * redraw_later(SOME_VALID) to update the whole window but still use scrolling | |
| 76 * to avoid redrawing everything. But the length of displayed lines must not | |
| 77 * change, use NOT_VALID then. | |
| 78 * | |
| 7 | 79 * Commands that move the window position must call redraw_later(NOT_VALID). |
| 80 * TODO: should minimize redrawing by scrolling when possible. | |
| 81 * | |
| 82 * Commands that change everything (e.g., resizing the screen) must call | |
| 83 * redraw_all_later(NOT_VALID) or redraw_all_later(CLEAR). | |
| 84 * | |
| 85 * Things that are handled indirectly: | |
| 86 * - When messages scroll the screen up, msg_scrolled will be set and | |
| 87 * update_screen() called to redraw. | |
| 88 */ | |
| 89 | |
| 90 #include "vim.h" | |
| 91 | |
| 3586 | 92 #define MB_FILLER_CHAR '<' /* character used when a double-width character |
| 93 * doesn't fit. */ | |
| 94 | |
| 7 | 95 /* |
| 96 * The attributes that are actually active for writing to the screen. | |
| 97 */ | |
| 98 static int screen_attr = 0; | |
| 99 | |
| 100 /* | |
| 101 * Positioning the cursor is reduced by remembering the last position. | |
| 102 * Mostly used by windgoto() and screen_char(). | |
| 103 */ | |
| 104 static int screen_cur_row, screen_cur_col; /* last known cursor position */ | |
| 105 | |
| 106 #ifdef FEAT_SEARCH_EXTRA | |
| 107 static match_T search_hl; /* used for 'hlsearch' highlight matching */ | |
| 108 #endif | |
| 109 | |
| 110 #ifdef FEAT_FOLDING | |
| 111 static foldinfo_T win_foldinfo; /* info for 'foldcolumn' */ | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
112 static int compute_foldcolumn(win_T *wp, int col); |
| 7 | 113 #endif |
| 114 | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
115 /* Flag that is set when drawing for a callback, not from the main command |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
116 * loop. */ |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
117 static int redrawing_for_callback = 0; |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
118 |
| 7 | 119 /* |
| 120 * Buffer for one screen line (characters and attributes). | |
| 121 */ | |
| 122 static schar_T *current_ScreenLine; | |
| 123 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
124 static void win_update(win_T *wp); |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
125 static void win_redr_status(win_T *wp, int ignore_pum); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
126 static void win_draw_end(win_T *wp, int c1, int c2, int row, int endrow, hlf_T hl); |
| 7 | 127 #ifdef FEAT_FOLDING |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
128 static void fold_line(win_T *wp, long fold_count, foldinfo_T *foldinfo, linenr_T lnum, int row); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
129 static void fill_foldcolumn(char_u *p, win_T *wp, int closed, linenr_T lnum); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
130 static void copy_text_attr(int off, char_u *buf, int len, int attr); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
131 #endif |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
132 static int win_line(win_T *, linenr_T, int, int, int nochange, int number_only); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
133 static void draw_vsep_win(win_T *wp, int row); |
| 680 | 134 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
135 static void redraw_custom_statusline(win_T *wp); |
| 680 | 136 #endif |
| 7 | 137 #ifdef FEAT_SEARCH_EXTRA |
| 5985 | 138 # define SEARCH_HL_PRIORITY 0 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
139 static void start_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
140 static void end_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
141 static void init_search_hl(win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
142 static void prepare_search_hl(win_T *wp, linenr_T lnum); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
143 static void next_search_hl(win_T *win, match_T *shl, linenr_T lnum, colnr_T mincol, matchitem_T *cur); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
144 static int next_search_hl_pos(match_T *shl, linenr_T lnum, posmatch_T *pos, colnr_T mincol); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
145 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
146 static void screen_char(unsigned off, int row, int col); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
147 #ifdef FEAT_MBYTE |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
148 static void screen_char_2(unsigned off, int row, int col); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
149 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
150 static void screenclear2(void); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
151 static void lineclear(unsigned off, int width, int attr); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
152 static void lineinvalid(unsigned off, int width); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
153 static int win_do_lines(win_T *wp, int row, int line_count, int mayclear, int del, int clear_attr); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
154 static void win_rest_invalid(win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
155 static void msg_pos_mode(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
156 static void recording_mode(int attr); |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
157 static int fillchar_status(int *attr, win_T *wp); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
158 static int fillchar_vsep(int *attr); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
159 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
160 static void redraw_win_toolbar(win_T *wp); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
161 #endif |
| 7 | 162 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
163 static void win_redr_custom(win_T *wp, int draw_ruler); |
| 7 | 164 #endif |
| 165 #ifdef FEAT_CMDL_INFO | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
166 static void win_redr_ruler(win_T *wp, int always, int ignore_pum); |
| 7 | 167 #endif |
| 168 | |
| 169 /* Ugly global: overrule attribute used by screen_char() */ | |
| 170 static int screen_char_attr = 0; | |
| 171 | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
172 #if defined(FEAT_SYN_HL) && defined(FEAT_RELTIME) |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
173 /* Can limit syntax highlight time to 'redrawtime'. */ |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
174 # define SYN_TIME_LIMIT 1 |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
175 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
176 |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
177 #ifdef FEAT_RIGHTLEFT |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
178 # define HAS_RIGHTLEFT(x) x |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
179 #else |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
180 # define HAS_RIGHTLEFT(x) FALSE |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
181 #endif |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
182 |
| 7 | 183 /* |
| 184 * Redraw the current window later, with update_screen(type). | |
| 185 * Set must_redraw only if not already set to a higher value. | |
| 186 * e.g. if must_redraw is CLEAR, type NOT_VALID will do nothing. | |
| 187 */ | |
| 188 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
189 redraw_later(int type) |
| 7 | 190 { |
| 191 redraw_win_later(curwin, type); | |
| 192 } | |
| 193 | |
| 194 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
195 redraw_win_later( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
196 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
197 int type) |
| 7 | 198 { |
|
12672
4e846c9d61a8
patch 8.0.1214: accessing freed memory when EXITFREE is set
Christian Brabandt <cb@256bit.org>
parents:
12582
diff
changeset
|
199 if (!exiting && wp->w_redr_type < type) |
| 7 | 200 { |
| 201 wp->w_redr_type = type; | |
| 202 if (type >= NOT_VALID) | |
| 203 wp->w_lines_valid = 0; | |
| 204 if (must_redraw < type) /* must_redraw is the maximum of all windows */ | |
| 205 must_redraw = type; | |
| 206 } | |
| 207 } | |
| 208 | |
| 209 /* | |
| 210 * Force a complete redraw later. Also resets the highlighting. To be used | |
| 211 * after executing a shell command that messes up the screen. | |
| 212 */ | |
| 213 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
214 redraw_later_clear(void) |
| 7 | 215 { |
| 216 redraw_all_later(CLEAR); | |
| 826 | 217 #ifdef FEAT_GUI |
| 218 if (gui.in_use) | |
| 219 /* Use a code that will reset gui.highlight_mask in | |
| 220 * gui_stop_highlight(). */ | |
| 221 screen_attr = HL_ALL + 1; | |
| 222 else | |
| 223 #endif | |
| 224 /* Use attributes that is very unlikely to appear in text. */ | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
225 screen_attr = HL_BOLD | HL_UNDERLINE | HL_INVERSE | HL_STRIKETHROUGH; |
| 7 | 226 } |
| 227 | |
| 228 /* | |
| 229 * Mark all windows to be redrawn later. | |
| 230 */ | |
| 231 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
232 redraw_all_later(int type) |
| 7 | 233 { |
| 234 win_T *wp; | |
| 235 | |
| 236 FOR_ALL_WINDOWS(wp) | |
| 237 { | |
| 238 redraw_win_later(wp, type); | |
| 239 } | |
|
15384
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
240 // This may be needed when switching tabs. |
|
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
241 if (must_redraw < type) |
|
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
242 must_redraw = type; |
| 7 | 243 } |
| 244 | |
| 245 /* | |
| 301 | 246 * Mark all windows that are editing the current buffer to be updated later. |
| 7 | 247 */ |
| 248 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
249 redraw_curbuf_later(int type) |
| 7 | 250 { |
| 251 redraw_buf_later(curbuf, type); | |
| 252 } | |
| 253 | |
| 254 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
255 redraw_buf_later(buf_T *buf, int type) |
| 7 | 256 { |
| 257 win_T *wp; | |
| 258 | |
| 259 FOR_ALL_WINDOWS(wp) | |
| 260 { | |
| 261 if (wp->w_buffer == buf) | |
| 262 redraw_win_later(wp, type); | |
| 263 } | |
| 264 } | |
| 265 | |
|
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
|
266 void |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
267 redraw_buf_line_later(buf_T *buf, linenr_T lnum) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
268 { |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
269 win_T *wp; |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
270 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
271 FOR_ALL_WINDOWS(wp) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
272 if (wp->w_buffer == buf && lnum >= wp->w_topline |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
273 && lnum < wp->w_botline) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
274 redrawWinline(wp, lnum); |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
275 } |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
276 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
277 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
|
278 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
|
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 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
|
281 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
282 #ifdef FEAT_WILDMENU |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
283 if (wild_menu_showing != 0) |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
284 /* Don't redraw while the command line completion is displayed, it |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
285 * would disappear. */ |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
286 return; |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
287 #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
|
288 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
|
289 { |
|
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
|
290 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
|
291 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
292 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
|
293 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
|
294 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
295 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
296 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
297 |
| 7 | 298 /* |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
299 * 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
|
300 * 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
|
301 * Return a code indicating what happened. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
302 */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
303 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
304 redraw_asap(int type) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
305 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
306 int rows; |
| 6959 | 307 int cols = screen_Columns; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
308 int r; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
309 int ret = 0; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
310 schar_T *screenline; /* copy from ScreenLines[] */ |
|
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
311 sattr_T *screenattr; /* copy from ScreenAttrs[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
312 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
313 int i; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
314 u8char_T *screenlineUC = NULL; /* copy from ScreenLinesUC[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
315 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
|
316 schar_T *screenline2 = NULL; /* copy from ScreenLines2[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
317 #endif |
|
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 redraw_later(type); |
| 6959 | 320 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
|
321 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
322 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
323 /* Allocate space to save the text displayed in the command line area. */ |
| 6959 | 324 rows = screen_Rows - cmdline_row; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
325 screenline = (schar_T *)lalloc( |
| 6959 | 326 (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
|
327 screenattr = (sattr_T *)lalloc( |
| 6959 | 328 (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
|
329 if (screenline == NULL || screenattr == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
330 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
331 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
332 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
333 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
334 screenlineUC = (u8char_T *)lalloc( |
| 6959 | 335 (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
|
336 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
337 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
338 for (i = 0; i < p_mco; ++i) |
|
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 screenlineC[i] = (u8char_T *)lalloc( |
| 6959 | 341 (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
|
342 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
343 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
344 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
345 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
346 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
347 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
348 screenline2 = (schar_T *)lalloc( |
| 6959 | 349 (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
|
350 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
351 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
352 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
353 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
354 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
355 if (ret != 2) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
356 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
357 /* 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
|
358 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
359 { |
| 6959 | 360 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
361 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 362 (size_t)cols * sizeof(schar_T)); |
| 363 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
364 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 365 (size_t)cols * sizeof(sattr_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
366 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
367 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
368 { |
| 6959 | 369 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
370 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 371 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
372 for (i = 0; i < p_mco; ++i) |
| 6959 | 373 mch_memmove(screenlineC[i] + r * cols, |
| 374 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 375 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
376 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
377 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 378 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
379 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 380 (size_t)cols * sizeof(schar_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
381 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
382 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
383 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
384 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
385 ret = 3; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
386 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
387 if (must_redraw == 0) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
388 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
389 int off = (int)(current_ScreenLine - ScreenLines); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
390 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
391 /* 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
|
392 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
393 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
394 mch_memmove(current_ScreenLine, |
| 6959 | 395 screenline + r * cols, |
| 396 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
397 mch_memmove(ScreenAttrs + off, |
| 6959 | 398 screenattr + r * cols, |
| 399 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
400 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
401 if (enc_utf8) |
|
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 mch_memmove(ScreenLinesUC + off, |
| 6959 | 404 screenlineUC + r * cols, |
| 405 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
406 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
407 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 408 screenlineC[i] + r * cols, |
| 409 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
410 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
411 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
412 mch_memmove(ScreenLines2 + off, |
| 6959 | 413 screenline2 + r * cols, |
| 414 (size_t)cols * sizeof(schar_T)); | |
| 415 #endif | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
416 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
|
417 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
418 ret = 4; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
419 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
420 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
421 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
422 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
423 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
424 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
425 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
426 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
427 vim_free(screenlineUC); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
428 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
429 vim_free(screenlineC[i]); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
430 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
431 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
432 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
433 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
434 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
435 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
436 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
437 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
438 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
439 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
440 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
441 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
442 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
443 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
444 * 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
|
445 * 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
|
446 * it belongs. If highlighting was changed a redraw is needed. |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
447 * If "call_update_screen" is FALSE don't call update_screen() when at the |
|
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
448 * command line. |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
449 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
450 void |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
451 redraw_after_callback(int call_update_screen) |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
452 { |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
453 ++redrawing_for_callback; |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
454 |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
455 if (State == HITRETURN || State == ASKMORE) |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
456 ; // do nothing |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
457 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
|
458 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
459 // Don't redraw when in prompt_for_number(). |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
460 if (cmdline_row > 0) |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
461 { |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
462 // Redrawing only works when the screen didn't scroll. Don't clear |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
463 // wildmenu entries. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
464 if (msg_scrolled == 0 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
465 #ifdef FEAT_WILDMENU |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
466 && wild_menu_showing == 0 |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
467 #endif |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
468 && call_update_screen) |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
469 update_screen(0); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
470 |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
471 // Redraw in the same position, so that the user can continue |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
472 // editing the command. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
473 redrawcmdline_ex(FALSE); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
474 } |
|
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
|
475 } |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
476 else if (State & (NORMAL | INSERT | TERMINAL)) |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
477 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
478 // keep the command line if possible |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
479 update_screen(VALID_NO_UPDATE); |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
480 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
481 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
482 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
483 #ifdef FEAT_GUI |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
484 if (gui.in_use && !gui_mch_is_blink_off()) |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
485 // Don't update the cursor when it is blinking and off to avoid |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
486 // flicker. |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
487 out_flush_cursor(FALSE, FALSE); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
488 else |
|
13204
a8a154cafc60
patch 8.0.1476: screen isn't always updated right away
Christian Brabandt <cb@256bit.org>
parents:
13150
diff
changeset
|
489 #endif |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
490 out_flush(); |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
491 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
492 --redrawing_for_callback; |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
493 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
494 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
495 /* |
| 7 | 496 * Changed something in the current window, at buffer line "lnum", that |
| 497 * requires that line and possibly other lines to be redrawn. | |
| 498 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 499 * Used to remove the "$" from a change command. | |
| 500 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 501 * may become invalid and the whole window will have to be redrawn. | |
| 502 */ | |
| 503 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
504 redrawWinline( |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
505 win_T *wp, |
|
15400
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15396
diff
changeset
|
506 linenr_T lnum) |
|
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15396
diff
changeset
|
507 { |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
508 if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
509 wp->w_redraw_top = lnum; |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
510 if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
511 wp->w_redraw_bot = lnum; |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
512 redraw_win_later(wp, VALID); |
| 7 | 513 } |
| 514 | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
515 void |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
516 reset_updating_screen(int may_resize_shell UNUSED) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
517 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
518 updating_screen = FALSE; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
519 #ifdef FEAT_GUI |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
520 if (may_resize_shell) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
521 gui_may_resize_shell(); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
522 #endif |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
523 #ifdef FEAT_TERMINAL |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
524 term_check_channel_closed_recently(); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
525 #endif |
|
14428
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
526 |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
527 #ifdef HAVE_DROP_FILE |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
528 // If handle_drop() was called while updating_screen was TRUE need to |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
529 // handle the drop now. |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
530 handle_any_postponed_drop(); |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
531 #endif |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
532 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
533 |
| 7 | 534 /* |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
535 * Update all windows that are editing the current buffer. |
| 7 | 536 */ |
| 537 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
538 update_curbuf(int type) |
| 7 | 539 { |
| 540 redraw_curbuf_later(type); | |
| 541 update_screen(type); | |
| 542 } | |
| 543 | |
| 544 /* | |
| 545 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 546 * of stuff from Filemem to ScreenLines[], and update curwin->w_botline. | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
547 * Return OK when the screen was updated, FAIL if it was not done. |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
548 */ |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
549 int |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
550 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
|
551 { |
|
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
|
552 int type = type_arg; |
| 7 | 553 win_T *wp; |
| 554 static int did_intro = FALSE; | |
| 555 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 556 int did_one; | |
| 557 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
558 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
559 int did_undraw = FALSE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
560 int gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
561 int gui_cursor_row; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
562 #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
|
563 int no_update = FALSE; |
| 7 | 564 |
| 2008 | 565 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 566 if (!screen_valid(TRUE)) |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
567 return FAIL; |
| 7 | 568 |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
569 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
|
570 { |
|
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
|
571 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
|
572 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
|
573 } |
|
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
|
574 |
| 7 | 575 if (must_redraw) |
| 576 { | |
| 577 if (type < must_redraw) /* use maximal type */ | |
| 578 type = must_redraw; | |
| 1331 | 579 |
| 580 /* must_redraw is reset here, so that when we run into some weird | |
| 581 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 582 * scrolling), or update_topline() in win_update() will cause a | |
| 583 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 584 must_redraw = 0; |
| 585 } | |
| 586 | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
587 /* May need to update w_lines[]. */ |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
588 if (curwin->w_lines_valid == 0 && type < NOT_VALID |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
589 #ifdef FEAT_TERMINAL |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
590 && !term_do_update_window(curwin) |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
591 #endif |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
592 ) |
| 7 | 593 type = NOT_VALID; |
| 594 | |
| 2008 | 595 /* Postpone the redrawing when it's not needed and when being called |
| 596 * recursively. */ | |
| 597 if (!redrawing() || updating_screen) | |
| 7 | 598 { |
| 599 redraw_later(type); /* remember type for next time */ | |
| 600 must_redraw = type; | |
| 601 if (type > INVERTED_ALL) | |
| 602 curwin->w_lines_valid = 0; /* don't use w_lines[].wl_size now */ | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
603 return FAIL; |
| 7 | 604 } |
| 605 | |
| 606 updating_screen = TRUE; | |
| 607 #ifdef FEAT_SYN_HL | |
| 608 ++display_tick; /* let syntax code know we're in a next round of | |
| 609 * display updating */ | |
| 610 #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
|
611 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
|
612 ++no_win_do_lines_ins; |
| 7 | 613 |
| 614 /* | |
| 615 * if the screen was scrolled up when displaying a message, scroll it down | |
| 616 */ | |
| 617 if (msg_scrolled) | |
| 618 { | |
| 619 clear_cmdline = TRUE; | |
| 620 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 621 type = CLEAR; | |
| 622 else if (type != CLEAR) | |
| 623 { | |
| 624 check_for_delay(FALSE); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
625 if (screen_ins_lines(0, 0, msg_scrolled, (int)Rows, 0, NULL) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
626 == FAIL) |
| 7 | 627 type = CLEAR; |
| 628 FOR_ALL_WINDOWS(wp) | |
| 629 { | |
| 630 if (W_WINROW(wp) < msg_scrolled) | |
| 631 { | |
| 632 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 633 && wp->w_redr_type < REDRAW_TOP | |
| 634 && wp->w_lines_valid > 0 | |
| 635 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 636 { | |
| 637 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 638 wp->w_redr_type = REDRAW_TOP; | |
| 639 } | |
| 640 else | |
| 641 { | |
| 642 wp->w_redr_type = NOT_VALID; | |
|
12529
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
643 if (W_WINROW(wp) + wp->w_height + wp->w_status_height |
|
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
644 <= msg_scrolled) |
| 7 | 645 wp->w_redr_status = TRUE; |
| 646 } | |
| 647 } | |
| 648 } | |
|
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
|
649 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
|
650 redraw_cmdline = TRUE; |
| 673 | 651 redraw_tabline = TRUE; |
| 7 | 652 } |
| 653 msg_scrolled = 0; | |
| 654 need_wait_return = FALSE; | |
| 655 } | |
| 656 | |
| 657 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 658 compute_cmdrow(); | |
| 659 | |
| 660 /* Check for changed highlighting */ | |
| 661 if (need_highlight_changed) | |
| 662 highlight_changed(); | |
| 663 | |
| 664 if (type == CLEAR) /* first clear screen */ | |
| 665 { | |
| 666 screenclear(); /* will reset clear_cmdline */ | |
| 667 type = NOT_VALID; | |
|
11607
24664144de4e
patch 8.0.0686: extra redraw when using CTRL-L in second window
Christian Brabandt <cb@256bit.org>
parents:
11585
diff
changeset
|
668 /* must_redraw may be set indirectly, avoid another redraw later */ |
|
24664144de4e
patch 8.0.0686: extra redraw when using CTRL-L in second window
Christian Brabandt <cb@256bit.org>
parents:
11585
diff
changeset
|
669 must_redraw = 0; |
| 7 | 670 } |
| 671 | |
| 672 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 673 check_for_delay(FALSE); | |
| 674 | |
| 13 | 675 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
676 /* 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
|
677 * changes. */ |
| 13 | 678 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
679 && 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
|
680 ? number_width(curwin) : 0)) |
| 13 | 681 curwin->w_redr_type = NOT_VALID; |
| 682 #endif | |
| 683 | |
| 7 | 684 /* |
| 685 * Only start redrawing if there is really something to do. | |
| 686 */ | |
| 687 if (type == INVERTED) | |
| 688 update_curswant(); | |
| 689 if (curwin->w_redr_type < type | |
| 690 && !((type == VALID | |
| 691 && curwin->w_lines[0].wl_valid | |
| 692 #ifdef FEAT_DIFF | |
| 693 && curwin->w_topfill == curwin->w_old_topfill | |
| 694 && curwin->w_botfill == curwin->w_old_botfill | |
| 695 #endif | |
| 696 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 697 || (type == INVERTED | |
| 1043 | 698 && VIsual_active |
| 7 | 699 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 700 && curwin->w_old_visual_mode == VIsual_mode | |
| 701 && (curwin->w_valid & VALID_VIRTCOL) | |
| 702 && curwin->w_old_curswant == curwin->w_curswant) | |
| 703 )) | |
| 704 curwin->w_redr_type = type; | |
| 705 | |
| 849 | 706 /* Redraw the tab pages line if needed. */ |
| 707 if (redraw_tabline || type >= NOT_VALID) | |
| 708 draw_tabline(); | |
| 709 | |
| 7 | 710 #ifdef FEAT_SYN_HL |
| 711 /* | |
| 712 * Correct stored syntax highlighting info for changes in each displayed | |
| 713 * buffer. Each buffer must only be done once. | |
| 714 */ | |
| 715 FOR_ALL_WINDOWS(wp) | |
| 716 { | |
| 717 if (wp->w_buffer->b_mod_set) | |
| 718 { | |
| 719 win_T *wwp; | |
| 720 | |
| 721 /* Check if we already did this buffer. */ | |
| 722 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 723 if (wwp->w_buffer == wp->w_buffer) | |
| 724 break; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
725 if (wwp == wp && syntax_present(wp)) |
| 7 | 726 syn_stack_apply_changes(wp->w_buffer); |
| 727 } | |
| 728 } | |
| 729 #endif | |
| 730 | |
| 731 /* | |
| 732 * Go from top to bottom through the windows, redrawing the ones that need | |
| 733 * it. | |
| 734 */ | |
| 735 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 736 did_one = FALSE; | |
| 737 #endif | |
| 738 #ifdef FEAT_SEARCH_EXTRA | |
| 739 search_hl.rm.regprog = NULL; | |
| 740 #endif | |
| 741 FOR_ALL_WINDOWS(wp) | |
| 742 { | |
| 743 if (wp->w_redr_type != 0) | |
| 744 { | |
| 745 cursor_off(); | |
| 746 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 747 if (!did_one) | |
| 748 { | |
| 749 did_one = TRUE; | |
| 750 # ifdef FEAT_SEARCH_EXTRA | |
| 751 start_search_hl(); | |
| 752 # endif | |
| 753 # ifdef FEAT_CLIPBOARD | |
| 754 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 755 if (clip_star.available && clip_isautosel_star()) |
| 756 clip_update_selection(&clip_star); | |
| 757 if (clip_plus.available && clip_isautosel_plus()) | |
| 758 clip_update_selection(&clip_plus); | |
| 7 | 759 # endif |
| 760 #ifdef FEAT_GUI | |
| 761 /* Remove the cursor before starting to do anything, because | |
| 762 * scrolling may make it difficult to redraw the text under | |
| 763 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
764 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
|
765 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
766 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
767 gui_cursor_row = gui.cursor_row; |
| 7 | 768 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
769 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
770 } |
| 7 | 771 #endif |
| 772 } | |
| 773 #endif | |
| 774 win_update(wp); | |
| 775 } | |
| 776 | |
| 777 /* redraw status line after the window to minimize cursor movement */ | |
| 778 if (wp->w_redr_status) | |
| 779 { | |
| 780 cursor_off(); | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
781 win_redr_status(wp, TRUE); // any popup menu will be redrawn below |
| 7 | 782 } |
| 783 } | |
| 784 #if defined(FEAT_SEARCH_EXTRA) | |
| 785 end_search_hl(); | |
| 786 #endif | |
| 4107 | 787 #ifdef FEAT_INS_EXPAND |
| 788 /* May need to redraw the popup menu. */ | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
789 pum_may_redraw(); |
| 4107 | 790 #endif |
| 7 | 791 |
| 792 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 793 * 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
|
794 FOR_ALL_WINDOWS(wp) |
| 7 | 795 wp->w_buffer->b_mod_set = FALSE; |
| 796 | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
797 reset_updating_screen(TRUE); |
| 7 | 798 |
| 799 /* Clear or redraw the command line. Done last, because scrolling may | |
| 800 * mess up the command line. */ | |
| 801 if (clear_cmdline || redraw_cmdline) | |
| 802 showmode(); | |
| 803 | |
|
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
|
804 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
|
805 --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
|
806 |
| 7 | 807 /* 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
|
808 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
809 maybe_intro_message(); |
| 7 | 810 did_intro = TRUE; |
| 811 | |
| 812 #ifdef FEAT_GUI | |
| 813 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 814 * done. */ | |
| 815 if (gui.in_use) | |
| 816 { | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
817 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
|
818 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
819 mch_disable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
820 out_flush(); /* required before updating the cursor */ |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
821 mch_enable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
822 |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
823 /* 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
|
824 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
825 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
826 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
827 # ifdef FEAT_MBYTE |
|
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
828 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
|
829 # endif |
| 7 | 830 gui_update_cursor(FALSE, FALSE); |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
831 gui_may_flush(); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
832 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
833 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
834 } |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
835 else |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
836 out_flush(); |
| 7 | 837 gui_update_scrollbars(FALSE); |
| 838 } | |
| 839 #endif | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
840 return OK; |
| 7 | 841 } |
| 842 | |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
843 #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
|
844 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
845 * 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
|
846 * 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
|
847 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
848 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
849 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
850 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
851 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
852 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
853 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
854 /* 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
|
855 * 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
|
856 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
857 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
858 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
859 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
860 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
861 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
862 } |
|
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 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
865 * 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
|
866 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
867 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
868 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
869 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
870 if (redraw_cmdline) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
871 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
872 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
873 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
874 end_search_hl(); |
|
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 |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
877 reset_updating_screen(TRUE); |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
878 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
879 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
880 /* 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
|
881 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
882 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
883 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
884 out_flush_cursor(FALSE, FALSE); |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
885 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
886 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
887 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
888 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
889 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
890 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
891 #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
|
892 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
893 * 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
|
894 * 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
|
895 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
896 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
897 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
|
898 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
899 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
|
900 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
901 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
|
902 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
|
903 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
|
904 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
|
905 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
|
906 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
|
907 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
|
908 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
909 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
910 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
|
911 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
912 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
|
913 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
|
914 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
915 |
|
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 * 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
|
918 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
919 void |
|
13876
156ebdcb8ef5
patch 8.0.1809: various typos
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
920 conceal_check_cursor_line(void) |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
921 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
922 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
|
923 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
924 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
|
925 /* 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
|
926 * 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
|
927 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
|
928 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
929 } |
| 7 | 930 #endif |
| 931 | |
| 932 #if defined(FEAT_SIGNS) || defined(PROTO) | |
| 933 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
934 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 935 { |
| 936 win_T *wp; | |
| 937 int doit = FALSE; | |
| 938 | |
| 939 # ifdef FEAT_FOLDING | |
| 940 win_foldinfo.fi_level = 0; | |
| 941 # endif | |
| 942 | |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
943 // update/delete a specific sign |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
944 redraw_buf_line_later(buf, lnum); |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
945 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
946 // check if it resulted in the need to redraw a window |
| 7 | 947 FOR_ALL_WINDOWS(wp) |
| 948 if (wp->w_redr_type != 0) | |
| 949 doit = TRUE; | |
| 950 | |
| 3250 | 951 /* Return when there is nothing to do, screen updating is already |
|
11915
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
952 * happening (recursive call), messages on the screen or still starting up. |
|
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
953 */ |
| 3250 | 954 if (!doit || updating_screen |
|
11915
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
955 || State == ASKMORE || State == HITRETURN |
|
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
956 || msg_scrolled |
| 3250 | 957 #ifdef FEAT_GUI |
| 958 || gui.starting | |
| 959 #endif | |
| 960 || starting) | |
| 7 | 961 return; |
| 962 | |
| 963 /* update all windows that need updating */ | |
| 964 update_prepare(); | |
| 965 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
966 FOR_ALL_WINDOWS(wp) |
| 7 | 967 { |
| 968 if (wp->w_redr_type != 0) | |
| 969 win_update(wp); | |
| 970 if (wp->w_redr_status) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
971 win_redr_status(wp, FALSE); |
| 7 | 972 } |
| 973 | |
| 974 update_finish(); | |
| 975 } | |
| 976 #endif | |
| 977 | |
| 978 | |
| 979 #if defined(FEAT_GUI) || defined(PROTO) | |
| 980 /* | |
| 981 * Update a single window, its status line and maybe the command line msg. | |
| 982 * Used for the GUI scrollbar. | |
| 983 */ | |
| 984 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
985 updateWindow(win_T *wp) |
| 7 | 986 { |
| 2008 | 987 /* return if already busy updating */ |
| 988 if (updating_screen) | |
| 989 return; | |
| 990 | |
| 7 | 991 update_prepare(); |
| 992 | |
| 993 #ifdef FEAT_CLIPBOARD | |
| 994 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 995 if (clip_star.available && clip_isautosel_star()) |
| 996 clip_update_selection(&clip_star); | |
| 997 if (clip_plus.available && clip_isautosel_plus()) | |
| 998 clip_update_selection(&clip_plus); | |
| 7 | 999 #endif |
| 670 | 1000 |
| 7 | 1001 win_update(wp); |
| 670 | 1002 |
| 1003 /* When the screen was cleared redraw the tab pages line. */ | |
| 673 | 1004 if (redraw_tabline) |
| 677 | 1005 draw_tabline(); |
| 670 | 1006 |
| 7 | 1007 if (wp->w_redr_status |
| 1008 # ifdef FEAT_CMDL_INFO | |
| 1009 || p_ru | |
| 1010 # endif | |
| 1011 # ifdef FEAT_STL_OPT | |
| 40 | 1012 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1013 # endif |
| 1014 ) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
1015 win_redr_status(wp, FALSE); |
| 7 | 1016 |
| 1017 update_finish(); | |
| 1018 } | |
| 1019 #endif | |
| 1020 | |
| 1021 /* | |
| 1022 * Update a single window. | |
| 1023 * | |
| 1024 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1025 * screen or scrolling lines). | |
| 1026 * | |
| 1027 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1028 * implies the one below it. | |
| 1029 * NOT_VALID redraw the whole window | |
| 743 | 1030 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1031 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1032 * INVERTED redraw the changed part of the Visual area | |
| 1033 * INVERTED_ALL redraw the whole Visual area | |
| 1034 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1035 * 2. update lines at the top when scrolled down | |
| 1036 * 3. redraw changed text: | |
| 301 | 1037 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1038 * b_mod_top and b_mod_bot. |
| 1039 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1040 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1041 * - continue redrawing when syntax status is invalid. | |
| 1042 * 4. if scrolled up, update lines at the bottom. | |
| 1043 * This results in three areas that may need updating: | |
| 1044 * top: from first row to top_end (when scrolled down) | |
| 1045 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1046 * bot: from bot_start to last row (when scrolled up) | |
| 1047 */ | |
| 1048 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1049 win_update(win_T *wp) |
| 7 | 1050 { |
| 1051 buf_T *buf = wp->w_buffer; | |
| 1052 int type; | |
| 1053 int top_end = 0; /* Below last row of the top area that needs | |
| 1054 updating. 0 when no top area updating. */ | |
| 1055 int mid_start = 999;/* first row of the mid area that needs | |
| 1056 updating. 999 when no mid area updating. */ | |
| 1057 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1058 updating. 0 when no mid area updating. */ | |
| 1059 int bot_start = 999;/* first row of the bot area that needs | |
| 1060 updating. 999 when no bot area updating */ | |
| 1061 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1062 w_topline got smaller a bit */ | |
| 1063 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1064 matchitem_T *cur; /* points to the match list */ |
| 7 | 1065 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1066 #endif | |
| 1067 | |
| 1068 int row; /* current window row to display */ | |
| 1069 linenr_T lnum; /* current buffer lnum to display */ | |
| 1070 int idx; /* current index in w_lines[] */ | |
| 1071 int srow; /* starting row of the current line */ | |
| 1072 | |
| 1073 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1074 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1075 int i; | |
| 1076 long j; | |
| 1077 static int recursive = FALSE; /* being called recursively */ | |
| 1078 int old_botline = wp->w_botline; | |
| 1079 #ifdef FEAT_FOLDING | |
| 1080 long fold_count; | |
| 1081 #endif | |
| 1082 #ifdef FEAT_SYN_HL | |
| 1083 /* remember what happened to the previous line, to know if | |
| 1084 * check_visual_highlight() can be used */ | |
| 1085 #define DID_NONE 1 /* didn't update a line */ | |
| 1086 #define DID_LINE 2 /* updated a normal line */ | |
| 1087 #define DID_FOLD 3 /* updated a folded line */ | |
| 1088 int did_update = DID_NONE; | |
| 1089 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1090 #endif | |
| 1091 linenr_T mod_top = 0; | |
| 1092 linenr_T mod_bot = 0; | |
| 1093 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1094 int save_got_int; | |
| 1095 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1096 #ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1097 proftime_T syntax_tm; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1098 #endif |
| 7 | 1099 |
| 1100 type = wp->w_redr_type; | |
| 1101 | |
| 1102 if (type == NOT_VALID) | |
| 1103 { | |
| 1104 wp->w_redr_status = TRUE; | |
| 1105 wp->w_lines_valid = 0; | |
| 1106 } | |
| 1107 | |
| 1108 /* Window is zero-height: nothing to draw. */ | |
|
12998
dd734ee3e2fe
patch 8.0.1375: window size wrong after maximizing with WinBar
Christian Brabandt <cb@256bit.org>
parents:
12964
diff
changeset
|
1109 if (wp->w_height + WINBAR_HEIGHT(wp) == 0) |
| 7 | 1110 { |
| 1111 wp->w_redr_type = 0; | |
| 1112 return; | |
| 1113 } | |
| 1114 | |
| 1115 /* Window is zero-width: Only need to draw the separator. */ | |
| 1116 if (wp->w_width == 0) | |
| 1117 { | |
| 1118 /* draw the vertical separator right of this window */ | |
| 1119 draw_vsep_win(wp, 0); | |
| 1120 wp->w_redr_type = 0; | |
| 1121 return; | |
| 1122 } | |
| 1123 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1124 #ifdef FEAT_TERMINAL |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1125 // If this window contains a terminal, redraw works completely differently. |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1126 if (term_do_update_window(wp)) |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1127 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1128 term_update_window(wp); |
|
13292
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1129 # ifdef FEAT_MENU |
|
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1130 /* Draw the window toolbar, if there is one. */ |
|
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1131 if (winbar_height(wp) > 0) |
|
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1132 redraw_win_toolbar(wp); |
|
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1133 # endif |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1134 wp->w_redr_type = 0; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1135 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1136 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1137 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1138 |
| 7 | 1139 #ifdef FEAT_SEARCH_EXTRA |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1140 init_search_hl(wp); |
| 7 | 1141 #endif |
| 1142 | |
| 13 | 1143 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1144 /* 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
|
1145 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1146 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1147 if (wp->w_nrwidth != i) |
| 13 | 1148 { |
| 1149 type = NOT_VALID; | |
| 677 | 1150 wp->w_nrwidth = i; |
| 13 | 1151 } |
| 1152 else | |
| 1153 #endif | |
| 1154 | |
| 7 | 1155 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1156 { | |
| 1157 /* | |
| 1158 * When there are both inserted/deleted lines and specific lines to be | |
| 1159 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1160 * everything (only happens when redrawing is off for while). | |
| 1161 */ | |
| 1162 type = NOT_VALID; | |
| 1163 } | |
| 1164 else | |
| 1165 { | |
| 1166 /* | |
| 1167 * Set mod_top to the first line that needs displaying because of | |
| 1168 * changes. Set mod_bot to the first line after the changes. | |
| 1169 */ | |
| 1170 mod_top = wp->w_redraw_top; | |
| 1171 if (wp->w_redraw_bot != 0) | |
| 1172 mod_bot = wp->w_redraw_bot + 1; | |
| 1173 else | |
| 1174 mod_bot = 0; | |
| 1175 wp->w_redraw_top = 0; /* reset for next time */ | |
| 1176 wp->w_redraw_bot = 0; | |
| 1177 if (buf->b_mod_set) | |
| 1178 { | |
| 1179 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1180 { | |
| 1181 mod_top = buf->b_mod_top; | |
| 1182 #ifdef FEAT_SYN_HL | |
| 1183 /* Need to redraw lines above the change that may be included | |
| 1184 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1185 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1186 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1187 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1188 if (mod_top < 1) |
| 1189 mod_top = 1; | |
| 1190 } | |
| 1191 #endif | |
| 1192 } | |
| 1193 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1194 mod_bot = buf->b_mod_bot; | |
| 1195 | |
| 1196 #ifdef FEAT_SEARCH_EXTRA | |
| 1197 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1198 * change in one line may make the Search highlighting in a | |
| 1199 * previous line invalid. Simple solution: redraw all visible | |
| 1200 * lines above the change. | |
| 1326 | 1201 * Same for a match pattern. |
| 7 | 1202 */ |
| 699 | 1203 if (search_hl.rm.regprog != NULL |
| 1204 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1205 top_to_mod = TRUE; |
| 699 | 1206 else |
| 1326 | 1207 { |
| 1208 cur = wp->w_match_head; | |
| 1209 while (cur != NULL) | |
| 1210 { | |
| 1211 if (cur->match.regprog != NULL | |
| 1212 && re_multiline(cur->match.regprog)) | |
| 699 | 1213 { |
| 1214 top_to_mod = TRUE; | |
| 1215 break; | |
| 1216 } | |
| 1326 | 1217 cur = cur->next; |
| 1218 } | |
| 1219 } | |
| 7 | 1220 #endif |
| 1221 } | |
| 1222 #ifdef FEAT_FOLDING | |
| 1223 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1224 { | |
| 1225 linenr_T lnumt, lnumb; | |
| 1226 | |
| 1227 /* | |
| 1228 * A change in a line can cause lines above it to become folded or | |
| 1229 * unfolded. Find the top most buffer line that may be affected. | |
| 1230 * If the line was previously folded and displayed, get the first | |
| 1231 * line of that fold. If the line is folded now, get the first | |
| 1232 * folded line. Use the minimum of these two. | |
| 1233 */ | |
| 1234 | |
| 1235 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1236 * the line below it. If there is no valid entry, use w_topline. | |
| 1237 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1238 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1239 lnumt = wp->w_topline; | |
| 1240 lnumb = MAXLNUM; | |
| 1241 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1242 if (wp->w_lines[i].wl_valid) | |
| 1243 { | |
| 1244 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1245 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1246 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1247 { | |
| 1248 lnumb = wp->w_lines[i].wl_lnum; | |
| 1249 /* When there is a fold column it might need updating | |
| 1250 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1251 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1252 ++lnumb; |
| 1253 } | |
| 1254 } | |
| 1255 | |
| 1256 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1257 if (mod_top > lnumt) | |
| 1258 mod_top = lnumt; | |
| 1259 | |
| 1260 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1261 --mod_bot; | |
| 1262 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1263 ++mod_bot; | |
| 1264 if (mod_bot < lnumb) | |
| 1265 mod_bot = lnumb; | |
| 1266 } | |
| 1267 #endif | |
| 1268 | |
| 1269 /* When a change starts above w_topline and the end is below | |
| 1270 * w_topline, start redrawing at w_topline. | |
| 36 | 1271 * If the end of the change is above w_topline: do like no change was |
| 1272 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1273 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1274 { | |
| 1275 if (mod_bot > wp->w_topline) | |
| 1276 mod_top = wp->w_topline; | |
| 1277 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1278 else if (syntax_present(wp)) |
| 7 | 1279 top_end = 1; |
| 1280 #endif | |
| 1281 } | |
| 36 | 1282 |
| 1283 /* When line numbers are displayed need to redraw all lines below | |
| 1284 * inserted/deleted lines. */ | |
| 1285 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1286 mod_bot = MAXLNUM; | |
| 7 | 1287 } |
| 1288 | |
| 1289 /* | |
| 1290 * When only displaying the lines at the top, set top_end. Used when | |
| 1291 * window has scrolled down for msg_scrolled. | |
| 1292 */ | |
| 1293 if (type == REDRAW_TOP) | |
| 1294 { | |
| 1295 j = 0; | |
| 1296 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1297 { | |
| 1298 j += wp->w_lines[i].wl_size; | |
| 1299 if (j >= wp->w_upd_rows) | |
| 1300 { | |
| 1301 top_end = j; | |
| 1302 break; | |
| 1303 } | |
| 1304 } | |
| 1305 if (top_end == 0) | |
| 1306 /* not found (cannot happen?): redraw everything */ | |
| 1307 type = NOT_VALID; | |
| 1308 else | |
| 1309 /* top area defined, the rest is VALID */ | |
| 1310 type = VALID; | |
| 1311 } | |
| 1312 | |
| 1378 | 1313 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1314 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1315 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1316 * called. */ | |
| 1317 if (screen_cleared) | |
| 1318 screen_cleared = MAYBE; | |
| 1319 | |
| 7 | 1320 /* |
| 1321 * If there are no changes on the screen that require a complete redraw, | |
| 1322 * handle three cases: | |
| 1323 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1324 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1325 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1326 * w_lines[] that needs updating. | |
| 1327 */ | |
| 743 | 1328 if ((type == VALID || type == SOME_VALID |
| 1329 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1330 #ifdef FEAT_DIFF |
| 1331 && !wp->w_botfill && !wp->w_old_botfill | |
| 1332 #endif | |
| 1333 ) | |
| 1334 { | |
| 1335 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1336 { | |
| 1337 /* | |
| 1338 * w_topline is the first changed line, the scrolling will be done | |
| 1339 * further down. | |
| 1340 */ | |
| 1341 } | |
| 1342 else if (wp->w_lines[0].wl_valid | |
| 1343 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1344 #ifdef FEAT_DIFF | |
| 1345 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1346 && wp->w_topfill > wp->w_old_topfill) | |
| 1347 #endif | |
| 1348 )) | |
| 1349 { | |
| 1350 /* | |
| 1351 * New topline is above old topline: May scroll down. | |
| 1352 */ | |
| 1353 #ifdef FEAT_FOLDING | |
| 1354 if (hasAnyFolding(wp)) | |
| 1355 { | |
| 1356 linenr_T ln; | |
| 1357 | |
| 1358 /* count the number of lines we are off, counting a sequence | |
| 1359 * of folded lines as one */ | |
| 1360 j = 0; | |
| 1361 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1362 { | |
| 1363 ++j; | |
| 1364 if (j >= wp->w_height - 2) | |
| 1365 break; | |
| 1366 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1367 } | |
| 1368 } | |
| 1369 else | |
| 1370 #endif | |
| 1371 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1372 if (j < wp->w_height - 2) /* not too far off */ | |
| 1373 { | |
| 1374 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1375 #ifdef FEAT_DIFF | |
| 1376 /* insert extra lines for previously invisible filler lines */ | |
| 1377 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1378 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1379 - wp->w_old_topfill; | |
| 1380 #endif | |
| 1381 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1382 { | |
| 1383 /* | |
| 1384 * Try to insert the correct number of lines. | |
| 1385 * If not the last window, delete the lines at the bottom. | |
| 1386 * win_ins_lines may fail when the terminal can't do it. | |
| 1387 */ | |
| 1388 if (i > 0) | |
| 1389 check_for_delay(FALSE); | |
| 1390 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1391 { | |
| 1392 if (wp->w_lines_valid != 0) | |
| 1393 { | |
| 1394 /* Need to update rows that are new, stop at the | |
| 1395 * first one that scrolled down. */ | |
| 1396 top_end = i; | |
| 1397 scrolled_down = TRUE; | |
| 1398 | |
| 1399 /* Move the entries that were scrolled, disable | |
| 1400 * the entries for the lines to be redrawn. */ | |
| 1401 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1402 wp->w_lines_valid = wp->w_height; | |
| 1403 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1404 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1405 while (idx >= 0) | |
| 1406 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1407 } | |
| 1408 } | |
| 1409 else | |
| 1410 mid_start = 0; /* redraw all lines */ | |
| 1411 } | |
| 1412 else | |
| 1413 mid_start = 0; /* redraw all lines */ | |
| 1414 } | |
| 1415 else | |
| 1416 mid_start = 0; /* redraw all lines */ | |
| 1417 } | |
| 1418 else | |
| 1419 { | |
| 1420 /* | |
| 1421 * New topline is at or below old topline: May scroll up. | |
| 1422 * When topline didn't change, find first entry in w_lines[] that | |
| 1423 * needs updating. | |
| 1424 */ | |
| 1425 | |
| 1426 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1427 j = -1; | |
| 1428 row = 0; | |
| 1429 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1430 { | |
| 1431 if (wp->w_lines[i].wl_valid | |
| 1432 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1433 { | |
| 1434 j = i; | |
| 1435 break; | |
| 1436 } | |
| 1437 row += wp->w_lines[i].wl_size; | |
| 1438 } | |
| 1439 if (j == -1) | |
| 1440 { | |
| 1441 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1442 * lines */ | |
| 1443 mid_start = 0; | |
| 1444 } | |
| 1445 else | |
| 1446 { | |
| 1447 /* | |
| 1448 * Try to delete the correct number of lines. | |
| 1449 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1450 */ | |
| 1451 #ifdef FEAT_DIFF | |
| 1452 /* If the topline didn't change, delete old filler lines, | |
| 1453 * otherwise delete filler lines of the new topline... */ | |
| 1454 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1455 row += wp->w_old_topfill; | |
| 1456 else | |
| 1457 row += diff_check_fill(wp, wp->w_topline); | |
| 1458 /* ... but don't delete new filler lines. */ | |
| 1459 row -= wp->w_topfill; | |
| 1460 #endif | |
| 1461 if (row > 0) | |
| 1462 { | |
| 1463 check_for_delay(FALSE); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
1464 if (win_del_lines(wp, 0, row, FALSE, wp == firstwin, 0) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
1465 == OK) |
| 7 | 1466 bot_start = wp->w_height - row; |
| 1467 else | |
| 1468 mid_start = 0; /* redraw all lines */ | |
| 1469 } | |
| 1470 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1471 { | |
| 1472 /* | |
| 1473 * Skip the lines (below the deleted lines) that are still | |
| 1474 * valid and don't need redrawing. Copy their info | |
| 1475 * upwards, to compensate for the deleted lines. Set | |
| 1476 * bot_start to the first row that needs redrawing. | |
| 1477 */ | |
| 1478 bot_start = 0; | |
| 1479 idx = 0; | |
| 1480 for (;;) | |
| 1481 { | |
| 1482 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1483 /* stop at line that didn't fit, unless it is still | |
| 1484 * valid (no lines deleted) */ | |
| 1485 if (row > 0 && bot_start + row | |
| 1486 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1487 { | |
| 1488 wp->w_lines_valid = idx + 1; | |
| 1489 break; | |
| 1490 } | |
| 1491 bot_start += wp->w_lines[idx++].wl_size; | |
| 1492 | |
| 1493 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1494 if (++j >= wp->w_lines_valid) | |
| 1495 { | |
| 1496 wp->w_lines_valid = idx; | |
| 1497 break; | |
| 1498 } | |
| 1499 } | |
| 1500 #ifdef FEAT_DIFF | |
| 1501 /* Correct the first entry for filler lines at the top | |
| 1502 * when it won't get updated below. */ | |
| 1503 if (wp->w_p_diff && bot_start > 0) | |
| 1504 wp->w_lines[0].wl_size = | |
| 1505 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1506 + wp->w_topfill; | |
| 1507 #endif | |
| 1508 } | |
| 1509 } | |
| 1510 } | |
| 1511 | |
| 1512 /* When starting redraw in the first line, redraw all lines. When | |
| 1513 * there is only one window it's probably faster to clear the screen | |
| 1514 * first. */ | |
| 1515 if (mid_start == 0) | |
| 1516 { | |
| 1517 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1518 if (ONE_WINDOW) |
| 981 | 1519 { |
| 1331 | 1520 /* Clear the screen when it was not done by win_del_lines() or |
| 1521 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1522 * then. */ | |
| 1523 if (screen_cleared != TRUE) | |
| 1524 screenclear(); | |
| 981 | 1525 /* The screen was cleared, redraw the tab pages line. */ |
| 1526 if (redraw_tabline) | |
| 1527 draw_tabline(); | |
| 1528 } | |
| 7 | 1529 } |
| 1331 | 1530 |
| 1531 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1532 * cleared (only happens for the first window) or when screenclear() | |
| 1533 * was called directly above, "must_redraw" will have been set to | |
| 1534 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1535 if (screen_cleared == TRUE) | |
| 1536 must_redraw = 0; | |
| 7 | 1537 } |
| 1538 else | |
| 1539 { | |
| 1540 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1541 mid_start = 0; | |
| 1542 mid_end = wp->w_height; | |
| 1543 } | |
| 1544 | |
| 743 | 1545 if (type == SOME_VALID) |
| 1546 { | |
| 1547 /* SOME_VALID: redraw all lines. */ | |
| 1548 mid_start = 0; | |
| 1549 mid_end = wp->w_height; | |
| 1550 type = NOT_VALID; | |
| 1551 } | |
| 1552 | |
| 7 | 1553 /* check if we are updating or removing the inverted part */ |
| 1554 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1555 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1556 { | |
| 1557 linenr_T from, to; | |
| 1558 | |
| 1559 if (VIsual_active) | |
| 1560 { | |
| 1561 if (VIsual_active | |
| 1562 && (VIsual_mode != wp->w_old_visual_mode | |
| 1563 || type == INVERTED_ALL)) | |
| 1564 { | |
| 1565 /* | |
| 1566 * If the type of Visual selection changed, redraw the whole | |
| 1567 * selection. Also when the ownership of the X selection is | |
| 1568 * gained or lost. | |
| 1569 */ | |
| 1570 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1571 { | |
| 1572 from = curwin->w_cursor.lnum; | |
| 1573 to = VIsual.lnum; | |
| 1574 } | |
| 1575 else | |
| 1576 { | |
| 1577 from = VIsual.lnum; | |
| 1578 to = curwin->w_cursor.lnum; | |
| 1579 } | |
| 1580 /* redraw more when the cursor moved as well */ | |
| 1581 if (wp->w_old_cursor_lnum < from) | |
| 1582 from = wp->w_old_cursor_lnum; | |
| 1583 if (wp->w_old_cursor_lnum > to) | |
| 1584 to = wp->w_old_cursor_lnum; | |
| 1585 if (wp->w_old_visual_lnum < from) | |
| 1586 from = wp->w_old_visual_lnum; | |
| 1587 if (wp->w_old_visual_lnum > to) | |
| 1588 to = wp->w_old_visual_lnum; | |
| 1589 } | |
| 1590 else | |
| 1591 { | |
| 1592 /* | |
| 1593 * Find the line numbers that need to be updated: The lines | |
| 1594 * between the old cursor position and the current cursor | |
| 1595 * position. Also check if the Visual position changed. | |
| 1596 */ | |
| 1597 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1598 { | |
| 1599 from = curwin->w_cursor.lnum; | |
| 1600 to = wp->w_old_cursor_lnum; | |
| 1601 } | |
| 1602 else | |
| 1603 { | |
| 1604 from = wp->w_old_cursor_lnum; | |
| 1605 to = curwin->w_cursor.lnum; | |
| 1606 if (from == 0) /* Visual mode just started */ | |
| 1607 from = to; | |
| 1608 } | |
| 1609 | |
| 422 | 1610 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1611 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1612 { |
| 1613 if (wp->w_old_visual_lnum < from | |
| 1614 && wp->w_old_visual_lnum != 0) | |
| 1615 from = wp->w_old_visual_lnum; | |
| 1616 if (wp->w_old_visual_lnum > to) | |
| 1617 to = wp->w_old_visual_lnum; | |
| 1618 if (VIsual.lnum < from) | |
| 1619 from = VIsual.lnum; | |
| 1620 if (VIsual.lnum > to) | |
| 1621 to = VIsual.lnum; | |
| 1622 } | |
| 1623 } | |
| 1624 | |
| 1625 /* | |
| 1626 * If in block mode and changed column or curwin->w_curswant: | |
| 1627 * update all lines. | |
| 1628 * First compute the actual start and end column. | |
| 1629 */ | |
| 1630 if (VIsual_mode == Ctrl_V) | |
| 1631 { | |
| 6266 | 1632 colnr_T fromc, toc; |
| 1633 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) | |
| 1634 int save_ve_flags = ve_flags; | |
| 1635 | |
| 1636 if (curwin->w_p_lbr) | |
| 1637 ve_flags = VE_ALL; | |
| 1638 #endif | |
| 7 | 1639 getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); |
| 6266 | 1640 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) |
| 1641 ve_flags = save_ve_flags; | |
| 1642 #endif | |
| 7 | 1643 ++toc; |
| 1644 if (curwin->w_curswant == MAXCOL) | |
| 1645 toc = MAXCOL; | |
| 1646 | |
| 1647 if (fromc != wp->w_old_cursor_fcol | |
| 1648 || toc != wp->w_old_cursor_lcol) | |
| 1649 { | |
| 1650 if (from > VIsual.lnum) | |
| 1651 from = VIsual.lnum; | |
| 1652 if (to < VIsual.lnum) | |
| 1653 to = VIsual.lnum; | |
| 1654 } | |
| 1655 wp->w_old_cursor_fcol = fromc; | |
| 1656 wp->w_old_cursor_lcol = toc; | |
| 1657 } | |
| 1658 } | |
| 1659 else | |
| 1660 { | |
| 1661 /* Use the line numbers of the old Visual area. */ | |
| 1662 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1663 { | |
| 1664 from = wp->w_old_cursor_lnum; | |
| 1665 to = wp->w_old_visual_lnum; | |
| 1666 } | |
| 1667 else | |
| 1668 { | |
| 1669 from = wp->w_old_visual_lnum; | |
| 1670 to = wp->w_old_cursor_lnum; | |
| 1671 } | |
| 1672 } | |
| 1673 | |
| 1674 /* | |
| 1675 * There is no need to update lines above the top of the window. | |
| 1676 */ | |
| 1677 if (from < wp->w_topline) | |
| 1678 from = wp->w_topline; | |
| 1679 | |
| 1680 /* | |
| 1681 * If we know the value of w_botline, use it to restrict the update to | |
| 1682 * the lines that are visible in the window. | |
| 1683 */ | |
| 1684 if (wp->w_valid & VALID_BOTLINE) | |
| 1685 { | |
| 1686 if (from >= wp->w_botline) | |
| 1687 from = wp->w_botline - 1; | |
| 1688 if (to >= wp->w_botline) | |
| 1689 to = wp->w_botline - 1; | |
| 1690 } | |
| 1691 | |
| 1692 /* | |
| 1693 * Find the minimal part to be updated. | |
| 1694 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1695 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1696 * top_end; need to redraw from top_end to the "to" line. | |
| 1697 * A middle mouse click with a Visual selection may change the text | |
| 1698 * above the Visual area and reset wl_valid, do count these for | |
| 1699 * mid_end (in srow). | |
| 1700 */ | |
| 1701 if (mid_start > 0) | |
| 1702 { | |
| 1703 lnum = wp->w_topline; | |
| 1704 idx = 0; | |
| 1705 srow = 0; | |
| 1706 if (scrolled_down) | |
| 1707 mid_start = top_end; | |
| 1708 else | |
| 1709 mid_start = 0; | |
| 1710 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1711 { | |
| 1712 if (wp->w_lines[idx].wl_valid) | |
| 1713 mid_start += wp->w_lines[idx].wl_size; | |
| 1714 else if (!scrolled_down) | |
| 1715 srow += wp->w_lines[idx].wl_size; | |
| 1716 ++idx; | |
| 1717 # ifdef FEAT_FOLDING | |
| 1718 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1719 lnum = wp->w_lines[idx].wl_lnum; | |
| 1720 else | |
| 1721 # endif | |
| 1722 ++lnum; | |
| 1723 } | |
| 1724 srow += mid_start; | |
| 1725 mid_end = wp->w_height; | |
| 1726 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1727 { | |
| 1728 if (wp->w_lines[idx].wl_valid | |
| 1729 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1730 { | |
| 1731 /* Only update until first row of this line */ | |
| 1732 mid_end = srow; | |
| 1733 break; | |
| 1734 } | |
| 1735 srow += wp->w_lines[idx].wl_size; | |
| 1736 } | |
| 1737 } | |
| 1738 } | |
| 1739 | |
| 1740 if (VIsual_active && buf == curwin->w_buffer) | |
| 1741 { | |
| 1742 wp->w_old_visual_mode = VIsual_mode; | |
| 1743 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1744 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1745 wp->w_old_visual_col = VIsual.col; |
| 7 | 1746 wp->w_old_curswant = curwin->w_curswant; |
| 1747 } | |
| 1748 else | |
| 1749 { | |
| 1750 wp->w_old_visual_mode = 0; | |
| 1751 wp->w_old_cursor_lnum = 0; | |
| 1752 wp->w_old_visual_lnum = 0; | |
| 422 | 1753 wp->w_old_visual_col = 0; |
| 7 | 1754 } |
| 1755 | |
| 1756 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1757 /* reset got_int, otherwise regexp won't work */ | |
| 1758 save_got_int = got_int; | |
| 1759 got_int = 0; | |
| 1760 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1761 #ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1762 /* Set the time limit to 'redrawtime'. */ |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1763 profile_setlimit(p_rdt, &syntax_tm); |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
1764 syn_set_timeout(&syntax_tm); |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1765 #endif |
| 7 | 1766 #ifdef FEAT_FOLDING |
| 1767 win_foldinfo.fi_level = 0; | |
| 1768 #endif | |
| 1769 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1770 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1771 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1772 * Draw the window toolbar, if there is one. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1773 * TODO: only when needed. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1774 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1775 if (winbar_height(wp) > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1776 redraw_win_toolbar(wp); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1777 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1778 |
| 7 | 1779 /* |
| 1780 * Update all the window rows. | |
| 1781 */ | |
| 1782 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1783 row = 0; | |
| 1784 srow = 0; | |
| 1785 lnum = wp->w_topline; /* first line shown in window */ | |
| 1786 for (;;) | |
| 1787 { | |
| 1788 /* stop updating when reached the end of the window (check for _past_ | |
| 1789 * the end of the window is at the end of the loop) */ | |
| 1790 if (row == wp->w_height) | |
| 1791 { | |
| 1792 didline = TRUE; | |
| 1793 break; | |
| 1794 } | |
| 1795 | |
| 1796 /* stop updating when hit the end of the file */ | |
| 1797 if (lnum > buf->b_ml.ml_line_count) | |
| 1798 { | |
| 1799 eof = TRUE; | |
| 1800 break; | |
| 1801 } | |
| 1802 | |
| 1803 /* Remember the starting row of the line that is going to be dealt | |
| 1804 * with. It is used further down when the line doesn't fit. */ | |
| 1805 srow = row; | |
| 1806 | |
| 1807 /* | |
| 1808 * Update a line when it is in an area that needs updating, when it | |
| 1809 * has changes or w_lines[idx] is invalid. | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
1810 * "bot_start" may be halfway a wrapped line after using |
| 7 | 1811 * win_del_lines(), check if the current line includes it. |
| 1812 * When syntax folding is being used, the saved syntax states will | |
| 1813 * already have been updated, we can't see where the syntax state is | |
| 1814 * the same again, just update until the end of the window. | |
| 1815 */ | |
| 1816 if (row < top_end | |
| 1817 || (row >= mid_start && row < mid_end) | |
| 1818 #ifdef FEAT_SEARCH_EXTRA | |
| 1819 || top_to_mod | |
| 1820 #endif | |
| 1821 || idx >= wp->w_lines_valid | |
| 1822 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1823 || (mod_top != 0 | |
| 1824 && (lnum == mod_top | |
| 1825 || (lnum >= mod_top | |
| 1826 && (lnum < mod_bot | |
| 1827 #ifdef FEAT_SYN_HL | |
| 1828 || did_update == DID_FOLD | |
| 1829 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1830 && syntax_present(wp) |
| 7 | 1831 && ( |
| 1832 # ifdef FEAT_FOLDING | |
| 1833 (foldmethodIsSyntax(wp) | |
| 1834 && hasAnyFolding(wp)) || | |
| 1835 # endif | |
| 1836 syntax_check_changed(lnum))) | |
| 1837 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1838 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1839 /* match in fixed position might need redraw |
| 1840 * if lines were inserted or deleted */ | |
| 1841 || (wp->w_match_head != NULL | |
| 1842 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1843 #endif |
| 7 | 1844 ))))) |
| 1845 { | |
| 1846 #ifdef FEAT_SEARCH_EXTRA | |
| 1847 if (lnum == mod_top) | |
| 1848 top_to_mod = FALSE; | |
| 1849 #endif | |
| 1850 | |
| 1851 /* | |
| 1852 * When at start of changed lines: May scroll following lines | |
| 1853 * up or down to minimize redrawing. | |
| 1854 * Don't do this when the change continues until the end. | |
| 3318 | 1855 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1856 */ |
| 1857 if (lnum == mod_top | |
| 1858 && mod_bot != MAXLNUM | |
| 3318 | 1859 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1860 { |
| 1861 int old_rows = 0; | |
| 1862 int new_rows = 0; | |
| 1863 int xtra_rows; | |
| 1864 linenr_T l; | |
| 1865 | |
| 1866 /* Count the old number of window rows, using w_lines[], which | |
| 1867 * should still contain the sizes for the lines as they are | |
| 1868 * currently displayed. */ | |
| 1869 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1870 { | |
| 1871 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1872 * lines are part of the changed area. */ | |
| 1873 if (wp->w_lines[i].wl_valid | |
| 1874 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1875 break; | |
| 1876 old_rows += wp->w_lines[i].wl_size; | |
| 1877 #ifdef FEAT_FOLDING | |
| 1878 if (wp->w_lines[i].wl_valid | |
| 1879 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1880 { | |
| 1881 /* Must have found the last valid entry above mod_bot. | |
| 1882 * Add following invalid entries. */ | |
| 1883 ++i; | |
| 1884 while (i < wp->w_lines_valid | |
| 1885 && !wp->w_lines[i].wl_valid) | |
| 1886 old_rows += wp->w_lines[i++].wl_size; | |
| 1887 break; | |
| 1888 } | |
| 1889 #endif | |
| 1890 } | |
| 1891 | |
| 1892 if (i >= wp->w_lines_valid) | |
| 1893 { | |
| 1894 /* We can't find a valid line below the changed lines, | |
| 1895 * need to redraw until the end of the window. | |
| 1896 * Inserting/deleting lines has no use. */ | |
| 1897 bot_start = 0; | |
| 1898 } | |
| 1899 else | |
| 1900 { | |
| 1901 /* Able to count old number of rows: Count new window | |
| 1902 * rows, and may insert/delete lines */ | |
| 1903 j = idx; | |
| 1904 for (l = lnum; l < mod_bot; ++l) | |
| 1905 { | |
| 1906 #ifdef FEAT_FOLDING | |
| 1907 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1908 ++new_rows; | |
| 1909 else | |
| 1910 #endif | |
| 1911 #ifdef FEAT_DIFF | |
| 1912 if (l == wp->w_topline) | |
| 1913 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1914 + wp->w_topfill; | |
| 1915 else | |
| 1916 #endif | |
| 1917 new_rows += plines_win(wp, l, TRUE); | |
| 1918 ++j; | |
| 1919 if (new_rows > wp->w_height - row - 2) | |
| 1920 { | |
| 1921 /* it's getting too much, must redraw the rest */ | |
| 1922 new_rows = 9999; | |
| 1923 break; | |
| 1924 } | |
| 1925 } | |
| 1926 xtra_rows = new_rows - old_rows; | |
| 1927 if (xtra_rows < 0) | |
| 1928 { | |
| 1929 /* May scroll text up. If there is not enough | |
| 1930 * remaining text or scrolling fails, must redraw the | |
| 1931 * rest. If scrolling works, must redraw the text | |
| 1932 * below the scrolled text. */ | |
| 1933 if (row - xtra_rows >= wp->w_height - 2) | |
| 1934 mod_bot = MAXLNUM; | |
| 1935 else | |
| 1936 { | |
| 1937 check_for_delay(FALSE); | |
| 1938 if (win_del_lines(wp, row, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
1939 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 1940 mod_bot = MAXLNUM; |
| 1941 else | |
| 1942 bot_start = wp->w_height + xtra_rows; | |
| 1943 } | |
| 1944 } | |
| 1945 else if (xtra_rows > 0) | |
| 1946 { | |
| 1947 /* May scroll text down. If there is not enough | |
| 1948 * remaining text of scrolling fails, must redraw the | |
| 1949 * rest. */ | |
| 1950 if (row + xtra_rows >= wp->w_height - 2) | |
| 1951 mod_bot = MAXLNUM; | |
| 1952 else | |
| 1953 { | |
| 1954 check_for_delay(FALSE); | |
| 1955 if (win_ins_lines(wp, row + old_rows, | |
| 1956 xtra_rows, FALSE, FALSE) == FAIL) | |
| 1957 mod_bot = MAXLNUM; | |
| 1958 else if (top_end > row + old_rows) | |
| 1959 /* Scrolled the part at the top that requires | |
| 1960 * updating down. */ | |
| 1961 top_end += xtra_rows; | |
| 1962 } | |
| 1963 } | |
| 1964 | |
| 1965 /* When not updating the rest, may need to move w_lines[] | |
| 1966 * entries. */ | |
| 1967 if (mod_bot != MAXLNUM && i != j) | |
| 1968 { | |
| 1969 if (j < i) | |
| 1970 { | |
| 1971 int x = row + new_rows; | |
| 1972 | |
| 1973 /* move entries in w_lines[] upwards */ | |
| 1974 for (;;) | |
| 1975 { | |
| 1976 /* stop at last valid entry in w_lines[] */ | |
| 1977 if (i >= wp->w_lines_valid) | |
| 1978 { | |
| 1979 wp->w_lines_valid = j; | |
| 1980 break; | |
| 1981 } | |
| 1982 wp->w_lines[j] = wp->w_lines[i]; | |
| 1983 /* stop at a line that won't fit */ | |
| 1984 if (x + (int)wp->w_lines[j].wl_size | |
| 1985 > wp->w_height) | |
| 1986 { | |
| 1987 wp->w_lines_valid = j + 1; | |
| 1988 break; | |
| 1989 } | |
| 1990 x += wp->w_lines[j++].wl_size; | |
| 1991 ++i; | |
| 1992 } | |
| 1993 if (bot_start > x) | |
| 1994 bot_start = x; | |
| 1995 } | |
| 1996 else /* j > i */ | |
| 1997 { | |
| 1998 /* move entries in w_lines[] downwards */ | |
| 1999 j -= i; | |
| 2000 wp->w_lines_valid += j; | |
| 2001 if (wp->w_lines_valid > wp->w_height) | |
| 2002 wp->w_lines_valid = wp->w_height; | |
| 2003 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2004 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2005 | |
| 2006 /* The w_lines[] entries for inserted lines are | |
| 2007 * now invalid, but wl_size may be used above. | |
| 2008 * Reset to zero. */ | |
| 2009 while (i >= idx) | |
| 2010 { | |
| 2011 wp->w_lines[i].wl_size = 0; | |
| 2012 wp->w_lines[i--].wl_valid = FALSE; | |
| 2013 } | |
| 2014 } | |
| 2015 } | |
| 2016 } | |
| 2017 } | |
| 2018 | |
| 2019 #ifdef FEAT_FOLDING | |
| 2020 /* | |
| 2021 * When lines are folded, display one line for all of them. | |
| 2022 * Otherwise, display normally (can be several display lines when | |
| 2023 * 'wrap' is on). | |
| 2024 */ | |
| 2025 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2026 if (fold_count != 0) | |
| 2027 { | |
| 2028 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2029 ++row; | |
| 2030 --fold_count; | |
| 2031 wp->w_lines[idx].wl_folded = TRUE; | |
| 2032 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2033 # ifdef FEAT_SYN_HL | |
| 2034 did_update = DID_FOLD; | |
| 2035 # endif | |
| 2036 } | |
| 2037 else | |
| 2038 #endif | |
| 2039 if (idx < wp->w_lines_valid | |
| 2040 && wp->w_lines[idx].wl_valid | |
| 2041 && wp->w_lines[idx].wl_lnum == lnum | |
| 2042 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2043 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
| 7 | 2044 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2045 #ifdef FEAT_DIFF | |
| 2046 && diff_check_fill(wp, lnum) == 0 | |
| 2047 #endif | |
| 2048 ) | |
| 2049 { | |
| 2050 /* This line is not going to fit. Don't draw anything here, | |
| 2051 * will draw "@ " lines below. */ | |
| 2052 row = wp->w_height + 1; | |
| 2053 } | |
| 2054 else | |
| 2055 { | |
| 2056 #ifdef FEAT_SEARCH_EXTRA | |
| 2057 prepare_search_hl(wp, lnum); | |
| 2058 #endif | |
| 2059 #ifdef FEAT_SYN_HL | |
| 2060 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2061 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
|
2062 && syntax_present(wp)) |
| 7 | 2063 syntax_end_parsing(syntax_last_parsed + 1); |
| 2064 #endif | |
| 2065 | |
| 2066 /* | |
| 2067 * Display one line. | |
| 2068 */ | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2069 row = win_line(wp, lnum, srow, wp->w_height, |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2070 mod_top == 0, FALSE); |
| 7 | 2071 |
| 2072 #ifdef FEAT_FOLDING | |
| 2073 wp->w_lines[idx].wl_folded = FALSE; | |
| 2074 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2075 #endif | |
| 2076 #ifdef FEAT_SYN_HL | |
| 2077 did_update = DID_LINE; | |
| 2078 syntax_last_parsed = lnum; | |
| 2079 #endif | |
| 2080 } | |
| 2081 | |
| 2082 wp->w_lines[idx].wl_lnum = lnum; | |
| 2083 wp->w_lines[idx].wl_valid = TRUE; | |
|
12700
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2084 |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2085 /* Past end of the window or end of the screen. Note that after |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2086 * resizing wp->w_height may be end up too big. That's a problem |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2087 * elsewhere, but prevent a crash here. */ |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2088 if (row > wp->w_height || row + wp->w_winrow >= Rows) |
| 7 | 2089 { |
| 2090 /* we may need the size of that too long line later on */ | |
| 3318 | 2091 if (dollar_vcol == -1) |
| 7 | 2092 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2093 ++idx; | |
| 2094 break; | |
| 2095 } | |
| 3318 | 2096 if (dollar_vcol == -1) |
| 7 | 2097 wp->w_lines[idx].wl_size = row - srow; |
| 2098 ++idx; | |
| 2099 #ifdef FEAT_FOLDING | |
| 2100 lnum += fold_count + 1; | |
| 2101 #else | |
| 2102 ++lnum; | |
| 2103 #endif | |
| 2104 } | |
| 2105 else | |
| 2106 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2107 if (wp->w_p_rnu) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2108 { |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2109 #ifdef FEAT_FOLDING |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2110 // 'relativenumber' set: The text doesn't need to be drawn, but |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2111 // the number column nearly always does. |
|
14875
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2112 fold_count = foldedCount(wp, lnum, &win_foldinfo); |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2113 if (fold_count != 0) |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2114 fold_line(wp, fold_count, &win_foldinfo, lnum, row); |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2115 else |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2116 #endif |
|
14875
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2117 (void)win_line(wp, lnum, srow, wp->w_height, TRUE, TRUE); |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2118 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2119 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2120 // This line does not need to be drawn, advance to the next one. |
| 7 | 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 | |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2144 #ifdef FEAT_VTP |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2145 /* Rewrite the character at the end of the screen line. */ |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2146 if (use_vtp()) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2147 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2148 int i; |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2149 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2150 for (i = 0; i < Rows; ++i) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2151 # ifdef FEAT_MBYTE |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2152 if (enc_utf8) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2153 if ((*mb_off2cells)(LineOffset[i] + Columns - 2, |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2154 LineOffset[i] + screen_Columns) > 1) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2155 screen_draw_rectangle(i, Columns - 2, 1, 2, FALSE); |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2156 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2157 screen_draw_rectangle(i, Columns - 1, 1, 1, FALSE); |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2158 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2159 # endif |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2160 screen_char(LineOffset[i] + Columns - 1, i, Columns - 1); |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2161 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2162 #endif |
| 7 | 2163 |
| 2164 if (idx > wp->w_lines_valid) | |
| 2165 wp->w_lines_valid = idx; | |
| 2166 | |
| 2167 #ifdef FEAT_SYN_HL | |
| 2168 /* | |
| 2169 * Let the syntax stuff know we stop parsing here. | |
| 2170 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2171 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2172 syntax_end_parsing(syntax_last_parsed + 1); |
| 2173 #endif | |
| 2174 | |
| 2175 /* | |
| 2176 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2177 * line we were working on, then the line didn't fit. | |
| 2178 */ | |
| 2179 wp->w_empty_rows = 0; | |
| 2180 #ifdef FEAT_DIFF | |
| 2181 wp->w_filler_rows = 0; | |
| 2182 #endif | |
| 2183 if (!eof && !didline) | |
| 2184 { | |
| 2185 if (lnum == wp->w_topline) | |
| 2186 { | |
| 2187 /* | |
| 2188 * Single line that does not fit! | |
| 2189 * Don't overwrite it, it can be edited. | |
| 2190 */ | |
| 2191 wp->w_botline = lnum + 1; | |
| 2192 } | |
| 2193 #ifdef FEAT_DIFF | |
| 2194 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2195 { | |
| 2196 /* Window ends in filler lines. */ | |
| 2197 wp->w_botline = lnum; | |
| 2198 wp->w_filler_rows = wp->w_height - srow; | |
| 2199 } | |
| 2200 #endif | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2201 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
|
2202 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2203 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
|
2204 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2205 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2206 * 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
|
2207 */ |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2208 screen_puts_len((char_u *)"@@", 2, scr_row, wp->w_wincol, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2209 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2210 screen_fill(scr_row, scr_row + 1, |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2211 (int)wp->w_wincol + 2, (int)W_ENDCOL(wp), |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2212 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2213 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2214 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2215 } |
| 7 | 2216 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2217 { | |
| 2218 /* | |
| 2219 * Last line isn't finished: Display "@@@" at the end. | |
| 2220 */ | |
| 2221 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2222 W_WINROW(wp) + wp->w_height, | |
| 2223 (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
|
2224 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2225 set_empty_rows(wp, srow); |
| 2226 wp->w_botline = lnum; | |
| 2227 } | |
| 2228 else | |
| 2229 { | |
| 2230 win_draw_end(wp, '@', ' ', srow, wp->w_height, HLF_AT); | |
| 2231 wp->w_botline = lnum; | |
| 2232 } | |
| 2233 } | |
| 2234 else | |
| 2235 { | |
| 2236 draw_vsep_win(wp, row); | |
| 2237 if (eof) /* we hit the end of the file */ | |
| 2238 { | |
| 2239 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2240 #ifdef FEAT_DIFF | |
| 2241 j = diff_check_fill(wp, wp->w_botline); | |
| 2242 if (j > 0 && !wp->w_botfill) | |
| 2243 { | |
| 2244 /* | |
| 2245 * Display filler lines at the end of the file | |
| 2246 */ | |
| 2247 if (char2cells(fill_diff) > 1) | |
| 2248 i = '-'; | |
| 2249 else | |
| 2250 i = fill_diff; | |
| 2251 if (row + j > wp->w_height) | |
| 2252 j = wp->w_height - row; | |
| 2253 win_draw_end(wp, i, i, row, row + (int)j, HLF_DED); | |
| 2254 row += j; | |
| 2255 } | |
| 2256 #endif | |
| 2257 } | |
| 3318 | 2258 else if (dollar_vcol == -1) |
| 7 | 2259 wp->w_botline = lnum; |
| 2260 | |
| 2261 /* make sure the rest of the screen is blank */ | |
| 2262 /* 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
|
2263 win_draw_end(wp, '~', ' ', row, wp->w_height, HLF_EOB); |
| 7 | 2264 } |
| 2265 | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2266 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2267 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2268 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2269 |
| 7 | 2270 /* Reset the type of redrawing required, the window has been updated. */ |
| 2271 wp->w_redr_type = 0; | |
| 2272 #ifdef FEAT_DIFF | |
| 2273 wp->w_old_topfill = wp->w_topfill; | |
| 2274 wp->w_old_botfill = wp->w_botfill; | |
| 2275 #endif | |
| 2276 | |
| 3318 | 2277 if (dollar_vcol == -1) |
| 7 | 2278 { |
| 2279 /* | |
| 2280 * There is a trick with w_botline. If we invalidate it on each | |
| 2281 * change that might modify it, this will cause a lot of expensive | |
| 2282 * calls to plines() in update_topline() each time. Therefore the | |
| 2283 * value of w_botline is often approximated, and this value is used to | |
| 2284 * compute the value of w_topline. If the value of w_botline was | |
| 2285 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2286 * the visible part of the text). If it's not, we need to redraw | |
| 2287 * again. Mostly this just means scrolling up a few lines, so it | |
| 2288 * doesn't look too bad. Only do this for the current window (where | |
| 2289 * changes are relevant). | |
| 2290 */ | |
| 2291 wp->w_valid |= VALID_BOTLINE; | |
| 2292 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2293 { | |
| 2294 recursive = TRUE; | |
| 2295 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2296 update_topline(); /* may invalidate w_botline again */ | |
| 2297 if (must_redraw != 0) | |
| 2298 { | |
| 2299 /* Don't update for changes in buffer again. */ | |
| 2300 i = curbuf->b_mod_set; | |
| 2301 curbuf->b_mod_set = FALSE; | |
| 2302 win_update(curwin); | |
| 2303 must_redraw = 0; | |
| 2304 curbuf->b_mod_set = i; | |
| 2305 } | |
| 2306 recursive = FALSE; | |
| 2307 } | |
| 2308 } | |
| 2309 | |
| 2310 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2311 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2312 if (!got_int) | |
| 2313 got_int = save_got_int; | |
| 2314 #endif | |
| 2315 } | |
| 2316 | |
| 2317 /* | |
| 2318 * Clear the rest of the window and mark the unused lines with "c1". use "c2" | |
| 2319 * as the filler character. | |
| 2320 */ | |
| 2321 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2322 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2323 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2324 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2325 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2326 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2327 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2328 hlf_T hl) |
| 7 | 2329 { |
| 2330 #if defined(FEAT_FOLDING) || defined(FEAT_SIGNS) || defined(FEAT_CMDWIN) | |
| 2331 int n = 0; | |
| 2332 # define FDC_OFF n | |
| 2333 #else | |
| 2334 # define FDC_OFF 0 | |
| 2335 #endif | |
| 6553 | 2336 #ifdef FEAT_FOLDING |
| 2337 int fdc = compute_foldcolumn(wp, 0); | |
| 2338 #endif | |
| 7 | 2339 |
| 2340 #ifdef FEAT_RIGHTLEFT | |
| 2341 if (wp->w_p_rl) | |
| 2342 { | |
| 2343 /* No check for cmdline window: should never be right-left. */ | |
| 2344 # ifdef FEAT_FOLDING | |
| 6553 | 2345 n = fdc; |
| 7 | 2346 |
| 2347 if (n > 0) | |
| 2348 { | |
| 2349 /* draw the fold column at the right */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2350 if (n > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2351 n = wp->w_width; |
| 7 | 2352 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2353 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
|
2354 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2355 } |
| 2356 # endif | |
| 2357 # ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2358 if (signcolumn_on(wp)) |
| 7 | 2359 { |
| 2360 int nn = n + 2; | |
| 2361 | |
| 2362 /* draw the sign column left of the fold column */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2363 if (nn > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2364 nn = wp->w_width; |
| 7 | 2365 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2366 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
|
2367 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2368 n = nn; |
| 2369 } | |
| 2370 # endif | |
| 2371 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2372 wp->w_wincol, W_ENDCOL(wp) - 1 - FDC_OFF, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2373 c2, c2, HL_ATTR(hl)); |
| 7 | 2374 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2375 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
|
2376 c1, c2, HL_ATTR(hl)); |
| 7 | 2377 } |
| 2378 else | |
| 2379 #endif | |
| 2380 { | |
| 2381 #ifdef FEAT_CMDWIN | |
| 2382 if (cmdwin_type != 0 && wp == curwin) | |
| 2383 { | |
| 2384 /* draw the cmdline character in the leftmost column */ | |
| 2385 n = 1; | |
| 2386 if (n > wp->w_width) | |
| 2387 n = wp->w_width; | |
| 2388 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2389 wp->w_wincol, (int)wp->w_wincol + n, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2390 cmdwin_type, ' ', HL_ATTR(HLF_AT)); |
| 7 | 2391 } |
| 2392 #endif | |
| 2393 #ifdef FEAT_FOLDING | |
| 6553 | 2394 if (fdc > 0) |
| 2395 { | |
| 2396 int nn = n + fdc; | |
| 7 | 2397 |
| 2398 /* draw the fold column at the left */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2399 if (nn > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2400 nn = wp->w_width; |
| 7 | 2401 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2402 wp->w_wincol + n, (int)wp->w_wincol + nn, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2403 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2404 n = nn; |
| 2405 } | |
| 2406 #endif | |
| 2407 #ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2408 if (signcolumn_on(wp)) |
| 7 | 2409 { |
| 2410 int nn = n + 2; | |
| 2411 | |
| 2412 /* draw the sign column after the fold column */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2413 if (nn > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2414 nn = wp->w_width; |
| 7 | 2415 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2416 wp->w_wincol + n, (int)wp->w_wincol + nn, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2417 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2418 n = nn; |
| 2419 } | |
| 2420 #endif | |
| 2421 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2422 wp->w_wincol + 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
|
2423 c1, c2, HL_ATTR(hl)); |
| 7 | 2424 } |
| 2425 set_empty_rows(wp, row); | |
| 2426 } | |
| 2427 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2428 #ifdef FEAT_SYN_HL |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2429 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2430 * 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
|
2431 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2432 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2433 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
|
2434 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2435 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2436 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2437 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2438 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2439 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2440 |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2441 #if defined(FEAT_MENU) || defined(FEAT_FOLDING) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2442 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2443 * Copy "text" to ScreenLines using "attr". |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2444 * Returns the next screen column. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2445 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2446 static int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2447 text_to_screenline(win_T *wp, char_u *text, int col) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2448 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2449 int off = (int)(current_ScreenLine - ScreenLines); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2450 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2451 #ifdef FEAT_MBYTE |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2452 if (has_mbyte) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2453 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2454 int cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2455 int u8c, u8cc[MAX_MCO]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2456 int i; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2457 int idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2458 int c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2459 char_u *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2460 # ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2461 int prev_c = 0; /* previous Arabic character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2462 int prev_c1 = 0; /* first composing char for prev_c */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2463 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2464 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2465 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2466 if (wp->w_p_rl) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2467 idx = off; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2468 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2469 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2470 idx = off + col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2471 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2472 /* Store multibyte characters in ScreenLines[] et al. correctly. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2473 for (p = text; *p != NUL; ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2474 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2475 cells = (*mb_ptr2cells)(p); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2476 c_len = (*mb_ptr2len)(p); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2477 if (col + cells > wp->w_width |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2478 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2479 - (wp->w_p_rl ? col : 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2480 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2481 ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2482 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2483 ScreenLines[idx] = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2484 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2485 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2486 u8c = utfc_ptr2char(p, u8cc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2487 if (*p < 0x80 && u8cc[0] == 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2488 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2489 ScreenLinesUC[idx] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2490 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2491 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2492 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2493 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2494 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2495 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2496 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2497 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2498 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2499 /* Do Arabic shaping. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2500 int pc, pc1, nc; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2501 int pcc[MAX_MCO]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2502 int firstbyte = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2503 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2504 /* The idea of what is the previous and next |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2505 * character depends on 'rightleft'. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2506 if (wp->w_p_rl) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2507 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2508 pc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2509 pc1 = prev_c1; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2510 nc = utf_ptr2char(p + c_len); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2511 prev_c1 = u8cc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2512 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2513 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2514 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2515 pc = utfc_ptr2char(p + c_len, pcc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2516 nc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2517 pc1 = pcc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2518 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2519 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2520 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2521 u8c = arabic_shape(u8c, &firstbyte, &u8cc[0], |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2522 pc, pc1, nc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2523 ScreenLines[idx] = firstbyte; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2524 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2525 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2526 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2527 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2528 /* Non-BMP character: display as ? or fullwidth ?. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2529 #ifdef UNICODE16 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2530 if (u8c >= 0x10000) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2531 ScreenLinesUC[idx] = (cells == 2) ? 0xff1f : (int)'?'; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2532 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2533 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2534 ScreenLinesUC[idx] = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2535 for (i = 0; i < Screen_mco; ++i) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2536 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2537 ScreenLinesC[i][idx] = u8cc[i]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2538 if (u8cc[i] == 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2539 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2540 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2541 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2542 if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2543 ScreenLines[idx + 1] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2544 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2545 else if (enc_dbcs == DBCS_JPNU && *p == 0x8e) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2546 /* double-byte single width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2547 ScreenLines2[idx] = p[1]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2548 else if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2549 /* double-width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2550 ScreenLines[idx + 1] = p[1]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2551 col += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2552 idx += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2553 p += c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2554 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2555 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2556 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2557 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2558 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2559 int len = (int)STRLEN(text); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2560 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2561 if (len > wp->w_width - col) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2562 len = wp->w_width - col; |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2563 if (len > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2564 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2565 #ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2566 if (wp->w_p_rl) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2567 STRNCPY(current_ScreenLine, text, len); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2568 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2569 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2570 STRNCPY(current_ScreenLine + col, text, len); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2571 col += len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2572 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2573 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2574 return col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2575 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2576 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2577 |
| 7 | 2578 #ifdef FEAT_FOLDING |
| 2579 /* | |
| 6553 | 2580 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2581 * space is available for window "wp", minus "col". | |
| 2582 */ | |
| 2583 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2584 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2585 { |
| 2586 int fdc = wp->w_p_fdc; | |
| 2587 int wmw = wp == curwin && p_wmw == 0 ? 1 : p_wmw; | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2588 int wwidth = wp->w_width; |
| 6553 | 2589 |
| 2590 if (fdc > wwidth - (col + wmw)) | |
| 2591 fdc = wwidth - (col + wmw); | |
| 2592 return fdc; | |
| 2593 } | |
| 2594 | |
| 2595 /* | |
| 7 | 2596 * Display one folded line. |
| 2597 */ | |
| 2598 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2599 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2600 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2601 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2602 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2603 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2604 int row) |
| 7 | 2605 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2606 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2607 pos_T *top, *bot; |
| 2608 linenr_T lnume = lnum + fold_count - 1; | |
| 2609 int len; | |
| 29 | 2610 char_u *text; |
| 7 | 2611 int fdc; |
| 2612 int col; | |
| 2613 int txtcol; | |
| 2614 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2615 int ri; |
| 7 | 2616 |
| 2617 /* Build the fold line: | |
| 2618 * 1. Add the cmdwin_type for the command-line window | |
| 2619 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2620 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2621 * 4. Compose the text |
| 2622 * 5. Add the text | |
| 2623 * 6. set highlighting for the Visual area an other text | |
| 2624 */ | |
| 2625 col = 0; | |
| 2626 | |
| 2627 /* | |
| 2628 * 1. Add the cmdwin_type for the command-line window | |
| 2629 * Ignores 'rightleft', this window is never right-left. | |
| 2630 */ | |
| 2631 #ifdef FEAT_CMDWIN | |
| 2632 if (cmdwin_type != 0 && wp == curwin) | |
| 2633 { | |
| 2634 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
|
2635 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2636 #ifdef FEAT_MBYTE |
| 2637 if (enc_utf8) | |
| 2638 ScreenLinesUC[off] = 0; | |
| 2639 #endif | |
| 2640 ++col; | |
| 2641 } | |
| 2642 #endif | |
| 2643 | |
| 2644 /* | |
| 2645 * 2. Add the 'foldcolumn' | |
| 6553 | 2646 * Reduce the width when there is not enough space. |
| 7 | 2647 */ |
| 6553 | 2648 fdc = compute_foldcolumn(wp, col); |
| 7 | 2649 if (fdc > 0) |
| 2650 { | |
| 2651 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2652 #ifdef FEAT_RIGHTLEFT | |
| 2653 if (wp->w_p_rl) | |
| 2654 { | |
| 2655 int i; | |
| 2656 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2657 copy_text_attr(off + wp->w_width - fdc - col, buf, fdc, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2658 HL_ATTR(HLF_FC)); |
| 7 | 2659 /* reverse the fold column */ |
| 2660 for (i = 0; i < fdc; ++i) | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2661 ScreenLines[off + wp->w_width - i - 1 - col] = buf[i]; |
| 7 | 2662 } |
| 2663 else | |
| 2664 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2665 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2666 col += fdc; |
| 2667 } | |
| 2668 | |
| 2669 #ifdef FEAT_RIGHTLEFT | |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2670 # define RL_MEMSET(p, v, l) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2671 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2672 if (wp->w_p_rl) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2673 for (ri = 0; ri < l; ++ri) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2674 ScreenAttrs[off + (wp->w_width - (p) - (l)) + ri] = v; \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2675 else \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2676 for (ri = 0; ri < l; ++ri) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2677 ScreenAttrs[off + (p) + ri] = v; \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2678 } while (0) |
| 7 | 2679 #else |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2680 # define RL_MEMSET(p, v, l) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2681 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2682 for (ri = 0; ri < l; ++ri) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2683 ScreenAttrs[off + (p) + ri] = v; \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2684 } while (0) |
| 7 | 2685 #endif |
| 2686 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2687 /* 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
|
2688 * text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2689 RL_MEMSET(col, HL_ATTR(HLF_FL), wp->w_width - col); |
| 7 | 2690 |
| 2691 #ifdef FEAT_SIGNS | |
| 2692 /* 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
|
2693 if (signcolumn_on(wp)) |
| 7 | 2694 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2695 len = wp->w_width - col; |
| 7 | 2696 if (len > 0) |
| 2697 { | |
| 2698 if (len > 2) | |
| 2699 len = 2; | |
| 2700 # ifdef FEAT_RIGHTLEFT | |
| 2701 if (wp->w_p_rl) | |
| 2702 /* the line number isn't reversed */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2703 copy_text_attr(off + wp->w_width - len - col, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2704 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2705 else |
| 2706 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2707 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2708 col += len; |
| 2709 } | |
| 2710 } | |
| 2711 #endif | |
| 2712 | |
| 2713 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2714 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2715 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2716 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2717 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2718 len = wp->w_width - col; |
| 7 | 2719 if (len > 0) |
| 2720 { | |
| 13 | 2721 int w = number_width(wp); |
| 5905 | 2722 long num; |
| 2723 char *fmt = "%*ld "; | |
| 13 | 2724 |
| 2725 if (len > w + 1) | |
| 2726 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2727 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2728 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
|
2729 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2730 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2731 else |
| 4065 | 2732 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2733 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2734 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
|
2735 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
|
2736 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2737 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2738 * line number */ |
| 4065 | 2739 num = lnum; |
| 2740 fmt = "%-*ld "; | |
| 2741 } | |
| 2742 } | |
| 2743 | |
| 2744 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2745 #ifdef FEAT_RIGHTLEFT |
| 2746 if (wp->w_p_rl) | |
| 2747 /* the line number isn't reversed */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2748 copy_text_attr(off + wp->w_width - len - col, buf, len, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2749 HL_ATTR(HLF_FL)); |
| 7 | 2750 else |
| 2751 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2752 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2753 col += len; |
| 2754 } | |
| 2755 } | |
| 2756 | |
| 2757 /* | |
| 2758 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2759 */ | |
| 29 | 2760 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2761 |
| 2762 txtcol = col; /* remember where text starts */ | |
| 2763 | |
| 2764 /* | |
| 2765 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2766 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2767 * in columns number-col - window-width. | |
| 2768 */ | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2769 col = text_to_screenline(wp, text, col); |
| 7 | 2770 |
| 2771 /* Fill the rest of the line with the fold filler */ | |
| 2772 #ifdef FEAT_RIGHTLEFT | |
| 2773 if (wp->w_p_rl) | |
| 2774 col -= txtcol; | |
| 2775 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2776 while (col < wp->w_width |
| 7 | 2777 #ifdef FEAT_RIGHTLEFT |
| 2778 - (wp->w_p_rl ? txtcol : 0) | |
| 2779 #endif | |
| 2780 ) | |
| 2781 { | |
| 2782 #ifdef FEAT_MBYTE | |
| 2783 if (enc_utf8) | |
| 2784 { | |
| 2785 if (fill_fold >= 0x80) | |
| 2786 { | |
| 2787 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2788 ScreenLinesC[0][off + col] = 0; |
|
13204
a8a154cafc60
patch 8.0.1476: screen isn't always updated right away
Christian Brabandt <cb@256bit.org>
parents:
13150
diff
changeset
|
2789 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2790 } |
| 2791 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2792 { |
| 7 | 2793 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2794 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2795 } |
|
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
|
2796 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
|
2797 } |
|
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
|
2798 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
|
2799 #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
|
2800 ScreenLines[off + col++] = fill_fold; |
| 7 | 2801 } |
| 2802 | |
| 2803 if (text != buf) | |
| 2804 vim_free(text); | |
| 2805 | |
| 2806 /* | |
| 2807 * 6. set highlighting for the Visual area an other text. | |
| 2808 * If all folded lines are in the Visual area, highlight the line. | |
| 2809 */ | |
| 2810 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2811 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2812 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2813 { |
| 2814 /* Visual is after curwin->w_cursor */ | |
| 2815 top = &curwin->w_cursor; | |
| 2816 bot = &VIsual; | |
| 2817 } | |
| 2818 else | |
| 2819 { | |
| 2820 /* Visual is before curwin->w_cursor */ | |
| 2821 top = &VIsual; | |
| 2822 bot = &curwin->w_cursor; | |
| 2823 } | |
| 2824 if (lnum >= top->lnum | |
| 2825 && lnume <= bot->lnum | |
| 2826 && (VIsual_mode != 'v' | |
| 2827 || ((lnum > top->lnum | |
| 2828 || (lnum == top->lnum | |
| 2829 && top->col == 0)) | |
| 2830 && (lnume < bot->lnum | |
| 2831 || (lnume == bot->lnum | |
| 2832 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2833 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2834 { |
| 2835 if (VIsual_mode == Ctrl_V) | |
| 2836 { | |
| 2837 /* Visual block mode: highlight the chars part of the block */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2838 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)wp->w_width) |
| 7 | 2839 { |
| 3040 | 2840 if (wp->w_old_cursor_lcol != MAXCOL |
| 2841 && wp->w_old_cursor_lcol + txtcol | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2842 < (colnr_T)wp->w_width) |
| 7 | 2843 len = wp->w_old_cursor_lcol; |
| 2844 else | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2845 len = wp->w_width - txtcol; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2846 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2847 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2848 } |
| 2849 } | |
| 2850 else | |
| 216 | 2851 { |
| 7 | 2852 /* Set all attributes of the text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2853 RL_MEMSET(txtcol, HL_ATTR(HLF_V), wp->w_width - txtcol); |
| 216 | 2854 } |
| 7 | 2855 } |
| 2856 } | |
| 2857 | |
| 743 | 2858 #ifdef FEAT_SYN_HL |
| 6685 | 2859 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2860 if (wp->w_p_cc_cols) | |
| 2861 { | |
| 2862 int i = 0; | |
| 2863 int j = wp->w_p_cc_cols[i]; | |
| 2864 int old_txtcol = txtcol; | |
| 2865 | |
| 2866 while (j > -1) | |
| 2867 { | |
| 2868 txtcol += j; | |
| 2869 if (wp->w_p_wrap) | |
| 2870 txtcol -= wp->w_skipcol; | |
| 2871 else | |
| 2872 txtcol -= wp->w_leftcol; | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2873 if (txtcol >= 0 && txtcol < wp->w_width) |
| 6685 | 2874 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
|
2875 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2876 txtcol = old_txtcol; |
| 2877 j = wp->w_p_cc_cols[++i]; | |
| 2878 } | |
| 2879 } | |
| 2880 | |
| 743 | 2881 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2882 if (wp->w_p_cuc) |
| 2883 { | |
| 2884 txtcol += wp->w_virtcol; | |
| 2885 if (wp->w_p_wrap) | |
| 2886 txtcol -= wp->w_skipcol; | |
| 2887 else | |
| 2888 txtcol -= wp->w_leftcol; | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2889 if (txtcol >= 0 && txtcol < wp->w_width) |
| 1725 | 2890 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
|
2891 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2892 } |
| 743 | 2893 #endif |
| 7 | 2894 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2895 screen_line(row + W_WINROW(wp), wp->w_wincol, (int)wp->w_width, |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2896 (int)wp->w_width, FALSE); |
| 7 | 2897 |
| 2898 /* | |
| 2899 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2900 * updated (saves a call to plines() later). | |
| 2901 */ | |
| 2902 if (wp == curwin | |
| 2903 && lnum <= curwin->w_cursor.lnum | |
| 2904 && lnume >= curwin->w_cursor.lnum) | |
| 2905 { | |
| 2906 curwin->w_cline_row = row; | |
| 2907 curwin->w_cline_height = 1; | |
| 2908 curwin->w_cline_folded = TRUE; | |
| 2909 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2910 } | |
| 2911 } | |
| 2912 | |
| 2913 /* | |
| 2914 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2915 */ | |
| 2916 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2917 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2918 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2919 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2920 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2921 int attr) |
| 7 | 2922 { |
| 216 | 2923 int i; |
| 2924 | |
| 7 | 2925 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2926 # ifdef FEAT_MBYTE | |
| 2927 if (enc_utf8) | |
| 2928 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 2929 # endif | |
| 216 | 2930 for (i = 0; i < len; ++i) |
| 2931 ScreenAttrs[off + i] = attr; | |
| 7 | 2932 } |
| 2933 | |
| 2934 /* | |
| 2935 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2936 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2937 */ |
| 2938 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2939 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2940 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2941 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2942 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2943 linenr_T lnum) /* current line number */ |
| 7 | 2944 { |
| 2945 int i = 0; | |
| 2946 int level; | |
| 2947 int first_level; | |
| 519 | 2948 int empty; |
| 6553 | 2949 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2950 |
| 2951 /* Init to all spaces. */ | |
| 6929 | 2952 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2953 |
| 2954 level = win_foldinfo.fi_level; | |
| 2955 if (level > 0) | |
| 2956 { | |
| 519 | 2957 /* If there is only one column put more info in it. */ |
| 6553 | 2958 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2959 |
| 7 | 2960 /* If the column is too narrow, we start at the lowest level that |
| 2961 * fits and use numbers to indicated the depth. */ | |
| 6553 | 2962 first_level = level - fdc - closed + 1 + empty; |
| 7 | 2963 if (first_level < 1) |
| 2964 first_level = 1; | |
| 2965 | |
| 6553 | 2966 for (i = 0; i + empty < fdc; ++i) |
| 7 | 2967 { |
| 2968 if (win_foldinfo.fi_lnum == lnum | |
| 2969 && first_level + i >= win_foldinfo.fi_low_level) | |
| 2970 p[i] = '-'; | |
| 2971 else if (first_level == 1) | |
| 2972 p[i] = '|'; | |
| 2973 else if (first_level + i <= 9) | |
| 2974 p[i] = '0' + first_level + i; | |
| 2975 else | |
| 2976 p[i] = '>'; | |
| 2977 if (first_level + i == level) | |
| 2978 break; | |
| 2979 } | |
| 2980 } | |
| 2981 if (closed) | |
| 6553 | 2982 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 2983 } |
| 2984 #endif /* FEAT_FOLDING */ | |
| 2985 | |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2986 #ifdef FEAT_TEXT_PROP |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2987 static textprop_T *current_text_props = NULL; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2988 static buf_T *current_buf = NULL; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2989 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2990 static int |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2991 #ifdef __BORLANDC__ |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2992 _RTLENTRYF |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2993 #endif |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2994 text_prop_compare(const void *s1, const void *s2) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2995 { |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2996 int idx1, idx2; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2997 proptype_T *pt1, *pt2; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2998 colnr_T col1, col2; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
2999 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3000 idx1 = *(int *)s1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3001 idx2 = *(int *)s2; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3002 pt1 = text_prop_type_by_id(current_buf, current_text_props[idx1].tp_type); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3003 pt2 = text_prop_type_by_id(current_buf, current_text_props[idx2].tp_type); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3004 if (pt1 == pt2) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3005 return 0; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3006 if (pt1 == NULL) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3007 return -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3008 if (pt2 == NULL) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3009 return 1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3010 if (pt1->pt_priority != pt2->pt_priority) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3011 return pt1->pt_priority > pt2->pt_priority ? 1 : -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3012 col1 = current_text_props[idx1].tp_col; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3013 col2 = current_text_props[idx2].tp_col; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3014 return col1 == col2 ? 0 : col1 > col2 ? 1 : -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3015 } |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3016 #endif |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3017 |
| 7 | 3018 /* |
| 3019 * Display line "lnum" of window 'wp' on the screen. | |
| 3020 * Start at row "startrow", stop when "endrow" is reached. | |
| 3021 * wp->w_virtcol needs to be valid. | |
| 3022 * | |
| 3023 * Return the number of last row the line occupies. | |
| 3024 */ | |
| 3025 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3026 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3027 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3028 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3029 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3030 int endrow, |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3031 int nochange UNUSED, // not updating for changed text |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3032 int number_only) // only update the number column |
| 7 | 3033 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3034 int col = 0; /* visual column on screen */ |
| 7 | 3035 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 3036 int c = 0; /* init for GCC */ | |
| 3037 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 3038 #ifdef FEAT_LINEBREAK |
| 3039 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 3040 #endif | |
| 7 | 3041 long vcol_prev = -1; /* "vcol" of previous character */ |
| 3042 char_u *line; /* current line */ | |
| 3043 char_u *ptr; /* current position in "line" */ | |
| 3044 int row; /* row in the window, excl w_winrow */ | |
| 3045 int screen_row; /* row on the screen, incl w_winrow */ | |
| 3046 | |
| 3047 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 3048 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 3049 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 3050 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 3051 int c_extra = NUL; /* extra chars, all the same */ |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3052 int c_final = NUL; /* final char, mandatory if set */ |
| 7 | 3053 int extra_attr = 0; /* attributes when n_extra != 0 */ |
| 3054 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 3055 displaying lcs_eol at end-of-line */ | |
| 3056 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 3057 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 3058 | |
| 3059 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 3060 int saved_n_extra = 0; | |
| 3061 char_u *saved_p_extra = NULL; | |
| 3062 int saved_c_extra = 0; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3063 int saved_c_final = 0; |
| 7 | 3064 int saved_char_attr = 0; |
| 3065 | |
| 3066 int n_attr = 0; /* chars with special attr */ | |
| 3067 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3068 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3069 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3070 | |
| 3071 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3072 | |
| 3073 int fromcol, tocol; /* start/end of inverting */ | |
| 3074 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3075 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3076 pos_T *top, *bot; | |
| 1813 | 3077 int lnum_in_visual_area = FALSE; |
| 7 | 3078 pos_T pos; |
| 3079 long v; | |
| 3080 | |
| 3081 int char_attr = 0; /* attributes for next character */ | |
| 674 | 3082 int attr_pri = FALSE; /* char_attr has priority */ |
| 7 | 3083 int area_highlighting = FALSE; /* Visual or incsearch highlighting |
| 3084 in this line */ | |
| 3085 int attr = 0; /* attributes for area highlighting */ | |
| 3086 int area_attr = 0; /* attributes desired by highlighting */ | |
| 3087 int search_attr = 0; /* attributes desired by 'hlsearch' */ | |
| 3088 #ifdef FEAT_SYN_HL | |
| 743 | 3089 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3090 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3091 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3092 int save_did_emsg; | |
| 1437 | 3093 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
|
3094 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3095 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3096 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3097 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3098 int text_prop_count; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3099 int text_prop_next = 0; // next text property to use |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3100 textprop_T *text_props = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3101 int *text_prop_idxs = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3102 int text_props_active = 0; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3103 proptype_T *text_prop_type = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3104 int text_prop_attr = 0; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3105 #endif |
| 743 | 3106 #ifdef FEAT_SPELL |
| 221 | 3107 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3108 # define SPWORDLEN 150 |
| 3109 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3110 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3111 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3112 starts */ |
| 221 | 3113 int spell_attr = 0; /* attributes desired by spelling */ |
| 3114 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3115 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3116 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3117 * there are no spell errors */ |
| 386 | 3118 static int cap_col = -1; /* column to check for Cap word */ |
| 3119 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3120 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3121 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3122 int extra_check = 0; // has extra highlighting |
| 7 | 3123 #ifdef FEAT_MBYTE |
| 3124 int multi_attr = 0; /* attributes desired by multibyte */ | |
| 3125 int mb_l = 1; /* multi-byte byte length */ | |
| 3126 int mb_c = 0; /* decoded multi-byte character */ | |
| 3127 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3128 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3129 #endif |
| 3130 #ifdef FEAT_DIFF | |
| 3131 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3132 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3133 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3134 int change_start = MAXCOL; /* first col of changed area */ |
| 3135 int change_end = -1; /* last col of changed area */ | |
| 3136 #endif | |
| 3137 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3138 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3139 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
|
3140 chars */ |
| 7 | 3141 #endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3142 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
| 910 | 3143 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) |
| 7 | 3144 # define LINE_ATTR |
| 1536 | 3145 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3146 #endif |
| 3147 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3148 matchitem_T *cur; /* points to the match list */ |
| 3149 match_T *shl; /* points to search_hl or a match */ | |
| 3150 int shl_flag; /* flag to indicate whether search_hl | |
| 3151 has been processed or not */ | |
| 5979 | 3152 int pos_inprogress; /* marks that position match search is |
| 3153 in progress */ | |
| 1326 | 3154 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3155 equals startcol of search_hl or one | |
| 3156 of the matches */ | |
| 7 | 3157 #endif |
| 3158 #ifdef FEAT_ARABIC | |
| 3159 int prev_c = 0; /* previous Arabic character */ | |
| 3160 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3161 #endif | |
| 910 | 3162 #if defined(LINE_ATTR) |
| 867 | 3163 int did_line_attr = 0; |
| 3164 #endif | |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3165 #ifdef FEAT_TERMINAL |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3166 int get_term_attr = FALSE; |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
3167 int term_attr = 0; /* background for terminal window */ |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3168 #endif |
| 7 | 3169 |
| 3170 /* draw_state: items that are drawn in sequence: */ | |
| 3171 #define WL_START 0 /* nothing done yet */ | |
| 3172 #ifdef FEAT_CMDWIN | |
| 3173 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3174 #else | |
| 3175 # define WL_CMDLINE WL_START | |
| 3176 #endif | |
| 3177 #ifdef FEAT_FOLDING | |
| 3178 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3179 #else | |
| 3180 # define WL_FOLD WL_CMDLINE | |
| 3181 #endif | |
| 3182 #ifdef FEAT_SIGNS | |
| 3183 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3184 #else | |
| 3185 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3186 #endif | |
| 3187 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3188 #ifdef FEAT_LINEBREAK |
| 3189 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3190 #else | |
| 3191 # define WL_BRI WL_NR | |
| 3192 #endif | |
| 7 | 3193 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3194 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3195 #else |
| 5995 | 3196 # define WL_SBR WL_BRI |
| 7 | 3197 #endif |
| 3198 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3199 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3200 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3201 int feedback_col = 0; |
| 3202 int feedback_old_attr = -1; | |
| 3203 #endif | |
| 3204 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3205 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3206 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
|
3207 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
|
3208 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
|
3209 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
|
3210 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3211 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
|
3212 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3213 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
|
3214 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3215 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
|
3216 int has_match_conc = 0; /* match wants to conceal */ |
| 6520 | 3217 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3218 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3219 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3220 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3221 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3222 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3223 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3224 col -= boguscols; \ |
| 6520 | 3225 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3226 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3227 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3228 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3229 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3230 #endif |
| 7 | 3231 |
| 3232 if (startrow > endrow) /* past the end already! */ | |
| 3233 return startrow; | |
| 3234 | |
| 3235 row = startrow; | |
| 3236 screen_row = row + W_WINROW(wp); | |
| 3237 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3238 if (!number_only) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3239 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3240 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3241 * To speed up the loop below, set extra_check when there is linebreak, |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3242 * trailing white space and/or syntax processing to be done. |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3243 */ |
| 7 | 3244 #ifdef FEAT_LINEBREAK |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3245 extra_check = wp->w_p_lbr; |
| 7 | 3246 #endif |
| 3247 #ifdef FEAT_SYN_HL | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3248 if (syntax_present(wp) && !wp->w_s->b_syn_error |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3249 # ifdef SYN_TIME_LIMIT |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3250 && !wp->w_s->b_syn_slow |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3251 # endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3252 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3253 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3254 /* Prepare for syntax highlighting in this line. When there is an |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3255 * error, stop syntax highlighting. */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3256 save_did_emsg = did_emsg; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3257 did_emsg = FALSE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3258 syntax_start(wp, lnum); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3259 if (did_emsg) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3260 wp->w_s->b_syn_error = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3261 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3262 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3263 did_emsg = save_did_emsg; |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3264 #ifdef SYN_TIME_LIMIT |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3265 if (!wp->w_s->b_syn_slow) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3266 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3267 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3268 has_syntax = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3269 extra_check = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3270 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3271 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3272 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3273 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3274 /* Check for columns to display for 'colorcolumn'. */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3275 color_cols = wp->w_p_cc_cols; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3276 if (color_cols != NULL) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3277 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3278 #endif |
| 3279 | |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3280 #ifdef FEAT_TERMINAL |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3281 if (term_show_buffer(wp->w_buffer)) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3282 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3283 extra_check = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3284 get_term_attr = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3285 term_attr = term_get_attr(wp->w_buffer, lnum, -1); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3286 } |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3287 #endif |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3288 |
| 743 | 3289 #ifdef FEAT_SPELL |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3290 if (wp->w_p_spell |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3291 && *wp->w_s->b_p_spl != NUL |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3292 && wp->w_s->b_langp.ga_len > 0 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3293 && *(char **)(wp->w_s->b_langp.ga_data) != NULL) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3294 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3295 /* Prepare for spell checking. */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3296 has_spell = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3297 extra_check = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3298 |
|
14875
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
3299 /* Get the start of the next line, so that words that wrap to the |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
3300 * next line are found too: "et<line-break>al.". |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3301 * Trick: skip a few chars for C/shell/Vim comments */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3302 nextline[SPWORDLEN] = NUL; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3303 if (lnum < wp->w_buffer->b_ml.ml_line_count) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3304 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3305 line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3306 spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3307 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3308 |
|
14875
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
3309 /* When a word wrapped from the previous line the start of the |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
3310 * current line is valid. */ |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3311 if (lnum == checked_lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3312 cur_checked_col = checked_col; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3313 checked_lnum = 0; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3314 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3315 /* When there was a sentence end in the previous line may require a |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3316 * word starting with capital in this line. In line 1 always check |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3317 * the first word. */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3318 if (lnum != capcol_lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3319 cap_col = -1; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3320 if (lnum == 1) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3321 cap_col = 0; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3322 capcol_lnum = 0; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3323 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3324 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3325 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3326 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3327 * handle visual active in this window |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3328 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3329 fromcol = -10; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3330 tocol = MAXCOL; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3331 if (VIsual_active && wp->w_buffer == curwin->w_buffer) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3332 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3333 /* Visual is after curwin->w_cursor */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3334 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3335 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3336 top = &curwin->w_cursor; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3337 bot = &VIsual; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3338 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3339 else /* Visual is before curwin->w_cursor */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3340 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3341 top = &VIsual; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3342 bot = &curwin->w_cursor; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3343 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3344 lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3345 if (VIsual_mode == Ctrl_V) /* block mode */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3346 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3347 if (lnum_in_visual_area) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3348 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3349 fromcol = wp->w_old_cursor_fcol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3350 tocol = wp->w_old_cursor_lcol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3351 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3352 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3353 else /* non-block mode */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3354 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3355 if (lnum > top->lnum && lnum <= bot->lnum) |
| 7 | 3356 fromcol = 0; |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3357 else if (lnum == top->lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3358 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3359 if (VIsual_mode == 'V') /* linewise */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3360 fromcol = 0; |
| 7 | 3361 else |
| 3362 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3363 getvvcol(wp, top, (colnr_T *)&fromcol, NULL, NULL); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3364 if (gchar_pos(top) == NUL) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3365 tocol = fromcol + 1; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3366 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3367 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3368 if (VIsual_mode != 'V' && lnum == bot->lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3369 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3370 if (*p_sel == 'e' && bot->col == 0 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3371 #ifdef FEAT_VIRTUALEDIT |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3372 && bot->coladd == 0 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3373 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3374 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3375 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3376 fromcol = -10; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3377 tocol = MAXCOL; |
| 7 | 3378 } |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3379 else if (bot->col == MAXCOL) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3380 tocol = MAXCOL; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3381 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3382 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3383 pos = *bot; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3384 if (*p_sel == 'e') |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3385 getvvcol(wp, &pos, (colnr_T *)&tocol, NULL, NULL); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3386 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3387 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3388 getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3389 ++tocol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3390 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3391 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3392 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3393 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3394 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3395 /* Check if the character under the cursor should not be inverted */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3396 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
|
3397 #ifdef FEAT_GUI |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3398 && !gui.in_use |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3399 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3400 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3401 noinvcur = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3402 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3403 /* if inverting in this line set area_highlighting */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3404 if (fromcol >= 0) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3405 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3406 area_highlighting = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3407 attr = HL_ATTR(HLF_V); |
| 7 | 3408 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3409 if ((clip_star.available && !clip_star.owned |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3410 && clip_isautosel_star()) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3411 || (clip_plus.available && !clip_plus.owned |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3412 && clip_isautosel_plus())) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3413 attr = HL_ATTR(HLF_VNC); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3414 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3415 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3416 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3417 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3418 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3419 * handle 'incsearch' and ":s///c" highlighting |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3420 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3421 else if (highlight_match |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3422 && wp == curwin |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3423 && lnum >= curwin->w_cursor.lnum |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3424 && lnum <= curwin->w_cursor.lnum + search_match_lines) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3425 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3426 if (lnum == curwin->w_cursor.lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3427 getvcol(curwin, &(curwin->w_cursor), |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3428 (colnr_T *)&fromcol, NULL, NULL); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3429 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3430 fromcol = 0; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3431 if (lnum == curwin->w_cursor.lnum + search_match_lines) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3432 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3433 pos.lnum = lnum; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3434 pos.col = search_match_endcol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3435 getvcol(curwin, &pos, (colnr_T *)&tocol, NULL, NULL); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3436 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3437 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3438 tocol = MAXCOL; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3439 /* do at least one character; happens when past end of line */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3440 if (fromcol == tocol) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3441 tocol = fromcol + 1; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3442 area_highlighting = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3443 attr = HL_ATTR(HLF_I); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3444 } |
| 7 | 3445 } |
| 3446 | |
| 3447 #ifdef FEAT_DIFF | |
| 3448 filler_lines = diff_check(wp, lnum); | |
| 3449 if (filler_lines < 0) | |
| 3450 { | |
| 3451 if (filler_lines == -1) | |
| 3452 { | |
| 3453 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3454 diff_hlf = HLF_ADD; /* added line */ | |
| 3455 else if (change_start == 0) | |
| 3456 diff_hlf = HLF_TXD; /* changed text */ | |
| 3457 else | |
| 3458 diff_hlf = HLF_CHD; /* changed line */ | |
| 3459 } | |
| 3460 else | |
| 3461 diff_hlf = HLF_ADD; /* added line */ | |
| 3462 filler_lines = 0; | |
| 3463 area_highlighting = TRUE; | |
| 3464 } | |
| 3465 if (lnum == wp->w_topline) | |
| 3466 filler_lines = wp->w_topfill; | |
| 3467 filler_todo = filler_lines; | |
| 3468 #endif | |
| 3469 | |
| 3470 #ifdef LINE_ATTR | |
| 3471 # ifdef FEAT_SIGNS | |
| 3472 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3473 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3474 if (v != 0) | |
| 3475 line_attr = sign_get_attr((int)v, TRUE); | |
| 3476 # endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3477 # if defined(FEAT_QUICKFIX) |
| 7 | 3478 /* Highlight the current line in the quickfix window. */ |
| 644 | 3479 if (bt_quickfix(wp->w_buffer) && qf_current_entry(wp) == lnum) |
|
11516
80491a71c716
patch 8.0.0641: cannot set a separate highlighting for the quickfix line
Christian Brabandt <cb@256bit.org>
parents:
11420
diff
changeset
|
3480 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3481 # endif |
| 3482 if (line_attr != 0) | |
| 3483 area_highlighting = TRUE; | |
| 3484 #endif | |
| 3485 | |
| 3486 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3487 ptr = line; | |
| 3488 | |
| 743 | 3489 #ifdef FEAT_SPELL |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3490 if (has_spell && !number_only) |
| 348 | 3491 { |
| 386 | 3492 /* For checking first word with a capital skip white space. */ |
| 3493 if (cap_col == 0) | |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
3494 cap_col = getwhitecols(line); |
| 386 | 3495 |
| 348 | 3496 /* To be able to spell-check over line boundaries copy the end of the |
| 3497 * current line into nextline[]. Above the start of the next line was | |
| 3498 * copied to nextline[SPWORDLEN]. */ | |
| 3499 if (nextline[SPWORDLEN] == NUL) | |
| 3500 { | |
| 3501 /* No next line or it is empty. */ | |
| 3502 nextlinecol = MAXCOL; | |
| 3503 nextline_idx = 0; | |
| 3504 } | |
| 3505 else | |
| 3506 { | |
| 835 | 3507 v = (long)STRLEN(line); |
| 348 | 3508 if (v < SPWORDLEN) |
| 3509 { | |
| 3510 /* Short line, use it completely and append the start of the | |
| 3511 * next line. */ | |
| 3512 nextlinecol = 0; | |
| 3513 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3514 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3515 nextline_idx = v + 1; |
| 3516 } | |
| 3517 else | |
| 3518 { | |
| 3519 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3520 nextlinecol = v - SPWORDLEN; | |
| 3521 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3522 nextline_idx = SPWORDLEN + 1; | |
| 3523 } | |
| 3524 } | |
| 3525 } | |
| 3526 #endif | |
| 3527 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3528 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3529 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3530 if (lcs_space || lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3531 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3532 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3533 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3534 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3535 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
|
3536 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
|
3537 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3538 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3539 } |
| 7 | 3540 } |
| 3541 | |
| 3542 /* | |
| 3543 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3544 * first character to be displayed. | |
| 3545 */ | |
| 3546 if (wp->w_p_wrap) | |
| 3547 v = wp->w_skipcol; | |
| 3548 else | |
| 3549 v = wp->w_leftcol; | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3550 if (v > 0 && !number_only) |
| 7 | 3551 { |
| 3552 #ifdef FEAT_MBYTE | |
| 3553 char_u *prev_ptr = ptr; | |
| 3554 #endif | |
| 3555 while (vcol < v && *ptr != NUL) | |
| 3556 { | |
| 5995 | 3557 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3558 vcol += c; |
| 3559 #ifdef FEAT_MBYTE | |
| 3560 prev_ptr = ptr; | |
| 39 | 3561 #endif |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3562 MB_PTR_ADV(ptr); |
| 7 | 3563 } |
| 3564 | |
| 1984 | 3565 /* When: |
| 3566 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3567 * - 'colorcolumn' is set, or |
| 1984 | 3568 * - 'virtualedit' is set, or |
| 3569 * - the visual mode is active, | |
| 3570 * the end of the line may be before the start of the displayed part. | |
| 3571 */ | |
| 3572 if (vcol < v && ( | |
| 5735 | 3573 #ifdef FEAT_SYN_HL |
| 3574 wp->w_p_cuc || draw_color_col || | |
| 3575 #endif | |
| 3576 #ifdef FEAT_VIRTUALEDIT | |
| 3577 virtual_active() || | |
| 3578 #endif | |
| 3579 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 1984 | 3580 { |
| 7 | 3581 vcol = v; |
| 1984 | 3582 } |
| 7 | 3583 |
| 3584 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3585 * that character but skip the first few screen characters. */ | |
| 3586 if (vcol > v) | |
| 3587 { | |
| 3588 vcol -= c; | |
| 3589 #ifdef FEAT_MBYTE | |
| 3590 ptr = prev_ptr; | |
| 3591 #else | |
| 3592 --ptr; | |
| 3593 #endif | |
|
11010
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3594 /* 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
|
3595 * 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
|
3596 if (( |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3597 #ifdef FEAT_MBYTE |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3598 (*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
|
3599 #endif |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3600 *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
|
3601 n_skip = v - vcol; |
| 7 | 3602 } |
| 3603 | |
| 3604 /* | |
| 3605 * Adjust for when the inverted text is before the screen, | |
| 3606 * and when the start of the inverted text is before the screen. | |
| 3607 */ | |
| 3608 if (tocol <= vcol) | |
| 3609 fromcol = 0; | |
| 3610 else if (fromcol >= 0 && fromcol < vcol) | |
| 3611 fromcol = vcol; | |
| 3612 | |
| 3613 #ifdef FEAT_LINEBREAK | |
| 3614 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3615 if (wp->w_p_wrap) | |
| 3616 need_showbreak = TRUE; | |
| 3617 #endif | |
| 743 | 3618 #ifdef FEAT_SPELL |
| 499 | 3619 /* When spell checking a word we need to figure out the start of the |
| 3620 * word and if it's badly spelled or not. */ | |
| 3621 if (has_spell) | |
| 3622 { | |
| 3623 int len; | |
| 1536 | 3624 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3625 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3626 |
| 3627 pos = wp->w_cursor; | |
| 3628 wp->w_cursor.lnum = lnum; | |
| 1536 | 3629 wp->w_cursor.col = linecol; |
| 534 | 3630 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3631 |
| 3632 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3633 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3634 ptr = line + linecol; | |
| 3635 | |
| 530 | 3636 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3637 { |
| 3638 /* no bad word found at line start, don't check until end of a | |
| 3639 * word */ | |
| 534 | 3640 spell_hlf = HLF_COUNT; |
| 3572 | 3641 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3642 } |
| 3643 else | |
| 534 | 3644 { |
| 499 | 3645 /* bad word found, use attributes until end of word */ |
| 3646 word_end = wp->w_cursor.col + len + 1; | |
| 3647 | |
| 534 | 3648 /* Turn index into actual attributes. */ |
| 3649 if (spell_hlf != HLF_COUNT) | |
| 3650 spell_attr = highlight_attr[spell_hlf]; | |
| 3651 } | |
| 499 | 3652 wp->w_cursor = pos; |
| 501 | 3653 |
| 743 | 3654 # ifdef FEAT_SYN_HL |
| 501 | 3655 /* Need to restart syntax highlighting for this line. */ |
| 3656 if (has_syntax) | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3657 syntax_start(wp, lnum); |
| 743 | 3658 # endif |
| 499 | 3659 } |
| 3660 #endif | |
| 7 | 3661 } |
| 3662 | |
| 3663 /* | |
| 3664 * Correct highlighting for cursor that can't be disabled. | |
| 3665 * Avoids having to check this for each character. | |
| 3666 */ | |
| 3667 if (fromcol >= 0) | |
| 3668 { | |
| 3669 if (noinvcur) | |
| 3670 { | |
| 3671 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3672 { | |
| 3673 /* highlighting starts at cursor, let it start just after the | |
| 3674 * cursor */ | |
| 3675 fromcol_prev = fromcol; | |
| 3676 fromcol = -1; | |
| 3677 } | |
| 3678 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3679 /* restart highlighting after the cursor */ | |
| 3680 fromcol_prev = wp->w_virtcol; | |
| 3681 } | |
| 3682 if (fromcol >= tocol) | |
| 3683 fromcol = -1; | |
| 3684 } | |
| 3685 | |
| 3686 #ifdef FEAT_SEARCH_EXTRA | |
| 3687 /* | |
| 1326 | 3688 * Handle highlighting the last used search pattern and matches. |
| 3689 * Do this for both search_hl and the match list. | |
| 7 | 3690 */ |
| 1326 | 3691 cur = wp->w_match_head; |
| 3692 shl_flag = FALSE; | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3693 while ((cur != NULL || shl_flag == FALSE) && !number_only) |
| 1326 | 3694 { |
| 3695 if (shl_flag == FALSE) | |
| 3696 { | |
| 3697 shl = &search_hl; | |
| 3698 shl_flag = TRUE; | |
| 3699 } | |
| 3700 else | |
| 3701 shl = &cur->hl; | |
| 36 | 3702 shl->startcol = MAXCOL; |
| 3703 shl->endcol = MAXCOL; | |
| 7 | 3704 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3705 shl->is_addpos = FALSE; |
| 5979 | 3706 v = (long)(ptr - line); |
| 3707 if (cur != NULL) | |
| 3708 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3709 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
|
3710 shl == &search_hl ? NULL : cur); |
| 5979 | 3711 |
| 3712 /* Need to get the line again, a multi-line regexp may have made it | |
| 3713 * invalid. */ | |
| 3714 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3715 ptr = line + v; | |
| 3716 | |
| 3717 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3718 { | |
| 3719 if (shl->lnum == lnum) | |
| 3720 shl->startcol = shl->rm.startpos[0].col; | |
| 3721 else | |
| 3722 shl->startcol = 0; | |
| 3723 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3724 - shl->rm.startpos[0].lnum) | |
| 3725 shl->endcol = shl->rm.endpos[0].col; | |
| 3726 else | |
| 3727 shl->endcol = MAXCOL; | |
| 3728 /* Highlight one character for an empty match. */ | |
| 3729 if (shl->startcol == shl->endcol) | |
| 3730 { | |
| 3731 #ifdef FEAT_MBYTE | |
| 3732 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3733 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3734 else |
| 5979 | 3735 #endif |
| 3736 ++shl->endcol; | |
| 3737 } | |
| 3738 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3739 { | |
| 3740 shl->attr_cur = shl->attr; | |
| 3741 search_attr = shl->attr; | |
| 3742 } | |
| 3743 area_highlighting = TRUE; | |
| 7 | 3744 } |
| 1326 | 3745 if (shl != &search_hl && cur != NULL) |
| 3746 cur = cur->next; | |
| 7 | 3747 } |
| 3748 #endif | |
| 3749 | |
| 743 | 3750 #ifdef FEAT_SYN_HL |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3751 /* 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
|
3752 * 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
|
3753 * then. */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3754 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
| 5979 | 3755 && !(wp == curwin && VIsual_active)) |
| 743 | 3756 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3757 line_attr = HL_ATTR(HLF_CUL); |
| 743 | 3758 area_highlighting = TRUE; |
| 3759 } | |
| 3760 #endif | |
| 3761 | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3762 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3763 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3764 char_u *prop_start; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3765 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3766 text_prop_count = get_text_props(wp->w_buffer, lnum, |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3767 &prop_start, FALSE); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3768 if (text_prop_count > 0) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3769 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3770 // Make a copy of the properties, so that they are properly |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3771 // aligned. |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3772 text_props = (textprop_T *)alloc( |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3773 text_prop_count * sizeof(textprop_T)); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3774 if (text_props != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3775 mch_memmove(text_props, prop_start, |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3776 text_prop_count * sizeof(textprop_T)); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3777 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3778 // Allocate an array for the indexes. |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3779 text_prop_idxs = (int *)alloc(text_prop_count * sizeof(int)); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3780 area_highlighting = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3781 extra_check = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3782 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3783 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3784 #endif |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3785 |
| 504 | 3786 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3787 col = 0; |
| 3788 #ifdef FEAT_RIGHTLEFT | |
| 3789 if (wp->w_p_rl) | |
| 3790 { | |
| 3791 /* Rightleft window: process the text in the normal direction, but put | |
| 3792 * it in current_ScreenLine[] from right to left. Start at the | |
| 3793 * rightmost column of the window. */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3794 col = wp->w_width - 1; |
| 7 | 3795 off += col; |
| 3796 } | |
| 3797 #endif | |
| 3798 | |
| 3799 /* | |
| 3800 * Repeat for the whole displayed line. | |
| 3801 */ | |
| 3802 for (;;) | |
| 3803 { | |
| 6947 | 3804 #ifdef FEAT_CONCEAL |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3805 has_match_conc = 0; |
| 6947 | 3806 #endif |
| 7 | 3807 /* Skip this quickly when working on the text. */ |
| 3808 if (draw_state != WL_LINE) | |
| 3809 { | |
| 3810 #ifdef FEAT_CMDWIN | |
| 3811 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3812 { | |
| 3813 draw_state = WL_CMDLINE; | |
| 3814 if (cmdwin_type != 0 && wp == curwin) | |
| 3815 { | |
| 3816 /* Draw the cmdline character. */ | |
| 3817 n_extra = 1; | |
| 1340 | 3818 c_extra = cmdwin_type; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3819 c_final = NUL; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3820 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3821 } |
| 3822 } | |
| 3823 #endif | |
| 3824 | |
| 3825 #ifdef FEAT_FOLDING | |
| 3826 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3827 { | |
| 6553 | 3828 int fdc = compute_foldcolumn(wp, 0); |
| 3829 | |
| 7 | 3830 draw_state = WL_FOLD; |
| 6553 | 3831 if (fdc > 0) |
| 7 | 3832 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3833 /* 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
|
3834 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3835 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3836 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3837 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3838 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3839 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3840 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
|
3841 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3842 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3843 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3844 c_extra = NUL; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3845 c_final = NUL; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3846 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
|
3847 } |
| 7 | 3848 } |
| 3849 } | |
| 3850 #endif | |
| 3851 | |
| 3852 #ifdef FEAT_SIGNS | |
| 3853 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3854 { | |
| 3855 draw_state = WL_SIGN; | |
| 3856 /* Show the sign column when there are any signs in this | |
| 3857 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3858 if (signcolumn_on(wp)) |
| 7 | 3859 { |
| 2661 | 3860 int text_sign; |
| 7 | 3861 # ifdef FEAT_SIGN_ICONS |
| 2661 | 3862 int icon_sign; |
| 7 | 3863 # endif |
| 3864 | |
| 3865 /* Draw two cells with the sign value or blank. */ | |
| 3866 c_extra = ' '; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3867 c_final = NUL; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3868 char_attr = HL_ATTR(HLF_SC); |
| 7 | 3869 n_extra = 2; |
| 3870 | |
| 5921 | 3871 if (row == startrow |
| 3872 #ifdef FEAT_DIFF | |
| 3873 + filler_lines && filler_todo <= 0 | |
| 3874 #endif | |
| 3875 ) | |
| 7 | 3876 { |
| 3877 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3878 SIGN_TEXT); | |
| 3879 # ifdef FEAT_SIGN_ICONS | |
| 3880 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3881 SIGN_ICON); | |
| 3882 if (gui.in_use && icon_sign != 0) | |
| 3883 { | |
| 3884 /* Use the image in this position. */ | |
| 3885 c_extra = SIGN_BYTE; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3886 c_final = NUL; |
| 7 | 3887 # ifdef FEAT_NETBEANS_INTG |
| 3888 if (buf_signcount(wp->w_buffer, lnum) > 1) | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3889 { |
| 7 | 3890 c_extra = MULTISIGN_BYTE; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3891 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3892 } |
| 7 | 3893 # endif |
| 3894 char_attr = icon_sign; | |
| 3895 } | |
| 3896 else | |
| 3897 # endif | |
| 3898 if (text_sign != 0) | |
| 3899 { | |
| 3900 p_extra = sign_get_text(text_sign); | |
| 3901 if (p_extra != NULL) | |
| 3902 { | |
| 3903 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3904 c_final = NUL; |
| 835 | 3905 n_extra = (int)STRLEN(p_extra); |
| 7 | 3906 } |
| 3907 char_attr = sign_get_attr(text_sign, FALSE); | |
| 3908 } | |
| 3909 } | |
| 3910 } | |
| 3911 } | |
| 3912 #endif | |
| 3913 | |
| 3914 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3915 { | |
| 3916 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3917 /* 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
|
3918 * 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
|
3919 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3920 && (row == startrow |
| 3921 #ifdef FEAT_DIFF | |
| 3922 + filler_lines | |
| 3923 #endif | |
| 3924 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3925 { | |
| 3926 /* Draw the line number (empty space after wrapping). */ | |
| 3927 if (row == startrow | |
| 3928 #ifdef FEAT_DIFF | |
| 3929 + filler_lines | |
| 3930 #endif | |
| 3931 ) | |
| 3932 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3933 long num; |
| 4065 | 3934 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3935 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3936 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
|
3937 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3938 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3939 else |
| 4065 | 3940 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3941 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3942 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
|
3943 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3944 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3945 /* 'number' + 'relativenumber' */ |
| 4065 | 3946 num = lnum; |
| 3947 fmt = "%-*ld "; | |
| 3948 } | |
| 3949 } | |
| 3950 | |
| 3951 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3952 number_width(wp), num); |
| 7 | 3953 if (wp->w_skipcol > 0) |
| 3954 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3955 *p_extra = '-'; | |
| 3956 #ifdef FEAT_RIGHTLEFT | |
| 3957 if (wp->w_p_rl) /* reverse line numbers */ | |
| 3958 rl_mirror(extra); | |
| 3959 #endif | |
| 3960 p_extra = extra; | |
| 3961 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3962 c_final = NUL; |
| 7 | 3963 } |
| 3964 else | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3965 { |
| 7 | 3966 c_extra = ' '; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3967 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3968 } |
| 13 | 3969 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
|
3970 char_attr = HL_ATTR(HLF_N); |
| 743 | 3971 #ifdef FEAT_SYN_HL |
| 3972 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 3973 * the current line differently. |
| 3974 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 3975 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3976 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 3977 && 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
|
3978 char_attr = HL_ATTR(HLF_CLN); |
| 743 | 3979 #endif |
| 7 | 3980 } |
| 3981 } | |
| 3982 | |
| 5995 | 3983 #ifdef FEAT_LINEBREAK |
| 3984 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 3985 && n_extra == 0 && *p_sbr != NUL) | |
| 3986 /* draw indent after showbreak value */ | |
| 3987 draw_state = WL_BRI; | |
| 3988 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 3989 /* After the showbreak, draw the breakindent */ | |
| 3990 draw_state = WL_BRI - 1; | |
| 3991 | |
| 3992 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 3993 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 3994 { | |
| 3995 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3996 /* 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
|
3997 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
|
3998 && (row != startrow || need_showbreak) |
| 5995 | 3999 # ifdef FEAT_DIFF |
| 4000 && filler_lines == 0 | |
| 6834 | 4001 # endif |
| 5995 | 4002 ) |
| 4003 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4004 char_attr = 0; |
| 6834 | 4005 # ifdef FEAT_DIFF |
| 5995 | 4006 if (diff_hlf != (hlf_T)0) |
| 6106 | 4007 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4008 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 4009 # ifdef FEAT_SYN_HL |
| 6106 | 4010 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4011 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
|
4012 HL_ATTR(HLF_CUL)); |
| 6834 | 4013 # endif |
| 6106 | 4014 } |
| 6834 | 4015 # endif |
| 6028 | 4016 p_extra = NULL; |
| 5995 | 4017 c_extra = ' '; |
| 4018 n_extra = get_breakindent_win(wp, | |
| 4019 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 4020 /* Correct end of highlighted area for 'breakindent', | |
| 4021 * required when 'linebreak' is also set. */ | |
| 4022 if (tocol == vcol) | |
| 4023 tocol += n_extra; | |
| 4024 } | |
| 4025 } | |
| 4026 #endif | |
| 4027 | |
| 7 | 4028 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 4029 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 4030 { | |
| 4031 draw_state = WL_SBR; | |
| 4032 # ifdef FEAT_DIFF | |
| 4033 if (filler_todo > 0) | |
| 4034 { | |
| 4035 /* Draw "deleted" diff line(s). */ | |
| 4036 if (char2cells(fill_diff) > 1) | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4037 { |
| 7 | 4038 c_extra = '-'; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4039 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4040 } |
| 7 | 4041 else |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4042 { |
| 7 | 4043 c_extra = fill_diff; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4044 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4045 } |
| 7 | 4046 # ifdef FEAT_RIGHTLEFT |
| 4047 if (wp->w_p_rl) | |
| 4048 n_extra = col + 1; | |
| 4049 else | |
| 4050 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4051 n_extra = wp->w_width - col; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4052 char_attr = HL_ATTR(HLF_DED); |
| 7 | 4053 } |
| 4054 # endif | |
| 4055 # ifdef FEAT_LINEBREAK | |
| 4056 if (*p_sbr != NUL && need_showbreak) | |
| 4057 { | |
| 4058 /* Draw 'showbreak' at the start of each broken line. */ | |
| 4059 p_extra = p_sbr; | |
| 4060 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4061 c_final = NUL; |
| 7 | 4062 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
|
4063 char_attr = HL_ATTR(HLF_AT); |
| 7 | 4064 need_showbreak = FALSE; |
| 6503 | 4065 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 4066 /* Correct end of highlighted area for 'showbreak', |
| 4067 * required when 'linebreak' is also set. */ | |
| 4068 if (tocol == vcol) | |
| 4069 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4070 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4071 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4072 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 4073 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
|
4074 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4075 #endif |
| 7 | 4076 } |
| 4077 # endif | |
| 4078 } | |
| 4079 #endif | |
| 4080 | |
| 4081 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4082 { | |
| 4083 draw_state = WL_LINE; | |
| 4084 if (saved_n_extra) | |
| 4085 { | |
| 4086 /* Continue item from end of wrapped line. */ | |
| 4087 n_extra = saved_n_extra; | |
| 4088 c_extra = saved_c_extra; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4089 c_final = saved_c_final; |
| 7 | 4090 p_extra = saved_p_extra; |
| 4091 char_attr = saved_char_attr; | |
| 4092 } | |
| 4093 else | |
| 4094 char_attr = 0; | |
| 4095 } | |
| 4096 } | |
| 4097 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4098 // When still displaying '$' of change command, stop at cursor. |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4099 // When only displaying the (relative) line number and that's done, |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4100 // stop here. |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4101 if ((dollar_vcol >= 0 && wp == curwin |
| 819 | 4102 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4103 #ifdef FEAT_DIFF |
| 4104 && filler_todo <= 0 | |
| 4105 #endif | |
| 4106 ) | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4107 || (number_only && draw_state > WL_NR)) |
| 7 | 4108 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4109 screen_line(screen_row, wp->w_wincol, col, -(int)wp->w_width, |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
4110 HAS_RIGHTLEFT(wp->w_p_rl)); |
| 819 | 4111 /* Pretend we have finished updating the window. Except when |
| 4112 * 'cursorcolumn' is set. */ | |
| 4113 #ifdef FEAT_SYN_HL | |
| 4114 if (wp->w_p_cuc) | |
| 4115 row = wp->w_cline_row + wp->w_cline_height; | |
| 4116 else | |
| 4117 #endif | |
| 4118 row = wp->w_height; | |
| 7 | 4119 break; |
| 4120 } | |
| 4121 | |
|
15351
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4122 if (draw_state == WL_LINE && (area_highlighting |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4123 #ifdef FEAT_SPELL |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4124 || has_spell |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4125 #endif |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4126 )) |
| 7 | 4127 { |
| 4128 /* handle Visual or match highlighting in this line */ | |
| 4129 if (vcol == fromcol | |
| 4130 #ifdef FEAT_MBYTE | |
| 4131 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4132 && (*mb_ptr2cells)(ptr) > 1) | |
| 4133 #endif | |
| 4134 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4135 && vcol_prev < vcol /* not at margin */ |
| 7 | 4136 && vcol < tocol)) |
| 4137 area_attr = attr; /* start highlighting */ | |
| 4138 else if (area_attr != 0 | |
| 4139 && (vcol == tocol | |
| 4140 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4141 area_attr = 0; /* stop highlighting */ | |
| 4142 | |
| 4143 #ifdef FEAT_SEARCH_EXTRA | |
| 4144 if (!n_extra) | |
| 4145 { | |
| 4146 /* | |
| 4147 * Check for start/end of search pattern match. | |
| 4148 * After end, check for start/end of next match. | |
| 4149 * When another match, have to check for start again. | |
| 4150 * Watch out for matching an empty string! | |
| 1326 | 4151 * Do this for 'search_hl' and the match list (ordered by |
| 4152 * priority). | |
| 7 | 4153 */ |
| 36 | 4154 v = (long)(ptr - line); |
| 1326 | 4155 cur = wp->w_match_head; |
| 4156 shl_flag = FALSE; | |
| 4157 while (cur != NULL || shl_flag == FALSE) | |
| 4158 { | |
| 4159 if (shl_flag == FALSE | |
| 4160 && ((cur != NULL | |
| 4161 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4162 || cur == NULL)) | |
| 4163 { | |
| 4164 shl = &search_hl; | |
| 4165 shl_flag = TRUE; | |
| 4166 } | |
| 4167 else | |
| 4168 shl = &cur->hl; | |
| 5979 | 4169 if (cur != NULL) |
| 4170 cur->pos.cur = 0; | |
| 4171 pos_inprogress = TRUE; | |
| 4172 while (shl->rm.regprog != NULL | |
| 4173 || (cur != NULL && pos_inprogress)) | |
| 7 | 4174 { |
| 36 | 4175 if (shl->startcol != MAXCOL |
| 4176 && v >= (long)shl->startcol | |
| 4177 && v < (long)shl->endcol) | |
| 7 | 4178 { |
| 6430 | 4179 #ifdef FEAT_MBYTE |
| 4180 int tmp_col = v + MB_PTR2LEN(ptr); | |
| 4181 | |
| 4182 if (shl->endcol < tmp_col) | |
| 4183 shl->endcol = tmp_col; | |
| 4184 #endif | |
| 7 | 4185 shl->attr_cur = shl->attr; |
| 6947 | 4186 #ifdef FEAT_CONCEAL |
| 4187 if (cur != NULL && syn_name2id((char_u *)"Conceal") | |
| 4188 == cur->hlg_id) | |
| 4189 { | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4190 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4191 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4192 match_conc = cur->conceal_char; |
| 4193 } | |
| 4194 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4195 has_match_conc = match_conc = 0; |
| 6947 | 4196 #endif |
| 7 | 4197 } |
| 6430 | 4198 else if (v == (long)shl->endcol) |
| 7 | 4199 { |
| 4200 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4201 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
|
4202 shl == &search_hl ? NULL : cur); |
| 5979 | 4203 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4204 ? FALSE : TRUE; |
| 7 | 4205 |
| 4206 /* Need to get the line again, a multi-line regexp | |
| 4207 * may have made it invalid. */ | |
| 4208 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4209 ptr = line + v; | |
| 4210 | |
| 4211 if (shl->lnum == lnum) | |
| 4212 { | |
| 36 | 4213 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4214 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4215 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4216 else |
| 36 | 4217 shl->endcol = MAXCOL; |
| 4218 | |
| 4219 if (shl->startcol == shl->endcol) | |
| 7 | 4220 { |
| 4221 /* highlight empty match, try again after | |
| 4222 * it */ | |
| 4223 #ifdef FEAT_MBYTE | |
| 4224 if (has_mbyte) | |
| 474 | 4225 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4226 + shl->endcol); |
| 7 | 4227 else |
| 4228 #endif | |
| 36 | 4229 ++shl->endcol; |
| 7 | 4230 } |
| 4231 | |
| 4232 /* Loop to check if the match starts at the | |
| 4233 * current position */ | |
| 4234 continue; | |
| 4235 } | |
| 4236 } | |
| 4237 break; | |
| 4238 } | |
| 1326 | 4239 if (shl != &search_hl && cur != NULL) |
| 4240 cur = cur->next; | |
| 4241 } | |
| 4242 | |
| 4243 /* Use attributes from match with highest priority among | |
| 4244 * 'search_hl' and the match list. */ | |
| 4245 search_attr = search_hl.attr_cur; | |
| 4246 cur = wp->w_match_head; | |
| 4247 shl_flag = FALSE; | |
| 4248 while (cur != NULL || shl_flag == FALSE) | |
| 4249 { | |
| 4250 if (shl_flag == FALSE | |
| 4251 && ((cur != NULL | |
| 4252 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4253 || cur == NULL)) | |
| 699 | 4254 { |
| 1326 | 4255 shl = &search_hl; |
| 4256 shl_flag = TRUE; | |
| 699 | 4257 } |
| 1326 | 4258 else |
| 4259 shl = &cur->hl; | |
| 4260 if (shl->attr_cur != 0) | |
| 4261 search_attr = shl->attr_cur; | |
| 4262 if (shl != &search_hl && cur != NULL) | |
| 4263 cur = cur->next; | |
| 4264 } | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4265 /* Only highlight one character after the last column. */ |
|
12582
97f0c74976c6
patch 8.0.1169: highlignting one char too many with 'list' and 'cul'
Christian Brabandt <cb@256bit.org>
parents:
12580
diff
changeset
|
4266 if (*ptr == NUL && (did_line_attr >= 1 |
|
97f0c74976c6
patch 8.0.1169: highlignting one char too many with 'list' and 'cul'
Christian Brabandt <cb@256bit.org>
parents:
12580
diff
changeset
|
4267 || (wp->w_p_list && lcs_eol_one == -1))) |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4268 search_attr = 0; |
| 7 | 4269 } |
| 4270 #endif | |
| 4271 | |
| 4272 #ifdef FEAT_DIFF | |
| 674 | 4273 if (diff_hlf != (hlf_T)0) |
| 7 | 4274 { |
| 1295 | 4275 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4276 && n_extra == 0) | |
| 7 | 4277 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4278 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4279 && n_extra == 0) | |
| 7 | 4280 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
|
4281 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4282 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
|
4283 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4284 } |
| 4285 #endif | |
| 4286 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4287 #ifdef FEAT_TEXT_PROP |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4288 if (text_props != NULL) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4289 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4290 int pi; |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4291 int bcol = (int)(ptr - line); |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4292 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4293 // Check if any active property ends. |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4294 for (pi = 0; pi < text_props_active; ++pi) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4295 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4296 int tpi = text_prop_idxs[pi]; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4297 |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4298 if (bcol >= text_props[tpi].tp_col - 1 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4299 + text_props[tpi].tp_len) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4300 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4301 if (pi + 1 < text_props_active) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4302 mch_memmove(text_prop_idxs + pi, |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4303 text_prop_idxs + pi + 1, |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4304 sizeof(int) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4305 * (text_props_active - (pi + 1))); |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4306 --text_props_active; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4307 --pi; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4308 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4309 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4310 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4311 // Add any text property that starts in this column. |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4312 while (text_prop_next < text_prop_count |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4313 && bcol >= text_props[text_prop_next].tp_col - 1) |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4314 text_prop_idxs[text_props_active++] = text_prop_next++; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4315 |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4316 text_prop_attr = 0; |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4317 if (text_props_active > 0) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4318 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4319 // Sort the properties on priority and/or starting last. |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4320 // Then combine the attributes, highest priority last. |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4321 current_text_props = text_props; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4322 current_buf = wp->w_buffer; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4323 qsort((void *)text_prop_idxs, (size_t)text_props_active, |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4324 sizeof(int), text_prop_compare); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4325 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4326 for (pi = 0; pi < text_props_active; ++pi) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4327 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4328 int tpi = text_prop_idxs[pi]; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4329 proptype_T *pt = text_prop_type_by_id(wp->w_buffer, text_props[tpi].tp_type); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4330 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4331 if (pt != NULL) |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4332 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4333 int pt_attr = syn_id2attr(pt->pt_hl_id); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4334 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4335 text_prop_type = pt; |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4336 if (text_prop_attr == 0) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4337 text_prop_attr = pt_attr; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4338 else |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4339 text_prop_attr = hl_combine_attr(text_prop_attr, pt_attr); |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4340 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4341 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4342 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4343 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4344 #endif |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4345 |
| 674 | 4346 /* Decide which of the highlight attributes to use. */ |
| 4347 attr_pri = TRUE; | |
| 6717 | 4348 #ifdef LINE_ATTR |
| 674 | 4349 if (area_attr != 0) |
| 6717 | 4350 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4351 else if (search_attr != 0) |
| 6717 | 4352 char_attr = hl_combine_attr(line_attr, search_attr); |
| 674 | 4353 /* Use line_attr when not in the Visual or 'incsearch' area |
| 4354 * (area_attr may be 0 when "noinvcur" is set). */ | |
| 4355 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) | |
| 1842 | 4356 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4357 || vcol >= tocol)) | |
| 674 | 4358 char_attr = line_attr; |
| 6717 | 4359 #else |
| 4360 if (area_attr != 0) | |
| 4361 char_attr = area_attr; | |
| 4362 else if (search_attr != 0) | |
| 4363 char_attr = search_attr; | |
| 674 | 4364 #endif |
| 4365 else | |
| 4366 { | |
| 4367 attr_pri = FALSE; | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4368 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4369 if (text_prop_type != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4370 char_attr = text_prop_attr; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4371 else |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4372 #endif |
| 674 | 4373 #ifdef FEAT_SYN_HL |
| 4374 if (has_syntax) | |
| 4375 char_attr = syntax_attr; | |
| 4376 else | |
| 4377 #endif | |
| 4378 char_attr = 0; | |
| 4379 } | |
| 7 | 4380 } |
| 4381 | |
| 4382 /* | |
| 4383 * Get the next character to put on the screen. | |
| 4384 */ | |
| 4385 /* | |
| 1340 | 4386 * The "p_extra" points to the extra stuff that is inserted to |
| 4387 * represent special characters (non-printable stuff) and other | |
| 4388 * things. When all characters are the same, c_extra is used. | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4389 * If c_final is set, it will compulsorily be used at the end. |
| 1340 | 4390 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past |
| 4391 * "p_extra[n_extra]". | |
| 7 | 4392 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4393 */ | |
| 4394 if (n_extra > 0) | |
| 4395 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4396 if (c_extra != NUL || (n_extra == 1 && c_final != NUL)) |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4397 { |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4398 c = (n_extra == 1 && c_final != NUL) ? c_final : c_extra; |
| 7 | 4399 #ifdef FEAT_MBYTE |
| 4400 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
|
4401 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4402 { |
| 4403 mb_utf8 = TRUE; | |
| 714 | 4404 u8cc[0] = 0; |
| 819 | 4405 c = 0xc0; |
| 7 | 4406 } |
| 4407 else | |
| 4408 mb_utf8 = FALSE; | |
| 4409 #endif | |
| 4410 } | |
| 4411 else | |
| 4412 { | |
| 4413 c = *p_extra; | |
| 4414 #ifdef FEAT_MBYTE | |
| 4415 if (has_mbyte) | |
| 4416 { | |
| 4417 mb_c = c; | |
| 4418 if (enc_utf8) | |
| 4419 { | |
| 4420 /* If the UTF-8 character is more than one byte: | |
| 4421 * 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
|
4422 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4423 mb_utf8 = FALSE; |
| 4424 if (mb_l > n_extra) | |
| 4425 mb_l = 1; | |
| 4426 else if (mb_l > 1) | |
| 4427 { | |
| 714 | 4428 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4429 mb_utf8 = TRUE; |
| 819 | 4430 c = 0xc0; |
| 7 | 4431 } |
| 4432 } | |
| 4433 else | |
| 4434 { | |
| 4435 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4436 mb_l = MB_BYTE2LEN(c); | |
| 4437 if (mb_l >= n_extra) | |
| 4438 mb_l = 1; | |
| 4439 else if (mb_l > 1) | |
| 4440 mb_c = (c << 8) + p_extra[1]; | |
| 4441 } | |
| 504 | 4442 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4443 mb_l = 1; | |
| 4444 | |
| 7 | 4445 /* If a double-width char doesn't fit display a '>' in the |
| 4446 * last column. */ | |
| 504 | 4447 if (( |
| 7 | 4448 # ifdef FEAT_RIGHTLEFT |
| 4449 wp->w_p_rl ? (col <= 0) : | |
| 4450 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4451 (col >= wp->w_width - 1)) |
| 7 | 4452 && (*mb_char2cells)(mb_c) == 2) |
| 4453 { | |
| 4454 c = '>'; | |
| 4455 mb_c = c; | |
| 4456 mb_l = 1; | |
| 4457 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
|
4458 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4459 /* put the pointer back to output the double-width |
| 4460 * character at the start of the next line. */ | |
| 4461 ++n_extra; | |
| 4462 --p_extra; | |
| 4463 } | |
| 4464 else | |
| 4465 { | |
| 4466 n_extra -= mb_l - 1; | |
| 4467 p_extra += mb_l - 1; | |
| 4468 } | |
| 4469 } | |
| 4470 #endif | |
| 4471 ++p_extra; | |
| 4472 } | |
| 4473 --n_extra; | |
| 4474 } | |
| 4475 else | |
| 4476 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4477 #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
|
4478 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4479 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4480 |
| 6026 | 4481 if (p_extra_free != NULL) |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
4482 VIM_CLEAR(p_extra_free); |
| 7 | 4483 /* |
| 4484 * Get a character from the line itself. | |
| 4485 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4486 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4487 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4488 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4489 #endif |
| 7 | 4490 #ifdef FEAT_MBYTE |
| 4491 if (has_mbyte) | |
| 4492 { | |
| 4493 mb_c = c; | |
| 4494 if (enc_utf8) | |
| 4495 { | |
| 4496 /* If the UTF-8 character is more than one byte: Decode it | |
| 4497 * 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
|
4498 mb_l = utfc_ptr2len(ptr); |
| 7 | 4499 mb_utf8 = FALSE; |
| 4500 if (mb_l > 1) | |
| 4501 { | |
| 714 | 4502 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4503 /* Overlong encoded ASCII or ASCII with composing char |
| 4504 * is displayed normally, except a NUL. */ | |
| 4505 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
|
4506 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4507 c = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4508 # ifdef FEAT_LINEBREAK |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4509 c0 = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4510 # endif |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4511 } |
| 7 | 4512 mb_utf8 = TRUE; |
| 507 | 4513 |
| 4514 /* At start of the line we can have a composing char. | |
| 4515 * Draw it as a space with a composing char. */ | |
| 4516 if (utf_iscomposing(mb_c)) | |
| 4517 { | |
| 1326 | 4518 int i; |
| 4519 | |
| 714 | 4520 for (i = Screen_mco - 1; i > 0; --i) |
| 4521 u8cc[i] = u8cc[i - 1]; | |
| 4522 u8cc[0] = mb_c; | |
| 507 | 4523 mb_c = ' '; |
| 4524 } | |
| 7 | 4525 } |
| 4526 | |
| 4527 if ((mb_l == 1 && c >= 0x80) | |
| 4528 || (mb_l >= 1 && mb_c == 0) | |
| 4529 || (mb_l > 1 && (!vim_isprintc(mb_c) | |
| 1401 | 4530 # ifdef UNICODE16 |
| 4531 || mb_c >= 0x10000 | |
| 4532 # endif | |
| 4533 ))) | |
| 7 | 4534 { |
| 4535 /* | |
| 4536 * Illegal UTF-8 byte: display as <xx>. | |
| 4537 * Non-BMP character : display as ? or fullwidth ?. | |
| 4538 */ | |
| 1401 | 4539 # ifdef UNICODE16 |
| 7 | 4540 if (mb_c < 0x10000) |
| 1401 | 4541 # endif |
| 7 | 4542 { |
| 4543 transchar_hex(extra, mb_c); | |
| 714 | 4544 # ifdef FEAT_RIGHTLEFT |
| 7 | 4545 if (wp->w_p_rl) /* reverse */ |
| 4546 rl_mirror(extra); | |
| 714 | 4547 # endif |
| 7 | 4548 } |
| 1401 | 4549 # ifdef UNICODE16 |
| 7 | 4550 else if (utf_char2cells(mb_c) != 2) |
| 4551 STRCPY(extra, "?"); | |
| 4552 else | |
| 4553 /* 0xff1f in UTF-8: full-width '?' */ | |
| 4554 STRCPY(extra, "\357\274\237"); | |
| 1401 | 4555 # endif |
| 7 | 4556 |
| 4557 p_extra = extra; | |
| 4558 c = *p_extra; | |
| 4559 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4560 mb_utf8 = (c >= 0x80); | |
| 4561 n_extra = (int)STRLEN(p_extra); | |
| 4562 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4563 c_final = NUL; |
| 7 | 4564 if (area_attr == 0 && search_attr == 0) |
| 4565 { | |
| 4566 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
|
4567 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4568 saved_attr2 = char_attr; /* save current attr */ |
| 4569 } | |
| 4570 } | |
| 4571 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4572 mb_l = 1; | |
| 4573 #ifdef FEAT_ARABIC | |
| 4574 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4575 { | |
| 4576 /* Do Arabic shaping. */ | |
| 714 | 4577 int pc, pc1, nc; |
| 4578 int pcc[MAX_MCO]; | |
| 7 | 4579 |
| 4580 /* The idea of what is the previous and next | |
| 4581 * character depends on 'rightleft'. */ | |
| 4582 if (wp->w_p_rl) | |
| 4583 { | |
| 4584 pc = prev_c; | |
| 4585 pc1 = prev_c1; | |
| 4586 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4587 prev_c1 = u8cc[0]; |
| 7 | 4588 } |
| 4589 else | |
| 4590 { | |
| 714 | 4591 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4592 nc = prev_c; |
| 714 | 4593 pc1 = pcc[0]; |
| 7 | 4594 } |
| 4595 prev_c = mb_c; | |
| 4596 | |
| 714 | 4597 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4598 } |
| 4599 else | |
| 4600 prev_c = mb_c; | |
| 4601 #endif | |
| 4602 } | |
| 4603 else /* enc_dbcs */ | |
| 4604 { | |
| 4605 mb_l = MB_BYTE2LEN(c); | |
| 4606 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4607 mb_l = 1; | |
| 4608 else if (mb_l > 1) | |
| 4609 { | |
| 4610 /* We assume a second byte below 32 is illegal. | |
| 4611 * Hopefully this is OK for all double-byte encodings! | |
| 4612 */ | |
| 4613 if (ptr[1] >= 32) | |
| 4614 mb_c = (c << 8) + ptr[1]; | |
| 4615 else | |
| 4616 { | |
| 4617 if (ptr[1] == NUL) | |
| 4618 { | |
| 4619 /* head byte at end of line */ | |
| 4620 mb_l = 1; | |
| 4621 transchar_nonprint(extra, c); | |
| 4622 } | |
| 4623 else | |
| 4624 { | |
| 4625 /* illegal tail byte */ | |
| 4626 mb_l = 2; | |
| 4627 STRCPY(extra, "XX"); | |
| 4628 } | |
| 4629 p_extra = extra; | |
| 4630 n_extra = (int)STRLEN(extra) - 1; | |
| 4631 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4632 c_final = NUL; |
| 7 | 4633 c = *p_extra++; |
| 4634 if (area_attr == 0 && search_attr == 0) | |
| 4635 { | |
| 4636 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
|
4637 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4638 saved_attr2 = char_attr; /* save current attr */ |
| 4639 } | |
| 4640 mb_c = c; | |
| 4641 } | |
| 4642 } | |
| 4643 } | |
| 4644 /* If a double-width char doesn't fit display a '>' in the | |
| 4645 * last column; the character is displayed at the start of the | |
| 4646 * next line. */ | |
| 4647 if (( | |
| 4648 # ifdef FEAT_RIGHTLEFT | |
| 4649 wp->w_p_rl ? (col <= 0) : | |
| 4650 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4651 (col >= wp->w_width - 1)) |
| 7 | 4652 && (*mb_char2cells)(mb_c) == 2) |
| 4653 { | |
| 4654 c = '>'; | |
| 4655 mb_c = c; | |
| 4656 mb_utf8 = FALSE; | |
| 4657 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
|
4658 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4659 /* Put pointer back so that the character will be |
| 4660 * displayed at the start of the next line. */ | |
| 4661 --ptr; | |
| 4662 } | |
| 4663 else if (*ptr != NUL) | |
| 4664 ptr += mb_l - 1; | |
| 4665 | |
| 4666 /* 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
|
4667 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4668 * 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
|
4669 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4670 { |
| 4671 n_extra = 1; | |
| 3586 | 4672 c_extra = MB_FILLER_CHAR; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4673 c_final = NUL; |
| 7 | 4674 c = ' '; |
| 4675 if (area_attr == 0 && search_attr == 0) | |
| 4676 { | |
| 4677 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
|
4678 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4679 saved_attr2 = char_attr; /* save current attr */ |
| 4680 } | |
| 4681 mb_c = c; | |
| 4682 mb_utf8 = FALSE; | |
| 4683 mb_l = 1; | |
| 4684 } | |
| 4685 | |
| 4686 } | |
| 4687 #endif | |
| 4688 ++ptr; | |
| 4689 | |
| 4690 if (extra_check) | |
| 4691 { | |
| 743 | 4692 #ifdef FEAT_SPELL |
| 221 | 4693 int can_spell = TRUE; |
| 743 | 4694 #endif |
| 4695 | |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4696 #ifdef FEAT_TERMINAL |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4697 if (get_term_attr) |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4698 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4699 syntax_attr = term_get_attr(wp->w_buffer, lnum, vcol); |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4700 |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4701 if (!attr_pri) |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4702 char_attr = syntax_attr; |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4703 else |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4704 char_attr = hl_combine_attr(syntax_attr, char_attr); |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4705 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4706 #endif |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4707 |
| 743 | 4708 #ifdef FEAT_SYN_HL |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4709 // Get syntax attribute, unless still at the start of the line |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4710 // (double-wide char that doesn't fit). |
| 221 | 4711 v = (long)(ptr - line); |
| 4712 if (has_syntax && v > 0) | |
| 7 | 4713 { |
| 4714 /* Get the syntax attribute for the character. If there | |
| 4715 * is an error, disable syntax highlighting. */ | |
| 4716 save_did_emsg = did_emsg; | |
| 4717 did_emsg = FALSE; | |
| 4718 | |
| 221 | 4719 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4720 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4721 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4722 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4723 NULL, FALSE); |
| 7 | 4724 |
| 4725 if (did_emsg) | |
| 482 | 4726 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4727 wp->w_s->b_syn_error = TRUE; |
| 482 | 4728 has_syntax = FALSE; |
| 4729 } | |
| 7 | 4730 else |
| 4731 did_emsg = save_did_emsg; | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4732 #ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4733 if (wp->w_s->b_syn_slow) |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4734 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4735 #endif |
| 7 | 4736 |
| 4737 /* Need to get the line again, a multi-line regexp may | |
| 4738 * have made it invalid. */ | |
| 4739 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4740 ptr = line + v; | |
| 4741 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4742 # ifdef FEAT_TEXT_PROP |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4743 // Text properties overrule syntax highlighting. |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4744 if (text_prop_attr == 0) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4745 #endif |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4746 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4747 if (!attr_pri) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4748 char_attr = syntax_attr; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4749 else |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4750 char_attr = hl_combine_attr(syntax_attr, char_attr); |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4751 } |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4752 # 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
|
4753 /* 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
|
4754 * 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
|
4755 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
|
4756 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
|
4757 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
|
4758 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
|
4759 # endif |
| 7 | 4760 } |
| 743 | 4761 #endif |
| 4762 | |
| 4763 #ifdef FEAT_SPELL | |
| 301 | 4764 /* Check spelling (unless at the end of the line). |
| 319 | 4765 * Only do this when there is no syntax highlighting, the |
| 4766 * @Spell cluster is not used or the current syntax item | |
| 4767 * contains the @Spell cluster. */ | |
| 348 | 4768 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4769 { |
| 230 | 4770 spell_attr = 0; |
| 743 | 4771 if (c != 0 && ( |
| 4772 # ifdef FEAT_SYN_HL | |
| 4773 !has_syntax || | |
| 4774 # endif | |
| 4775 can_spell)) | |
| 221 | 4776 { |
| 348 | 4777 char_u *prev_ptr, *p; |
| 4778 int len; | |
| 534 | 4779 hlf_T spell_hlf = HLF_COUNT; |
| 221 | 4780 # ifdef FEAT_MBYTE |
| 336 | 4781 if (has_mbyte) |
| 4782 { | |
| 4783 prev_ptr = ptr - mb_l; | |
| 4784 v -= mb_l - 1; | |
| 4785 } | |
| 4786 else | |
| 221 | 4787 # endif |
| 336 | 4788 prev_ptr = ptr - 1; |
| 348 | 4789 |
| 4790 /* Use nextline[] if possible, it has the start of the | |
| 4791 * next line concatenated. */ | |
| 4792 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4793 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4794 else | |
| 4795 p = prev_ptr; | |
| 835 | 4796 cap_col -= (int)(prev_ptr - line); |
| 625 | 4797 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4798 nochange); | |
| 348 | 4799 word_end = v + len; |
| 301 | 4800 |
| 4801 /* In Insert mode only highlight a word that | |
| 4802 * doesn't touch the cursor. */ | |
| 534 | 4803 if (spell_hlf != HLF_COUNT |
| 301 | 4804 && (State & INSERT) != 0 |
| 4805 && wp->w_cursor.lnum == lnum | |
| 4806 && wp->w_cursor.col >= | |
| 4807 (colnr_T)(prev_ptr - line) | |
| 4808 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4809 { |
| 534 | 4810 spell_hlf = HLF_COUNT; |
| 301 | 4811 spell_redraw_lnum = lnum; |
| 221 | 4812 } |
| 348 | 4813 |
| 534 | 4814 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4815 && (p - nextline) + len > nextline_idx) |
| 4816 { | |
| 4817 /* Remember that the good word continues at the | |
| 4818 * start of the next line. */ | |
| 4819 checked_lnum = lnum + 1; | |
| 835 | 4820 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4821 } |
| 386 | 4822 |
| 534 | 4823 /* Turn index into actual attributes. */ |
| 4824 if (spell_hlf != HLF_COUNT) | |
| 4825 spell_attr = highlight_attr[spell_hlf]; | |
| 4826 | |
| 386 | 4827 if (cap_col > 0) |
| 4828 { | |
| 4829 if (p != prev_ptr | |
| 4830 && (p - nextline) + cap_col >= nextline_idx) | |
| 4831 { | |
| 4832 /* Remember that the word in the next line | |
| 4833 * must start with a capital. */ | |
| 4834 capcol_lnum = lnum + 1; | |
| 835 | 4835 cap_col = (int)((p - nextline) + cap_col |
| 4836 - nextline_idx); | |
| 386 | 4837 } |
| 4838 else | |
| 4839 /* Compute the actual column. */ | |
| 835 | 4840 cap_col += (int)(prev_ptr - line); |
| 386 | 4841 } |
| 221 | 4842 } |
| 4843 } | |
| 4844 if (spell_attr != 0) | |
| 348 | 4845 { |
| 674 | 4846 if (!attr_pri) |
| 348 | 4847 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4848 else | |
| 4849 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4850 } | |
| 7 | 4851 #endif |
| 4852 #ifdef FEAT_LINEBREAK | |
| 4853 /* | |
| 221 | 4854 * Found last space before word: check for line break. |
| 7 | 4855 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4856 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
|
4857 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4858 { |
| 6681 | 4859 # ifdef FEAT_MBYTE |
| 6693 | 4860 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
| 6681 | 4861 # endif |
| 5995 | 4862 char_u *p = ptr - ( |
| 7 | 4863 # ifdef FEAT_MBYTE |
| 6693 | 4864 mb_off + |
| 7 | 4865 # endif |
| 5995 | 4866 1); |
| 6681 | 4867 |
| 5995 | 4868 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4869 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4870 NULL) - 1; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4871 if (c == TAB && n_extra + col > wp->w_width) |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4872 # ifdef FEAT_VARTABS |
|
14198
9ca8c36869ce
patch 8.1.0116: display problem with 'vartabstop' and 'linebreak'
Christian Brabandt <cb@256bit.org>
parents:
14191
diff
changeset
|
4873 n_extra = tabstop_padding(vcol, wp->w_buffer->b_p_ts, |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4874 wp->w_buffer->b_p_vts_array) - 1; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4875 # else |
| 6371 | 4876 n_extra = (int)wp->w_buffer->b_p_ts |
| 4877 - vcol % (int)wp->w_buffer->b_p_ts - 1; | |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4878 # endif |
| 6371 | 4879 |
| 6681 | 4880 # ifdef FEAT_MBYTE |
| 6693 | 4881 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; |
| 6681 | 4882 # else |
| 7 | 4883 c_extra = ' '; |
| 6681 | 4884 # endif |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4885 c_final = NUL; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4886 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4887 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4888 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4889 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4890 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4891 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4892 #endif |
| 6026 | 4893 if (!wp->w_p_list) |
| 4894 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4895 } |
| 7 | 4896 } |
| 4897 #endif | |
| 4898 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4899 /* '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
|
4900 */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4901 if (wp->w_p_list |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4902 && (((c == 160 |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4903 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4904 || (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
|
4905 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4906 ) && lcs_nbsp) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4907 || (c == ' ' && lcs_space && ptr - line <= trailcol))) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4908 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4909 c = (c == ' ') ? lcs_space : lcs_nbsp; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4910 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
|
4911 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4912 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
|
4913 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
|
4914 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
|
4915 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4916 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4917 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
|
4918 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
|
4919 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4920 mb_utf8 = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4921 u8cc[0] = 0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4922 c = 0xc0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4923 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4924 else |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4925 mb_utf8 = FALSE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4926 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4927 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4928 |
| 7 | 4929 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4930 { | |
| 4931 c = lcs_trail; | |
| 674 | 4932 if (!attr_pri) |
| 7 | 4933 { |
| 4934 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
|
4935 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4936 saved_attr2 = char_attr; /* save current attr */ |
| 4937 } | |
| 4938 #ifdef FEAT_MBYTE | |
| 4939 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
|
4940 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4941 { |
| 4942 mb_utf8 = TRUE; | |
| 714 | 4943 u8cc[0] = 0; |
| 819 | 4944 c = 0xc0; |
| 7 | 4945 } |
| 4946 else | |
| 4947 mb_utf8 = FALSE; | |
| 4948 #endif | |
| 4949 } | |
| 4950 } | |
| 4951 | |
| 4952 /* | |
| 4953 * Handling of non-printable characters. | |
| 4954 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4955 if (!vim_isprintc(c)) |
| 7 | 4956 { |
| 4957 /* | |
| 4958 * when getting a character from the file, we may have to | |
| 4959 * turn it into something else on the way to putting it | |
| 4960 * into "ScreenLines". | |
| 4961 */ | |
| 4962 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4963 { | |
| 6026 | 4964 int tab_len = 0; |
| 6503 | 4965 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 4966 #ifdef FEAT_LINEBREAK | |
| 4967 /* only adjust the tab_len, when at the first column | |
| 4968 * after the showbreak value was drawn */ | |
| 4969 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 4970 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 4971 #endif | |
| 7 | 4972 /* tab amount depends on current column */ |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4973 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4974 tab_len = tabstop_padding(vcol_adjusted, |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4975 wp->w_buffer->b_p_ts, |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4976 wp->w_buffer->b_p_vts_array) - 1; |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4977 #else |
| 6026 | 4978 tab_len = (int)wp->w_buffer->b_p_ts |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4979 - vcol_adjusted % (int)wp->w_buffer->b_p_ts - 1; |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
4980 #endif |
| 6503 | 4981 |
| 6026 | 4982 #ifdef FEAT_LINEBREAK |
| 6100 | 4983 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 4984 #endif |
| 4985 /* tab amount depends on current column */ | |
| 4986 n_extra = tab_len; | |
| 4987 #ifdef FEAT_LINEBREAK | |
| 4988 else | |
| 4989 { | |
| 4990 char_u *p; | |
| 4991 int len = n_extra; | |
| 4992 int i; | |
| 4993 int saved_nextra = n_extra; | |
| 4994 | |
| 6172 | 4995 #ifdef FEAT_CONCEAL |
| 6627 | 4996 if (vcol_off > 0) |
| 6172 | 4997 /* there are characters to conceal */ |
| 4998 tab_len += vcol_off; | |
| 6520 | 4999 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 5000 */ | |
| 5001 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 5002 && n_extra > tab_len) | |
| 5003 tab_len += n_extra - tab_len; | |
| 5004 #endif | |
| 5005 | |
| 6026 | 5006 /* if n_extra > 0, it gives the number of chars, to |
| 5007 * use for a tab, else we need to calculate the width | |
| 5008 * for a tab */ | |
| 5009 #ifdef FEAT_MBYTE | |
| 5010 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 5011 if (n_extra > 0) | |
| 5012 len += n_extra - tab_len; | |
| 5013 #endif | |
| 5014 c = lcs_tab1; | |
| 5015 p = alloc((unsigned)(len + 1)); | |
| 5016 vim_memset(p, ' ', len); | |
| 5017 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5018 vim_free(p_extra_free); |
| 6026 | 5019 p_extra_free = p; |
| 5020 for (i = 0; i < tab_len; i++) | |
| 5021 { | |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5022 if (*p == NUL) |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5023 { |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5024 tab_len = i; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5025 break; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5026 } |
| 6026 | 5027 #ifdef FEAT_MBYTE |
| 5028 mb_char2bytes(lcs_tab2, p); | |
| 5029 p += mb_char2len(lcs_tab2); | |
| 5030 n_extra += mb_char2len(lcs_tab2) | |
| 5031 - (saved_nextra > 0 ? 1 : 0); | |
| 5032 #else | |
| 5033 p[i] = lcs_tab2; | |
| 5034 #endif | |
| 5035 } | |
| 5036 p_extra = p_extra_free; | |
| 6172 | 5037 #ifdef FEAT_CONCEAL |
| 5038 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 5039 * macro below, so need to adjust for that here */ | |
| 6627 | 5040 if (vcol_off > 0) |
| 6172 | 5041 n_extra -= vcol_off; |
| 5042 #endif | |
| 6026 | 5043 } |
| 5044 #endif | |
| 3984 | 5045 #ifdef FEAT_CONCEAL |
| 6627 | 5046 { |
| 5047 int vc_saved = vcol_off; | |
| 5048 | |
| 5049 /* Tab alignment should be identical regardless of | |
| 5050 * 'conceallevel' value. So tab compensates of all | |
| 5051 * previous concealed characters, and thus resets | |
| 5052 * vcol_off and boguscols accumulated so far in the | |
| 5053 * line. Note that the tab can be longer than | |
| 5054 * 'tabstop' when there are concealed characters. */ | |
| 5055 FIX_FOR_BOGUSCOLS; | |
| 5056 | |
| 5057 /* Make sure, the highlighting for the tab char will be | |
| 5058 * correctly set further below (effectively reverts the | |
| 5059 * FIX_FOR_BOGSUCOLS macro */ | |
| 5060 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 5061 && lcs_tab1) |
| 6627 | 5062 tab_len += vc_saved; |
| 5063 } | |
| 3984 | 5064 #endif |
| 7 | 5065 #ifdef FEAT_MBYTE |
| 5066 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5067 #endif | |
| 5068 if (wp->w_p_list) | |
| 5069 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5070 c = (n_extra == 0 && lcs_tab3) ? lcs_tab3 : lcs_tab1; |
| 6026 | 5071 #ifdef FEAT_LINEBREAK |
| 5072 if (wp->w_p_lbr) | |
| 5073 c_extra = NUL; /* using p_extra from above */ | |
| 5074 else | |
| 5075 #endif | |
| 5076 c_extra = lcs_tab2; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5077 c_final = lcs_tab3; |
| 6026 | 5078 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
|
5079 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5080 saved_attr2 = char_attr; /* save current attr */ |
| 5081 #ifdef FEAT_MBYTE | |
| 5082 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
|
5083 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5084 { |
| 5085 mb_utf8 = TRUE; | |
| 714 | 5086 u8cc[0] = 0; |
| 819 | 5087 c = 0xc0; |
| 7 | 5088 } |
| 5089 #endif | |
| 5090 } | |
| 5091 else | |
| 5092 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5093 c_final = NUL; |
| 7 | 5094 c_extra = ' '; |
| 5095 c = ' '; | |
| 5096 } | |
| 5097 } | |
| 36 | 5098 else if (c == NUL |
| 6799 | 5099 && (wp->w_p_list |
| 36 | 5100 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 5101 && tocol > vcol | |
| 5102 && VIsual_mode != Ctrl_V | |
| 5103 && ( | |
| 5104 # ifdef FEAT_RIGHTLEFT | |
| 5105 wp->w_p_rl ? (col >= 0) : | |
| 5106 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5107 (col < wp->w_width)) |
| 36 | 5108 && !(noinvcur |
| 1850 | 5109 && lnum == wp->w_cursor.lnum |
| 36 | 5110 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 5111 && lcs_eol_one > 0) |
| 7 | 5112 { |
| 36 | 5113 /* Display a '$' after the line or highlight an extra |
| 5114 * character if the line break is included. */ | |
| 7 | 5115 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 5116 /* For a diff line the highlighting continues after the | |
| 5117 * "$". */ | |
| 5118 if ( | |
| 5119 # ifdef FEAT_DIFF | |
| 534 | 5120 diff_hlf == (hlf_T)0 |
| 7 | 5121 # ifdef LINE_ATTR |
| 5122 && | |
| 5123 # endif | |
| 5124 # endif | |
| 5125 # ifdef LINE_ATTR | |
| 5126 line_attr == 0 | |
| 5127 # endif | |
| 5128 ) | |
| 5129 #endif | |
| 5130 { | |
| 5131 #ifdef FEAT_VIRTUALEDIT | |
| 5132 /* In virtualedit, visual selections may extend | |
| 5133 * beyond end of line. */ | |
| 5134 if (area_highlighting && virtual_active() | |
| 5135 && tocol != MAXCOL && vcol < tocol) | |
| 5136 n_extra = 0; | |
| 5137 else | |
| 5138 #endif | |
| 5139 { | |
| 5140 p_extra = at_end_str; | |
| 5141 n_extra = 1; | |
| 5142 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5143 c_final = NUL; |
| 7 | 5144 } |
| 5145 } | |
| 6799 | 5146 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 5147 c = lcs_eol; |
| 5148 else | |
| 5149 c = ' '; | |
| 7 | 5150 lcs_eol_one = -1; |
| 5151 --ptr; /* put it back at the NUL */ | |
| 674 | 5152 if (!attr_pri) |
| 7 | 5153 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5154 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 5155 n_attr = 1; |
| 5156 } | |
| 5157 #ifdef FEAT_MBYTE | |
| 5158 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
|
5159 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5160 { |
| 5161 mb_utf8 = TRUE; | |
| 714 | 5162 u8cc[0] = 0; |
| 819 | 5163 c = 0xc0; |
| 7 | 5164 } |
| 5165 else | |
| 5166 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5167 #endif | |
| 5168 } | |
| 5169 else if (c != NUL) | |
| 5170 { | |
| 5171 p_extra = transchar(c); | |
| 6064 | 5172 if (n_extra == 0) |
| 5173 n_extra = byte2cells(c) - 1; | |
| 7 | 5174 #ifdef FEAT_RIGHTLEFT |
| 5175 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5176 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5177 #endif | |
| 5178 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5179 c_final = NUL; |
| 6026 | 5180 #ifdef FEAT_LINEBREAK |
| 5181 if (wp->w_p_lbr) | |
| 5182 { | |
| 5183 char_u *p; | |
| 5184 | |
| 5185 c = *p_extra; | |
| 5186 p = alloc((unsigned)n_extra + 1); | |
| 5187 vim_memset(p, ' ', n_extra); | |
| 5188 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5189 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5190 vim_free(p_extra_free); |
| 6026 | 5191 p_extra_free = p_extra = p; |
| 5192 } | |
| 5193 else | |
| 5194 #endif | |
| 5195 { | |
| 5196 n_extra = byte2cells(c) - 1; | |
| 5197 c = *p_extra++; | |
| 5198 } | |
| 674 | 5199 if (!attr_pri) |
| 7 | 5200 { |
| 5201 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
|
5202 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5203 saved_attr2 = char_attr; /* save current attr */ |
| 5204 } | |
| 5205 #ifdef FEAT_MBYTE | |
| 5206 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5207 #endif | |
| 5208 } | |
| 5209 #ifdef FEAT_VIRTUALEDIT | |
| 5210 else if (VIsual_active | |
| 5211 && (VIsual_mode == Ctrl_V | |
| 5212 || VIsual_mode == 'v') | |
| 5213 && virtual_active() | |
| 5214 && tocol != MAXCOL | |
| 5215 && vcol < tocol | |
| 5216 && ( | |
| 5217 # ifdef FEAT_RIGHTLEFT | |
| 5218 wp->w_p_rl ? (col >= 0) : | |
| 5219 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5220 (col < wp->w_width))) |
| 7 | 5221 { |
| 5222 c = ' '; | |
| 5223 --ptr; /* put it back at the NUL */ | |
| 5224 } | |
| 5225 #endif | |
| 910 | 5226 #if defined(LINE_ATTR) |
| 7 | 5227 else if (( |
| 5228 # ifdef FEAT_DIFF | |
| 910 | 5229 diff_hlf != (hlf_T)0 || |
| 7 | 5230 # endif |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5231 # ifdef FEAT_TERMINAL |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5232 term_attr != 0 || |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5233 # endif |
| 7 | 5234 line_attr != 0 |
| 5235 ) && ( | |
| 5236 # ifdef FEAT_RIGHTLEFT | |
| 5237 wp->w_p_rl ? (col >= 0) : | |
| 5238 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5239 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5240 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5241 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5242 # endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5243 < wp->w_width))) |
| 7 | 5244 { |
| 5245 /* Highlight until the right side of the window */ | |
| 5246 c = ' '; | |
| 5247 --ptr; /* put it back at the NUL */ | |
| 867 | 5248 |
| 5249 /* Remember we do the char for line highlighting. */ | |
| 5250 ++did_line_attr; | |
| 5251 | |
| 5252 /* don't do search HL for the rest of the line */ | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5253 if (line_attr != 0 && char_attr == search_attr |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5254 && (did_line_attr > 1 |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5255 || (wp->w_p_list && lcs_eol > 0))) |
| 867 | 5256 char_attr = line_attr; |
| 7 | 5257 # ifdef FEAT_DIFF |
| 5258 if (diff_hlf == HLF_TXD) | |
| 5259 { | |
| 5260 diff_hlf = HLF_CHD; | |
| 5261 if (attr == 0 || char_attr != attr) | |
| 6106 | 5262 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5263 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5264 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5265 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
|
5266 HL_ATTR(HLF_CUL)); |
| 6106 | 5267 } |
| 7 | 5268 } |
| 5269 # endif | |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5270 # ifdef FEAT_TERMINAL |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5271 if (term_attr != 0) |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5272 { |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5273 char_attr = term_attr; |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5274 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5275 char_attr = hl_combine_attr(char_attr, |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5276 HL_ATTR(HLF_CUL)); |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5277 } |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5278 # endif |
| 7 | 5279 } |
| 5280 #endif | |
| 5281 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5282 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5283 #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
|
5284 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
|
5285 && (wp != curwin || lnum != wp->w_cursor.lnum || |
| 6947 | 5286 conceal_cursor_line(wp) ) |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5287 && ( (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
|
5288 && !(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
|
5289 && 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
|
5290 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5291 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5292 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5293 && (syn_get_sub_char() != NUL || match_conc |
| 5294 || 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
|
5295 && 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
|
5296 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5297 /* 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
|
5298 * character. */ |
| 6947 | 5299 if (match_conc) |
| 5300 c = match_conc; | |
| 5301 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
|
5302 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5303 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5304 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5305 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5306 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5307 |
|
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
|
5308 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5309 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5310 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5311 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5312 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5313 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
|
5314 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5315 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5316 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5317 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5318 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5319 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5320 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5321 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5322 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5323 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5324 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5325 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5326 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5327 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5328 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5329 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5330 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5331 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5332 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5333 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5334 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5335 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5336 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5337 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
|
5338 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
|
5339 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5340 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5341 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5342 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5343 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5344 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5345 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
|
5346 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5347 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5348 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5349 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5350 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
|
5351 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5352 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5353 #endif /* FEAT_CONCEAL */ |
| 7 | 5354 } |
| 5355 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5356 #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
|
5357 /* 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
|
5358 * 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
|
5359 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
|
5360 && 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
|
5361 && 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
|
5362 && (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
|
5363 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5364 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5365 if (wp->w_p_rl) |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5366 wp->w_wcol = wp->w_width - col + boguscols - 1; |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5367 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5368 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5369 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
|
5370 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
|
5371 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
|
5372 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5373 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5374 |
| 7 | 5375 /* Don't override visual selection highlighting. */ |
| 5376 if (n_attr > 0 | |
| 5377 && draw_state == WL_LINE | |
| 674 | 5378 && !attr_pri) |
| 7 | 5379 char_attr = extra_attr; |
| 5380 | |
| 42 | 5381 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5382 /* XIM don't send preedit_start and preedit_end, but they send |
| 5383 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5384 * im_is_preediting() here. */ | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12244
diff
changeset
|
5385 if (p_imst == IM_ON_THE_SPOT |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12244
diff
changeset
|
5386 && xic != NULL |
| 1850 | 5387 && lnum == wp->w_cursor.lnum |
| 7 | 5388 && (State & INSERT) |
| 5389 && !p_imdisable | |
| 5390 && im_is_preediting() | |
| 5391 && draw_state == WL_LINE) | |
| 5392 { | |
| 5393 colnr_T tcol; | |
| 5394 | |
| 5395 if (preedit_end_col == MAXCOL) | |
| 1850 | 5396 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5397 else |
| 5398 tcol = preedit_end_col; | |
| 5399 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5400 { | |
| 5401 if (feedback_old_attr < 0) | |
| 5402 { | |
| 5403 feedback_col = 0; | |
| 5404 feedback_old_attr = char_attr; | |
| 5405 } | |
| 5406 char_attr = im_get_feedback_attr(feedback_col); | |
| 5407 if (char_attr < 0) | |
| 5408 char_attr = feedback_old_attr; | |
| 5409 feedback_col++; | |
| 5410 } | |
| 5411 else if (feedback_old_attr >= 0) | |
| 5412 { | |
| 5413 char_attr = feedback_old_attr; | |
| 5414 feedback_old_attr = -1; | |
| 5415 feedback_col = 0; | |
| 5416 } | |
| 5417 } | |
| 5418 #endif | |
| 5419 /* | |
| 5420 * Handle the case where we are in column 0 but not on the first | |
| 5421 * character of the line and the user wants us to show us a | |
| 5422 * special character (via 'listchars' option "precedes:<char>". | |
| 5423 */ | |
| 5424 if (lcs_prec_todo != NUL | |
| 6276 | 5425 && wp->w_p_list |
| 7 | 5426 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5427 #ifdef FEAT_DIFF | |
| 5428 && filler_todo <= 0 | |
| 5429 #endif | |
| 5430 && draw_state > WL_NR | |
| 5431 && c != NUL) | |
| 5432 { | |
| 5433 c = lcs_prec; | |
| 5434 lcs_prec_todo = NUL; | |
| 5435 #ifdef FEAT_MBYTE | |
| 3586 | 5436 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5437 { | |
| 5438 /* Double-width character being overwritten by the "precedes" | |
| 5439 * character, need to fill up half the character. */ | |
| 5440 c_extra = MB_FILLER_CHAR; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5441 c_final = NUL; |
| 3586 | 5442 n_extra = 1; |
| 5443 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
|
5444 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5445 } |
| 7 | 5446 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
|
5447 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5448 { |
| 5449 mb_utf8 = TRUE; | |
| 714 | 5450 u8cc[0] = 0; |
| 819 | 5451 c = 0xc0; |
| 7 | 5452 } |
| 5453 else | |
| 5454 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5455 #endif | |
| 674 | 5456 if (!attr_pri) |
| 7 | 5457 { |
| 5458 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
|
5459 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5460 n_attr3 = 1; |
| 5461 } | |
| 5462 } | |
| 5463 | |
| 5464 /* | |
| 867 | 5465 * At end of the text line or just after the last character. |
| 7 | 5466 */ |
| 867 | 5467 if (c == NUL |
| 910 | 5468 #if defined(LINE_ATTR) |
| 867 | 5469 || did_line_attr == 1 |
| 5470 #endif | |
| 5471 ) | |
| 5472 { | |
| 5473 #ifdef FEAT_SEARCH_EXTRA | |
| 5474 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5475 |
| 5476 /* we're not really at that column when skipping some text */ | |
| 1439 | 5477 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5478 ++prevcol; |
| 867 | 5479 #endif |
| 5480 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5481 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5482 * highlight match at end of line. If it's beyond the last |
| 5483 * char on the screen, just overwrite that one (tricky!) Not | |
| 5484 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5485 #ifdef FEAT_SEARCH_EXTRA |
| 5486 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5487 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5488 prevcol_hl_flag = TRUE; |
| 5489 else | |
| 5490 { | |
| 5491 cur = wp->w_match_head; | |
| 5492 while (cur != NULL) | |
| 5493 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5494 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5495 { |
| 5496 prevcol_hl_flag = TRUE; | |
| 5497 break; | |
| 5498 } | |
| 5499 cur = cur->next; | |
| 5500 } | |
| 5501 } | |
| 5502 #endif | |
| 7 | 5503 if (lcs_eol == lcs_eol_one |
| 1850 | 5504 && ((area_attr != 0 && vcol == fromcol |
| 5505 && (VIsual_mode != Ctrl_V | |
| 5506 || lnum == VIsual.lnum | |
| 5507 || lnum == curwin->w_cursor.lnum) | |
| 5508 && c == NUL) | |
| 7 | 5509 #ifdef FEAT_SEARCH_EXTRA |
| 5510 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5511 || (prevcol_hl_flag == TRUE |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5512 # ifdef FEAT_SYN_HL |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5513 && !(wp->w_p_cul && lnum == wp->w_cursor.lnum |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5514 && !(wp == curwin && VIsual_active)) |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5515 # endif |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5516 # ifdef FEAT_DIFF |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5517 && diff_hlf == (hlf_T)0 |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5518 # endif |
| 910 | 5519 # if defined(LINE_ATTR) |
| 867 | 5520 && did_line_attr <= 1 |
| 5521 # endif | |
| 5522 ) | |
| 7 | 5523 #endif |
| 5524 )) | |
| 5525 { | |
| 5526 int n = 0; | |
| 5527 | |
| 5528 #ifdef FEAT_RIGHTLEFT | |
| 5529 if (wp->w_p_rl) | |
| 5530 { | |
| 5531 if (col < 0) | |
| 5532 n = 1; | |
| 5533 } | |
| 5534 else | |
| 5535 #endif | |
| 5536 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5537 if (col >= wp->w_width) |
| 7 | 5538 n = -1; |
| 5539 } | |
| 5540 if (n != 0) | |
| 5541 { | |
| 5542 /* At the window boundary, highlight the last character | |
| 5543 * instead (better than nothing). */ | |
| 5544 off += n; | |
| 5545 col += n; | |
| 5546 } | |
| 5547 else | |
| 5548 { | |
| 5549 /* Add a blank character to highlight. */ | |
| 5550 ScreenLines[off] = ' '; | |
| 5551 #ifdef FEAT_MBYTE | |
| 5552 if (enc_utf8) | |
| 5553 ScreenLinesUC[off] = 0; | |
| 5554 #endif | |
| 5555 } | |
| 5556 #ifdef FEAT_SEARCH_EXTRA | |
| 5557 if (area_attr == 0) | |
| 5558 { | |
| 1326 | 5559 /* Use attributes from match with highest priority among |
| 5560 * 'search_hl' and the match list. */ | |
| 5561 char_attr = search_hl.attr; | |
| 5562 cur = wp->w_match_head; | |
| 5563 shl_flag = FALSE; | |
| 5564 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5565 { |
| 1326 | 5566 if (shl_flag == FALSE |
| 5567 && ((cur != NULL | |
| 5568 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5569 || cur == NULL)) | |
| 699 | 5570 { |
| 1326 | 5571 shl = &search_hl; |
| 5572 shl_flag = TRUE; | |
| 699 | 5573 } |
| 1326 | 5574 else |
| 5575 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5576 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
|
5577 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5578 char_attr = shl->attr; |
| 5579 if (shl != &search_hl && cur != NULL) | |
| 5580 cur = cur->next; | |
| 699 | 5581 } |
| 7 | 5582 } |
| 5583 #endif | |
| 5584 ScreenAttrs[off] = char_attr; | |
| 5585 #ifdef FEAT_RIGHTLEFT | |
| 5586 if (wp->w_p_rl) | |
| 1437 | 5587 { |
| 7 | 5588 --col; |
| 1437 | 5589 --off; |
| 5590 } | |
| 7 | 5591 else |
| 5592 #endif | |
| 1437 | 5593 { |
| 7 | 5594 ++col; |
| 1437 | 5595 ++off; |
| 5596 } | |
| 743 | 5597 ++vcol; |
| 1437 | 5598 #ifdef FEAT_SYN_HL |
| 5599 eol_hl_off = 1; | |
| 5600 #endif | |
| 743 | 5601 } |
| 867 | 5602 } |
| 5603 | |
| 5604 /* | |
| 5605 * At end of the text line. | |
| 5606 */ | |
| 5607 if (c == NUL) | |
| 5608 { | |
| 743 | 5609 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5610 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5611 if (wp->w_p_wrap) |
| 5612 v = wp->w_skipcol; | |
| 5613 else | |
| 5614 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5615 |
| 820 | 5616 /* check if line ends before left margin */ |
| 5617 if (vcol < v + col - win_col_off(wp)) | |
| 5618 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
|
5619 #ifdef FEAT_CONCEAL |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5620 /* 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
|
5621 * edge for 'cursorcolumn'. */ |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5622 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5623 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5624 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5625 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5626 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5627 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
|
5628 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5629 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5630 && (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
|
5631 && (int)wp->w_virtcol < |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5632 wp->w_width * (row - startrow + 1) + v |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5633 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5634 || draw_color_col) |
| 743 | 5635 # ifdef FEAT_RIGHTLEFT |
| 5636 && !wp->w_p_rl | |
| 5637 # endif | |
| 5638 ) | |
| 5639 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5640 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5641 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5642 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5643 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5644 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5645 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5646 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5647 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
|
5648 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5649 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5650 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5651 while (col < wp->w_width) |
| 743 | 5652 { |
| 5653 ScreenLines[off] = ' '; | |
| 5654 #ifdef FEAT_MBYTE | |
| 5655 if (enc_utf8) | |
| 5656 ScreenLinesUC[off] = 0; | |
| 5657 #endif | |
| 5658 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5659 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5660 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
|
5661 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5662 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5663 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
|
5664 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
|
5665 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
|
5666 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5667 else |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5668 ScreenAttrs[off++] = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5669 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5670 if (VCOL_HLC >= rightmost_vcol) |
| 743 | 5671 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5672 |
| 743 | 5673 ++vcol; |
| 5674 } | |
| 5675 } | |
| 5676 #endif | |
| 7 | 5677 |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5678 screen_line(screen_row, wp->w_wincol, col, |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5679 (int)wp->w_width, HAS_RIGHTLEFT(wp->w_p_rl)); |
| 7 | 5680 row++; |
| 5681 | |
| 5682 /* | |
| 5683 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5684 * updated (saves a call to plines() later). | |
| 5685 */ | |
| 5686 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5687 { | |
| 5688 curwin->w_cline_row = startrow; | |
| 5689 curwin->w_cline_height = row - startrow; | |
| 5690 #ifdef FEAT_FOLDING | |
| 5691 curwin->w_cline_folded = FALSE; | |
| 5692 #endif | |
| 5693 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5694 } | |
| 5695 | |
| 5696 break; | |
| 5697 } | |
| 5698 | |
| 5699 /* line continues beyond line end */ | |
| 5700 if (lcs_ext | |
| 5701 && !wp->w_p_wrap | |
| 5702 #ifdef FEAT_DIFF | |
| 5703 && filler_todo <= 0 | |
| 5704 #endif | |
| 5705 && ( | |
| 5706 #ifdef FEAT_RIGHTLEFT | |
| 5707 wp->w_p_rl ? col == 0 : | |
| 5708 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5709 col == wp->w_width - 1) |
| 7 | 5710 && (*ptr != NUL |
| 1555 | 5711 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5712 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5713 { | |
| 5714 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
|
5715 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5716 #ifdef FEAT_MBYTE |
| 5717 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
|
5718 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5719 { |
| 5720 mb_utf8 = TRUE; | |
| 714 | 5721 u8cc[0] = 0; |
| 819 | 5722 c = 0xc0; |
| 7 | 5723 } |
| 5724 else | |
| 5725 mb_utf8 = FALSE; | |
| 5726 #endif | |
| 5727 } | |
| 5728 | |
| 743 | 5729 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5730 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5731 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5732 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
|
5733 |
| 743 | 5734 /* 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
|
5735 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5736 * 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
|
5737 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5738 vcol_save_attr = -1; |
|
11585
18373179040e
patch 8.0.0675: 'colorcolumn' has a higher priority than 'hlsearch'
Christian Brabandt <cb@256bit.org>
parents:
11529
diff
changeset
|
5739 if (draw_state == WL_LINE && !lnum_in_visual_area |
|
18373179040e
patch 8.0.0675: 'colorcolumn' has a higher priority than 'hlsearch'
Christian Brabandt <cb@256bit.org>
parents:
11529
diff
changeset
|
5740 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5741 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5742 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
|
5743 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5744 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5745 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
|
5746 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
|
5747 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5748 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
|
5749 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5750 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
|
5751 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
|
5752 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5753 } |
| 743 | 5754 #endif |
| 5755 | |
| 7 | 5756 /* |
| 5757 * Store character to be displayed. | |
| 5758 * Skip characters that are left of the screen for 'nowrap'. | |
| 5759 */ | |
| 5760 vcol_prev = vcol; | |
| 5761 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5762 { | |
| 5763 /* | |
| 5764 * Store the character. | |
| 5765 */ | |
| 5766 #if defined(FEAT_RIGHTLEFT) && defined(FEAT_MBYTE) | |
| 5767 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) | |
| 5768 { | |
| 5769 /* A double-wide character is: put first halve in left cell. */ | |
| 5770 --off; | |
| 5771 --col; | |
| 5772 } | |
| 5773 #endif | |
| 5774 ScreenLines[off] = c; | |
| 5775 #ifdef FEAT_MBYTE | |
| 5776 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5777 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5778 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5779 ScreenLines[off] = 0x8e; |
| 7 | 5780 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5781 } |
| 7 | 5782 else if (enc_utf8) |
| 5783 { | |
| 5784 if (mb_utf8) | |
| 5785 { | |
| 1326 | 5786 int i; |
| 5787 | |
| 7 | 5788 ScreenLinesUC[off] = mb_c; |
| 819 | 5789 if ((c & 0xff) == 0) |
| 5790 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5791 for (i = 0; i < Screen_mco; ++i) |
| 5792 { | |
| 5793 ScreenLinesC[i][off] = u8cc[i]; | |
| 5794 if (u8cc[i] == 0) | |
| 5795 break; | |
| 5796 } | |
| 7 | 5797 } |
| 5798 else | |
| 5799 ScreenLinesUC[off] = 0; | |
| 5800 } | |
| 5801 if (multi_attr) | |
| 5802 { | |
| 5803 ScreenAttrs[off] = multi_attr; | |
| 5804 multi_attr = 0; | |
| 5805 } | |
| 5806 else | |
| 5807 #endif | |
| 5808 ScreenAttrs[off] = char_attr; | |
| 5809 | |
| 5810 #ifdef FEAT_MBYTE | |
| 5811 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5812 { | |
| 5813 /* Need to fill two screen columns. */ | |
| 5814 ++off; | |
| 5815 ++col; | |
| 5816 if (enc_utf8) | |
| 5817 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5818 ScreenLines[off] = 0; | |
| 5819 else | |
| 5820 /* DBCS: Put second byte in the second screen char. */ | |
| 5821 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5822 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5823 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5824 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5825 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5826 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5827 ++vcol; |
| 7 | 5828 /* When "tocol" is halfway a character, set it to the end of |
| 5829 * the character, otherwise highlighting won't stop. */ | |
| 5830 if (tocol == vcol) | |
| 5831 ++tocol; | |
| 5832 #ifdef FEAT_RIGHTLEFT | |
| 5833 if (wp->w_p_rl) | |
| 5834 { | |
| 5835 /* now it's time to backup one cell */ | |
| 5836 --off; | |
| 5837 --col; | |
| 5838 } | |
| 5839 #endif | |
| 5840 } | |
| 5841 #endif | |
| 5842 #ifdef FEAT_RIGHTLEFT | |
| 5843 if (wp->w_p_rl) | |
| 5844 { | |
| 5845 --off; | |
| 5846 --col; | |
| 5847 } | |
| 5848 else | |
| 5849 #endif | |
| 5850 { | |
| 5851 ++off; | |
| 5852 ++col; | |
| 5853 } | |
| 5854 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5855 #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
|
5856 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
|
5857 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5858 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5859 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5860 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5861 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5862 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5863 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5864 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5865 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5866 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5867 * 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
|
5868 * 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
|
5869 * 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
|
5870 * 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
|
5871 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5872 * 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
|
5873 * 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
|
5874 * 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
|
5875 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5876 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5877 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5878 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5879 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5880 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5881 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5882 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5883 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5884 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5885 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5886 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5887 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5888 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5889 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5890 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5891 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5892 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5893 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5894 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5895 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5896 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5897 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5898 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
|
5899 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5900 /* Need to fill two screen columns. */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5901 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5902 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5903 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5904 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5905 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5906 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5907 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5908 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5909 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5910 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5911 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5912 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5913 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5914 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5915 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5916 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5917 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5918 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5919 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5920 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5921 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5922 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5923 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5924 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5925 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5926 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5927 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5928 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5929 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5930 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5931 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5932 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5933 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5934 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5935 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5936 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5937 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5938 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5939 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5940 #endif /* FEAT_CONCEAL */ |
| 7 | 5941 else |
| 5942 --n_skip; | |
| 5943 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5944 /* 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
|
5945 * column. */ |
| 1849 | 5946 if (draw_state > WL_NR |
| 7 | 5947 #ifdef FEAT_DIFF |
| 5948 && filler_todo <= 0 | |
| 5949 #endif | |
| 5950 ) | |
| 5951 ++vcol; | |
| 5952 | |
| 743 | 5953 #ifdef FEAT_SYN_HL |
| 5954 if (vcol_save_attr >= 0) | |
| 5955 char_attr = vcol_save_attr; | |
| 5956 #endif | |
| 5957 | |
| 7 | 5958 /* restore attributes after "predeces" in 'listchars' */ |
| 5959 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5960 char_attr = saved_attr3; | |
| 5961 | |
| 5962 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5963 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5964 char_attr = saved_attr2; | |
| 5965 | |
| 5966 /* | |
| 5967 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5968 * so far. If there is no more to display it is caught above. |
| 7 | 5969 */ |
| 5970 if (( | |
| 5971 #ifdef FEAT_RIGHTLEFT | |
| 5972 wp->w_p_rl ? (col < 0) : | |
| 5973 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5974 (col >= wp->w_width)) |
| 7 | 5975 && (*ptr != NUL |
| 5976 #ifdef FEAT_DIFF | |
| 5977 || filler_todo > 0 | |
| 5978 #endif | |
| 2724 | 5979 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5980 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5981 ) | |
| 5982 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5983 #ifdef FEAT_CONCEAL |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5984 screen_line(screen_row, wp->w_wincol, col - boguscols, |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5985 (int)wp->w_width, HAS_RIGHTLEFT(wp->w_p_rl)); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5986 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5987 #else |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5988 screen_line(screen_row, wp->w_wincol, col, |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5989 (int)wp->w_width, HAS_RIGHTLEFT(wp->w_p_rl)); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5990 #endif |
| 7 | 5991 ++row; |
| 5992 ++screen_row; | |
| 5993 | |
| 5994 /* When not wrapping and finished diff lines, or when displayed | |
| 5995 * '$' and highlighting until last column, break here. */ | |
| 5996 if ((!wp->w_p_wrap | |
| 5997 #ifdef FEAT_DIFF | |
| 5998 && filler_todo <= 0 | |
| 5999 #endif | |
| 6000 ) || lcs_eol_one == -1) | |
| 6001 break; | |
| 6002 | |
| 6003 /* When the window is too narrow draw all "@" lines. */ | |
| 6004 if (draw_state != WL_LINE | |
| 6005 #ifdef FEAT_DIFF | |
| 6006 && filler_todo <= 0 | |
| 6007 #endif | |
| 6008 ) | |
| 6009 { | |
| 6010 win_draw_end(wp, '@', ' ', row, wp->w_height, HLF_AT); | |
| 6011 draw_vsep_win(wp, row); | |
| 6012 row = endrow; | |
| 6013 } | |
| 6014 | |
| 6015 /* When line got too long for screen break here. */ | |
| 6016 if (row == endrow) | |
| 6017 { | |
| 6018 ++row; | |
| 6019 break; | |
| 6020 } | |
| 6021 | |
| 6022 if (screen_cur_row == screen_row - 1 | |
| 6023 #ifdef FEAT_DIFF | |
| 6024 && filler_todo <= 0 | |
| 6025 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6026 && wp->w_width == Columns) |
| 7 | 6027 { |
| 6028 /* Remember that the line wraps, used for modeless copy. */ | |
| 6029 LineWraps[screen_row - 1] = TRUE; | |
| 6030 | |
| 6031 /* | |
| 6032 * Special trick to make copy/paste of wrapped lines work with | |
| 6033 * xterm/screen: write an extra character beyond the end of | |
| 6034 * the line. This will work with all terminal types | |
| 6035 * (regardless of the xn,am settings). | |
| 6036 * Only do this on a fast tty. | |
| 6037 * Only do this if the cursor is on the current line | |
| 6038 * (something has been written in it). | |
| 6039 * Don't do this for the GUI. | |
| 6040 * Don't do this for double-width characters. | |
| 6041 * Don't do this for a window not at the right screen border. | |
| 6042 */ | |
| 6043 if (p_tf | |
| 6044 #ifdef FEAT_GUI | |
| 6045 && !gui.in_use | |
| 6046 #endif | |
| 6047 #ifdef FEAT_MBYTE | |
| 6048 && !(has_mbyte | |
| 1378 | 6049 && ((*mb_off2cells)(LineOffset[screen_row], |
| 6050 LineOffset[screen_row] + screen_Columns) | |
| 6051 == 2 | |
| 7 | 6052 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 6053 + (int)Columns - 2, |
| 6054 LineOffset[screen_row] + screen_Columns) | |
| 6055 == 2)) | |
| 7 | 6056 #endif |
| 6057 ) | |
| 6058 { | |
| 6059 /* First make sure we are at the end of the screen line, | |
| 6060 * then output the same character again to let the | |
| 6061 * terminal know about the wrap. If the terminal doesn't | |
| 6062 * auto-wrap, we overwrite the character. */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6063 if (screen_cur_col != wp->w_width) |
| 7 | 6064 screen_char(LineOffset[screen_row - 1] |
| 6065 + (unsigned)Columns - 1, | |
| 6066 screen_row - 1, (int)(Columns - 1)); | |
| 6067 | |
| 6068 #ifdef FEAT_MBYTE | |
| 6069 /* When there is a multi-byte character, just output a | |
| 6070 * space to keep it simple. */ | |
| 148 | 6071 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 6072 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 6073 out_char(' '); |
| 6074 else | |
| 6075 #endif | |
| 6076 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 6077 + (Columns - 1)]); | |
| 6078 /* force a redraw of the first char on the next line */ | |
| 6079 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 6080 screen_start(); /* don't know where cursor is now */ | |
| 6081 } | |
| 6082 } | |
| 6083 | |
| 6084 col = 0; | |
| 6085 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6086 #ifdef FEAT_RIGHTLEFT | |
| 6087 if (wp->w_p_rl) | |
| 6088 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6089 col = wp->w_width - 1; /* col is not used if breaking! */ |
| 7 | 6090 off += col; |
| 6091 } | |
| 6092 #endif | |
| 6093 | |
| 6094 /* reset the drawing state for the start of a wrapped line */ | |
| 6095 draw_state = WL_START; | |
| 6096 saved_n_extra = n_extra; | |
| 6097 saved_p_extra = p_extra; | |
| 6098 saved_c_extra = c_extra; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
6099 saved_c_final = c_final; |
| 7 | 6100 saved_char_attr = char_attr; |
| 6101 n_extra = 0; | |
| 6102 lcs_prec_todo = lcs_prec; | |
| 6103 #ifdef FEAT_LINEBREAK | |
| 6104 # ifdef FEAT_DIFF | |
| 6105 if (filler_todo <= 0) | |
| 6106 # endif | |
| 6107 need_showbreak = TRUE; | |
| 6108 #endif | |
| 6109 #ifdef FEAT_DIFF | |
| 6110 --filler_todo; | |
| 6111 /* When the filler lines are actually below the last line of the | |
| 6112 * file, don't draw the line itself, break here. */ | |
| 6113 if (filler_todo == 0 && wp->w_botfill) | |
| 6114 break; | |
| 6115 #endif | |
| 6116 } | |
| 6117 | |
| 6118 } /* for every character in the line */ | |
| 6119 | |
| 743 | 6120 #ifdef FEAT_SPELL |
| 386 | 6121 /* After an empty line check first word for capital. */ |
| 6122 if (*skipwhite(line) == NUL) | |
| 6123 { | |
| 6124 capcol_lnum = lnum + 1; | |
| 6125 cap_col = 0; | |
| 6126 } | |
| 6127 #endif | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6128 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6129 vim_free(text_props); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6130 vim_free(text_prop_idxs); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6131 #endif |
| 386 | 6132 |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
6133 vim_free(p_extra_free); |
| 7 | 6134 return row; |
| 6135 } | |
| 6136 | |
| 714 | 6137 #ifdef FEAT_MBYTE |
| 6138 /* | |
| 6139 * 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
|
6140 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 6141 */ |
| 6142 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6143 comp_char_differs(int off_from, int off_to) |
| 714 | 6144 { |
| 6145 int i; | |
| 6146 | |
| 6147 for (i = 0; i < Screen_mco; ++i) | |
| 6148 { | |
| 6149 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 6150 return TRUE; | |
| 6151 if (ScreenLinesC[i][off_from] == 0) | |
| 6152 break; | |
| 6153 } | |
| 6154 return FALSE; | |
| 6155 } | |
| 6156 #endif | |
| 6157 | |
| 7 | 6158 /* |
| 6159 * Check whether the given character needs redrawing: | |
| 6160 * - the (first byte of the) character is different | |
| 6161 * - the attributes are different | |
| 6162 * - the character is multi-byte and the next byte is different | |
| 1616 | 6163 * - the character is two cells wide and the second cell differs. |
| 7 | 6164 */ |
| 6165 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6166 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 6167 { |
| 6168 if (cols > 0 | |
| 6169 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 6170 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6171 | |
| 6172 #ifdef FEAT_MBYTE | |
| 6173 || (enc_dbcs != 0 | |
| 6174 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 6175 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 6176 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 6177 : (cols > 1 && ScreenLines[off_from + 1] | |
| 6178 != ScreenLines[off_to + 1]))) | |
| 6179 || (enc_utf8 | |
| 6180 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 6181 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 6182 && comp_char_differs(off_from, off_to)) |
| 3759 | 6183 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6184 && ScreenLines[off_from + 1] | |
| 6185 != ScreenLines[off_to + 1]))) | |
| 7 | 6186 #endif |
| 6187 )) | |
| 6188 return TRUE; | |
| 6189 return FALSE; | |
| 6190 } | |
| 6191 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6192 #if defined(FEAT_TERMINAL) || defined(PROTO) |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6193 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6194 * Return the index in ScreenLines[] for the current screen line. |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6195 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6196 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6197 screen_get_current_line_off() |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6198 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6199 return (int)(current_ScreenLine - ScreenLines); |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6200 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6201 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6202 |
| 7 | 6203 /* |
| 6204 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6205 * have actually changed. Handle insert/delete character. | |
| 6206 * "coloff" gives the first column on the screen for this line. | |
| 6207 * "endcol" gives the columns where valid characters are. | |
| 6208 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6209 * needs to be cleared, negative otherwise. | |
| 6210 * "rlflag" is TRUE in a rightleft window: | |
| 6211 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" | |
| 6212 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6213 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6214 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6215 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6216 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6217 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6218 int endcol, |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6219 int clear_width, |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6220 int rlflag UNUSED) |
| 7 | 6221 { |
| 6222 unsigned off_from; | |
| 6223 unsigned off_to; | |
| 1378 | 6224 #ifdef FEAT_MBYTE |
| 6225 unsigned max_off_from; | |
| 6226 unsigned max_off_to; | |
| 6227 #endif | |
| 7 | 6228 int col = 0; |
| 6229 int hl; | |
| 6230 int force = FALSE; /* force update rest of the line */ | |
| 6231 int redraw_this /* bool: does character need redraw? */ | |
| 6232 #ifdef FEAT_GUI | |
| 6233 = TRUE /* For GUI when while-loop empty */ | |
| 6234 #endif | |
| 6235 ; | |
| 6236 int redraw_next; /* redraw_this for next character */ | |
| 6237 #ifdef FEAT_MBYTE | |
| 6238 int clear_next = FALSE; | |
| 6239 int char_cells; /* 1: normal char */ | |
| 6240 /* 2: occupies two display cells */ | |
| 6241 # define CHAR_CELLS char_cells | |
| 6242 #else | |
| 6243 # define CHAR_CELLS 1 | |
| 6244 #endif | |
| 6245 | |
| 3413 | 6246 /* Check for illegal row and col, just in case. */ |
| 6247 if (row >= Rows) | |
| 6248 row = Rows - 1; | |
| 6249 if (endcol > Columns) | |
| 6250 endcol = Columns; | |
| 6251 | |
| 7 | 6252 # ifdef FEAT_CLIPBOARD |
| 6253 clip_may_clear_selection(row, row); | |
| 6254 # endif | |
| 6255 | |
| 6256 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6257 off_to = LineOffset[row] + coloff; | |
| 1378 | 6258 #ifdef FEAT_MBYTE |
| 6259 max_off_from = off_from + screen_Columns; | |
| 6260 max_off_to = LineOffset[row] + screen_Columns; | |
| 6261 #endif | |
| 7 | 6262 |
| 6263 #ifdef FEAT_RIGHTLEFT | |
| 6264 if (rlflag) | |
| 6265 { | |
| 6266 /* Clear rest first, because it's left of the text. */ | |
| 6267 if (clear_width > 0) | |
| 6268 { | |
| 6269 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6270 && ScreenAttrs[off_to] == 0 | |
| 6271 # ifdef FEAT_MBYTE | |
| 6272 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6273 # endif | |
| 6274 ) | |
| 6275 { | |
| 6276 ++off_to; | |
| 6277 ++col; | |
| 6278 } | |
| 6279 if (col <= endcol) | |
| 6280 screen_fill(row, row + 1, col + coloff, | |
| 6281 endcol + coloff + 1, ' ', ' ', 0); | |
| 6282 } | |
| 6283 col = endcol + 1; | |
| 6284 off_to = LineOffset[row] + col + coloff; | |
| 6285 off_from += col; | |
| 6286 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6287 } | |
| 6288 #endif /* FEAT_RIGHTLEFT */ | |
| 6289 | |
| 6290 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6291 | |
| 6292 while (col < endcol) | |
| 6293 { | |
| 6294 #ifdef FEAT_MBYTE | |
| 6295 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6296 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6297 else |
| 6298 char_cells = 1; | |
| 6299 #endif | |
| 6300 | |
| 6301 redraw_this = redraw_next; | |
| 6302 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6303 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6304 | |
| 6305 #ifdef FEAT_GUI | |
| 6306 /* If the next character was bold, then redraw the current character to | |
| 6307 * remove any pixels that might have spilt over into us. This only | |
| 6308 * happens in the GUI. | |
| 6309 */ | |
| 6310 if (redraw_next && gui.in_use) | |
| 6311 { | |
| 6312 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6313 if (hl > HL_ALL) |
| 6314 hl = syn_attr2attr(hl); | |
| 6315 if (hl & HL_BOLD) | |
| 7 | 6316 redraw_this = TRUE; |
| 6317 } | |
| 6318 #endif | |
| 6319 | |
| 6320 if (redraw_this) | |
| 6321 { | |
| 6322 /* | |
| 6323 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6324 * Attributes for characters are stored at the position where the | |
| 6325 * cursor is when writing the highlighting code. The | |
| 6326 * start-highlighting code must be written with the cursor on the | |
| 6327 * first highlighted character. The stop-highlighting code must | |
| 6328 * be written with the cursor just after the last highlighted | |
| 6329 * character. | |
|
15034
6e4e0d43b20b
patch 8.1.0528: various typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
14877
diff
changeset
|
6330 * Overwriting a character doesn't remove its highlighting. Need |
| 7 | 6331 * to clear the rest of the line, and force redrawing it |
| 6332 * completely. | |
| 6333 */ | |
| 6334 if ( p_wiv | |
| 6335 && !force | |
| 6336 #ifdef FEAT_GUI | |
| 6337 && !gui.in_use | |
| 6338 #endif | |
| 6339 && ScreenAttrs[off_to] != 0 | |
| 6340 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6341 { | |
| 6342 /* | |
| 6343 * Need to remove highlighting attributes here. | |
| 6344 */ | |
| 6345 windgoto(row, col + coloff); | |
| 6346 out_str(T_CE); /* clear rest of this screen line */ | |
| 6347 screen_start(); /* don't know where cursor is now */ | |
| 6348 force = TRUE; /* force redraw of rest of the line */ | |
| 6349 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6350 | |
| 6351 /* | |
| 6352 * If the previous character was highlighted, need to stop | |
| 6353 * highlighting at this character. | |
| 6354 */ | |
| 6355 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6356 { | |
| 6357 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6358 term_windgoto(row, col + coloff); | |
| 6359 screen_stop_highlight(); | |
| 6360 } | |
| 6361 else | |
| 6362 screen_attr = 0; /* highlighting has stopped */ | |
| 6363 } | |
| 6364 #ifdef FEAT_MBYTE | |
| 6365 if (enc_dbcs != 0) | |
| 6366 { | |
| 6367 /* Check if overwriting a double-byte with a single-byte or | |
| 6368 * the other way around requires another character to be | |
| 6369 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6370 * ScreenLinesUC[] is sufficient. */ | |
| 6371 if (char_cells == 1 | |
| 6372 && col + 1 < endcol | |
| 1378 | 6373 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6374 { |
| 6375 /* Writing a single-cell character over a double-cell | |
| 6376 * character: need to redraw the next cell. */ | |
| 6377 ScreenLines[off_to + 1] = 0; | |
| 6378 redraw_next = TRUE; | |
| 6379 } | |
| 6380 else if (char_cells == 2 | |
| 6381 && col + 2 < endcol | |
| 1378 | 6382 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6383 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6384 { |
| 6385 /* Writing the second half of a double-cell character over | |
| 6386 * a double-cell character: need to redraw the second | |
| 6387 * cell. */ | |
| 6388 ScreenLines[off_to + 2] = 0; | |
| 6389 redraw_next = TRUE; | |
| 6390 } | |
| 6391 | |
| 6392 if (enc_dbcs == DBCS_JPNU) | |
| 6393 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6394 } | |
| 6395 /* When writing a single-width character over a double-width | |
| 6396 * character and at the end of the redrawn text, need to clear out | |
| 6397 * the right halve of the old character. | |
| 6398 * Also required when writing the right halve of a double-width | |
| 6399 * char over the left halve of an existing one. */ | |
| 6400 if (has_mbyte && col + char_cells == endcol | |
| 6401 && ((char_cells == 1 | |
| 1378 | 6402 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6403 || (char_cells == 2 |
| 1378 | 6404 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6405 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6406 clear_next = TRUE; |
| 6407 #endif | |
| 6408 | |
| 6409 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6410 #ifdef FEAT_MBYTE | |
| 6411 if (enc_utf8) | |
| 6412 { | |
| 6413 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6414 if (ScreenLinesUC[off_from] != 0) | |
| 6415 { | |
| 714 | 6416 int i; |
| 6417 | |
| 6418 for (i = 0; i < Screen_mco; ++i) | |
| 6419 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6420 } |
| 6421 } | |
| 6422 if (char_cells == 2) | |
| 6423 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6424 #endif | |
| 6425 | |
| 6426 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6427 /* The bold trick makes a single column of pixels appear in the |
| 6428 * next character. When a bold character is removed, the next | |
| 7 | 6429 * character should be redrawn too. This happens for our own GUI |
| 6430 * and for some xterms. */ | |
| 6431 if ( | |
| 6432 # ifdef FEAT_GUI | |
| 6433 gui.in_use | |
| 6434 # endif | |
| 6435 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6436 || | |
| 6437 # endif | |
| 6438 # ifdef UNIX | |
| 6439 term_is_xterm | |
| 6440 # endif | |
| 6441 ) | |
| 6442 { | |
| 6443 hl = ScreenAttrs[off_to]; | |
| 743 | 6444 if (hl > HL_ALL) |
| 6445 hl = syn_attr2attr(hl); | |
| 6446 if (hl & HL_BOLD) | |
| 7 | 6447 redraw_next = TRUE; |
| 6448 } | |
| 6449 #endif | |
| 6450 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
| 6451 #ifdef FEAT_MBYTE | |
| 819 | 6452 /* For simplicity set the attributes of second half of a |
| 6453 * double-wide character equal to the first half. */ | |
| 6454 if (char_cells == 2) | |
| 6455 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6456 | |
| 7 | 6457 if (enc_dbcs != 0 && char_cells == 2) |
| 6458 screen_char_2(off_to, row, col + coloff); | |
| 6459 else | |
| 6460 #endif | |
| 6461 screen_char(off_to, row, col + coloff); | |
| 6462 } | |
| 6463 else if ( p_wiv | |
| 6464 #ifdef FEAT_GUI | |
| 6465 && !gui.in_use | |
| 6466 #endif | |
| 6467 && col + coloff > 0) | |
| 6468 { | |
| 6469 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6470 { | |
| 6471 /* | |
| 6472 * Don't output stop-highlight when moving the cursor, it will | |
| 6473 * stop the highlighting when it should continue. | |
| 6474 */ | |
| 6475 screen_attr = 0; | |
| 6476 } | |
| 6477 else if (screen_attr != 0) | |
| 6478 screen_stop_highlight(); | |
| 6479 } | |
| 6480 | |
| 6481 off_to += CHAR_CELLS; | |
| 6482 off_from += CHAR_CELLS; | |
| 6483 col += CHAR_CELLS; | |
| 6484 } | |
| 6485 | |
| 6486 #ifdef FEAT_MBYTE | |
| 6487 if (clear_next) | |
| 6488 { | |
| 6489 /* Clear the second half of a double-wide character of which the left | |
| 6490 * half was overwritten with a single-wide character. */ | |
| 6491 ScreenLines[off_to] = ' '; | |
| 6492 if (enc_utf8) | |
| 6493 ScreenLinesUC[off_to] = 0; | |
| 6494 screen_char(off_to, row, col + coloff); | |
| 6495 } | |
| 6496 #endif | |
| 6497 | |
| 6498 if (clear_width > 0 | |
| 6499 #ifdef FEAT_RIGHTLEFT | |
| 6500 && !rlflag | |
| 6501 #endif | |
| 6502 ) | |
| 6503 { | |
| 6504 #ifdef FEAT_GUI | |
| 6505 int startCol = col; | |
| 6506 #endif | |
| 6507 | |
| 6508 /* blank out the rest of the line */ | |
| 6509 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6510 && ScreenAttrs[off_to] == 0 | |
| 6511 #ifdef FEAT_MBYTE | |
| 6512 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6513 #endif | |
| 6514 ) | |
| 6515 { | |
| 6516 ++off_to; | |
| 6517 ++col; | |
| 6518 } | |
| 6519 if (col < clear_width) | |
| 6520 { | |
| 6521 #ifdef FEAT_GUI | |
| 6522 /* | |
| 6523 * In the GUI, clearing the rest of the line may leave pixels | |
| 6524 * behind if the first character cleared was bold. Some bold | |
| 6525 * fonts spill over the left. In this case we redraw the previous | |
| 6526 * character too. If we didn't skip any blanks above, then we | |
| 6527 * only redraw if the character wasn't already redrawn anyway. | |
| 6528 */ | |
| 996 | 6529 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6530 { |
| 6531 hl = ScreenAttrs[off_to]; | |
| 6532 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6533 { |
| 6534 int prev_cells = 1; | |
| 6535 # ifdef FEAT_MBYTE | |
| 6536 if (enc_utf8) | |
| 6537 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6538 * that its width is 2. */ | |
| 6539 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6540 else if (enc_dbcs != 0) | |
| 6541 { | |
| 6542 /* find previous character by counting from first | |
| 6543 * column and get its width. */ | |
| 6544 unsigned off = LineOffset[row]; | |
| 1378 | 6545 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6546 |
| 6547 while (off < off_to) | |
| 6548 { | |
| 1378 | 6549 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6550 off += prev_cells; |
| 6551 } | |
| 6552 } | |
| 6553 | |
| 6554 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6555 screen_char_2(off_to - prev_cells, row, | |
| 6556 col + coloff - prev_cells); | |
| 6557 else | |
| 6558 # endif | |
| 6559 screen_char(off_to - prev_cells, row, | |
| 6560 col + coloff - prev_cells); | |
| 6561 } | |
| 7 | 6562 } |
| 6563 #endif | |
| 6564 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6565 ' ', ' ', 0); | |
| 6566 off_to += clear_width - col; | |
| 6567 col = clear_width; | |
| 6568 } | |
| 6569 } | |
| 6570 | |
| 6571 if (clear_width > 0) | |
| 6572 { | |
| 6573 /* For a window that's left of another, draw the separator char. */ | |
| 6574 if (col + coloff < Columns) | |
| 6575 { | |
| 6576 int c; | |
| 6577 | |
| 6578 c = fillchar_vsep(&hl); | |
| 6477 | 6579 if (ScreenLines[off_to] != (schar_T)c |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6580 #ifdef FEAT_MBYTE |
| 714 | 6581 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6582 != (c >= 0x80 ? c : 0)) | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6583 #endif |
| 7 | 6584 || ScreenAttrs[off_to] != hl) |
| 6585 { | |
| 6586 ScreenLines[off_to] = c; | |
| 6587 ScreenAttrs[off_to] = hl; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6588 #ifdef FEAT_MBYTE |
| 7 | 6589 if (enc_utf8) |
| 6590 { | |
| 6591 if (c >= 0x80) | |
| 6592 { | |
| 6593 ScreenLinesUC[off_to] = c; | |
| 714 | 6594 ScreenLinesC[0][off_to] = 0; |
| 7 | 6595 } |
| 6596 else | |
| 6597 ScreenLinesUC[off_to] = 0; | |
| 6598 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6599 #endif |
| 7 | 6600 screen_char(off_to, row, col + coloff); |
| 6601 } | |
| 6602 } | |
| 6603 else | |
| 6604 LineWraps[row] = FALSE; | |
| 6605 } | |
| 6606 } | |
| 6607 | |
| 474 | 6608 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6609 /* |
| 474 | 6610 * Mirror text "str" for right-left displaying. |
| 6611 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6612 */ |
| 474 | 6613 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6614 rl_mirror(char_u *str) |
| 7 | 6615 { |
| 6616 char_u *p1, *p2; | |
| 6617 int t; | |
| 6618 | |
| 6619 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6620 { | |
| 6621 t = *p1; | |
| 6622 *p1 = *p2; | |
| 6623 *p2 = t; | |
| 6624 } | |
| 6625 } | |
| 6626 #endif | |
| 6627 | |
| 6628 /* | |
| 6629 * mark all status lines for redraw; used after first :cd | |
| 6630 */ | |
| 6631 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6632 status_redraw_all(void) |
| 7 | 6633 { |
| 6634 win_T *wp; | |
| 6635 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6636 FOR_ALL_WINDOWS(wp) |
| 7 | 6637 if (wp->w_status_height) |
| 6638 { | |
| 6639 wp->w_redr_status = TRUE; | |
| 6640 redraw_later(VALID); | |
| 6641 } | |
| 6642 } | |
| 6643 | |
| 6644 /* | |
| 6645 * mark all status lines of the current buffer for redraw | |
| 6646 */ | |
| 6647 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6648 status_redraw_curbuf(void) |
| 7 | 6649 { |
| 6650 win_T *wp; | |
| 6651 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6652 FOR_ALL_WINDOWS(wp) |
| 7 | 6653 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6654 { | |
| 6655 wp->w_redr_status = TRUE; | |
| 6656 redraw_later(VALID); | |
| 6657 } | |
| 6658 } | |
| 6659 | |
| 6660 /* | |
| 6661 * Redraw all status lines that need to be redrawn. | |
| 6662 */ | |
| 6663 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6664 redraw_statuslines(void) |
| 7 | 6665 { |
| 6666 win_T *wp; | |
| 6667 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6668 FOR_ALL_WINDOWS(wp) |
| 7 | 6669 if (wp->w_redr_status) |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6670 win_redr_status(wp, FALSE); |
| 673 | 6671 if (redraw_tabline) |
| 677 | 6672 draw_tabline(); |
| 7 | 6673 } |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6674 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6675 #if defined(FEAT_WILDMENU) || defined(PROTO) |
| 7 | 6676 /* |
| 6677 * Redraw all status lines at the bottom of frame "frp". | |
| 6678 */ | |
| 6679 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6680 win_redraw_last_status(frame_T *frp) |
| 7 | 6681 { |
| 6682 if (frp->fr_layout == FR_LEAF) | |
| 6683 frp->fr_win->w_redr_status = TRUE; | |
| 6684 else if (frp->fr_layout == FR_ROW) | |
| 6685 { | |
|
15227
95678f27a704
patch 8.1.0623: iterating through window frames is repeated
Bram Moolenaar <Bram@vim.org>
parents:
15138
diff
changeset
|
6686 FOR_ALL_FRAMES(frp, frp->fr_child) |
| 7 | 6687 win_redraw_last_status(frp); |
| 6688 } | |
| 6689 else /* frp->fr_layout == FR_COL */ | |
| 6690 { | |
| 6691 frp = frp->fr_child; | |
| 6692 while (frp->fr_next != NULL) | |
| 6693 frp = frp->fr_next; | |
| 6694 win_redraw_last_status(frp); | |
| 6695 } | |
| 6696 } | |
| 6697 #endif | |
| 6698 | |
| 6699 /* | |
| 6700 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6701 */ | |
| 6702 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6703 draw_vsep_win(win_T *wp, int row) |
| 7 | 6704 { |
| 6705 int hl; | |
| 6706 int c; | |
| 6707 | |
| 6708 if (wp->w_vsep_width) | |
| 6709 { | |
| 6710 /* draw the vertical separator right of this window */ | |
| 6711 c = fillchar_vsep(&hl); | |
| 6712 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6713 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6714 c, ' ', hl); | |
| 6715 } | |
| 6716 } | |
| 6717 | |
| 6718 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6719 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6720 |
| 6721 /* | |
| 1378 | 6722 * Get the length of an item as it will be shown in the status line. |
| 7 | 6723 */ |
| 6724 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6725 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6726 { |
| 6727 int len = 0; | |
| 6728 | |
| 6729 #ifdef FEAT_MENU | |
| 6730 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6731 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6732 | |
| 6733 /* Check for menu separators - replace with '|'. */ | |
| 6734 if (emenu && menu_is_separator(s)) | |
| 6735 return 1; | |
| 6736 #endif | |
| 6737 | |
| 6738 while (*s != NUL) | |
| 6739 { | |
| 1685 | 6740 s += skip_status_match_char(xp, s); |
| 42 | 6741 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6742 MB_PTR_ADV(s); |
| 7 | 6743 } |
| 6744 | |
| 6745 return len; | |
| 6746 } | |
| 6747 | |
| 6748 /* | |
| 1685 | 6749 * Return the number of characters that should be skipped in a status match. |
| 277 | 6750 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6751 */ | |
| 6752 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6753 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6754 { |
| 1685 | 6755 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6756 #ifdef FEAT_MENU |
| 6757 || ((xp->xp_context == EXPAND_MENUS | |
| 6758 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6759 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6760 #endif | |
| 1685 | 6761 ) |
| 6762 { | |
| 6763 #ifndef BACKSLASH_IN_FILENAME | |
| 6764 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6765 return 2; | |
| 6766 #endif | |
| 6767 return 1; | |
| 6768 } | |
| 6769 return 0; | |
| 277 | 6770 } |
| 6771 | |
| 6772 /* | |
| 7 | 6773 * Show wildchar matches in the status line. |
| 6774 * Show at least the "match" item. | |
| 6775 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6776 * | |
| 6777 * If inversion is possible we use it. Else '=' characters are used. | |
| 6778 */ | |
| 6779 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6780 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6781 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6782 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6783 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6784 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6785 int showtail) |
| 7 | 6786 { |
| 6787 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6788 int row; | |
| 6789 char_u *buf; | |
| 6790 int len; | |
| 1378 | 6791 int clen; /* length in screen cells */ |
| 7 | 6792 int fillchar; |
| 6793 int attr; | |
| 6794 int i; | |
| 6795 int highlight = TRUE; | |
| 6796 char_u *selstart = NULL; | |
| 6797 int selstart_col = 0; | |
| 6798 char_u *selend = NULL; | |
| 6799 static int first_match = 0; | |
| 6800 int add_left = FALSE; | |
| 6801 char_u *s; | |
| 6802 #ifdef FEAT_MENU | |
| 6803 int emenu; | |
| 6804 #endif | |
| 6805 #if defined(FEAT_MBYTE) || defined(FEAT_MENU) | |
| 6806 int l; | |
| 6807 #endif | |
| 6808 | |
| 6809 if (matches == NULL) /* interrupted completion? */ | |
| 6810 return; | |
| 6811 | |
| 39 | 6812 #ifdef FEAT_MBYTE |
| 6813 if (has_mbyte) | |
| 6814 buf = alloc((unsigned)Columns * MB_MAXBYTES + 1); | |
| 6815 else | |
| 6816 #endif | |
| 6817 buf = alloc((unsigned)Columns + 1); | |
| 7 | 6818 if (buf == NULL) |
| 6819 return; | |
| 6820 | |
| 6821 if (match == -1) /* don't show match but original text */ | |
| 6822 { | |
| 6823 match = 0; | |
| 6824 highlight = FALSE; | |
| 6825 } | |
| 6826 /* count 1 for the ending ">" */ | |
| 6827 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6828 if (match == 0) | |
| 6829 first_match = 0; | |
| 6830 else if (match < first_match) | |
| 6831 { | |
| 6832 /* jumping left, as far as we can go */ | |
| 6833 first_match = match; | |
| 6834 add_left = TRUE; | |
| 6835 } | |
| 6836 else | |
| 6837 { | |
| 6838 /* check if match fits on the screen */ | |
| 6839 for (i = first_match; i < match; ++i) | |
| 6840 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6841 if (first_match > 0) | |
| 6842 clen += 2; | |
| 6843 /* jumping right, put match at the left */ | |
| 6844 if ((long)clen > Columns) | |
| 6845 { | |
| 6846 first_match = match; | |
| 6847 /* if showing the last match, we can add some on the left */ | |
| 6848 clen = 2; | |
| 6849 for (i = match; i < num_matches; ++i) | |
| 6850 { | |
| 6851 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6852 if ((long)clen >= Columns) | |
| 6853 break; | |
| 6854 } | |
| 6855 if (i == num_matches) | |
| 6856 add_left = TRUE; | |
| 6857 } | |
| 6858 } | |
| 6859 if (add_left) | |
| 6860 while (first_match > 0) | |
| 6861 { | |
| 6862 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6863 if ((long)clen >= Columns) | |
| 6864 break; | |
| 6865 --first_match; | |
| 6866 } | |
| 6867 | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
6868 fillchar = fillchar_status(&attr, curwin); |
| 7 | 6869 |
| 6870 if (first_match == 0) | |
| 6871 { | |
| 6872 *buf = NUL; | |
| 6873 len = 0; | |
| 6874 } | |
| 6875 else | |
| 6876 { | |
| 6877 STRCPY(buf, "< "); | |
| 6878 len = 2; | |
| 6879 } | |
| 6880 clen = len; | |
| 6881 | |
| 6882 i = first_match; | |
| 6883 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6884 { | |
| 6885 if (i == match) | |
| 6886 { | |
| 6887 selstart = buf + len; | |
| 6888 selstart_col = clen; | |
| 6889 } | |
| 6890 | |
| 6891 s = L_MATCH(i); | |
| 6892 /* Check for menu separators - replace with '|' */ | |
| 6893 #ifdef FEAT_MENU | |
| 6894 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6895 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6896 if (emenu && menu_is_separator(s)) | |
| 6897 { | |
| 6898 STRCPY(buf + len, transchar('|')); | |
| 6899 l = (int)STRLEN(buf + len); | |
| 6900 len += l; | |
| 6901 clen += l; | |
| 6902 } | |
| 6903 else | |
| 6904 #endif | |
| 6905 for ( ; *s != NUL; ++s) | |
| 6906 { | |
| 1685 | 6907 s += skip_status_match_char(xp, s); |
| 7 | 6908 clen += ptr2cells(s); |
| 6909 #ifdef FEAT_MBYTE | |
| 474 | 6910 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6911 { |
| 6912 STRNCPY(buf + len, s, l); | |
| 6913 s += l - 1; | |
| 6914 len += l; | |
| 6915 } | |
| 6916 else | |
| 6917 #endif | |
| 6918 { | |
| 6919 STRCPY(buf + len, transchar_byte(*s)); | |
| 6920 len += (int)STRLEN(buf + len); | |
| 6921 } | |
| 6922 } | |
| 6923 if (i == match) | |
| 6924 selend = buf + len; | |
| 6925 | |
| 6926 *(buf + len++) = ' '; | |
| 6927 *(buf + len++) = ' '; | |
| 6928 clen += 2; | |
| 6929 if (++i == num_matches) | |
| 6930 break; | |
| 6931 } | |
| 6932 | |
| 6933 if (i != num_matches) | |
| 6934 { | |
| 6935 *(buf + len++) = '>'; | |
| 6936 ++clen; | |
| 6937 } | |
| 6938 | |
| 6939 buf[len] = NUL; | |
| 6940 | |
| 6941 row = cmdline_row - 1; | |
| 6942 if (row >= 0) | |
| 6943 { | |
| 6944 if (wild_menu_showing == 0) | |
| 6945 { | |
| 6946 if (msg_scrolled > 0) | |
| 6947 { | |
| 6948 /* Put the wildmenu just above the command line. If there is | |
| 6949 * no room, scroll the screen one line up. */ | |
| 6950 if (cmdline_row == Rows - 1) | |
| 6951 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
6952 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 6953 ++msg_scrolled; |
| 6954 } | |
| 6955 else | |
| 6956 { | |
| 6957 ++cmdline_row; | |
| 6958 ++row; | |
| 6959 } | |
| 6960 wild_menu_showing = WM_SCROLLED; | |
| 6961 } | |
| 6962 else | |
| 6963 { | |
| 6964 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6965 * Set 'winminheight' to zero to avoid that the window is | |
| 6966 * resized. */ | |
| 6967 if (lastwin->w_status_height == 0) | |
| 6968 { | |
| 6969 save_p_ls = p_ls; | |
| 6970 save_p_wmh = p_wmh; | |
| 6971 p_ls = 2; | |
| 6972 p_wmh = 0; | |
| 6973 last_status(FALSE); | |
| 6974 } | |
| 6975 wild_menu_showing = WM_SHOWN; | |
| 6976 } | |
| 6977 } | |
| 6978 | |
| 6979 screen_puts(buf, row, 0, attr); | |
| 6980 if (selstart != NULL && highlight) | |
| 6981 { | |
| 6982 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
6983 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 6984 } |
| 6985 | |
| 6986 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6987 } | |
| 6988 | |
| 6989 win_redraw_last_status(topframe); | |
| 6990 vim_free(buf); | |
| 6991 } | |
| 6992 #endif | |
| 6993 | |
| 6994 /* | |
| 6995 * Redraw the status line of window wp. | |
| 6996 * | |
| 6997 * If inversion is possible we use it. Else '=' characters are used. | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6998 * If "ignore_pum" is TRUE, also redraw statusline when the popup menu is |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6999 * displayed. |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7000 */ |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7001 static void |
|
14191
ec39f281e3e8
patch 8.1.0113: compiler warning for unused variable
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
7002 win_redr_status(win_T *wp, int ignore_pum UNUSED) |
| 7 | 7003 { |
| 7004 int row; | |
| 7005 char_u *p; | |
| 7006 int len; | |
| 7007 int fillchar; | |
| 7008 int attr; | |
| 7009 int this_ru_col; | |
| 1910 | 7010 static int busy = FALSE; |
| 7011 | |
| 7012 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 7013 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 7014 if (busy) | |
| 7015 return; | |
| 7016 busy = TRUE; | |
| 7 | 7017 |
| 7018 wp->w_redr_status = FALSE; | |
| 7019 if (wp->w_status_height == 0) | |
| 7020 { | |
| 7021 /* no status line, can only be last window */ | |
| 7022 redraw_cmdline = TRUE; | |
| 7023 } | |
| 540 | 7024 else if (!redrawing() |
| 7025 #ifdef FEAT_INS_EXPAND | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7026 // don't update status line when popup menu is visible and may be |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7027 // drawn over it, unless it will be redrawn later |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7028 || (!ignore_pum && pum_visible()) |
| 540 | 7029 #endif |
| 7030 ) | |
| 7 | 7031 { |
| 7032 /* Don't redraw right now, do it later. */ | |
| 7033 wp->w_redr_status = TRUE; | |
| 7034 } | |
| 7035 #ifdef FEAT_STL_OPT | |
| 40 | 7036 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 7037 { |
| 7038 /* redraw custom status line */ | |
| 1983 | 7039 redraw_custom_statusline(wp); |
| 7 | 7040 } |
| 7041 #endif | |
| 7042 else | |
| 7043 { | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
7044 fillchar = fillchar_status(&attr, wp); |
| 7 | 7045 |
| 685 | 7046 get_trans_bufname(wp->w_buffer); |
| 7 | 7047 p = NameBuff; |
| 7048 len = (int)STRLEN(p); | |
| 7049 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
7050 if (bt_help(wp->w_buffer) |
| 7 | 7051 #ifdef FEAT_QUICKFIX |
| 7052 || wp->w_p_pvw | |
| 7053 #endif | |
| 7054 || bufIsChanged(wp->w_buffer) | |
| 7055 || wp->w_buffer->b_p_ro) | |
| 7056 *(p + len++) = ' '; | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
7057 if (bt_help(wp->w_buffer)) |
| 7 | 7058 { |
| 809 | 7059 STRCPY(p + len, _("[Help]")); |
| 7 | 7060 len += (int)STRLEN(p + len); |
| 7061 } | |
| 7062 #ifdef FEAT_QUICKFIX | |
| 7063 if (wp->w_p_pvw) | |
| 7064 { | |
| 7065 STRCPY(p + len, _("[Preview]")); | |
| 7066 len += (int)STRLEN(p + len); | |
| 7067 } | |
| 7068 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7069 if (bufIsChanged(wp->w_buffer) |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7070 #ifdef FEAT_TERMINAL |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7071 && !bt_terminal(wp->w_buffer) |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7072 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7073 ) |
| 7 | 7074 { |
| 7075 STRCPY(p + len, "[+]"); | |
| 7076 len += 3; | |
| 7077 } | |
| 7078 if (wp->w_buffer->b_p_ro) | |
| 7079 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
7080 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
|
7081 len += (int)STRLEN(p + len); |
| 7 | 7082 } |
| 7083 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7084 this_ru_col = ru_col - (Columns - wp->w_width); |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7085 if (this_ru_col < (wp->w_width + 1) / 2) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7086 this_ru_col = (wp->w_width + 1) / 2; |
| 7 | 7087 if (this_ru_col <= 1) |
| 7088 { | |
| 7089 p = (char_u *)"<"; /* No room for file name! */ | |
| 7090 len = 1; | |
| 7091 } | |
| 7092 else | |
| 7093 #ifdef FEAT_MBYTE | |
| 7094 if (has_mbyte) | |
| 7095 { | |
| 7096 int clen = 0, i; | |
| 7097 | |
| 7098 /* Count total number of display cells. */ | |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
7099 clen = mb_string2cells(p, -1); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
7100 |
| 7 | 7101 /* Find first character that will fit. |
| 7102 * Going from start to end is much faster for DBCS. */ | |
| 7103 for (i = 0; p[i] != NUL && clen >= this_ru_col - 1; | |
| 474 | 7104 i += (*mb_ptr2len)(p + i)) |
| 7 | 7105 clen -= (*mb_ptr2cells)(p + i); |
| 7106 len = clen; | |
| 7107 if (i > 0) | |
| 7108 { | |
| 7109 p = p + i - 1; | |
| 7110 *p = '<'; | |
| 7111 ++len; | |
| 7112 } | |
| 7113 | |
| 7114 } | |
| 7115 else | |
| 7116 #endif | |
| 7117 if (len > this_ru_col - 1) | |
| 7118 { | |
| 7119 p += len - (this_ru_col - 1); | |
| 7120 *p = '<'; | |
| 7121 len = this_ru_col - 1; | |
| 7122 } | |
| 7123 | |
| 7124 row = W_WINROW(wp) + wp->w_height; | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7125 screen_puts(p, row, wp->w_wincol, attr); |
|
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7126 screen_fill(row, row + 1, len + wp->w_wincol, |
|
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7127 this_ru_col + wp->w_wincol, fillchar, fillchar, attr); |
| 7 | 7128 |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7129 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 7130 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 7131 screen_puts(NameBuff, row, (int)(this_ru_col - STRLEN(NameBuff) | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7132 - 1 + wp->w_wincol), attr); |
| 7 | 7133 |
| 7134 #ifdef FEAT_CMDL_INFO | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
7135 win_redr_ruler(wp, TRUE, ignore_pum); |
| 7 | 7136 #endif |
| 7137 } | |
| 7138 | |
| 7139 /* | |
| 7140 * May need to draw the character below the vertical separator. | |
| 7141 */ | |
| 7142 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 7143 { | |
| 7144 if (stl_connected(wp)) | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
7145 fillchar = fillchar_status(&attr, wp); |
| 7 | 7146 else |
| 7147 fillchar = fillchar_vsep(&attr); | |
| 7148 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 7149 attr); | |
| 7150 } | |
| 1910 | 7151 busy = FALSE; |
| 7 | 7152 } |
| 7153 | |
| 680 | 7154 #ifdef FEAT_STL_OPT |
| 7155 /* | |
| 7156 * Redraw the status line according to 'statusline' and take care of any | |
| 7157 * errors encountered. | |
| 7158 */ | |
| 7159 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7160 redraw_custom_statusline(win_T *wp) |
| 680 | 7161 { |
| 1983 | 7162 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7163 int saved_did_emsg = did_emsg; |
| 1983 | 7164 |
| 7165 /* When called recursively return. This can happen when the statusline | |
| 7166 * contains an expression that triggers a redraw. */ | |
| 7167 if (entered) | |
| 7168 return; | |
| 7169 entered = TRUE; | |
| 680 | 7170 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7171 did_emsg = FALSE; |
| 680 | 7172 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7173 if (did_emsg) |
| 1983 | 7174 { |
| 7175 /* When there is an error disable the statusline, otherwise the | |
| 7176 * display is messed up with errors and a redraw triggers the problem | |
| 7177 * again and again. */ | |
| 680 | 7178 set_string_option_direct((char_u *)"statusline", -1, |
| 7179 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7180 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7181 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7182 did_emsg |= saved_did_emsg; |
| 1983 | 7183 entered = FALSE; |
| 680 | 7184 } |
| 7185 #endif | |
| 7186 | |
| 7 | 7187 /* |
| 7188 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7189 * line of the window right of it. If not, then it's a vertical separator. | |
| 7190 * Only call if (wp->w_vsep_width != 0). | |
| 7191 */ | |
| 7192 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7193 stl_connected(win_T *wp) |
| 7 | 7194 { |
| 7195 frame_T *fr; | |
| 7196 | |
| 7197 fr = wp->w_frame; | |
| 7198 while (fr->fr_parent != NULL) | |
| 7199 { | |
| 7200 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7201 { | |
| 7202 if (fr->fr_next != NULL) | |
| 7203 break; | |
| 7204 } | |
| 7205 else | |
| 7206 { | |
| 7207 if (fr->fr_next != NULL) | |
| 7208 return TRUE; | |
| 7209 } | |
| 7210 fr = fr->fr_parent; | |
| 7211 } | |
| 7212 return FALSE; | |
| 7213 } | |
| 7214 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7215 |
| 7 | 7216 /* |
| 7217 * Get the value to show for the language mappings, active 'keymap'. | |
| 7218 */ | |
| 7219 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7220 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7221 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7222 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
|
7223 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
|
7224 int len) /* length of buffer */ |
| 7 | 7225 { |
| 7226 char_u *p; | |
| 7227 | |
| 7228 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7229 return FALSE; | |
| 7230 | |
| 7231 { | |
| 7232 #ifdef FEAT_EVAL | |
| 7233 buf_T *old_curbuf = curbuf; | |
| 7234 win_T *old_curwin = curwin; | |
| 7235 char_u *s; | |
| 7236 | |
| 7237 curbuf = wp->w_buffer; | |
| 7238 curwin = wp; | |
| 7239 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7240 ++emsg_skip; | |
| 714 | 7241 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7242 --emsg_skip; |
| 7243 curbuf = old_curbuf; | |
| 7244 curwin = old_curwin; | |
| 7245 if (p == NULL || *p == NUL) | |
| 7246 #endif | |
| 7247 { | |
| 7248 #ifdef FEAT_KEYMAP | |
| 7249 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7250 p = wp->w_buffer->b_p_keymap; | |
| 7251 else | |
| 7252 #endif | |
| 7253 p = (char_u *)"lang"; | |
| 7254 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7255 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7256 buf[0] = NUL; |
| 7257 #ifdef FEAT_EVAL | |
| 7258 vim_free(s); | |
| 7259 #endif | |
| 7260 } | |
| 7261 return buf[0] != NUL; | |
| 7262 } | |
| 7263 | |
| 7264 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7265 /* | |
| 677 | 7266 * Redraw the status line or ruler of window "wp". |
| 7267 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7268 */ |
| 7269 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7270 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7271 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7272 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7273 { |
| 5539 | 7274 static int entered = FALSE; |
| 7 | 7275 int attr; |
| 7276 int curattr; | |
| 7277 int row; | |
| 7278 int col = 0; | |
| 7279 int maxwidth; | |
| 7280 int width; | |
| 7281 int n; | |
| 7282 int len; | |
| 7283 int fillchar; | |
| 7284 char_u buf[MAXPATHL]; | |
| 1983 | 7285 char_u *stl; |
| 7 | 7286 char_u *p; |
| 681 | 7287 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7288 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7289 int use_sandbox = FALSE; |
| 2693 | 7290 win_T *ewp; |
| 7291 int p_crb_save; | |
| 7 | 7292 |
| 5539 | 7293 /* There is a tiny chance that this gets called recursively: When |
| 7294 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7295 * Avoid trouble by not allowing recursion. */ | |
| 7296 if (entered) | |
| 7297 return; | |
| 7298 entered = TRUE; | |
| 7299 | |
| 7 | 7300 /* setup environment for the task at hand */ |
| 677 | 7301 if (wp == NULL) |
| 7302 { | |
| 7303 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7304 stl = p_tal; |
| 677 | 7305 row = 0; |
| 707 | 7306 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7307 attr = HL_ATTR(HLF_TPF); |
| 677 | 7308 maxwidth = Columns; |
| 7309 # ifdef FEAT_EVAL | |
| 681 | 7310 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7311 # endif |
| 7312 } | |
| 40 | 7313 else |
| 677 | 7314 { |
| 7315 row = W_WINROW(wp) + wp->w_height; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
7316 fillchar = fillchar_status(&attr, wp); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7317 maxwidth = wp->w_width; |
| 677 | 7318 |
| 7319 if (draw_ruler) | |
| 7320 { | |
| 1983 | 7321 stl = p_ruf; |
| 677 | 7322 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7323 if (*stl == '%') |
| 7324 { | |
| 7325 if (*++stl == '-') | |
| 7326 stl++; | |
| 7327 if (atoi((char *)stl)) | |
| 7328 while (VIM_ISDIGIT(*stl)) | |
| 7329 stl++; | |
| 7330 if (*stl++ != '(') | |
| 7331 stl = p_ruf; | |
| 677 | 7332 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7333 col = ru_col - (Columns - wp->w_width); |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7334 if (col < (wp->w_width + 1) / 2) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7335 col = (wp->w_width + 1) / 2; |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7336 maxwidth = wp->w_width - col; |
| 677 | 7337 if (!wp->w_status_height) |
| 7338 { | |
| 7339 row = Rows - 1; | |
| 7340 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7341 fillchar = ' '; | |
| 7342 attr = 0; | |
| 7343 } | |
| 7344 | |
| 7345 # ifdef FEAT_EVAL | |
| 681 | 7346 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7347 # endif |
| 7348 } | |
| 7349 else | |
| 7350 { | |
| 7351 if (*wp->w_p_stl != NUL) | |
| 1983 | 7352 stl = wp->w_p_stl; |
| 677 | 7353 else |
| 1983 | 7354 stl = p_stl; |
| 677 | 7355 # ifdef FEAT_EVAL |
| 681 | 7356 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7357 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7358 # endif |
| 7359 } | |
| 7360 | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7361 col += wp->w_wincol; |
| 677 | 7362 } |
| 7363 | |
| 7 | 7364 if (maxwidth <= 0) |
| 5539 | 7365 goto theend; |
| 677 | 7366 |
| 2693 | 7367 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7368 * the cursor away and back. */ | |
| 7369 ewp = wp == NULL ? curwin : wp; | |
| 7370 p_crb_save = ewp->w_p_crb; | |
| 7371 ewp->w_p_crb = FALSE; | |
| 7372 | |
| 1983 | 7373 /* Make a copy, because the statusline may include a function call that |
| 7374 * might change the option value and free the memory. */ | |
| 7375 stl = vim_strsave(stl); | |
| 2693 | 7376 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7377 stl, use_sandbox, |
| 681 | 7378 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7379 vim_free(stl); |
| 2693 | 7380 ewp->w_p_crb = p_crb_save; |
| 2661 | 7381 |
| 7382 /* Make all characters printable. */ | |
| 7383 p = transstr(buf); | |
| 7384 if (p != NULL) | |
| 7385 { | |
| 7386 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7387 vim_free(p); | |
| 7388 } | |
| 7389 | |
| 7390 /* fill up with "fillchar" */ | |
| 835 | 7391 len = (int)STRLEN(buf); |
| 1883 | 7392 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7393 { |
| 7394 #ifdef FEAT_MBYTE | |
| 7395 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7396 #else | |
| 7397 buf[len++] = fillchar; | |
| 7398 #endif | |
| 7399 ++width; | |
| 7400 } | |
| 7401 buf[len] = NUL; | |
| 7402 | |
| 681 | 7403 /* |
| 7404 * Draw each snippet with the specified highlighting. | |
| 7405 */ | |
| 7 | 7406 curattr = attr; |
| 7407 p = buf; | |
| 681 | 7408 for (n = 0; hltab[n].start != NULL; n++) |
| 7409 { | |
| 7410 len = (int)(hltab[n].start - p); | |
| 7 | 7411 screen_puts_len(p, len, row, col, curattr); |
| 7412 col += vim_strnsize(p, len); | |
| 681 | 7413 p = hltab[n].start; |
| 7414 | |
| 7415 if (hltab[n].userhl == 0) | |
| 7 | 7416 curattr = attr; |
| 681 | 7417 else if (hltab[n].userhl < 0) |
| 7418 curattr = syn_id2attr(-hltab[n].userhl); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7419 #ifdef FEAT_TERMINAL |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7420 else if (wp != NULL && wp != curwin && bt_terminal(wp->w_buffer) |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7421 && wp->w_status_height != 0) |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7422 curattr = highlight_stltermnc[hltab[n].userhl - 1]; |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
11981
diff
changeset
|
7423 else if (wp != NULL && bt_terminal(wp->w_buffer) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
11981
diff
changeset
|
7424 && wp->w_status_height != 0) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
11981
diff
changeset
|
7425 curattr = highlight_stlterm[hltab[n].userhl - 1]; |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7426 #endif |
| 680 | 7427 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7428 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7429 else |
| 681 | 7430 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7431 } |
| 7432 screen_puts(p, row, col, curattr); | |
| 681 | 7433 |
| 7434 if (wp == NULL) | |
| 7435 { | |
| 7436 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7437 col = 0; | |
| 7438 len = 0; | |
| 7439 p = buf; | |
| 7440 fillchar = 0; | |
| 7441 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7442 { | |
| 7443 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7444 while (col < len) | |
| 7445 TabPageIdxs[col++] = fillchar; | |
| 7446 p = tabtab[n].start; | |
| 7447 fillchar = tabtab[n].userhl; | |
| 7448 } | |
| 7449 while (col < Columns) | |
| 7450 TabPageIdxs[col++] = fillchar; | |
| 7451 } | |
| 5539 | 7452 |
| 7453 theend: | |
| 7454 entered = FALSE; | |
| 7 | 7455 } |
| 7456 | |
| 7457 #endif /* FEAT_STL_OPT */ | |
| 7458 | |
| 7459 /* | |
| 7460 * Output a single character directly to the screen and update ScreenLines. | |
| 7461 */ | |
| 7462 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7463 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7464 { |
| 3549 | 7465 char_u buf[MB_MAXBYTES + 1]; |
| 7466 | |
| 7 | 7467 #ifdef FEAT_MBYTE |
| 3549 | 7468 if (has_mbyte) |
| 7469 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7470 else | |
| 7471 #endif | |
| 7472 { | |
| 7473 buf[0] = c; | |
| 7474 buf[1] = NUL; | |
| 7475 } | |
| 7 | 7476 screen_puts(buf, row, col, attr); |
| 7477 } | |
| 7478 | |
| 7479 /* | |
| 7480 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7481 * Also return its attribute in *attrp; | |
| 7482 */ | |
| 7483 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7484 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7485 { |
| 7486 unsigned off; | |
| 7487 | |
| 7488 /* safety check */ | |
| 7489 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7490 { | |
| 7491 off = LineOffset[row] + col; | |
| 7492 *attrp = ScreenAttrs[off]; | |
| 7493 bytes[0] = ScreenLines[off]; | |
| 7494 bytes[1] = NUL; | |
| 7495 | |
| 7496 #ifdef FEAT_MBYTE | |
| 7497 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7498 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7499 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7500 { | |
| 7501 bytes[0] = ScreenLines[off]; | |
| 7502 bytes[1] = ScreenLines2[off]; | |
| 7503 bytes[2] = NUL; | |
| 7504 } | |
| 7505 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7506 { | |
| 7507 bytes[1] = ScreenLines[off + 1]; | |
| 7508 bytes[2] = NUL; | |
| 7509 } | |
| 7510 #endif | |
| 7511 } | |
| 7512 } | |
| 7513 | |
| 714 | 7514 #ifdef FEAT_MBYTE |
| 7515 /* | |
| 7516 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7517 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7518 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7519 */ |
| 7520 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7521 screen_comp_differs(int off, int *u8cc) |
| 714 | 7522 { |
| 7523 int i; | |
| 7524 | |
| 7525 for (i = 0; i < Screen_mco; ++i) | |
| 7526 { | |
| 7527 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7528 return TRUE; | |
| 7529 if (u8cc[i] == 0) | |
| 7530 break; | |
| 7531 } | |
| 7532 return FALSE; | |
| 7533 } | |
| 7534 #endif | |
| 7535 | |
| 7 | 7536 /* |
| 7537 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7538 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7539 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7540 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7541 */ | |
| 7542 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7543 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7544 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7545 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7546 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7547 int attr) |
| 7 | 7548 { |
| 7549 screen_puts_len(text, -1, row, col, attr); | |
| 7550 } | |
| 7551 | |
| 7552 /* | |
| 7553 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7554 * a NUL. | |
| 7555 */ | |
| 7556 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7557 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7558 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7559 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7560 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7561 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7562 int attr) |
| 7 | 7563 { |
| 7564 unsigned off; | |
| 7565 char_u *ptr = text; | |
| 5923 | 7566 int len = textlen; |
| 7 | 7567 int c; |
| 7568 #ifdef FEAT_MBYTE | |
| 1378 | 7569 unsigned max_off; |
| 7 | 7570 int mbyte_blen = 1; |
| 7571 int mbyte_cells = 1; | |
| 7572 int u8c = 0; | |
| 714 | 7573 int u8cc[MAX_MCO]; |
| 7 | 7574 int clear_next_cell = FALSE; |
| 7575 # ifdef FEAT_ARABIC | |
| 7576 int prev_c = 0; /* previous Arabic character */ | |
| 714 | 7577 int pc, nc, nc1; |
| 7578 int pcc[MAX_MCO]; | |
| 7 | 7579 # endif |
| 7580 #endif | |
| 1843 | 7581 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7582 int force_redraw_this; | |
| 7583 int force_redraw_next = FALSE; | |
| 7584 #endif | |
| 7585 int need_redraw; | |
| 7 | 7586 |
| 7587 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7588 return; | |
| 1843 | 7589 off = LineOffset[row] + col; |
| 7 | 7590 |
| 1668 | 7591 #ifdef FEAT_MBYTE |
| 7592 /* When drawing over the right halve of a double-wide char clear out the | |
| 7593 * left halve. Only needed in a terminal. */ | |
| 1685 | 7594 if (has_mbyte && col > 0 && col < screen_Columns |
| 1668 | 7595 # ifdef FEAT_GUI |
| 7596 && !gui.in_use | |
| 7597 # endif | |
| 7598 && mb_fix_col(col, row) != col) | |
| 1843 | 7599 { |
| 7600 ScreenLines[off - 1] = ' '; | |
| 7601 ScreenAttrs[off - 1] = 0; | |
| 7602 if (enc_utf8) | |
| 7603 { | |
| 7604 ScreenLinesUC[off - 1] = 0; | |
| 7605 ScreenLinesC[0][off - 1] = 0; | |
| 7606 } | |
| 7607 /* redraw the previous cell, make it empty */ | |
| 7608 screen_char(off - 1, row, col - 1); | |
| 7609 /* force the cell at "col" to be redrawn */ | |
| 7610 force_redraw_next = TRUE; | |
| 7611 } | |
| 7612 #endif | |
| 7613 | |
| 1378 | 7614 #ifdef FEAT_MBYTE |
| 7615 max_off = LineOffset[row] + screen_Columns; | |
| 7616 #endif | |
| 1340 | 7617 while (col < screen_Columns |
| 7618 && (len < 0 || (int)(ptr - text) < len) | |
| 7619 && *ptr != NUL) | |
| 7 | 7620 { |
| 7621 c = *ptr; | |
| 7622 #ifdef FEAT_MBYTE | |
| 7623 /* check if this is the first byte of a multibyte */ | |
| 7624 if (has_mbyte) | |
| 7625 { | |
| 7626 if (enc_utf8 && len > 0) | |
| 474 | 7627 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7628 else |
| 474 | 7629 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7630 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7631 mbyte_cells = 1; | |
| 7632 else if (enc_dbcs != 0) | |
| 7633 mbyte_cells = mbyte_blen; | |
| 7634 else /* enc_utf8 */ | |
| 7635 { | |
| 7636 if (len >= 0) | |
| 714 | 7637 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7638 (int)((text + len) - ptr)); |
| 7639 else | |
| 714 | 7640 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7641 mbyte_cells = utf_char2cells(u8c); |
| 1401 | 7642 # ifdef UNICODE16 |
| 7 | 7643 /* Non-BMP character: display as ? or fullwidth ?. */ |
| 7644 if (u8c >= 0x10000) | |
| 7645 { | |
| 7646 u8c = (mbyte_cells == 2) ? 0xff1f : (int)'?'; | |
| 7647 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
|
7648 attr = HL_ATTR(HLF_8); |
| 7 | 7649 } |
| 1401 | 7650 # endif |
| 7 | 7651 # ifdef FEAT_ARABIC |
| 7652 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 7653 { | |
| 7654 /* Do Arabic shaping. */ | |
| 7655 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7656 { | |
| 7657 /* Past end of string to be displayed. */ | |
| 7658 nc = NUL; | |
| 7659 nc1 = NUL; | |
| 7660 } | |
| 7661 else | |
| 714 | 7662 { |
| 1994 | 7663 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7664 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7665 nc1 = pcc[0]; |
| 7666 } | |
| 7 | 7667 pc = prev_c; |
| 7668 prev_c = u8c; | |
| 714 | 7669 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7670 } |
| 7671 else | |
| 7672 prev_c = u8c; | |
| 7673 # endif | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7674 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7675 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7676 /* 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
|
7677 * 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
|
7678 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7679 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7680 } |
| 7 | 7681 } |
| 7682 } | |
| 7683 #endif | |
| 7684 | |
| 1843 | 7685 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7686 force_redraw_this = force_redraw_next; | |
| 7687 force_redraw_next = FALSE; | |
| 7688 #endif | |
| 7689 | |
| 7690 need_redraw = ScreenLines[off] != c | |
| 7 | 7691 #ifdef FEAT_MBYTE |
| 7692 || (mbyte_cells == 2 | |
| 7693 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7694 || (enc_dbcs == DBCS_JPNU | |
| 7695 && c == 0x8e | |
| 7696 && ScreenLines2[off] != ptr[1]) | |
| 7697 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7698 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7699 (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
|
7700 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7701 && screen_comp_differs(off, u8cc)))) |
| 7 | 7702 #endif |
| 7703 || ScreenAttrs[off] != attr | |
| 1843 | 7704 || exmode_active; |
| 7705 | |
| 7706 if (need_redraw | |
| 7707 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7708 || force_redraw_this | |
| 7709 #endif | |
| 7 | 7710 ) |
| 7711 { | |
| 7712 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7713 /* The bold trick makes a single row of pixels appear in the next | |
| 7714 * character. When a bold character is removed, the next | |
| 7715 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7716 * and for some xterms. */ |
| 7717 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7718 # ifdef FEAT_GUI |
| 7719 gui.in_use | |
| 7720 # endif | |
| 7721 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7722 || | |
| 7723 # endif | |
| 7724 # ifdef UNIX | |
| 7725 term_is_xterm | |
| 7726 # endif | |
| 1843 | 7727 )) |
| 7728 { | |
| 7729 int n = ScreenAttrs[off]; | |
| 7730 | |
| 7731 if (n > HL_ALL) | |
| 7732 n = syn_attr2attr(n); | |
| 7733 if (n & HL_BOLD) | |
| 7734 force_redraw_next = TRUE; | |
| 7 | 7735 } |
| 7736 #endif | |
| 7737 #ifdef FEAT_MBYTE | |
| 7738 /* When at the end of the text and overwriting a two-cell | |
| 7739 * character with a one-cell character, need to clear the next | |
| 7740 * cell. Also when overwriting the left halve of a two-cell char | |
| 7741 * with the right halve of a two-cell char. Do this only once | |
| 7742 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7743 if (clear_next_cell) | |
| 7744 clear_next_cell = FALSE; | |
| 7745 else if (has_mbyte | |
| 7746 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7747 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7748 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7749 || (mbyte_cells == 2 |
| 1378 | 7750 && (*mb_off2cells)(off, max_off) == 1 |
| 7751 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7752 clear_next_cell = TRUE; |
| 7753 | |
| 7754 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7755 * it confuses mb_off2cells(). */ | |
| 7756 if (enc_dbcs | |
| 1378 | 7757 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7758 || (mbyte_cells == 2 |
| 1378 | 7759 && (*mb_off2cells)(off, max_off) == 1 |
| 7760 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7761 ScreenLines[off + mbyte_blen] = 0; |
| 7762 #endif | |
| 7763 ScreenLines[off] = c; | |
| 7764 ScreenAttrs[off] = attr; | |
| 7765 #ifdef FEAT_MBYTE | |
| 7766 if (enc_utf8) | |
| 7767 { | |
| 714 | 7768 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7769 ScreenLinesUC[off] = 0; |
| 7770 else | |
| 7771 { | |
| 714 | 7772 int i; |
| 7773 | |
| 7 | 7774 ScreenLinesUC[off] = u8c; |
| 714 | 7775 for (i = 0; i < Screen_mco; ++i) |
| 7776 { | |
| 7777 ScreenLinesC[i][off] = u8cc[i]; | |
| 7778 if (u8cc[i] == 0) | |
| 7779 break; | |
| 7780 } | |
| 7 | 7781 } |
| 7782 if (mbyte_cells == 2) | |
| 7783 { | |
| 7784 ScreenLines[off + 1] = 0; | |
| 7785 ScreenAttrs[off + 1] = attr; | |
| 7786 } | |
| 7787 screen_char(off, row, col); | |
| 7788 } | |
| 7789 else if (mbyte_cells == 2) | |
| 7790 { | |
| 7791 ScreenLines[off + 1] = ptr[1]; | |
| 7792 ScreenAttrs[off + 1] = attr; | |
| 7793 screen_char_2(off, row, col); | |
| 7794 } | |
| 7795 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7796 { | |
| 7797 ScreenLines2[off] = ptr[1]; | |
| 7798 screen_char(off, row, col); | |
| 7799 } | |
| 7800 else | |
| 7801 #endif | |
| 7802 screen_char(off, row, col); | |
| 7803 } | |
| 7804 #ifdef FEAT_MBYTE | |
| 7805 if (has_mbyte) | |
| 7806 { | |
| 7807 off += mbyte_cells; | |
| 7808 col += mbyte_cells; | |
| 7809 ptr += mbyte_blen; | |
| 7810 if (clear_next_cell) | |
| 5923 | 7811 { |
| 7812 /* This only happens at the end, display one space next. */ | |
| 7 | 7813 ptr = (char_u *)" "; |
| 5923 | 7814 len = -1; |
| 7815 } | |
| 7 | 7816 } |
| 7817 else | |
| 7818 #endif | |
| 7819 { | |
| 7820 ++off; | |
| 7821 ++col; | |
| 7822 ++ptr; | |
| 7823 } | |
| 7824 } | |
| 1843 | 7825 |
| 7826 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7827 /* If we detected the next character needs to be redrawn, but the text | |
| 7828 * doesn't extend up to there, update the character here. */ | |
| 7829 if (force_redraw_next && col < screen_Columns) | |
| 7830 { | |
| 7831 # ifdef FEAT_MBYTE | |
| 7832 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7833 screen_char_2(off, row, col); | |
| 7834 else | |
| 7835 # endif | |
| 7836 screen_char(off, row, col); | |
| 7837 } | |
| 7838 #endif | |
| 7 | 7839 } |
| 7840 | |
| 7841 #ifdef FEAT_SEARCH_EXTRA | |
| 7842 /* | |
| 1326 | 7843 * Prepare for 'hlsearch' highlighting. |
| 7 | 7844 */ |
| 7845 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7846 start_search_hl(void) |
| 7 | 7847 { |
| 7848 if (p_hls && !no_hlsearch) | |
| 7849 { | |
| 7850 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
|
7851 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7852 # ifdef FEAT_RELTIME |
| 7853 /* Set the time limit to 'redrawtime'. */ | |
| 7854 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7855 # endif | |
| 7 | 7856 } |
| 7857 } | |
| 7858 | |
| 7859 /* | |
| 1326 | 7860 * Clean up for 'hlsearch' highlighting. |
| 7 | 7861 */ |
| 7862 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7863 end_search_hl(void) |
| 7 | 7864 { |
| 7865 if (search_hl.rm.regprog != NULL) | |
| 7866 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7867 vim_regfree(search_hl.rm.regprog); |
| 7 | 7868 search_hl.rm.regprog = NULL; |
| 7869 } | |
| 7870 } | |
| 7871 | |
| 7872 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7873 * 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
|
7874 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7875 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7876 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
|
7877 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7878 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7879 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7880 /* 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
|
7881 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7882 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7883 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7884 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7885 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7886 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7887 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7888 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7889 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
|
7890 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
|
7891 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7892 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7893 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7894 /* 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
|
7895 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
|
7896 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7897 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7898 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7899 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
|
7900 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7901 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7902 /* 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
|
7903 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7904 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7905 /* |
| 7 | 7906 * Advance to the match in window "wp" line "lnum" or past it. |
| 7907 */ | |
| 7908 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7909 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7910 { |
| 1326 | 7911 matchitem_T *cur; /* points to the match list */ |
| 7912 match_T *shl; /* points to search_hl or a match */ | |
| 7913 int shl_flag; /* flag to indicate whether search_hl | |
| 7914 has been processed or not */ | |
| 5979 | 7915 int pos_inprogress; /* marks that position match search is |
| 7916 in progress */ | |
| 7 | 7917 int n; |
| 7918 | |
| 7919 /* | |
| 7920 * When using a multi-line pattern, start searching at the top | |
| 7921 * of the window or just after a closed fold. | |
| 1326 | 7922 * Do this both for search_hl and the match list. |
| 7 | 7923 */ |
| 1326 | 7924 cur = wp->w_match_head; |
| 7925 shl_flag = FALSE; | |
| 7926 while (cur != NULL || shl_flag == FALSE) | |
| 7927 { | |
| 7928 if (shl_flag == FALSE) | |
| 7929 { | |
| 7930 shl = &search_hl; | |
| 7931 shl_flag = TRUE; | |
| 7932 } | |
| 7933 else | |
| 7934 shl = &cur->hl; | |
| 7 | 7935 if (shl->rm.regprog != NULL |
| 7936 && shl->lnum == 0 | |
| 7937 && re_multiline(shl->rm.regprog)) | |
| 7938 { | |
| 7939 if (shl->first_lnum == 0) | |
| 7940 { | |
| 7941 # ifdef FEAT_FOLDING | |
| 7942 for (shl->first_lnum = lnum; | |
| 7943 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7944 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7945 NULL, NULL, TRUE, NULL)) | |
| 7946 break; | |
| 7947 # else | |
| 7948 shl->first_lnum = wp->w_topline; | |
| 7949 # endif | |
| 7950 } | |
| 5979 | 7951 if (cur != NULL) |
| 7952 cur->pos.cur = 0; | |
| 7953 pos_inprogress = TRUE; | |
| 7 | 7954 n = 0; |
| 5979 | 7955 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7956 || (cur != NULL && pos_inprogress))) | |
| 7957 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7958 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
|
7959 shl == &search_hl ? NULL : cur); |
| 5979 | 7960 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 7961 ? FALSE : TRUE; | |
| 7 | 7962 if (shl->lnum != 0) |
| 7963 { | |
| 7964 shl->first_lnum = shl->lnum | |
| 7965 + shl->rm.endpos[0].lnum | |
| 7966 - shl->rm.startpos[0].lnum; | |
| 7967 n = shl->rm.endpos[0].col; | |
| 7968 } | |
| 7969 else | |
| 7970 { | |
| 7971 ++shl->first_lnum; | |
| 7972 n = 0; | |
| 7973 } | |
| 7974 } | |
| 7975 } | |
| 1326 | 7976 if (shl != &search_hl && cur != NULL) |
| 7977 cur = cur->next; | |
| 7 | 7978 } |
| 7979 } | |
| 7980 | |
| 7981 /* | |
| 1326 | 7982 * Search for a next 'hlsearch' or match. |
| 7 | 7983 * Uses shl->buf. |
| 7984 * Sets shl->lnum and shl->rm contents. | |
| 7985 * Note: Assumes a previous match is always before "lnum", unless | |
| 7986 * shl->lnum is zero. | |
| 7987 * Careful: Any pointers for buffer lines will become invalid. | |
| 7988 */ | |
| 7989 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7990 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7991 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7992 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
|
7993 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7994 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
|
7995 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 7996 { |
| 7997 linenr_T l; | |
| 7998 colnr_T matchcol; | |
| 7999 long nmatched; | |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8000 int save_called_emsg = called_emsg; |
| 7 | 8001 |
|
14515
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8002 // for :{range}s/pat only highlight inside the range |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8003 if (lnum < search_first_line || lnum > search_last_line) |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8004 { |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8005 shl->lnum = 0; |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8006 return; |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8007 } |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8008 |
| 7 | 8009 if (shl->lnum != 0) |
| 8010 { | |
| 8011 /* Check for three situations: | |
| 8012 * 1. If the "lnum" is below a previous match, start a new search. | |
| 8013 * 2. If the previous match includes "mincol", use it. | |
| 8014 * 3. Continue after the previous match. | |
| 8015 */ | |
| 8016 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 8017 if (lnum > l) | |
| 8018 shl->lnum = 0; | |
| 8019 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 8020 return; | |
| 8021 } | |
| 8022 | |
| 8023 /* | |
| 8024 * Repeat searching for a match until one is found that includes "mincol" | |
| 8025 * or none is found in this line. | |
| 8026 */ | |
| 8027 called_emsg = FALSE; | |
| 8028 for (;;) | |
| 8029 { | |
| 1521 | 8030 #ifdef FEAT_RELTIME |
| 8031 /* Stop searching after passing the time limit. */ | |
| 8032 if (profile_passed_limit(&(shl->tm))) | |
| 8033 { | |
| 8034 shl->lnum = 0; /* no match found in time */ | |
| 8035 break; | |
| 8036 } | |
| 8037 #endif | |
| 7 | 8038 /* Three situations: |
| 8039 * 1. No useful previous match: search from start of line. | |
| 8040 * 2. Not Vi compatible or empty match: continue at next character. | |
| 8041 * Break the loop if this is beyond the end of the line. | |
| 8042 * 3. Vi compatible searching: continue at end of previous match. | |
| 8043 */ | |
| 8044 if (shl->lnum == 0) | |
| 8045 matchcol = 0; | |
| 8046 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 8047 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 8048 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 8049 { | |
| 688 | 8050 char_u *ml; |
| 685 | 8051 |
| 8052 matchcol = shl->rm.startpos[0].col; | |
| 688 | 8053 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 8054 if (*ml == NUL) |
| 8055 { | |
| 8056 ++matchcol; | |
| 7 | 8057 shl->lnum = 0; |
| 8058 break; | |
| 8059 } | |
| 685 | 8060 #ifdef FEAT_MBYTE |
| 8061 if (has_mbyte) | |
| 8062 matchcol += mb_ptr2len(ml); | |
| 8063 else | |
| 8064 #endif | |
| 8065 ++matchcol; | |
| 7 | 8066 } |
| 8067 else | |
| 8068 matchcol = shl->rm.endpos[0].col; | |
| 8069 | |
| 8070 shl->lnum = lnum; | |
| 5979 | 8071 if (shl->rm.regprog != NULL) |
| 8072 { | |
| 6394 | 8073 /* Remember whether shl->rm is using a copy of the regprog in |
| 8074 * cur->match. */ | |
| 8075 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 8076 && shl == &cur->hl | |
| 8077 && cur->match.regprog == cur->hl.rm.regprog); | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
8078 int timed_out = FALSE; |
| 6394 | 8079 |
| 5979 | 8080 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 8081 matchcol, | |
| 1521 | 8082 #ifdef FEAT_RELTIME |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
8083 &(shl->tm), &timed_out |
| 1521 | 8084 #else |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
8085 NULL, NULL |
| 5979 | 8086 #endif |
| 8087 ); | |
| 6394 | 8088 /* Copy the regprog, in case it got freed and recompiled. */ |
| 8089 if (regprog_is_copy) | |
| 8090 cur->match.regprog = cur->hl.rm.regprog; | |
| 8091 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
8092 if (called_emsg || got_int || timed_out) |
| 5979 | 8093 { |
| 8094 /* Error while handling regexp: stop using this regexp. */ | |
| 8095 if (shl == &search_hl) | |
| 8096 { | |
| 8097 /* don't free regprog in the match list, it's a copy */ | |
| 8098 vim_regfree(shl->rm.regprog); | |
|
13792
0e9b2971d7c3
patch 8.0.1768: SET_NO_HLSEARCH() used in a wrong way
Christian Brabandt <cb@256bit.org>
parents:
13666
diff
changeset
|
8099 set_no_hlsearch(TRUE); |
| 5979 | 8100 } |
| 8101 shl->rm.regprog = NULL; | |
| 8102 shl->lnum = 0; | |
| 8103 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 8104 message */ | |
| 8105 break; | |
| 8106 } | |
| 8107 } | |
| 8108 else if (cur != NULL) | |
| 8109 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 8110 else |
| 8111 nmatched = 0; | |
| 7 | 8112 if (nmatched == 0) |
| 8113 { | |
| 8114 shl->lnum = 0; /* no match found */ | |
| 8115 break; | |
| 8116 } | |
| 8117 if (shl->rm.startpos[0].lnum > 0 | |
| 8118 || shl->rm.startpos[0].col >= mincol | |
| 8119 || nmatched > 1 | |
| 8120 || shl->rm.endpos[0].col > mincol) | |
| 8121 { | |
| 8122 shl->lnum += shl->rm.startpos[0].lnum; | |
| 8123 break; /* useful match found */ | |
| 8124 } | |
| 8125 } | |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8126 |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8127 // Restore called_emsg for assert_fails(). |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8128 called_emsg = save_called_emsg; |
| 7 | 8129 } |
| 8130 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8131 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8132 * 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
|
8133 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8134 */ |
| 5979 | 8135 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8136 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8137 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
|
8138 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8139 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8140 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 8141 { |
| 8142 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8143 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8144 |
| 5979 | 8145 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 8146 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8147 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8148 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8149 if (pos->lnum == 0) |
| 5979 | 8150 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8151 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 8152 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8153 if (pos->lnum == lnum) |
| 5979 | 8154 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8155 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8156 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8157 /* 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
|
8158 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8159 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
|
8160 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8161 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8162 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8163 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8164 posmatch->pos[found] = tmp; |
| 5979 | 8165 } |
| 8166 } | |
| 8167 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8168 found = i; |
| 5979 | 8169 } |
| 8170 } | |
| 8171 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8172 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8173 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8174 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
|
8175 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8176 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
|
8177 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8178 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8179 shl->lnum = lnum; |
| 5979 | 8180 shl->rm.startpos[0].lnum = 0; |
| 8181 shl->rm.startpos[0].col = start; | |
| 8182 shl->rm.endpos[0].lnum = 0; | |
| 8183 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
|
8184 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8185 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8186 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8187 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8188 return 0; |
| 5979 | 8189 } |
| 5985 | 8190 #endif |
| 5979 | 8191 |
| 7 | 8192 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8193 screen_start_highlight(int attr) |
| 7 | 8194 { |
| 8195 attrentry_T *aep = NULL; | |
| 8196 | |
| 8197 screen_attr = attr; | |
| 8198 if (full_screen | |
| 8199 #ifdef WIN3264 | |
| 8200 && termcap_active | |
| 8201 #endif | |
| 8202 ) | |
| 8203 { | |
| 8204 #ifdef FEAT_GUI | |
| 8205 if (gui.in_use) | |
| 8206 { | |
| 8207 char buf[20]; | |
| 8208 | |
| 681 | 8209 /* The GUI handles this internally. */ |
| 8210 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 8211 OUT_STR(buf); |
| 8212 } | |
| 8213 else | |
| 8214 #endif | |
| 8215 { | |
| 8216 if (attr > HL_ALL) /* special HL attr. */ | |
| 8217 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8218 if (IS_CTERM) |
| 7 | 8219 aep = syn_cterm_attr2entry(attr); |
| 8220 else | |
| 8221 aep = syn_term_attr2entry(attr); | |
| 8222 if (aep == NULL) /* did ":syntax clear" */ | |
| 8223 attr = 0; | |
| 8224 else | |
| 8225 attr = aep->ae_attr; | |
| 8226 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8227 if ((attr & HL_BOLD) && *T_MD != NUL) /* bold */ |
| 7 | 8228 out_str(T_MD); |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8229 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
|
8230 #ifdef FEAT_TERMGUICOLORS |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8231 p_tgc && aep->ae_u.cterm.fg_rgb != CTERMCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8232 ? aep->ae_u.cterm.fg_rgb != INVALCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8233 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8234 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8235 t_colors > 1 && aep->ae_u.cterm.fg_color)) |
| 681 | 8236 /* If the Normal FG color has BOLD attribute and the new HL |
| 8237 * has a FG color defined, clear BOLD. */ | |
| 8238 out_str(T_ME); | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8239 if ((attr & HL_STANDOUT) && *T_SO != NUL) /* standout */ |
| 7 | 8240 out_str(T_SO); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8241 if ((attr & HL_UNDERCURL) && *T_UCS != NUL) /* undercurl */ |
|
12964
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8242 out_str(T_UCS); |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8243 if (((attr & HL_UNDERLINE) /* underline or undercurl */ |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8244 || ((attr & HL_UNDERCURL) && *T_UCS == NUL)) |
|
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8245 && *T_US != NUL) |
| 7 | 8246 out_str(T_US); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8247 if ((attr & HL_ITALIC) && *T_CZH != NUL) /* italic */ |
| 7 | 8248 out_str(T_CZH); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8249 if ((attr & HL_INVERSE) && *T_MR != NUL) /* inverse (reverse) */ |
| 7 | 8250 out_str(T_MR); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8251 if ((attr & HL_STRIKETHROUGH) && *T_STS != NUL) /* strike */ |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8252 out_str(T_STS); |
| 7 | 8253 |
| 8254 /* | |
| 8255 * Output the color or start string after bold etc., in case the | |
| 8256 * bold etc. override the color setting. | |
| 8257 */ | |
| 8258 if (aep != NULL) | |
| 8259 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8260 #ifdef FEAT_TERMGUICOLORS |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8261 /* When 'termguicolors' is set but fg or bg is unset, |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8262 * fall back to the cterm colors. This helps for SpellBad, |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8263 * where the GUI uses a red undercurl. */ |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8264 if (p_tgc && aep->ae_u.cterm.fg_rgb != CTERMCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8265 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8266 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
|
8267 term_fg_rgb_color(aep->ae_u.cterm.fg_rgb); |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8268 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8269 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8270 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8271 if (t_colors > 1) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8272 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8273 if (aep->ae_u.cterm.fg_color) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8274 term_fg_color(aep->ae_u.cterm.fg_color - 1); |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8275 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8276 #ifdef FEAT_TERMGUICOLORS |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8277 if (p_tgc && aep->ae_u.cterm.bg_rgb != CTERMCOLOR) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8278 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8279 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
|
8280 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8281 } |
| 8282 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8283 #endif |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8284 if (t_colors > 1) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8285 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8286 if (aep->ae_u.cterm.bg_color) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8287 term_bg_color(aep->ae_u.cterm.bg_color - 1); |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8288 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8289 |
|
13452
9b09f6e470e0
patch 8.0.1600: crash when setting t_Co to zero when 'termguicolors' is set
Christian Brabandt <cb@256bit.org>
parents:
13400
diff
changeset
|
8290 if (!IS_CTERM) |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8291 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8292 if (aep->ae_u.term.start != NULL) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8293 out_str(aep->ae_u.term.start); |
| 7 | 8294 } |
| 8295 } | |
| 8296 } | |
| 8297 } | |
| 8298 } | |
| 8299 | |
| 8300 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8301 screen_stop_highlight(void) |
| 7 | 8302 { |
| 8303 int do_ME = FALSE; /* output T_ME code */ | |
| 8304 | |
| 8305 if (screen_attr != 0 | |
| 8306 #ifdef WIN3264 | |
| 8307 && termcap_active | |
| 8308 #endif | |
| 8309 ) | |
| 8310 { | |
| 8311 #ifdef FEAT_GUI | |
| 8312 if (gui.in_use) | |
| 8313 { | |
| 8314 char buf[20]; | |
| 8315 | |
| 8316 /* use internal GUI code */ | |
| 8317 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8318 OUT_STR(buf); | |
| 8319 } | |
| 8320 else | |
| 8321 #endif | |
| 8322 { | |
| 8323 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8324 { | |
| 8325 attrentry_T *aep; | |
| 8326 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8327 if (IS_CTERM) |
| 7 | 8328 { |
| 8329 /* | |
| 8330 * Assume that t_me restores the original colors! | |
| 8331 */ | |
| 8332 aep = syn_cterm_attr2entry(screen_attr); | |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8333 if (aep != NULL && (( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8334 #ifdef FEAT_TERMGUICOLORS |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8335 p_tgc && aep->ae_u.cterm.fg_rgb != CTERMCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8336 ? aep->ae_u.cterm.fg_rgb != INVALCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8337 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8338 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8339 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
|
8340 #ifdef FEAT_TERMGUICOLORS |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8341 p_tgc && aep->ae_u.cterm.bg_rgb != CTERMCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8342 ? aep->ae_u.cterm.bg_rgb != INVALCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8343 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8344 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8345 aep->ae_u.cterm.bg_color))) |
| 7 | 8346 do_ME = TRUE; |
| 8347 } | |
| 8348 else | |
| 8349 { | |
| 8350 aep = syn_term_attr2entry(screen_attr); | |
| 8351 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8352 { | |
| 8353 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8354 do_ME = TRUE; | |
| 8355 else | |
| 8356 out_str(aep->ae_u.term.stop); | |
| 8357 } | |
| 8358 } | |
| 8359 if (aep == NULL) /* did ":syntax clear" */ | |
| 8360 screen_attr = 0; | |
| 8361 else | |
| 8362 screen_attr = aep->ae_attr; | |
| 8363 } | |
| 8364 | |
| 8365 /* | |
| 8366 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8367 * same sequence several times. | |
| 8368 */ | |
| 8369 if (screen_attr & HL_STANDOUT) | |
| 8370 { | |
| 8371 if (STRCMP(T_SE, T_ME) == 0) | |
| 8372 do_ME = TRUE; | |
| 8373 else | |
| 8374 out_str(T_SE); | |
| 8375 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8376 if ((screen_attr & HL_UNDERCURL) && *T_UCE != NUL) |
|
12964
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8377 { |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8378 if (STRCMP(T_UCE, T_ME) == 0) |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8379 do_ME = TRUE; |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8380 else |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8381 out_str(T_UCE); |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8382 } |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8383 if ((screen_attr & HL_UNDERLINE) |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8384 || ((screen_attr & HL_UNDERCURL) && *T_UCE == NUL)) |
| 7 | 8385 { |
| 8386 if (STRCMP(T_UE, T_ME) == 0) | |
| 8387 do_ME = TRUE; | |
| 8388 else | |
| 8389 out_str(T_UE); | |
| 8390 } | |
| 8391 if (screen_attr & HL_ITALIC) | |
| 8392 { | |
| 8393 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8394 do_ME = TRUE; | |
| 8395 else | |
| 8396 out_str(T_CZR); | |
| 8397 } | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8398 if (screen_attr & HL_STRIKETHROUGH) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8399 { |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8400 if (STRCMP(T_STE, T_ME) == 0) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8401 do_ME = TRUE; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8402 else |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8403 out_str(T_STE); |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8404 } |
| 7 | 8405 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) |
| 8406 out_str(T_ME); | |
| 8407 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8408 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8409 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8410 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8411 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
|
8412 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
|
8413 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
|
8414 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
|
8415 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8416 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8417 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8418 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8419 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8420 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8421 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8422 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8423 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
|
8424 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8425 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
|
8426 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8427 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8428 } |
| 7 | 8429 } |
| 8430 } | |
| 8431 } | |
| 8432 screen_attr = 0; | |
| 8433 } | |
| 8434 | |
| 8435 /* | |
| 8436 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8437 * The machine specific code may override this again. | |
| 8438 */ | |
| 8439 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8440 reset_cterm_colors(void) |
| 7 | 8441 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8442 if (IS_CTERM) |
| 7 | 8443 { |
| 8444 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8445 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8446 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
|
8447 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8448 : (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
|
8449 #else |
| 7 | 8450 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
|
8451 #endif |
| 7 | 8452 { |
| 8453 out_str(T_OP); | |
| 8454 screen_attr = -1; | |
| 8455 } | |
| 8456 if (cterm_normal_fg_bold) | |
| 8457 { | |
| 8458 out_str(T_ME); | |
| 8459 screen_attr = -1; | |
| 8460 } | |
| 8461 } | |
| 8462 } | |
| 8463 | |
| 8464 /* | |
| 8465 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8466 * using the attributes from ScreenAttrs["off"]. | |
| 8467 */ | |
| 8468 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8469 screen_char(unsigned off, int row, int col) |
| 7 | 8470 { |
| 8471 int attr; | |
| 8472 | |
| 8473 /* Check for illegal values, just in case (could happen just after | |
| 8474 * resizing). */ | |
| 8475 if (row >= screen_Rows || col >= screen_Columns) | |
| 8476 return; | |
| 8477 | |
| 6602 | 8478 /* Outputting a character in the last cell on the screen may scroll the |
| 8479 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8480 * mark the character invalid (update it when scrolled up). */ | |
| 8481 if (*T_XN == NUL | |
| 8482 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8483 #ifdef FEAT_RIGHTLEFT |
| 8484 /* account for first command-line character in rightleft mode */ | |
| 8485 && !cmdmsg_rl | |
| 8486 #endif | |
| 8487 ) | |
| 8488 { | |
| 8489 ScreenAttrs[off] = (sattr_T)-1; | |
| 8490 return; | |
| 8491 } | |
| 8492 | |
| 8493 /* | |
| 8494 * Stop highlighting first, so it's easier to move the cursor. | |
| 8495 */ | |
| 8496 if (screen_char_attr != 0) | |
| 8497 attr = screen_char_attr; | |
| 8498 else | |
| 8499 attr = ScreenAttrs[off]; | |
| 8500 if (screen_attr != attr) | |
| 8501 screen_stop_highlight(); | |
| 8502 | |
| 8503 windgoto(row, col); | |
| 8504 | |
| 8505 if (screen_attr != attr) | |
| 8506 screen_start_highlight(attr); | |
| 8507 | |
| 8508 #ifdef FEAT_MBYTE | |
| 8509 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8510 { | |
| 8511 char_u buf[MB_MAXBYTES + 1]; | |
| 8512 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8513 if (utf_ambiguous_width(ScreenLinesUC[off])) |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8514 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8515 if (*p_ambw == 'd' |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8516 # ifdef FEAT_GUI |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8517 && !gui.in_use |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8518 # endif |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8519 ) |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8520 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8521 /* Clear the two screen cells. If the character is actually |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8522 * single width it won't change the second cell. */ |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8523 out_str((char_u *)" "); |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8524 term_windgoto(row, col); |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8525 } |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8526 /* not sure where the cursor is after drawing the ambiguous width |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8527 * character */ |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8528 screen_cur_col = 9999; |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8529 } |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8530 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8531 ++screen_cur_col; |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8532 |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8533 /* Convert the UTF-8 character to bytes and write it. */ |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8534 buf[utfc_char2bytes(off, buf)] = NUL; |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8535 out_str(buf); |
| 7 | 8536 } |
| 8537 else | |
| 8538 #endif | |
| 8539 { | |
| 8540 #ifdef FEAT_MBYTE | |
| 8541 out_flush_check(); | |
| 8542 #endif | |
| 8543 out_char(ScreenLines[off]); | |
| 8544 #ifdef FEAT_MBYTE | |
| 8545 /* double-byte character in single-width cell */ | |
| 8546 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8547 out_char(ScreenLines2[off]); | |
| 8548 #endif | |
| 8549 } | |
| 8550 | |
| 8551 screen_cur_col++; | |
| 8552 } | |
| 8553 | |
| 8554 #ifdef FEAT_MBYTE | |
| 8555 | |
| 8556 /* | |
| 8557 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8558 * on the screen at position 'row' and 'col'. | |
| 8559 * The attributes of the first byte is used for all. This is required to | |
| 8560 * output the two bytes of a double-byte character with nothing in between. | |
| 8561 */ | |
| 8562 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8563 screen_char_2(unsigned off, int row, int col) |
| 7 | 8564 { |
| 8565 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8566 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8567 return; | |
| 8568 | |
| 8569 /* Outputting the last character on the screen may scrollup the screen. | |
| 8570 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8571 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8572 { | |
| 8573 ScreenAttrs[off] = (sattr_T)-1; | |
| 8574 return; | |
| 8575 } | |
| 8576 | |
| 8577 /* Output the first byte normally (positions the cursor), then write the | |
| 8578 * second byte directly. */ | |
| 8579 screen_char(off, row, col); | |
| 8580 out_char(ScreenLines[off + 1]); | |
| 8581 ++screen_cur_col; | |
| 8582 } | |
| 8583 #endif | |
| 8584 | |
| 8585 /* | |
| 8586 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8587 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8588 */ | |
| 8589 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8590 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8591 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8592 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8593 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8594 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8595 int invert) |
| 7 | 8596 { |
| 8597 int r, c; | |
| 8598 int off; | |
| 1378 | 8599 #ifdef FEAT_MBYTE |
| 8600 int max_off; | |
| 8601 #endif | |
| 7 | 8602 |
| 534 | 8603 /* Can't use ScreenLines unless initialized */ |
| 8604 if (ScreenLines == NULL) | |
| 8605 return; | |
| 8606 | |
| 7 | 8607 if (invert) |
| 8608 screen_char_attr = HL_INVERSE; | |
| 8609 for (r = row; r < row + height; ++r) | |
| 8610 { | |
| 8611 off = LineOffset[r]; | |
| 1378 | 8612 #ifdef FEAT_MBYTE |
| 8613 max_off = off + screen_Columns; | |
| 8614 #endif | |
| 7 | 8615 for (c = col; c < col + width; ++c) |
| 8616 { | |
| 8617 #ifdef FEAT_MBYTE | |
| 1378 | 8618 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8619 { |
| 8620 screen_char_2(off + c, r, c); | |
| 8621 ++c; | |
| 8622 } | |
| 8623 else | |
| 8624 #endif | |
| 8625 { | |
| 8626 screen_char(off + c, r, c); | |
| 8627 #ifdef FEAT_MBYTE | |
| 1378 | 8628 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8629 ++c; |
| 8630 #endif | |
| 8631 } | |
| 8632 } | |
| 8633 } | |
| 8634 screen_char_attr = 0; | |
| 8635 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
8636 |
| 7 | 8637 /* |
| 8638 * Redraw the characters for a vertically split window. | |
| 8639 */ | |
| 8640 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8641 redraw_block(int row, int end, win_T *wp) |
| 7 | 8642 { |
| 8643 int col; | |
| 8644 int width; | |
| 8645 | |
| 8646 # ifdef FEAT_CLIPBOARD | |
| 8647 clip_may_clear_selection(row, end - 1); | |
| 8648 # endif | |
| 8649 | |
| 8650 if (wp == NULL) | |
| 8651 { | |
| 8652 col = 0; | |
| 8653 width = Columns; | |
| 8654 } | |
| 8655 else | |
| 8656 { | |
| 8657 col = wp->w_wincol; | |
| 8658 width = wp->w_width; | |
| 8659 } | |
| 8660 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8661 } | |
| 8662 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8663 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8664 space_to_screenline(int off, int attr) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8665 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8666 ScreenLines[off] = ' '; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8667 ScreenAttrs[off] = attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8668 # ifdef FEAT_MBYTE |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8669 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8670 ScreenLinesUC[off] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8671 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8672 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8673 |
| 7 | 8674 /* |
| 8675 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8676 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8677 * Use attributes 'attr'. | |
| 8678 */ | |
| 8679 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8680 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8681 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8682 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8683 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8684 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8685 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8686 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8687 int attr) |
| 7 | 8688 { |
| 8689 int row; | |
| 8690 int col; | |
| 8691 int off; | |
| 8692 int end_off; | |
| 8693 int did_delete; | |
| 8694 int c; | |
| 8695 int norm_term; | |
| 8696 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8697 int force_next = FALSE; | |
| 8698 #endif | |
| 8699 | |
| 8700 if (end_row > screen_Rows) /* safety check */ | |
| 8701 end_row = screen_Rows; | |
| 8702 if (end_col > screen_Columns) /* safety check */ | |
| 8703 end_col = screen_Columns; | |
| 8704 if (ScreenLines == NULL | |
| 8705 || start_row >= end_row | |
| 8706 || start_col >= end_col) /* nothing to do */ | |
| 8707 return; | |
| 8708 | |
| 8709 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8710 norm_term = ( | |
| 8711 #ifdef FEAT_GUI | |
| 8712 !gui.in_use && | |
| 8713 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8714 !IS_CTERM); |
| 7 | 8715 for (row = start_row; row < end_row; ++row) |
| 8716 { | |
| 1668 | 8717 #ifdef FEAT_MBYTE |
| 8718 if (has_mbyte | |
| 8719 # ifdef FEAT_GUI | |
| 8720 && !gui.in_use | |
| 8721 # endif | |
| 8722 ) | |
| 8723 { | |
| 8724 /* When drawing over the right halve of a double-wide char clear | |
| 8725 * out the left halve. When drawing over the left halve of a | |
| 8726 * double wide-char clear out the right halve. Only needed in a | |
| 8727 * terminal. */ | |
| 1685 | 8728 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8729 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8730 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8731 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8732 } |
| 8733 #endif | |
| 7 | 8734 /* |
| 8735 * Try to use delete-line termcap code, when no attributes or in a | |
| 8736 * "normal" terminal, where a bold/italic space is just a | |
| 8737 * space. | |
| 8738 */ | |
| 8739 did_delete = FALSE; | |
| 8740 if (c2 == ' ' | |
| 8741 && end_col == Columns | |
| 8742 && can_clear(T_CE) | |
| 8743 && (attr == 0 | |
| 8744 || (norm_term | |
| 8745 && attr <= HL_ALL | |
| 8746 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8747 { | |
| 8748 /* | |
| 8749 * check if we really need to clear something | |
| 8750 */ | |
| 8751 col = start_col; | |
| 8752 if (c1 != ' ') /* don't clear first char */ | |
| 8753 ++col; | |
| 8754 | |
| 8755 off = LineOffset[row] + col; | |
| 8756 end_off = LineOffset[row] + end_col; | |
| 8757 | |
| 8758 /* skip blanks (used often, keep it fast!) */ | |
| 8759 #ifdef FEAT_MBYTE | |
| 8760 if (enc_utf8) | |
| 8761 while (off < end_off && ScreenLines[off] == ' ' | |
| 8762 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8763 ++off; | |
| 8764 else | |
| 8765 #endif | |
| 8766 while (off < end_off && ScreenLines[off] == ' ' | |
| 8767 && ScreenAttrs[off] == 0) | |
| 8768 ++off; | |
| 8769 if (off < end_off) /* something to be cleared */ | |
| 8770 { | |
| 8771 col = off - LineOffset[row]; | |
| 8772 screen_stop_highlight(); | |
| 8773 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8774 out_str(T_CE); | |
| 8775 screen_start(); /* don't know where cursor is now */ | |
| 8776 col = end_col - col; | |
| 8777 while (col--) /* clear chars in ScreenLines */ | |
| 8778 { | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8779 space_to_screenline(off, 0); |
| 7 | 8780 ++off; |
| 8781 } | |
| 8782 } | |
| 8783 did_delete = TRUE; /* the chars are cleared now */ | |
| 8784 } | |
| 8785 | |
| 8786 off = LineOffset[row] + start_col; | |
| 8787 c = c1; | |
| 8788 for (col = start_col; col < end_col; ++col) | |
| 8789 { | |
| 8790 if (ScreenLines[off] != c | |
| 8791 #ifdef FEAT_MBYTE | |
| 714 | 8792 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8793 != (c >= 0x80 ? c : 0)) | |
| 7 | 8794 #endif |
| 8795 || ScreenAttrs[off] != attr | |
| 8796 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8797 || force_next | |
| 8798 #endif | |
| 8799 ) | |
| 8800 { | |
| 8801 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8802 /* The bold trick may make a single row of pixels appear in | |
| 8803 * the next character. When a bold character is removed, the | |
| 8804 * next character should be redrawn too. This happens for our | |
| 8805 * own GUI and for some xterms. */ | |
| 8806 if ( | |
| 8807 # ifdef FEAT_GUI | |
| 8808 gui.in_use | |
| 8809 # endif | |
| 8810 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8811 || | |
| 8812 # endif | |
| 8813 # ifdef UNIX | |
| 8814 term_is_xterm | |
| 8815 # endif | |
| 8816 ) | |
| 8817 { | |
| 8818 if (ScreenLines[off] != ' ' | |
| 8819 && (ScreenAttrs[off] > HL_ALL | |
| 8820 || ScreenAttrs[off] & HL_BOLD)) | |
| 8821 force_next = TRUE; | |
| 8822 else | |
| 8823 force_next = FALSE; | |
| 8824 } | |
| 8825 #endif | |
| 8826 ScreenLines[off] = c; | |
| 8827 #ifdef FEAT_MBYTE | |
| 8828 if (enc_utf8) | |
| 8829 { | |
| 8830 if (c >= 0x80) | |
| 8831 { | |
| 8832 ScreenLinesUC[off] = c; | |
| 714 | 8833 ScreenLinesC[0][off] = 0; |
| 7 | 8834 } |
| 8835 else | |
| 8836 ScreenLinesUC[off] = 0; | |
| 8837 } | |
| 8838 #endif | |
| 8839 ScreenAttrs[off] = attr; | |
| 8840 if (!did_delete || c != ' ') | |
| 8841 screen_char(off, row, col); | |
| 8842 } | |
| 8843 ++off; | |
| 8844 if (col == start_col) | |
| 8845 { | |
| 8846 if (did_delete) | |
| 8847 break; | |
| 8848 c = c2; | |
| 8849 } | |
| 8850 } | |
| 8851 if (end_col == Columns) | |
| 8852 LineWraps[row] = FALSE; | |
| 8853 if (row == Rows - 1) /* overwritten the command line */ | |
| 8854 { | |
| 8855 redraw_cmdline = TRUE; | |
|
13666
57da3d873f20
patch 8.0.1705: when making a vertical split the mode message isn't updated
Christian Brabandt <cb@256bit.org>
parents:
13632
diff
changeset
|
8856 if (start_col == 0 && end_col == Columns |
|
57da3d873f20
patch 8.0.1705: when making a vertical split the mode message isn't updated
Christian Brabandt <cb@256bit.org>
parents:
13632
diff
changeset
|
8857 && c1 == ' ' && c2 == ' ' && attr == 0) |
| 7 | 8858 clear_cmdline = FALSE; /* command line has been cleared */ |
| 644 | 8859 if (start_col == 0) |
| 8860 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8861 } |
| 8862 } | |
| 8863 } | |
| 8864 | |
| 8865 /* | |
| 8866 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8867 * screen or the command line. | |
| 8868 */ | |
| 8869 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8870 check_for_delay(int check_msg_scroll) |
| 7 | 8871 { |
| 8872 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8873 && !did_wait_return | |
| 8874 && emsg_silent == 0) | |
| 8875 { | |
| 8876 out_flush(); | |
| 8877 ui_delay(1000L, TRUE); | |
| 8878 emsg_on_display = FALSE; | |
| 8879 if (check_msg_scroll) | |
| 8880 msg_scroll = FALSE; | |
| 8881 } | |
| 8882 } | |
| 8883 | |
| 8884 /* | |
| 8885 * screen_valid - allocate screen buffers if size changed | |
| 3263 | 8886 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8887 * Returns TRUE if there is a valid screen to write to. |
| 8888 * Returns FALSE when starting up and screen not initialized yet. | |
| 8889 */ | |
| 8890 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8891 screen_valid(int doclear) |
| 7 | 8892 { |
| 3263 | 8893 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8894 return (ScreenLines != NULL); |
| 8895 } | |
| 8896 | |
| 8897 /* | |
| 8898 * Resize the shell to Rows and Columns. | |
| 8899 * Allocate ScreenLines[] and associated items. | |
| 8900 * | |
| 8901 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8902 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8903 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8904 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8905 * final size of the shell is needed. | |
| 8906 */ | |
| 8907 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8908 screenalloc(int doclear) |
| 7 | 8909 { |
| 8910 int new_row, old_row; | |
| 8911 #ifdef FEAT_GUI | |
| 8912 int old_Rows; | |
| 8913 #endif | |
| 8914 win_T *wp; | |
| 8915 int outofmem = FALSE; | |
| 8916 int len; | |
| 8917 schar_T *new_ScreenLines; | |
| 8918 #ifdef FEAT_MBYTE | |
| 8919 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8920 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8921 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8922 int i; |
| 7 | 8923 #endif |
| 8924 sattr_T *new_ScreenAttrs; | |
| 8925 unsigned *new_LineOffset; | |
| 8926 char_u *new_LineWraps; | |
| 681 | 8927 short *new_TabPageIdxs; |
| 671 | 8928 tabpage_T *tp; |
| 7 | 8929 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8930 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8931 int retry_count = 0; |
| 8932 | |
| 8933 retry: | |
| 7 | 8934 /* |
| 8935 * Allocation of the screen buffers is done only when the size changes and | |
| 8936 * when Rows and Columns have been set and we have started doing full | |
| 8937 * screen stuff. | |
| 8938 */ | |
| 8939 if ((ScreenLines != NULL | |
| 8940 && Rows == screen_Rows | |
| 8941 && Columns == screen_Columns | |
| 8942 #ifdef FEAT_MBYTE | |
| 8943 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8944 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
| 714 | 8945 && p_mco == Screen_mco |
| 7 | 8946 #endif |
| 8947 ) | |
| 8948 || Rows == 0 | |
| 8949 || Columns == 0 | |
| 8950 || (!full_screen && ScreenLines == NULL)) | |
| 8951 return; | |
| 8952 | |
| 8953 /* | |
| 8954 * It's possible that we produce an out-of-memory message below, which | |
| 8955 * will cause this function to be called again. To break the loop, just | |
| 8956 * return here. | |
| 8957 */ | |
| 8958 if (entered) | |
| 8959 return; | |
| 8960 entered = TRUE; | |
| 8961 | |
| 911 | 8962 /* |
| 8963 * Note that the window sizes are updated before reallocating the arrays, | |
| 8964 * thus we must not redraw here! | |
| 8965 */ | |
| 8966 ++RedrawingDisabled; | |
| 8967 | |
| 7 | 8968 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8969 | |
| 8970 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8971 | |
| 8972 /* | |
| 8973 * We're changing the size of the screen. | |
| 8974 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8975 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8976 * lines (unless the screen is going to be cleared). | |
| 8977 * - Free the old arrays. | |
| 8978 * | |
| 8979 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8980 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8981 * size is wrong. | |
| 8982 */ | |
| 671 | 8983 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8984 win_free_lsize(wp); |
| 1946 | 8985 if (aucmd_win != NULL) |
| 8986 win_free_lsize(aucmd_win); | |
| 7 | 8987 |
| 8988 new_ScreenLines = (schar_T *)lalloc((long_u)( | |
| 8989 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8990 #ifdef FEAT_MBYTE | |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
8991 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8992 if (enc_utf8) |
| 8993 { | |
| 8994 new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( | |
| 8995 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); | |
| 714 | 8996 for (i = 0; i < p_mco; ++i) |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
8997 new_ScreenLinesC[i] = (u8char_T *)lalloc_clear((long_u)( |
| 7 | 8998 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); |
| 8999 } | |
| 9000 if (enc_dbcs == DBCS_JPNU) | |
| 9001 new_ScreenLines2 = (schar_T *)lalloc((long_u)( | |
| 9002 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 9003 #endif | |
| 9004 new_ScreenAttrs = (sattr_T *)lalloc((long_u)( | |
| 9005 (Rows + 1) * Columns * sizeof(sattr_T)), FALSE); | |
| 9006 new_LineOffset = (unsigned *)lalloc((long_u)( | |
| 9007 Rows * sizeof(unsigned)), FALSE); | |
| 9008 new_LineWraps = (char_u *)lalloc((long_u)(Rows * sizeof(char_u)), FALSE); | |
| 681 | 9009 new_TabPageIdxs = (short *)lalloc((long_u)(Columns * sizeof(short)), FALSE); |
| 7 | 9010 |
| 677 | 9011 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 9012 { |
| 9013 if (win_alloc_lines(wp) == FAIL) | |
| 9014 { | |
| 9015 outofmem = TRUE; | |
| 1819 | 9016 goto give_up; |
| 9017 } | |
| 9018 } | |
| 1946 | 9019 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 9020 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 9021 outofmem = TRUE; |
| 1819 | 9022 give_up: |
| 7 | 9023 |
| 714 | 9024 #ifdef FEAT_MBYTE |
| 9025 for (i = 0; i < p_mco; ++i) | |
| 9026 if (new_ScreenLinesC[i] == NULL) | |
| 9027 break; | |
| 9028 #endif | |
| 7 | 9029 if (new_ScreenLines == NULL |
| 9030 #ifdef FEAT_MBYTE | |
| 714 | 9031 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 9032 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 9033 #endif | |
| 9034 || new_ScreenAttrs == NULL | |
| 9035 || new_LineOffset == NULL | |
| 9036 || new_LineWraps == NULL | |
| 671 | 9037 || new_TabPageIdxs == NULL |
| 7 | 9038 || outofmem) |
| 9039 { | |
| 944 | 9040 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 9041 { |
| 9042 /* guess the size */ | |
| 9043 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 9044 | |
| 9045 /* Remember we did this to avoid getting outofmem messages over | |
| 9046 * and over again. */ | |
| 944 | 9047 done_outofmem_msg = TRUE; |
| 534 | 9048 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9049 VIM_CLEAR(new_ScreenLines); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9050 #ifdef FEAT_MBYTE |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9051 VIM_CLEAR(new_ScreenLinesUC); |
| 714 | 9052 for (i = 0; i < p_mco; ++i) |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9053 VIM_CLEAR(new_ScreenLinesC[i]); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9054 VIM_CLEAR(new_ScreenLines2); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9055 #endif |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9056 VIM_CLEAR(new_ScreenAttrs); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9057 VIM_CLEAR(new_LineOffset); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9058 VIM_CLEAR(new_LineWraps); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9059 VIM_CLEAR(new_TabPageIdxs); |
| 7 | 9060 } |
| 9061 else | |
| 9062 { | |
| 944 | 9063 done_outofmem_msg = FALSE; |
| 534 | 9064 |
| 7 | 9065 for (new_row = 0; new_row < Rows; ++new_row) |
| 9066 { | |
| 9067 new_LineOffset[new_row] = new_row * Columns; | |
| 9068 new_LineWraps[new_row] = FALSE; | |
| 9069 | |
| 9070 /* | |
| 9071 * If the screen is not going to be cleared, copy as much as | |
| 9072 * possible from the old screen to the new one and clear the rest | |
| 9073 * (used when resizing the window at the "--more--" prompt or when | |
| 9074 * executing an external command, for the GUI). | |
| 9075 */ | |
| 3263 | 9076 if (!doclear) |
| 7 | 9077 { |
| 9078 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 9079 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 9080 #ifdef FEAT_MBYTE | |
| 9081 if (enc_utf8) | |
| 9082 { | |
| 9083 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 9084 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 9085 for (i = 0; i < p_mco; ++i) |
| 9086 (void)vim_memset(new_ScreenLinesC[i] | |
| 9087 + new_row * Columns, | |
| 7 | 9088 0, (size_t)Columns * sizeof(u8char_T)); |
| 9089 } | |
| 9090 if (enc_dbcs == DBCS_JPNU) | |
| 9091 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 9092 0, (size_t)Columns * sizeof(schar_T)); | |
| 9093 #endif | |
| 9094 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 9095 0, (size_t)Columns * sizeof(sattr_T)); | |
| 9096 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 9097 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 9098 { |
| 9099 if (screen_Columns < Columns) | |
| 9100 len = screen_Columns; | |
| 9101 else | |
| 9102 len = Columns; | |
| 26 | 9103 #ifdef FEAT_MBYTE |
| 571 | 9104 /* When switching to utf-8 don't copy characters, they |
| 714 | 9105 * may be invalid now. Also when p_mco changes. */ |
| 9106 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 9107 && p_mco == Screen_mco) | |
| 26 | 9108 #endif |
| 9109 mch_memmove(new_ScreenLines + new_LineOffset[new_row], | |
| 9110 ScreenLines + LineOffset[old_row], | |
| 9111 (size_t)len * sizeof(schar_T)); | |
| 7 | 9112 #ifdef FEAT_MBYTE |
| 714 | 9113 if (enc_utf8 && ScreenLinesUC != NULL |
| 9114 && p_mco == Screen_mco) | |
| 7 | 9115 { |
| 9116 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 9117 ScreenLinesUC + LineOffset[old_row], | |
| 9118 (size_t)len * sizeof(u8char_T)); | |
| 714 | 9119 for (i = 0; i < p_mco; ++i) |
| 9120 mch_memmove(new_ScreenLinesC[i] | |
| 9121 + new_LineOffset[new_row], | |
| 9122 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 9123 (size_t)len * sizeof(u8char_T)); |
| 9124 } | |
| 9125 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 9126 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 9127 ScreenLines2 + LineOffset[old_row], | |
| 9128 (size_t)len * sizeof(schar_T)); | |
| 9129 #endif | |
| 9130 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 9131 ScreenAttrs + LineOffset[old_row], | |
| 9132 (size_t)len * sizeof(sattr_T)); | |
| 9133 } | |
| 9134 } | |
| 9135 } | |
| 9136 /* Use the last line of the screen for the current line. */ | |
| 9137 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 9138 } | |
| 9139 | |
| 356 | 9140 free_screenlines(); |
| 9141 | |
| 7 | 9142 ScreenLines = new_ScreenLines; |
| 9143 #ifdef FEAT_MBYTE | |
| 9144 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 9145 for (i = 0; i < p_mco; ++i) |
| 9146 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 9147 Screen_mco = p_mco; | |
| 7 | 9148 ScreenLines2 = new_ScreenLines2; |
| 9149 #endif | |
| 9150 ScreenAttrs = new_ScreenAttrs; | |
| 9151 LineOffset = new_LineOffset; | |
| 9152 LineWraps = new_LineWraps; | |
| 671 | 9153 TabPageIdxs = new_TabPageIdxs; |
| 7 | 9154 |
| 9155 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 9156 * size of ScreenLines[]. Set them before calling anything. */ | |
| 9157 #ifdef FEAT_GUI | |
| 9158 old_Rows = screen_Rows; | |
| 9159 #endif | |
| 9160 screen_Rows = Rows; | |
| 9161 screen_Columns = Columns; | |
| 9162 | |
| 9163 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 9164 if (doclear) |
| 7 | 9165 screenclear2(); |
| 9166 | |
| 9167 #ifdef FEAT_GUI | |
| 9168 else if (gui.in_use | |
| 9169 && !gui.starting | |
| 9170 && ScreenLines != NULL | |
| 9171 && old_Rows != Rows) | |
| 9172 { | |
| 9173 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 9174 /* | |
| 9175 * Adjust the position of the cursor, for when executing an external | |
| 9176 * command. | |
| 9177 */ | |
| 9178 if (msg_row >= Rows) /* Rows got smaller */ | |
| 9179 msg_row = Rows - 1; /* put cursor at last row */ | |
| 9180 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 9181 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 9182 if (msg_col >= Columns) /* Columns got smaller */ | |
| 9183 msg_col = Columns - 1; /* put cursor at last column */ | |
| 9184 } | |
| 9185 #endif | |
| 9186 | |
| 9187 entered = FALSE; | |
| 911 | 9188 --RedrawingDisabled; |
| 766 | 9189 |
| 1824 | 9190 /* |
| 9191 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 9192 * in case applying autocommands always changes Rows or Columns. | |
| 9193 */ | |
| 9194 if (starting == 0 && ++retry_count <= 3) | |
| 9195 { | |
| 766 | 9196 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 9197 /* In rare cases, autocommands may have altered Rows or Columns, |
| 9198 * jump back to check if we need to allocate the screen again. */ | |
| 9199 goto retry; | |
| 9200 } | |
| 7 | 9201 } |
| 9202 | |
| 9203 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9204 free_screenlines(void) |
| 356 | 9205 { |
| 9206 #ifdef FEAT_MBYTE | |
| 714 | 9207 int i; |
| 9208 | |
| 356 | 9209 vim_free(ScreenLinesUC); |
| 714 | 9210 for (i = 0; i < Screen_mco; ++i) |
| 9211 vim_free(ScreenLinesC[i]); | |
| 356 | 9212 vim_free(ScreenLines2); |
| 9213 #endif | |
| 714 | 9214 vim_free(ScreenLines); |
| 356 | 9215 vim_free(ScreenAttrs); |
| 9216 vim_free(LineOffset); | |
| 9217 vim_free(LineWraps); | |
| 671 | 9218 vim_free(TabPageIdxs); |
| 356 | 9219 } |
| 9220 | |
| 9221 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9222 screenclear(void) |
| 7 | 9223 { |
| 9224 check_for_delay(FALSE); | |
| 9225 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 9226 screenclear2(); /* clear the screen */ | |
| 9227 } | |
| 9228 | |
| 9229 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9230 screenclear2(void) |
| 7 | 9231 { |
| 9232 int i; | |
| 9233 | |
| 9234 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 9235 #ifdef FEAT_GUI | |
| 9236 || (gui.in_use && gui.starting) | |
| 9237 #endif | |
| 9238 ) | |
| 9239 return; | |
| 9240 | |
| 9241 #ifdef FEAT_GUI | |
| 9242 if (!gui.in_use) | |
| 9243 #endif | |
| 9244 screen_attr = -1; /* force setting the Normal colors */ | |
| 9245 screen_stop_highlight(); /* don't want highlighting here */ | |
| 9246 | |
| 9247 #ifdef FEAT_CLIPBOARD | |
| 9248 /* disable selection without redrawing it */ | |
| 9249 clip_scroll_selection(9999); | |
| 9250 #endif | |
| 9251 | |
| 9252 /* blank out ScreenLines */ | |
| 9253 for (i = 0; i < Rows; ++i) | |
| 9254 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9255 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 9256 LineWraps[i] = FALSE; |
| 9257 } | |
| 9258 | |
| 9259 if (can_clear(T_CL)) | |
| 9260 { | |
| 9261 out_str(T_CL); /* clear the display */ | |
| 9262 clear_cmdline = FALSE; | |
| 644 | 9263 mode_displayed = FALSE; |
| 7 | 9264 } |
| 9265 else | |
| 9266 { | |
| 9267 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9268 for (i = 0; i < Rows; ++i) | |
| 9269 lineinvalid(LineOffset[i], (int)Columns); | |
| 9270 clear_cmdline = TRUE; | |
| 9271 } | |
| 9272 | |
| 9273 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9274 | |
| 9275 win_rest_invalid(firstwin); | |
| 9276 redraw_cmdline = TRUE; | |
| 673 | 9277 redraw_tabline = TRUE; |
| 7 | 9278 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9279 must_redraw = NOT_VALID; | |
| 9280 compute_cmdrow(); | |
| 9281 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9282 msg_col = 0; | |
| 9283 screen_start(); /* don't know where cursor is now */ | |
| 9284 msg_scrolled = 0; /* can't scroll back */ | |
| 9285 msg_didany = FALSE; | |
| 9286 msg_didout = FALSE; | |
| 9287 } | |
| 9288 | |
| 9289 /* | |
| 9290 * Clear one line in ScreenLines. | |
| 9291 */ | |
| 9292 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9293 lineclear(unsigned off, int width, int attr) |
| 7 | 9294 { |
| 9295 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9296 #ifdef FEAT_MBYTE | |
| 9297 if (enc_utf8) | |
| 9298 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9299 (size_t)width * sizeof(u8char_T)); | |
| 9300 #endif | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9301 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 9302 } |
| 9303 | |
| 9304 /* | |
| 9305 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9306 * invalid value. | |
| 9307 */ | |
| 9308 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9309 lineinvalid(unsigned off, int width) |
| 7 | 9310 { |
| 9311 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9312 } | |
| 9313 | |
| 9314 /* | |
| 9315 * Copy part of a Screenline for vertically split window "wp". | |
| 9316 */ | |
| 9317 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9318 linecopy(int to, int from, win_T *wp) |
| 7 | 9319 { |
| 9320 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9321 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9322 | |
| 9323 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9324 wp->w_width * sizeof(schar_T)); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9325 #ifdef FEAT_MBYTE |
| 7 | 9326 if (enc_utf8) |
| 9327 { | |
| 714 | 9328 int i; |
| 9329 | |
| 7 | 9330 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9331 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9332 for (i = 0; i < p_mco; ++i) |
| 9333 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9334 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9335 } |
| 9336 if (enc_dbcs == DBCS_JPNU) | |
| 9337 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9338 wp->w_width * sizeof(schar_T)); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9339 #endif |
| 7 | 9340 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, |
| 9341 wp->w_width * sizeof(sattr_T)); | |
| 9342 } | |
| 9343 | |
| 9344 /* | |
| 9345 * Return TRUE if clearing with term string "p" would work. | |
| 9346 * It can't work when the string is empty or it won't set the right background. | |
| 9347 */ | |
| 9348 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9349 can_clear(char_u *p) |
| 7 | 9350 { |
| 9351 return (*p != NUL && (t_colors <= 1 | |
| 9352 #ifdef FEAT_GUI | |
| 9353 || gui.in_use | |
| 9354 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9355 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9356 || (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
|
9357 || (!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
|
9358 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9359 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9360 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9361 || *T_UT != NUL)); |
| 7 | 9362 } |
| 9363 | |
| 9364 /* | |
| 9365 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9366 * something directly to the screen (shell commands) or a terminal control | |
| 9367 * code. | |
| 9368 */ | |
| 9369 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9370 screen_start(void) |
| 7 | 9371 { |
| 9372 screen_cur_row = screen_cur_col = 9999; | |
| 9373 } | |
| 9374 | |
| 9375 /* | |
| 9376 * Move the cursor to position "row","col" in the screen. | |
| 9377 * This tries to find the most efficient way to move, minimizing the number of | |
| 9378 * characters sent to the terminal. | |
| 9379 */ | |
| 9380 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9381 windgoto(int row, int col) |
| 7 | 9382 { |
| 205 | 9383 sattr_T *p; |
| 7 | 9384 int i; |
| 9385 int plan; | |
| 9386 int cost; | |
| 9387 int wouldbe_col; | |
| 9388 int noinvcurs; | |
| 9389 char_u *bs; | |
| 9390 int goto_cost; | |
| 9391 int attr; | |
| 9392 | |
| 1213 | 9393 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9394 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9395 | |
| 9396 #define PLAN_LE 1 | |
| 9397 #define PLAN_CR 2 | |
| 9398 #define PLAN_NL 3 | |
| 9399 #define PLAN_WRITE 4 | |
| 9400 /* Can't use ScreenLines unless initialized */ | |
| 9401 if (ScreenLines == NULL) | |
| 9402 return; | |
| 9403 | |
| 9404 if (col != screen_cur_col || row != screen_cur_row) | |
| 9405 { | |
| 9406 /* Check for valid position. */ | |
| 9407 if (row < 0) /* window without text lines? */ | |
| 9408 row = 0; | |
| 9409 if (row >= screen_Rows) | |
| 9410 row = screen_Rows - 1; | |
| 9411 if (col >= screen_Columns) | |
| 9412 col = screen_Columns - 1; | |
| 9413 | |
| 9414 /* check if no cursor movement is allowed in highlight mode */ | |
| 9415 if (screen_attr && *T_MS == NUL) | |
| 9416 noinvcurs = HIGHL_COST; | |
| 9417 else | |
| 9418 noinvcurs = 0; | |
| 9419 goto_cost = GOTO_COST + noinvcurs; | |
| 9420 | |
| 9421 /* | |
| 9422 * Plan how to do the positioning: | |
| 9423 * 1. Use CR to move it to column 0, same row. | |
| 9424 * 2. Use T_LE to move it a few columns to the left. | |
| 9425 * 3. Use NL to move a few lines down, column 0. | |
| 9426 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9427 * | |
| 9428 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9429 * position is unknown then (some terminals wrap, some don't ) | |
| 9430 * | |
| 1213 | 9431 * First check if the highlighting attributes allow us to write |
| 7 | 9432 * characters to move the cursor to the right. |
| 9433 */ | |
| 9434 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9435 { | |
| 9436 /* | |
| 9437 * If the cursor is in the same row, bigger col, we can use CR | |
| 9438 * or T_LE. | |
| 9439 */ | |
| 9440 bs = NULL; /* init for GCC */ | |
| 9441 attr = screen_attr; | |
| 9442 if (row == screen_cur_row && col < screen_cur_col) | |
| 9443 { | |
| 9444 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9445 if (*T_LE) | |
| 9446 bs = T_LE; /* "cursor left" */ | |
| 9447 else | |
| 9448 bs = T_BC; /* "backspace character (old) */ | |
| 9449 if (*bs) | |
| 9450 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9451 else | |
| 9452 cost = 999; | |
| 9453 if (col + 1 < cost) /* using CR is less characters */ | |
| 9454 { | |
| 9455 plan = PLAN_CR; | |
| 9456 wouldbe_col = 0; | |
| 9457 cost = 1; /* CR is just one character */ | |
| 9458 } | |
| 9459 else | |
| 9460 { | |
| 9461 plan = PLAN_LE; | |
| 9462 wouldbe_col = col; | |
| 9463 } | |
| 9464 if (noinvcurs) /* will stop highlighting */ | |
| 9465 { | |
| 9466 cost += noinvcurs; | |
| 9467 attr = 0; | |
| 9468 } | |
| 9469 } | |
| 9470 | |
| 9471 /* | |
| 9472 * If the cursor is above where we want to be, we can use CR LF. | |
| 9473 */ | |
| 9474 else if (row > screen_cur_row) | |
| 9475 { | |
| 9476 plan = PLAN_NL; | |
| 9477 wouldbe_col = 0; | |
| 9478 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9479 if (noinvcurs) /* will stop highlighting */ | |
| 9480 { | |
| 9481 cost += noinvcurs; | |
| 9482 attr = 0; | |
| 9483 } | |
| 9484 } | |
| 9485 | |
| 9486 /* | |
| 9487 * If the cursor is in the same row, smaller col, just use write. | |
| 9488 */ | |
| 9489 else | |
| 9490 { | |
| 9491 plan = PLAN_WRITE; | |
| 9492 wouldbe_col = screen_cur_col; | |
| 9493 cost = 0; | |
| 9494 } | |
| 9495 | |
| 9496 /* | |
| 9497 * Check if any characters that need to be written have the | |
| 9498 * correct attributes. Also avoid UTF-8 characters. | |
| 9499 */ | |
| 9500 i = col - wouldbe_col; | |
| 9501 if (i > 0) | |
| 9502 cost += i; | |
| 9503 if (cost < goto_cost && i > 0) | |
| 9504 { | |
| 9505 /* | |
| 9506 * Check if the attributes are correct without additionally | |
| 9507 * stopping highlighting. | |
| 9508 */ | |
| 9509 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9510 while (i && *p++ == attr) | |
| 9511 --i; | |
| 9512 if (i != 0) | |
| 9513 { | |
| 9514 /* | |
| 9515 * Try if it works when highlighting is stopped here. | |
| 9516 */ | |
| 9517 if (*--p == 0) | |
| 9518 { | |
| 9519 cost += noinvcurs; | |
| 9520 while (i && *p++ == 0) | |
| 9521 --i; | |
| 9522 } | |
| 9523 if (i != 0) | |
| 9524 cost = 999; /* different attributes, don't do it */ | |
| 9525 } | |
| 9526 #ifdef FEAT_MBYTE | |
| 9527 if (enc_utf8) | |
| 9528 { | |
| 9529 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9530 for (i = wouldbe_col; i < col; ++i) | |
| 9531 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9532 { | |
| 9533 cost = 999; | |
| 9534 break; | |
| 9535 } | |
| 9536 } | |
| 9537 #endif | |
| 9538 } | |
| 9539 | |
| 9540 /* | |
| 9541 * We can do it without term_windgoto()! | |
| 9542 */ | |
| 9543 if (cost < goto_cost) | |
| 9544 { | |
| 9545 if (plan == PLAN_LE) | |
| 9546 { | |
| 9547 if (noinvcurs) | |
| 9548 screen_stop_highlight(); | |
| 9549 while (screen_cur_col > col) | |
| 9550 { | |
| 9551 out_str(bs); | |
| 9552 --screen_cur_col; | |
| 9553 } | |
| 9554 } | |
| 9555 else if (plan == PLAN_CR) | |
| 9556 { | |
| 9557 if (noinvcurs) | |
| 9558 screen_stop_highlight(); | |
| 9559 out_char('\r'); | |
| 9560 screen_cur_col = 0; | |
| 9561 } | |
| 9562 else if (plan == PLAN_NL) | |
| 9563 { | |
| 9564 if (noinvcurs) | |
| 9565 screen_stop_highlight(); | |
| 9566 while (screen_cur_row < row) | |
| 9567 { | |
| 9568 out_char('\n'); | |
| 9569 ++screen_cur_row; | |
| 9570 } | |
| 9571 screen_cur_col = 0; | |
| 9572 } | |
| 9573 | |
| 9574 i = col - screen_cur_col; | |
| 9575 if (i > 0) | |
| 9576 { | |
| 9577 /* | |
| 9578 * Use cursor-right if it's one character only. Avoids | |
| 9579 * removing a line of pixels from the last bold char, when | |
| 9580 * using the bold trick in the GUI. | |
| 9581 */ | |
| 9582 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9583 { | |
| 9584 while (i-- > 0) | |
| 9585 out_char(*T_ND); | |
| 9586 } | |
| 9587 else | |
| 9588 { | |
| 9589 int off; | |
| 9590 | |
| 9591 off = LineOffset[row] + screen_cur_col; | |
| 9592 while (i-- > 0) | |
| 9593 { | |
| 9594 if (ScreenAttrs[off] != screen_attr) | |
| 9595 screen_stop_highlight(); | |
| 9596 #ifdef FEAT_MBYTE | |
| 9597 out_flush_check(); | |
| 9598 #endif | |
| 9599 out_char(ScreenLines[off]); | |
| 9600 #ifdef FEAT_MBYTE | |
| 9601 if (enc_dbcs == DBCS_JPNU | |
| 9602 && ScreenLines[off] == 0x8e) | |
| 9603 out_char(ScreenLines2[off]); | |
| 9604 #endif | |
| 9605 ++off; | |
| 9606 } | |
| 9607 } | |
| 9608 } | |
| 9609 } | |
| 9610 } | |
| 9611 else | |
| 9612 cost = 999; | |
| 9613 | |
| 9614 if (cost >= goto_cost) | |
| 9615 { | |
| 9616 if (noinvcurs) | |
| 9617 screen_stop_highlight(); | |
| 5995 | 9618 if (row == screen_cur_row && (col > screen_cur_col) |
| 9619 && *T_CRI != NUL) | |
| 7 | 9620 term_cursor_right(col - screen_cur_col); |
| 9621 else | |
| 9622 term_windgoto(row, col); | |
| 9623 } | |
| 9624 screen_cur_row = row; | |
| 9625 screen_cur_col = col; | |
| 9626 } | |
| 9627 } | |
| 9628 | |
| 9629 /* | |
| 9630 * Set cursor to its position in the current window. | |
| 9631 */ | |
| 9632 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9633 setcursor(void) |
| 7 | 9634 { |
|
13400
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9635 setcursor_mayforce(FALSE); |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9636 } |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9637 |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9638 /* |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9639 * Set cursor to its position in the current window. |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9640 * When "force" is TRUE also when not redrawing. |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9641 */ |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9642 void |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9643 setcursor_mayforce(int force) |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9644 { |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9645 if (force || redrawing()) |
| 7 | 9646 { |
| 9647 validate_cursor(); | |
| 9648 windgoto(W_WINROW(curwin) + curwin->w_wrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
9649 curwin->w_wincol + ( |
| 7 | 9650 #ifdef FEAT_RIGHTLEFT |
| 1545 | 9651 /* With 'rightleft' set and the cursor on a double-wide |
| 9652 * character, position it on the leftmost column. */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9653 curwin->w_p_rl ? ((int)curwin->w_width - curwin->w_wcol - ( |
| 7 | 9654 # ifdef FEAT_MBYTE |
| 1545 | 9655 (has_mbyte |
| 9656 && (*mb_ptr2cells)(ml_get_cursor()) == 2 | |
| 9657 && vim_isprintc(gchar_cursor())) ? 2 : | |
| 7 | 9658 # endif |
| 9659 1)) : | |
| 9660 #endif | |
| 9661 curwin->w_wcol)); | |
| 9662 } | |
| 9663 } | |
| 9664 | |
| 9665 | |
| 9666 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9667 * Insert 'line_count' lines at 'row' in window 'wp'. |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9668 * If 'invalid' is TRUE the wp->w_lines[].wl_lnum is invalidated. |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9669 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9670 * scrolling. |
| 9671 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9672 */ | |
| 9673 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9674 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9675 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9676 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9677 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9678 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9679 int mayclear) |
| 7 | 9680 { |
| 9681 int did_delete; | |
| 9682 int nextrow; | |
| 9683 int lastrow; | |
| 9684 int retval; | |
| 9685 | |
| 9686 if (invalid) | |
| 9687 wp->w_lines_valid = 0; | |
| 9688 | |
| 9689 if (wp->w_height < 5) | |
| 9690 return FAIL; | |
| 9691 | |
| 9692 if (line_count > wp->w_height - row) | |
| 9693 line_count = wp->w_height - row; | |
| 9694 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9695 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9696 if (retval != MAYBE) |
| 9697 return retval; | |
| 9698 | |
| 9699 /* | |
| 9700 * If there is a next window or a status line, we first try to delete the | |
| 9701 * lines at the bottom to avoid messing what is after the window. | |
| 9702 * If this fails and there are following windows, don't do anything to avoid | |
| 9703 * messing up those windows, better just redraw. | |
| 9704 */ | |
| 9705 did_delete = FALSE; | |
| 9706 if (wp->w_next != NULL || wp->w_status_height) | |
| 9707 { | |
| 9708 if (screen_del_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9709 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9710 did_delete = TRUE; |
| 9711 else if (wp->w_next) | |
| 9712 return FAIL; | |
| 9713 } | |
| 9714 /* | |
| 9715 * if no lines deleted, blank the lines that will end up below the window | |
| 9716 */ | |
| 9717 if (!did_delete) | |
| 9718 { | |
| 9719 wp->w_redr_status = TRUE; | |
| 9720 redraw_cmdline = TRUE; | |
|
12529
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
9721 nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height; |
| 7 | 9722 lastrow = nextrow + line_count; |
| 9723 if (lastrow > Rows) | |
| 9724 lastrow = Rows; | |
| 9725 screen_fill(nextrow - line_count, lastrow - line_count, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
9726 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9727 ' ', ' ', 0); |
| 9728 } | |
| 9729 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9730 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9731 == FAIL) |
| 9732 { | |
| 9733 /* deletion will have messed up other windows */ | |
| 9734 if (did_delete) | |
| 9735 { | |
| 9736 wp->w_redr_status = TRUE; | |
| 9737 win_rest_invalid(W_NEXT(wp)); | |
| 9738 } | |
| 9739 return FAIL; | |
| 9740 } | |
| 9741 | |
| 9742 return OK; | |
| 9743 } | |
| 9744 | |
| 9745 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9746 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9747 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9748 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9749 * scrolling | |
| 9750 * Return OK for success, FAIL if the lines are not deleted. | |
| 9751 */ | |
| 9752 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9753 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9754 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9755 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9756 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9757 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9758 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9759 int clear_attr) /* for clearing lines */ |
| 7 | 9760 { |
| 9761 int retval; | |
| 9762 | |
| 9763 if (invalid) | |
| 9764 wp->w_lines_valid = 0; | |
| 9765 | |
| 9766 if (line_count > wp->w_height - row) | |
| 9767 line_count = wp->w_height - row; | |
| 9768 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9769 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9770 if (retval != MAYBE) |
| 9771 return retval; | |
| 9772 | |
| 9773 if (screen_del_lines(0, W_WINROW(wp) + row, line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9774 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9775 return FAIL; |
| 9776 | |
| 9777 /* | |
| 9778 * If there are windows or status lines below, try to put them at the | |
| 9779 * correct place. If we can't do that, they have to be redrawn. | |
| 9780 */ | |
| 9781 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9782 { | |
| 9783 if (screen_ins_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9784 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9785 { |
| 9786 wp->w_redr_status = TRUE; | |
| 9787 win_rest_invalid(wp->w_next); | |
| 9788 } | |
| 9789 } | |
| 9790 /* | |
| 9791 * If this is the last window and there is no status line, redraw the | |
| 9792 * command line later. | |
| 9793 */ | |
| 9794 else | |
| 9795 redraw_cmdline = TRUE; | |
| 9796 return OK; | |
| 9797 } | |
| 9798 | |
| 9799 /* | |
| 9800 * Common code for win_ins_lines() and win_del_lines(). | |
| 9801 * Returns OK or FAIL when the work has been done. | |
| 9802 * Returns MAYBE when not finished yet. | |
| 9803 */ | |
| 9804 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9805 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9806 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9807 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9808 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9809 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9810 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9811 int clear_attr) |
| 7 | 9812 { |
| 9813 int retval; | |
| 9814 | |
| 9815 if (!redrawing() || line_count <= 0) | |
| 9816 return FAIL; | |
| 9817 | |
|
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
|
9818 /* 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
|
9819 * 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
|
9820 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
|
9821 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
|
9822 |
| 7 | 9823 /* only a few lines left: redraw is faster */ |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9824 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) |
| 7 | 9825 { |
|
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
|
9826 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
|
9827 screenclear(); /* will set wp->w_lines_valid to 0 */ |
| 7 | 9828 return FAIL; |
| 9829 } | |
| 9830 | |
| 9831 /* | |
| 9832 * Delete all remaining lines | |
| 9833 */ | |
| 9834 if (row + line_count >= wp->w_height) | |
| 9835 { | |
| 9836 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
9837 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9838 ' ', ' ', 0); |
| 9839 return OK; | |
| 9840 } | |
| 9841 | |
| 9842 /* | |
|
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
|
9843 * When scrolling, the message on the command line should be cleared, |
| 7 | 9844 * 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
|
9845 * Don't do this when avoiding to insert lines. |
| 7 | 9846 */ |
|
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
|
9847 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
|
9848 clear_cmdline = TRUE; |
| 7 | 9849 |
| 9850 /* | |
| 9851 * If the terminal can set a scroll region, use that. | |
| 9852 * Always do this in a vertically split window. This will redraw from | |
| 9853 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9854 * win_line(). | |
| 9855 * 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
|
9856 * 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
|
9857 * scroll-up . |
| 7 | 9858 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9859 if (scroll_region || wp->w_width != Columns) |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9860 { |
| 7 | 9861 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9862 scroll_region_set(wp, row); | |
| 9863 if (del) | |
| 9864 retval = screen_del_lines(W_WINROW(wp) + row, 0, line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9865 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 9866 else |
| 9867 retval = screen_ins_lines(W_WINROW(wp) + row, 0, line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9868 wp->w_height - row, clear_attr, wp); |
| 7 | 9869 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9870 scroll_region_reset(); | |
| 9871 return retval; | |
| 9872 } | |
| 9873 | |
| 9874 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9875 return FAIL; | |
| 9876 | |
| 9877 return MAYBE; | |
| 9878 } | |
| 9879 | |
| 9880 /* | |
| 9881 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9882 */ | |
| 9883 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9884 win_rest_invalid(win_T *wp) |
| 7 | 9885 { |
| 9886 while (wp != NULL) | |
| 9887 { | |
| 9888 redraw_win_later(wp, NOT_VALID); | |
| 9889 wp->w_redr_status = TRUE; | |
| 9890 wp = wp->w_next; | |
| 9891 } | |
| 9892 redraw_cmdline = TRUE; | |
| 9893 } | |
| 9894 | |
| 9895 /* | |
| 9896 * The rest of the routines in this file perform screen manipulations. The | |
| 9897 * given operation is performed physically on the screen. The corresponding | |
| 9898 * change is also made to the internal screen image. In this way, the editor | |
| 9899 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9900 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9901 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9902 * screen changes, and in the meantime, everything still works. | |
| 9903 */ | |
| 9904 | |
| 9905 /* | |
| 9906 * types for inserting or deleting lines | |
| 9907 */ | |
| 9908 #define USE_T_CAL 1 | |
| 9909 #define USE_T_CDL 2 | |
| 9910 #define USE_T_AL 3 | |
| 9911 #define USE_T_CE 4 | |
| 9912 #define USE_T_DL 5 | |
| 9913 #define USE_T_SR 6 | |
| 9914 #define USE_NL 7 | |
| 9915 #define USE_T_CD 8 | |
| 9916 #define USE_REDRAW 9 | |
| 9917 | |
| 9918 /* | |
| 9919 * insert lines on the screen and update ScreenLines[] | |
| 9920 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9921 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9922 * 'row' and 'end' are relative to the start of the region. | |
| 9923 * | |
| 9924 * return FAIL for failure, OK for success. | |
| 9925 */ | |
| 446 | 9926 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9927 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9928 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9929 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9930 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9931 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9932 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9933 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9934 { |
| 9935 int i; | |
| 9936 int j; | |
| 9937 unsigned temp; | |
| 9938 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9939 int cursor_col = 0; |
| 7 | 9940 int type; |
| 9941 int result_empty; | |
| 9942 int can_ce = can_clear(T_CE); | |
| 9943 | |
| 9944 /* | |
| 9945 * FAIL if | |
| 9946 * - there is no valid screen | |
| 9947 * - the screen has to be redrawn completely | |
| 9948 * - the line count is less than one | |
| 9949 * - the line count is more than 'ttyscroll' | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9950 * - redrawing for a callback and there is a modeless selection |
| 7 | 9951 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9952 if (!screen_valid(TRUE) || line_count <= 0 || line_count > p_ttyscroll |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9953 #ifdef FEAT_CLIPBOARD |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9954 || (clip_star.state != SELECT_CLEARED |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9955 && redrawing_for_callback > 0) |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9956 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9957 ) |
| 7 | 9958 return FAIL; |
| 9959 | |
| 9960 /* | |
| 9961 * There are seven ways to insert lines: | |
| 9962 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9963 * characters from ScreenLines[]. | |
| 9964 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9965 * the insert is just empty lines | |
| 9966 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9967 * present or line_count > 1. It looks better if we do all the inserts | |
| 9968 * at once. | |
| 9969 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9970 * insert is just empty lines and T_CE is not present or line_count > | |
| 9971 * 1. | |
| 9972 * 4. Use T_AL (insert line) if it exists. | |
| 9973 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9974 * just empty lines. | |
| 9975 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9976 * just empty lines. | |
| 9977 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9978 * the 'da' flag is not set or we have clear line capability. | |
| 9979 * 8. redraw the characters from ScreenLines[]. | |
| 9980 * | |
| 9981 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9982 * the scrollbar for the window. It does have insert line, use that if it | |
| 9983 * exists. | |
| 9984 */ | |
| 9985 result_empty = (row + line_count >= end); | |
| 9986 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 9987 type = USE_REDRAW; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9988 else if (can_clear(T_CD) && result_empty) |
| 7 | 9989 type = USE_T_CD; |
| 9990 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9991 type = USE_T_CAL; | |
| 9992 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9993 type = USE_T_CDL; | |
| 9994 else if (*T_AL != NUL) | |
| 9995 type = USE_T_AL; | |
| 9996 else if (can_ce && result_empty) | |
| 9997 type = USE_T_CE; | |
| 9998 else if (*T_DL != NUL && result_empty) | |
| 9999 type = USE_T_DL; | |
| 10000 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 10001 type = USE_T_SR; | |
| 10002 else | |
| 10003 return FAIL; | |
| 10004 | |
| 10005 /* | |
| 10006 * For clearing the lines screen_del_lines() is used. This will also take | |
| 10007 * care of t_db if necessary. | |
| 10008 */ | |
| 10009 if (type == USE_T_CD || type == USE_T_CDL || | |
| 10010 type == USE_T_CE || type == USE_T_DL) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10011 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 10012 |
| 10013 /* | |
| 10014 * If text is retained below the screen, first clear or delete as many | |
| 10015 * lines at the bottom of the window as are about to be inserted so that | |
| 10016 * the deleted lines won't later surface during a screen_del_lines. | |
| 10017 */ | |
| 10018 if (*T_DB) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10019 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 10020 |
| 10021 #ifdef FEAT_CLIPBOARD | |
| 10022 /* Remove a modeless selection when inserting lines halfway the screen | |
| 10023 * or not the full width of the screen. */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10024 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10025 clip_clear_selection(&clip_star); |
| 7 | 10026 else |
| 10027 clip_scroll_selection(-line_count); | |
| 10028 #endif | |
| 10029 | |
| 10030 #ifdef FEAT_GUI | |
| 10031 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10032 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10033 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 10034 #endif |
| 10035 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10036 if (wp != NULL && wp->w_wincol != 0 && *T_CSV != NUL && *T_CCS == NUL) |
|
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10037 cursor_col = wp->w_wincol; |
|
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10038 |
| 7 | 10039 if (*T_CCS != NUL) /* cursor relative to region */ |
| 10040 cursor_row = row; | |
| 10041 else | |
| 10042 cursor_row = row + off; | |
| 10043 | |
| 10044 /* | |
| 10045 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 10046 * Clear the inserted lines in ScreenLines[]. | |
| 10047 */ | |
| 10048 row += off; | |
| 10049 end += off; | |
| 10050 for (i = 0; i < line_count; ++i) | |
| 10051 { | |
| 10052 if (wp != NULL && wp->w_width != Columns) | |
| 10053 { | |
| 10054 /* need to copy part of a line */ | |
| 10055 j = end - 1 - i; | |
| 10056 while ((j -= line_count) >= row) | |
| 10057 linecopy(j + line_count, j, wp); | |
| 10058 j += line_count; | |
| 10059 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10060 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10061 clear_attr); |
| 7 | 10062 else |
| 10063 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10064 LineWraps[j] = FALSE; | |
| 10065 } | |
| 10066 else | |
| 10067 { | |
| 10068 j = end - 1 - i; | |
| 10069 temp = LineOffset[j]; | |
| 10070 while ((j -= line_count) >= row) | |
| 10071 { | |
| 10072 LineOffset[j + line_count] = LineOffset[j]; | |
| 10073 LineWraps[j + line_count] = LineWraps[j]; | |
| 10074 } | |
| 10075 LineOffset[j + line_count] = temp; | |
| 10076 LineWraps[j + line_count] = FALSE; | |
| 10077 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10078 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10079 else |
| 10080 lineinvalid(temp, (int)Columns); | |
| 10081 } | |
| 10082 } | |
| 10083 | |
| 10084 screen_stop_highlight(); | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10085 windgoto(cursor_row, cursor_col); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10086 if (clear_attr != 0) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10087 screen_start_highlight(clear_attr); |
| 7 | 10088 |
| 10089 /* redraw the characters */ | |
| 10090 if (type == USE_REDRAW) | |
| 10091 redraw_block(row, end, wp); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10092 else if (type == USE_T_CAL) |
| 7 | 10093 { |
| 10094 term_append_lines(line_count); | |
| 10095 screen_start(); /* don't know where cursor is now */ | |
| 10096 } | |
| 10097 else | |
| 10098 { | |
| 10099 for (i = 0; i < line_count; i++) | |
| 10100 { | |
| 10101 if (type == USE_T_AL) | |
| 10102 { | |
| 10103 if (i && cursor_row != 0) | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10104 windgoto(cursor_row, cursor_col); |
| 7 | 10105 out_str(T_AL); |
| 10106 } | |
| 10107 else /* type == USE_T_SR */ | |
| 10108 out_str(T_SR); | |
| 10109 screen_start(); /* don't know where cursor is now */ | |
| 10110 } | |
| 10111 } | |
| 10112 | |
| 10113 /* | |
| 10114 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 10115 * have been scrolled down into the region. | |
| 10116 */ | |
| 10117 if (type == USE_T_SR && *T_DA) | |
| 10118 { | |
| 10119 for (i = 0; i < line_count; ++i) | |
| 10120 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10121 windgoto(off + i, cursor_col); |
| 7 | 10122 out_str(T_CE); |
| 10123 screen_start(); /* don't know where cursor is now */ | |
| 10124 } | |
| 10125 } | |
| 10126 | |
| 10127 #ifdef FEAT_GUI | |
| 10128 gui_can_update_cursor(); | |
| 10129 if (gui.in_use) | |
| 10130 out_flush(); /* always flush after a scroll */ | |
| 10131 #endif | |
| 10132 return OK; | |
| 10133 } | |
| 10134 | |
| 10135 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10136 * 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
|
10137 * "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
|
10138 * 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
|
10139 * "row" and "end" are relative to the start of the region. |
| 7 | 10140 * |
| 10141 * Return OK for success, FAIL if the lines are not deleted. | |
| 10142 */ | |
| 10143 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10144 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10145 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10146 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10147 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10148 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10149 int force, /* even when line_count > p_ttyscroll */ |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10150 int clear_attr, /* used for clearing lines */ |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10151 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 10152 { |
| 10153 int j; | |
| 10154 int i; | |
| 10155 unsigned temp; | |
| 10156 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10157 int cursor_col = 0; |
| 7 | 10158 int cursor_end; |
| 10159 int result_empty; /* result is empty until end of region */ | |
| 10160 int can_delete; /* deleting line codes can be used */ | |
| 10161 int type; | |
| 10162 | |
| 10163 /* | |
| 10164 * FAIL if | |
| 10165 * - there is no valid screen | |
| 10166 * - the screen has to be redrawn completely | |
| 10167 * - the line count is less than one | |
| 10168 * - the line count is more than 'ttyscroll' | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10169 * - redrawing for a callback and there is a modeless selection |
| 7 | 10170 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10171 if (!screen_valid(TRUE) || line_count <= 0 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10172 || (!force && line_count > p_ttyscroll) |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10173 #ifdef FEAT_CLIPBOARD |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10174 || (clip_star.state != SELECT_CLEARED |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10175 && redrawing_for_callback > 0) |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10176 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10177 ) |
| 7 | 10178 return FAIL; |
| 10179 | |
| 10180 /* | |
| 10181 * Check if the rest of the current region will become empty. | |
| 10182 */ | |
| 10183 result_empty = row + line_count >= end; | |
| 10184 | |
| 10185 /* | |
| 10186 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 10187 * available. | |
| 10188 */ | |
| 10189 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 10190 | |
| 10191 /* | |
| 10192 * There are six ways to delete lines: | |
| 10193 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10194 * characters from ScreenLines[]. | |
| 10195 * 1. Use T_CD if it exists and the result is empty. | |
| 10196 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 10197 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 10198 * none of the other ways work. | |
| 10199 * 4. Use T_CE (erase line) if the result is empty. | |
| 10200 * 5. Use T_DL (delete line) if it exists. | |
| 10201 * 6. redraw the characters from ScreenLines[]. | |
| 10202 */ | |
| 10203 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10204 type = USE_REDRAW; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10205 else if (can_clear(T_CD) && result_empty) |
| 7 | 10206 type = USE_T_CD; |
| 10207 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 10208 /* | |
| 10209 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 10210 * its internal termcap... this works okay for tests which test *T_DB != | |
| 10211 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 10212 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 10213 * the trick... | |
| 10214 * Anyway, this hack will hopefully go away with the next OS release. | |
| 10215 * (Olaf Seibert) | |
| 10216 */ | |
| 10217 else if (row == 0 && T_DB == empty_option | |
| 10218 && (line_count == 1 || *T_CDL == NUL)) | |
| 10219 #else | |
| 10220 else if (row == 0 && ( | |
| 10221 #ifndef AMIGA | |
| 10222 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 10223 * up, so use delete-line command */ | |
| 10224 line_count == 1 || | |
| 10225 #endif | |
| 10226 *T_CDL == NUL)) | |
| 10227 #endif | |
| 10228 type = USE_NL; | |
| 10229 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 10230 type = USE_T_CDL; | |
| 10231 else if (can_clear(T_CE) && result_empty | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10232 && (wp == NULL || wp->w_width == Columns)) |
| 7 | 10233 type = USE_T_CE; |
| 10234 else if (*T_DL != NUL && can_delete) | |
| 10235 type = USE_T_DL; | |
| 10236 else if (*T_CDL != NUL && can_delete) | |
| 10237 type = USE_T_CDL; | |
| 10238 else | |
| 10239 return FAIL; | |
| 10240 | |
| 10241 #ifdef FEAT_CLIPBOARD | |
| 10242 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 10243 * not the full width of the screen. */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10244 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10245 clip_clear_selection(&clip_star); |
| 7 | 10246 else |
| 10247 clip_scroll_selection(line_count); | |
| 10248 #endif | |
| 10249 | |
| 10250 #ifdef FEAT_GUI | |
| 10251 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10252 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10253 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
|
10254 && gui.cursor_row < end + off); |
| 7 | 10255 #endif |
| 10256 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10257 if (wp != NULL && wp->w_wincol != 0 && *T_CSV != NUL && *T_CCS == NUL) |
|
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10258 cursor_col = wp->w_wincol; |
|
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10259 |
| 7 | 10260 if (*T_CCS != NUL) /* cursor relative to region */ |
| 10261 { | |
| 10262 cursor_row = row; | |
| 10263 cursor_end = end; | |
| 10264 } | |
| 10265 else | |
| 10266 { | |
| 10267 cursor_row = row + off; | |
| 10268 cursor_end = end + off; | |
| 10269 } | |
| 10270 | |
| 10271 /* | |
| 10272 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10273 * Clear the inserted lines in ScreenLines[]. | |
| 10274 */ | |
| 10275 row += off; | |
| 10276 end += off; | |
| 10277 for (i = 0; i < line_count; ++i) | |
| 10278 { | |
| 10279 if (wp != NULL && wp->w_width != Columns) | |
| 10280 { | |
| 10281 /* need to copy part of a line */ | |
| 10282 j = row + i; | |
| 10283 while ((j += line_count) <= end - 1) | |
| 10284 linecopy(j - line_count, j, wp); | |
| 10285 j -= line_count; | |
| 10286 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10287 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10288 clear_attr); |
| 7 | 10289 else |
| 10290 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10291 LineWraps[j] = FALSE; | |
| 10292 } | |
| 10293 else | |
| 10294 { | |
| 10295 /* whole width, moving the line pointers is faster */ | |
| 10296 j = row + i; | |
| 10297 temp = LineOffset[j]; | |
| 10298 while ((j += line_count) <= end - 1) | |
| 10299 { | |
| 10300 LineOffset[j - line_count] = LineOffset[j]; | |
| 10301 LineWraps[j - line_count] = LineWraps[j]; | |
| 10302 } | |
| 10303 LineOffset[j - line_count] = temp; | |
| 10304 LineWraps[j - line_count] = FALSE; | |
| 10305 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10306 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10307 else |
| 10308 lineinvalid(temp, (int)Columns); | |
| 10309 } | |
| 10310 } | |
| 10311 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10312 if (screen_attr != clear_attr) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10313 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10314 if (clear_attr != 0) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10315 screen_start_highlight(clear_attr); |
| 7 | 10316 |
| 10317 /* redraw the characters */ | |
| 10318 if (type == USE_REDRAW) | |
| 10319 redraw_block(row, end, wp); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10320 else if (type == USE_T_CD) /* delete the lines */ |
| 7 | 10321 { |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10322 windgoto(cursor_row, cursor_col); |
| 7 | 10323 out_str(T_CD); |
| 10324 screen_start(); /* don't know where cursor is now */ | |
| 10325 } | |
| 10326 else if (type == USE_T_CDL) | |
| 10327 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10328 windgoto(cursor_row, cursor_col); |
| 7 | 10329 term_delete_lines(line_count); |
| 10330 screen_start(); /* don't know where cursor is now */ | |
| 10331 } | |
| 10332 /* | |
| 10333 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10334 * the whole screen (scroll region) up by outputting newlines on the | |
| 10335 * last line. | |
| 10336 */ | |
| 10337 else if (type == USE_NL) | |
| 10338 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10339 windgoto(cursor_end - 1, cursor_col); |
| 7 | 10340 for (i = line_count; --i >= 0; ) |
| 10341 out_char('\n'); /* cursor will remain on same line */ | |
| 10342 } | |
| 10343 else | |
| 10344 { | |
| 10345 for (i = line_count; --i >= 0; ) | |
| 10346 { | |
| 10347 if (type == USE_T_DL) | |
| 10348 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10349 windgoto(cursor_row, cursor_col); |
| 7 | 10350 out_str(T_DL); /* delete a line */ |
| 10351 } | |
| 10352 else /* type == USE_T_CE */ | |
| 10353 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10354 windgoto(cursor_row + i, cursor_col); |
| 7 | 10355 out_str(T_CE); /* erase a line */ |
| 10356 } | |
| 10357 screen_start(); /* don't know where cursor is now */ | |
| 10358 } | |
| 10359 } | |
| 10360 | |
| 10361 /* | |
| 10362 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10363 * scrolled up at the bottom of the region. | |
| 10364 */ | |
| 10365 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10366 { | |
| 10367 for (i = line_count; i > 0; --i) | |
| 10368 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10369 windgoto(cursor_end - i, cursor_col); |
| 7 | 10370 out_str(T_CE); /* erase a line */ |
| 10371 screen_start(); /* don't know where cursor is now */ | |
| 10372 } | |
| 10373 } | |
| 10374 | |
| 10375 #ifdef FEAT_GUI | |
| 10376 gui_can_update_cursor(); | |
| 10377 if (gui.in_use) | |
| 10378 out_flush(); /* always flush after a scroll */ | |
| 10379 #endif | |
| 10380 | |
| 10381 return OK; | |
| 10382 } | |
| 10383 | |
| 10384 /* | |
|
13308
ae312df8d0ab
patch 8.0.1528: dead code found
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
10385 * Show the current mode and ruler. |
| 7 | 10386 * |
| 10387 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10388 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10389 * cleared only if a mode is shown. | |
| 10390 * Return the length of the message (0 if no message). | |
| 10391 */ | |
| 10392 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10393 showmode(void) |
| 7 | 10394 { |
| 10395 int need_clear; | |
| 10396 int length = 0; | |
| 10397 int do_mode; | |
| 10398 int attr; | |
| 10399 int nwr_save; | |
| 10400 #ifdef FEAT_INS_EXPAND | |
| 10401 int sub_attr; | |
| 10402 #endif | |
| 10403 | |
| 642 | 10404 do_mode = ((p_smd && msg_silent == 0) |
| 10405 && ((State & INSERT) | |
|
14093
a9d94f10ecef
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Christian Brabandt <cb@256bit.org>
parents:
14089
diff
changeset
|
10406 || restart_edit != NUL |
| 5735 | 10407 || VIsual_active)); |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10408 if (do_mode || reg_recording != 0) |
| 7 | 10409 { |
| 10410 /* | |
| 10411 * Don't show mode right now, when not redrawing or inside a mapping. | |
| 10412 * Call char_avail() only when we are going to show something, because | |
| 10413 * it takes a bit of time. | |
| 10414 */ | |
| 10415 if (!redrawing() || (char_avail() && !KeyTyped) || msg_silent != 0) | |
| 10416 { | |
| 10417 redraw_cmdline = TRUE; /* show mode later */ | |
| 10418 return 0; | |
| 10419 } | |
| 10420 | |
| 10421 nwr_save = need_wait_return; | |
| 10422 | |
| 10423 /* wait a bit before overwriting an important message */ | |
| 10424 check_for_delay(FALSE); | |
| 10425 | |
| 10426 /* if the cmdline is more than one line high, erase top lines */ | |
| 10427 need_clear = clear_cmdline; | |
| 10428 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10429 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10430 | |
| 10431 /* Position on the last line in the window, column 0 */ | |
| 10432 msg_pos_mode(); | |
| 10433 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10434 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10435 if (do_mode) |
| 10436 { | |
| 10437 MSG_PUTS_ATTR("--", attr); | |
| 10438 #if defined(FEAT_XIM) | |
| 2520 | 10439 if ( |
| 10440 # ifdef FEAT_GUI_GTK | |
| 10441 preedit_get_status() | |
| 1668 | 10442 # else |
| 10443 im_get_status() | |
| 2520 | 10444 # endif |
| 1668 | 10445 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10446 # ifdef FEAT_GUI_GTK /* most of the time, it's not XIM being used */ |
| 7 | 10447 MSG_PUTS_ATTR(" IM", attr); |
| 10448 # else | |
| 10449 MSG_PUTS_ATTR(" XIM", attr); | |
| 10450 # endif | |
| 10451 #endif | |
| 10452 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10453 if (gui.in_use) | |
| 10454 { | |
| 10455 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10456 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10457 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10458 if (enc_utf8) |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10459 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
|
10460 else |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10461 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
|
10462 } |
| 7 | 10463 } |
| 10464 #endif | |
| 10465 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10466 /* CTRL-X in Insert mode */ |
| 10467 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10468 { |
| 10469 /* These messages can get long, avoid a wrap in a narrow | |
| 10470 * window. Prefer showing edit_submode_extra. */ | |
| 10471 length = (Rows - msg_row) * Columns - 3; | |
| 10472 if (edit_submode_extra != NULL) | |
| 10473 length -= vim_strsize(edit_submode_extra); | |
| 10474 if (length > 0) | |
| 10475 { | |
| 10476 if (edit_submode_pre != NULL) | |
| 10477 length -= vim_strsize(edit_submode_pre); | |
| 10478 if (length - vim_strsize(edit_submode) > 0) | |
| 10479 { | |
| 10480 if (edit_submode_pre != NULL) | |
| 10481 msg_puts_attr(edit_submode_pre, attr); | |
| 10482 msg_puts_attr(edit_submode, attr); | |
| 10483 } | |
| 10484 if (edit_submode_extra != NULL) | |
| 10485 { | |
| 10486 MSG_PUTS_ATTR(" ", attr); /* add a space in between */ | |
| 10487 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
|
10488 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10489 else |
| 10490 sub_attr = attr; | |
| 10491 msg_puts_attr(edit_submode_extra, sub_attr); | |
| 10492 } | |
| 10493 } | |
| 10494 } | |
| 10495 else | |
| 10496 #endif | |
| 10497 { | |
| 10498 if (State & VREPLACE_FLAG) | |
| 10499 MSG_PUTS_ATTR(_(" VREPLACE"), attr); | |
|
14424
0a69e6e708f9
patch 8.1.0226: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
14218
diff
changeset
|
10500 else if (State & REPLACE_FLAG) |
| 7 | 10501 MSG_PUTS_ATTR(_(" REPLACE"), attr); |
| 10502 else if (State & INSERT) | |
| 10503 { | |
| 10504 #ifdef FEAT_RIGHTLEFT | |
| 10505 if (p_ri) | |
| 10506 MSG_PUTS_ATTR(_(" REVERSE"), attr); | |
| 10507 #endif | |
| 10508 MSG_PUTS_ATTR(_(" INSERT"), attr); | |
| 10509 } | |
|
14093
a9d94f10ecef
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Christian Brabandt <cb@256bit.org>
parents:
14089
diff
changeset
|
10510 else if (restart_edit == 'I' || restart_edit == 'A') |
| 7 | 10511 MSG_PUTS_ATTR(_(" (insert)"), attr); |
| 10512 else if (restart_edit == 'R') | |
| 10513 MSG_PUTS_ATTR(_(" (replace)"), attr); | |
| 10514 else if (restart_edit == 'V') | |
| 10515 MSG_PUTS_ATTR(_(" (vreplace)"), attr); | |
| 10516 #ifdef FEAT_RIGHTLEFT | |
| 10517 if (p_hkmap) | |
| 10518 MSG_PUTS_ATTR(_(" Hebrew"), attr); | |
| 10519 # ifdef FEAT_FKMAP | |
| 10520 if (p_fkmap) | |
| 10521 MSG_PUTS_ATTR(farsi_text_5, attr); | |
| 10522 # endif | |
| 10523 #endif | |
| 10524 #ifdef FEAT_KEYMAP | |
| 10525 if (State & LANGMAP) | |
| 10526 { | |
| 10527 # ifdef FEAT_ARABIC | |
| 10528 if (curwin->w_p_arab) | |
| 10529 MSG_PUTS_ATTR(_(" Arabic"), attr); | |
| 10530 else | |
| 10531 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10532 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
|
10533 NameBuff, MAXPATHL)) |
|
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10534 MSG_PUTS_ATTR(NameBuff, attr); |
| 7 | 10535 } |
| 10536 #endif | |
| 10537 if ((State & INSERT) && p_paste) | |
| 10538 MSG_PUTS_ATTR(_(" (paste)"), attr); | |
| 10539 | |
| 10540 if (VIsual_active) | |
| 10541 { | |
| 10542 char *p; | |
| 10543 | |
| 10544 /* Don't concatenate separate words to avoid translation | |
| 10545 * problems. */ | |
| 10546 switch ((VIsual_select ? 4 : 0) | |
| 10547 + (VIsual_mode == Ctrl_V) * 2 | |
| 10548 + (VIsual_mode == 'V')) | |
| 10549 { | |
| 10550 case 0: p = N_(" VISUAL"); break; | |
| 10551 case 1: p = N_(" VISUAL LINE"); break; | |
| 10552 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10553 case 4: p = N_(" SELECT"); break; | |
| 10554 case 5: p = N_(" SELECT LINE"); break; | |
| 10555 default: p = N_(" SELECT BLOCK"); break; | |
| 10556 } | |
| 10557 MSG_PUTS_ATTR(_(p), attr); | |
| 10558 } | |
| 10559 MSG_PUTS_ATTR(" --", attr); | |
| 10560 } | |
| 644 | 10561 |
| 7 | 10562 need_clear = TRUE; |
| 10563 } | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10564 if (reg_recording != 0 |
| 7 | 10565 #ifdef FEAT_INS_EXPAND |
| 10566 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10567 #endif | |
| 10568 ) | |
| 10569 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10570 recording_mode(attr); |
| 7 | 10571 need_clear = TRUE; |
| 10572 } | |
| 644 | 10573 |
| 10574 mode_displayed = TRUE; | |
| 7 | 10575 if (need_clear || clear_cmdline) |
| 10576 msg_clr_eos(); | |
| 10577 msg_didout = FALSE; /* overwrite this message */ | |
| 10578 length = msg_col; | |
| 10579 msg_col = 0; | |
| 10580 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10581 } | |
| 10582 else if (clear_cmdline && msg_silent == 0) | |
| 10583 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10584 msg_clr_cmdline(); | |
| 10585 | |
| 10586 #ifdef FEAT_CMDL_INFO | |
| 10587 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10588 if (VIsual_active) | |
| 10589 clear_showcmd(); | |
| 10590 | |
| 10591 /* If the last window has no status line, the ruler is after the mode | |
| 10592 * message and must be redrawn */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10593 if (redrawing() && lastwin->w_status_height == 0) |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10594 win_redr_ruler(lastwin, TRUE, FALSE); |
| 7 | 10595 #endif |
| 10596 redraw_cmdline = FALSE; | |
| 10597 clear_cmdline = FALSE; | |
| 10598 | |
| 10599 return length; | |
| 10600 } | |
| 10601 | |
| 10602 /* | |
| 10603 * Position for a mode message. | |
| 10604 */ | |
| 10605 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10606 msg_pos_mode(void) |
| 7 | 10607 { |
| 10608 msg_col = 0; | |
| 10609 msg_row = Rows - 1; | |
| 10610 } | |
| 10611 | |
| 10612 /* | |
| 10613 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10614 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10615 * Caller should check "mode_displayed". |
| 7 | 10616 */ |
| 10617 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10618 unshowmode(int force) |
| 7 | 10619 { |
| 10620 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10621 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10622 */ |
| 10623 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10624 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10625 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10626 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10627 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10628 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10629 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10630 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10631 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10632 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10633 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10634 { |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10635 int save_msg_row = msg_row; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10636 int save_msg_col = msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10637 |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10638 msg_pos_mode(); |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10639 if (reg_recording != 0) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10640 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
|
10641 msg_clr_eos(); |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10642 |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10643 msg_col = save_msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10644 msg_row = save_msg_row; |
| 7 | 10645 } |
| 10646 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10647 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10648 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10649 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10650 MSG_PUTS_ATTR(_("recording"), attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10651 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10652 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10653 char_u s[4]; |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10654 sprintf((char *)s, " @%c", reg_recording); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10655 MSG_PUTS_ATTR(s, attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10656 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10657 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10658 |
| 667 | 10659 /* |
| 10660 * Draw the tab pages line at the top of the Vim window. | |
| 10661 */ | |
|
15396
325e4a8ba1b6
patch 8.1.0706: tabline is not always redrawn
Bram Moolenaar <Bram@vim.org>
parents:
15384
diff
changeset
|
10662 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10663 draw_tabline(void) |
| 667 | 10664 { |
| 10665 int tabcount = 0; | |
| 10666 tabpage_T *tp; | |
| 10667 int tabwidth; | |
| 10668 int col = 0; | |
| 673 | 10669 int scol = 0; |
| 667 | 10670 int attr; |
| 10671 win_T *wp; | |
| 671 | 10672 win_T *cwp; |
| 10673 int wincount; | |
| 10674 int modified; | |
| 667 | 10675 int c; |
| 10676 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10677 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
|
10678 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
|
10679 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10680 char_u *p; |
| 677 | 10681 int room; |
| 10682 int use_sep_chars = (t_colors < 8 | |
| 10683 #ifdef FEAT_GUI | |
| 10684 && !gui.in_use | |
| 10685 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10686 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10687 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10688 #endif |
| 677 | 10689 ); |
| 673 | 10690 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10691 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10692 return; |
| 673 | 10693 redraw_tabline = FALSE; |
| 667 | 10694 |
| 685 | 10695 #ifdef FEAT_GUI_TABLINE |
| 798 | 10696 /* Take care of a GUI tabline. */ |
| 685 | 10697 if (gui_use_tabline()) |
| 10698 { | |
| 10699 gui_update_tabline(); | |
| 10700 return; | |
| 10701 } | |
| 10702 #endif | |
| 10703 | |
| 10704 if (tabline_height() < 1) | |
| 667 | 10705 return; |
| 10706 | |
| 677 | 10707 #if defined(FEAT_STL_OPT) |
| 681 | 10708 |
| 10709 /* Init TabPageIdxs[] to zero: Clicking outside of tabs has no effect. */ | |
| 10710 for (scol = 0; scol < Columns; ++scol) | |
| 10711 TabPageIdxs[scol] = 0; | |
| 10712 | |
| 677 | 10713 /* Use the 'tabline' option if it's set. */ |
| 10714 if (*p_tal != NUL) | |
| 10715 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10716 int saved_did_emsg = did_emsg; |
| 680 | 10717 |
| 10718 /* Check for an error. If there is one we would loop in redrawing the | |
| 10719 * 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
|
10720 did_emsg = FALSE; |
| 677 | 10721 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10722 if (did_emsg) |
| 680 | 10723 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10724 (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
|
10725 did_emsg |= saved_did_emsg; |
| 680 | 10726 } |
| 10727 else | |
| 10728 #endif | |
| 10729 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10730 FOR_ALL_TABPAGES(tp) |
| 680 | 10731 ++tabcount; |
| 10732 | |
| 10733 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10734 if (tabwidth < 6) | |
| 10735 tabwidth = 6; | |
| 10736 | |
| 10737 attr = attr_nosel; | |
| 10738 tabcount = 0; | |
| 681 | 10739 scol = 0; |
| 699 | 10740 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10741 tp = tp->tp_next) | |
| 680 | 10742 { |
| 10743 scol = col; | |
| 10744 | |
| 10745 if (tp->tp_topframe == topframe) | |
| 10746 attr = attr_sel; | |
| 10747 if (use_sep_chars && col > 0) | |
| 10748 screen_putchar('|', 0, col++, attr); | |
| 10749 | |
| 10750 if (tp->tp_topframe != topframe) | |
| 10751 attr = attr_nosel; | |
| 10752 | |
| 10753 screen_putchar(' ', 0, col++, attr); | |
| 10754 | |
| 10755 if (tp == curtab) | |
| 10756 { | |
| 10757 cwp = curwin; | |
| 10758 wp = firstwin; | |
| 10759 } | |
| 10760 else | |
| 10761 { | |
| 10762 cwp = tp->tp_curwin; | |
| 10763 wp = tp->tp_firstwin; | |
| 10764 } | |
| 10765 | |
| 10766 modified = FALSE; | |
| 10767 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10768 if (bufIsChanged(wp->w_buffer)) | |
| 10769 modified = TRUE; | |
| 10770 if (modified || wincount > 1) | |
| 10771 { | |
| 10772 if (wincount > 1) | |
| 10773 { | |
| 10774 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10775 len = (int)STRLEN(NameBuff); |
| 699 | 10776 if (col + len >= Columns - 3) |
| 10777 break; | |
| 680 | 10778 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10779 #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
|
10780 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10781 #else |
| 6106 | 10782 attr |
| 680 | 10783 #endif |
| 10784 ); | |
| 10785 col += len; | |
| 10786 } | |
| 10787 if (modified) | |
| 10788 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10789 screen_putchar(' ', 0, col++, attr); | |
| 10790 } | |
| 10791 | |
| 10792 room = scol - col + tabwidth - 1; | |
| 10793 if (room > 0) | |
| 10794 { | |
| 685 | 10795 /* Get buffer name in NameBuff[] */ |
| 10796 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10797 shorten_dir(NameBuff); |
| 680 | 10798 len = vim_strsize(NameBuff); |
| 10799 p = NameBuff; | |
| 677 | 10800 #ifdef FEAT_MBYTE |
| 680 | 10801 if (has_mbyte) |
| 10802 while (len > room) | |
| 10803 { | |
| 10804 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10805 MB_PTR_ADV(p); |
| 680 | 10806 } |
| 10807 else | |
| 10808 #endif | |
| 10809 if (len > room) | |
| 677 | 10810 { |
| 680 | 10811 p += len - room; |
| 10812 len = room; | |
| 677 | 10813 } |
| 699 | 10814 if (len > Columns - col - 1) |
| 10815 len = Columns - col - 1; | |
| 680 | 10816 |
| 835 | 10817 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10818 col += len; |
| 10819 } | |
| 10820 screen_putchar(' ', 0, col++, attr); | |
| 10821 | |
| 10822 /* Store the tab page number in TabPageIdxs[], so that | |
| 10823 * jump_to_mouse() knows where each one is. */ | |
| 10824 ++tabcount; | |
| 10825 while (scol < col) | |
| 10826 TabPageIdxs[scol++] = tabcount; | |
| 10827 } | |
| 10828 | |
| 10829 if (use_sep_chars) | |
| 10830 c = '_'; | |
| 10831 else | |
| 10832 c = ' '; | |
| 10833 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10834 |
| 10835 /* Put an "X" for closing the current tab if there are several. */ | |
| 10836 if (first_tabpage->tp_next != NULL) | |
| 10837 { | |
| 10838 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10839 TabPageIdxs[Columns - 1] = -999; | |
| 10840 } | |
| 10841 } | |
| 834 | 10842 |
| 10843 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10844 * set. */ | |
| 10845 redraw_tabline = FALSE; | |
| 667 | 10846 } |
| 685 | 10847 |
| 10848 /* | |
| 10849 * Get buffer name for "buf" into NameBuff[]. | |
| 10850 * Takes care of special buffer names and translates special characters. | |
| 10851 */ | |
| 10852 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10853 get_trans_bufname(buf_T *buf) |
| 685 | 10854 { |
| 10855 if (buf_spname(buf) != NULL) | |
| 3839 | 10856 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10857 else |
| 10858 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10859 trans_characters(NameBuff, MAXPATHL); | |
| 10860 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10861 |
| 7 | 10862 /* |
| 10863 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10864 */ | |
| 10865 static int | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10866 fillchar_status(int *attr, win_T *wp) |
| 7 | 10867 { |
| 10868 int fill; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10869 |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10870 #ifdef FEAT_TERMINAL |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10871 if (bt_terminal(wp->w_buffer)) |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10872 { |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10873 if (wp == curwin) |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10874 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10875 *attr = HL_ATTR(HLF_ST); |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10876 fill = fill_stl; |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10877 } |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10878 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10879 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10880 *attr = HL_ATTR(HLF_STNC); |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10881 fill = fill_stlnc; |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10882 } |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10883 } |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10884 else |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10885 #endif |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10886 if (wp == curwin) |
| 7 | 10887 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10888 *attr = HL_ATTR(HLF_S); |
| 7 | 10889 fill = fill_stl; |
| 10890 } | |
| 10891 else | |
| 10892 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10893 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10894 fill = fill_stlnc; |
| 10895 } | |
| 10896 /* Use fill when there is highlighting, and highlighting of current | |
| 10897 * window differs, or the fillchars differ, or this is not the | |
| 10898 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10899 if (*attr != 0 && ((HL_ATTR(HLF_S) != HL_ATTR(HLF_SNC) |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10900 || wp != curwin || ONE_WINDOW) |
| 7 | 10901 || (fill_stl != fill_stlnc))) |
| 10902 return fill; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10903 if (wp == curwin) |
| 7 | 10904 return '^'; |
| 10905 return '='; | |
| 10906 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10907 |
| 7 | 10908 /* |
| 10909 * Get the character to use in a separator between vertically split windows. | |
| 10910 * Get its attributes in "*attr". | |
| 10911 */ | |
| 10912 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10913 fillchar_vsep(int *attr) |
| 7 | 10914 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10915 *attr = HL_ATTR(HLF_C); |
| 7 | 10916 if (*attr == 0 && fill_vert == ' ') |
| 10917 return '|'; | |
| 10918 else | |
| 10919 return fill_vert; | |
| 10920 } | |
| 10921 | |
| 10922 /* | |
| 10923 * Return TRUE if redrawing should currently be done. | |
| 10924 */ | |
| 10925 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10926 redrawing(void) |
| 7 | 10927 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10928 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10929 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
|
10930 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10931 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10932 #endif |
|
14673
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10933 return ((!RedrawingDisabled |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10934 #ifdef FEAT_EVAL |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10935 || ignore_redraw_flag_for_testing |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10936 #endif |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10937 ) && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 7 | 10938 } |
| 10939 | |
| 10940 /* | |
| 10941 * Return TRUE if printing messages should currently be done. | |
| 10942 */ | |
| 10943 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10944 messaging(void) |
| 7 | 10945 { |
| 10946 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10947 } | |
| 10948 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10949 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10950 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10951 * Draw the window toolbar. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10952 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10953 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10954 redraw_win_toolbar(win_T *wp) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10955 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10956 vimmenu_T *menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10957 int item_idx = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10958 int item_count = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10959 int col = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10960 int next_col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10961 int off = (int)(current_ScreenLine - ScreenLines); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10962 int fill_attr = syn_name2attr((char_u *)"ToolbarLine"); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10963 int button_attr = syn_name2attr((char_u *)"ToolbarButton"); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10964 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10965 vim_free(wp->w_winbar_items); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10966 for (menu = wp->w_winbar->children; menu != NULL; menu = menu->next) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10967 ++item_count; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10968 wp->w_winbar_items = (winbar_item_T *)alloc_clear( |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10969 (unsigned)sizeof(winbar_item_T) * (item_count + 1)); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10970 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10971 /* TODO: use fewer spaces if there is not enough room */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10972 for (menu = wp->w_winbar->children; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10973 menu != NULL && col < wp->w_width; menu = menu->next) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10974 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10975 space_to_screenline(off + col, fill_attr); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10976 if (++col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10977 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10978 if (col > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10979 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10980 space_to_screenline(off + col, fill_attr); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10981 if (++col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10982 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10983 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10984 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10985 wp->w_winbar_items[item_idx].wb_startcol = col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10986 space_to_screenline(off + col, button_attr); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10987 if (++col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10988 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10989 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10990 next_col = text_to_screenline(wp, menu->name, col); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10991 while (col < next_col) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10992 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10993 ScreenAttrs[off + col] = button_attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10994 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10995 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10996 wp->w_winbar_items[item_idx].wb_endcol = col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10997 wp->w_winbar_items[item_idx].wb_menu = menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10998 ++item_idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10999 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11000 if (col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11001 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11002 space_to_screenline(off + col, button_attr); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11003 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11004 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11005 while (col < wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11006 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11007 space_to_screenline(off + col, fill_attr); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11008 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11009 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11010 wp->w_winbar_items[item_idx].wb_menu = NULL; /* end marker */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11011 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11012 screen_line(wp->w_winrow, wp->w_wincol, (int)wp->w_width, |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11013 (int)wp->w_width, FALSE); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11014 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11015 #endif |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
11016 |
| 7 | 11017 /* |
| 11018 * Show current status info in ruler and various other places | |
| 11019 * If always is FALSE, only show ruler if position has changed. | |
| 11020 */ | |
| 11021 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11022 showruler(int always) |
| 7 | 11023 { |
| 11024 if (!always && !redrawing()) | |
| 11025 return; | |
| 574 | 11026 #ifdef FEAT_INS_EXPAND |
| 11027 if (pum_visible()) | |
| 11028 { | |
| 11029 /* Don't redraw right now, do it later. */ | |
| 11030 curwin->w_redr_status = TRUE; | |
| 11031 return; | |
| 11032 } | |
| 11033 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11034 #if defined(FEAT_STL_OPT) |
| 40 | 11035 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 680 | 11036 { |
| 1983 | 11037 redraw_custom_statusline(curwin); |
| 680 | 11038 } |
| 7 | 11039 else |
| 11040 #endif | |
| 11041 #ifdef FEAT_CMDL_INFO | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
11042 win_redr_ruler(curwin, always, FALSE); |
| 7 | 11043 #endif |
| 11044 | |
| 11045 #ifdef FEAT_TITLE | |
| 11046 if (need_maketitle | |
| 11047 # ifdef FEAT_STL_OPT | |
| 11048 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 11049 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 11050 # endif | |
| 11051 ) | |
| 11052 maketitle(); | |
| 11053 #endif | |
| 1588 | 11054 /* Redraw the tab pages line if needed. */ |
| 11055 if (redraw_tabline) | |
| 11056 draw_tabline(); | |
| 7 | 11057 } |
| 11058 | |
| 11059 #ifdef FEAT_CMDL_INFO | |
| 11060 static void | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
11061 win_redr_ruler(win_T *wp, int always, int ignore_pum) |
| 7 | 11062 { |
| 1869 | 11063 #define RULER_BUF_LEN 70 |
| 11064 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 11065 int row; |
| 11066 int fillchar; | |
| 11067 int attr; | |
| 11068 int empty_line = FALSE; | |
| 11069 colnr_T virtcol; | |
| 11070 int i; | |
| 1869 | 11071 size_t len; |
| 7 | 11072 int o; |
| 11073 int this_ru_col; | |
| 11074 int off = 0; | |
| 11075 int width = Columns; | |
| 11076 | |
| 11077 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 11078 if (!p_ru) | |
| 11079 return; | |
| 11080 | |
| 11081 /* | |
| 11082 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 11083 * after deleting lines, before cursor.lnum is corrected. | |
| 11084 */ | |
| 11085 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 11086 return; | |
| 11087 | |
| 11088 #ifdef FEAT_INS_EXPAND | |
| 11089 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 11090 * the (long) mode message. */ | |
| 11091 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 11092 if (edit_submode != NULL) | |
| 11093 return; | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
11094 // Don't draw the ruler when the popup menu is visible, it may overlap. |
|
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
11095 // Except when the popup menu will be redrawn anyway. |
|
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
11096 if (!ignore_pum && pum_visible()) |
| 540 | 11097 return; |
| 7 | 11098 #endif |
| 11099 | |
| 11100 #ifdef FEAT_STL_OPT | |
| 11101 if (*p_ruf) | |
| 11102 { | |
| 680 | 11103 int save_called_emsg = called_emsg; |
| 11104 | |
| 11105 called_emsg = FALSE; | |
| 7 | 11106 win_redr_custom(wp, TRUE); |
| 680 | 11107 if (called_emsg) |
| 11108 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 11109 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 11110 called_emsg |= save_called_emsg; |
| 7 | 11111 return; |
| 11112 } | |
| 11113 #endif | |
| 11114 | |
| 11115 /* | |
| 11116 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 11117 */ | |
| 11118 if (!(State & INSERT) | |
| 11119 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 11120 empty_line = TRUE; | |
| 11121 | |
| 11122 /* | |
| 11123 * Only draw the ruler when something changed. | |
| 11124 */ | |
| 11125 validate_virtcol_win(wp); | |
| 11126 if ( redraw_cmdline | |
| 11127 || always | |
| 11128 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 11129 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 11130 || wp->w_virtcol != wp->w_ru_virtcol | |
| 11131 #ifdef FEAT_VIRTUALEDIT | |
| 11132 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 11133 #endif | |
| 11134 || wp->w_topline != wp->w_ru_topline | |
| 11135 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 11136 #ifdef FEAT_DIFF | |
| 11137 || wp->w_topfill != wp->w_ru_topfill | |
| 11138 #endif | |
| 11139 || empty_line != wp->w_ru_empty) | |
| 11140 { | |
| 11141 cursor_off(); | |
| 11142 if (wp->w_status_height) | |
| 11143 { | |
| 11144 row = W_WINROW(wp) + wp->w_height; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
11145 fillchar = fillchar_status(&attr, wp); |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
11146 off = wp->w_wincol; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11147 width = wp->w_width; |
| 7 | 11148 } |
| 11149 else | |
| 11150 { | |
| 11151 row = Rows - 1; | |
| 11152 fillchar = ' '; | |
| 11153 attr = 0; | |
| 11154 width = Columns; | |
| 11155 off = 0; | |
| 11156 } | |
| 11157 | |
| 11158 /* In list mode virtcol needs to be recomputed */ | |
| 11159 virtcol = wp->w_virtcol; | |
| 11160 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 11161 { | |
| 11162 wp->w_p_list = FALSE; | |
| 11163 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 11164 wp->w_p_list = TRUE; | |
| 11165 } | |
| 11166 | |
| 11167 /* | |
| 11168 * Some sprintfs return the length, some return a pointer. | |
| 11169 * To avoid portability problems we use strlen() here. | |
| 11170 */ | |
| 1869 | 11171 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 11172 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 11173 ? 0L | |
| 11174 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 11175 len = STRLEN(buffer); |
| 11176 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 11177 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 11178 (int)virtcol + 1); | |
| 11179 | |
| 11180 /* | |
| 11181 * Add a "50%" if there is room for it. | |
| 11182 * On the last line, don't print in the last column (scrolls the | |
| 11183 * screen up on some terminals). | |
| 11184 */ | |
| 11185 i = (int)STRLEN(buffer); | |
| 1869 | 11186 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 11187 o = i + vim_strsize(buffer + i + 1); |
| 11188 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 11189 ++o; | |
| 11190 this_ru_col = ru_col - (Columns - width); | |
| 11191 if (this_ru_col < 0) | |
| 11192 this_ru_col = 0; | |
| 11193 /* Never use more than half the window/screen width, leave the other | |
| 11194 * half for the filename. */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11195 if (this_ru_col < (width + 1) / 2) |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11196 this_ru_col = (width + 1) / 2; |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11197 if (this_ru_col + o < width) |
| 7 | 11198 { |
| 6466 | 11199 /* need at least 3 chars left for get_rel_pos() + NUL */ |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11200 while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) |
| 7 | 11201 { |
| 11202 #ifdef FEAT_MBYTE | |
| 11203 if (has_mbyte) | |
| 11204 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 11205 else | |
| 11206 #endif | |
| 11207 buffer[i++] = fillchar; | |
| 11208 ++o; | |
| 11209 } | |
| 1869 | 11210 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 11211 } |
| 11212 /* Truncate at window boundary. */ | |
| 11213 #ifdef FEAT_MBYTE | |
| 11214 if (has_mbyte) | |
| 11215 { | |
| 11216 o = 0; | |
| 474 | 11217 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 11218 { |
| 11219 o += (*mb_ptr2cells)(buffer + i); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11220 if (this_ru_col + o > width) |
| 7 | 11221 { |
| 11222 buffer[i] = NUL; | |
| 11223 break; | |
| 11224 } | |
| 11225 } | |
| 11226 } | |
| 11227 else | |
| 11228 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11229 if (this_ru_col + (int)STRLEN(buffer) > width) |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11230 buffer[width - this_ru_col] = NUL; |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11231 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11232 screen_puts(buffer, row, this_ru_col + off, attr); |
| 7 | 11233 i = redraw_cmdline; |
| 11234 screen_fill(row, row + 1, | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11235 this_ru_col + off + (int)STRLEN(buffer), |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11236 (int)(off + width), |
| 7 | 11237 fillchar, fillchar, attr); |
| 11238 /* don't redraw the cmdline because of showing the ruler */ | |
| 11239 redraw_cmdline = i; | |
| 11240 wp->w_ru_cursor = wp->w_cursor; | |
| 11241 wp->w_ru_virtcol = wp->w_virtcol; | |
| 11242 wp->w_ru_empty = empty_line; | |
| 11243 wp->w_ru_topline = wp->w_topline; | |
| 11244 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 11245 #ifdef FEAT_DIFF | |
| 11246 wp->w_ru_topfill = wp->w_topfill; | |
| 11247 #endif | |
| 11248 } | |
| 11249 } | |
| 11250 #endif | |
| 13 | 11251 |
| 11252 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 11253 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
11254 * 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
|
11255 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 11256 * Otherwise it depends on 'numberwidth' and the line count. |
| 11257 */ | |
| 11258 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11259 number_width(win_T *wp) |
| 13 | 11260 { |
| 11261 int n; | |
| 11262 linenr_T lnum; | |
| 11263 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11264 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
|
11265 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11266 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11267 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11268 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11269 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
|
11270 |
| 6679 | 11271 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 11272 return wp->w_nrwidth_width; |
| 11273 wp->w_nrwidth_line_count = lnum; | |
| 11274 | |
| 11275 n = 0; | |
| 11276 do | |
| 11277 { | |
| 856 | 11278 lnum /= 10; |
| 11279 ++n; | |
| 13 | 11280 } while (lnum > 0); |
| 11281 | |
| 11282 /* 'numberwidth' gives the minimal width plus one */ | |
| 11283 if (n < wp->w_p_nuw - 1) | |
| 11284 n = wp->w_p_nuw - 1; | |
| 11285 | |
| 11286 wp->w_nrwidth_width = n; | |
| 6679 | 11287 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11288 return n; |
| 11289 } | |
| 11290 #endif | |
| 3986 | 11291 |
| 11292 /* | |
| 11293 * Return the current cursor column. This is the actual position on the | |
| 11294 * screen. First column is 0. | |
| 11295 */ | |
| 11296 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11297 screen_screencol(void) |
| 3986 | 11298 { |
| 11299 return screen_cur_col; | |
| 11300 } | |
| 11301 | |
| 11302 /* | |
| 11303 * Return the current cursor row. This is the actual position on the screen. | |
| 11304 * First row is 0. | |
| 11305 */ | |
| 11306 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11307 screen_screenrow(void) |
| 3986 | 11308 { |
| 11309 return screen_cur_row; | |
| 11310 } |